Changeset 1394 for trunk/dll/arccnrs.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/arccnrs.c (modified) (11 diffs)

trunk/dll/arccnrs.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2008 Steven H. Levine
+  Copyright (c) 2001, 2009 Steven H. Levine
 
   11 Jun 02 SHL Ensure archive name not garbage
@@ -212 +212 @@
       priority_normal();
       ret = runemf2(WaitChild->RunFlags, WaitChild->hwndClient,
-                    WaitChild->pszSrcFile, WaitChild->uiLineNumber,
+                    WaitChild->pszSrcFile, WaitChild->uiLineNumber,
                     WaitChild->pszDirectory, WaitChild->pszEnvironment,
                     WaitChild->formatstring, WaitChild->pszCmdLine);
@@ -1075 +1075 @@
     {
       USHORT id = WinQueryWindowUShort(hwnd, QWS_ID);
-      char *s = NULL;
+      PCSZ s = NULL;
 
       if (fOtherHelp) {
@@ -1599 +1599 @@
           return 0;
         }
-        sprintf(WaitChild->pszCmdLine, "%s %s %s",
-                dcd->info->exwdirs ? dcd->info->exwdirs :
+        sprintf(WaitChild->pszCmdLine, "%s %s %s",
+                dcd->info->exwdirs ? dcd->info->exwdirs :
                 dcd->info->extract,
                 BldQuotedFileName(szQuotedArcName, dcd->arcname),
@@ -1625 +1625 @@
         WaitChild->RunFlags = SEPARATE | ASYNCHRONOUS | WAIT |
                               (fArcStuffVisible ? 0 : BACKGROUND);
-        WaitChild->hwndClient = dcd->hwndClient;
-        WaitChild->msg = UM_ENTER;
-        WaitChild->uiLineNumber = __LINE__;
-        WaitChild->pszSrcFile = pszSrcFile;
+        WaitChild->hwndClient = dcd->hwndClient;
+        WaitChild->msg = UM_ENTER;
+        WaitChild->uiLineNumber = __LINE__;
+        WaitChild->pszSrcFile = pszSrcFile;
         WaitChild->pszDirectory = xstrdup(dcd->workdir, pszSrcFile, __LINE__);
         WaitChild->pszEnvironment = NULL;
@@ -1901 +1901 @@
                 }
               }
-              z = x;
-              runemf2(SEPARATE | WINDOWED | WAIT |
-                      (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
-                      hwnd, pszSrcFile, __LINE__,
-                      li->targetpath, NULL, "%s", pszCmdLine);
+              z = x;
+              runemf2(SEPARATE | WINDOWED | WAIT |
+                      (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
+                      hwnd, pszSrcFile, __LINE__,
+                      li->targetpath, NULL, "%s", pszCmdLine);
               *endofit = 0;
             } while (li->list[x]);
@@ -2531 +2531 @@
             pfi->flData = CFA_STRING | CFA_LEFT | CFA_FIREADONLY;
             pfi->flTitle = CFA_CENTER;
-            pfi->pTitleData = GetPString(IDS_FILENAMECOLTEXT);
+            pfi->pTitleData = (PSZ)GetPString(IDS_FILENAMECOLTEXT);
             pfi->offStruct = FIELDOFFSET(ARCITEM, pszDisplayName);
             pfiLastLeftCol = pfi;
@@ -2538 +2538 @@
               CFA_ULONG | CFA_RIGHT | CFA_SEPARATOR | CFA_FIREADONLY;
             pfi->flTitle = CFA_CENTER;
-            pfi->pTitleData = GetPString(IDS_OLDSIZECOLTEXT);
+            pfi->pTitleData = (PSZ)GetPString(IDS_OLDSIZECOLTEXT);
             pfi->offStruct = FIELDOFFSET(ARCITEM, cbFile);
             pfi = pfi->pNextFieldInfo;
@@ -2544 +2544 @@
               CFA_ULONG | CFA_RIGHT | CFA_SEPARATOR | CFA_FIREADONLY;
             pfi->flTitle = CFA_CENTER;
-            pfi->pTitleData = GetPString(IDS_NEWSIZECOLTEXT);
+            pfi->pTitleData = (PSZ)GetPString(IDS_NEWSIZECOLTEXT);
             pfi->offStruct = FIELDOFFSET(ARCITEM, cbComp);
             pfi = pfi->pNextFieldInfo;
@@ -2550 +2550 @@
               CFA_STRING | CFA_CENTER | CFA_SEPARATOR | CFA_FIREADONLY;
             pfi->flTitle = CFA_CENTER | CFA_FITITLEREADONLY;
-            pfi->pTitleData = GetPString(IDS_DATETIMECOLTEXT);
+            pfi->pTitleData = (PSZ)GetPString(IDS_DATETIMECOLTEXT);
             pfi->offStruct = FIELDOFFSET(ARCITEM, pszDate);
             pfi = pfi->pNextFieldInfo;
             pfi->flData = CFA_DATE | CFA_RIGHT | CFA_FIREADONLY;
             pfi->flTitle = CFA_CENTER;
-            pfi->pTitleData = GetPString(IDS_DATECOLTEXT);
+            pfi->pTitleData = (PSZ)GetPString(IDS_DATECOLTEXT);
             pfi->offStruct = FIELDOFFSET(ARCITEM, date);
             pfi = pfi->pNextFieldInfo;
             pfi->flData = CFA_TIME | CFA_RIGHT | CFA_FIREADONLY;
             pfi->flTitle = CFA_CENTER | CFA_FITITLEREADONLY;
-            pfi->pTitleData = GetPString(IDS_TIMECOLTEXT);
+            pfi->pTitleData = (PSZ)GetPString(IDS_TIMECOLTEXT);
             pfi->offStruct = FIELDOFFSET(ARCITEM, time);
             memset(&fii, 0, sizeof(FIELDINFOINSERT));
@@ -3585 +3585 @@
               IDM_FILTER,
               0};
-        char *szHelpString = NULL;
+        PCSZ szHelpString = NULL;