Changeset 1435 for trunk/dll

Timestamp:

Jun 26, 2009, 10:25:47 PM (16 years ago)

Author:

Steven Levine

Message:

Update for OpenWatcom 1.9 compatibility
Add wipfc support (see USE_WIPFC)
Drop unused dialog

Location:

trunk/dll

Files:

• dirsize.c (modified) (1 diff)
• filldir.c (modified) (1 diff)
• fm3res.dlg (modified) (1 diff)
• ipf/Makefile (modified) (1 diff)
• tools.c (modified) (1 diff)

trunk/dll/dirsize.c

@@ -332 +332 @@
     // easize = subdirectory usage in bytes
     CommaFmtULL(szCurDir, sizeof(szCurDir), pci->cbFile, 'K');
-    *szBar = NULL;
+    *szBar = 0;
     pci->pszLongName = NULL;
     memset(szBuf, 0, sizeof(szBuf));

trunk/dll/filldir.c

@@ -242 +242 @@
                                          DRIVE_VIRTUAL)) && fInitialDriveScan) {
               if (!(driveflags[toupper(*StubbyScan->pci->pszFileName) - 'A'] &
-                    ((fRScanNoWrite ? NULL : DRIVE_NOTWRITEABLE) |
-                     (fRScanSlow ? NULL : DRIVE_SLOW)))) {
+                    ((fRScanNoWrite ? 0 : DRIVE_NOTWRITEABLE) |
+                     (fRScanSlow ? 0 : DRIVE_SLOW)))) {
                 WinSendMsg(StubbyScan->hwndCnr, CM_EXPANDTREE, MPFROMP(StubbyScan->pci), MPVOID);
                 //DbgMsg(pszSrcFile, __LINE__, "expanded %x %s", StubbyScan->hwndCnr, StubbyScan->pci->pszFileName);

trunk/dll/fm3res.dlg

@@ -124 +124 @@
     END
 END
-
-#if 0 // 12 Jan 08 SHL fixme to be gone
-DLGTEMPLATE WALK_FRAME LOADONCALL MOVEABLE DISCARDABLE
-BEGIN
-    DIALOG  "FM/2: Select a directory", WALK_FRAME, -50, -86, 314, 168,
-            FS_MOUSEALIGN, FCF_TITLEBAR
-    BEGIN
-        CTEXT           "", WALK_HELP, 8, 158, 297, 8
-                        PRESPARAMS PP_FOREGROUNDCOLOR, 0x00FFFFFFL
-                        PRESPARAMS PP_BACKGROUNDCOLOR, 0x00000080L
-        ICON            DID_OK, -1, 178, 21, 20, 16
-        GROUPBOX        "User List:", -1, 168, 19, 143, 124, NOT WS_GROUP
-        GROUPBOX        "", -1, 4, 2, 308, 18, NOT WS_GROUP
-        ENTRYFIELD      "", WALK_PATH, 6, 4, 302, 10, WS_GROUP
-        LISTBOX         WALK_DRIVELIST, 4, 38, 24, 116, LS_NOADJUSTPOS |
-                        WS_GROUP
-                        PRESPARAMS PP_FONTNAMESIZE, "10.System Monospaced"
-        LISTBOX         WALK_DIRLIST, 30, 38, 134, 116, LS_NOADJUSTPOS |
-                        LS_HORZSCROLL
-        PUSHBUTTON      "Okay", DID_OK, 8, 20, 40, 14, WS_GROUP
-        PUSHBUTTON      "~Help", IDM_HELP, 64, 20, 40, 14, BS_NOPOINTERFOCUS
-        PUSHBUTTON      "Cancel", DID_CANCEL, 122, 20, 40, 14
-        CONTROL         "", WALK_RECENT, 168, 10, 143, 144, WC_COMBOBOX,
-                        CBS_DROPDOWN | LS_HORZSCROLL | WS_GROUP | WS_TABSTOP |
-                        WS_VISIBLE
-        LISTBOX         WALK_USERLIST, 171, 38, 137, 96, LS_NOADJUSTPOS |
-                        LS_HORZSCROLL | WS_GROUP
-        PUSHBUTTON      "~Add", WALK_ADD, 214, 22, 40, 14, BS_NOPOINTERFOCUS |
-                        WS_GROUP
-        PUSHBUTTON      "~Delete", WALK_DELETE, 265, 22, 40, 14,
-                        BS_NOPOINTERFOCUS
-    END
-END
-#endif // 12 Jan 08 SHL
 
 DLGTEMPLATE AD_FRAME LOADONCALL MOVEABLE DISCARDABLE

trunk/dll/ipf/Makefile

@@ -2 +2 @@
 # $Id$
 
-# Copyright (c) 2006, 2007 Steven H. Levine
+# Copyright (c) 2006, 2009 Steven H. Levine
 
 # 19 Oct 06 SHL Baseline
 # 15 Jun 07 SHL Update for OpenWatcom
+# 25 Apr 09 SHL Support wipfc
+
+!ifndef USE_WIPFC                       # if not defined on command line
+!ifdef %USE_WIPFC                       # if defined in environment
+USE_WIPFC = $(%USE_WIPFC)
+!endif
+!endif
+
+!ifdef USE_WIPFC
+IPFC = wipfc
+IFLAGS = -l en_US
+!else
+IPFC = ipfc
+IFLAGS = /CODEPAGE=850
+!endif
 
 all: fm3.hlp .symbolic
 
 fm3.hlp: *.ipf bitmaps\*.bmp ..\..\bitmaps\*.bmp
-  ipfc /CODEPAGE=850 fm3.ipf
+  set WIPFC=$(%WATCOM)\wipfc
+  $(IPFC) $(IFLAGS) fm3.ipf
   ren fm3.hlp fm3.hlp
 

trunk/dll/tools.c

@@ -736 +736 @@
         BOOL BadID = FALSE;
 
-        help[0] = text[0] = NULL;
+        help[0] = text[0] = 0;
         WinQueryDlgItemText(hwnd, ADDBTN_HELP, 80, help);
         WinQueryDlgItemText(hwnd, ADDBTN_TEXT, 80, text);