wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Eric Pouech : explorerframe/tests: Use correct integral type.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 4bd7b55df3eb85b6ed30b1a3068d69fc264d185e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bd7b55df3eb85b6ed30b1a3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:29:28 2022 +0100 explorerframe/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/tests/nstc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 6433b69ebf8..617c93d9b09 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -910,7 +910,7 @@ static void test_basics(void) ok(style == tmp, "Got style %x (expected %x)\n", style, tmp); if(SUCCEEDED(hr)) { - DWORD tmp2; + NSTCSTYLE tmp2; for(i = 0; styles[i] != 0; i++) { hr = INameSpaceTreeControl2_GetControlStyle(pnstc2, styles[i], &tmp2); @@ -966,7 +966,7 @@ static void test_basics(void) ok(style2 == tmp, "Got style %x (expected %x)\n", style2, tmp); if(SUCCEEDED(hr)) { - DWORD tmp2; + NSTCSTYLE2 tmp2; for(i = 0; styles2[i] != 0; i++) { hr = INameSpaceTreeControl2_GetControlStyle2(pnstc2, styles2[i], &tmp2); @@ -1372,7 +1372,7 @@ static void test_basics(void) ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { - UINT count; + DWORD count; hr = IShellItemArray_GetCount(psia, &count); ok(hr == S_OK, "Got 0x%08x\n", hr); ok(count == 1, "Got %d selected items.\n", count); @@ -1400,7 +1400,7 @@ static void test_basics(void) ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { - UINT count; + DWORD count; hr = IShellItemArray_GetCount(psia, &count); ok(hr == S_OK, "Got 0x%08x\n", hr); ok(count == 1, "Got %d selected items.\n", count); @@ -1426,7 +1426,7 @@ static void test_basics(void) ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { - UINT count; + DWORD count; hr = IShellItemArray_GetCount(psia, &count); ok(hr == S_OK, "Got 0x%08x\n", hr); ok(count == 1, "Got %d selected items.\n", count);

1 0

Eric Pouech : dxdiagn/tests: Enable compilation with long types.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 309a564dccf93dc952f6379ac23dcbf631311e87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=309a564dccf93dc952f6379a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:29:15 2022 +0100 dxdiagn/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/tests/Makefile.in | 1 - dlls/dxdiagn/tests/container.c | 174 ++++++++++++++++++++--------------------- dlls/dxdiagn/tests/provider.c | 30 +++---- 3 files changed, 102 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=309a564dccf93dc952f6…

1 0

Eric Pouech : dwmapi/tests: Enable compilation with long types.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 261bf4910ef821358d623d1efbbcf8e79bae580b URL: https://source.winehq.org/git/wine.git/?a=commit;h=261bf4910ef821358d623d1e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:28:56 2022 +0100 dwmapi/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/tests/Makefile.in | 1 - dlls/dwmapi/tests/dwmapi.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dwmapi/tests/Makefile.in b/dlls/dwmapi/tests/Makefile.in index 8821fb5b0fb..6c6130401d6 100644 --- a/dlls/dwmapi/tests/Makefile.in +++ b/dlls/dwmapi/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dwmapi.dll IMPORTS = dwmapi diff --git a/dlls/dwmapi/tests/dwmapi.c b/dlls/dwmapi/tests/dwmapi.c index 1904e283bba..7cb9eb424f1 100644 --- a/dlls/dwmapi/tests/dwmapi.c +++ b/dlls/dwmapi/tests/dwmapi.c @@ -25,11 +25,11 @@ static void test_DwmIsCompositionEnabled(void) HRESULT hr; hr = DwmIsCompositionEnabled(NULL); - ok(hr == E_INVALIDARG, "Expected %#x, got %#x.\n", E_INVALIDARG, hr); + ok(hr == E_INVALIDARG, "Expected %#lx, got %#lx.\n", E_INVALIDARG, hr); enabled = -1; hr = DwmIsCompositionEnabled(&enabled); - ok(hr == S_OK, "Expected %#x, got %#x.\n", S_OK, hr); + ok(hr == S_OK, "Expected %#lx, got %#lx.\n", S_OK, hr); ok(enabled == TRUE || enabled == FALSE, "Got unexpected %#x.\n", enabled); }

1 0

Eric Pouech : dssenh/tests: Enable compilation with long types.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: e792a609741b271d0edc21bde69988b1234bb00a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e792a609741b271d0edc21bd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:28:50 2022 +0100 dssenh/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/tests/Makefile.in | 1 - dlls/dssenh/tests/dssenh.c | 254 +++++++++++++++++++++--------------------- 2 files changed, 127 insertions(+), 128 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e792a609741b271d0edc…

1 0

Eric Pouech : dsdmo/tests: Enable compilation with long types.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: efa323405d65ba5b332072c20e933b5034ef8daf URL: https://source.winehq.org/git/wine.git/?a=commit;h=efa323405d65ba5b332072c2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:28:38 2022 +0100 dsdmo/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsdmo/tests/Makefile.in | 1 - dlls/dsdmo/tests/dsdmo.c | 170 +++++++++++++++++++++---------------------- 2 files changed, 85 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=efa323405d65ba5b3320…

1 0

Eric Pouech : dpvoice/tests: Enable compilation with long types.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 2b78dfb5bcf51197f4ce048de607424db85596f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b78dfb5bcf51197f4ce048d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:28:32 2022 +0100 dpvoice/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpvoice/tests/Makefile.in | 1 - dlls/dpvoice/tests/voice.c | 100 ++++++++++++++++++++--------------------- 2 files changed, 50 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2b78dfb5bcf51197f4ce…

1 0

Eric Pouech : directmanipulation/tests: Enable compilation with long types.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 2f858cc06494f3a8e50f0c6ff3dd6f1270badb93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f858cc06494f3a8e50f0c6f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:27:50 2022 +0100 directmanipulation/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/tests/Makefile.in | 1 - dlls/directmanipulation/tests/manipulation.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/directmanipulation/tests/Makefile.in b/dlls/directmanipulation/tests/Makefile.in index 6fa94fa3cc6..29ec0db511a 100644 --- a/dlls/directmanipulation/tests/Makefile.in +++ b/dlls/directmanipulation/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = directmanipulation.dll IMPORTS = uuid ole32 diff --git a/dlls/directmanipulation/tests/manipulation.c b/dlls/directmanipulation/tests/manipulation.c index 93b692729b3..92c8ddd9edd 100644 --- a/dlls/directmanipulation/tests/manipulation.c +++ b/dlls/directmanipulation/tests/manipulation.c @@ -39,10 +39,10 @@ static void test_IDirectManipulationManager2(void) win_skip("Failed to create XMLView instance\n"); return; } - ok(hres == S_OK, "CoCreateInstance returned %x, expected S_OK\n", hres); + ok(hres == S_OK, "CoCreateInstance returned %lx, expected S_OK\n", hres); hres = IDirectManipulationManager2_GetUpdateManager(manager2, &IID_IDirectManipulationUpdateManager, (void**)&update); - ok(hres == S_OK, "returned %x, expected S_OK\n", hres); + ok(hres == S_OK, "returned %lx, expected S_OK\n", hres); if(update) IDirectManipulationUpdateManager_Release(update);

1 0

Eric Pouech : dhcpcsvc/tests: Enable compilation with long types.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 20ca4e9a06442fa1865a8f63a2bdfc6aa3404399 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20ca4e9a06442fa1865a8f63… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:27:45 2022 +0100 dhcpcsvc/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhcpcsvc/tests/Makefile.in | 1 - dlls/dhcpcsvc/tests/dhcpcsvc.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/dhcpcsvc/tests/Makefile.in b/dlls/dhcpcsvc/tests/Makefile.in index 1f1e6acb7ce..47440eb2cd4 100644 --- a/dlls/dhcpcsvc/tests/Makefile.in +++ b/dlls/dhcpcsvc/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dhcpcsvc.dll IMPORTS = dhcpcsvc iphlpapi diff --git a/dlls/dhcpcsvc/tests/dhcpcsvc.c b/dlls/dhcpcsvc/tests/dhcpcsvc.c index 547fb515329..52b1b150ad8 100644 --- a/dlls/dhcpcsvc/tests/dhcpcsvc.c +++ b/dlls/dhcpcsvc/tests/dhcpcsvc.c @@ -56,24 +56,24 @@ static void test_DhcpRequestParams(void) for (ptr = adapters; ptr; ptr = ptr->Next) { MultiByteToWideChar( CP_ACP, 0, ptr->AdapterName, -1, name, ARRAY_SIZE(name) ); - trace( "adapter '%s' type %u dhcpv4 enabled %d\n", wine_dbgstr_w(ptr->Description), ptr->IfType, ptr->Dhcpv4Enabled ); + trace( "adapter '%s' type %lu dhcpv4 enabled %d\n", wine_dbgstr_w(ptr->Description), ptr->IfType, ptr->Dhcpv4Enabled ); if (ptr->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; memset( &send_params, 0, sizeof(send_params) ); memset( &recv_params, 0, sizeof(recv_params) ); err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, NULL, NULL, send_params, recv_params, NULL, NULL, NULL ); - ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err ); + ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err ); err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, nosuchW, NULL, send_params, recv_params, NULL, NULL, NULL ); - ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err ); + ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err ); err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, NULL, NULL, NULL ); - ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err ); + ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err ); size = 0; err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, NULL, &size, NULL ); - ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err ); + ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err ); memset( params, 0, sizeof(params) ); params[0].OptionId = OPTION_SUBNET_MASK; @@ -106,8 +106,8 @@ static void test_DhcpRequestParams(void) case OPTION_BROADCAST_ADDRESS: if (params[i].Data) { - ok( params[i].nBytesData == sizeof(DWORD), "got %u\n", params[i].nBytesData ); - trace( "%u: Data %p (%08x) nBytesData %u OptionId %u Flags %08x IsVendor %d\n", + ok( params[i].nBytesData == sizeof(DWORD), "got %lu\n", params[i].nBytesData ); + trace( "%lu: Data %p (%08lx) nBytesData %lu OptionId %lu Flags %08lx IsVendor %d\n", i, params[i].Data, *(DWORD *)params[i].Data, params[i].nBytesData, params[i].OptionId, params[i].Flags, params[i].IsVendor ); } @@ -120,14 +120,14 @@ static void test_DhcpRequestParams(void) char *str = HeapAlloc( GetProcessHeap(), 0, params[i].nBytesData + 1 ); memcpy( str, params[i].Data, params[i].nBytesData ); str[params[i].nBytesData] = 0; - trace( "%u: Data %p (%s) nBytesData %u OptionId %u Flags %08x IsVendor %d\n", + trace( "%lu: Data %p (%s) nBytesData %lu OptionId %lu Flags %08lx IsVendor %d\n", i, params[i].Data, str, params[i].nBytesData, params[i].OptionId, params[i].Flags, params[i].IsVendor ); HeapFree( GetProcessHeap(), 0, str ); } break; default: - ok( 0, "unexpected option %u\n", params[i].OptionId ); + ok( 0, "unexpected option %lu\n", params[i].OptionId ); break; } }

