Changeset 3524 for trunk/src

Timestamp:

May 12, 2000, 8:07:43 PM (25 years ago)

Author:

sandervl

Message:

GetOpenFileNameA/W bugfixes

File:

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

trunk/src/comdlg32/filedlg95.c

@@ -1 @@
-/* $Id: filedlg95.c,v 1.9 2000-05-10 13:12:46 sandervl Exp $*/
+/* $Id: filedlg95.c,v 1.10 2000-05-12 18:07:43 sandervl Exp $*/
 /*
  * COMMDLG - File Open Dialogs Win95 look and feel
@@ -289 +289 @@
   /* Replace the NULL lpstrInitialDir by the current folder */
   lpstrInitialDir = ofn->lpstrInitialDir;
-  if(!lpstrInitialDir)
+  if(!lpstrInitialDir || *lpstrInitialDir == 0)
   {
     fodInfos->ofnInfos->lpstrInitialDir = MemAlloc(MAX_PATH);
@@ -429 +429 @@
   // convert initial dir & title (if necessary)
   lpstrInitialDir = (LPWSTR)ofn->lpstrInitialDir;
-  if(lpstrInitialDir) {
+  if(lpstrInitialDir && *lpstrInitialDir != 0) {
         ofn->lpstrInitialDir = MemAlloc(lstrlenW(ofn->lpstrInitialDir)+1);
         lstrcpyWtoA((LPSTR)ofn->lpstrInitialDir, lpstrInitialDir);
   }
+  else
+  /* Replace the NULL lpstrInitialDir by the current folder */
+  if(!lpstrInitialDir || *lpstrInitialDir == 0)
+  {
+        ofn->lpstrInitialDir = MemAlloc(MAX_PATH);
+        GetCurrentDirectoryA(MAX_PATH,(LPSTR)ofn->lpstrInitialDir);
+  }
+
   lpstrTitle = (LPWSTR)ofn->lpstrTitle;
   if(lpstrTitle) {