Changeset 8279 for trunk/src

Timestamp:

Apr 17, 2002, 3:42:45 PM (23 years ago)

Author:

sandervl

Message:

PF: If application specifies full path in file dialog structure (and initial dir string is NULL), then change to the directory.

File:

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

trunk/src/comdlg32/filedlg95.c

@@ -1083 +1083 @@
 {
   LPITEMIDLIST pidlItemId = NULL;
-  
+  CHAR *dopstr = NULL;
+
   FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) lParam;
 
@@ -1089 +1090 @@
   fodInfos->ofnInfos->lpstrInitialDir, fodInfos->ofnInfos->lpstrFile);
 
+#ifdef __WIN32OS2__
+  /*@PF 
+  How can Wine miss this?? Very common situation for Windows apps!
+  If InitialDir is NULL and we have full blown path in lpstrFile we set
+  directory to it.
+
+  Q: What about Unicode?
+  */
+
+  if (fodInfos->ofnInfos->lpstrInitialDir == NULL && fodInfos->ofnInfos->lpstrFile && 
+    !PathIsRelativeA(fodInfos->ofnInfos->lpstrFile) &&
+    PathGetDriveNumberA(fodInfos->ofnInfos->lpstrFile) != -1)
+  {
+   dopstr = HEAP_strdupA(GetProcessHeap(), 0,fodInfos->ofnInfos->lpstrFile);      
+   *strrchr(dopstr,'\\') = '\0';
+   fodInfos->ofnInfos->lpstrInitialDir = dopstr;
+  }
+#endif
+
   /* Get the initial directory pidl */
-
   if(!(pidlItemId = GetPidlFromName(fodInfos->Shell.FOIShellFolder,fodInfos->ofnInfos->lpstrInitialDir)))
   {
@@ -1098 +1117 @@
     pidlItemId = GetPidlFromName(fodInfos->Shell.FOIShellFolder, path);
   }
-
+  
   /* Initialise shell objects */
   FILEDLG95_SHELL_Init(hwnd);
@@ -1114 +1133 @@
   COMDLG32_SHFree(pidlItemId);
 
+#ifdef __WIN32OS2__
+  /* Free dopstr */
+  if (dopstr)
+  {
+   fodInfos->ofnInfos->lpstrInitialDir = NULL;
+   HEAP_free(dopstr);
+  }  
+#endif
   return TRUE;
 }