Changeset 1438 for trunk/dll/systemf.c

Timestamp:

Jun 28, 2009, 10:47:00 PM (16 years ago)

Author:

Gregg Young

Message:

Improved drivebar changes; Added AddBackslashToPath() to remove repeatative code. replaced "
" with PCSZ variable; ANY_OBJ added the DosAlloc... (experimental)

File:

• trunk/dll/systemf.c (modified) (5 diffs)

trunk/dll/systemf.c

@@ -201 +201 @@
             strcpy(listfile, pTmpDir ? pTmpDir : pFM2SaveDirectory);
             MakeTempName(listfile, "$FM2LI$T", 2);
-            /*if (listfile[strlen(listfile) - 1] != '\\')
-              strcat(listfile, "\\");
-            sprintf(&listfile[strlen(listfile)], "%s.%03x",
-                    LISTTEMPROOT, (clock() & 4095));*/
             fp = xfopen(listfile, "w",pszSrcFile,__LINE__);
             if (fp) {
@@ -670 +666 @@
   PID sessPID;
   BOOL wasquote;
-  char *pszPgm, *pszArgs = NULL;
-  char szObject[32] = "", *p, szSavedir[CCHMAXPATH];
+  char *p, *pszPgm, *pszArgs = NULL;
+  char szObject[32] = "";
+  char szSavedir[CCHMAXPATH];
   BOOL useTermQ = FALSE;
   char szTempdir[CCHMAXPATH];
@@ -704 +701 @@
     hwnd = HWND_DESKTOP;
 
-  rc = DosAllocMem((PVOID)&pszPgm,
-                   MaxComLineStrg,
-                   PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
+  rc = xDosAllocMem((PVOID)&pszPgm,
+                    MaxComLineStrg,
+                    PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
   if (rc) {
     Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY));
@@ -752 +749 @@
       temp = *p;
       if (temp) {
-        rc = DosAllocMem((PVOID)&pszArgs,
-                         MaxComLineStrg * 2,
-                         PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
+        rc = xDosAllocMem((PVOID)&pszArgs,
+                          MaxComLineStrg * 2,
+                          PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
         if (rc)
           Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY));
@@ -886 +883 @@
       if (~type & FULLSCREEN)
         type |= WINDOWED;
-      rc = DosAllocMem((PVOID) & pszArgs, MaxComLineStrg * 2,
-                       PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
+      rc = xDosAllocMem((PVOID) & pszArgs, MaxComLineStrg * 2,
+                        PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
       if (rc) {
         Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY));