Changeset 1476 for trunk/dll/wrappers.c

Timestamp:

Nov 15, 2009, 11:11:36 PM (16 years ago)

Author:

Gregg Young

Message:

Rework xDosQueryAppType to remove HIMEM ifdef

File:

• trunk/dll/wrappers.c (modified) (2 diffs)

trunk/dll/wrappers.c

@@ -17 +17 @@
   25 Dec 08 GKY Add code to allow write verify to be turned off on a per drive basis
   17 Jun 09 SHL Correct missing rc set
-  12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
+  12 Jul 09 GKY Add xDosQueryAppType and xDosAlloc... to allow FM/2 to load in high memory
+  15 Nov 09 GKY Rework xDosQueryAppType to remove HIMEM ifdefs
 
 ***********************************************************************/
@@ -57 +58 @@
 {
   APIRET rc;
-# ifdef HIMEM
-  char *pszPgm;
-
-  rc = DosAllocMem((PVOID)&pszPgm,
-                   MaxComLineStrg,
-                   PAG_COMMIT | PAG_READ | PAG_WRITE);
-  if (rc) {
-    Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile,
-              __LINE__, GetPString(IDS_OUTOFMEMORY));
-    return -1;
-  }
-  strcpy(pszPgm, pszName);
-  rc = DosQueryAppType(pszPgm, pFlags);
-  DosFreeMem(pszPgm);
-  return rc;
-# else
-  rc = DosQueryAppType(pszName, pFlags);
-  return rc;
-# endif
+  CHAR szPgm[CCHMAXPATH];
+
+  strcpy(szPgm, pszName);
+  rc = DosQueryAppType(szPgm, pFlags);
+  return rc;
 }