[PATCH 05/14] kernel32/tests: Use fixed length to print possibly unterminated buffers.

[Bernhard Übelacker]

From: Bernhard Übelacker

---
 dlls/kernel32/tests/locale.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index 60fa7d99a8a..82d9edb3ebe 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -2987,16 +2987,16 @@ static void test_LocaleNameToLCID(void)
     pLCIDToLocaleName(GetUserDefaultLCID(), expbuff, LOCALE_NAME_MAX_LENGTH, 0);
     ret = pLCIDToLocaleName(LOCALE_NEUTRAL, buffer, LOCALE_NAME_MAX_LENGTH, 0);
     ok(ret > 0, "Expected ret > 0, got %d, error %ld\n", ret, GetLastError());
-    ok( !wcscmp( buffer, expbuff ), "got %s / %s\n", debugstr_w(buffer), debugstr_w(expbuff));
+    ok( !wcscmp( buffer, expbuff ), "got %s / %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)), debugstr_w(expbuff));

ret = pLCIDToLocaleName(LOCALE_CUSTOM_DEFAULT, buffer, LOCALE_NAME_MAX_LENGTH, 0);
     ok(ret > 0, "Expected ret > 0, got %d, error %ld\n", ret, GetLastError());
-    ok( !wcscmp( buffer, expbuff ), "got %s / %s\n", debugstr_w(buffer), debugstr_w(expbuff));
+    ok( !wcscmp( buffer, expbuff ), "got %s / %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)), debugstr_w(expbuff));

SetLastError( 0xdeadbeef );
     ret = pLCIDToLocaleName(LOCALE_CUSTOM_UNSPECIFIED, buffer, LOCALE_NAME_MAX_LENGTH, 0);
     ok(ret > 0 || broken(!ret), /* <= win8 */ "Expected ret > 0, got %d, error %ld\n", ret, GetLastError());
-    if (ret) ok( !wcscmp( buffer, expbuff ), "got %s / %s\n", debugstr_w(buffer), debugstr_w(expbuff));
+    if (ret) ok( !wcscmp( buffer, expbuff ), "got %s / %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)), debugstr_w(expbuff));

SetLastError( 0xdeadbeef );
     ret = pLCIDToLocaleName(LOCALE_CUSTOM_UI_DEFAULT, buffer, LOCALE_NAME_MAX_LENGTH, 0);
@@ -3190,7 +3190,7 @@ static void test_LocaleNameToLCID(void)
         memset( buffer, 0xcc, sizeof(buffer) );
         status = pRtlLcidToLocaleName( MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), &str, 0, 0 );
         ok( status == STATUS_SUCCESS, "wrong error %lx\n", status );
-        ok( !wcscmp( buffer, L"en-US" ), "wrong name %s\n", debugstr_w(buffer) );
+        ok( !wcscmp( buffer, L"en-US" ), "wrong name %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)) );
         ok( str.Length == wcslen(buffer) * sizeof(WCHAR), "wrong len %u\n", str.Length );
         ok( str.MaximumLength == sizeof(buffer), "wrong max len %u\n", str.MaximumLength );

@@ -3201,14 +3201,14 @@ static void test_LocaleNameToLCID(void)
         status = pRtlLcidToLocaleName( MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL), &str, 2, 0 );
         ok( status == STATUS_SUCCESS, "wrong error %lx\n", status );
         ok( str.Length == wcslen(buffer) * sizeof(WCHAR), "wrong len %u\n", str.Length );
-        ok( !wcscmp( buffer, L"en" ), "wrong name %s\n", debugstr_w(buffer) );
+        ok( !wcscmp( buffer, L"en" ), "wrong name %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)) );

ok( IsValidLocale( 0x00010407, 0 ), "expected valid\n" );
         memset( buffer, 0xcc, sizeof(buffer) );
         status = pRtlLcidToLocaleName( 0x00010407, &str, 0, 0 );
         ok( status == STATUS_SUCCESS, "wrong error %lx\n", status );
         ok( str.Length == wcslen(buffer) * sizeof(WCHAR), "wrong len %u\n", str.Length );
-        ok( !wcscmp( buffer, L"de-DE_phoneb" ), "wrong name %s\n", debugstr_w(buffer) );
+        ok( !wcscmp( buffer, L"de-DE_phoneb" ), "wrong name %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)) );

ok( !IsValidLocale( LOCALE_SYSTEM_DEFAULT, 0 ), "expected invalid\n" );
         memset( buffer, 0xcc, sizeof(buffer) );
@@ -3216,7 +3216,7 @@ static void test_LocaleNameToLCID(void)
         ok( status == STATUS_SUCCESS, "wrong error %lx\n", status );
         ok( str.Length == wcslen(buffer) * sizeof(WCHAR), "wrong len %u\n", str.Length );
         LCIDToLocaleName( GetSystemDefaultLCID(), expect, ARRAY_SIZE(expect), 0 );
-        ok( !wcscmp( buffer, expect ), "wrong name %s / %s\n", debugstr_w(buffer), debugstr_w(expect) );
+        ok( !wcscmp( buffer, expect ), "wrong name %s / %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)), debugstr_w(expect) );

ok( !IsValidLocale( LOCALE_USER_DEFAULT, 0 ), "expected invalid\n" );
         memset( buffer, 0xcc, sizeof(buffer) );
@@ -3224,21 +3224,21 @@ static void test_LocaleNameToLCID(void)
         ok( status == STATUS_SUCCESS, "wrong error %lx\n", status );
         ok( str.Length == wcslen(buffer) * sizeof(WCHAR), "wrong len %u\n", str.Length );
         LCIDToLocaleName( GetUserDefaultLCID(), expect, ARRAY_SIZE(expect), 0 );
-        ok( !wcscmp( buffer, expect ), "wrong name %s / %s\n", debugstr_w(buffer), debugstr_w(expect) );
+        ok( !wcscmp( buffer, expect ), "wrong name %s / %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)), debugstr_w(expect) );

ok( IsValidLocale( LOCALE_INVARIANT, 0 ), "expected valid\n" );
         memset( buffer, 0xcc, sizeof(buffer) );
         status = pRtlLcidToLocaleName( LOCALE_INVARIANT, &str, 0, 0 );
         ok( status == STATUS_SUCCESS, "wrong error %lx\n", status );
         ok( str.Length == wcslen(buffer) * sizeof(WCHAR), "wrong len %u\n", str.Length );
-        ok( !wcscmp( buffer, L"" ), "wrong name %s\n", debugstr_w(buffer) );
+        ok( !wcscmp( buffer, L"" ), "wrong name %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)) );

memset( buffer, 0xcc, sizeof(buffer) );
         status = pRtlLcidToLocaleName( LOCALE_CUSTOM_DEFAULT, &str, 0, 0 );
         ok( status == STATUS_SUCCESS, "wrong error %lx\n", status );
         ok( str.Length == wcslen(buffer) * sizeof(WCHAR), "wrong len %u\n", str.Length );
         LCIDToLocaleName( GetUserDefaultLCID(), expect, ARRAY_SIZE(expect), 0 );
-        ok( !wcscmp( buffer, expect ), "wrong name %s / %s\n", debugstr_w(buffer), debugstr_w(expect) );
+        ok( !wcscmp( buffer, expect ), "wrong name %s / %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)), debugstr_w(expect) );

status = pRtlLcidToLocaleName( LOCALE_CUSTOM_UI_DEFAULT, &str, 0, 0 );
         ok( status == STATUS_SUCCESS || status == STATUS_UNSUCCESSFUL, "wrong error %lx\n", status );
@@ -3253,7 +3253,7 @@ static void test_LocaleNameToLCID(void)
         ok( status == STATUS_BUFFER_TOO_SMALL, "wrong error %lx\n", status );
         ok( str.Length == 0xbeef, "wrong len %u\n", str.Length );
         ok( str.MaximumLength == 5 * sizeof(WCHAR), "wrong len %u\n", str.MaximumLength );
-        ok( buffer[0] == 0xcccc, "wrong name %s\n", debugstr_w(buffer) );
+        ok( buffer[0] == 0xcccc, "wrong name %s\n", debugstr_wn(buffer, ARRAY_SIZE(buffer)) );

memset( &str, 0xcc, sizeof(str) );
         status = pRtlLcidToLocaleName( MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), &str, 0, 1 );