1 0

Eric Pouech : dbghelp/tests: Enable compilation with long types.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 56681b53144085d3a77ea7b638d414911ca60292 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56681b53144085d3a77ea7b6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:27:18 2022 +0100 dbghelp/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/tests/Makefile.in | 1 - dlls/dbghelp/tests/dbghelp.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/tests/Makefile.in b/dlls/dbghelp/tests/Makefile.in index 408431fb516..31e5b01e8a8 100644 --- a/dlls/dbghelp/tests/Makefile.in +++ b/dlls/dbghelp/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dbghelp.dll IMPORTS = dbghelp diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index b7e828281cd..73f8ee5f14f 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -26,7 +26,7 @@ static DWORD CALLBACK stack_walk_thread(void *arg) { DWORD count = SuspendThread(GetCurrentThread()); - ok(!count, "got %d\n", count); + ok(!count, "got %ld\n", count); return 0; } @@ -86,7 +86,7 @@ static void test_stack_walk(void) /* first invocation just calculates the return address */ ret = StackWalk64(machine, GetCurrentProcess(), thread, &frame, &ctx, NULL, SymFunctionTableAccess64, SymGetModuleBase64, NULL); - ok(ret, "StackWalk64() failed: %u\n", GetLastError()); + ok(ret, "StackWalk64() failed: %lu\n", GetLastError()); ok(frame.AddrPC.Offset == frame0.AddrPC.Offset, "expected %s, got %s\n", wine_dbgstr_longlong(frame0.AddrPC.Offset), wine_dbgstr_longlong(frame.AddrPC.Offset)); @@ -102,7 +102,7 @@ static void test_stack_walk(void) ret = StackWalk64(machine, GetCurrentProcess(), thread, &frame, &ctx, NULL, SymFunctionTableAccess64, SymGetModuleBase64, NULL); - ok(ret, "StackWalk64() failed: %u\n", GetLastError()); + ok(ret, "StackWalk64() failed: %lu\n", GetLastError()); addr = (void *)(DWORD_PTR)frame.AddrPC.Offset; @@ -199,11 +199,11 @@ START_TEST(dbghelp) SetEnvironmentVariableA("_NT_ALT_SYMBOL_PATH", NULL); ret = SymInitialize(GetCurrentProcess(), NULL, TRUE); - ok(ret, "got error %u\n", GetLastError()); + ok(ret, "got error %lu\n", GetLastError()); test_stack_walk(); test_search_path(); ret = SymCleanup(GetCurrentProcess()); - ok(ret, "got error %u\n", GetLastError()); + ok(ret, "got error %lu\n", GetLastError()); }

