Changeset 1402 for trunk/dll/mainwnd.c

Timestamp:

Mar 14, 2009, 6:17:59 PM (16 years ago)

Author:

Gregg Young

Message:

Remove variable aurgs from docopy & unlinkf (not used); Move more strings to PCSZs and string table; Move PCSZs to compile time initialization; Fix hang on startup caused by a drive scan and a dircnr scan trying to update a drive in the tree at the same time (related to the "treeswitch options); Code cleanup mainly removal of old printfs, SayMsgs, DbgMsg and unneeded %s.

File:

• trunk/dll/mainwnd.c (modified) (24 diffs)

trunk/dll/mainwnd.c

@@ -81 +81 @@
   07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
   08 Mar 09 GKY Renamed commafmt.h i18nutil.h
-  08 Mar 09 GKY Additional strings move to PCSZs in init.c
+  08 Mar 09 GKY Additional strings move to PCSZs & String Table
   08 Mar 09 GKY Add WriteDetailsSwitches and use LoadDetailsSwitches to replace in line code
 
@@ -207 +207 @@
 #pragma data_seg(GLOBAL2)
 HMODULE FM3ModHandle;
-CHAR *FM3Str;
+PCSZ FM3Str  = "FM/3";
 RGB2 RGBGREY;
 
@@ -427 +427 @@
       henum = WinBeginEnumWindows(hwndMain);
       while ((hwndC = WinGetNextWindow(henum)) != NULLHANDLE) {
-         //saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Tree = %lu\rExclude = %lu\rFound = %lu",hwndTree,exclude,hwndC);
-        if (hwndC != exclude && hwndC != hwndTree) {
+         if (hwndC != exclude && hwndC != hwndTree) {
           id = WinQueryWindowUShort(hwndC, QWS_ID);
           if (id) {
@@ -446 +445 @@
                                UM_CONTAINERDIR, MPFROMP(ret), MPVOID)) {
                   MakeValidDir(ret);
-                  //saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Tree = %lu\rExclude = %lu\rFound = %lu\r\"%s\"",hwndTree,exclude,hwndC,ret);
                   WinEndEnumWindows(henum);
                   return hwndC;
@@ -698 +696 @@
           if (haccelSaved == NULLHANDLE)
             Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__, "WinQueryAccelTable");
-          // else
-            // DbgMsg(pszSrcFile, __LINE__, "WinQueryAccelTable SAVED %x", haccelSaved);
         }
         if (haccelSaved != NULLHANDLE) {
@@ -712 +708 @@
               if (!WinSetAccelTable(hab, haccelDriveList, hwndFrame))
                 Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINSETACCELTABLE);
-              // else
-                // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_DRIVELIST %x %x", hwndFrame, haccelDriveList);
             }
             break;
@@ -725 +719 @@
               if (!WinSetAccelTable(hab, haccelSetupList, hwndFrame))
                 Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINSETACCELTABLE);
-              // else
-                // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_SETUPLIST %x %x", hwndFrame, haccelSetupList);
             }
             break;
@@ -738 +730 @@
               if (!WinSetAccelTable(hab, haccelCmdList, hwndFrame))
                 Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINSETACCELTABLE);
-              // else
-                // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_CMDLIST %x %x", hwndFrame, haccelCmdList);
             }
             break;
@@ -751 +741 @@
               if (!WinSetAccelTable(hab, haccelUserList, hwndFrame))
                 Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINSETACCELTABLE);
-              // else
-                // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_USERLIST %x %x", hwndFrame, haccelUserList);
             }
             break;
@@ -764 +752 @@
               if (!WinSetAccelTable(hab, haccelButtonList, hwndFrame))
                 Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINSETACCELTABLE);
-              // else
-                // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable MAIN_BUTTONLIST %x %x", hwndFrame, haccelButtonList);
             }
             break;
@@ -782 +768 @@
             if (!WinSetAccelTable(hab, haccelSaved, hwndFrame))
               Win_Error(hwndFrame, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_WINSETACCELTABLE);
-            // else
-              // DbgMsg(pszSrcFile, __LINE__, "WinSetAccelTable SAVED %x %x", hwndFrame, haccelSaved);
           }
           break;
@@ -865 +849 @@
   case WM_BEGINDRAG:
     id = WinQueryWindowUShort(hwnd, QWS_ID);
-    // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"%u %s %u",id,(id == CBID_EDIT) ? "TRUE" : "FALSE",WinQueryWindowUShort(WinQueryWindow(hwnd,QW_PARENT),QWS_ID) == MAIN_USERLIST);
     if (id == CBID_EDIT &&
-        WinQueryWindowUShort(WinQueryWindow(hwnd, QW_PARENT), QWS_ID) ==
+        WinQueryWindowUShort(WinQueryWindow(hwnd, QW_PARENT), QWS_ID) ==
         MAIN_USERLIST) {
 
@@ -875 +858 @@
       WinQueryWindowText(hwnd, CCHMAXPATH, path);
       bstrip(path);
-      // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Dragging: %s",path);
       if (*path && !IsRoot(path))
         DragOne(hwnd, (HWND) 0, path, FALSE);
@@ -2097 +2079 @@
           if (li->type == DID_ERROR)
                   Win_Error(DND_FRAME, HWND_DESKTOP, pszSrcFile, __LINE__,
-                            "Drag & Drop Dialog");
+                            GetPString(IDS_DRAGDROPDIALOGTEXT));
           if (!li->type) {
             FreeListInfo(li);
@@ -2952 +2934 @@
   }
 
