[PATCH v2 2/3] kernel32/tests: Call LCIDToLocaleName via function address (locale.c)

[Hugh McMaster]

From: Hugh McMaster

Signed-off-by: Hugh McMaster 
---
 dlls/kernel32/tests/locale.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index dbcc5bb5a8f..e5d9cc6a078 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -2864,9 +2864,9 @@ static void test_LocaleNameToLCID(void)
     WCHAR expbuff[LOCALE_NAME_MAX_LENGTH];
     const struct neutralsublang_name_t *ptr;

-    if (!pLocaleNameToLCID)
+    if (!pLCIDToLocaleName || !pLocaleNameToLCID)
     {
-        win_skip( "LocaleNameToLCID not available\n" );
+        win_skip( "LCIDToLocaleName or LocaleNameToLCID not available.\n" );
         return;
     }

@@ -3128,7 +3128,7 @@ static void test_LocaleNameToLCID(void)
         status = pRtlLcidToLocaleName( LOCALE_SYSTEM_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( GetSystemDefaultLCID(), expect, ARRAY_SIZE(expect), 0 );
+        pLCIDToLocaleName( GetSystemDefaultLCID(), expect, ARRAY_SIZE(expect), 0 );
         ok( !wcscmp( buffer, expect ), "wrong name %s / %s\n", debugstr_w(buffer), debugstr_w(expect) );

ok( !IsValidLocale( LOCALE_USER_DEFAULT, 0 ), "expected invalid\n" );
@@ -3136,7 +3136,7 @@ static void test_LocaleNameToLCID(void)
         status = pRtlLcidToLocaleName( LOCALE_USER_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 );
+        pLCIDToLocaleName( GetUserDefaultLCID(), expect, ARRAY_SIZE(expect), 0 );
         ok( !wcscmp( buffer, expect ), "wrong name %s / %s\n", debugstr_w(buffer), debugstr_w(expect) );

ok( IsValidLocale( LOCALE_INVARIANT, 0 ), "expected valid\n" );
@@ -3150,7 +3150,7 @@ static void test_LocaleNameToLCID(void)
         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 );
+        pLCIDToLocaleName( GetUserDefaultLCID(), expect, ARRAY_SIZE(expect), 0 );
         ok( !wcscmp( buffer, expect ), "wrong name %s / %s\n", debugstr_w(buffer), debugstr_w(expect) );

status = pRtlLcidToLocaleName( LOCALE_CUSTOM_UI_DEFAULT, &str, 0, 0 );