Commit 38f7d54f authored by Andrew Nguyen's avatar Andrew Nguyen Committed by Alexandre Julliard

kernel32/tests: Correctly skip when the Unicode file functions are not available.

parent a85dc859
...@@ -633,8 +633,11 @@ static void test_CopyFileW(void) ...@@ -633,8 +633,11 @@ static void test_CopyFileW(void)
DWORD ret; DWORD ret;
ret = GetTempPathW(MAX_PATH, temp_path); ret = GetTempPathW(MAX_PATH, temp_path);
if (ret==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) if (ret == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{
win_skip("GetTempPathW is not available\n");
return; return;
}
ok(ret != 0, "GetTempPathW error %d\n", GetLastError()); ok(ret != 0, "GetTempPathW error %d\n", GetLastError());
ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n");
...@@ -720,8 +723,11 @@ static void test_CreateFileW(void) ...@@ -720,8 +723,11 @@ static void test_CreateFileW(void)
DWORD ret; DWORD ret;
ret = GetTempPathW(MAX_PATH, temp_path); ret = GetTempPathW(MAX_PATH, temp_path);
if (ret==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) if (ret == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{
win_skip("GetTempPathW is not available\n");
return; return;
}
ok(ret != 0, "GetTempPathW error %d\n", GetLastError()); ok(ret != 0, "GetTempPathW error %d\n", GetLastError());
ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n");
...@@ -864,8 +870,11 @@ static void test_DeleteFileW( void ) ...@@ -864,8 +870,11 @@ static void test_DeleteFileW( void )
static const WCHAR emptyW[]={'\0'}; static const WCHAR emptyW[]={'\0'};
ret = DeleteFileW(NULL); ret = DeleteFileW(NULL);
if (ret==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) if (ret == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{
win_skip("DeleteFileW is not available\n");
return; return;
}
ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND, ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND,
"DeleteFileW(NULL) returned ret=%d error=%d\n",ret,GetLastError()); "DeleteFileW(NULL) returned ret=%d error=%d\n",ret,GetLastError());
...@@ -984,8 +993,11 @@ static void test_MoveFileW(void) ...@@ -984,8 +993,11 @@ static void test_MoveFileW(void)
DWORD ret; DWORD ret;
ret = GetTempPathW(MAX_PATH, temp_path); ret = GetTempPathW(MAX_PATH, temp_path);
if (ret==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) if (ret == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{
win_skip("GetTempPathW is not available\n");
return; return;
}
ok(ret != 0, "GetTempPathW error %d\n", GetLastError()); ok(ret != 0, "GetTempPathW error %d\n", GetLastError());
ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n");
...@@ -2352,8 +2364,11 @@ static void test_ReplaceFileW(void) ...@@ -2352,8 +2364,11 @@ static void test_ReplaceFileW(void)
} }
ret = GetTempPathW(MAX_PATH, temp_path); ret = GetTempPathW(MAX_PATH, temp_path);
if (ret==0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) if (ret == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{
win_skip("GetTempPathW is not available\n");
return; return;
}
ok(ret != 0, "GetTempPathW error %d\n", GetLastError()); ok(ret != 0, "GetTempPathW error %d\n", GetLastError());
ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment