ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shlwapi/tests: Fix some test failures on Win2000.

This commit is contained in:
Nikolay Sivov 2010-07-29 09:59:58 +04:00 committed by Alexandre Julliard
parent 4c174fc845
commit b684c60a10
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/shlwapi/tests/ordinal.c
View File

@ -590,6 +590,7 @@ static void test_GetShellSecurityDescriptor(void)
};
SECURITY_DESCRIPTOR* psd;
SECURITY_DESCRIPTOR* (WINAPI*pGetShellSecurityDescriptor)(PSHELL_USER_PERMISSION*,int);
void *pChrCmpIW = GetProcAddress(hShlwapi, "ChrCmpIW");
pGetShellSecurityDescriptor=(void*)GetProcAddress(hShlwapi,(char*)475);
@ -599,12 +600,18 @@ static void test_GetShellSecurityDescriptor(void)
return;
}
if(pChrCmpIW && pChrCmpIW == pGetShellSecurityDescriptor) /* win2k */
{
win_skip("Skipping for GetShellSecurityDescriptor, same ordinal used for ChrCmpIW\n");
return;
}
psd = pGetShellSecurityDescriptor(NULL, 2);
ok(psd==NULL ||
broken(psd==INVALID_HANDLE_VALUE), /* IE5 */
"GetShellSecurityDescriptor should fail\n");
psd = pGetShellSecurityDescriptor(rgsup, 0);
ok(psd==NULL, "GetShellSecurityDescriptor should fail\n");
ok(psd==NULL, "GetShellSecurityDescriptor should fail, got %p\n", psd);
SetLastError(0xdeadbeef);
psd = pGetShellSecurityDescriptor(rgsup, 2);
@ -614,7 +621,7 @@ static void test_GetShellSecurityDescriptor(void)
win_skip("GetShellSecurityDescriptor is not implemented\n");
return;
}
if (psd==INVALID_HANDLE_VALUE)
if (psd == INVALID_HANDLE_VALUE)
{
win_skip("GetShellSecurityDescriptor is broken on IE5\n");
return;
@ -1910,6 +1917,7 @@ static void test_SHGetObjectCompatFlags(void)
};
static const char compat_path[] = "Software\\Microsoft\\Windows\\CurrentVersion\\ShellCompatibility\\Objects";
void *pColorAdjustLuma = GetProcAddress(hShlwapi, "ColorAdjustLuma");
CHAR keyA[39]; /* {CLSID} */
HKEY root;
DWORD ret;
@ -1921,6 +1929,12 @@ static void test_SHGetObjectCompatFlags(void)
return;
}
if (pColorAdjustLuma && pColorAdjustLuma == pSHGetObjectCompatFlags) /* win2k */
{
win_skip("Skipping SHGetObjectCompatFlags, same ordinal used for ColorAdjustLuma\n");
return;
}
/* null args */
ret = pSHGetObjectCompatFlags(NULL, NULL);
ok(ret == 0, "got %d\n", ret);