Changeset 1394 for trunk/dll/collect.c

Timestamp:

Feb 5, 2009, 5:17:25 AM (17 years ago)

Author:

Steven Levine

Message:

Ticket 340: Convert GetPString to use STRINGTABLE.

Drop fm3dll.str and mkstr.exe from makefiles and wpi builders

Convert many functions to expect PCSZ arguments.
Correct walk, compare and dirsizes dialog setups to ignore saved dialog size
Drop copyright.c logic from makefile

File:

• trunk/dll/collect.c (modified) (6 diffs)

trunk/dll/collect.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2003, 2008 Steven H. Levine
+  Copyright (c) 2003, 2009 Steven H. Levine
 
   15 Oct 02 MK Baseline
@@ -292 +292 @@
     {
       USHORT id = WinQueryWindowUShort(hwnd, QWS_ID);
-      char *s = NULL;
+      PCSZ s = NULL;
 
       if (fOtherHelp) {
@@ -1384 +1384 @@
                MPVOID, MPFROM2SHORT(0, CMA_ERASE | CMA_REPOSITION));
     disable_menuitem(WinWindowFromID(WinQueryWindow(hwndMain, QW_PARENT),
-                                     FID_MENU), IDM_GREP, FALSE);
+                                     FID_MENU), IDM_GREP, FALSE);
     disable_menuitem(TreeMenu, IDM_GREP, FALSE);
     disable_menuitem(DirMenu, IDM_GREP, FALSE);
@@ -1938 +1938 @@
                  "Collector busy - please try again later");
         }
-        else {
-          GREPINFO *GrepInfo;
-
-          GrepInfo = xmallocz(sizeof(GREPINFO), pszSrcFile, __LINE__);
-          if (GrepInfo) {
-            GrepInfo->hwnd = &hwnd;
-            if (mp2)
-              GrepInfo->szGrepPath = mp2;
-            if (WinDlgBox(HWND_DESKTOP, hwnd, GrepDlgProc,
-                          FM3ModHandle, GREP_FRAME, (PVOID) GrepInfo)) {
-              free(GrepInfo);
-              dcd->amextracted = TRUE;  // Say busy scanning
-              disable_menuitem(WinWindowFromID
-                               (WinQueryWindow(hwndMain, QW_PARENT), FID_MENU),
-                               IDM_GREP, TRUE);
-              disable_menuitem(TreeMenu, IDM_GREP, TRUE);
-              disable_menuitem(DirMenu, IDM_GREP, TRUE);
-              PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
-            }
-            else
-              free(GrepInfo);
+        else {
+          GREPINFO *GrepInfo;
+
+          GrepInfo = xmallocz(sizeof(GREPINFO), pszSrcFile, __LINE__);
+          if (GrepInfo) {
+            GrepInfo->hwnd = &hwnd;
+            if (mp2)
+              GrepInfo->szGrepPath = mp2;
+            if (WinDlgBox(HWND_DESKTOP, hwnd, GrepDlgProc,
+                          FM3ModHandle, GREP_FRAME, (PVOID) GrepInfo)) {
+              free(GrepInfo);
+              dcd->amextracted = TRUE;  // Say busy scanning
+              disable_menuitem(WinWindowFromID
+                               (WinQueryWindow(hwndMain, QW_PARENT), FID_MENU),
+                               IDM_GREP, TRUE);
+              disable_menuitem(TreeMenu, IDM_GREP, TRUE);
+              disable_menuitem(DirMenu, IDM_GREP, TRUE);
+              PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
+            }
+            else
+              free(GrepInfo);
           }
         }
@@ -2378 +2378 @@
           numitems = DrgQueryDragitemCount(pDInfo);
           usOperation = pDInfo->usOperation;
-          if (usOperation == DO_DEFAULT)
-            usOperation = fCopyDefault ? DO_COPY : DO_MOVE;
+          if (usOperation == DO_DEFAULT)
+            usOperation = fCopyDefault ? DO_COPY : DO_MOVE;
           FreeDragInfoData(hwnd, pDInfo);
           saymsg(MB_ENTER | MB_ICONASTERISK,
@@ -2905 +2905 @@
               IDM_REMOVE,
               0};
-        char *szHelpString = NULL;
+        PCSZ szHelpString = NULL;