November 2013 - Wine-commits

Tag wine-1.7.6 : Alexandre Julliard : Release 1.7.6
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: refs/tags/wine-1.7.6 Tag: dc89d6b4b34dc155addd071b4cdcf74bd2de1bae URL: http://source.winehq.org/git/wine.git/?a=tag;h=dc89d6b4b34dc155addd071b4cdc… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 8 19:23:34 2013 +0100 Release 1.7.6

1 0

Dmitry Timoshkov : gdiplus/tests: Fix the test for flags of an empty region .
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 9797afd0031b5b4bc7df576960616c3fa410a8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9797afd0031b5b4bc7df57696… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 8 16:33:39 2013 +0900 gdiplus/tests: Fix the test for flags of an empty region. --- dlls/gdiplus/tests/region.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index d19d919..3e6f902 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -370,8 +370,8 @@ static void test_getregiondata(void) expect_magic(buf + 6); expect_dword(buf + 7, 0); /* flags 0 means that a path is an array of FLOATs */ - ok((*(buf + 8) & (~ 0x00004000)) == 0x00000000, - "expected 00000000 got %08x\n", *(buf + 8) & (~ 0x00004000)); + ok(*(buf + 8) == 0x4000 /* before win7 */ || *(buf + 8) == 0, + "expected 0x4000 or 0, got %08x\n", *(buf + 8)); /* Transform an empty region */ status = GdipCreateMatrix(&matrix);

1 0

Dmitry Timoshkov : gdiplus: Use flags 0 for an empty path in region to follow Windows7+ behaviour.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 108a63367731d5b59a7280e8f32fc4a135d30332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=108a63367731d5b59a7280e8f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 8 16:33:46 2013 +0900 gdiplus: Use flags 0 for an empty path in region to follow Windows7+ behaviour. --- dlls/gdiplus/region.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 9ac3124..4cd9636 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -426,7 +426,7 @@ GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *path, GpRegion **region) { region_element* element; GpStatus stat; - DWORD flags = FLAGS_INTPATH; + DWORD flags; INT count, i; TRACE("%p, %p\n", path, region); @@ -446,6 +446,8 @@ GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *path, GpRegion **region) element = &(*region)->node; count = path->pathdata.Count; + flags = count ? FLAGS_INTPATH : FLAGS_NOFLAGS; + /* Test to see if the path is an Integer path */ for (i = 0; i < count; i++) {

1 0

Dmitry Timoshkov : gdiplus: Add test for data returned by GdipGetRegionData for a translated integer region .
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 2bbd179ea4a2d6bad054175710e9df03a11267ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bbd179ea4a2d6bad05417571… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 8 16:33:42 2013 +0900 gdiplus: Add test for data returned by GdipGetRegionData for a translated integer region. --- dlls/gdiplus/tests/region.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 3e6f902..f509204 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -2,6 +2,7 @@ * Unit test suite for gdiplus regions * * Copyright (C) 2008 Huw Davies + * Copyright (C) 2013 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -420,6 +421,45 @@ static void test_getregiondata(void) expect(6, point[3].Y); expect_dword(buf + 13, 0x81010100); /* 0x01010100 if we don't close the path */ + status = GdipTranslateRegion(region, 0.6, 0.8); + expect(Ok, status); + memset(buf, 0, sizeof(buf)); + needed = 0; + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + expect(Ok, status); +todo_wine + expect(72, needed); +todo_wine + expect_dword(buf, 64); + expect_magic(buf + 2); + expect_dword(buf + 3 , 0); + expect_dword(buf + 4 , RGNDATA_PATH); +todo_wine + expect_dword(buf + 5, 48); + expect_magic(buf + 6); + expect_dword(buf + 7, 4); + /* flags 0 means that a path is an array of FLOATs */ +todo_wine + expect_dword(buf + 8, 0); +todo_wine + expect_float(buf + 9, 5.6); +todo_wine + expect_float(buf + 10, 6.8); +todo_wine + expect_float(buf + 11, 7.6); +todo_wine + expect_float(buf + 12, 8.8); +todo_wine + expect_float(buf + 13, 8.6); +todo_wine + expect_float(buf + 14, 1.8); +todo_wine + expect_float(buf + 15, 5.6); +todo_wine + expect_float(buf + 16, 6.8); +todo_wine + expect_dword(buf + 17, 0x81010100); /* 0x01010100 if we don't close the path */ + status = GdipDeletePath(path); expect(Ok, status); status = GdipDeleteRegion(region);

1 0

Alexandre Julliard : shlwapi/tests: Test if SHCreateStreamOnFileEx is present before using it.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: ec7c250450628cbf835533f8383f4c27278f1cb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec7c250450628cbf835533f83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 8 12:57:14 2013 +0100 shlwapi/tests: Test if SHCreateStreamOnFileEx is present before using it. --- dlls/shlwapi/tests/istream.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 760b847..9ea3def 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -759,5 +759,5 @@ START_TEST(istream) } } - test_SHCreateStreamOnFileEx_CopyTo(); + if (pSHCreateStreamOnFileEx) test_SHCreateStreamOnFileEx_CopyTo(); }

