Andrew Nguyen : shlwapi/tests: Skip SHAnsiToAnsi tests on Win98.
Alexandre Julliard
julliard at winehq.org
Tue Jul 20 11:20:34 CDT 2010
Module: wine
Branch: master
Commit: d3e083643548b6cd161dac1c8039d69af115083d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3e083643548b6cd161dac1c8039d69af115083d
Author: Andrew Nguyen <anguyen at codeweavers.com>
Date: Mon Jul 19 23:14:11 2010 -0500
shlwapi/tests: Skip SHAnsiToAnsi tests on Win98.
---
dlls/shlwapi/tests/string.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c
index e0d4910..356616a 100644
--- a/dlls/shlwapi/tests/string.c
+++ b/dlls/shlwapi/tests/string.c
@@ -55,6 +55,7 @@ static LPSTR (WINAPI *pStrFormatKBSizeA)(LONGLONG,LPSTR,UINT);
static LPWSTR (WINAPI *pStrFormatKBSizeW)(LONGLONG,LPWSTR,UINT);
static BOOL (WINAPI *pStrIsIntlEqualA)(BOOL,LPCSTR,LPCSTR,int);
static BOOL (WINAPI *pStrIsIntlEqualW)(BOOL,LPCWSTR,LPCWSTR,int);
+static LPWSTR (WINAPI *pStrPBrkW)(LPCWSTR,LPCWSTR);
static HRESULT (WINAPI *pStrRetToBSTR)(STRRET*,void*,BSTR*);
static HRESULT (WINAPI *pStrRetToBufA)(STRRET*,LPCITEMIDLIST,LPSTR,UINT);
static HRESULT (WINAPI *pStrRetToBufW)(STRRET*,LPCITEMIDLIST,LPWSTR,UINT);
@@ -815,6 +816,12 @@ static void test_SHAnsiToAnsi(void)
return;
}
+ if (pSHAnsiToAnsi == (void *)pStrPBrkW)
+ {
+ win_skip("Ordinal 345 corresponds to StrPBrkW, skipping SHAnsiToAnsi tests\n");
+ return;
+ }
+
memset(dest, '\n', sizeof(dest));
dwRet = pSHAnsiToAnsi("hello", dest, sizeof(dest)/sizeof(dest[0]));
ok(dwRet == 6 && !memcmp(dest, "hello\0\n\n", sizeof(dest)),
@@ -1370,6 +1377,7 @@ START_TEST(string)
pStrFormatKBSizeW = (void *)GetProcAddress(hShlwapi, "StrFormatKBSizeW");
pStrIsIntlEqualA = (void *)GetProcAddress(hShlwapi, "StrIsIntlEqualA");
pStrIsIntlEqualW = (void *)GetProcAddress(hShlwapi, "StrIsIntlEqualW");
+ pStrPBrkW = (void *)GetProcAddress(hShlwapi, "StrPBrkW");
pStrRetToBSTR = (void *)GetProcAddress(hShlwapi, "StrRetToBSTR");
pStrRetToBufA = (void *)GetProcAddress(hShlwapi, "StrRetToBufA");
pStrRetToBufW = (void *)GetProcAddress(hShlwapi, "StrRetToBufW");
More information about the wine-cvs
mailing list