Changeset 773 for trunk/dll/comp.c

Timestamp:

Aug 7, 2007, 11:23:27 PM (18 years ago)

Author:

Steven Levine

Message:

Correct some compare directories collector nits
Use BldQuoted... functions
Move BldQuoted... functions near primary callers
Add RUNTYPE_MASK
Use Runtime_Error2 more

File:

• trunk/dll/comp.c (modified) (12 diffs)

trunk/dll/comp.c

@@ -28 +28 @@
   01 Aug 07 SHL Rework to remove vast amount of duplicate code
   03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
+  06 Aug 07 SHL Move BldFullPathName here to be near primary caller
+  07 Aug 07 SHL COMP_COLLECT: Avoid collecting empty entries when nothing selected
 
 ***********************************************************************/
@@ -49 +51 @@
 #include "fm3str.h"
 
-#pragma alloc_text(COMPAREDIR,FillCnrsThread,FillDirList,CompNames)
+#pragma alloc_text(COMPAREDIR,FillCnrsThread,FillDirList,CompNames,BldFullPathName)
 #pragma alloc_text(COMPAREDIR1,CompareDlgProc)
 #pragma alloc_text(COMPAREDIR2,SelectCnrsThread,ActionCnrThread)
@@ -64 +66 @@
 
 static PSZ pszSrcFile = __FILE__;
+
+/**
+ * Build full path name in callers buffer given directory
+ * name and filename
+ * @param pszPathName points to drive/directory if not NULL
+ * @returns pointer to full path name in caller's buffer
+ * @note OK for pszFullPathName and pszPathName to point to same buffer
+ *
+ */
+
+PSZ BldFullPathName(PSZ pszFullPathName, PSZ pszPathName, PSZ pszFileName)
+{
+  UINT c = pszPathName ? strlen(pszPathName) : 0;
+  if (c > 0) {
+    memcpy(pszFullPathName, pszPathName, c);
+    if (pszFullPathName[c - 1] != '\\')
+      pszFullPathName[c++] = '\\';
+  }
+  strcpy(pszFullPathName + c, pszFileName);
+  return pszFullPathName;
+}
 
 //=== SnapShot() Write directory tree to file and recurse if requested ===
@@ -361 +384 @@
 
   if (!cmp) {
-    Runtime_Error(pszSrcFile, __LINE__, "no data");
+    Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
     return;
   }
@@ -458 +481 @@
           case IDM_MOVE:
             if (hwndCnrS == WinWindowFromID(cmp->hwnd, COMP_RIGHTDIR))
-              // 02 Aug 07 SHL fixme to replace this kind of stuff with _makepath or equivalent
               BldFullPathName(szNewName, cmp->leftdir, pci->pszDisplayName);
               //sprintf(szNewName, "%s%s%s",
@@ -716 +738 @@
 
   if (!str || !*str) {
-    Runtime_Error(pszSrcFile, __LINE__, "no data");
+    Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
     return;
   }
@@ -818 +840 @@
 
   if (!cmp) {
-    Runtime_Error(pszSrcFile, __LINE__, "no data");
+    Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
     _endthread();
   }
@@ -1136 +1158 @@
           if (x >= 0) {
             // File appears on right side
-            BldFullPathName(szBuf, cmp->rightdir, filesl[r]->fname);
+            BldFullPathName(szBuf, cmp->rightdir, filesr[r]->fname);
             //sprintf(szBuf, "%s%s%s", cmp->rightdir,
             //        (cmp->rightdir[strlen(cmp->rightdir) - 1] == '\\') ?
@@ -1360 +1382 @@
 }
 
-#define hwndLeft  (WinWindowFromID(hwnd,COMP_LEFTDIR))
-#define hwndRight (WinWindowFromID(hwnd,COMP_RIGHTDIR))
+// fixme to be gone - use variable
+#define hwndLeft        (WinWindowFromID(hwnd,COMP_LEFTDIR))
+#define hwndRight       (WinWindowFromID(hwnd,COMP_RIGHTDIR))
 
 //=== CompareDlgProc() Compare directories dialog procedure ===
