Changeset 16078 for release-kits/wirk3/wrapper/wrapper.cpp

Timestamp:

2008-06-20T09:58:58+12:00 (16 years ago)

Author:

oranfry

Message:

corrections to the splitting and joining scheme, and a few fixes to make use of shared stuff

File:

• release-kits/wirk3/wrapper/wrapper.cpp (modified) (7 diffs)

release-kits/wirk3/wrapper/wrapper.cpp

@@ -14 +14 @@
 //globals
 HBITMAP g_splash = NULL; //the main splash bitmap
+HFONT g_hfFont = NULL; //the main splash bitmap
 char step[10] = "TMP"; //the current step
 char progress[4] = "0"; //progress in the current step
@@ -45 +46 @@
 
 //extracts a resource in chunks
-int extractResource( const char * basename, const char * type, char * file, int no_chunks ) {
+int extractResource( const char * basename, const char * type, char * file ) {
 
     HMODULE hModule = GetModuleHandle(NULL);
     set_splash_progress( 0 );
 
+    int no_chunks;
+    bool chunk_available = true;
+    for ( no_chunks = 0; chunk_available; no_chunks++ ) {
+
+        //construct the chunk name
+        char chunkname[127] = {0};
+        strcpy( chunkname, basename );
+        strcat( chunkname, "_" );
+        char chunknum[5] = {0};
+        itoa( no_chunks+1, chunknum, 10 );
+        strcat( chunkname, chunknum );
+        
+        if ( FindResource(hModule, chunkname, type) == NULL ) {
+            chunk_available = false;
+        }
+    }
+    
     for ( int i=0; i<no_chunks; i++ ) {
-
+    
         //construct the chunk name
         char chunkname[127] = {0};
@@ -60 +78 @@
         strcat( chunkname, chunknum );
         
-        //MessageBox(NULL, chunkname, "chunk name", MB_OK);
-        
-        //try to find it
+        //find it
         HRSRC hRsrc = FindResource(hModule, chunkname, type);
-        if (hRsrc == NULL ) return -1; //couldn't find the chunk
+        if (hRsrc == NULL ) return 1; //couldn't find the chunk
         
         //load it
         HGLOBAL hGlobal = LoadResource(hModule, hRsrc);
         if (hGlobal == NULL) return 1; //couldn't lock
+        
+        //lock it
         BYTE* pBytes = (BYTE*) LockResource(hGlobal);
         if (pBytes == NULL) return 1; //couldn't lock
@@ -98 +116 @@
             //load in the reusable resources
             g_splash = LoadBitmap(GetModuleHandle(NULL),"SPLASH");
+            g_hfFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT);
             if(g_splash == NULL) {
                 MessageBox(hwnd, "Could not load splash bitmap!", "Error", MB_OK | MB_ICONEXCLAMATION);
@@ -146 +165 @@
             SelectObject(hdcMem, g_step);
             BitBlt(hdc, 0, 276, bm.bmWidth, bm.bmHeight, hdcMem, 0, 0, SRCPAINT);
+            
+            //print the step with text
+            RECT rcClient;
+            GetClientRect(hwnd, &rcClient);
+            //DrawText(hdc, "This is the step", -1, &rcClient, DT_SINGLELINE | DT_CENTER | DT_VCENTER);
             
             //restore the hdc
@@ -294 +318 @@
         //is this an installer with the bundled JRE?
         set_splash_step( "XJAVA" );
-        int extract_result = extractResource( "JAVA", "EXE", "@java.installer@", 2 );
+        int extract_result = extractResource( "JAVA", "EXE", "@java.installer@" );
 
         if ( extract_result == 0 ) {
@@ -327 +351 @@
         
         set_splash_step( "XJAR" );
-        extractResource( "JAR", "JAR", (char*) jarLocation.c_str(), 12 );
+        extractResource( "JAR", "JAR", (char*) jarLocation.c_str() );
 
         //launch the jar