Changeset 1846 for trunk/dll/undel.c

Timestamp:

Aug 12, 2015, 10:31:54 PM (10 years ago)

Author:

John Small

Message:

Ticket #524: Ensure no "highmem-unsafe" functions are called directly
Calls to unsafe Dos... functions have been changed to call the wrapped xDos... functions.

File:

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

trunk/dll/undel.c

@@ -107 +107 @@
     else {
       newstdout = -1;
-      if (DosDupHandle(fileno(stdout), &newstdout)) {
+      if (xDosDupHandle(fileno(stdout), &newstdout)) {
         saymsg(MB_CANCEL,
                hwnd,
@@ -116 +116 @@
       }
       oldstdout = fileno(stdout);
-      DosDupHandle(fileno(fp), &oldstdout);
+      xDosDupHandle(fileno(fp), &oldstdout);
       runemf2(SEPARATE | INVISIBLE | WINDOWED | BACKGROUND | WAIT,
               hwnd, pszSrcFile, __LINE__,
@@ -124 +124 @@
               path, (undelinfo->inclsubdirs) ? " /S" : NullStr);
       oldstdout = fileno(stdout);
-      DosDupHandle(newstdout, &oldstdout);
+      xDosDupHandle(newstdout, &oldstdout);
       DosClose(newstdout);
       fclose(fp);
@@ -176 +176 @@
     ;
   }
-  DosForceDelete(szTempFile);
+  xDosForceDelete(szTempFile);
   xfree(undelinfo, pszSrcFile, __LINE__);
   if (thmq) {
@@ -428 +428 @@
 
           FILE *fp;
-          CHAR s[CCHMAXPATH + 1];
-          CHAR *modew = "w";
-
-          DosForceDelete("\\FMUNDEL.CMD");
+          CHAR s[CCHMAXPATH + 1];
+          CHAR *modew = "w";
+
+          xDosForceDelete("\\FMUNDEL.CMD");
           fp = xfopen("\\FMUNDEL.CMD", modew, pszSrcFile, __LINE__, FALSE);
           if (fp) {