Commit a1131786 authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard

kernel32/tests: Add some skips to fix failures on WinMe.

parent 0d147057
...@@ -2042,12 +2042,22 @@ static BOOL CALLBACK langgrp_procA(LGRPID lgrpid, LPSTR lpszNum, LPSTR lpszName, ...@@ -2042,12 +2042,22 @@ static BOOL CALLBACK langgrp_procA(LGRPID lgrpid, LPSTR lpszNum, LPSTR lpszName,
static void test_EnumSystemLanguageGroupsA(void) static void test_EnumSystemLanguageGroupsA(void)
{ {
BOOL ret;
if (!pEnumSystemLanguageGroupsA || !pIsValidLanguageGroup) if (!pEnumSystemLanguageGroupsA || !pIsValidLanguageGroup)
{
win_skip("EnumSystemLanguageGroupsA and/or IsValidLanguageGroup are not available\n");
return; return;
}
/* No enumeration proc */ /* No enumeration proc */
SetLastError(0); SetLastError(0);
pEnumSystemLanguageGroupsA(0, LGRPID_INSTALLED, 0); pEnumSystemLanguageGroupsA(0, LGRPID_INSTALLED, 0);
if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{
win_skip("EnumSystemLanguageGroupsA is not implemented\n");
return;
}
EXPECT_INVALID; EXPECT_INVALID;
/* Invalid flags */ /* Invalid flags */
...@@ -2083,12 +2093,22 @@ static BOOL CALLBACK lgrplocale_procA(LGRPID lgrpid, LCID lcid, LPSTR lpszNum, ...@@ -2083,12 +2093,22 @@ static BOOL CALLBACK lgrplocale_procA(LGRPID lgrpid, LCID lcid, LPSTR lpszNum,
static void test_EnumLanguageGroupLocalesA(void) static void test_EnumLanguageGroupLocalesA(void)
{ {
BOOL ret;
if (!pEnumLanguageGroupLocalesA || !pIsValidLanguageGroup) if (!pEnumLanguageGroupLocalesA || !pIsValidLanguageGroup)
{
win_skip("EnumLanguageGroupLocalesA and/or IsValidLanguageGroup are not available\n");
return; return;
}
/* No enumeration proc */ /* No enumeration proc */
SetLastError(0); SetLastError(0);
pEnumLanguageGroupLocalesA(0, LGRPID_WESTERN_EUROPE, 0, 0); ret = pEnumLanguageGroupLocalesA(0, LGRPID_WESTERN_EUROPE, 0, 0);
if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{
win_skip("EnumLanguageGroupLocalesA is not implemented\n");
return;
}
EXPECT_INVALID; EXPECT_INVALID;
/* lgrpid too small */ /* lgrpid too small */
...@@ -2159,6 +2179,11 @@ static void test_EnumUILanguageA(void) ...@@ -2159,6 +2179,11 @@ static void test_EnumUILanguageA(void)
SetLastError(ERROR_SUCCESS); SetLastError(ERROR_SUCCESS);
ret = pEnumUILanguagesA(luilocale_proc1A, 0, 0); ret = pEnumUILanguagesA(luilocale_proc1A, 0, 0);
if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{
win_skip("EnumUILanguagesA is not implemented\n");
return;
}
EXPECT_TRUE; EXPECT_VALID; EXPECT_TRUE; EXPECT_VALID;
enumCount = 0; enumCount = 0;
......
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