Changeset 690

Timestamp:

Jun 15, 2007, 6:02:06 PM (18 years ago)

Author:

Steven Levine

Message:

Commit more OpenWatcom compatibility updates

Location:

trunk/dll

Files:

• arccnrs.c (modified) (2 diffs)
• collect.c (modified) (2 diffs)
• dircnrs.c (modified) (2 diffs)
• init.c (modified) (6 diffs)
• mainwnd.c (modified) (2 diffs)
• select.c (modified) (8 diffs)
• treecnr.c (modified) (2 diffs)

trunk/dll/arccnrs.c

@@ -1121 +1121 @@
 {
   DIRCNRDATA *dcd;
-  DIRCNRDATA *dcdsrc;
   PSZ psz;
 
@@ -1937 +1936 @@
 {
   DIRCNRDATA *dcd = INSTDATA(hwnd);
-  DIRCNRDATA *dcdsrc;
 
   switch (msg) {

trunk/dll/collect.c

@@ -446 +446 @@
   ULONG size;
   DIRCNRDATA *dcd;
-  DIRCNRDATA *dcdsrc;
 
   switch (msg) {
@@ -913 +912 @@
 {
   DIRCNRDATA *dcd = INSTDATA(hwnd);
-  DIRCNRDATA *dcdsrc;
   ULONG size;
 

trunk/dll/dircnrs.c

@@ -573 +573 @@
 {
   DIRCNRDATA *dcd;
-  DIRCNRDATA *dcdsrc;
 
   switch (msg) {
@@ -1059 +1058 @@
 {
   DIRCNRDATA *dcd = INSTDATA(hwnd);
-  DIRCNRDATA *dcdsrc;
 
   switch (msg) {

trunk/dll/init.c

@@ -23 +23 @@
   30 Mar 07 GKY Defined golbals for removing GetPString for window class names
   21 Apr 07 GKY Find FM2Utils by path or utils directory eleminate fAddUtils global
+  15 Jun 07 SHL Make OpenWatcom compatible
 
 ***********************************************************************/
@@ -50 +51 @@
 #include "version.h"
 
+#ifdef __WATCOMC__
+#pragma alloc_text(INIT,LibMain,InitFM3DLL,DeInitFM3DLL)
+#else // __IBMC__
 #pragma alloc_text(INIT,_DLL_InitTerm,InitFM3DLL,DeInitFM3DLL)
+#endif
+
 #pragma alloc_text(INIT1,StartFM3,FindSwapperDat)
 
@@ -160 +166 @@
 }
 
-unsigned long _System _DLL_InitTerm(unsigned long hModule,
-                                    unsigned long ulFlag)
+#ifdef __WATCOMC__
+
+unsigned APIENTRY LibMain(unsigned hModule,
+                          unsigned ulFlag)
 {
   CHAR *env;
@@ -170 +178 @@
   switch (ulFlag) {
   case 0:
-    if (_CRT_init() == -1)
-      return 0UL;
+    // 14 Jun 07 SHL Already done for us
+    // if (_CRT_init() == -1)
+    //   return 0UL;
     FM3DllHandle = hModule;
     strcpy(stringfile, "FM3RES.STR");
@@ -265 +274 @@
       PrfCloseProfile(fmprof);
     DosError(FERR_ENABLEHARDERR);
+    // 14 Jun 07 SHL Already done for us
+    // _CRT_term();
+    break;
+  default:
+    return 0UL;
+  }
+  return 1UL;
+}
+
+#else // __IBMC__
+
+unsigned long _System _DLL_InitTerm(unsigned long hModule,
+                                    unsigned long ulFlag)
+{
+  CHAR *env;
+  CHAR stringfile[CCHMAXPATH];
+  FILESTATUS3 fsa;
+  APIRET rc;
+
+  switch (ulFlag) {
+  case 0:
+    if (_CRT_init() == -1)
+      return 0UL;
+    FM3DllHandle = hModule;
+    strcpy(stringfile, "FM3RES.STR");
+    env = getenv("FM3INI");
+    if (env) {
+      DosError(FERR_DISABLEHARDERR);
+      rc = DosQueryPathInfo(env, FIL_STANDARD, &fsa, (ULONG) sizeof(fsa));
+      if (!rc) {
+        if (fsa.attrFile & FILE_DIRECTORY) {
+          strcpy(stringfile, env);
+          if (stringfile[strlen(stringfile) - 1] != '\\')
+            strcat(stringfile, "\\");
+          strcat(stringfile, "FM3RES.STR");
+          DosError(FERR_DISABLEHARDERR);
+          if (DosQueryPathInfo(stringfile, FIL_STANDARD, &fsa, sizeof(fsa)))
+            strcpy(stringfile, "FM3RES.STR");
+        }
+      }
+    }
+    LoadStrings(stringfile);
+
+    DosError(FERR_DISABLEHARDERR);
+    /* strings here to prevent multiple occurences in DLL */
+    FM2Str = "FM/2";
+    FM3Str = "FM/3";
+    NullStr = "";
+    Default = "DEFAULT";
+    Settings = "SETTINGS";
+    WPProgram = "WPProgram";
+    FM3Folder = "<FM3_Folder>";
+    FM3Tools = "<FM3_Tools>";
+    DRM_OS2FILE = "DRM_OS2FILE";
+    DRM_FM2ARCMEMBER = "DRM_FM2ARCMEMBER";
+    DRF_FM2ARCHIVE = "DRF_FM2ARCHIVE";
+    DRMDRFLIST = "<DRM_OS2FILE,DRF_UNKNOWN>,"
+      "<DRM_DISCARD,DRF_UNKNOWN>," "<DRM_PRINT,DRF_UNKNOWN>";
+    DRMDRFOS2FILE = "<DRM_OS2FILE,DRF_UNKNOWN>";
+    DRMDRFFM2ARC = "<DRM_FM2ARCMEMBER,DRF_FM2ARCHIVE>";
+    DRM_FM2INIRECORD = "DRM_FM2INIRECORD";
+    DRF_FM2INI = "DRF_FM2INI";
+    SUBJECT = ".SUBJECT";
+    LONGNAME = ".LONGNAME";
+    HPFS = "HPFS";
+    JFS = "JFS";
+    CDFS = "CDFS";
+    ISOFS = "ISOFS";
+    FAT32 = "FAT32";
+    HPFS386 = "HPFS386";
+    CBSIFS = "CBSIFS";
+    NDFS32 = "NDFS32";
+    RAMFS = "RAMFS";
+    NTFS = "NTFS";
+    WC_OBJECTWINDOW    =  "WC_OBJECTWINDOW";
+    WC_BUBBLE          =  "WC_BUBBLE";
+    WC_TOOLBUTTONS     =  "WC_TOOLBUTTONS";
+    WC_DRIVEBUTTONS    =  "WC_DRIVEBUTTONS";
+    WC_DIRCONTAINER    =  "WC_DIRCONTAINER";
+    WC_DIRSTATUS       =  "WC_DIRSTATUS";
+    WC_TREECONTAINER   =  "WC_TREECONTAINER";
+    WC_TREEOPENBUTTON  =  "WC_TREEOPENBUTTON";
+    WC_TREESTATUS      =  "WC_TREESTATUS";
+    WC_MAINWND         =  "WC_MAINWND";
+    WC_MAINWND2        =  "WC_MAINWND2";
+    WC_AUTOVIEW        =  "WC_AUTOVIEW";
+    WC_LED             =  "WC_LED";
+    WC_COLLECTOR       =  "WC_COLLECTOR";
+    WC_COLSTATUS       =  "WC_COLSTATUS";
+    WC_STATUS          =  "WC_STATUS";
+    WC_TOOLBACK        =  "WC_TOOLBACK";
+    WC_DRIVEBACK       =  "WC_DRIVEBACK";
+    WC_ARCCONTAINER    =  "WC_ARCCONTAINER";
+    WC_ARCSTATUS       =  "WC_ARCSTATUS";
+    WC_MLEEDITOR       =  "WC_MLEEDITOR";
+    WC_INIEDITOR       =  "WC_INIEDITOR";
+    WC_SEEALL          =  "WC_SEEALL";
+    WC_NEWVIEW         =  "WC_NEWVIEW";
+    WC_SEESTATUS       =  "WC_SEESTATUS";
+    WC_VIEWSTATUS      =  "WC_VIEWSTATUS";
+    WC_ERRORWND        =  "WC_ERRORWND";
+    WC_MINITIME        =  "WC_MINITIME";
+    WC_DATABAR         =  "WC_DATABAR";
+
+    /* end of strings */
+    memset(&RGBBLACK, 0, sizeof(RGB2));
+    RGBGREY.bRed = RGBGREY.bGreen = RGBGREY.bBlue = (BYTE)204;
+    RGBGREY.fcOptions = 0;
+    FM3UL = *(ULONG *) FM3Str;
+    DEBUG_STRING = "Debug -- please report to author";
+    break;
+  case 1:
+    StopPrinting = 1;
+    if (fmprof)
+      PrfCloseProfile(fmprof);
+    DosError(FERR_ENABLEHARDERR);
     _CRT_term();
     break;
@@ -272 +397 @@
   return 1UL;
 }
+
+#endif // __IBMC__
 
 VOID APIENTRY DeInitFM3DLL(ULONG why)

trunk/dll/mainwnd.c

@@ -1026 +1026 @@
   USHORT id;
   TOOL *tool;
-  DIRCNRDATA *dcd;
 
   static HWND hwndMenu = (HWND) 0;
@@ -1616 +1615 @@
   USHORT id;
   CHAR szDrv[CCHMAXPATH];
-  DIRCNRDATA *dcd;
 
   static BOOL emphasized = FALSE;

trunk/dll/select.c

@@ -19 +19 @@
   19 Apr 07 SHL Sync with NumItemsToUnhilite mods
   12 May 07 SHL Use dcd->ulItemsToUnHilite
+  14 Jun 07 SHL SelectAll: make odd expression go away
 
 ***********************************************************************/
@@ -63 +64 @@
                  MPFROM2SHORT(FALSE, CRA_SELECTED));
       if (!all)
-          break;
+          break;
       // Count is one extra to ensure non-zero elsewhere
       // x is 0 based index
       if (x + 2 == ulItemsToUnHilite)
-        break;
+        break;
       if (list)
         AddToList(pci->szFileName, list, &numfiles, &numalloc);
@@ -199 +200 @@
               if (wildcard((strchr(Mask.pszMasks[x], '\\') ||
                             strchr(Mask.pszMasks[x], ':')) ?
-                           pci->szFileName : file, Mask.pszMasks[x], FALSE))
+                             pci->szFileName :
+                             file,
+                           Mask.pszMasks[x],
+                           FALSE)) {
                 markit = TRUE;
+              }
             }
             else {
-              if (wildcard((strchr(Mask.pszMasks[x], '\\') ||  //fixme always true?
-                            strchr(Mask.pszMasks[x], ':'), FALSE) ?
-                           pci->szFileName : file, Mask.pszMasks[x] + 1,
+              if (wildcard((strchr(Mask.pszMasks[x], '\\') ||
+                            strchr(Mask.pszMasks[x], ':')) ?
+                              pci->szFileName :
+                              file,
+                            Mask.pszMasks[x] + 1,
                            FALSE)) {
                 markit = FALSE;
@@ -212 +219 @@
             }
           }
-        }
+        } // for
       }
     }
@@ -503 +510 @@
   p = mask->szMaskCopy;
   strcpy(p, mask->szMask);
-  // memset(mask->pszMasks,0,sizeof(mask->pszMasks);    // fixme to be gone
   // Allow up to 25 masks - ignore extras
   for (x = 0; *p && x < 25; x++) {
@@ -767 +773 @@
 
   case IDM_SELECTSAMECONTENT:
-    // fixme
+    // fixme why?
     for (x = 0; x < numS; x++) {
       if (~pciSa[x]->rc.flRecordAttr & CRA_FILTERED &&
@@ -817 +823 @@
                 else if (memcmp(buf1, buf2, numread1))
                   break;
-              }                         // while
-            }                           // same len
+              } // while
+            } // same len
           }
         }
@@ -1188 +1194 @@
     FreeCnrs(Cnrs, numwindows);
     Runtime_Error(pszSrcFile, __LINE__, "expected two windows");
-    // fixme DosBeep(250,100);
     Notify(GetPString(IDS_COMPSEL2ORMORETEXT));
     return;

trunk/dll/treecnr.c

@@ -508 +508 @@
 {
   DIRCNRDATA *dcd;
-  DIRCNRDATA *dcdsrc;
 
   switch (msg) {
@@ -832 +831 @@
   static APPNOTIFY *apphead = NULL, *apptail = NULL;
   DIRCNRDATA *dcd = INSTDATA(hwnd);
-  DIRCNRDATA *dcdsrc;
 
   switch (msg) {