November 2013 - Wine-Commits

Saulius Krasuckas : comctl32/tests: Make tooltips. c compile with -D__WINESRC__.
by Alexandre Julliard Nov. 8, 2013

Nov. 8, 2013

Module: wine Branch: master Commit: 6d773fd979bd5c7e67b657c58e75a0a91e502982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d773fd979bd5c7e67b657c58… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Sat Oct 19 23:10:34 2013 +0300 comctl32/tests: Make tooltips.c compile with -D__WINESRC__. --- dlls/comctl32/tests/tooltips.c | 78 ++++++++++++++++++++-------------------- 1 files changed, 39 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d773fd979bd5c7e67b65…

1 0

Saulius Krasuckas : comctl32/tests: Make mru.c, pager.c and syslink. c compile with -D__WINESRC__.
by Alexandre Julliard Nov. 8, 2013

Nov. 8, 2013

Module: wine Branch: master Commit: 26ec350b73f490c2df8b0c87e8cff5545d8cb5bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=26ec350b73f490c2df8b0c87e… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Sat Oct 19 22:35:01 2013 +0300 comctl32/tests: Make mru.c, pager.c and syslink.c compile with -D__WINESRC__. --- dlls/comctl32/tests/mru.c | 8 ++++---- dlls/comctl32/tests/pager.c | 4 ++-- dlls/comctl32/tests/syslink.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index 1d8ad9a..5b5f98e 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -409,7 +409,7 @@ static void test_MRUListA(void) /* check entry 0 */ buffer[0] = 0; iRet = pEnumMRUListA(hMRU, 0, buffer, 255); - ok(iRet == lstrlen(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[3]), iRet); + ok(iRet == lstrlenA(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlenA(checks[3]), iRet); ok(strcmp(buffer, checks[3]) == 0, "EnumMRUList expected %s, got %s\n", checks[3], buffer); /* check entry 0 with a too small buffer */ @@ -418,7 +418,7 @@ static void test_MRUListA(void) buffer[2] = 'A'; /* unchanged */ buffer[3] = 0; /* unchanged */ iRet = pEnumMRUListA(hMRU, 0, buffer, 2); - ok(iRet == lstrlen(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[3]), iRet); + ok(iRet == lstrlenA(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlenA(checks[3]), iRet); ok(strcmp(buffer, "T") == 0, "EnumMRUList expected %s, got %s\n", "T", buffer); /* make sure space after buffer has old values */ ok(buffer[2] == 'A', "EnumMRUList expected %02x, got %02x\n", 'A', buffer[2]); @@ -426,13 +426,13 @@ static void test_MRUListA(void) /* check entry 1 */ buffer[0] = 0; iRet = pEnumMRUListA(hMRU, 1, buffer, 255); - ok(iRet == lstrlen(checks[1]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[1]), iRet); + ok(iRet == lstrlenA(checks[1]), "EnumMRUList expected %d, got %d\n", lstrlenA(checks[1]), iRet); ok(strcmp(buffer, checks[1]) == 0, "EnumMRUList expected %s, got %s\n", checks[1], buffer); /* check entry 2 */ buffer[0] = 0; iRet = pEnumMRUListA(hMRU, 2, buffer, 255); - ok(iRet == lstrlen(checks[2]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[2]), iRet); + ok(iRet == lstrlenA(checks[2]), "EnumMRUList expected %d, got %d\n", lstrlenA(checks[2]), iRet); ok(strcmp(buffer, checks[2]) == 0, "EnumMRUList expected %s, got %s\n", checks[2], buffer); /* check out of bounds entry 3 */ diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 56cadaf..d352140 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -100,7 +100,7 @@ static BOOL register_parent_wnd_class(void) cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(NULL); cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, IDC_ARROW); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "Pager test parent class"; @@ -112,7 +112,7 @@ static HWND create_parent_window(void) if (!register_parent_wnd_class()) return NULL; - return CreateWindow("Pager test parent class", "Pager test parent window", + return CreateWindowA("Pager test parent class", "Pager test parent window", WS_OVERLAPPED | WS_VISIBLE, 0, 0, 200, 200, 0, NULL, GetModuleHandleA(NULL), NULL ); } diff --git a/dlls/comctl32/tests/syslink.c b/dlls/comctl32/tests/syslink.c index 26bd924..d493cb7 100644 --- a/dlls/comctl32/tests/syslink.c +++ b/dlls/comctl32/tests/syslink.c @@ -70,7 +70,7 @@ static void flush_events(void) while (diff > 0) { if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, 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(); } } @@ -245,8 +245,8 @@ START_TEST(syslink) /* Make the SysLink control visible */ flush_sequences(sequences, NUM_MSG_SEQUENCE); - oldstyle = GetWindowLong(hWndSysLink, GWL_STYLE); - SetWindowLong(hWndSysLink, GWL_STYLE, oldstyle | WS_VISIBLE); + oldstyle = GetWindowLongA(hWndSysLink, GWL_STYLE); + SetWindowLongA(hWndSysLink, GWL_STYLE, oldstyle | WS_VISIBLE); RedrawWindow(hWndSysLink, NULL, NULL, RDW_INVALIDATE); flush_events(); ok_sequence(sequences, SYSLINK_SEQ_INDEX, visible_syslink_wnd_seq, "visible SysLink", TRUE);

1 0

Saulius Krasuckas : comctl32/tests: Make status. c compile with -D__WINESRC__.
by Alexandre Julliard Nov. 8, 2013

Nov. 8, 2013

