Changeset 6517 for trunk/src

Timestamp:

Aug 11, 2001, 2:03:36 PM (24 years ago)

Author:

sandervl

Message:

work dir change for creating objects

Location:

trunk/src/user32

Files:

• dde.cpp (modified) (3 diffs)
• oslibres.cpp (modified) (3 diffs)

trunk/src/user32/dde.cpp

@@ -1 @@
-/* $Id: dde.cpp,v 1.13 2001-07-31 07:56:48 sandervl Exp $ */
+/* $Id: dde.cpp,v 1.14 2001-08-11 12:03:35 sandervl Exp $ */
 
 /*
@@ -208 +208 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API DdeKeepStringHandle(DWORD arg1, HSZ  arg2)
-{
-    dprintf(("USER32:  DdeKeepStringHandle\n"));
+BOOL WIN32API DdeKeepStringHandle(DWORD arg1, HSZ arg2)
+{
+    dprintf(("USER32: DdeKeepStringHandle %x %x", arg1, arg2));
 
     return O32_DdeKeepStringHandle(arg1, arg2);
@@ -218 +218 @@
 HDDEDATA WIN32API DdeNameService( DWORD arg1, HSZ  arg2, HSZ  arg3, UINT  arg4)
 {
-    dprintf(("USER32:  DdeNameService\n"));
+    dprintf(("USER32: DdeNameService %x %x %x %x", arg1, arg2, arg3, arg4));
 
     return O32_DdeNameService(arg1, arg2, arg3, arg4);

trunk/src/user32/oslibres.cpp

@@ -1 @@
-/* $Id: oslibres.cpp,v 1.17 2001-08-07 21:35:36 sandervl Exp $ */
+/* $Id: oslibres.cpp,v 1.18 2001-08-11 12:03:36 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -580 +580 @@
 
    GetSystemDirectoryA(szSystemDir, sizeof(szSystemDir));
-   strcpy(szWorkDir, pszPath);
-   OSLibStripFile(szWorkDir);
+   if(pszWorkDir && *pszWorkDir) {
+       strcpy(szWorkDir, pszWorkDir);
+   }
+   else {
+       strcpy(szWorkDir, pszPath);
+       OSLibStripFile(szWorkDir);
+   }
 
    pszSetupString = (LPSTR)malloc(128 + strlen(pszPath) + strlen(pszName) + 
@@ -593 +598 @@
        strcat(pszSetupString, " ");
        strcat(pszSetupString, pszArgs);
-   }
-   if(pszWorkDir && *pszWorkDir) {
-       sprintf(temp, " /OPT:[CURDIR=%s]", pszWorkDir);
-       strcat(pszSetupString, temp);
    }
    strcat(pszSetupString, ";");