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

trunk/dll/comp.c

@@ -221 +221 @@
   FILE *fp;
   CHAR *p;
+  CHAR *modew = "w";
 
   if (sf) {
@@ -235 +236 @@
         p++;
       }
-      fp = xfopen(sf->filename, "w", pszSrcFile, __LINE__);
+      fp = xfopen(sf->filename, modew, pszSrcFile, __LINE__, FALSE);
       if (fp) {
         fprintf(fp, "\"%s\"\n", sf->dirname);
@@ -261 +262 @@
   LONG numread1, numread2;
   CHAR s[1024], ss[1024], *p1, *p2;
+  CHAR *moderb = "rb";
 
   if (args) {
@@ -293 +295 @@
         sprintf(s, GetPString(IDS_COMPTOTEXT), fc.file2);
         AddToListboxBottom(fc.hwndList, s);
-        fp1 = _fsopen(fc.file1, "rb", SH_DENYNO);
+        fp1 = xfsopen(fc.file1, moderb, SH_DENYNO, pszSrcFile, __LINE__, TRUE);
         if (!fp1) {
           sprintf(s, GetPString(IDS_COMPCANTOPENTEXT), fc.file1);
@@ -300 +302 @@
         }
         else {
-          fp2 = _fsopen(fc.file2, "rb", SH_DENYNO);
+          fp2 = xfsopen(fc.file2, moderb, SH_DENYNO, pszSrcFile, __LINE__, TRUE);
           if (!fp2) {
             sprintf(s, GetPString(IDS_COMPCANTOPENTEXT), fc.file2);
@@ -1073 +1075 @@
           CHAR buf1[1024];
           CHAR buf2[1024];
-          HAB hab = WinQueryAnchorBlock(hwndCnrS);
+          HAB hab = WinQueryAnchorBlock(hwndCnrS);
+          CHAR *moderb = "rb";
 
           if (!*pciS->pszFileName ||
@@ -1082 +1085 @@
           }
 
-          fp1 = _fsopen(pciS->pszFileName, "rb", SH_DENYNO);
+          fp1 = xfsopen(pciS->pszFileName, moderb, SH_DENYNO, pszSrcFile, __LINE__, TRUE);
           if (!fp1) {
             errLineNo = __LINE__;
@@ -1088 +1091 @@
           }
           else {
-            fp2 = _fsopen(pciD->pszFileName, "rb", SH_DENYNO);
+            fp2 = xfsopen(pciD->pszFileName, moderb, SH_DENYNO, pszSrcFile, __LINE__, TRUE);
             if (!fp2) {
               errLineNo = __LINE__;
@@ -1566 +1569 @@
         FILE *fp;
         FILEFINDBUF4L fb4;
-        CHAR str[CCHMAXPATH * 2], *p;
+        CHAR str[CCHMAXPATH * 2], *p;
+        CHAR *moder = "r";
 
         memset(&fb4, 0, sizeof(fb4));
-        fp = fopen(cmp->rightlist, "r");
-        if (!fp)
+        fp = xfopen(cmp->rightlist, moder, pszSrcFile, __LINE__, FALSE);
+        /*if (!fp)
           Runtime_Error(pszSrcFile, __LINE__, "can not open %s (%d)",
-                        cmp->rightlist, errno);
-        else {
+                        cmp->rightlist, errno);*/
+        if (fp) {
           while (!feof(fp)) {
             // First get name of directory