Skip to content

W
wine-winehq
Commit fd0780cb authored by Sebastian Lackner's avatar Sebastian Lackner Committed by Alexandre Julliard
Browse files
Options

kernel32/tests: Simplify activation context tests by using todo_wine_if.

Signed-off-by: 's avatarSebastian Lackner <sebastian@fds-team.de> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 5b478f7c
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 34 deletions
dlls/kernel32/tests/actctx.c
View file @ fd0780cb
...@@ -776,12 +776,7 @@ static void test_create_and_fail(const char *manifest, const char *depmanifest, ...@@ -776,12 +776,7 @@ static void test_create_and_fail(const char *manifest, const char *depmanifest,
create_manifest_file("bad.manifest", manifest, -1, "testdep.manifest", depmanifest); create_manifest_file("bad.manifest", manifest, -1, "testdep.manifest", depmanifest);
handle = pCreateActCtxW(&actctx); handle = pCreateActCtxW(&actctx);
if (todo) todo_wine todo_wine_if(todo)
{
ok(handle == INVALID_HANDLE_VALUE, "handle != INVALID_HANDLE_VALUE\n");
ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX, "GetLastError == %u\n", GetLastError());
}
else
{ {
ok(handle == INVALID_HANDLE_VALUE, "handle != INVALID_HANDLE_VALUE\n"); ok(handle == INVALID_HANDLE_VALUE, "handle != INVALID_HANDLE_VALUE\n");
ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX, "GetLastError == %u\n", GetLastError()); ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX, "GetLastError == %u\n", GetLastError());
...@@ -2089,13 +2084,9 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should ...@@ -2089,13 +2084,9 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should
err = GetLastError(); err = GetLastError();
ok_(__FILE__, line)(ret == should_find, ok_(__FILE__, line)(ret == should_find,
"FindActCtxSectionStringA: expected ret = %u, got %u\n", should_find, ret); "FindActCtxSectionStringA: expected ret = %u, got %u\n", should_find, ret);
if (todo) todo_wine_if(todo)
todo_wine ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND),
ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND), "FindActCtxSectionStringA: unexpected error %u\n", err);
"FindActCtxSectionStringA: unexpected error %u\n", err);
else
ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND),
"FindActCtxSectionStringA: unexpected error %u\n", err);
memset(&data, 0xfe, sizeof(data)); memset(&data, 0xfe, sizeof(data));
data.cbSize = sizeof(data); data.cbSize = sizeof(data);
...@@ -2105,13 +2096,9 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should ...@@ -2105,13 +2096,9 @@ static void kernel32_find(ULONG section, const char *string_to_find, BOOL should
err = GetLastError(); err = GetLastError();
ok_(__FILE__, line)(ret == should_find, ok_(__FILE__, line)(ret == should_find,
"FindActCtxSectionStringW: expected ret = %u, got %u\n", should_find, ret); "FindActCtxSectionStringW: expected ret = %u, got %u\n", should_find, ret);
if (todo) todo_wine_if(todo)
todo_wine ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND),
ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND), "FindActCtxSectionStringW: unexpected error %u\n", err);
"FindActCtxSectionStringW: unexpected error %u\n", err);
else
ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND),
"FindActCtxSectionStringW: unexpected error %u\n", err);
SetLastError(0); SetLastError(0);
ret = pFindActCtxSectionStringA(0, NULL, section, string_to_find, NULL); ret = pFindActCtxSectionStringA(0, NULL, section, string_to_find, NULL);
...@@ -2144,22 +2131,14 @@ static void ntdll_find(ULONG section, const char *string_to_find, BOOL should_fi ...@@ -2144,22 +2131,14 @@ static void ntdll_find(ULONG section, const char *string_to_find, BOOL should_fi
data.cbSize = sizeof(data); data.cbSize = sizeof(data);
ret = pRtlFindActivationContextSectionString(0, NULL, section, &string_to_findW, &data); ret = pRtlFindActivationContextSectionString(0, NULL, section, &string_to_findW, &data);
if (todo) todo_wine_if(todo)
todo_wine ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND),
ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret);
"RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret);
else
ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND),
"RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret);
ret = pRtlFindActivationContextSectionString(0, NULL, section, &string_to_findW, NULL); ret = pRtlFindActivationContextSectionString(0, NULL, section, &string_to_findW, NULL);
if (todo) todo_wine_if(todo)
todo_wine ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND),
ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret);
"RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret);
else
ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND),
"RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret);
pRtlFreeUnicodeString(&string_to_findW); pRtlFreeUnicodeString(&string_to_findW);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment