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

Timestamp:

Feb 25, 2003, 12:00:29 PM (22 years ago)

Author:

sandervl

Message:

Bugfix for WPS object creation

File:

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

trunk/src/user32/oslibres.cpp

@@ -1 @@
-/* $Id: oslibres.cpp,v 1.35 2003-02-24 17:02:43 sandervl Exp $ */
+/* $Id: oslibres.cpp,v 1.36 2003-02-25 11:00:29 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -751 +751 @@
    BOOL    fWin32App;
 
-   if(pszName) {
+   if(pszLink) {
        char *tmp;
        pszName = OSLibStripPath(pszLink);
@@ -763 +763 @@
        }
    }
+   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));
@@ -784 +788 @@
                                   ((pszArgs) ? strlen(pszArgs) : 0) +
                                   ((pszWorkDir) ? strlen(pszWorkDir) : 0));
+   if(pszSetupString == NULL) {
+       DebugInt3();
+       return FALSE;
+   }
 
    fWin32App = ODIN_IsWin32App(pszPath);
@@ -791 +799 @@
    }
    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, " ");