From: André Zwing nerv@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);