Changeset 9306 for trunk/src

Timestamp:

Sep 30, 2002, 11:40:37 AM (23 years ago)

Author:

sandervl

Message:

PF: if lpstrInitialDir is not a dir but a filename

File:

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

trunk/src/comdlg32/filedlg95.c

@@ -1112 +1112 @@
 
   Q: What about Unicode?
+ 
   */
 
@@ -1132 +1133 @@
     pidlItemId = GetPidlFromName(fodInfos->Shell.FOIShellFolder, path);
   }
-  
+#ifdef __WIN32OS2__
+  /* @PF Another WINE hole. If lpstrInitialDir is not a dir but a filename
+   skip it and use current directory. */
+
+  else
+  {
+     DWORD dwAttr = GetFileAttributesA(fodInfos->ofnInfos->lpstrInitialDir);
+     if(dwAttr != -1 )
+     {
+       if (!(dwAttr & FILE_ATTRIBUTE_DIRECTORY))
+       {
+          char path[MAX_PATH];
+
+          GetCurrentDirectoryA(MAX_PATH,path);
+          COMDLG32_SHFree(pidlItemId);
+          pidlItemId = GetPidlFromName(fodInfos->Shell.FOIShellFolder, path);
+       }
+     }
+  }
+#endif
   /* Initialise shell objects */
   FILEDLG95_SHELL_Init(hwnd);
@@ -2886 +2906 @@
         
         TRACE("%p, %p\n", psf, pidl);
-        
-        ret = IShellFolder_GetAttributesOf( psf, 1, &pidl, &uAttr );
-        
+
+        ret = IShellFolder_GetAttributesOf( psf, 1, &pidl, &uAttr );
+
         TRACE("-- 0x%08lx 0x%08lx\n", uAttr, ret);
         /* see documentation shell 4.1*/