kernel32/tests: Account for unsupported NLSVERSIONINFOEX.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

kernel32/tests: Account for unsupported NLSVERSIONINFOEX.
42a18cf5 · Zebediah Figura · Alexandre Julliard · 913e6ef8 · 42a18cf5
Commit 42a18cf5 authored May 04, 2020 by Zebediah Figura Committed by Alexandre Julliard May 05, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 6 deletions

locale.c dlls/kernel32/tests/locale.c +18 -6

No files found.
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -6653,17 +6653,29 @@ static void test_NLSVersion(void)
        win_skip( "GetNLSVersion not available\n" );
        return;
    }
+
    SetLastError( 0xdeadbeef );
    memset( &info, 0xcc, sizeof(info) );
-    info.dwNLSVersionInfoSize = sizeof(info);
+    info.dwNLSVersionInfoSize = offsetof( NLSVERSIONINFO, dwEffectiveId );
    ret = pGetNLSVersion( COMPARE_STRING, MAKELANGID( LANG_FRENCH, SUBLANG_FRENCH_CANADIAN ),
                          (NLSVERSIONINFO *)&info );
    ok( ret, "GetNLSVersion failed err %u\n", GetLastError() );
-    ok( info.dwEffectiveId == MAKELANGID( LANG_FRENCH, SUBLANG_FRENCH_CANADIAN ),
-        "wrong id %x\n", info.dwEffectiveId );
-    ok( IsEqualIID( &info.guidCustomVersion, &guid_fr ) ||
-        broken( IsEqualIID( &info.guidCustomVersion, &guid_null )),  /* <= win7 */
-        "wrong guid %s\n", debugstr_guid(&info.guidCustomVersion) );
+
+    SetLastError( 0xdeadbeef );
+    memset( &info, 0xcc, sizeof(info) );
+    info.dwNLSVersionInfoSize = sizeof(info);
+    ret = pGetNLSVersion( COMPARE_STRING, MAKELANGID( LANG_FRENCH, SUBLANG_FRENCH_CANADIAN ),
+                          (NLSVERSIONINFO *)&info );
+    ok( ret || GetLastError() == ERROR_INSUFFICIENT_BUFFER /* < Vista */,
+        "GetNLSVersion failed err %u\n", GetLastError() );
+    if (ret)
+    {
+        ok( info.dwEffectiveId == MAKELANGID( LANG_FRENCH, SUBLANG_FRENCH_CANADIAN ),
+            "wrong id %x\n", info.dwEffectiveId );
+        ok( IsEqualIID( &info.guidCustomVersion, &guid_fr ) ||
+            broken( IsEqualIID( &info.guidCustomVersion, &guid_null )),  /* <= win7 */
+            "wrong guid %s\n", debugstr_guid(&info.guidCustomVersion) );
+    }

    SetLastError( 0xdeadbeef );
    info.dwNLSVersionInfoSize = 8;