Wolfram Sang : comdlg32: Filedlg should not add extension if it contains a glob.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 3b53dce920f16816ec6408a8c048ca629fedfa1c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3b53dce920f16816ec6408a8c0...

Author: Wolfram Sang <wolfram(a)the-dreams.de>
Date:   Sat Jan 29 09:15:34 2011 +0100

comdlg32: Filedlg should not add extension if it contains a glob.
(cherry picked from commit 5cb4c55335c5e1192a6ac3b6f97db87f6344c7cd)

---

 dlls/comdlg32/filedlg.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c
index 6778f17..30dba64 100644
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -2273,8 +2273,8 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
             else if ( fodInfos->defext ) /* attach the default file extension*/
                 filterExt = fodInfos->defext;
 
-            /* If extension is .*, ignore it */
-            if (filterExt[0] != '*')
+            /* If extension contains a glob, ignore it */
+            if ( filterExt && !strchrW(filterExt, '*') && !strchrW(filterExt, '?') )
             {
                 /* Attach the dot*/
                 lstrcatW(lpstrPathAndFile, szwDot);