gdi32: Remove broken check for WinXP.
This commit is contained in:
parent
7a354177b3
commit
d419f24372
|
@ -3185,8 +3185,6 @@ static void test_AddFontMemResource(void)
|
|||
void *font;
|
||||
DWORD font_size, num_fonts;
|
||||
HANDLE ret;
|
||||
DEVMODEA dmA;
|
||||
BOOL is_winxp;
|
||||
|
||||
if (!pAddFontMemResourceEx || !pRemoveFontMemResourceEx)
|
||||
{
|
||||
|
@ -3201,11 +3199,6 @@ static void test_AddFontMemResource(void)
|
|||
return;
|
||||
}
|
||||
|
||||
is_winxp = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dmA) &&
|
||||
(dmA.dmFields & DM_DISPLAYORIENTATION);
|
||||
|
||||
if (is_winxp)
|
||||
{
|
||||
SetLastError(0xdeadbeef);
|
||||
ret = pAddFontMemResourceEx(NULL, 0, NULL, NULL);
|
||||
ok(!ret, "AddFontMemResourceEx should fail\n");
|
||||
|
@ -3257,6 +3250,8 @@ static void test_AddFontMemResource(void)
|
|||
GetLastError());
|
||||
ok(num_fonts == 0xdeadbeef, "number of loaded fonts should be 0xdeadbeef\n");
|
||||
|
||||
if (0) /* hangs under windows 2000 */
|
||||
{
|
||||
num_fonts = 0xdeadbeef;
|
||||
SetLastError(0xdeadbeef);
|
||||
ret = pAddFontMemResourceEx(font, 10, NULL, &num_fonts);
|
||||
|
@ -3266,8 +3261,6 @@ static void test_AddFontMemResource(void)
|
|||
GetLastError());
|
||||
ok(num_fonts == 0xdeadbeef, "number of loaded fonts should be 0xdeadbeef\n");
|
||||
}
|
||||
else
|
||||
win_skip("AddFontMemResourceEx invalid parameter tests are problematic on Win2k\n");
|
||||
|
||||
num_fonts = 0xdeadbeef;
|
||||
SetLastError(0xdeadbeef);
|
||||
|
|
Loading…
Reference in New Issue