Changeset 9889 for trunk/src/user32/oslibres.cpp

Timestamp:

Mar 3, 2003, 5:37:27 PM (22 years ago)

Author:

sandervl

Message:

Move OSLibWinCreateObject to KERNEL32

File:

• trunk/src/user32/oslibres.cpp (modified) (2 diffs)

trunk/src/user32/oslibres.cpp

@@ -1 @@
-/* $Id: oslibres.cpp,v 1.36 2003-02-25 11:00:29 sandervl Exp $ */
+/* $Id: oslibres.cpp,v 1.37 2003-03-03 16:36:26 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -704 +704 @@
 //******************************************************************************
 //******************************************************************************
-static 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];
-   char    szPEGUILoaderPath[256];
-   BOOL    fWin32App;
-
-   if(pszLink) {
-       char *tmp;
-       pszName = OSLibStripPath(pszLink);
-       tmp = pszName;
-       while(*tmp) {
-           if(*tmp == '.') {
-               *tmp = 0;
-               break;
-           }
-           tmp++;
-       }
-   }
-   else {  
-       dprintf(("OSLibWinCreateObject: pszLink == NULL!!"));
-       return FALSE;
-   }
-   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));
-   if(pszWorkDir && *pszWorkDir) {
-       strcpy(szWorkDir, pszWorkDir);
-   }
-   else {
-       strcpy(szWorkDir, pszPath);
-       OSLibStripFile(szWorkDir);
-   }
-
-   ODIN_QueryLoaders(NULL, 0, szPEGUILoaderPath, sizeof(szPEGUILoaderPath), NULL, 0);
-
-   pszSetupString = (LPSTR)malloc(128 + strlen(pszPath) + strlen(pszName) +
-                                  strlen(pszLink) + strlen(szSystemDir) +
-                                  strlen(szWorkDir) + strlen(pszIcoPath) +
-                                  strlen(szPEGUILoaderPath) +
-                                  ((pszArgs) ? strlen(pszArgs) : 0) +
-                                  ((pszWorkDir) ? strlen(pszWorkDir) : 0));
-   if(pszSetupString == NULL) {
-       DebugInt3();
-       return FALSE;
-   }
-
-   fWin32App = ODIN_IsWin32App(pszPath);
-   if(!fWin32App) 
-   {//don't use the PE loader; use the program path directly
-        sprintf(pszSetupString, "PROGTYPE=PM;OBJECTID=<%s%s>;EXENAME=%s;SET BEGINLIBPATH=%s;STARTUPDIR=%s;ICONFILE=%s;PARAMETERS=", (fDesktop) ? "DESKTOP_" : "", pszName, pszPath, szSystemDir, szWorkDir, pszIcoPath);
-   }
-   else sprintf(pszSetupString, "PROGTYPE=PM;OBJECTID=<%s%s>;EXENAME=%s;SET BEGINLIBPATH=%s;STARTUPDIR=%s;ICONFILE=%s;PARAMETERS=\"%s\"", (fDesktop) ? "DESKTOP_" : "", pszName, szPEGUILoaderPath, szSystemDir, szWorkDir, pszIcoPath, pszPath);
-   if(pszArgs && *pszArgs) {
-       strcat(pszSetupString, " ");
-       strcat(pszSetupString, pszArgs);
-   }
-   strcat(pszSetupString, ";");
-
-   if(fDesktop) {
-       dprintf(("Name = %s", pszName));
-       dprintf(("Setup string = %s", pszSetupString));
-
-       //Use a different name for desktop objects
-       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);
-       if(hObject) {
-           hObject = WinCreateObject("WPProgram", pszName, pszSetupString,
-                                     temp, CO_REPLACEIFEXISTS);
-       }
-       else {
-           hObject = 1; //force silent failure
-       }
-   }
-
-   free(pszSetupString);
-   if(!hObject) {
-       dprintf(("ERROR: WinCreateObject failed!!"));
-   }
-   return hObject != 0;
-}
-//******************************************************************************
-//******************************************************************************
-