Jacek Caban : urlmon: Fix FindMimeFromData tests on IE7.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Mar 2 06:14:28 CST 2007
Module: wine
Branch: master
Commit: 74d49757c74b4b1ec0355a4b5c49f519fa2273a8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=74d49757c74b4b1ec0355a4b5c49f519fa2273a8
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Mar 1 20:21:55 2007 +0100
urlmon: Fix FindMimeFromData tests on IE7.
---
dlls/urlmon/tests/misc.c | 19 +++++++++++--------
dlls/urlmon/urlmon_main.c | 4 ++--
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c
index 8774410..67e0d3d 100644
--- a/dlls/urlmon/tests/misc.c
+++ b/dlls/urlmon/tests/misc.c
@@ -367,14 +367,15 @@ static const WCHAR mimeAppXMSDownload[] =
static const struct {
LPCWSTR url;
LPCWSTR mime;
+ HRESULT hres;
} mime_tests[] = {
- {url1, mimeTextHtml},
- {url2, mimeTextHtml},
- {url3, mimeTextHtml},
- {url4, NULL},
- {url5, NULL},
- {url6, NULL},
- {url7, NULL}
+ {url1, mimeTextHtml, S_OK},
+ {url2, mimeTextHtml, S_OK},
+ {url3, mimeTextHtml, S_OK},
+ {url4, NULL, E_FAIL},
+ {url5, NULL, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)},
+ {url6, NULL, E_FAIL},
+ {url7, NULL, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)}
};
static BYTE data1[] = "test data\n";
@@ -539,7 +540,9 @@ static void test_FindMimeFromData(void)
ok(!lstrcmpW(mime, mime_tests[i].mime), "[%d] wrong mime\n", i);
CoTaskMemFree(mime);
}else {
- ok(hres == E_FAIL, "[%d] FindMimeFromData failed: %08x, expected E_FAIL\n", i, hres);
+ ok(hres == E_FAIL || hres == mime_tests[i].hres,
+ "[%d] FindMimeFromData failed: %08x, expected %08x\n",
+ i, hres, mime_tests[i].hres);
ok(mime == (LPWSTR)0xf0f0f0f0, "[%d] mime != 0xf0f0f0f0\n", i);
}
diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c
index 7cee585..3d29feb 100644
--- a/dlls/urlmon/urlmon_main.c
+++ b/dlls/urlmon/urlmon_main.c
@@ -647,13 +647,13 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer,
res = RegOpenKeyW(HKEY_CLASSES_ROOT, ptr, &hkey);
if(res != ERROR_SUCCESS)
- return E_FAIL;
+ return HRESULT_FROM_WIN32(res);
size = sizeof(mime);
res = RegQueryValueExW(hkey, wszContentType, NULL, NULL, (LPBYTE)mime, &size);
RegCloseKey(hkey);
if(res != ERROR_SUCCESS)
- return E_FAIL;
+ return HRESULT_FROM_WIN32(res);
*ppwzMimeOut = CoTaskMemAlloc(size);
memcpy(*ppwzMimeOut, mime, size);
More information about the wine-cvs
mailing list