October 2013 - Wine-commits

Dmitry Timoshkov : kernel32/tests: Fix console tests compilation with __WINESRC__ defined.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: fd65dfbac94612ef3274a99ecf888ecc93ca931f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd65dfbac94612ef3274a99ec… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:01:37 2013 +0900 kernel32/tests: Fix console tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/console.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index d2ce294..48c70a9 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -50,7 +50,7 @@ static BOOL (WINAPI *pVerifyConsoleIoHandle)(HANDLE handle); #define okCHAR(hCon, c, ch, attr) do { \ char __ch; WORD __attr; DWORD __len; BOOL expect; \ - expect = ReadConsoleOutputCharacter((hCon), &__ch, 1, (c), &__len) == 1 && __len == 1 && __ch == (ch); \ + expect = ReadConsoleOutputCharacterA((hCon), &__ch, 1, (c), &__len) == 1 && __len == 1 && __ch == (ch); \ ok(expect, "At (%d,%d): expecting char '%c'/%02x got '%c'/%02x\n", (c).X, (c).Y, (ch), (ch), __ch, __ch); \ expect = ReadConsoleOutputAttribute((hCon), &__attr, 1, (c), &__len) == 1 && __len == 1 && __attr == (attr); \ ok(expect, "At (%d,%d): expecting attr %04x got %04x\n", (c).X, (c).Y, (attr), __attr); \ @@ -179,7 +179,7 @@ static void testEmptyWrite(HANDLE hCon) ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left\n"); len = -1; - ok(WriteConsole(hCon, NULL, 0, &len, NULL) != 0 && len == 0, "WriteConsole\n"); + ok(WriteConsoleA(hCon, NULL, 0, &len, NULL) != 0 && len == 0, "WriteConsole\n"); okCURSOR(hCon, c); /* Passing a NULL lpBuffer with sufficiently large non-zero length succeeds @@ -188,22 +188,22 @@ static void testEmptyWrite(HANDLE hCon) if (0) { len = -1; - ok(!WriteConsole(hCon, NULL, 16, &len, NULL) && len == -1, "WriteConsole\n"); + ok(!WriteConsoleA(hCon, NULL, 16, &len, NULL) && len == -1, "WriteConsole\n"); okCURSOR(hCon, c); /* Cursor advances for this call. */ len = -1; - ok(WriteConsole(hCon, NULL, 128, &len, NULL) != 0 && len == 128, "WriteConsole\n"); + ok(WriteConsoleA(hCon, NULL, 128, &len, NULL) != 0 && len == 128, "WriteConsole\n"); } len = -1; - ok(WriteConsole(hCon, emptybuf, 0, &len, NULL) != 0 && len == 0, "WriteConsole\n"); + ok(WriteConsoleA(hCon, emptybuf, 0, &len, NULL) != 0 && len == 0, "WriteConsole\n"); okCURSOR(hCon, c); /* WriteConsole does not halt on a null terminator and is happy to write * memory contents beyond the actual size of the buffer. */ len = -1; - ok(WriteConsole(hCon, emptybuf, 16, &len, NULL) != 0 && len == 16, "WriteConsole\n"); + ok(WriteConsoleA(hCon, emptybuf, 16, &len, NULL) != 0 && len == 16, "WriteConsole\n"); c.X += 16; okCURSOR(hCon, c); } @@ -219,7 +219,7 @@ static void testWriteSimple(HANDLE hCon) c.X = c.Y = 0; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left\n"); - ok(WriteConsole(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); + ok(WriteConsoleA(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); c.Y = 0; for (c.X = 0; c.X < mylen; c.X++) { @@ -246,7 +246,7 @@ static void testWriteNotWrappedNotProcessed(HANDLE hCon, COORD sbSize) c.X = sbSize.X - 3; c.Y = 0; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-3\n"); - ret = WriteConsole(hCon, mytest, mylen, &len, NULL); + ret = WriteConsoleA(hCon, mytest, mylen, &len, NULL); ok(ret != 0 && len == mylen, "Couldn't write, ret = %d, len = %d\n", ret, len); c.Y = 0; for (p = mylen - 3; p < mylen; p++) @@ -265,7 +265,7 @@ static void testWriteNotWrappedNotProcessed(HANDLE hCon, COORD sbSize) c.X = sbSize.X - mylen; c.Y = 0; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-3\n"); - ok(WriteConsole(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); + ok(WriteConsoleA(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); } static void testWriteNotWrappedProcessed(HANDLE hCon, COORD sbSize) @@ -285,7 +285,7 @@ static void testWriteNotWrappedProcessed(HANDLE hCon, COORD sbSize) c.X = sbSize.X - 5; c.Y = 0; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-5\n"); - ok(WriteConsole(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); + ok(WriteConsoleA(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); c.Y = 0; for (c.X = sbSize.X - 5; c.X < sbSize.X - 1; c.X++) { @@ -316,7 +316,7 @@ static void testWriteNotWrappedProcessed(HANDLE hCon, COORD sbSize) c.X = sbSize.X - 4; c.Y = 0; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-4\n"); - ok(WriteConsole(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); + ok(WriteConsoleA(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); c.Y = 0; for (c.X = sbSize.X - 4; c.X < sbSize.X; c.X++) { @@ -336,7 +336,7 @@ static void testWriteNotWrappedProcessed(HANDLE hCon, COORD sbSize) c.X = sbSize.X - 3; c.Y = 0; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-4\n"); - ok(WriteConsole(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); + ok(WriteConsoleA(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); c.Y = 0; for (p = mylen2 - 3; p < mylen2; p++) { @@ -369,7 +369,7 @@ static void testWriteWrappedNotProcessed(HANDLE hCon, COORD sbSize) c.X = sbSize.X - 9; c.Y = 0; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-9\n"); - ok(WriteConsole(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); + ok(WriteConsoleA(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); c.Y = 0; for (p = 0; p < mylen; p++) { @@ -406,7 +406,7 @@ static void testWriteWrappedProcessed(HANDLE hCon, COORD sbSize) c.X = sbSize.X - 9; c.Y = 0; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-9\n"); - ok(WriteConsole(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); + ok(WriteConsoleA(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); for (p = 0; p < 4; p++) { c.X = sbSize.X - 9 + p; @@ -431,7 +431,7 @@ static void testWriteWrappedProcessed(HANDLE hCon, COORD sbSize) c.X = sbSize.X - 3; c.Y = 2; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-3\n"); - ok(WriteConsole(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); + ok(WriteConsoleA(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); for (p = 0; p < 3; p++) { c.X = sbSize.X - 3 + p; @@ -504,7 +504,7 @@ static void testScroll(HANDLE hCon, COORD sbSize) clip.Top = 0; clip.Bottom = sbSize.Y - 1; - ok(ScrollConsoleScreenBuffer(hCon, &scroll, NULL, dst, &ci), "Scrolling SB\n"); + ok(ScrollConsoleScreenBufferA(hCon, &scroll, NULL, dst, &ci), "Scrolling SB\n"); for (c.Y = 0; c.Y < sbSize.Y; c.Y++) { @@ -539,7 +539,7 @@ static void testScroll(HANDLE hCon, COORD sbSize) clip.Top = 0; clip.Bottom = sbSize.Y - 1; - ok(ScrollConsoleScreenBuffer(hCon, &scroll, NULL, dst, &ci), "Scrolling SB\n"); + ok(ScrollConsoleScreenBufferA(hCon, &scroll, NULL, dst, &ci), "Scrolling SB\n"); for (c.Y = 0; c.Y < sbSize.Y; c.Y++) { @@ -574,7 +574,7 @@ static void testScroll(HANDLE hCon, COORD sbSize) clip.Bottom = min(H + H / 2, sbSize.Y - 1); SetLastError(0xdeadbeef); - ret = ScrollConsoleScreenBuffer(hCon, &scroll, &clip, dst, &ci); + ret = ScrollConsoleScreenBufferA(hCon, &scroll, &clip, dst, &ci); if (ret) { for (c.Y = 0; c.Y < sbSize.Y; c.Y++) @@ -617,7 +617,7 @@ static void testScroll(HANDLE hCon, COORD sbSize) clip.Top = H / 2; clip.Bottom = min(H + H / 2, sbSize.Y - 1); - ok(ScrollConsoleScreenBuffer(hCon, &scroll, &clip, dst, &ci), "Scrolling SB\n"); + ok(ScrollConsoleScreenBufferA(hCon, &scroll, &clip, dst, &ci), "Scrolling SB\n"); for (c.Y = 0; c.Y < sbSize.Y; c.Y++) { @@ -927,7 +927,7 @@ static void test_GetSetConsoleInputExeName(void) ok(ret, "GetConsoleInputExeNameA failed\n"); ok(error == ERROR_BUFFER_OVERFLOW, "got %u expected ERROR_BUFFER_OVERFLOW\n", error); - GetModuleFileNameA(GetModuleHandle(NULL), module, sizeof(module)); + GetModuleFileNameA(GetModuleHandleA(NULL), module, sizeof(module)); p = strrchr(module, '\\') + 1; ret = pGetConsoleInputExeNameA(sizeof(buffer)/sizeof(buffer[0]), buffer);

