Changeset 40 for trunk/src/plugins/platform-launcher

Timestamp:

Nov 21, 2007, 1:32:50 PM (18 years ago)

Author:

lpino

Message:

• Fixes some problems loading the splash window. It doesn't load the eclipse platform yet

File:

• trunk/src/plugins/platform-launcher/library/pm/eclipseOs2.c (modified) (9 diffs)

trunk/src/plugins/platform-launcher/library/pm/eclipseOs2.c

@@ -1 @@
-/* $Id: os2_eclipse.c,v 1.1 2002/07/10 04:28:02 phaller Exp $ */
-
-/*
- * Contributed by Mark Hale
- */
 
 #include "eclipseOS.h"
@@ -35 +30 @@
 #define SPLASH_WINDOW_ID 100
 #define MSG_BOX_ID 11
-#define BMP_SPLASH_BITMAP 501
 
 /* Define local variables for running the JVM and detecting its exit. */
@@ -52 +46 @@
 static void      splashTimeout(void);
 static MRESULT EXPENTRY clientWndProc (HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
-
 
 /*
@@ -163 +156 @@
     return (ERROR_INVALID_PARAMETER);                /* Fehler signalisieren */
 
-
         /* Find out how big the file is, allocate that much memory, and read */
                                                     /* in the entire bitmap. */
@@ -337 +329 @@
   HPS     hps = WinGetScreenPS( HWND_DESKTOP );
   HBITMAP hbmp;
-  APIRET  rc = BmpRead(hps,
+  APIRET  rc = BmpReadFile(hps,
                        featureImage,
                        &hbmp);
@@ -349 +341 @@
 
 
-
-
 /* Display a Message */
 void displayMessage( char* message )
 {
-  WinMessageBox(HWND_DESKTOP,
-                hwndFrame,
-                message,
-                NULL,
-                MSG_BOX_ID,
-                MB_OK | MB_MOVEABLE);
+   WinMessageBox( HWND_DESKTOP, hwndFrame, message, NULL, MSG_BOX_ID, MB_OK );
 }
 
@@ -436 +421 @@
    DevQueryCaps(hDC, CAPS_COLOR_PLANES, 2, devCaps);
    depth = devCaps[0] * devCaps[1];
+
     if (featureImage != NULL)
         hBitmap = MMLoadBitmap(hab, featureImage);
-
     /* If the bitmap could not be found, try again using the install directory. */
     if (hBitmap == NULLHANDLE)
-        hBitmap = loadSplashImage( homeDir, depth <= LO_RES_DEPTH ? loResSplash : hiResSplash );
-
+         hBitmap = loadSplashImage( homeDir, depth <= LO_RES_DEPTH ? loResSplash : hiResSplash );
     /* If the bitmap could not be found, return an error. */
     if (hBitmap == NULLHANDLE)
@@ -562 +546 @@
 static HBITMAP loadSplashImage(char* baseDir, char *fileName)
 {
-  HBITMAP hBitmap = NULLHANDLE;
-  char *langEnvVar;
-  char lang[4] = {0};
-  char country[4] = {0};
-  char *splashFile;
-
-  langEnvVar = getenv("LANG");
-  if(langEnvVar != NULL && strlen(langEnvVar) == 5) {
-    lang[0] = langEnvVar[0];
-    lang[1] = langEnvVar[1];
-    lang[2] = '\0';
-    country[0] = langEnvVar[3];
-    country[1] = langEnvVar[4];
-    country[2] = '\0';
-  }
-
-  splashFile = malloc ( strlen( baseDir ) + 256 );
-
-  sprintf( splashFile, "%s\\splash\\%s_%s\\%s", baseDir, lang, country, fileName );
-  hBitmap = MMLoadBitmap(hab, splashFile);
-  if(hBitmap == NULLHANDLE) {
-    sprintf( splashFile, "%s\\splash\\%s\\%s", baseDir, lang, fileName );
-    hBitmap = MMLoadBitmap(hab, splashFile);
-  }
-
-  if(hBitmap == NULLHANDLE) {
-    sprintf( splashFile, "%s\\splash\\%s", baseDir, fileName );
-    hBitmap = MMLoadBitmap(hab, splashFile);
-  }
-
-  // load bitmap from resource table
-  {
-    HPS     hps = WinGetScreenPS( HWND_DESKTOP );
-    hBitmap = GpiLoadBitmap(hps,
-                            (HMODULE)NULLHANDLE,
-                            BMP_SPLASH_BITMAP,
-                            0,
-                            0);
-    WinReleasePS( hps );
-  }
-
-
-  free (splashFile);
-  return hBitmap;
+        HBITMAP hBitmap = NULLHANDLE;
+        char *langEnvVar;
+        char lang[4] = {0};
+        char country[4] = {0};
+        char *splashFile;
+
+   langEnvVar = getenv("LANG");
+   if(langEnvVar != NULL && strlen(langEnvVar) == 5) {
+      lang[0] = langEnvVar[0];
+      lang[1] = langEnvVar[1];
+      lang[2] = '\0';
+      country[0] = langEnvVar[3];
+      country[1] = langEnvVar[4];
+      country[2] = '\0';
+   }
+
+   splashFile = malloc ( strlen( baseDir ) + 256 );
+
+   sprintf( splashFile, "%s\\splash\\%s_%s\\%s", baseDir, lang, country, fileName );
+   hBitmap = MMLoadBitmap(hab, splashFile);
+   if(hBitmap == NULLHANDLE) {
+      sprintf( splashFile, "%s\\splash\\%s\\%s", baseDir, lang, fileName );
+      hBitmap = MMLoadBitmap(hab, splashFile);
+   }
+
+   if(hBitmap == NULLHANDLE) {
+      sprintf( splashFile, "%s\\splash\\%s", baseDir, fileName );
+      hBitmap = MMLoadBitmap(hab, splashFile);
+   }
+
+   free (splashFile);
+   return hBitmap;
 }
 
@@ -630 +602 @@
 }
 
-
-/*****************************************************************************
- * Name      : char* findCommandOS2
- * Purpose   : Scan environment and system configuration for a given command
- * Parameter : char* pszCommand
- * Variables :
- * Result    : NULL if not found,
- *             fully qualified name otherwise
- * Remark    : The method is mainly used to determine which javaw.exe to start,
- *             Eclipse expects the following priorisation:
- *             1 - %ECLIPSE%\jre\bin\javaw.exe
- *             :
- *             :
- *             2 - HINIUSER\Java131\USER_HOME -> javaw.exe
- *             3 - HINIUSER\Java13\USER_HOME -> javaw.exe
- *             4 - %PATH% -> javaw.exe
- *
- * Author    : Patrick Haller 2002-07-10
- *****************************************************************************/
-
-char*  findCommandOS2( char* command )
-{
-  // @@@PH not yet implemented
-  return NULL;
-}
-
-/*
- * $Log: os2_eclipse.c,v $
- * Revision 1.1  2002/07/10 04:28:02  phaller
- * Added Mark Hale's launcher code
- *
- */