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

trunk/dll/saveclip.c

@@ -284 +284 @@
       {
         FILE *fp;
-        CHAR s[CCHMAXPATH + 14];
+        CHAR s[CCHMAXPATH + 14];
+        CHAR *moder = "r";
 
         BldFullPathName(s, pFM2SaveDirectory, PCSZ_PATTERNSDAT);
-        fp = _fsopen(s, "r", SH_DENYWR);
+        fp = xfsopen(s, moder, SH_DENYWR, pszSrcFile, __LINE__, TRUE);
         if (fp) {
           while (xfgets(s, 81, fp, pszSrcFile, __LINE__)) {
@@ -309 +310 @@
       CHAR szBuffer[CCHMAXPATH + 14];
       FILE *fp;
+      CHAR *modew = "w";
 
       sMax = (SHORT) WinSendDlgItemMsg(hwnd, SAV_LISTBOX,
@@ -316 +318 @@
         if (CheckDriveSpaceAvail(szBuffer, ullDATFileSpaceNeeded, 1) == 2)
           break; //already gave error msg
-        fp = xfopen(szBuffer, "w", pszSrcFile, __LINE__);
+        fp = xfopen(szBuffer, modew, pszSrcFile, __LINE__, FALSE);
         if (fp) {
           fputs(GetPString(IDS_LISTPATTERNTEXT), fp);
@@ -477 +479 @@
         if (!pci || (INT) pci == -1)
           Runtime_Error(pszSrcFile, __LINE__, NULL);
-        else {
-          fp = _fsopen(savename, "r+", SH_DENYWR);
-          if (!fp)
-            Runtime_Error(pszSrcFile, __LINE__, "_fsopen");
-          else {
+        else {
+          CHAR *moder = "r+";
+
+          fp = xfsopen(savename, moder, SH_DENYWR, pszSrcFile, __LINE__, FALSE);
+          if (fp) {
             fseek(fp, 0, SEEK_SET);
             if (WinQueryButtonCheckstate(hwnd, SAV_APPEND) == 0)
@@ -645 +647 @@
       {
         FILE *fp;
-        CHAR s[CCHMAXPATH + 14];
+        CHAR s[CCHMAXPATH + 14];
+        CHAR *moder = "r";
 
         BldFullPathName(s, pFM2SaveDirectory, PCSZ_PATTERNSDAT);
-        fp = _fsopen(s, "r", SH_DENYWR);
+        fp = xfsopen(s, moder, SH_DENYWR, pszSrcFile, __LINE__, TRUE);
         if (fp) {
           while (xfgets(s, 81, fp, pszSrcFile, __LINE__)) {
@@ -670 +673 @@
       CHAR szBuffer[CCHMAXPATH + 14];
       FILE *fp;
+      CHAR *modew = "w";
 
       sMax = (SHORT) WinSendDlgItemMsg(hwnd,
@@ -678 +682 @@
         if (CheckDriveSpaceAvail(szBuffer, ullDATFileSpaceNeeded, 1) == 2)
           break; //already gave error msg
-        fp = xfopen(szBuffer, "w", pszSrcFile, __LINE__);
+        fp = xfopen(szBuffer, modew, pszSrcFile, __LINE__, FALSE);
         if (fp) {
           fputs(GetPString(IDS_LISTPATTERNTEXT), fp);
@@ -830 +834 @@
         if (!list || !list[0])
           Runtime_Error(pszSrcFile, __LINE__, NULL);
-        else {
-          fp = _fsopen(savename, "r+", SH_DENYWR);
-          if (!fp)
-            Runtime_Error(pszSrcFile, __LINE__, "_fsopen");
-          else {
+        else {
+          CHAR *moder = "r+";
+          fp = xfsopen(savename, moder, SH_DENYWR, pszSrcFile, __LINE__, FALSE);
+          if (fp) {
             fseek(fp, 0, SEEK_SET);
             if (WinQueryButtonCheckstate(hwnd, SAV_APPEND) == 0)