[PATCH 0/6] MR7081: Don't test functions directly when reporting GetLastError()
From: André Zwing <nerv(a)dawncrow.de> --- dlls/kernel32/tests/locale.c | 4 ++-- dlls/kernel32/tests/resource.c | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 625a2ceac2b..60fa7d99a8a 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2970,8 +2970,8 @@ static void test_LocaleNameToLCID(void) buffer[0] = 0; SetLastError(0xdeadbeef); lcid = LocaleNameToLCID(LOCALE_NAME_SYSTEM_DEFAULT, 0); - ok(lcid == GetSystemDefaultLCID(), - "Expected lcid == %08lx, got %08lx, error %ld\n", GetSystemDefaultLCID(), lcid, GetLastError()); + expect = GetSystemDefaultLCID(); + ok(lcid == expect, "Expected lcid == %08lx, got %08lx, error %ld\n", expect, lcid, GetLastError()); ret = pLCIDToLocaleName(lcid, buffer, LOCALE_NAME_MAX_LENGTH, 0); ok(ret > 0, "Expected ret > 0, got %d, error %ld\n", ret, GetLastError()); trace("%08lx, %s\n", lcid, wine_dbgstr_w(buffer)); diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index 5f42d443eec..4af5ab83644 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -714,7 +714,8 @@ static void test_mui(void) ok( res != NULL, "BeginUpdateResourceW failed: %ld\n", GetLastError() ); r = UpdateResourceW( res, L"MUI", MAKEINTRESOURCEW(1), 0, &ln_mui_res, 4 ); ok( r, "UpdateResource failed: %ld\n", GetLastError() ); - ok( EndUpdateResourceW( res, FALSE ), "EndUpdateResourceW failed: %ld\n", GetLastError() ); + r = EndUpdateResourceW( res, FALSE ); + ok( r, "EndUpdateResourceW failed: %ld\n", GetLastError() ); size = 0; r = GetFileMUIInfo( MUI_QUERY_TYPE | MUI_QUERY_CHECKSUM | MUI_QUERY_LANGUAGE_NAME @@ -726,7 +727,8 @@ static void test_mui(void) ok( res != NULL, "BeginUpdateResourceW failed: %ld\n", GetLastError() ); r = UpdateResourceW( res, L"MUI", MAKEINTRESOURCEW(1), 0, &ln_mui_res, sizeof(ln_mui_res) ); ok( r, "UpdateResource failed: %ld\n", GetLastError() ); - ok( EndUpdateResourceW( res, FALSE ), "EndUpdateResourceW failed: %ld\n", GetLastError() ); + r = EndUpdateResourceW( res, FALSE ); + ok( r, "EndUpdateResourceW failed: %ld\n", GetLastError() ); size = 0; r = GetFileMUIInfo( MUI_QUERY_TYPE | MUI_QUERY_CHECKSUM | MUI_QUERY_LANGUAGE_NAME @@ -775,7 +777,8 @@ static void test_mui(void) ok( res != NULL, "BeginUpdateResourceW failed: %ld\n", GetLastError() ); r = UpdateResourceW( res, L"MUI", MAKEINTRESOURCEW(1), 0, &en_mui_res, sizeof(en_mui_res) ); ok( r, "UpdateResource failed: %ld\n", GetLastError() ); - ok( EndUpdateResourceW( res, FALSE ), "EndUpdateResourceW failed: %ld\n", GetLastError() ); + r = EndUpdateResourceW( res, FALSE ); + ok( r, "EndUpdateResourceW failed: %ld\n", GetLastError() ); memset( buf, 0xfe, sizeof(buf) ); size = sizeof(buf); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7081
From: André Zwing <nerv(a)dawncrow.de> --- dlls/iphlpapi/tests/iphlpapi.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index da3a06d54ca..397b2e8fad9 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1947,8 +1947,10 @@ static void test_GetExtendedTcpTable_owner( int family ) addr.sin_addr.s_addr = htonl( INADDR_LOOPBACK ); addr.sin_port = 0; - ok( bind( sock, (struct sockaddr *)&addr, addr_len ) == 0, "bind error %d\n", WSAGetLastError() ); - ok( getsockname( sock, (struct sockaddr *)&addr, &addr_len ) == 0, "getsockname error %d\n", WSAGetLastError() ); + ret = bind( sock, (struct sockaddr *)&addr, addr_len ); + ok( !ret, "bind error %d\n", WSAGetLastError() ); + ret = getsockname( sock, (struct sockaddr *)&addr, &addr_len ); + ok( !ret, "getsockname error %d\n", WSAGetLastError() ); port = addr.sin_port; } @@ -1961,8 +1963,10 @@ static void test_GetExtendedTcpTable_owner( int family ) addr.sin6_addr = in6addr_loopback; addr.sin6_port = 0; - ok( bind( sock, (struct sockaddr *)&addr, addr_len ) == 0, "bind error %d\n", WSAGetLastError() ); - ok( getsockname( sock, (struct sockaddr *)&addr, &addr_len ) == 0, "getsockname error %d\n", WSAGetLastError() ); + ret = bind( sock, (struct sockaddr *)&addr, addr_len ); + ok( !ret, "bind error %d\n", WSAGetLastError() ); + ret = getsockname( sock, (struct sockaddr *)&addr, &addr_len ); + ok( !ret, "getsockname error %d\n", WSAGetLastError() ); port = addr.sin6_port; } @@ -2136,8 +2140,10 @@ static void test_GetExtendedUdpTable_owner( int family ) addr.sin_addr.s_addr = htonl( INADDR_LOOPBACK ); addr.sin_port = 0; - ok( bind( sock, (struct sockaddr *)&addr, addr_len ) == 0, "bind error %d\n", WSAGetLastError() ); - ok( getsockname( sock, (struct sockaddr *)&addr, &addr_len ) == 0, "getsockname error %d\n", WSAGetLastError() ); + ret = bind( sock, (struct sockaddr *)&addr, addr_len ); + ok( !ret, "bind error %d\n", WSAGetLastError() ); + ret = getsockname( sock, (struct sockaddr *)&addr, &addr_len ); + ok( !ret, "getsockname error %d\n", WSAGetLastError() ); port = addr.sin_port; } @@ -2150,8 +2156,10 @@ static void test_GetExtendedUdpTable_owner( int family ) addr.sin6_addr = in6addr_loopback; addr.sin6_port = 0; - ok( bind( sock, (struct sockaddr *)&addr, addr_len ) == 0, "bind error %d\n", WSAGetLastError() ); - ok( getsockname( sock, (struct sockaddr *)&addr, &addr_len ) == 0, "getsockname error %d\n", WSAGetLastError() ); + ret = bind( sock, (struct sockaddr *)&addr, addr_len ); + ok( !ret, "bind error %d\n", WSAGetLastError() ); + ret = getsockname( sock, (struct sockaddr *)&addr, &addr_len ); + ok( !ret, "getsockname error %d\n", WSAGetLastError() ); port = addr.sin6_port; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7081
From: André Zwing <nerv(a)dawncrow.de> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 48deda7c455..e0123d1a01f 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -676,7 +676,8 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) } else { - ok(GetLastError() == RtlNtStatusToDosErrorNoTeb(expect_status), "got error %lu\n", GetLastError()); + ULONG err = RtlNtStatusToDosErrorNoTeb(expect_status); + ok(GetLastError() == err, "got error %lu\n", GetLastError()); } if (NT_ERROR(expect_status)) ok(size == 0xdeadf00d, "got size %lu\n", size); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7081
From: André Zwing <nerv(a)dawncrow.de> --- dlls/msvcr120/tests/msvcr120.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index e4a67d5c6db..9ee2890d8e6 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -1837,7 +1837,7 @@ static void test_gmtime64(void) static void test__fsopen(void) { - int i; + int i, ret; FILE *f; wchar_t wpath[MAX_PATH]; static const struct { @@ -1858,8 +1858,8 @@ static void test__fsopen(void) } memset(wpath, 0, sizeof(wpath)); - ok(MultiByteToWideChar(CP_ACP, 0, tests[i].path, -1, wpath, MAX_PATH), - "MultiByteToWideChar failed on %s with locale %s: %lx\n", + ret = MultiByteToWideChar(CP_ACP, 0, tests[i].path, -1, wpath, MAX_PATH); + ok(ret, "MultiByteToWideChar failed on %s with locale %s: %lx\n", tests[i].path, tests[i].loc, GetLastError()); f = p__fsopen(tests[i].path, "w", SH_DENYNO); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7081
From: André Zwing <nerv(a)dawncrow.de> --- dlls/msvcp140/tests/msvcp140.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 128ea20add2..d2bcd192f45 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1703,7 +1703,7 @@ static void test__Mtx(void) static void test__Fiopen(void) { - int i; + int i, ret; FILE *f; wchar_t wpath[MAX_PATH]; static const struct { @@ -1724,8 +1724,8 @@ static void test__Fiopen(void) continue; } - ok(MultiByteToWideChar(CP_UTF8, 0, tests[i].path, -1, wpath, MAX_PATH), - "MultiByteToWideChar failed on %s with locale %s: %lx\n", + ret = MultiByteToWideChar(CP_UTF8, 0, tests[i].path, -1, wpath, MAX_PATH); + ok(ret, "MultiByteToWideChar failed on %s with locale %s: %lx\n", debugstr_a(tests[i].path), tests[i].loc, GetLastError()); f = p__Fiopen(tests[i].path, OPENMODE_out, SH_DENYNO); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7081
From: André Zwing <nerv(a)dawncrow.de> --- dlls/msvcp120/tests/msvcp120.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 1fe411483d2..b3dbacd082a 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -3374,7 +3374,7 @@ static void test_data_exports(void) static void test__Fiopen(void) { - int i; + int i, ret; FILE *f; wchar_t wpath[MAX_PATH]; static const struct { @@ -3395,8 +3395,8 @@ static void test__Fiopen(void) } memset(wpath, 0, sizeof(wpath)); - ok(MultiByteToWideChar(CP_ACP, 0, tests[i].path, -1, wpath, MAX_PATH), - "MultiByteToWideChar failed on %s with locale %s: %lx\n", + ret = MultiByteToWideChar(CP_ACP, 0, tests[i].path, -1, wpath, MAX_PATH); + ok(ret, "MultiByteToWideChar failed on %s with locale %s: %lx\n", tests[i].path, tests[i].loc, GetLastError()); f = p__Fiopen(tests[i].path, OPENMODE_out, SH_DENYNO); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7081
This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7081
Piotr Caban (@piotr) commented about dlls/ntoskrnl.exe/tests/ntoskrnl.c:
} else { - ok(GetLastError() == RtlNtStatusToDosErrorNoTeb(expect_status), "got error %lu\n", GetLastError()); + ULONG err = RtlNtStatusToDosErrorNoTeb(expect_status); + ok(GetLastError() == err, "got error %lu\n", GetLastError());
This change is not needed. `RtlNtStatusToDosErrorNoTeb` is not setting last error. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7081#note_91234
This merge request was approved by Piotr Caban. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7081
participants (3)
-
André Zwing -
Huw Davies (＠huw)
-
Piotr Caban (＠piotr)