Changeset 1402 for trunk/dll/treecnr.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/treecnr.c (modified) (6 diffs)

trunk/dll/treecnr.c

@@ -65 +65 @@
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
   08 Mar 09 GKY Add WriteDetailsSwitches and use LoadDetailsSwitches to replace in line code
+  14 Mar 09 GKY Prevent execution of UM_SHOWME while drive scan is occuring
 
 ***********************************************************************/
@@ -624 +625 @@
       Fortify_BecomeOwner(mp1);
 #     endif
+      if (StubbyScanCount != 0) { //prevent treeswitch from hanging fm2 during startup GKY 3-14-09
+        DosSleep(50);
+        PostMsg(hwndTree, UM_SHOWME, mp1, MPVOID);
+      }
       dcd = INSTDATA(hwnd);
       if (dcd) {
@@ -1464 +1469 @@
           if (!DrgAccessDraginfo(pDInfo)) {
             Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                      "DrgAccessDraginfo");
+                      PCSZ_DRGACCESSDRAGINFO);
             return (MRFROM2SHORT(DOR_NODROP, 0));       /* Drop not valid */
           }
@@ -1593 +1598 @@
               if (li->type == DID_ERROR)
                   Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,
-                            "Drag & Drop Dialog");
+                            GetPString(IDS_DRAGDROPDIALOGTEXT));
               if (!li->type) {
                 FreeListInfo(li);
@@ -2088 +2093 @@
               CHAR s[33];
 
-              strcpy(s, "ICON");
+              strcpy(s, PCSZ_ICON);
               PrfQueryProfileData(fmprof,
                                   appname,
@@ -2095 +2100 @@
               if (flWindowAttr & CV_DETAIL) {
                 if (IsRoot(pci->pszFileName))
-                  strcpy(s, "TREE");
+                  strcpy(s, PCSZ_TREE);
                 else
-                  strcpy(s, "DETAILS");
+                  strcpy(s, Details);
               }
               OpenObject(pci->pszFileName, s, dcd->hwndFrame);