Changeset 1439 for trunk/dll/wrappers.c

Timestamp:

Jul 12, 2009, 11:57:04 PM (16 years ago)

Author:

Gregg Young

Message:

Changes to allow high mem loading of dll; Refactor .LONGNAME and .SUBJECT EA fetch to FetchCommonEAs. Add szFSType to FillInRecordFromFSA use to bypass EA scan and size formatting for tree container; Fix labels/FS type to work on scan on NOPRESCAN Drives; Fixed dbl directory names on restore of dir cnrs; (Tickets 47, 339, 363, 368, 369, 370)

File:

• trunk/dll/wrappers.c (modified) (5 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
 
 ***********************************************************************/
@@ -45 +46 @@
 #include "info.h"                       // driveflags
 #include "notebook.h"                   // fVerify
+#include "pathutil.h"                   // MaxComLineStrg
 
 // Data definitions
@@ -51 +53 @@
 #pragma data_seg(GLOBAL1)
 BOOL fNoLargeFileSupport;
+
+APIRET xDosQueryAppType(PCSZ pszName, PULONG pFlags)
+{
+  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
+}
 
 APIRET xDosAllocSharedMem(PPVOID ppb,
@@ -60 +86 @@
 
   rc = DosAllocSharedMem(ppb, pszName, cb, flag | OBJ_ANY);
-  DbgMsg(pszSrcFile, __LINE__, "ppb %p", *ppb);
+  //DbgMsg(pszSrcFile, __LINE__, "ppb %p", *ppb);
   if (rc)
     rc = DosAllocSharedMem(ppb, pszName, cb, flag);
@@ -68 +94 @@
 APIRET xDosAllocMem(PPVOID ppb,
                     ULONG cb,
-                    ULONG flag)
+                    ULONG flag,
+                    PCSZ pszSrcFile,
+                    UINT uiLineNumber)
 {
   APIRET rc;
 
   rc = DosAllocMem(ppb, cb, flag | OBJ_ANY);
-  DbgMsg(pszSrcFile, __LINE__, "ppb %p %x", *ppb, rc);
+  //DbgMsg(pszSrcFile, uiLineNumber, "ppb %p %x", *ppb, rc);
   if (rc)
     rc = DosAllocMem(ppb, cb, flag);
-  DbgMsg(pszSrcFile, __LINE__, "ppb %p", *ppb);
+  //DbgMsg(pszSrcFile, uiLineNumber, "ppb %p", *ppb);
   return rc;
 }