1 0

Daniel Lehman : kernel32: Use ANSI code page if current thread locale has no code page.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 37dad12971ba08df39f54dcde833a5ce70a98eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=37dad12971ba08df39f54dcde… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Oct 31 11:03:18 2013 -0700 kernel32: Use ANSI code page if current thread locale has no code page. --- dlls/kernel32/locale.c | 1 + dlls/kernel32/tests/codepage.c | 156 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 157 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 9ddf078..22903d5 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -215,6 +215,7 @@ static const union cptable *get_codepage_table( unsigned int codepage ) case CP_THREAD_ACP: if (NtCurrentTeb()->CurrentLocale == GetUserDefaultLCID()) return ansi_cptable; codepage = get_lcid_codepage( NtCurrentTeb()->CurrentLocale ); + if (!codepage) return ansi_cptable; /* fall through */ default: if (codepage == ansi_cptable->info.codepage) return ansi_cptable; diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 36ea66d..a269c7e 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -462,6 +462,161 @@ static void test_undefined_byte_char(void) } } +static void test_threadcp(void) +{ + static const LCID ENGLISH = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + static const LCID HINDI = MAKELCID(MAKELANGID(LANG_HINDI, SUBLANG_HINDI_INDIA), SORT_DEFAULT); + static const LCID GEORGIAN = MAKELCID(MAKELANGID(LANG_GEORGIAN, SUBLANG_GEORGIAN_GEORGIA), SORT_DEFAULT); + static const LCID RUSSIAN = MAKELCID(MAKELANGID(LANG_RUSSIAN, SUBLANG_RUSSIAN_RUSSIA), SORT_DEFAULT); + static const LCID JAPANESE = MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN), SORT_DEFAULT); + static const LCID CHINESE = MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT); + + BOOL islead, islead_acp; + CPINFOEXA cpi; + UINT cp, acp; + int i, num; + LCID last; + BOOL ret; + + struct test { + LCID lcid; + UINT threadcp; + } lcids[] = { + { HINDI, 0 }, + { GEORGIAN, 0 }, + { ENGLISH, 1252 }, + { RUSSIAN, 1251 }, + { JAPANESE, 932 }, + { CHINESE, 936 } + }; + + struct test_islead_nocp { + LCID lcid; + BYTE testchar; + } isleads_nocp[] = { + { HINDI, 0x00 }, + { HINDI, 0x81 }, + { HINDI, 0xa0 }, + { HINDI, 0xe0 }, + + { GEORGIAN, 0x00 }, + { GEORGIAN, 0x81 }, + { GEORGIAN, 0xa0 }, + { GEORGIAN, 0xe0 }, + }; + + struct test_islead { + LCID lcid; + BYTE testchar; + BOOL islead; + } isleads[] = { + { ENGLISH, 0x00, FALSE }, + { ENGLISH, 0x81, FALSE }, + { ENGLISH, 0xa0, FALSE }, + { ENGLISH, 0xe0, FALSE }, + + { RUSSIAN, 0x00, FALSE }, + { RUSSIAN, 0x81, FALSE }, + { RUSSIAN, 0xa0, FALSE }, + { RUSSIAN, 0xe0, FALSE }, + + { JAPANESE, 0x00, FALSE }, + { JAPANESE, 0x81, TRUE }, + { JAPANESE, 0xa0, FALSE }, + { JAPANESE, 0xe0, TRUE }, + + { CHINESE, 0x00, FALSE }, + { CHINESE, 0x81, TRUE }, + { CHINESE, 0xa0, TRUE }, + { CHINESE, 0xe0, TRUE }, + }; + + last = GetThreadLocale(); + acp = GetACP(); + + for (i = 0; i < sizeof(lcids)/sizeof(lcids[0]); i++) + { + SetThreadLocale(lcids[i].lcid); + + cp = 0xdeadbeef; + GetLocaleInfoA(lcids[i].lcid, LOCALE_IDEFAULTANSICODEPAGE|LOCALE_RETURN_NUMBER, (LPSTR)&cp, sizeof(cp)); + ok(cp == lcids[i].threadcp, "wrong codepage %u for lcid %04x, should be %u\n", cp, lcids[i].threadcp, cp); + + /* GetCPInfoEx/GetCPInfo - CP_ACP */ + SetLastError(0xdeadbeef); + memset(&cpi, 0, sizeof(cpi)); + ret = GetCPInfoExA(CP_ACP, 0, &cpi); + ok(ret, "GetCPInfoExA failed for lcid %04x\n", lcids[i].lcid); + ok(GetLastError() == 0xdeadbeef || + broken(GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND), /* win2k */ + "GetLastError() is %u for lcid %04x\n", GetLastError(), lcids[i].lcid); + ok(cpi.CodePage == acp, "wrong codepage %u for lcid %04x, should be %u\n", cpi.CodePage, lcids[i].lcid, acp); + + /* WideCharToMultiByte - CP_ACP */ + SetLastError(0xdeadbeef); + num = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, NULL, 0, NULL, NULL); + ok(num == 7, "ret is %d (%04x)\n", num, lcids[i].lcid); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u (%04x)\n", GetLastError(), lcids[i].lcid); + + /* MultiByteToWideChar - CP_ACP */ + SetLastError(0xdeadbeef); + num = MultiByteToWideChar(CP_ACP, 0, "foobar", -1, NULL, 0); + ok(num == 7, "ret is %d (%04x)\n", num, lcids[i].lcid); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u (%04x)\n", GetLastError(), lcids[i].lcid); + + /* GetCPInfoEx/GetCPInfo - CP_THREAD_ACP */ + SetLastError(0xdeadbeef); + memset(&cpi, 0, sizeof(cpi)); + ret = GetCPInfoExA(CP_THREAD_ACP, 0, &cpi); + ok(ret, "GetCPInfoExA failed for lcid %04x\n", lcids[i].lcid); + ok(GetLastError() == 0xdeadbeef || + broken(GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND), /* win2k */ + "GetLastError() is %u for lcid %04x\n", GetLastError(), lcids[i].lcid); + if (lcids[i].threadcp) + ok(cpi.CodePage == lcids[i].threadcp, "wrong codepage %u for lcid %04x, should be %u\n", + cpi.CodePage, lcids[i].lcid, lcids[i].threadcp); + else + ok(cpi.CodePage == acp, "wrong codepage %u for lcid %04x, should be %u\n", + cpi.CodePage, lcids[i].lcid, acp); + + /* WideCharToMultiByte - CP_THREAD_ACP */ + SetLastError(0xdeadbeef); + num = WideCharToMultiByte(CP_THREAD_ACP, 0, foobarW, -1, NULL, 0, NULL, NULL); + ok(num == 7, "ret is %d (%04x)\n", num, lcids[i].lcid); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u (%04x)\n", GetLastError(), lcids[i].lcid); + + /* MultiByteToWideChar - CP_THREAD_ACP */ + SetLastError(0xdeadbeef); + num = MultiByteToWideChar(CP_THREAD_ACP, 0, "foobar", -1, NULL, 0); + ok(num == 7, "ret is %d (%04x)\n", num, lcids[i].lcid); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u (%04x)\n", GetLastError(), lcids[i].lcid); + } + + /* IsDBCSLeadByteEx - locales without codepage */ + for (i = 0; i < sizeof(isleads_nocp)/sizeof(isleads_nocp[0]); i++) + { + SetThreadLocale(isleads_nocp[i].lcid); + + islead_acp = IsDBCSLeadByteEx(CP_ACP, isleads_nocp[i].testchar); + islead = IsDBCSLeadByteEx(CP_THREAD_ACP, isleads_nocp[i].testchar); + + ok(islead == islead_acp, "wrong islead %i for test char %x in lcid %04x. should be %i\n", + islead, isleads_nocp[i].testchar, isleads_nocp[i].lcid, islead_acp); + } + + /* IsDBCSLeadByteEx - locales with codepage */ + for (i = 0; i < sizeof(isleads)/sizeof(isleads[0]); i++) + { + SetThreadLocale(isleads[i].lcid); + + islead = IsDBCSLeadByteEx(CP_THREAD_ACP, isleads[i].testchar); + ok(islead == isleads[i].islead, "wrong islead %i for test char %x in lcid %04x. should be %i\n", + islead, isleads[i].testchar, isleads[i].lcid, isleads[i].islead); + } + + SetThreadLocale(last); +} + START_TEST(codepage) { BOOL bUsedDefaultChar; @@ -478,4 +633,5 @@ START_TEST(codepage) test_string_conversion(&bUsedDefaultChar); test_undefined_byte_char(); + test_threadcp(); }

