Changeset 773 for trunk/dll/mainwnd.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/mainwnd.c (modified) (4 diffs)

trunk/dll/mainwnd.c

@@ -35 +35 @@
   12 May 07 SHL Use dcd->ulItemsToUnHilite
   10 Jun 07 GKY Add CheckPmDrgLimit including IsFm2Window as part of work around PM drag limit
+  07 Aug 07 SHL Use BldQuotedFileName
 
 ***********************************************************************/
@@ -1810 +1811 @@
       li = DoFileDrop(hwnd,
                       NULL,
-                      TRUE, MPFROM2SHORT(TREE_CNR, CN_DROP), MPFROMP(&cnd));
+                      TRUE, MPFROM2SHORT(TREE_CNR, CN_DROP), MPFROMP(&cnd));
       CheckPmDrgLimit(cnd.pDragInfo);
       if (li) {
@@ -4109 +4110 @@
         else {
 
-          CHAR d1[] = "\"";
-          CHAR d2[] = "\"";
-
-          if (!needs_quoting(wa.szCurrentPath1))
-            *d1 = 0;
-          if (!needs_quoting(wa.szCurrentPath2))
-            *d2 = 0;
+          CHAR szPath1[CCHMAXPATH];
+          CHAR szPath2[CCHMAXPATH];
           runemf2(SEPARATE,
-                  HWND_DESKTOP,
-                  NULL,
-                  NULL,
-                  "%s %s%s%s %s%s%s",
+                  HWND_DESKTOP, NULL, NULL,
+                  "%s %s %s",
                   dircompare,
-                  d1, wa.szCurrentPath1, d1, d2, wa.szCurrentPath2, d2);
+                  BldQuotedFileName(szPath1, wa.szCurrentPath1),
+                  BldQuotedFileName(szPath2, wa.szCurrentPath2));
+          // CHAR d1[] = "\"";
+          // CHAR d2[] = "\"";
+          // if (!needs_quoting(wa.szCurrentPath1))
+          //   *d1 = 0;
+          // if (!needs_quoting(wa.szCurrentPath2))
+          //   *d2 = 0;
+          // runemf2(SEPARATE,
+          //      HWND_DESKTOP, NULL, NULL,
+          //      "%s %s%s%s %s%s%s",
+          //      dircompare,
+          //      d1, wa.szCurrentPath1, d1, d2, wa.szCurrentPath2, d2);
         }
       }
@@ -4818 +4824 @@
             DIRCNRDATA *dcd = NULL;
 
-            // 12 May 07 SHL fixme to understand?  backwards maybe? looking for DIR_CNR?
+            // 12 May 07 SHL fixme to understand? backwards maybe? looking for DIR_CNR?
             if (WinQueryWindowUShort(hwndCnr, QWS_ID) != TREE_CNR)
               dcd = INSTDATA(hwndCnr);