Changeset 5878 for trunk/src

Timestamp:

Jun 2, 2001, 1:29:31 PM (24 years ago)

Author:

achimha

Message:

correct open action in OFN_NOVALIDATE mode, fixes FrameMaker 5.5 missing graphics file dialog

File:

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

trunk/src/comdlg32/filedlg95.c

@@ -1388 +1388 @@
   nOpenAction = ONOPEN_BROWSE;
 
+  /* @@@AH 2001-06-02 moved out of !OFN_NONVALIDATE block - needs to be set */
+  if (FAILED (SHGetDesktopFolder(&lpsf))) return FALSE;
+
   /* dont apply any checks with OFN_NOVALIDATE */
   if(!(fodInfos->ofnInfos->Flags & OFN_NOVALIDATE))
@@ -1402 +1405 @@
     }
 
-    if (FAILED (SHGetDesktopFolder(&lpsf))) return FALSE;
-  
     lpszTemp1 = lpszTemp = lpstrPathAndFile;
     while (lpszTemp1)
@@ -1490 +1491 @@
     }
     if(pidl) COMDLG32_SHFree(pidl);
+  }
+  else
+  {
+    // @@@AH 2001-06-02 when we are in OFN_NOVALIDATE mode, the action
+    // must be to open the specified file when pressing open button
+    TRACE("OFN_NOVALIDATE mode, set open action to ONOPEN_OPEN\n");
+    nOpenAction = ONOPEN_OPEN;
   }