1 0

Qian Hong : user32: Implement OpenInputDesktop.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: f7835dea2ddbd3aa8fb53fb4b83ccaf16f5efde9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7835dea2ddbd3aa8fb53fb4b… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Nov 8 17:10:24 2013 +0800 user32: Implement OpenInputDesktop. --- dlls/user32/tests/winstation.c | 22 ---------------------- dlls/user32/winstation.c | 20 +++++++++++++++++--- include/wine/server_protocol.h | 21 ++++++++++++++++++++- server/protocol.def | 10 ++++++++++ server/request.h | 8 ++++++++ server/trace.c | 15 +++++++++++++++ server/winstation.c | 22 ++++++++++++++++++++++ 7 files changed, 92 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7835dea2ddbd3aa8fb53…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 9c8d4a9489b1ee16f37345e98d8aba1a087dd313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8d4a9489b1ee16f37345e98… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Nov 7 21:12:10 2013 +0200 po: Update Finnish translation. --- po/fi.po | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/po/fi.po b/po/fi.po index 87023ae..1ae9e94 100644 --- a/po/fi.po +++ b/po/fi.po @@ -4690,8 +4690,6 @@ msgid "No Unicode translation.\n" msgstr "Ei Unicode-käännöstä.\n" #: winerror.mc:1366 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" msgstr "DLL:n alustus epäonnistui.\n"

