Alistair Leslie-Hughes : shlwapi: Fix tests under w2k8.
Alexandre Julliard
julliard at winehq.org
Thu Jul 10 14:07:32 CDT 2008
Module: wine
Branch: master
Commit: d2cce3284af1b6a22b8a09751d10c16fdaae97b9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2cce3284af1b6a22b8a09751d10c16fdaae97b9
Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Wed Jul 9 19:37:05 2008 +1000
shlwapi: Fix tests under w2k8.
---
dlls/shlwapi/tests/ordinal.c | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c
index f5286f0..df90bf7 100644
--- a/dlls/shlwapi/tests/ordinal.c
+++ b/dlls/shlwapi/tests/ordinal.c
@@ -64,22 +64,26 @@ static void test_GetAcceptLanguagesA(void)
SetLastError(ERROR_SUCCESS);
retval = pGetAcceptLanguagesA( NULL, NULL);
- ok(retval == E_FAIL,
+ ok(retval == E_FAIL ||
+ retval == E_INVALIDARG, /* w2k8 */
"function result wrong: got %08x; expected E_FAIL\n", retval);
ok(ERROR_SUCCESS == GetLastError(), "last error set to %u\n", GetLastError());
buffersize = sizeof(buffer);
SetLastError(ERROR_SUCCESS);
retval = pGetAcceptLanguagesA( NULL, &buffersize);
- ok(retval == E_FAIL,
+ ok(retval == E_FAIL ||
+ retval == E_INVALIDARG, /* w2k8 */
"function result wrong: got %08x; expected E_FAIL\n", retval);
- ok(buffersize == sizeof(buffer),
- "buffersize was changed (2nd parameter; not on Win2k)\n");
+ ok(buffersize == sizeof(buffer) ||
+ buffersize == 0, /* w2k8*/
+ "buffersize was changed and is not 0; size (%d))\n", buffersize);
ok(ERROR_SUCCESS == GetLastError(), "last error set to %u\n", GetLastError());
SetLastError(ERROR_SUCCESS);
retval = pGetAcceptLanguagesA( buffer, NULL);
- ok(retval == E_FAIL,
+ ok(retval == E_FAIL ||
+ retval == E_INVALIDARG, /* w2k8 */
"function result wrong: got %08x; expected E_FAIL\n", retval);
ok(ERROR_SUCCESS == GetLastError(), "last error set to %u\n", GetLastError());
@@ -87,7 +91,8 @@ static void test_GetAcceptLanguagesA(void)
memset(buffer, 0, sizeof(buffer));
SetLastError(ERROR_SUCCESS);
retval = pGetAcceptLanguagesA( buffer, &buffersize);
- ok(retval == E_FAIL,
+ ok(retval == E_FAIL ||
+ retval == E_INVALIDARG, /* w2k8 */
"function result wrong: got %08x; expected E_FAIL\n", retval);
ok(buffersize == 0,
"buffersize wrong(changed) got %08x; expected 0 (2nd parameter; not on Win2k)\n", buffersize);
@@ -363,6 +368,12 @@ static void test_GetShellSecurityDescriptor(void)
pGetShellSecurityDescriptor=(void*)GetProcAddress(hShlwapi,(char*)475);
+ if(!pGetShellSecurityDescriptor)
+ {
+ skip("GetShellSecurityDescriptor not available\n");
+ return;
+ }
+
psd = pGetShellSecurityDescriptor(NULL, 2);
ok(psd==NULL, "GetShellSecurityDescriptor should fail\n");
psd = pGetShellSecurityDescriptor(rgsup, 0);
More information about the wine-cvs
mailing list