From: Esme Povirk esme@codeweavers.com
--- dlls/user32/dialog.c | 1 + dlls/user32/tests/msg.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index d13594324e0..3e49d66a099 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -825,6 +825,7 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) } } retval = dlgInfo->idResult; + NtUserNotifyWinEvent( EVENT_SYSTEM_DIALOGEND, hwnd, OBJID_WINDOW, 0 ); NtUserDestroyWindow( hwnd ); return retval; } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9ee0965023e..9b2d71c679a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1873,7 +1873,7 @@ static const struct message WmModalDialogSeq[] = { { WM_IME_SETCONTEXT, sent|parent|wparam|defwinproc|optional, 1 }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|parent|defwinproc }, - { EVENT_SYSTEM_DIALOGEND, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, + { EVENT_SYSTEM_DIALOGEND, winevent_hook|wparam|lparam, 0, 0 }, { HCBT_DESTROYWND, hook }, { 0x0090, sent|optional }, { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, @@ -1902,7 +1902,7 @@ static const struct message WmModalDialogSeq_2[] = { { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|optional, 0, 0 }, { WM_CHANGEUISTATE, sent|optional }, { WM_UPDATEUISTATE, sent|optional }, - { EVENT_SYSTEM_DIALOGEND, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, + { EVENT_SYSTEM_DIALOGEND, winevent_hook|wparam|lparam, 0, 0 }, { HCBT_DESTROYWND, hook }, { 0x0090, sent|optional }, { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, @@ -14493,7 +14493,7 @@ static const struct message WmQuitDialogSeq[] = { { WM_SETFONT, sent }, { WM_INITDIALOG, sent }, { WM_CHANGEUISTATE, sent|optional }, - { EVENT_SYSTEM_DIALOGEND, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, + { EVENT_SYSTEM_DIALOGEND, winevent_hook|wparam|lparam, 0, 0 }, { HCBT_DESTROYWND, hook }, { 0x0090, sent|optional }, /* Vista */ { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 },