Changeset 13847

Timestamp:

Mar 29, 2000, 5:19:36 PM (25 years ago)

Author:

cbratschi

Message:

wrong path fix

File:

• tags/trunk/src/comdlg32/filedlg95.c (modified) (6 diffs)

tags/trunk/src/comdlg32/filedlg95.c ¶

@@ -1 @@
-/* $Id: filedlg95.c,v 1.6 2000-03-28 15:26:42 cbratschi Exp $*/
+/* $Id: filedlg95.c,v 1.7 2000-03-29 15:19:36 cbratschi Exp $*/
 /*
  * COMMDLG - File Open Dialogs Win95 look and feel
@@ -1393 +1393 @@
         HANDLE hFile;
         WIN32_FIND_DATAA stffile;
-//CB: FindFirstFileA bug!
+
         /* browse if the user specified a directory */
-        hFile = FindFirstFileA(lpstrFileSpec, &stffile);
+        hFile = FindFirstFileA(lpstrPathAndFile,&stffile);
         if ( hFile != INVALID_HANDLE_VALUE )
         {
@@ -1406 +1406 @@
             // if there is an extention, then get the Pidl otherwise
             // we are going to need to add the extention
-           if(strrchr(lpstrFileSpec,'.'))
-             browsePidl = GetPidlFromName(fodInfos->Shell.FOIShellFolder,
+            if(strrchr(lpstrFileSpec,'.'))
+              browsePidl = GetPidlFromName(fodInfos->Shell.FOIShellFolder,
                                           lpstrFileSpec);
-           else
-             browsePidl=NULL;
+            else
+              browsePidl=NULL;
           }
         }
@@ -1643 +1643 @@
                         LPSTR lpstrFindFile;
                         WIN32_FIND_DATAA fd;
+                        HANDLE hFind;
 
                         lpstrFindFile = MemAlloc(strlen(lpstrPathAndFile)+strlen(lpstrExt));
                         strcpy(lpstrFindFile, lpstrPathAndFile);
                         strcat(lpstrFindFile, lpstrExt);
-                        if(FindFirstFileA(lpstrFindFile, &fd) != INVALID_HANDLE_VALUE)
-                                strcat(lpstrPathAndFile,lpstrExt);
+                        hFind = FindFirstFileA(lpstrFindFile,&fd);
+                        if(hFind != INVALID_HANDLE_VALUE)
+                        {
+                          strcat(lpstrPathAndFile,lpstrExt);
+                          FindClose(hFind);
+                        }
                         MemFree(lpstrFindFile);
                   }
@@ -1813 +1818 @@
   /* Find a Unique directory name */
   hHandle = FindFirstFileA(lpstrNewDir,&FindData);
-  if(hHandle !=INVALID_HANDLE_VALUE)
+  if(hHandle != INVALID_HANDLE_VALUE)
   {
     int i;
@@ -1859 +1864 @@
       MessageBoxA(hwnd,lpstrText, lpstrCaption, MB_OK | MB_ICONEXCLAMATION);
     }
-  }
+  } else FindClose(hHandle);
   return bRes;
 }