kernel32: Implement and test GetVolumePathNamesForVolumeName.
Hans Leidekker
hans at codeweavers.com
Mon Feb 14 02:36:21 CST 2011
See http://bugs.winehq.org/show_bug.cgi?id=7711
---
dlls/kernel32/kernel32.spec | 2 +-
dlls/kernel32/tests/volume.c | 135 ++++++++++++++++++++++++++++++++++++++++++
dlls/kernel32/volume.c | 62 ++++++++++++++++++-
3 files changed, 195 insertions(+), 4 deletions(-)
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index c2f7bc2..1f33c9a 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -676,7 +676,7 @@
@ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long)
@ stdcall GetVolumePathNameA(str ptr long)
@ stdcall GetVolumePathNameW(wstr ptr long)
-# @ stub GetVolumePathNamesForVolumeNameA
+@ stdcall GetVolumePathNamesForVolumeNameA(str ptr long ptr)
@ stdcall GetVolumePathNamesForVolumeNameW(wstr ptr long ptr)
@ stdcall GetWindowsDirectoryA(ptr long)
@ stdcall GetWindowsDirectoryW(ptr long)
diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c
index 4484a80..79c7048 100644
--- a/dlls/kernel32/tests/volume.c
+++ b/dlls/kernel32/tests/volume.c
@@ -32,6 +32,8 @@ static BOOL (WINAPI *pFindVolumeClose)(HANDLE);
static UINT (WINAPI *pGetLogicalDriveStringsA)(UINT,LPSTR);
static UINT (WINAPI *pGetLogicalDriveStringsW)(UINT,LPWSTR);
static BOOL (WINAPI *pGetVolumeInformationA)(LPCSTR, LPSTR, DWORD, LPDWORD, LPDWORD, LPDWORD, LPSTR, DWORD);
+static BOOL (WINAPI *pGetVolumePathNamesForVolumeNameA)(LPCSTR, LPSTR, DWORD, LPDWORD);
+static BOOL (WINAPI *pGetVolumePathNamesForVolumeNameW)(LPCWSTR, LPWSTR, DWORD, LPDWORD);
/* ############################### */
@@ -537,6 +539,135 @@ static void test_disk_extents(void)
CloseHandle( handle );
}
+static void test_GetVolumePathNamesForVolumeNameA(void)
+{
+ BOOL ret;
+ char volume[MAX_PATH], buffer[MAX_PATH];
+ DWORD len, error;
+
+ if (!pGetVolumePathNamesForVolumeNameA || !pGetVolumeNameForVolumeMountPointA)
+ {
+ win_skip("required functions not found\n");
+ return;
+ }
+
+ ret = pGetVolumeNameForVolumeMountPointA( "c:\\", volume, sizeof(volume) );
+ ok(ret, "failed to get volume name %u\n", GetLastError());
+ trace("c:\\ -> %s\n", volume);
+
+ SetLastError( 0xdeadbeef );
+ ret = pGetVolumePathNamesForVolumeNameA( NULL, NULL, 0, NULL );
+ error = GetLastError();
+ ok(!ret, "expected failure\n");
+ ok(error == ERROR_INVALID_NAME, "expected ERROR_INVALID_NAME got %u\n", error);
+
+ SetLastError( 0xdeadbeef );
+ ret = pGetVolumePathNamesForVolumeNameA( "", NULL, 0, NULL );
+ error = GetLastError();
+ ok(!ret, "expected failure\n");
+ ok(error == ERROR_INVALID_NAME, "expected ERROR_INVALID_NAME got %u\n", error);
+
+ SetLastError( 0xdeadbeef );
+ ret = pGetVolumePathNamesForVolumeNameA( volume, NULL, 0, NULL );
+ error = GetLastError();
+ ok(!ret, "expected failure\n");
+ ok(error == ERROR_MORE_DATA, "expected ERROR_MORE_DATA got %u\n", error);
+
+ SetLastError( 0xdeadbeef );
+ ret = pGetVolumePathNamesForVolumeNameA( volume, buffer, 0, NULL );
+ error = GetLastError();
+ ok(!ret, "expected failure\n");
+ ok(error == ERROR_MORE_DATA, "expected ERROR_MORE_DATA got %u\n", error);
+
+ memset( buffer, 0xff, sizeof(buffer) );
+ ret = pGetVolumePathNamesForVolumeNameA( volume, buffer, sizeof(buffer), NULL );
+ ok(ret, "failed to get path names %u\n", GetLastError());
+ ok(!strcmp( "C:\\", buffer ), "expected \"\\C:\" got \"%s\"\n", buffer);
+ ok(!buffer[4], "expected double null-terminated buffer\n");
+
+ len = 0;
+ SetLastError( 0xdeadbeef );
+ ret = pGetVolumePathNamesForVolumeNameA( NULL, NULL, 0, &len );
+ error = GetLastError();
+ ok(!ret, "expected failure\n");
+ ok(error == ERROR_INVALID_NAME, "expected ERROR_INVALID_NAME got %u\n", error);
+
+ len = 0;
+ SetLastError( 0xdeadbeef );
+ ret = pGetVolumePathNamesForVolumeNameA( NULL, NULL, sizeof(buffer), &len );
+ error = GetLastError();
+ ok(!ret, "expected failure\n");
+ ok(error == ERROR_INVALID_NAME, "expected ERROR_INVALID_NAME got %u\n", error);
+
+ len = 0;
+ SetLastError( 0xdeadbeef );
+ ret = pGetVolumePathNamesForVolumeNameA( NULL, buffer, sizeof(buffer), &len );
+ error = GetLastError();
+ ok(!ret, "expected failure\n");
+ ok(error == ERROR_INVALID_NAME, "expected ERROR_INVALID_NAME got %u\n", error);
+
+ len = 0;
+ SetLastError( 0xdeadbeef );
+ ret = pGetVolumePathNamesForVolumeNameA( NULL, buffer, sizeof(buffer), &len );
+ error = GetLastError();
+ ok(!ret, "expected failure\n");
+ ok(error == ERROR_INVALID_NAME, "expected ERROR_INVALID_NAME got %u\n", error);
+
+ len = 0;
+ memset( buffer, 0xff, sizeof(buffer) );
+ ret = pGetVolumePathNamesForVolumeNameA( volume, buffer, sizeof(buffer), &len );
+ ok(ret, "failed to get path names %u\n", GetLastError());
+ ok(len == 5 || broken(len == 2), "expected 5 got %u\n", len);
+ ok(!strcmp( "C:\\", buffer ), "expected \"\\C:\" got \"%s\"\n", buffer);
+ ok(!buffer[4], "expected double null-terminated buffer\n");
+}
+
+static void test_GetVolumePathNamesForVolumeNameW(void)
+{
+ static const WCHAR empty[] = {0};
+ static const WCHAR drive_c[] = {'c',':','\\',0};
+ BOOL ret;
+ WCHAR volume[MAX_PATH], buffer[MAX_PATH];
+ DWORD len, error;
+
+ if (!pGetVolumePathNamesForVolumeNameW || !pGetVolumeNameForVolumeMountPointW)
+ {
+ win_skip("required functions not found\n");
+ return;
+ }
+
+ ret = pGetVolumeNameForVolumeMountPointW( drive_c, volume, sizeof(volume)/sizeof(volume[0]) );
+ ok(ret, "failed to get volume name %u\n", GetLastError());
+
+ SetLastError( 0xdeadbeef );
+ ret = pGetVolumePathNamesForVolumeNameW( empty, NULL, 0, NULL );
+ error = GetLastError();
+ ok(!ret, "expected failure\n");
+ ok(error == ERROR_INVALID_NAME, "expected ERROR_INVALID_NAME got %u\n", error);
+
+ SetLastError( 0xdeadbeef );
+ ret = pGetVolumePathNamesForVolumeNameW( volume, NULL, 0, NULL );
+ error = GetLastError();
+ ok(!ret, "expected failure\n");
+ ok(error == ERROR_MORE_DATA, "expected ERROR_MORE_DATA got %u\n", error);
+
+ SetLastError( 0xdeadbeef );
+ ret = pGetVolumePathNamesForVolumeNameW( volume, buffer, 0, NULL );
+ error = GetLastError();
+ ok(!ret, "expected failure\n");
+ ok(error == ERROR_MORE_DATA, "expected ERROR_MORE_DATA got %u\n", error);
+
+ ret = pGetVolumePathNamesForVolumeNameW( volume, buffer, sizeof(buffer), NULL );
+ ok(ret, "failed to get path names %u\n", GetLastError());
+
+ len = 0;
+ memset( buffer, 0xff, sizeof(buffer) );
+ ret = pGetVolumePathNamesForVolumeNameW( volume, buffer, sizeof(buffer), &len );
+ ok(ret, "failed to get path names %u\n", GetLastError());
+ ok(len == 5, "expected 5 got %u\n", len);
+ ok(!buffer[4], "expected double null-terminated buffer\n");
+}
+
START_TEST(volume)
{
hdll = GetModuleHandleA("kernel32.dll");
@@ -548,6 +679,8 @@ START_TEST(volume)
pGetLogicalDriveStringsA = (void *) GetProcAddress(hdll, "GetLogicalDriveStringsA");
pGetLogicalDriveStringsW = (void *) GetProcAddress(hdll, "GetLogicalDriveStringsW");
pGetVolumeInformationA = (void *) GetProcAddress(hdll, "GetVolumeInformationA");
+ pGetVolumePathNamesForVolumeNameA = (void *) GetProcAddress(hdll, "GetVolumePathNamesForVolumeNameA");
+ pGetVolumePathNamesForVolumeNameW = (void *) GetProcAddress(hdll, "GetVolumePathNamesForVolumeNameW");
test_query_dos_deviceA();
test_FindFirstVolume();
@@ -558,4 +691,6 @@ START_TEST(volume)
test_GetVolumeInformationA();
test_enum_vols();
test_disk_extents();
+ test_GetVolumePathNamesForVolumeNameA();
+ test_GetVolumePathNamesForVolumeNameW();
}
diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c
index 106b4fb..40ca5b8 100644
--- a/dlls/kernel32/volume.c
+++ b/dlls/kernel32/volume.c
@@ -1622,13 +1622,69 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu
}
/***********************************************************************
+ * GetVolumePathNamesForVolumeNameA (KERNEL32.@)
+ */
+BOOL WINAPI GetVolumePathNamesForVolumeNameA(LPCSTR volumename, LPSTR volumepathname, DWORD buflen, PDWORD returnlen)
+{
+ BOOL ret;
+ WCHAR *volumenameW = NULL, *volumepathnameW;
+
+ if (volumename && !(volumenameW = FILE_name_AtoW( volumename, TRUE ))) return FALSE;
+ if (!(volumepathnameW = HeapAlloc( GetProcessHeap(), 0, buflen * sizeof(WCHAR) )))
+ {
+ HeapFree( GetProcessHeap(), 0, volumenameW );
+ return FALSE;
+ }
+ if ((ret = GetVolumePathNamesForVolumeNameW( volumenameW, volumepathnameW, buflen, returnlen )))
+ {
+ char *path = volumepathname;
+ const WCHAR *pathW = volumepathnameW;
+
+ while (*pathW)
+ {
+ int len = strlenW( pathW ) + 1;
+ FILE_name_WtoA( pathW, len, path, buflen );
+ buflen -= len;
+ pathW += len;
+ path += len;
+ }
+ path[0] = 0;
+ }
+ HeapFree( GetProcessHeap(), 0, volumenameW );
+ HeapFree( GetProcessHeap(), 0, volumepathnameW );
+ return ret;
+}
+
+/***********************************************************************
* GetVolumePathNamesForVolumeNameW (KERNEL32.@)
*/
BOOL WINAPI GetVolumePathNamesForVolumeNameW(LPCWSTR volumename, LPWSTR volumepathname, DWORD buflen, PDWORD returnlen)
{
- FIXME("(%s, %p, %d, %p), stub!\n", debugstr_w(volumename), volumepathname, buflen, returnlen);
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return FALSE;
+ static const WCHAR prefixW[] =
+ {'\\','\\','?','\\','V','o','l','u','m','e','{','0','0','0','0','0','0','0','0','-','0','0','0','0','-',
+ '0','0','0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0','0'};
+ static const WCHAR fmtW[] = {'%','c',':','\\',0};
+
+ TRACE("%s, %p, %u, %p\n", debugstr_w(volumename), volumepathname, buflen, returnlen);
+
+ if (!volumename || strlenW( volumename ) != 49 ||
+ volumename[47] != '}' || memcmp( volumename, prefixW, sizeof(prefixW) ))
+ {
+ SetLastError( ERROR_INVALID_NAME );
+ return FALSE;
+ }
+ if (returnlen)
+ {
+ *returnlen = 5;
+ }
+ if (buflen < 5 || !volumepathname)
+ {
+ SetLastError( ERROR_MORE_DATA );
+ return FALSE;
+ }
+ sprintfW( volumepathname, fmtW, strtolW( volumename + 45, NULL, 16 ) );
+ volumepathname[4] = 0;
+ return TRUE;
}
/***********************************************************************
--
1.7.1
More information about the wine-patches
mailing list