[PATCH] wininet/tests: Import GetDiskInfoA by ordinal
Detlef Riekenberg
wine.dev at web.de
Mon May 18 16:20:45 CDT 2009
---
dlls/wininet/tests/urlcache.c | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c
index a87d9bd..526effa 100644
--- a/dlls/wininet/tests/urlcache.c
+++ b/dlls/wininet/tests/urlcache.c
@@ -32,6 +32,7 @@
#define TEST_URL "http://urlcachetest.winehq.org/index.html"
static BOOL (WINAPI *pDeleteUrlCacheEntryA)(LPCSTR);
+static BOOL (WINAPI *pGetDiskInfoA)(PCSTR, PDWORD, PDWORDLONG, PDWORDLONG);
static BOOL (WINAPI *pUnlockUrlCacheEntryFileA)(LPCSTR,DWORD);
static char filenameA[MAX_PATH + 1];
@@ -227,24 +228,30 @@ static void test_GetDiskInfoA(void)
DWORDLONG free, total;
char path[MAX_PATH], *p;
+ if (!pGetDiskInfoA)
+ {
+ win_skip("GetDiskInfoA not found\n");
+ return;
+ }
+
GetSystemDirectoryA(path, MAX_PATH);
if ((p = strchr(path, '\\'))) *++p = 0;
- ret = GetDiskInfoA(path, &cluster_size, &free, &total);
+ ret = pGetDiskInfoA(path, &cluster_size, &free, &total);
ok(ret, "GetDiskInfoA failed %u\n", GetLastError());
- ret = GetDiskInfoA(path, &cluster_size, &free, NULL);
+ ret = pGetDiskInfoA(path, &cluster_size, &free, NULL);
ok(ret, "GetDiskInfoA failed %u\n", GetLastError());
- ret = GetDiskInfoA(path, &cluster_size, NULL, NULL);
+ ret = pGetDiskInfoA(path, &cluster_size, NULL, NULL);
ok(ret, "GetDiskInfoA failed %u\n", GetLastError());
- ret = GetDiskInfoA(path, NULL, NULL, NULL);
+ ret = pGetDiskInfoA(path, NULL, NULL, NULL);
ok(ret, "GetDiskInfoA failed %u\n", GetLastError());
SetLastError(0xdeadbeef);
strcpy(p, "\\non\\existing\\path");
- ret = GetDiskInfoA(path, NULL, NULL, NULL);
+ ret = pGetDiskInfoA(path, NULL, NULL, NULL);
error = GetLastError();
ok(!ret ||
broken(ret), /* < IE7 */
@@ -254,7 +261,7 @@ static void test_GetDiskInfoA(void)
"got %u expected ERROR_PATH_NOT_FOUND\n", error);
SetLastError(0xdeadbeef);
- ret = GetDiskInfoA(NULL, NULL, NULL, NULL);
+ ret = pGetDiskInfoA(NULL, NULL, NULL, NULL);
error = GetLastError();
ok(!ret, "GetDiskInfoA succeeded\n");
ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error);
@@ -265,6 +272,7 @@ START_TEST(urlcache)
HMODULE hdll;
hdll = GetModuleHandleA("wininet.dll");
pDeleteUrlCacheEntryA = (void*)GetProcAddress(hdll, "DeleteUrlCacheEntryA");
+ pGetDiskInfoA = (void*)GetProcAddress(hdll, (LPCSTR)102);
pUnlockUrlCacheEntryFileA = (void*)GetProcAddress(hdll, "UnlockUrlCacheEntryFileA");
test_urlcacheA();
test_FindCloseUrlCache();
--
1.5.4.3
--=-PAwI6qngQaNn8os7Hc5I--
More information about the wine-patches
mailing list