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

trunk/dll/mainwnd2.c

@@ -17 +17 @@
   30 Mar 07 GKY Remove GetPString for window class names
   12 May 07 SHL Pass ulItemsToUnHilite to UnHilite
+  07 Aug 07 SHL Use BldQuotedFileName
 
 ***********************************************************************/
@@ -124 +125 @@
       /*
        * Calculate the position of the client rectangle.
-       * Otherwise,  we'll see a lot of redraw when we move the
+       * Otherwise, we'll see a lot of redraw when we move the
        * client during WM_FORMATFRAME.
        */
@@ -498 +499 @@
         }
         else {
-
-          CHAR *d1 = "\"", *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 = "\"", *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);
         }
       }