Commit 854413e5 authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard

user32: Add a defwinproc flag when appropriate.

parent de3c19c2
...@@ -4924,7 +4924,7 @@ static void test_static_messages(void) ...@@ -4924,7 +4924,7 @@ static void test_static_messages(void)
static const struct message WmKeyDownComboSeq[] = static const struct message WmKeyDownComboSeq[] =
{ {
{ WM_KEYDOWN, sent|wparam|lparam, VK_DOWN, 0 }, { WM_KEYDOWN, sent|wparam|lparam, VK_DOWN, 0 },
{ WM_COMMAND, sent|wparam, MAKEWPARAM(1000, LBN_SELCHANGE) }, { WM_COMMAND, sent|wparam|defwinproc, MAKEWPARAM(1000, LBN_SELCHANGE) },
{ WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_COMBOBOX, CBN_SELENDOK) }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_COMBOBOX, CBN_SELENDOK) },
{ WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_COMBOBOX, CBN_SELCHANGE) }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_COMBOBOX, CBN_SELCHANGE) },
{ WM_CTLCOLOREDIT, sent|parent }, { WM_CTLCOLOREDIT, sent|parent },
...@@ -4954,6 +4954,7 @@ static LRESULT CALLBACK combobox_hook_proc(HWND hwnd, UINT message, WPARAM wPara ...@@ -4954,6 +4954,7 @@ static LRESULT CALLBACK combobox_hook_proc(HWND hwnd, UINT message, WPARAM wPara
msg.message = message; msg.message = message;
msg.flags = sent|wparam|lparam; msg.flags = sent|wparam|lparam;
if (defwndproc_counter) msg.flags |= defwinproc;
msg.wParam = wParam; msg.wParam = wParam;
msg.lParam = lParam; msg.lParam = lParam;
add_message(&msg); add_message(&msg);
...@@ -6838,6 +6839,7 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) ...@@ -6838,6 +6839,7 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam)
!lstrcmpiA(buf, "my_edit_class") || !lstrcmpiA(buf, "my_edit_class") ||
!lstrcmpiA(buf, "static") || !lstrcmpiA(buf, "static") ||
!lstrcmpiA(buf, "ListBox") || !lstrcmpiA(buf, "ListBox") ||
!lstrcmpiA(buf, "ComboBox") ||
!lstrcmpiA(buf, "MyDialogClass") || !lstrcmpiA(buf, "MyDialogClass") ||
!lstrcmpiA(buf, "#32770")) !lstrcmpiA(buf, "#32770"))
{ {
...@@ -6886,6 +6888,7 @@ static void CALLBACK win_event_proc(HWINEVENTHOOK hevent, ...@@ -6886,6 +6888,7 @@ static void CALLBACK win_event_proc(HWINEVENTHOOK hevent,
!lstrcmpiA(buf, "my_edit_class") || !lstrcmpiA(buf, "my_edit_class") ||
!lstrcmpiA(buf, "static") || !lstrcmpiA(buf, "static") ||
!lstrcmpiA(buf, "ListBox") || !lstrcmpiA(buf, "ListBox") ||
!lstrcmpiA(buf, "ComboBox") ||
!lstrcmpiA(buf, "MyDialogClass") || !lstrcmpiA(buf, "MyDialogClass") ||
!lstrcmpiA(buf, "#32770")) !lstrcmpiA(buf, "#32770"))
{ {
...@@ -10112,7 +10115,7 @@ static const struct message wm_lb_click_0[] = ...@@ -10112,7 +10115,7 @@ static const struct message wm_lb_click_0[] =
{ WM_IME_SETCONTEXT, sent|wparam|optional|parent, 0 }, { WM_IME_SETCONTEXT, sent|wparam|optional|parent, 0 },
{ WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_SETCONTEXT, sent|wparam|optional, 1 },
{ EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 },
{ WM_SETFOCUS, sent }, { WM_SETFOCUS, sent|defwinproc },
{ WM_DRAWITEM, sent|wparam|lparam|parent, ID_LISTBOX, 0x001142f2 }, { WM_DRAWITEM, sent|wparam|lparam|parent, ID_LISTBOX, 0x001142f2 },
{ WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_LISTBOX, LBN_SETFOCUS) }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_LISTBOX, LBN_SETFOCUS) },
...@@ -10132,7 +10135,7 @@ static const struct message wm_lb_click_0[] = ...@@ -10132,7 +10135,7 @@ static const struct message wm_lb_click_0[] =
{ WM_LBUTTONUP, sent|wparam|lparam, 0, 0 }, { WM_LBUTTONUP, sent|wparam|lparam, 0, 0 },
{ EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 },
{ WM_CAPTURECHANGED, sent|wparam|lparam, 0, 0 }, { WM_CAPTURECHANGED, sent|wparam|lparam|defwinproc, 0, 0 },
{ WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_LISTBOX, LBN_SELCHANGE) }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_LISTBOX, LBN_SELCHANGE) },
{ 0 } { 0 }
}; };
...@@ -10161,6 +10164,7 @@ static LRESULT WINAPI listbox_hook_proc(HWND hwnd, UINT message, WPARAM wp, LPAR ...@@ -10161,6 +10164,7 @@ static LRESULT WINAPI listbox_hook_proc(HWND hwnd, UINT message, WPARAM wp, LPAR
msg.message = message; msg.message = message;
msg.flags = sent|wparam|lparam; msg.flags = sent|wparam|lparam;
if (defwndproc_counter) msg.flags |= defwinproc;
msg.wParam = wp; msg.wParam = wp;
msg.lParam = lp; msg.lParam = lp;
add_message(&msg); add_message(&msg);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment