Eryk Wieliczko : comdlg32: GetSaveFileName: Don't append .* extension.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 276b83559f87dbc834c6e0c0ac57a995d48e5c20
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=276b83559f87dbc834c6e0c0ac...

Author: Eryk Wieliczko <ewdevel(a)gmail.com>
Date:   Mon Nov  1 12:35:43 2010 +0100

comdlg32: GetSaveFileName: Don't append .* extension.
(cherry picked from commit bd0fe7d26bafebc2e51ec54d354bf1e41bc3892e)

---

 dlls/comdlg32/filedlg.c |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c
index c689584..6778f17 100644
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -2256,14 +2256,11 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
             /* if no extension is specified with file name, then */
             /* attach the extension from file filter or default one */
             
-            WCHAR *filterExt = NULL;
+            const WCHAR *filterExt = NULL;
             LPWSTR lpstrFilter = NULL;
             static const WCHAR szwDot[] = {'.',0};
             int PathLength = lstrlenW(lpstrPathAndFile);
 
-            /* Attach the dot*/
-            lstrcatW(lpstrPathAndFile, szwDot);
-    
             /*Get the file extension from file type filter*/
             lpstrFilter = (LPWSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB,
                                              fodInfos->ofnInfos->nFilterIndex-1);
@@ -2272,9 +2269,18 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
                 filterExt = PathFindExtensionW(lpstrFilter);
 
             if ( filterExt && *filterExt ) /* attach the file extension from file type filter*/
-                lstrcatW(lpstrPathAndFile, filterExt + 1);
+                filterExt = filterExt + 1;
             else if ( fodInfos->defext ) /* attach the default file extension*/
-                lstrcatW(lpstrPathAndFile, fodInfos->defext);
+                filterExt = fodInfos->defext;
+
+            /* If extension is .*, ignore it */
+            if (filterExt[0] != '*')
+            {
+                /* Attach the dot*/
+                lstrcatW(lpstrPathAndFile, szwDot);
+                /* Attach the extension */
+                lstrcatW(lpstrPathAndFile, filterExt );
+            }
 
             /* In Open dialog: if file does not exist try without extension */
             if (!(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) && !PathFileExistsW(lpstrPathAndFile))