[KERNEL32_APITEST]

- Make GetDriveType test succeed if the current directory is the drive root. Spotted by Edijs.
- Use strsafe functions
ROSTESTS-160 #resolve

svn path=/trunk/; revision=67222
This commit is contained in:
Thomas Faber 2015-04-17 08:09:30 +00:00
parent a239c99e56
commit e69c4796da

View file

@ -1,4 +1,5 @@
#include <apitest.h>
#include <strsafe.h>
#define IS_DRIVE_TYPE_VALID(type) ((type) != DRIVE_UNKNOWN && (type) != DRIVE_NO_ROOT_DIR)
@ -6,45 +7,48 @@ START_TEST(GetDriveType)
{
UINT Type, Type2, i;
WCHAR Path[MAX_PATH];
/* Note: Successful calls can set last error to at least ERROR_NOT_A_REPARSE_POINT, we don't test it here */
SetLastError(0xdeadbeaf);
Type = GetDriveTypeW(L"");
ok(Type == DRIVE_NO_ROOT_DIR, "Expected DRIVE_NO_ROOT_DIR, got %u\n", Type);
Type = GetDriveTypeW(L"\nC:\\");
ok(Type == DRIVE_NO_ROOT_DIR, "Expected DRIVE_NO_ROOT_DIR, got %u\n", Type);
Type = GetDriveTypeW(L"Z:\\");
ok(Type == DRIVE_NO_ROOT_DIR, "Expected DRIVE_NO_ROOT_DIR, got %u\n", Type);
ok(GetLastError() == 0xdeadbeaf, "Expected no errors, got %lu\n", GetLastError());
/* Drive root is accepted without ending slash */
Type = GetDriveTypeW(L"C:");
ok(IS_DRIVE_TYPE_VALID(Type), "Expected valid drive type, got %u\n", Type);
Type = GetDriveTypeW(L"C:\\");
ok(IS_DRIVE_TYPE_VALID(Type), "Expected valid drive type, got %u\n", Type);
Type = GetDriveTypeW(NULL);
ok(IS_DRIVE_TYPE_VALID(Type), "Expected valid drive type, got %u\n", Type);
i = GetCurrentDirectoryW(sizeof(Path)/sizeof(Path[0]), Path);
if (i)
{
/* Note: there is no backslash at the end of Path */
SetLastError(0xdeadbeaf);
Type2 = GetDriveTypeW(Path);
ok(Type2 == DRIVE_NO_ROOT_DIR, "Expected DRIVE_NO_ROOT_DIR, got %u\n", Type2);
ok(GetLastError() == 0xdeadbeaf, "Expected ERROR_NOT_A_REPARSE_POINT, got %lu\n", GetLastError());
wcscpy(Path+i, L"\\");
/* No trailing backslash returned unless we're at the drive root */
if (Path[i - 1] != L'\\')
{
SetLastError(0xdeadbeaf);
Type2 = GetDriveTypeW(Path);
ok(Type2 == DRIVE_NO_ROOT_DIR, "Expected DRIVE_NO_ROOT_DIR, got %u\n", Type2);
ok(GetLastError() == 0xdeadbeaf, "Expected no errors, got %lu\n", GetLastError());
StringCchCopyW(Path + i, MAX_PATH - i, L"\\");
}
Type2 = GetDriveTypeW(Path);
ok(Type == Type2, "Types are not equal: %u != %u\n", Type, Type2);
}
i = GetSystemDirectoryW(Path, sizeof(Path)/sizeof(Path[0]));
if (i)
{
@ -53,16 +57,16 @@ START_TEST(GetDriveType)
Type = GetDriveTypeW(Path);
ok(Type == DRIVE_NO_ROOT_DIR, "Expected DRIVE_NO_ROOT_DIR, got %u\n", Type);
ok(GetLastError() == 0xdeadbeaf, "Expected no errors, got %lu\n", GetLastError());
wcscpy(Path+i, L"\\");
StringCchCopyW(Path + i, MAX_PATH - i, L"\\");
Type = GetDriveTypeW(Path);
ok(IS_DRIVE_TYPE_VALID(Type), "Expected valid drive type, got %u\n", Type);
wcscpy(Path+i, L"/");
StringCchCopyW(Path + i, MAX_PATH - i, L"/");
Type = GetDriveTypeW(Path);
ok(IS_DRIVE_TYPE_VALID(Type), "Expected valid drive type, got %u\n", Type);
wcscpy(Path+i, L"\\\\");
StringCchCopyW(Path + i, MAX_PATH - i, L"\\\\");
Type = GetDriveTypeW(Path);
ok(IS_DRIVE_TYPE_VALID(Type), "Expected valid drive type, got %u\n", Type);
}