Changeset 1544 for trunk/dll/wrappers.c

Timestamp:

Sep 30, 2010, 3:00:59 PM (15 years ago)

Author:

Gregg Young

Message:

Changes to fopen and _fsopen to allow FM2 to be loaded in high memory

File:

• trunk/dll/wrappers.c (modified) (1 diff)

trunk/dll/wrappers.c

@@ -370 +370 @@
 }
 
+/**
+ * Wrapper for fopen it works around DosOpenL's failure to
+ * thunk properly so that fm2 can be loaded in high memory
+ * It also gives the option of reporting file open errors
+ * If fSilent is TRUE it fails silently; if FALSE it produces a
+ * runtime error dialog. Note pszMode must be passed on the stack
+ * to xfopen to avoid the thunking problem.
+ */
+
 FILE *xfopen(PCSZ pszFileName, PCSZ pszMode, PCSZ pszSrcFile,
-             UINT uiLineNumber)
-{
-  FILE *fp = fopen(pszFileName, pszMode);
-
-  if (!fp)
+             UINT uiLineNumber, BOOL fSilent)
+{
+  CHAR FileName[CCHMAXPATH];
+  FILE *fp;
+
+  strcpy(FileName, pszFileName);
+  fp = fopen(FileName, pszMode);
+
+  if (!fp && !fSilent)
     Runtime_Error(pszSrcFile, uiLineNumber, "fopen");
   return fp;
 }
 
+/**
+ * Wrapper for _fsopen it works around DosOpenL's failure to
+ * thunk properly so that fm2 can be loaded in high memory
+ * It also gives the option of reporting file open errors
+ * If fSilent is TRUE it fails silently; if FALSE it produces a
+ * runtime error dialog. Note pszMode must be passed on the stack
+ * to xfopen to avoid the thunking problem
+ */
+
 FILE *xfsopen(PCSZ pszFileName, PCSZ pszMode, INT fSharemode, PCSZ pszSrcFile,
-              UINT uiLineNumber)
-{
-  FILE *fp = _fsopen(pszFileName, pszMode, fSharemode);
-
-  if (!fp)
+              UINT uiLineNumber, BOOL fSilent)
+{
+  CHAR FileName[CCHMAXPATH];
+  FILE *fp;
+
+  strcpy(FileName, pszFileName);
+  fp = _fsopen(FileName, pszMode, fSharemode);
+
+  if (!fp && !fSilent)
     Runtime_Error(pszSrcFile, uiLineNumber, "_fsopen");
   return fp;