commit 3b53dce920f16816ec6408a8c048ca629fedfa1c
author Wolfram Sang <wolfram@the-dreams.de> Sat Jan 29 09:15:34 2011 +0100
committer Alexandre Julliard <julliard@winehq.org> Thu Apr 07 12:53:04 2011 +0200
tree f753cf76cf546a97f2a4c2ce6f9bda20529d8187
parent 92258b69a657b719db2df8c6d85a1e99b6b6a253

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

dlls/comdlg32/filedlg.c

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 @@
             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);