Module: wine Branch: master Commit: 529484603bbf7049e6aec8fea422c6911aaa00f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=529484603bbf7049e6aec8fea… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Sat Oct 19 21:30:47 2013 +0300 comctl32/tests: Make status.c compile with -D__WINESRC__. --- dlls/comctl32/tests/status.c | 196 +++++++++++++++++++++--------------------- 1 files changed, 98 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=529484603bbf7049e6aec…

1 0

Saulius Krasuckas : comctl32/tests: Make subclass. c compile with -D__WINESRC__.
by Alexandre Julliard Nov. 8, 2013

Nov. 8, 2013

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

Saulius Krasuckas : comctl32/tests: Make progress. c compile with -D__WINESRC__.
by Alexandre Julliard Nov. 8, 2013

Nov. 8, 2013

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 propsheet. c compile with -D__WINESRC__.
by Alexandre Julliard Nov. 8, 2013

Nov. 8, 2013

Module: wine Branch: master Commit: 85aa34eea64a7a3f374ee8be4560fc252a1bfd93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85aa34eea64a7a3f374ee8be4… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Mon Nov 4 18:47:32 2013 +0200 comctl32/tests: Make propsheet.c compile with -D__WINESRC__. --- dlls/comctl32/tests/propsheet.c | 85 ++++++++++++++++++++------------------ 1 files changed, 45 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=85aa34eea64a7a3f374ee…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Nov. 8, 2013

Nov. 8, 2013

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

Julian Rüger : po: Update German translation.
by Alexandre Julliard Nov. 7, 2013

Nov. 7, 2013

Module: wine Branch: master Commit: ba6a5f3d6da0bcf1931b89298eb5a056f2721ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba6a5f3d6da0bcf1931b89298… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Nov 7 16:38:42 2013 +0100 po: Update German translation. --- po/de.po | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index cc5b6a1..f7191e8 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-06-19 11:34+0200\n" +"PO-Revision-Date: 2013-11-07 16:38+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -4705,8 +4705,6 @@ msgid "No Unicode translation.\n" msgstr "Keine Unicode-Übersetzung.\n" #: winerror.mc:1366 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" msgstr "DLL-Initialisierung fehlgeschlagen.\n"

1 0

Frédéric Delanoy : gdi32/tests: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 7, 2013

Nov. 7, 2013

Module: wine Branch: master Commit: 259cb3c8cd8a6f61b71fbb7b5d9f051a9eef79ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=259cb3c8cd8a6f61b71fbb7b5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 6 21:21:09 2013 +0100 gdi32/tests: Use BOOL type where appropriate. --- dlls/gdi32/tests/mapping.c | 2 +- dlls/gdi32/tests/path.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index 573a97f..b8dd8ee 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -513,7 +513,7 @@ static void test_isotropic_mapping(void) static void test_setvirtualresolution(void) { HDC hdc = CreateICA("DISPLAY", NULL, NULL, NULL); - DWORD r; + BOOL r; INT horz_res = GetDeviceCaps(hdc, HORZRES); INT horz_size = GetDeviceCaps(hdc, HORZSIZE); INT log_pixels_x = GetDeviceCaps(hdc, LOGPIXELSX); diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 8399b19..0b350bc 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -270,7 +270,8 @@ static void test_widenpath(void) HDC hdc = GetDC(0); HPEN greenPen, narrowPen; POINT pnt[6]; - INT nSize, ret; + INT nSize; + BOOL ret; /* Create a pen to be used in WidenPath */ greenPen = CreatePen(PS_SOLID, 10, RGB(0,0,0));

1 0

Frédéric Delanoy : ctapi32: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 7, 2013

Nov. 7, 2013

Module: wine Branch: master Commit: c710a50b249bd1e5282ac36bb2d8d7d68a839f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c710a50b249bd1e5282ac36bb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 6 21:21:06 2013 +0100 ctapi32: Use BOOL type where appropriate. --- dlls/ctapi32/ctapi32.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ctapi32/ctapi32.c b/dlls/ctapi32/ctapi32.c index 089e0ab..a2dc5bc 100644 --- a/dlls/ctapi32/ctapi32.c +++ b/dlls/ctapi32/ctapi32.c @@ -42,13 +42,13 @@ static IS8 (*pCT_close)(IU16 ctn) = NULL; static void *ctapi_handle = NULL; -static int load_functions(void) { +static BOOL load_functions(void) { char soname[MAX_PATH] = FALLBACK_LIBCTAPI, buffer[MAX_PATH]; LONG result; HKEY key_handle; if (pCT_init) /* loaded already */ - return 0; + return TRUE; /* Try to get name of low level library from registry */ /* @@ Wine registry key: HKCU\Software\Wine\ctapi32 */ @@ -80,16 +80,16 @@ static int load_functions(void) { MESSAGE("Wine cannot find any usable hardware library, ctapi32.dll not working.\n"); MESSAGE("Please create the key \"HKEY_CURRENT_USER\\Software\\Wine\\ctapi32\" in your registry\n"); MESSAGE("and set the value \"library\" to your library name (e.g. \"libctapi-cyberjack.so.1\" or \"/usr/lib/readers/libctapi.so\").\n"); - return 1; + return FALSE; } -#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(ctapi_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); return 1;} +#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(ctapi_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); return FALSE;} LOAD_FUNCPTR(CT_init); LOAD_FUNCPTR(CT_data); LOAD_FUNCPTR(CT_close); #undef LOAD_FUNCPTR - return 0; + return TRUE; } /* @@ -129,7 +129,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); /* Try to load low-level library */ - if (load_functions() != 0) + if (!load_functions()) return FALSE; /* error */ break; case DLL_PROCESS_DETACH:

1 0