-  fIsShutDownState = strcmp(pszStateName, GetPString(IDS_SHUTDOWNSTATE)) == 0;
+  fIsShutDownState = strcmp(pszStateName, PCSZ_SHUTDOWNSTATE) == 0;
   sprintf(szPrefix, "%s.", pszStateName);
 
@@ -3131 +3113 @@
 
   // If restoring shutdown state bypass no-prescan drives
-  fIsShutDownState = strcmp(pszStateName, GetPString(IDS_SHUTDOWNSTATE)) == 0;
+  fIsShutDownState = strcmp(pszStateName, PCSZ_SHUTDOWNSTATE) == 0;
   // Delete saved state if internally saved state
-  fDeleteState = strcmp(pszStateName, GetPString(IDS_FM2TEMPTEXT)) == 0;
+  fDeleteState = strcmp(pszStateName, PCSZ_FM2TEMPTEXT) == 0;
 
   //size = (ULONG)0;
@@ -3223 +3205 @@
           if (fIsShutDownState &&
               driveflags[toupper(*szDir) - 'A'] & DRIVE_NOPRESCAN) {
-            PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+            PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+            sprintf(szKey, "%sDirCnr.%lu", szPrefix, x);
+            WriteDetailsSwitches(szKey, NULL);
             continue;
           }
           if (fDeleteState)
             PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-          localdcd.ds.detailslongname = dsDirCnrDefault.detailslongname;  // Set default
-          sprintf(szKey, "%sDirCnr.%lu.DetailsLongname", szPrefix, x);
-          size = sizeof(BOOL);
-          if (PrfQueryProfileData(fmprof,
-                                  FM3Str,
-                                  szKey,
-                                  (PVOID) &localdcd.ds.detailslongname,
-                                  &size))
-          {
-            if (fDeleteState)
-              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-          }
-
           sprintf(szKey, "%sDirCnr.%lu", szPrefix, x);
           LoadDetailsSwitches(szKey, &localdcd.ds);
@@ -3267 +3238 @@
                 RestorePresParams(hwndPPSave, PCSZ_DIRCNR);
               }
-              sprintf(szKey, "%sDirCnr.%lu", szPrefix, x);
+              //sprintf(szKey, "%sDirCnr.%lu", szPrefix, x);
               RestorePresParams(hwndCnr, szKey);
               dcd = WinQueryWindowPtr(hwndCnr, QWL_USER);
@@ -4605 +4576 @@
       // Complain if attempting to use reserved name
       if (stricmp(szStateName, GetPString(IDS_STATETEXT)) == 0 ||
-          stricmp(szStateName, GetPString(IDS_FM2TEMPTEXT)) == 0)
+          stricmp(szStateName, PCSZ_FM2TEMPTEXT) == 0)
       {
         saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
                GetPString(IDS_WARNINGTEXT),
-               "\"%s\" is a reserved state name", szStateName);
+               GetPString(IDS_STATERESERVENAMETEXT), szStateName);
       }
       // Ignore request if blank
       else if (*szStateName) {
         BOOL fAbortOperation = FALSE;
-        if (!fNoSaveState && fSaveState && stricmp(szStateName, GetPString(IDS_SHUTDOWNSTATE)) == 0)
+        if (!fNoSaveState && fSaveState && stricmp(szStateName, PCSZ_SHUTDOWNSTATE) == 0)
          {
           if (saymsg(MB_YESNO | MB_DEFBUTTON2 | MB_ICONASTERISK, hwnd,
@@ -4635 +4606 @@
                 saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
                        GetPString(IDS_WARNINGTEXT),
-                       "\"%s\" state name add failed", szStateName);      // 15 Apr 07 SHL failed
+                       GetPString(IDS_STATEADDFAILEDTEXT), szStateName);      // 15 Apr 07 SHL failed
                 WinSetWindowText(hwndStatelist, GetPString(IDS_STATETEXT));
               }
@@ -4643 +4614 @@
                      hwnd,
                      GetPString(IDS_WARNINGTEXT),
-                     "State data save failed");
+                     GetPString(IDS_STATEDATASAVEFAILED));
               WinSetWindowText(hwndStatelist, GetPString(IDS_STATETEXT));
             }
@@ -5732 +5703 @@
     /* start remaining child windows */
     if (!fNoSaveState && fSaveState) {
-      PCSZ pszStatename = GetPString(IDS_SHUTDOWNSTATE);
+      PCSZ pszStatename = PCSZ_SHUTDOWNSTATE;
       PostMsg(MainObjectHwnd, UM_RESTORE, MPFROMP(pszStatename), MPVOID);
       if (!add_setup(pszStatename))
@@ -5887 +5858 @@
                           "MainWindowPos", WinQueryWindow(hwnd, QW_PARENT));
         if (!fNoSaveState && fSaveState)
-          SaveDirCnrState(hwnd, GetPString(IDS_SHUTDOWNSTATE));
+          SaveDirCnrState(hwnd, PCSZ_SHUTDOWNSTATE);
       }
     }
@@ -6344 +6315 @@
     {
       // Try to restore saved shutdown state
-      char *pszDefaultStateName = xstrdup(GetPString(IDS_SHUTDOWNSTATE),
-                                          pszSrcFile, __LINE__);
+      char *pszDefaultStateName = xstrdup(PCSZ_SHUTDOWNSTATE, pszSrcFile, __LINE__);
       if (pszDefaultStateName) {
         if (!PostMsg(MainObjectHwnd, UM_RESTORE, MPFROMP(pszDefaultStateName), MPVOID))