Module: wine Branch: master Commit: 10f5a733c10d35549b50ed8b713f4f7ac4776979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f5a733c10d35549b50ed8b71... Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Sat Oct 19 18:23:32 2013 +0300 comctl32/tests: Make subclass.c compile with -D__WINESRC__. --- dlls/comctl32/tests/subclass.c | 64 ++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index e32919b..d5bfeef 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -166,7 +166,7 @@ static void ok_sequence(const struct message *expected, const char *context) flush_sequence(); } -static LRESULT WINAPI WndProc1(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +static LRESULT WINAPI wnd_proc_1(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct message msg; @@ -175,12 +175,12 @@ static LRESULT WINAPI WndProc1(HWND hwnd, UINT message, WPARAM wParam, LPARAM lP msg.procnum = 1; add_message(&msg); } - return DefWindowProc(hwnd, message, wParam, lParam); + return DefWindowProcA(hwnd, message, wParam, lParam); } -static WNDPROC origProc3; -static LRESULT WINAPI WndProc3(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +static WNDPROC orig_proc_3; +static LRESULT WINAPI wnd_proc_3(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct message msg; @@ -189,10 +189,10 @@ static LRESULT WINAPI WndProc3(HWND hwnd, UINT message, WPARAM wParam, LPARAM lP msg.procnum = 3; add_message(&msg); } - return CallWindowProc(origProc3, hwnd, message, wParam, lParam); + return CallWindowProcA(orig_proc_3, hwnd, message, wParam, lParam); } -static LRESULT WINAPI WndProcSub(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, UINT_PTR uldSubclass, DWORD_PTR dwRefData) +static LRESULT WINAPI wnd_proc_sub(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, UINT_PTR uldSubclass, DWORD_PTR dwRefData) { struct message msg; @@ -203,13 +203,13 @@ static LRESULT WINAPI WndProcSub(HWND hwnd, UINT message, WPARAM wParam, LPARAM if(lParam) { if(dwRefData & DELETE_SELF) { - pRemoveWindowSubclass(hwnd, WndProcSub, uldSubclass); - pRemoveWindowSubclass(hwnd, WndProcSub, uldSubclass); + pRemoveWindowSubclass(hwnd, wnd_proc_sub, uldSubclass); + pRemoveWindowSubclass(hwnd, wnd_proc_sub, uldSubclass); } if(dwRefData & DELETE_PREV) - pRemoveWindowSubclass(hwnd, WndProcSub, uldSubclass-1); + pRemoveWindowSubclass(hwnd, wnd_proc_sub, uldSubclass-1); if(dwRefData & SEND_NEST) - SendMessage(hwnd, WM_USER, wParam+1, 0); + SendMessageA(hwnd, WM_USER, wParam+1, 0); } } return pDefSubclassProc(hwnd, message, wParam, lParam); @@ -221,51 +221,51 @@ static void test_subclass(void) 100, 100, 200, 200, 0, 0, 0, NULL); assert(hwnd); - pSetWindowSubclass(hwnd, WndProcSub, 2, 0); - SendMessage(hwnd, WM_USER, 1, 0); - SendMessage(hwnd, WM_USER, 2, 0); + pSetWindowSubclass(hwnd, wnd_proc_sub, 2, 0); + SendMessageA(hwnd, WM_USER, 1, 0); + SendMessageA(hwnd, WM_USER, 2, 0); ok_sequence(Sub_BasicTest, "Basic"); - pSetWindowSubclass(hwnd, WndProcSub, 2, DELETE_SELF); - SendMessage(hwnd, WM_USER, 1, 1); + pSetWindowSubclass(hwnd, wnd_proc_sub, 2, DELETE_SELF); + SendMessageA(hwnd, WM_USER, 1, 1); ok_sequence(Sub_DeletedTest, "Deleted"); - SendMessage(hwnd, WM_USER, 1, 0); + SendMessageA(hwnd, WM_USER, 1, 0); ok_sequence(Sub_AfterDeletedTest, "After Deleted"); - pSetWindowSubclass(hwnd, WndProcSub, 2, 0); - origProc3 = (WNDPROC)SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)WndProc3); - SendMessage(hwnd, WM_USER, 1, 0); - SendMessage(hwnd, WM_USER, 2, 0); + pSetWindowSubclass(hwnd, wnd_proc_sub, 2, 0); + orig_proc_3 = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)wnd_proc_3); + SendMessageA(hwnd, WM_USER, 1, 0); + SendMessageA(hwnd, WM_USER, 2, 0); ok_sequence(Sub_OldAfterNewTest, "Old after New"); - pSetWindowSubclass(hwnd, WndProcSub, 4, 0); - SendMessage(hwnd, WM_USER, 1, 0); + pSetWindowSubclass(hwnd, wnd_proc_sub, 4, 0); + SendMessageA(hwnd, WM_USER, 1, 0); ok_sequence(Sub_MixTest, "Mix"); /* Now the fun starts */ - pSetWindowSubclass(hwnd, WndProcSub, 4, SEND_NEST); - SendMessage(hwnd, WM_USER, 1, 1); + pSetWindowSubclass(hwnd, wnd_proc_sub, 4, SEND_NEST); + SendMessageA(hwnd, WM_USER, 1, 1); ok_sequence(Sub_MixAndNestTest, "Mix and nest"); - pSetWindowSubclass(hwnd, WndProcSub, 4, SEND_NEST | DELETE_SELF); - SendMessage(hwnd, WM_USER, 1, 1); + pSetWindowSubclass(hwnd, wnd_proc_sub, 4, SEND_NEST | DELETE_SELF); + SendMessageA(hwnd, WM_USER, 1, 1); ok_sequence(Sub_MixNestDelTest, "Mix, nest, del"); - pSetWindowSubclass(hwnd, WndProcSub, 4, 0); - pSetWindowSubclass(hwnd, WndProcSub, 5, DELETE_PREV); - SendMessage(hwnd, WM_USER, 1, 1); + pSetWindowSubclass(hwnd, wnd_proc_sub, 4, 0); + pSetWindowSubclass(hwnd, wnd_proc_sub, 5, DELETE_PREV); + SendMessageA(hwnd, WM_USER, 1, 1); ok_sequence(Sub_MixDelPrevTest, "Mix and del prev"); DestroyWindow(hwnd); } -static BOOL RegisterWindowClasses(void) +static BOOL register_window_classes(void) { WNDCLASSA cls; cls.style = 0; - cls.lpfnWndProc = WndProc1; + cls.lpfnWndProc = wnd_proc_1; cls.cbClsExtra = 0; cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(0); @@ -323,7 +323,7 @@ START_TEST(subclass) { if(!init_function_pointers()) return; - if(!RegisterWindowClasses()) assert(0); + if(!register_window_classes()) assert(0); test_subclass(); }