Changeset 6483 for trunk/src

Timestamp:

Aug 7, 2001, 11:35:36 PM (24 years ago)

Author:

sandervl

Message:

added code to create program objects

Location:

trunk/src/user32

Files:

• USER32.DEF (modified) (2 diffs)
• oslibres.cpp (modified) (3 diffs)
• win32class.cpp (modified) (2 diffs)

trunk/src/user32/USER32.DEF

@@ -1 @@
-; $Id: USER32.DEF,v 1.63 2001-07-30 12:02:15 sandervl Exp $
+; $Id: USER32.DEF,v 1.64 2001-08-07 21:35:35 sandervl Exp $
 
 LIBRARY USER32 INITINSTANCE TERMINSTANCE
@@ -701 +701 @@
     ; Do NOT change this ordinal
     _SetWindowAppearance@4                                       @2030 NONAME
+
+    _OSLibWinCreateObject@32                                     @2031 NONAME

trunk/src/user32/oslibres.cpp

@@ -1 @@
-/* $Id: oslibres.cpp,v 1.16 2001-07-16 19:32:55 sandervl Exp $ */
+/* $Id: oslibres.cpp,v 1.17 2001-08-07 21:35:36 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -14 +14 @@
 #include <os2wrap.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 
@@ -517 +518 @@
 //******************************************************************************
 //******************************************************************************
+char *OSLibStripPath(char *path)
+{
+  char *pszFilename;
+  char *pszFilename1;
+
+  pszFilename  = strrchr(path, '\\');                 /* find rightmost backslash */
+  pszFilename1 = strrchr(path, '/');                  /* find rightmost slash */
+  if(pszFilename > pszFilename1 && pszFilename != NULL)
+    return (++pszFilename);              /* return pointer to next character */
+
+  if (pszFilename1 != NULL)
+    return (++pszFilename1);              /* return pointer to next character */
+
+  return (path);                                     /* default return value */
+}
+//******************************************************************************
+//******************************************************************************
+void OSLibStripFile(char *path)
+{
+  char *pszFilename;
+  char *pszFilename1;
+
+   pszFilename  = strrchr(path, '\\');                 /* find rightmost backslash */
+   pszFilename1 = strrchr(path, '/');                  /* find rightmost slash */
+   if(pszFilename > pszFilename1 && pszFilename != NULL)
+     *pszFilename = 0;
+   else
+   if (pszFilename1 != NULL)
+     *pszFilename1 = 0;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API OSLibWinCreateObject(LPSTR pszPath, LPSTR pszArgs, 
+                                   LPSTR pszWorkDir, LPSTR pszLink, 
+                                   LPSTR pszDescription, LPSTR pszIcoPath,
+                                   INT iIcoNdx, BOOL fDesktop)
+{
+   HOBJECT hObject = 0;
+   LPSTR   pszName;
+   LPSTR   pszSetupString;
+   LPSTR   pszFolder;
+   char    szSystemDir[256];
+   char    temp[128];
+   char    szWorkDir[256];
+
+   if(pszName) {
+       char *tmp;
+       pszName = OSLibStripPath(pszLink);
+       tmp = pszName;
+       while(*tmp) {
+           if(*tmp == '.') {
+               *tmp = 0;
+               break;
+           }
+           tmp++;
+       }
+   }
+   dprintf(("OSLibWinCreateObject %s %s %s\n    %s %s %s %d %d", pszPath, pszArgs, 
+            pszWorkDir, pszName, pszDescription, pszIcoPath, iIcoNdx, fDesktop));
+   dprintf(("Link path %s", pszLink));
+
+   GetSystemDirectoryA(szSystemDir, sizeof(szSystemDir));
+   strcpy(szWorkDir, pszPath);
+   OSLibStripFile(szWorkDir);
+
+   pszSetupString = (LPSTR)malloc(128 + strlen(pszPath) + strlen(pszName) + 
+                                  strlen(pszLink) + 2*strlen(szSystemDir) +
+                                  strlen(szWorkDir) + strlen(pszIcoPath) +
+                                  ((pszArgs) ? strlen(pszArgs) : 0) + 
+                                  ((pszWorkDir) ? strlen(pszWorkDir) : 0)); 
+
+   sprintf(pszSetupString, "PROGTYPE=PM;OBJECTID=<%s>;EXENAME=%s\\PE.EXE;SET BEGINLIBPATH=%s;STARTUPDIR=%s;ICONFILE=%s;PARAMETERS=\"%s\"", pszName, szSystemDir, szSystemDir, szWorkDir, pszIcoPath, pszPath);
+   if(pszArgs && *pszArgs) {
+       strcat(pszSetupString, " ");
+       strcat(pszSetupString, pszArgs);
+   }
+   if(pszWorkDir && *pszWorkDir) {
+       sprintf(temp, " /OPT:[CURDIR=%s]", pszWorkDir);
+       strcat(pszSetupString, temp);
+   }
+   strcat(pszSetupString, ";");
+
+   if(fDesktop) {
+       dprintf(("Name = %s", pszName));
+       dprintf(("Setup string = %s", pszSetupString));
+       hObject = WinCreateObject("WPProgram", pszName, pszSetupString, 
+                                 "<WP_DESKTOP>", CO_REPLACEIFEXISTS);
+   }
+   else {
+       //e.g.: Link path k:\source\odin32\bin\win\Start Menu\Programs\Winamp\Winamp
+       OSLibStripFile(pszLink);
+       pszFolder = OSLibStripPath(pszLink);
+       sprintf(temp, "<FOLDER_%s>", pszFolder);
+       sprintf(szWorkDir, "OBJECTID=%s;", temp);
+       hObject = WinCreateObject("WPFolder", pszFolder, szWorkDir,
+                                 "<ODINFOLDER>", CO_UPDATEIFEXISTS);
+       hObject = WinCreateObject("WPProgram", pszName, pszSetupString, 
+                                 temp, CO_REPLACEIFEXISTS);
+   }
+// If SysCreateObject("WPProgram", "WarpMix", "<ICHAUDIO>",,
+//                    "PROGTYPE=PM;OBJECTID=<WARPMIX>;ICONFILE=WARPMIX.ICO;EXENAME="||bootDrive||"\MMOS2\WARPMIX.EXE")  
+
+   free(pszSetupString);
+   return hObject != 0;
+}
+//******************************************************************************
+//******************************************************************************
+

trunk/src/user32/win32class.cpp

@@ -1 @@
-/* $Id: win32class.cpp,v 1.25 2001-06-09 14:50:20 sandervl Exp $ */
+/* $Id: win32class.cpp,v 1.26 2001-08-07 21:35:36 sandervl Exp $ */
 /*
  * Win32 Window Class Managment Code for OS/2
@@ -85 +85 @@
   }
   if(!(wndclass->style & CS_GLOBALCLASS)) {
-        processId = GetCurrentProcess();
+        processId = GetCurrentProcessId();
   }
   menuNameA = 0;