Nikolay Sivov : shlwapi/tests: Fix some test failures on Win2000.
Alexandre Julliard
julliard at winehq.org
Thu Jul 29 12:08:39 CDT 2010
Module: wine
Branch: master
Commit: b684c60a10c058d5e9d13dfc57d480978b54744d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b684c60a10c058d5e9d13dfc57d480978b54744d
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Thu Jul 29 09:59:58 2010 +0400
shlwapi/tests: Fix some test failures on Win2000.
---
dlls/shlwapi/tests/ordinal.c | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c
index d60effd..c3c59c4 100644
--- a/dlls/shlwapi/tests/ordinal.c
+++ b/dlls/shlwapi/tests/ordinal.c
@@ -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);
More information about the wine-cvs
mailing list