1 0

Dmitry Timoshkov : kernel32/tests: Fix debugger tests compilation with __WINESRC__ defined.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: 79ac1fa33f993da192c5f41ba2d1fe31db0d310b URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ac1fa33f993da192c5f41ba… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:01:42 2013 +0900 kernel32/tests: Fix debugger tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/debugger.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index e578cdd..41e4f1a 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -113,9 +113,9 @@ static void get_events(const char* name, HANDLE *start_event, HANDLE *done_event event_name=HeapAlloc(GetProcessHeap(), 0, 6+strlen(basename)+1); sprintf(event_name, "start_%s", basename); - *start_event=CreateEvent(NULL, 0,0, event_name); + *start_event=CreateEventA(NULL, 0,0, event_name); sprintf(event_name, "done_%s", basename); - *done_event=CreateEvent(NULL, 0,0, event_name); + *done_event=CreateEventA(NULL, 0,0, event_name); HeapFree(GetProcessHeap(), 0, event_name); } @@ -429,8 +429,8 @@ static void test_ExitCode(void) reg_save_value auto_value; reg_save_value debugger_value; - GetModuleFileNameA(GetModuleHandle(NULL), test_exe, sizeof(test_exe)); - if (GetFileAttributes(test_exe) == INVALID_FILE_ATTRIBUTES) + GetModuleFileNameA(GetModuleHandleA(NULL), test_exe, sizeof(test_exe)); + if (GetFileAttributesA(test_exe) == INVALID_FILE_ATTRIBUTES) strcat(test_exe, ".so"); if (GetFileAttributesA(test_exe) == INVALID_FILE_ATTRIBUTES) { @@ -686,7 +686,7 @@ static void doChildren(int argc, char **argv) p = p ? p+1 : blackbox_file; strcpy(event_name, p); strcat(event_name, "_init"); - event = OpenEvent(EVENT_ALL_ACCESS, FALSE, event_name); + event = OpenEventA(EVENT_ALL_ACCESS, FALSE, event_name); child_ok(event != NULL, "OpenEvent failed, last error %d.\n", GetLastError()); SetEvent(event); CloseHandle(event); @@ -695,7 +695,7 @@ static void doChildren(int argc, char **argv) p = p ? p+1 : blackbox_file; strcpy(event_name, p); strcat(event_name, "_attach"); - event = OpenEvent(EVENT_ALL_ACCESS, FALSE, event_name); + event = OpenEventA(EVENT_ALL_ACCESS, FALSE, event_name); child_ok(event != NULL, "OpenEvent failed, last error %d.\n", GetLastError()); WaitForSingleObject(event, INFINITE); CloseHandle(event); @@ -747,14 +747,14 @@ static void test_debug_children(char *name, DWORD flag, BOOL debug_child) p = p ? p+1 : blackbox_file; strcpy(event_name, p); strcat(event_name, "_init"); - event_init = CreateEvent(NULL, FALSE, FALSE, event_name); + event_init = CreateEventA(NULL, FALSE, FALSE, event_name); ok(event_init != NULL, "OpenEvent failed, last error %d.\n", GetLastError()); p = strrchr(blackbox_file, '\\'); p = p ? p+1 : blackbox_file; strcpy(event_name, p); strcat(event_name, "_attach"); - event_attach = CreateEvent(NULL, FALSE, flag!=0, event_name); + event_attach = CreateEventA(NULL, FALSE, flag!=0, event_name); ok(event_attach != NULL, "CreateEvent failed, last error %d.\n", GetLastError()); memset(&si, 0, sizeof(si)); @@ -814,12 +814,12 @@ START_TEST(debugger) { HMODULE hdll; - hdll=GetModuleHandle("kernel32.dll"); + hdll=GetModuleHandleA("kernel32.dll"); pCheckRemoteDebuggerPresent=(void*)GetProcAddress(hdll, "CheckRemoteDebuggerPresent"); pDebugActiveProcessStop=(void*)GetProcAddress(hdll, "DebugActiveProcessStop"); pDebugSetProcessKillOnExit=(void*)GetProcAddress(hdll, "DebugSetProcessKillOnExit"); pIsDebuggerPresent=(void*)GetProcAddress(hdll, "IsDebuggerPresent"); - hdll=GetModuleHandle("ntdll.dll"); + hdll=GetModuleHandleA("ntdll.dll"); if (hdll) pNtCurrentTeb = (void*)GetProcAddress(hdll, "NtCurrentTeb"); myARGC=winetest_get_mainargs(&myARGV);

1 0

Dmitry Timoshkov : kernel32/tests: Fix fiber tests compilation with __WINESRC__ defined.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: f8fbe80cc724b017990f8079d24fdb98760957a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8fbe80cc724b017990f8079d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:01:46 2013 +0900 kernel32/tests: Fix fiber tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/fiber.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 0e68535..96f60d0 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -39,7 +39,7 @@ static WORD cbCount; static VOID init_funcs(void) { - HMODULE hKernel32 = GetModuleHandle("kernel32"); + HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); #define X(f) p##f = (void*)GetProcAddress(hKernel32, #f); X(CreateFiber);

1 0

Dmitry Timoshkov : kernel32/tests: Fix file tests compilation with __WINESRC__ defined.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: 8014c7cbbb21ed508804ebac20ff015349811afa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8014c7cbbb21ed508804ebac2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:01:55 2013 +0900 kernel32/tests: Fix file tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/file.c | 96 ++++++++++++++++++++++---------------------- 1 files changed, 48 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8014c7cbbb21ed508804e…

1 0

Dmitry Timoshkov : kernel32/tests: Fix FormatMessage tests compilation with __WINESRC__ defined.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: d44cc84381604fc0708caa366c6921a3e4a2910d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d44cc84381604fc0708caa366… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:01:59 2013 +0900 kernel32/tests: Fix FormatMessage tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/format_msg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 005e6c4..e98e083 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -1543,7 +1543,7 @@ static void test_message_from_hmodule(void) HMODULE h; CHAR out[0x100] = {0}; - h = GetModuleHandle("kernel32.dll"); + h = GetModuleHandleA("kernel32.dll"); ok(h != 0, "GetModuleHandle failed\n"); /*Test existing messageID; as the message strings from wine's kernel32 differ from windows' kernel32 we don't compare

1 0

Francois Gouget : oleaut32/tests: Make the uk_*() methods static.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: 5098cd62467ced28d15a1380a6420401f0308ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5098cd62467ced28d15a1380a… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 19 13:29:26 2013 +0200 oleaut32/tests: Make the uk_*() methods static. --- dlls/oleaut32/tests/typelib.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 9f6fa1f..613a27d 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -5052,17 +5052,17 @@ static void test_GetLibAttr(void) ITypeLib_Release(tl); } -HRESULT WINAPI uk_QueryInterface(IUnknown *obj, REFIID iid, void **out) +static HRESULT WINAPI uk_QueryInterface(IUnknown *obj, REFIID iid, void **out) { return E_NOINTERFACE; } -ULONG WINAPI uk_AddRef(IUnknown *obj) +static ULONG WINAPI uk_AddRef(IUnknown *obj) { return 2; } -ULONG WINAPI uk_Release(IUnknown *obj) +static ULONG WINAPI uk_Release(IUnknown *obj) { return 1; }

1 0

Frédéric Delanoy : windowscodecs/tests: Use BOOL type where appropriate.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: 98757d12cf58f55f8d9c09c01c915c63b30e046b URL: http://source.winehq.org/git/wine.git/?a=commit;h=98757d12cf58f55f8d9c09c01… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 19 15:28:48 2013 +0200 windowscodecs/tests: Use BOOL type where appropriate. --- dlls/windowscodecs/tests/converter.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index b77e455..6c3d232 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -338,7 +338,7 @@ static void test_default_converter(void) { BitmapTestSrc *src_obj; IWICFormatConverter *converter; - BOOL can_convert=1; + BOOL can_convert = TRUE; HRESULT hr; CreateTestBitmap(&testdata_32bppBGRA, &src_obj); @@ -647,18 +647,18 @@ START_TEST(converter) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - test_conversion(&testdata_32bppBGRA, &testdata_32bppBGR, "BGRA -> BGR", 0); - test_conversion(&testdata_32bppBGR, &testdata_32bppBGRA, "BGR -> BGRA", 0); - test_conversion(&testdata_32bppBGRA, &testdata_32bppBGRA, "BGRA -> BGRA", 0); + test_conversion(&testdata_32bppBGRA, &testdata_32bppBGR, "BGRA -> BGR", FALSE); + test_conversion(&testdata_32bppBGR, &testdata_32bppBGRA, "BGR -> BGRA", FALSE); + test_conversion(&testdata_32bppBGRA, &testdata_32bppBGRA, "BGRA -> BGRA", FALSE); - test_conversion(&testdata_24bppBGR, &testdata_24bppBGR, "24bppBGR -> 24bppBGR", 0); - test_conversion(&testdata_24bppBGR, &testdata_24bppRGB, "24bppBGR -> 24bppRGB", 0); + test_conversion(&testdata_24bppBGR, &testdata_24bppBGR, "24bppBGR -> 24bppBGR", FALSE); + test_conversion(&testdata_24bppBGR, &testdata_24bppRGB, "24bppBGR -> 24bppRGB", FALSE); - test_conversion(&testdata_24bppRGB, &testdata_24bppRGB, "24bppRGB -> 24bppRGB", 0); - test_conversion(&testdata_24bppRGB, &testdata_24bppBGR, "24bppRGB -> 24bppBGR", 0); + test_conversion(&testdata_24bppRGB, &testdata_24bppRGB, "24bppRGB -> 24bppRGB", FALSE); + test_conversion(&testdata_24bppRGB, &testdata_24bppBGR, "24bppRGB -> 24bppBGR", FALSE); - test_conversion(&testdata_32bppBGR, &testdata_24bppRGB, "32bppBGR -> 24bppRGB", 0); - test_conversion(&testdata_24bppRGB, &testdata_32bppBGR, "24bppRGB -> 32bppBGR", 0); + test_conversion(&testdata_32bppBGR, &testdata_24bppRGB, "32bppBGR -> 24bppRGB", FALSE); + test_conversion(&testdata_24bppRGB, &testdata_32bppBGR, "24bppRGB -> 32bppBGR", FALSE); test_invalid_conversion(); test_default_converter();

1 0

Frédéric Delanoy : shell32/tests: Use BOOL type where appropriate.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: 44b2fd269ecfe31d1c25e6982390749a909027c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44b2fd269ecfe31d1c25e6982… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 19 15:28:49 2013 +0200 shell32/tests: Use BOOL type where appropriate. --- dlls/shell32/tests/brsfolder.c | 4 ++-- dlls/shell32/tests/shellpath.c | 6 +++--- dlls/shell32/tests/shlexec.c | 2 +- dlls/shell32/tests/shlfolder.c | 7 ++++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c index f8e8e16..ad062d0 100644 --- a/dlls/shell32/tests/brsfolder.c +++ b/dlls/shell32/tests/brsfolder.c @@ -296,9 +296,9 @@ static int CALLBACK selection_callback(HWND hwnd, UINT uMsg, LPARAM lParam, LPAR ok(!ret, "SendMessage returned: %u\n", ret); SendMessage(hwnd, WM_COMMAND, IDOK, 0); - return TRUE; + return 1; default: - return FALSE; + return 0; } } diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 729a341..5014d9f 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -687,12 +687,12 @@ static char **myARGV; static char base[MAX_PATH]; static char selfname[MAX_PATH]; -static int init(void) +static BOOL init(void) { myARGC = winetest_get_mainargs(&myARGV); - if (!GetCurrentDirectoryA(sizeof(base), base)) return 0; + if (!GetCurrentDirectoryA(sizeof(base), base)) return FALSE; strcpy(selfname, myARGV[0]); - return 1; + return TRUE; } static void doChild(const char *arg) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 131e334..9e5ce32 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1885,7 +1885,7 @@ static void test_find_executable(void) } if (rc > 32) { - int equal; + BOOL equal; equal=strcmp(command, argv0) == 0 || /* NT4 returns an extra 0x8 character! */ (strlen(command) == strlen(argv0)+1 && strncmp(command, argv0, strlen(argv0)) == 0); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 169426e..c866800 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3001,13 +3001,14 @@ static inline IUnknownImpl *impl_from_IUnknown(IUnknown *iface) static HRESULT WINAPI unk_fnQueryInterface(IUnknown *iunk, REFIID riid, void** punk) { IUnknownImpl *This = impl_from_IUnknown(iunk); - UINT i, found; - for(i = found = 0; This->ifaces[i].id != NULL; i++) + UINT i; + BOOL found = FALSE; + for(i = 0; This->ifaces[i].id != NULL; i++) { if(IsEqualIID(This->ifaces[i].id, riid)) { This->ifaces[i].count++; - found = 1; + found = TRUE; break; } }

1 0

Frédéric Delanoy : windowscodecs: Use BOOL type where appropriate.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: 0153a962f617c9f7530f3e859eeed5e2e26be88a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0153a962f617c9f7530f3e859… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 19 15:28:50 2013 +0200 windowscodecs: Use BOOL type where appropriate. --- dlls/windowscodecs/jpegformat.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index c742f78..5ce8fa0 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -773,13 +773,13 @@ typedef struct JpegEncoder { struct jpeg_compress_struct cinfo; struct jpeg_error_mgr jerr; struct jpeg_destination_mgr dest_mgr; - int initialized; + BOOL initialized; int frame_count; - int frame_initialized; - int started_compress; + BOOL frame_initialized; + BOOL started_compress; int lines_written; - int frame_committed; - int committed; + BOOL frame_committed; + BOOL committed; UINT width, height; double xres, yres; const jpeg_compress_format *format; @@ -1050,7 +1050,7 @@ static HRESULT WINAPI JpegEncoder_Frame_WritePixels(IWICBitmapFrameEncode *iface pjpeg_start_compress(&This->cinfo, TRUE); - This->started_compress = 1; + This->started_compress = TRUE; } row_size = This->format->bpp / 8 * This->width; @@ -1480,13 +1480,13 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->IWICBitmapEncoder_iface.lpVtbl = &JpegEncoder_Vtbl; This->IWICBitmapFrameEncode_iface.lpVtbl = &JpegEncoder_FrameVtbl; This->ref = 1; - This->initialized = 0; + This->initialized = FALSE; This->frame_count = 0; - This->frame_initialized = 0; - This->started_compress = 0; + This->frame_initialized = FALSE; + This->started_compress = FALSE; This->lines_written = 0; - This->frame_committed = 0; - This->committed = 0; + This->frame_committed = FALSE; + This->committed = FALSE; This->width = This->height = 0; This->xres = This->yres = 0.0; This->format = NULL;

1 0

Ken Thomases : winemac: Fix some bytes-vs-WCHARs length computation bugs in the UTF-16 clipboard support .
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: c7f8e71ab6e766003faaf0bde9edee64c1f1b3e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f8e71ab6e766003faaf0bde… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 20 23:54:49 2013 -0500 winemac: Fix some bytes-vs-WCHARs length computation bugs in the UTF-16 clipboard support. --- dlls/winemac.drv/clipboard.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 80fd689..9cfe283 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1007,7 +1007,7 @@ static HANDLE import_utf16_to_unicodetext(CFDataRef data) HANDLE unicode_handle; src = (const WCHAR *)CFDataGetBytePtr(data); - data_len = CFDataGetLength(data); + data_len = CFDataGetLength(data) / sizeof(WCHAR); for (i = 0; i < data_len; i++) { if (src[i] == '\n') @@ -1358,13 +1358,13 @@ static CFDataRef export_unicodetext_to_utf16(HANDLE data) dst_len = GlobalSize(data) / sizeof(WCHAR); if (dst_len) dst_len--; /* Leave off null terminator. */ - ret = CFDataCreateMutable(NULL, dst_len); + ret = CFDataCreateMutable(NULL, dst_len * sizeof(WCHAR)); if (ret) { LPWSTR dst; int i, j; - CFDataSetLength(ret, dst_len); + CFDataSetLength(ret, dst_len * sizeof(WCHAR)); dst = (LPWSTR)CFDataGetMutableBytePtr(ret); /* Remove carriage returns */ @@ -1375,7 +1375,7 @@ static CFDataRef export_unicodetext_to_utf16(HANDLE data) continue; dst[j++] = src[i]; } - CFDataSetLength(ret, j); + CFDataSetLength(ret, j * sizeof(WCHAR)); } GlobalUnlock(data);

1 0