kernel32/tests: GetVolumeNameForMountPoint not present before w2k

[Detlef Riekenberg]

Changelog:
kernel32/tests: GetVolumeNameForMountPoint not present before w2k


-- 
 
By by ... Detlef

-------------- next part --------------
>From 2342f00be8dac7da71e19aac17eb3e4b8dbed3f9 Mon Sep 17 00:00:00 2001
From: Detlef Riekenberg <wine.dev at web.de>
Date: Sat, 20 Jan 2007 12:30:41 +0100
Subject: [PATCH] kernel32/tests: GetVolumeNameForMountPoint not present before w2k
---
 dlls/kernel32/tests/volume.c |   38 ++++++++++++++++++++++++++++++--------
 1 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c
index e940a4b..b673947 100644
--- a/dlls/kernel32/tests/volume.c
+++ b/dlls/kernel32/tests/volume.c
@@ -27,6 +27,12 @@ #define HARDISK "HARDDISK"
 #define LANMAN  "LANMANREDIRECTOR"
 #define RAMDISK "RAMDISK"
 
+static HINSTANCE hdll;
+static BOOL (WINAPI * pGetVolumeNameForVolumeMountPointA)(LPCSTR, LPSTR, DWORD);
+static BOOL (WINAPI * pGetVolumeNameForVolumeMountPointW)(LPCWSTR, LPWSTR, DWORD);
+
+/* ############################### */
+
 static void test_query_dos_deviceA(void)
 {
     char drivestr[] = "a:";
@@ -51,18 +57,24 @@ static void test_GetVolumeNameForVolumeM
     char volume[MAX_PATH], path[] = "c:\\";
     DWORD len = sizeof(volume);
 
-    ret = GetVolumeNameForVolumeMountPointA(path, volume, 0);
+    /* not present before w2k */
+    if (!pGetVolumeNameForVolumeMountPointA) {
+        skip("GetVolumeNameForVolumeMountPointA not found\n");
+        return;
+    }
+
+    ret = pGetVolumeNameForVolumeMountPointA(path, volume, 0);
     ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n");
 
     if (0) { /* these crash on XP */
-    ret = GetVolumeNameForVolumeMountPointA(path, NULL, len);
+    ret = pGetVolumeNameForVolumeMountPointA(path, NULL, len);
     ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n");
 
-    ret = GetVolumeNameForVolumeMountPointA(NULL, volume, len);
+    ret = pGetVolumeNameForVolumeMountPointA(NULL, volume, len);
     ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n");
     }
 
-    ret = GetVolumeNameForVolumeMountPointA(path, volume, len);
+    ret = pGetVolumeNameForVolumeMountPointA(path, volume, len);
     ok(ret == TRUE, "GetVolumeNameForVolumeMountPointA failed\n");
 }
 
@@ -72,23 +84,33 @@ static void test_GetVolumeNameForVolumeM
     WCHAR volume[MAX_PATH], path[] = {'c',':','\\',0};
     DWORD len = sizeof(volume) / sizeof(WCHAR);
 
-    ret = GetVolumeNameForVolumeMountPointW(path, volume, 0);
+    /* not present before w2k */
+    if (!pGetVolumeNameForVolumeMountPointW) {
+        skip("GetVolumeNameForVolumeMountPointW not found\n");
+        return;
+    }
+
+    ret = pGetVolumeNameForVolumeMountPointW(path, volume, 0);
     ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n");
 
     if (0) { /* these crash on XP */
-    ret = GetVolumeNameForVolumeMountPointW(path, NULL, len);
+    ret = pGetVolumeNameForVolumeMountPointW(path, NULL, len);
     ok(ret == FALSE, "GetVolumeNameForVolumeMountPointW succeeded\n");
 
-    ret = GetVolumeNameForVolumeMountPointW(NULL, volume, len);
+    ret = pGetVolumeNameForVolumeMountPointW(NULL, volume, len);
     ok(ret == FALSE, "GetVolumeNameForVolumeMountPointW succeeded\n");
     }
 
-    ret = GetVolumeNameForVolumeMountPointW(path, volume, len);
+    ret = pGetVolumeNameForVolumeMountPointW(path, volume, len);
     ok(ret == TRUE, "GetVolumeNameForVolumeMountPointW failed\n");
 }
 
 START_TEST(volume)
 {
+    hdll = GetModuleHandleA("kernel32.dll");
+    pGetVolumeNameForVolumeMountPointA = (void *) GetProcAddress(hdll, "GetVolumeNameForVolumeMountPointA");
+    pGetVolumeNameForVolumeMountPointW = (void *) GetProcAddress(hdll, "GetVolumeNameForVolumeMountPointW");
+
     test_query_dos_deviceA();
     test_GetVolumeNameForVolumeMountPointA();
     test_GetVolumeNameForVolumeMountPointW();
-- 
1.4.1