Changeset 544

Timestamp:

Dec 21, 2006, 6:41:59 AM (18 years ago)

Author:

root

Message:

Correct FillPathListBox regression

File:

• trunk/dll/walkem.c (modified) (11 diffs)

trunk/dll/walkem.c ¶

@@ -14 +14 @@
   29 Jul 06 SHL Use xfgets
   20 Oct 06 SHL Correct . .. check
+  06 Nov 06 SHL Oops - need to allow .. here
+  14 Nov 06 SHL Correct FillPathListBox regression
 
 ***********************************************************************/
@@ -264 +266 @@
             else
             {
-                /* if adding manual directory, remove from auto list if present */
+                /* if adding manual directory, remove from auto list if present */
                 info = ldirhead;
-                temp = NULL;
+                temp = NULL;
                 while (info)
                 {
@@ -393 +395 @@
 }
 
-VOID FillPathListBox(HWND hwnd, HWND hwnddrive, HWND hwnddir, CHAR * path,
+VOID FillPathListBox(HWND hwnd, HWND hwnddrive, HWND hwnddir, CHAR *pszPath,
                      BOOL nounwriteable)
 {
@@ -416 +418 @@
         WinSendMsg(hwnddir, LM_DELETEALL, MPVOID, MPVOID);
 
-    if (hwnddrive)
-    {
+    if (hwnddrive) {
+        // Fill drive listbox
         for (sDrive = 0; sDrive < 26; sDrive++)
         {
@@ -429 +431 @@
             }
         }
-        if (hwnddrive != hwnddir && path && isalpha(*path) && path[1] == ':')
-        {
-            *szDrive = toupper(*path);
+        if (hwnddrive != hwnddir && pszPath && isalpha(*pszPath) && pszPath[1] == ':')
+        {
+            *szDrive = toupper(*pszPath);
             WinSetWindowText(hwnddrive, szDrive);
         }
     }
 
-    if (hwnddir)
-    {
+    if (hwnddir) {
+        // Fill directory listbox
         sprintf(szTemp,
                 "%s%s*",
-                path,
-                (path[strlen(path) - 1] == '\\') ? "" : "\\");
+                pszPath,
+                (pszPath[strlen(pszPath) - 1] == '\\') ? "" : "\\");
         DosError(FERR_DISABLEHARDERR);
         if (!DosFindFirst(szTemp,
@@ -453 +455 @@
                           FIL_STANDARD))
         {
-            do
-            {
+            do {
                 if (findbuf.attrFile & FILE_DIRECTORY) {
-                    if (strlen(path) > 3 || path[1] != ':') {
-                        // Skip . and .. too
-                        if (findbuf.achName[0] != '.' ||
-                            (findbuf.achName[1] &&
-                             (findbuf.achName[1] != '.' ||
-                              findbuf.achName[2]))) {
+                    // Skip .. unless full path supplied
+                    if (strcmp(findbuf.achName, "..") ||
+                        strlen(pszPath) > 3 || pszPath[1] != ':') {
+                        // Skip . allow ..
+                        if (findbuf.achName[0] != '.' || findbuf.achName[1]) {
                             WinSendMsg(hwnddir,
                                        LM_INSERTITEM,
                                        MPFROM2SHORT(LIT_SORTASCENDING, 0),
                                        MPFROMP(findbuf.achName));
-                        }
+                        }
                     }
                 }
                 ulSearchCount = 1L;
-            } 
-            while (!DosFindNext(hDir,
-                                &findbuf,
-                                sizeof(FILEFINDBUF3),
-                                &ulSearchCount));
+            } while (!DosFindNext(hDir,
+                                  &findbuf,
+                                  sizeof(FILEFINDBUF3),
+                                  &ulSearchCount));
             DosFindClose(hDir);
         }
@@ -516 +515 @@
         if (!mp2)
         {
-            Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+            Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
             WinDismissDlg(hwnd, 0);
             break;
@@ -823 +822 @@
                 APIRET rc;
 
-                // *szBuffer = 0;
+                // *szBuffer = 0;
                 // WinQueryDlgItemText(hwnd,WALK_RECENT,CCHMAXPATH,szBuffer);
                 if (!*szBuffer)
@@ -846 +845 @@
                 }
                 if (rc)
-                    Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,"DosFindFirst");
+                    Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,"DosFindFirst");
                 else if (~findbuf.attrFile & FILE_DIRECTORY)
-                    Runtime_Error(pszSrcFile, __LINE__, "not a directory");
+                    Runtime_Error(pszSrcFile, __LINE__, "not a directory");
                 else
                 {
@@ -899 +898 @@
                 }
                 if (rc)
-                    Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,"DosFindFirst");
+                    Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,"DosFindFirst");
                 else if (~findbuf.attrFile & FILE_DIRECTORY)
-                    Runtime_Error(pszSrcFile, __LINE__, "not a directory");
+                    Runtime_Error(pszSrcFile, __LINE__, "not a directory");
                 else
                 {
@@ -1066 +1065 @@
                 MakeFullName(szBuff);
                 if (!add_udir(TRUE, szBuff))
-                    Runtime_Error(pszSrcFile, __LINE__, "add_udir");
+                    Runtime_Error(pszSrcFile, __LINE__, "add_udir");
                 else {
                     WinSendDlgItemMsg(hwnd,