[PATCH] shlwapi/tests: PathCreateFromUrl* not present on Win95B (winetestbot)
Detlef Riekenberg
wine.dev at web.de
Sat Jan 30 15:59:01 CST 2010
Argh.
Another function, that is not present on shlwpai 4.7*
And still no end ....
--
By by ... Detlef
---
dlls/shlwapi/tests/path.c | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c
index 5d64a24..d3fcf28 100644
--- a/dlls/shlwapi/tests/path.c
+++ b/dlls/shlwapi/tests/path.c
@@ -32,6 +32,8 @@ static HMODULE hShlwapi;
static HRESULT (WINAPI *pPathIsValidCharA)(char,DWORD);
static HRESULT (WINAPI *pPathIsValidCharW)(WCHAR,DWORD);
static LPWSTR (WINAPI *pPathCombineW)(LPWSTR, LPCWSTR, LPCWSTR);
+static HRESULT (WINAPI *pPathCreateFromUrlA)(LPCSTR, LPSTR, LPDWORD, DWORD);
+static HRESULT (WINAPI *pPathCreateFromUrlW)(LPCWSTR, LPWSTR, LPDWORD, DWORD);
/* ################ */
@@ -207,31 +209,39 @@ static void test_PathCreateFromUrl(void)
WCHAR *pathW, *urlW;
static const char url[] = "http://www.winehq.org";
+ if (!pPathCreateFromUrlA) {
+ win_skip("PathCreateFromUrlA not found\n");
+ return;
+ }
+
/* Check ret_path = NULL */
len = sizeof(url);
- ret = PathCreateFromUrlA(url, NULL, &len, 0);
+ ret = pPathCreateFromUrlA(url, NULL, &len, 0);
ok ( ret == E_INVALIDARG, "got 0x%08x expected E_INVALIDARG\n", ret);
for(i = 0; i < sizeof(TEST_PATHFROMURL) / sizeof(TEST_PATHFROMURL[0]); i++) {
len = INTERNET_MAX_URL_LENGTH;
- ret = PathCreateFromUrlA(TEST_PATHFROMURL[i].url, ret_path, &len, 0);
+ ret = pPathCreateFromUrlA(TEST_PATHFROMURL[i].url, ret_path, &len, 0);
ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url);
if(TEST_PATHFROMURL[i].path) {
ok(!lstrcmpi(ret_path, TEST_PATHFROMURL[i].path), "got %s expected %s from url %s\n", ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url);
ok(len == strlen(ret_path), "ret len %d from url %s\n", len, TEST_PATHFROMURL[i].url);
}
- len = INTERNET_MAX_URL_LENGTH;
- pathW = GetWideString(TEST_PATHFROMURL[i].path);
- urlW = GetWideString(TEST_PATHFROMURL[i].url);
- ret = PathCreateFromUrlW(urlW, ret_pathW, &len, 0);
- WideCharToMultiByte(CP_ACP, 0, ret_pathW, -1, ret_path, sizeof(ret_path),0,0);
- ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url);
- if(TEST_PATHFROMURL[i].path) {
- ok(!lstrcmpiW(ret_pathW, pathW), "got %s expected %s from url L\"%s\"\n", ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url);
- ok(len == lstrlenW(ret_pathW), "ret len %d from url L\"%s\"\n", len, TEST_PATHFROMURL[i].url);
+ if (pPathCreateFromUrlW) {
+ len = INTERNET_MAX_URL_LENGTH;
+ pathW = GetWideString(TEST_PATHFROMURL[i].path);
+ urlW = GetWideString(TEST_PATHFROMURL[i].url);
+ ret = pPathCreateFromUrlW(urlW, ret_pathW, &len, 0);
+ WideCharToMultiByte(CP_ACP, 0, ret_pathW, -1, ret_path, sizeof(ret_path),0,0);
+ ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url);
+ if(TEST_PATHFROMURL[i].path) {
+ ok(!lstrcmpiW(ret_pathW, pathW), "got %s expected %s from url L\"%s\"\n",
+ ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url);
+ ok(len == lstrlenW(ret_pathW), "ret len %d from url L\"%s\"\n", len, TEST_PATHFROMURL[i].url);
+ }
+ FreeWideString(urlW);
+ FreeWideString(pathW);
}
- FreeWideString(urlW);
- FreeWideString(pathW);
}
}
@@ -1307,6 +1317,8 @@ static void test_PathUnquoteSpaces(void)
START_TEST(path)
{
hShlwapi = GetModuleHandleA("shlwapi.dll");
+ pPathCreateFromUrlA = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlA");
+ pPathCreateFromUrlW = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlW");
test_PathSearchAndQualify();
test_PathCreateFromUrl();
--
1.6.5
More information about the wine-patches
mailing list