From: Bernhard Übelacker bernhardu@mailbox.org
--- dlls/kernel32/tests/actctx.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index b6f43b12f1a..a51c3c8db8b 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -3421,7 +3421,7 @@ static void test_settings(void) memset( buffer, 0xcc, sizeof(buffer) ); ret = pQueryActCtxSettingsW( 0, handle, NULL, dpiAwareW, buffer, 80, &size ); ok( ret, "QueryActCtxSettingsW failed err %lu\n", GetLastError() ); - ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_wn(buffer, ARRAY_SIZE(buffer)) ); ok( size == lstrlenW( buffer ) + 1, "wrong len %Iu\n", size ); SetLastError( 0xdeadbeef ); size = 0xdead; @@ -3429,20 +3429,20 @@ static void test_settings(void) ret = pQueryActCtxSettingsW( 0, handle, NULL, dummyW, buffer, 80, &size ); ok( !ret, "QueryActCtxSettingsW succeeded\n" ); ok( GetLastError() == ERROR_SXS_KEY_NOT_FOUND, "wrong error %lu\n", GetLastError() ); - ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_w(buffer) ); + ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_wn(buffer, ARRAY_SIZE(buffer)) ); SetLastError( 0xdeadbeef ); size = 0xdead; memset( buffer, 0xcc, sizeof(buffer) ); ret = pQueryActCtxSettingsW( 0, handle, namespace2005W, dpiAwareW, buffer, 80, &size ); ok( ret, "QueryActCtxSettingsW failed err %lu\n", GetLastError() ); - ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_wn(buffer, ARRAY_SIZE(buffer)) ); ok( size == ARRAY_SIZE(trueW), "wrong len %Iu\n", size ); SetLastError( 0xdeadbeef ); size = 0xdead; memset( buffer, 0xcc, sizeof(buffer) ); ret = pQueryActCtxSettingsW( 0, handle, namespace2005W, dpiAwareW, buffer, lstrlenW(trueW) + 1, &size ); ok( ret, "QueryActCtxSettingsW failed err %lu\n", GetLastError() ); - ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_wn(buffer, ARRAY_SIZE(buffer)) ); ok( size == ARRAY_SIZE(trueW), "wrong len %Iu\n", size ); SetLastError( 0xdeadbeef ); size = 0xdead; @@ -3451,21 +3451,21 @@ static void test_settings(void) ok( !ret, "QueryActCtxSettingsW succeeded\n" ); ok( GetLastError() == ERROR_SXS_KEY_NOT_FOUND || broken( GetLastError() == ERROR_INVALID_PARAMETER ), "wrong error %lu\n", GetLastError() ); - ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_w(buffer) ); + ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_wn(buffer, ARRAY_SIZE(buffer)) ); SetLastError( 0xdeadbeef ); size = 0xdead; memset( buffer, 0xcc, sizeof(buffer) ); ret = pQueryActCtxSettingsW( 0, handle, NULL, dpiAwarenessW, buffer, lstrlenW(trueW) + 1, &size ); ok( !ret, "QueryActCtxSettingsW succeeded\n" ); ok( GetLastError() == ERROR_SXS_KEY_NOT_FOUND, "wrong error %lu\n", GetLastError() ); - ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_w(buffer) ); + ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_wn(buffer, ARRAY_SIZE(buffer)) ); SetLastError( 0xdeadbeef ); size = 0xdead; memset( buffer, 0xcc, sizeof(buffer) ); ret = pQueryActCtxSettingsW( 0, handle, namespace2005W, dpiAwarenessW, buffer, lstrlenW(trueW) + 1, &size ); ok( !ret, "QueryActCtxSettingsW succeeded\n" ); ok( GetLastError() == ERROR_SXS_KEY_NOT_FOUND, "wrong error %lu\n", GetLastError() ); - ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_w(buffer) ); + ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_wn(buffer, ARRAY_SIZE(buffer)) ); SetLastError( 0xdeadbeef ); size = 0xdead; memset( buffer, 0xcc, sizeof(buffer) ); @@ -3474,16 +3474,16 @@ static void test_settings(void) "QueryActCtxSettingsW failed err %lu\n", GetLastError() ); if (ret) { - ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_wn(buffer, ARRAY_SIZE(buffer)) ); ok( size == ARRAY_SIZE(trueW), "wrong len %Iu\n", size ); } - else ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_w(buffer) ); + else ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_wn(buffer, ARRAY_SIZE(buffer)) ); SetLastError( 0xdeadbeef ); size = 0xdead; memset( buffer, 0xcc, sizeof(buffer) ); ret = pQueryActCtxSettingsW( 0, handle, NULL, dpiAwareW, buffer, lstrlenW(trueW), &size ); ok( ret, "QueryActCtxSettingsW failed err %lu\n", GetLastError() ); - ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_wn(buffer, ARRAY_SIZE(buffer)) ); ok( size == ARRAY_SIZE(trueW), "wrong len %Iu\n", size ); SetLastError( 0xdeadbeef ); size = 0xdead; @@ -3491,7 +3491,7 @@ static void test_settings(void) ret = pQueryActCtxSettingsW( 0, handle, NULL, dpiAwareW, buffer, lstrlenW(trueW) - 1, &size ); ok( !ret, "QueryActCtxSettingsW failed err %lu\n", GetLastError() ); ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %lu\n", GetLastError() ); - ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_w(buffer) ); + ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_wn(buffer, ARRAY_SIZE(buffer)) ); ok( size == ARRAY_SIZE(trueW), "wrong len %Iu\n", size ); ReleaseActCtx(handle);
@@ -3507,7 +3507,7 @@ static void test_settings(void) memset( buffer, 0xcc, sizeof(buffer) ); ret = pQueryActCtxSettingsW( 0, handle, NULL, dpiAwareW, buffer, 80, &size ); ok( ret, "QueryActCtxSettingsW failed err %lu\n", GetLastError() ); - ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_wn(buffer, ARRAY_SIZE(buffer)) ); ok( size == lstrlenW( buffer ) + 1, "wrong len %Iu\n", size ); ReleaseActCtx(handle); }