Changeset 1544 for trunk/dll/assoc.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/assoc.c (modified) (6 diffs)

trunk/dll/assoc.c

@@ -170 +170 @@
   CHAR env[ENVIRONMENT_SIZE];
   CHAR key[CCHMAXPATH];
+  CHAR *moder = "r";
 
   if (asshead)
@@ -175 +176 @@
   assloaded = TRUE;
   BldFullPathName(mask, pFM2SaveDirectory, PCSZ_ASSOCDAT);
-  fp = _fsopen(mask, "r", SH_DENYWR);
+  fp = xfsopen(mask, moder, SH_DENYWR, pszSrcFile, __LINE__, TRUE);
   pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
   if (!pszCmdLine) {
@@ -278 +279 @@
   FILE *fp;
   CHAR s[CCHMAXPATH + 14];
+  CHAR *modew = "w";
 
   if (!assloaded || !asshead)
@@ -304 +306 @@
   if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 1) == 2)
     return; //already gave error msg
-  fp = xfopen(s, "w", pszSrcFile, __LINE__);
+  fp = xfopen(s, modew, pszSrcFile, __LINE__, FALSE);
   if (fp) {
     fputs(GetPString(IDS_ASSOCFILETEXT), fp);
@@ -433 +435 @@
   ULONG offset;
   LINKASSOC *info;
+  CHAR *moderb = "rb";
 
   if (!assloaded)
@@ -462 +465 @@
       if (exclude && didmatch)
         didmatch = FALSE;
-      fp = _fsopen(datafile, "rb", SH_DENYNO);
+      fp = xfsopen(datafile, moderb, SH_DENYNO, pszSrcFile, __LINE__, TRUE);
       if (fp) {
         if (!checked) {