Module: wine Branch: master Commit: 17789c16369c06f4d740d80c868d13a90c7164dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=17789c16369c06f4d740d80c86...
Author: Andrew Eikum aeikum@codeweavers.com Date: Tue May 18 16:02:41 2010 -0500
Revert "user32: Don't use DLGTEMPLATE's ExStyle when creating dialogs.".
This reverts commit 897f11d33178f1c5b591ba1a516e79ec8834055e.
---
dlls/user32/dialog.c | 1 - dlls/user32/tests/dialog.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index af241a2..79f5182 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -498,7 +498,6 @@ 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 b5d6271..d18ba0e 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 */ - 0x40,0x00,0x00,0x00, /* Extended style (WM_EX_MDICHILD) */ + 0x00,0x00,0x00,0x00, /* Extended style */ 0xc0,0x00,0xc8,0x80, /* Style (WS_SYSMENU|WS_CAPTION|WS_POPUP|DS_SETFONT|DS_MODALFRAME) */ 0x01,0x00, /* Control count */ 0x00,0x00, /* X */