Module: wine Branch: master Commit: fc4b906d784db3681d1626d29becb886cf1a6d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4b906d784db3681d1626d29b...
Author: Jacek Caban jacek@codeweavers.com Date: Wed Apr 6 14:41:10 2016 +0200
user32: Don't enable owner in DIALOG_DoDialogBox.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/user32/controls.h | 1 - dlls/user32/dialog.c | 2 -- 2 files changed, 3 deletions(-)
diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 542bf39..4fdab62 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -241,7 +241,6 @@ typedef struct tagDIALOGINFO } DIALOGINFO;
#define DF_END 0x0001 -#define DF_OWNERENABLED 0x0002
extern DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) DECLSPEC_HIDDEN; extern INT DIALOG_DoDialogBox( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 2804ed2..b5ed902 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -601,7 +601,6 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, } if (IsWindowEnabled( owner )) { - flags |= DF_OWNERENABLED; disabled_owner = owner; EnableWindow( disabled_owner, FALSE ); } @@ -822,7 +821,6 @@ INT DIALOG_DoDialogBox( HWND hwnd ) } } } - if (dlgInfo->flags & DF_OWNERENABLED) EnableWindow( owner, TRUE ); retval = dlgInfo->idResult; DestroyWindow( hwnd ); return retval;