Changeset 1498 for trunk/dll/extract.c

Timestamp:

Jan 18, 2010, 1:57:01 AM (16 years ago)

Author:

Gregg Young

Message:

Changes to get FM2 to compile with the latest watcom 1.9 beta (mostly type casts of CHAR CONSTANT * to CHAR *). Changes to get the environment settings working everywhere again (broken by the change that moved commands to the INI); Added an environment size variable (set to 2048 which was the largest I found hard coded). Still need to find everywhere the environment size is set and use this variable.

File:

• trunk/dll/extract.c (modified) (12 diffs)

trunk/dll/extract.c

@@ -5 +5 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004, 2008 Steven H. Levine
+  Copyright (c) 2004, 2010 Steven H. Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
@@ -18 +18 @@
                 for the extract path.
   07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
+  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
 
 ***********************************************************************/
@@ -120 +121 @@
                         QWL_USER, (PVOID) oldproc);
       size = sizeof(BOOL);
-      PrfQueryProfileData(fmprof, FM3Str, "RememberExt",
+      PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "RememberExt",
                           (PVOID) & fRemember, &size);
       size = sizeof(BOOL);
-      PrfQueryProfileData(fmprof, FM3Str, "DirectoryExt",
+      PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "DirectoryExt",
                           (PVOID) & fDirectory, &size);
       size = sizeof(BOOL);
-      PrfQueryProfileData(fmprof, FM3Str, "FileNamePathExt",
+      PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "FileNamePathExt",
                           (PVOID) & fFileNameExtPath, &size);
       WinCheckButton(hwnd, EXT_REMEMBER, fRemember);
@@ -142 +143 @@
         WinSetDlgItemText(hwnd, EXT_FILENAME, arcdata->arcname);
       else
-        WinSetDlgItemText(hwnd, EXT_FILENAME, GetPString(IDS_EXTVARIOUSTEXT));
+        WinSetDlgItemText(hwnd, EXT_FILENAME, (CHAR *) GetPString(IDS_EXTVARIOUSTEXT));
 
       if (fFileNameExtPath && arcdata->arcname) {
@@ -176 +177 @@
         CHAR textdir[CCHMAXPATH];
 
-        PrfQueryProfileString(fmprof, FM3Str, "Ext_ExtractDir", NULL, textdir, sizeof(textdir));
+        PrfQueryProfileString(fmprof, (CHAR *) FM3Str, "Ext_ExtractDir", NULL, textdir, sizeof(textdir));
         if (*textdir && !IsFile(textdir))
           strcpy(arcdata->extractdir, textdir);
-        PrfQueryProfileString(fmprof, FM3Str, "Ext_Mask", NULL, textdir, sizeof(textdir));
+        PrfQueryProfileString(fmprof, (CHAR *) FM3Str, "Ext_Mask", NULL, textdir, sizeof(textdir));
         WinSetDlgItemText(hwnd, EXT_MASK, textdir);
       }
@@ -223 +224 @@
         fRemember = FALSE;
         size = sizeof(BOOL);
-        PrfQueryProfileData(fmprof, FM3Str, "Ext_WDirs",
+        PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "Ext_WDirs",
                             (PVOID) &fRemember, &size);
         if (fRemember)
@@ -249 +250 @@
         BOOL fRemember = WinQueryButtonCheckstate(hwnd, EXT_REMEMBER);
         size = sizeof(BOOL);
