Changeset 3511 for trunk/src

Timestamp:

May 10, 2000, 3:12:46 PM (25 years ago)

Author:

sandervl

Message:

GetOpenFileNameW fixes

File:

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

trunk/src/comdlg32/filedlg95.c

@@ -1 @@
-/* $Id: filedlg95.c,v 1.8 2000-04-10 17:48:06 cbratschi Exp $*/
+/* $Id: filedlg95.c,v 1.9 2000-05-10 13:12:46 sandervl Exp $*/
 /*
  * COMMDLG - File Open Dialogs Win95 look and feel
@@ -350 +350 @@
   LPCSTR lpstrFilter = NULL;
   LPSTR lpstrCustomFilter = NULL;
+  LPWSTR lpstrFile = NULL;
+  LPWSTR lpstrInitialDir = NULL;
+  LPWSTR lpstrTitle = NULL;
   DWORD dwFlags;
 
@@ -420 +423 @@
   fodInfos->DlgInfos.dwDlgProp = 0;
 
+  /* allocate ansi filename buffer */
+  lpstrFile = ofn->lpstrFile;  
+  ofn->lpstrFile = MemAlloc(ofn->nMaxFile);
+
+  // convert initial dir & title (if necessary)
+  lpstrInitialDir = (LPWSTR)ofn->lpstrInitialDir;
+  if(lpstrInitialDir) {
+        ofn->lpstrInitialDir = MemAlloc(lstrlenW(ofn->lpstrInitialDir)+1);
+        lstrcpyWtoA((LPSTR)ofn->lpstrInitialDir, lpstrInitialDir);
+  }
+  lpstrTitle = (LPWSTR)ofn->lpstrTitle;
+  if(lpstrTitle) {
+        ofn->lpstrTitle = MemAlloc(lstrlenW(ofn->lpstrTitle)+1);
+        lstrcpyWtoA((LPSTR)ofn->lpstrTitle, lpstrTitle);
+  }
+
   switch(iDlgType)
   {
@@ -452 +471 @@
   fodInfos->ofnInfos->hInstance = hInstance;
   MemFree((LPVOID)(fodInfos));
+
+  /* filename */
+  lstrcpynAtoW(lpstrFile, (LPCSTR)ofn->lpstrFile, ofn->nMaxFile);
+  MemFree(ofn->lpstrFile);
+  ofn->lpstrFile = lpstrFile;
+
+  //free converted initial dir & title strings
+  if(lpstrInitialDir) {
+        MemFree((LPVOID)ofn->lpstrInitialDir);
+        ofn->lpstrInitialDir = (LPCWSTR)lpstrInitialDir;
+  }
+  if(lpstrTitle) {
+        MemFree((LPVOID)ofn->lpstrTitle);
+        ofn->lpstrTitle = (LPCWSTR)lpstrTitle;
+  }
   return ret;
 }