@@ -1368 +1391 @@
 {
   COMPARE *cmp;
-
-  static HPOINTER hptr = (HPOINTER) 0;
+  BOOL temp;
+
+  static HPOINTER hptr;
 
   switch (msg) {
@@ -2376 +2400 @@
     case COMP_COLLECT:
       cmp = INSTDATA(hwnd);
-      if (cmp) {
-
-        CHAR **listl, **listr = NULL;
-
+      if (!cmp)
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      else {
+        CHAR **listl;
+        CHAR **listr = NULL;
         if (!Collector) {
-
           SWP swp;
           HWND hwndC;
-
-          if (!fAutoTile && !ParentIsDesktop(hwnd, cmp->hwndParent) &&
-              (!fExternalCollector && !strcmp(realappname, FM3Str)))
+          if (!fAutoTile &&
+               !ParentIsDesktop(hwnd, cmp->hwndParent) &&
+               !fExternalCollector &&
+               !strcmp(realappname, FM3Str)) {
             GetNextWindowPos(cmp->hwndParent, &swp, NULL, NULL);
-          hwndC = StartCollector((fExternalCollector ||
-                                  strcmp(realappname, FM3Str)) ?
-                                 HWND_DESKTOP : cmp->hwndParent, 4);
+          }
+          hwndC = StartCollector(fExternalCollector ||
+                                 strcmp(realappname, FM3Str) ?
+                                   HWND_DESKTOP :
+                                   cmp->hwndParent,
+                                 4);
           if (hwndC) {
-            if (!fAutoTile && !ParentIsDesktop(hwnd, cmp->hwndParent) &&
-                (!fExternalCollector && !strcmp(realappname, FM3Str)))
-              WinSetWindowPos(hwndC, HWND_TOP, swp.x, swp.y,
-                              swp.cx, swp.cy, SWP_MOVE | SWP_SIZE |
-                              SWP_SHOW | SWP_ZORDER);
-            else if (!ParentIsDesktop(hwnd, cmp->hwndParent) && fAutoTile &&
-                     !strcmp(realappname, FM3Str))
+            if (!fAutoTile &&
+                !ParentIsDesktop(hwnd, cmp->hwndParent) &&
+                !fExternalCollector &&
+                !strcmp(realappname, FM3Str)) {
+              WinSetWindowPos(hwndC, HWND_TOP,
+                              swp.x, swp.y, swp.cx, swp.cy,
+                              SWP_MOVE | SWP_SIZE | SWP_SHOW | SWP_ZORDER);
+            }
+            else if (!ParentIsDesktop(hwnd, cmp->hwndParent) &&
+                     fAutoTile &&
+                     !strcmp(realappname, FM3Str)) {
               TileChildren(cmp->hwndParent, TRUE);
-            DosSleep(32); //05 Aug 07 GKY 64
+            }
+            DosSleep(32); // 05 Aug 07 GKY 64
             PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(COMP_COLLECT, 0), MPVOID);
             break;
@@ -2407 +2440 @@
         else
           StartCollector(cmp->hwndParent, 4);
-        {
-          BOOL temp;
-
-          temp = fSelectedAlways;
-          fSelectedAlways = TRUE;
-          listl = BuildList(hwndLeft);
-          if (!*cmp->rightlist)
-            listr = BuildList(hwndRight);
-          fSelectedAlways = temp;
-        }
+
+        temp = fSelectedAlways;
+        fSelectedAlways = TRUE;
+        listl = BuildList(hwndLeft);
+        if (!*cmp->rightlist)
+          listr = BuildList(hwndRight);
+        fSelectedAlways = temp;
+
         if (listl || listr) {
           if (Collector) {
-            if (listl) {
-              if (!PostMsg(Collector, WM_COMMAND,
-                           MPFROM2SHORT(IDM_COLLECTOR, 0), MPFROMP(listl)))
-                FreeList(listl);
-            }
-            if (listr) {
-              if (!PostMsg(Collector, WM_COMMAND,
-                           MPFROM2SHORT(IDM_COLLECTOR, 0), MPFROMP(listr)))
-                FreeList(listr);
+            // 07 Aug 07 SHL Avoid collected from empty list
+            if (listl && listl[0] && *listl[0]) {
+              if (PostMsg(Collector, WM_COMMAND,
+                          MPFROM2SHORT(IDM_COLLECTOR, 0), MPFROMP(listl)))
+                listl = NULL;           // Collector will free
+            }
+            if (listr && listr[0] && *listr[0]) {
+              if (PostMsg(Collector, WM_COMMAND,
+                          MPFROM2SHORT(IDM_COLLECTOR, 0), MPFROMP(listr)))
+                listr = NULL;           // Collector will free
             }
             WinSetWindowPos(WinQueryWindow(WinQueryWindow(Collector,
                                                           QW_PARENT),
-                                           QW_PARENT), HWND_TOP, 0, 0, 0, 0,
+                                           QW_PARENT),
+                            HWND_TOP, 0, 0, 0, 0,
                             SWP_ACTIVATE);
           }
-          else {
-            FreeList(listl);
-            FreeList(listr);
-          }
+          FreeList(listl);
+          FreeList(listr);
         }
       }