Paul Vriens : wininet/tests: Skip some tests on IE5.
Alexandre Julliard
julliard at winehq.org
Mon Mar 9 09:40:25 CDT 2009
Module: wine
Branch: master
Commit: ac07d2eb289dbe1a1aaf4f56904bab047d798dbb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac07d2eb289dbe1a1aaf4f56904bab047d798dbb
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Sun Mar 8 13:38:25 2009 +0100
wininet/tests: Skip some tests on IE5.
---
dlls/wininet/tests/internet.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c
index 80841a1..56a604b 100644
--- a/dlls/wininet/tests/internet.c
+++ b/dlls/wininet/tests/internet.c
@@ -27,6 +27,8 @@
#include "wine/test.h"
+static BOOL (WINAPI *pCreateUrlCacheContainerA)(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);
@@ -770,6 +772,7 @@ START_TEST(internet)
{
HMODULE hdll;
hdll = GetModuleHandleA("wininet.dll");
+ pCreateUrlCacheContainerA = (void*)GetProcAddress(hdll, "CreateUrlCacheContainerA");
pInternetTimeFromSystemTimeA = (void*)GetProcAddress(hdll, "InternetTimeFromSystemTimeA");
pInternetTimeFromSystemTimeW = (void*)GetProcAddress(hdll, "InternetTimeFromSystemTimeW");
pInternetTimeToSystemTimeA = (void*)GetProcAddress(hdll, "InternetTimeToSystemTimeA");
@@ -784,7 +787,7 @@ START_TEST(internet)
test_null();
if (!pInternetTimeFromSystemTimeA)
- skip("skipping the InternetTime tests\n");
+ win_skip("skipping the InternetTime tests\n");
else
{
InternetTimeFromSystemTimeA_test();
@@ -792,8 +795,10 @@ START_TEST(internet)
InternetTimeToSystemTimeA_test();
InternetTimeToSystemTimeW_test();
}
- if (!pIsDomainLegalCookieDomainW)
- skip("skipping IsDomainLegalCookieDomainW tests\n");
+ if (pIsDomainLegalCookieDomainW && (void*)pIsDomainLegalCookieDomainW == (void*)pCreateUrlCacheContainerA)
+ win_skip("IsDomainLegalCookieDomainW is not available on systems with IE5\n");
+ else if (!pIsDomainLegalCookieDomainW)
+ win_skip("IsDomainLegalCookieDomainW (or ordinal 117) is not available\n");
else
test_IsDomainLegalCookieDomainW();
}
More information about the wine-cvs
mailing list