1 0

Eric Pouech : comctl32/tests: Use inline function in expect*() macros to handle integral conversion.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 2596bd57c6c0db410fce39af5a47fd119ac52388 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2596bd57c6c0db410fce39af… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:26:53 2022 +0100 comctl32/tests: Use inline function in expect*() macros to handle integral conversion. depending on the files, these macros can be called with: - UINT/UINT, DWORD/DWORD pairs, but also UINT/DWORD or DWORD/UINT pairs... - wrapping inside an inline function allows the compiler to take care of the integral conversions Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/dpa.c | 6 +++++- dlls/comctl32/tests/edit.c | 7 +++++-- dlls/comctl32/tests/header.c | 6 +++++- dlls/comctl32/tests/listview.c | 16 +++++++++++++--- dlls/comctl32/tests/monthcal.c | 13 +++++++++++-- dlls/comctl32/tests/tab.c | 7 ++++++- dlls/comctl32/tests/trackbar.c | 7 ++++++- dlls/comctl32/tests/treeview.c | 6 +++++- dlls/comctl32/tests/updown.c | 6 +++++- 9 files changed, 61 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 4a446a8e2c5..841076ef00f 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -32,7 +32,11 @@ #include "wine/test.h" #include "v6util.h" -#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %d, got %d\n", expected, got); +} typedef struct _STREAMDATA { diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 7fcc44eb4a1..2c108ed419c 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -2032,8 +2032,11 @@ static void test_margins_font_change(void) } -#define edit_pos_ok(exp, got, txt) \ - ok(exp == got, "wrong " #txt " expected %d got %d\n", exp, got); +#define edit_pos_ok(expected, got, txt) edit_pos_ok_(__LINE__, expected, got, #txt) +static inline void edit_pos_ok_(unsigned line, DWORD expected, DWORD got, const char* txt) +{ + ok_(__FILE__, line)(expected == got, "wrong %s expected %d got %d\n", txt, expected, got); +} #define check_pos(hwEdit, set_height, test_top, test_height, test_left) \ do { \ diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 3428936cd75..143bc8f84f4 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -56,7 +56,11 @@ static HWND hWndHeader; #define compare(val, exp, fmt) ok((val) == (exp), #val " value: " fmt ", expected: " fmt "\n", (val), (exp)) -#define expect(expected, got) ok(expected == got, "expected %d, got %d\n", expected,got) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %d, got %d\n", expected, got); +} #define NUM_MSG_SEQUENCES 2 #define PARENT_SEQ_INDEX 0 diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 3810cd8f4bc..1718bf71342 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -46,9 +46,19 @@ enum seq_index { #define LISTVIEW_ID 0 #define HEADER_ID 1 -#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) -#define expect2(expected1, expected2, got1, got2) ok(expected1 == got1 && expected2 == got2, \ - "expected (%d,%d), got (%d,%d)\n", expected1, expected2, got1, got2) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %d, got %d\n", expected, got); +} + +#define expect2(expected1, expected2, got1, got2) expect2_(__LINE__, expected1, expected2, got1, got2) +static inline void expect2_(unsigned line, DWORD expected1, DWORD expected2, DWORD got1, DWORD got2) +{ + ok_(__FILE__, line)(expected1 == got1 && expected2 == got2, + "expected (%d,%d), got (%d,%d)\n", + expected1, expected2, got1, got2); +} static HWND hwndparent, hwndparentW; /* prevents edit box creation, LVN_BEGINLABELEDIT return value */ diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index ae528a0ddb2..5b950ac76c3 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -32,8 +32,17 @@ #include <windows.h> #include "msg.h" -#define expect(expected, got) ok(expected == got, "Expected %d, got %d\n", expected, got); -#define expect_hex(expected, got) ok(expected == got, "Expected %x, got %x\n", expected, got); +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %d, got %d\n", expected, got); +} + +#define expect_hex(expected,got) expect_hex_(__LINE__, expected, got) +static inline void expect_hex_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %x, got %x\n", expected, got); +} #define expect_d(expected, got) ok(abs((expected) - (got)) <= 2, "Expected %d, got %d\n", expected, got); #define NUM_MSG_SEQUENCES 2 diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 9685c8d37f5..c5d57af114d 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -34,7 +34,12 @@ #define PARENT_SEQ_INDEX 0 #define TAB_SEQ_INDEX 1 -#define expect(expected, got) ok ( expected == got, "Expected %d, got %d\n", expected, got) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %d, got %d\n", expected, got); +} + #define expect_str(expected, got)\ ok ( strcmp(expected, got) == 0, "Expected '%s', got '%s'\n", expected, got) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index eb5464483d0..70b61d4db20 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -25,7 +25,12 @@ #include "msg.h" #include "v6util.h" -#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %d, got %d\n", expected, got); +} + #define NUM_MSG_SEQUENCE 2 #define PARENT_SEQ_INDEX 0 #define TRACKBAR_SEQ_INDEX 1 diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 1804e1886a7..45e2091f3b2 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -57,7 +57,11 @@ static BOOL g_v6; #define PARENT_SEQ_INDEX 1 #define PARENT_CD_SEQ_INDEX 2 -#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %d, got %d\n", expected, got); +} static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; static struct msg_sequence *item_sequence[1]; diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 97afcb042f6..6ffdcb9e1ab 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -50,7 +50,11 @@ #include "wine/test.h" #include "msg.h" -#define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %d, got %d\n", expected, got); +} #define NUM_MSG_SEQUENCES 3 #define PARENT_SEQ_INDEX 0

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022