Paul Vriens : wininet/tests: Don't crash on IE5.01SP4.
Alexandre Julliard
julliard at winehq.org
Tue Mar 10 10:53:21 CDT 2009
Module: wine
Branch: master
Commit: e9ece6bd12fd1b325f6169b70b96f65284cbe221
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ece6bd12fd1b325f6169b70b96f65284cbe221
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Tue Mar 10 08:34:28 2009 +0100
wininet/tests: Don't crash on IE5.01SP4.
---
dlls/wininet/tests/internet.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c
index 91c82d3..8fa4823 100644
--- a/dlls/wininet/tests/internet.c
+++ b/dlls/wininet/tests/internet.c
@@ -29,6 +29,8 @@
static BOOL (WINAPI *pCreateUrlCacheContainerA)(DWORD, DWORD, DWORD, DWORD,
DWORD, DWORD, DWORD, DWORD);
+static BOOL (WINAPI *pCreateUrlCacheContainerW)(DWORD, DWORD, DWORD, DWORD,
+ DWORD, DWORD, DWORD, DWORD);
static BOOL (WINAPI *pInternetTimeFromSystemTimeA)(CONST SYSTEMTIME *,DWORD ,LPSTR ,DWORD);
static BOOL (WINAPI *pInternetTimeFromSystemTimeW)(CONST SYSTEMTIME *,DWORD ,LPWSTR ,DWORD);
static BOOL (WINAPI *pInternetTimeToSystemTimeA)(LPCSTR ,SYSTEMTIME *,DWORD);
@@ -784,6 +786,7 @@ START_TEST(internet)
HMODULE hdll;
hdll = GetModuleHandleA("wininet.dll");
pCreateUrlCacheContainerA = (void*)GetProcAddress(hdll, "CreateUrlCacheContainerA");
+ pCreateUrlCacheContainerW = (void*)GetProcAddress(hdll, "CreateUrlCacheContainerW");
pInternetTimeFromSystemTimeA = (void*)GetProcAddress(hdll, "InternetTimeFromSystemTimeA");
pInternetTimeFromSystemTimeW = (void*)GetProcAddress(hdll, "InternetTimeFromSystemTimeW");
pInternetTimeToSystemTimeA = (void*)GetProcAddress(hdll, "InternetTimeToSystemTimeA");
@@ -806,7 +809,9 @@ START_TEST(internet)
InternetTimeToSystemTimeA_test();
InternetTimeToSystemTimeW_test();
}
- if (pIsDomainLegalCookieDomainW && (void*)pIsDomainLegalCookieDomainW == (void*)pCreateUrlCacheContainerA)
+ if (pIsDomainLegalCookieDomainW &&
+ ((void*)pIsDomainLegalCookieDomainW == (void*)pCreateUrlCacheContainerA ||
+ (void*)pIsDomainLegalCookieDomainW == (void*)pCreateUrlCacheContainerW))
win_skip("IsDomainLegalCookieDomainW is not available on systems with IE5\n");
else if (!pIsDomainLegalCookieDomainW)
win_skip("IsDomainLegalCookieDomainW (or ordinal 117) is not available\n");
More information about the wine-cvs
mailing list