Changeset 5880 for trunk/src

Timestamp:

Jun 2, 2001, 2:22:02 PM (24 years ago)

Author:

sandervl

Message:

* empty log message *

File:

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

trunk/src/comdlg32/filedlg95.c

@@ -1388 +1388 @@
   nOpenAction = ONOPEN_BROWSE;
 
+#ifdef __WIN32OS2__
   /* @@@AH 2001-06-02 moved out of !OFN_NONVALIDATE block - needs to be set */
   if (FAILED (SHGetDesktopFolder(&lpsf))) return FALSE;
+#endif
 
   /* dont apply any checks with OFN_NOVALIDATE */
@@ -1404 +1406 @@
       goto ret;
     }
-
+#ifndef __WIN32OS2__
+    if (FAILED (SHGetDesktopFolder(&lpsf))) return FALSE;
+#endif
     lpszTemp1 = lpszTemp = lpstrPathAndFile;
     while (lpszTemp1)
@@ -1492 +1496 @@
     if(pidl) COMDLG32_SHFree(pidl);
   }
+#ifdef __WIN32OS2__
   else
   {
@@ -1499 +1504 @@
     nOpenAction = ONOPEN_OPEN;
   }
+#endif
 
 /*