Module: wine Branch: master Commit: f7e6777e6e19ca3be4b84f98baf22ef53ab19f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7e6777e6e19ca3be4b84f98ba...
Author: Guy Albertelli galberte@neo.rr.com Date: Tue Apr 28 21:08:22 2009 -0400
kernel32: Fix GetVolumeInformation[AW] to require trailing .
---
dlls/kernel32/tests/volume.c | 1 - dlls/kernel32/volume.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 1bbdb68..16fad10 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -287,7 +287,6 @@ static void test_GetVolumeInformationA(void) /* check for error on no trailing \ */ ret = pGetVolumeInformationA(Root_Dir0, vol_name_buf, vol_name_size, NULL, NULL, NULL, fs_name_buf, fs_name_len); -todo_wine ok(!ret && GetLastError() == ERROR_INVALID_NAME, "GetVolumeInformationA w/o '\' did not fail, last error %u\n", GetLastError());
diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index e0d0989..1b44ace 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -526,7 +526,7 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, } else { - if (!root[0] || root[1] != ':') + if (!root[0] || root[1] != ':' || root[lstrlenW(root)-1] != '\' ) { SetLastError( ERROR_INVALID_NAME ); return FALSE;