1 0

Saulius Krasuckas : comctl32/tests: Make progress. c compile with -D__WINESRC__.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: ce91a287282b36dce99b4b4215df411dcde107be URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce91a287282b36dce99b4b421… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Sat Oct 19 18:04:23 2013 +0300 comctl32/tests: Make progress.c compile with -D__WINESRC__. --- dlls/comctl32/tests/progress.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index 59a4b00..af8a84c 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -48,12 +48,12 @@ static void flush_events(void) while (diff > 0) { if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min(10,diff), QS_ALLINPUT ) == WAIT_TIMEOUT) break; - while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); diff = time - GetTickCount(); } } -static LRESULT CALLBACK ProgressTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK progress_test_wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) { @@ -72,7 +72,7 @@ static WNDPROC progress_wndproc; static BOOL erased; static RECT last_paint_rect; -static LRESULT CALLBACK ProgressSubclassProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK progress_subclass_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { if (msg == WM_PAINT) { @@ -82,7 +82,7 @@ static LRESULT CALLBACK ProgressSubclassProc(HWND hWnd, UINT msg, WPARAM wParam, { erased = TRUE; } - return CallWindowProc(progress_wndproc, hWnd, msg, wParam, lParam); + return CallWindowProcA(progress_wndproc, hWnd, msg, wParam, lParam); } @@ -117,11 +117,11 @@ static void init(void) wc.cbWndExtra = 0; wc.hInstance = GetModuleHandleA(NULL); wc.hIcon = NULL; - wc.hCursor = LoadCursorA(NULL, IDC_ARROW); + wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); wc.lpszMenuName = NULL; wc.lpszClassName = progressTestClass; - wc.lpfnWndProc = ProgressTestWndProc; + wc.lpfnWndProc = progress_test_wnd_proc; RegisterClassA(&wc); rect.left = 0; @@ -135,10 +135,10 @@ static void init(void) assert(hProgressParentWnd != NULL); GetClientRect(hProgressParentWnd, &rect); - hProgressWnd = CreateWindowEx(0, PROGRESS_CLASS, "", WS_CHILD | WS_VISIBLE, + hProgressWnd = CreateWindowExA(0, PROGRESS_CLASSA, "", WS_CHILD | WS_VISIBLE, 0, 0, rect.right, rect.bottom, hProgressParentWnd, NULL, GetModuleHandleA(NULL), 0); assert(hProgressWnd != NULL); - progress_wndproc = (WNDPROC)SetWindowLongPtr(hProgressWnd, GWLP_WNDPROC, (LPARAM)ProgressSubclassProc); + progress_wndproc = (WNDPROC)SetWindowLongPtrA(hProgressWnd, GWLP_WNDPROC, (LPARAM)progress_subclass_proc); ShowWindow(hProgressParentWnd, SW_SHOWNORMAL); ok(GetUpdateRect(hProgressParentWnd, NULL, FALSE), "GetUpdateRect: There should be a region that needs to be updated\n"); @@ -201,13 +201,13 @@ static void test_redraw(void) position is not in the new range, it does. Don't test this, it may change in future Windows versions. */ - SendMessage(hProgressWnd, PBM_SETPOS, 0, 0); + SendMessageA(hProgressWnd, PBM_SETPOS, 0, 0); update_window(hProgressWnd); /* increase to 10 - no background erase required */ erased = FALSE; SetRectEmpty(&last_paint_rect); - SendMessage(hProgressWnd, PBM_SETPOS, 10, 0); + SendMessageA(hProgressWnd, PBM_SETPOS, 10, 0); GetClientRect(hProgressWnd, &client_rect); ok(EqualRect(&last_paint_rect, &client_rect), "last_paint_rect was { %d, %d, %d, %d } instead of { %d, %d, %d, %d }\n", @@ -219,7 +219,7 @@ static void test_redraw(void) /* decrease to 0 - background erase will be required */ erased = FALSE; SetRectEmpty(&last_paint_rect); - SendMessage(hProgressWnd, PBM_SETPOS, 0, 0); + SendMessageA(hProgressWnd, PBM_SETPOS, 0, 0); GetClientRect(hProgressWnd, &client_rect); ok(EqualRect(&last_paint_rect, &client_rect), "last_paint_rect was { %d, %d, %d, %d } instead of { %d, %d, %d, %d }\n",

1 0

Saulius Krasuckas : comctl32/tests: Make subclass. c compile with -D__WINESRC__.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 10f5a733c10d35549b50ed8b713f4f7ac4776979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f5a733c10d35549b50ed8b7… 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(); }

1 0