Andrew Eikum : user32: Don't use DLGTEMPLATE' s ExStyle when creating dialogs.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 897f11d33178f1c5b591ba1a516e79ec8834055e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=897f11d33178f1c5b591ba1a51...

Author: Andrew Eikum <aeikum(a)codeweavers.com>
Date:   Fri May  7 17:16:41 2010 -0500

user32: Don't use DLGTEMPLATE's ExStyle when creating dialogs.

---

 dlls/user32/dialog.c       |    1 +
 dlls/user32/tests/dialog.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c
index 79f5182..af241a2 100644
--- a/dlls/user32/dialog.c
+++ b/dlls/user32/dialog.c
@@ -498,6 +498,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate,
 
     if (!dlgTemplate) return 0;
     dlgTemplate = DIALOG_ParseTemplate32( dlgTemplate, &template );
+    template.exStyle = 0;  /* exstyle is ignored */
 
       /* Load menu */
 
diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c
index d18ba0e..b5d6271 100644
--- a/dlls/user32/tests/dialog.c
+++ b/dlls/user32/tests/dialog.c
@@ -1061,7 +1061,7 @@ static void test_MessageBoxFontTest(void)
         0x01,0x00,              /* Version */
         0xff,0xff,              /* Extended template marker */
         0x00,0x00,0x00,0x00,    /* Context Help ID */
-        0x00,0x00,0x00,0x00,    /* Extended style */
+        0x40,0x00,0x00,0x00,    /* Extended style (WM_EX_MDICHILD) */
         0xc0,0x00,0xc8,0x80,    /* Style (WS_SYSMENU|WS_CAPTION|WS_POPUP|DS_SETFONT|DS_MODALFRAME) */
         0x01,0x00,              /* Control count */
         0x00,0x00,              /* X */