-        PrfWriteProfileData(fmprof, FM3Str, "RememberExt",
+        PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "RememberExt",
                             (PVOID) &fRemember, size);
         WinSendDlgItemMsg(hwnd, EXT_FILENAMEEXT, BM_SETCHECK,
@@ -260 +261 @@
         BOOL fDirectory = WinQueryButtonCheckstate(hwnd, EXT_AWDIRS);
         size = sizeof(BOOL);
-        PrfWriteProfileData(fmprof, FM3Str, "DirectoryExt",
+        PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "DirectoryExt",
                             (PVOID) &fDirectory, size);
 
@@ -281 +282 @@
         BOOL fRemember = WinQueryButtonCheckstate(hwnd, EXT_REMEMBER);
         size = sizeof(BOOL);
-        PrfWriteProfileData(fmprof, FM3Str, "FileNamePathExt",
+        PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "FileNamePathExt",
                             fRemember ? FALSE : (PVOID) &fFileNameExtPath, size);
         if (fRemember) {
@@ -346 +347 @@
     case EXT_FILENAME:
       if (SHORT2FROMMP(mp1) == EN_KILLFOCUS)
-        WinSetDlgItemText(hwnd, EXT_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
+        WinSetDlgItemText(hwnd, EXT_HELP, (CHAR *) GetPString(IDS_ARCDEFAULTHELPTEXT));
       if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
-        WinSetDlgItemText(hwnd, EXT_HELP, GetPString(IDS_ARCARCNAMEHELPTEXT));
+        WinSetDlgItemText(hwnd, EXT_HELP, (CHAR *) GetPString(IDS_ARCARCNAMEHELPTEXT));
       break;
 
     case EXT_DIRECTORY:
       if (SHORT2FROMMP(mp1) == EN_KILLFOCUS)
-        WinSetDlgItemText(hwnd, EXT_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
+        WinSetDlgItemText(hwnd, EXT_HELP, (CHAR *) GetPString(IDS_ARCDEFAULTHELPTEXT));
       if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
-        WinSetDlgItemText(hwnd, EXT_HELP,
-                          GetPString(IDS_EXTEXTRACTDIRHELPTEXT));
+        WinSetDlgItemText(hwnd, EXT_HELP, (CHAR *) GetPString(IDS_EXTEXTRACTDIRHELPTEXT));
       break;
 
     case EXT_COMMAND:
       if (SHORT2FROMMP(mp1) == EN_KILLFOCUS)
-        WinSetDlgItemText(hwnd, EXT_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
+        WinSetDlgItemText(hwnd, EXT_HELP, (CHAR *) GetPString(IDS_ARCDEFAULTHELPTEXT));
       if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
-        WinSetDlgItemText(hwnd, EXT_HELP, GetPString(IDS_ARCCMDHELPTEXT));
+        WinSetDlgItemText(hwnd, EXT_HELP, (CHAR *) GetPString(IDS_ARCCMDHELPTEXT));
       break;
 
     case EXT_MASK:
       if (SHORT2FROMMP(mp1) == EN_KILLFOCUS)
-        WinSetDlgItemText(hwnd, EXT_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
+        WinSetDlgItemText(hwnd, EXT_HELP, (CHAR *) GetPString(IDS_ARCDEFAULTHELPTEXT));
       if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
-        WinSetDlgItemText(hwnd, EXT_HELP, GetPString(IDS_ARCMASKHELPTEXT));
+        WinSetDlgItemText(hwnd, EXT_HELP, (CHAR *) GetPString(IDS_ARCMASKHELPTEXT));
       break;
 
@@ -430 +430 @@
           strcpy(lastextractpath, s);
           if (fRemember) {
-            PrfWriteProfileString(fmprof, FM3Str, "Ext_ExtractDir", s);
+            PrfWriteProfileString(fmprof, (CHAR *) FM3Str, "Ext_ExtractDir", s);
             fRemember = WinQueryButtonCheckstate(hwnd, EXT_WDIRS);
             size = sizeof(BOOL);
-            PrfWriteProfileData(fmprof, FM3Str, "Ext_WDirs",
+            PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Ext_WDirs",
                                 (PVOID) &fRemember, size);
             fRemember = TRUE;
@@ -446 +446 @@
             strcpy(arcdata->masks, s);
             if (fRemember)
-              PrfWriteProfileString(fmprof, FM3Str, "Ext_Mask", s);
+              PrfWriteProfileString(fmprof, (CHAR *) FM3Str, "Ext_Mask", s);
             arcdata->ret = 1;
             WinDismissDlg(hwnd, 1);