From 81b6613b3762a1f2e5f8258f55cc9004ce5cc239 Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Mon, 30 Nov 2020 10:10:10 +0100 Subject: [PATCH] msvcp140/tests: Use wide-char string literals. Signed-off-by: Piotr Caban Signed-off-by: Alexandre Julliard --- dlls/msvcp140/tests/msvcp140.c | 356 +++++++++++++-------------------- 1 file changed, 141 insertions(+), 215 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 751b1beed86..ae21feaf9e4 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -560,9 +560,7 @@ static void test_chore(void) static void test_to_byte(void) { - static const WCHAR test_1[] = {'T', 'E', 'S', 'T', 0}; - static const WCHAR test_2[] = {0x9580, 0x9581, 0x9582, 0x9583, 0}; /* some CJK characters */ - static const WCHAR *tests[] = {test_1, test_2}; + static const WCHAR *tests[] = {L"TEST", L"\x9580\x9581\x9582\x9583"}; char dst[MAX_PATH + 4] = "ABC\0XXXXXXX"; char compare[MAX_PATH + 4] = "ABC\0XXXXXXX"; @@ -654,10 +652,6 @@ static void test_File_size(void) ULONGLONG val; HANDLE file; LARGE_INTEGER file_size; - WCHAR test_f1_W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','1',0}; - WCHAR test_f2_W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','2',0}; - WCHAR test_dir_W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r',0}; - WCHAR test_ne_W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','n','e',0}; WCHAR temp_path[MAX_PATH], origin_path[MAX_PATH]; int r; @@ -665,28 +659,28 @@ static void test_File_size(void) GetTempPathW(MAX_PATH, temp_path); ok(SetCurrentDirectoryW(temp_path), "SetCurrentDirectoryW to temp_path failed\n"); - CreateDirectoryW(test_dir_W, NULL); + CreateDirectoryW(L"wine_test_dir", NULL); - file = CreateFileW(test_f1_W, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + file = CreateFileW(L"wine_test_dir/f1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); file_size.QuadPart = 7; ok(SetFilePointerEx(file, file_size, NULL, FILE_BEGIN), "SetFilePointerEx failed\n"); ok(SetEndOfFile(file), "SetEndOfFile failed\n"); CloseHandle(file); - val = p_File_size(test_f1_W); + val = p_File_size(L"wine_test_dir/f1"); ok(val == 7, "file_size is %s\n", wine_dbgstr_longlong(val)); - file = CreateFileW(test_f2_W, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + file = CreateFileW(L"wine_test_dir/f2", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); CloseHandle(file); - val = p_File_size(test_f2_W); + val = p_File_size(L"wine_test_dir/f2"); ok(val == 0, "file_size is %s\n", wine_dbgstr_longlong(val)); - val = p_File_size(test_dir_W); + val = p_File_size(L"wine_test_dir"); ok(val == 0, "file_size is %s\n", wine_dbgstr_longlong(val)); errno = 0xdeadbeef; - val = p_File_size(test_ne_W); + val = p_File_size(L"wine_test_dir/ne"); ok(val == ~(ULONGLONG)0, "file_size is %s\n", wine_dbgstr_longlong(val)); ok(errno == 0xdeadbeef, "errno = %d\n", errno); @@ -695,34 +689,33 @@ static void test_File_size(void) ok(val == ~(ULONGLONG)0, "file_size is %s\n", wine_dbgstr_longlong(val)); ok(errno == 0xdeadbeef, "errno = %d\n", errno); - r = p_Resize(test_f1_W, 1000); + r = p_Resize(L"wine_test_dir/f1", 1000); ok(!r, "p_Resize returned %d\n", r); - val = p_File_size(test_f1_W); + val = p_File_size(L"wine_test_dir/f1"); ok(val == 1000, "file_size is %s\n", wine_dbgstr_longlong(val)); - r = p_Resize(test_f1_W, 100); + r = p_Resize(L"wine_test_dir/f1", 100); ok(!r, "p_Resize returned %d\n", r); - val = p_File_size(test_f1_W); + val = p_File_size(L"wine_test_dir/f1"); ok(val == 100, "file_size is %s\n", wine_dbgstr_longlong(val)); - r = p_Resize(test_f1_W, 0); + r = p_Resize(L"wine_test_dir/f1", 0); ok(!r, "p_Resize returned %d\n", r); - val = p_File_size(test_f1_W); + val = p_File_size(L"wine_test_dir/f1"); ok(val == 0, "file_size is %s\n", wine_dbgstr_longlong(val)); - ok(DeleteFileW(test_f1_W), "expect wine_test_dir/f1 to exist\n"); + ok(DeleteFileW(L"wine_test_dir/f1"), "expect wine_test_dir/f1 to exist\n"); - r = p_Resize(test_f1_W, 0); + r = p_Resize(L"wine_test_dir/f1", 0); ok(r == ERROR_FILE_NOT_FOUND, "p_Resize returned %d\n", r); - ok(DeleteFileW(test_f2_W), "expect wine_test_dir/f2 to exist\n"); - ok(RemoveDirectoryW(test_dir_W), "expect wine_test_dir to exist\n"); + ok(DeleteFileW(L"wine_test_dir/f2"), "expect wine_test_dir/f2 to exist\n"); + ok(RemoveDirectoryW(L"wine_test_dir"), "expect wine_test_dir to exist\n"); ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); } static void test_Current_get(void) { - static const WCHAR backslashW[] = {'\\',0}; WCHAR temp_path[MAX_PATH], current_path[MAX_PATH], origin_path[MAX_PATH]; BOOL ret; @@ -732,7 +725,7 @@ static void test_Current_get(void) ok(SetCurrentDirectoryW(temp_path), "SetCurrentDirectoryW to temp_path failed\n"); ret = p_Current_get(current_path); ok(ret == TRUE, "p_Current_get returned %u\n", ret); - wcscat(current_path, backslashW); + wcscat(current_path, L"\\"); ok(!wcscmp(temp_path, current_path), "p_Current_get(): expect: %s, got %s\n", wine_dbgstr_w(temp_path), wine_dbgstr_w(current_path)); @@ -747,10 +740,6 @@ static void test_Current_set(void) { WCHAR temp_path[MAX_PATH], current_path[MAX_PATH], origin_path[MAX_PATH]; MSVCP_bool ret; - static const WCHAR backslashW[] = {'\\',0}; - static const WCHAR testW[] = {'.','/',0}; - static const WCHAR not_exit_dirW[] = {'n', 'o', 't', '_', 'e', 'x', 'i', 's', 't', '_', 'd', 'i', 'r', 0}; - static const WCHAR invalid_nameW[] = {'?', '?', 'i', 'n', 'v', 'a', 'l', 'i', 'd', '_', 'n', 'a', 'm', 'e', '>', '>', 0}; GetTempPathW(MAX_PATH, temp_path); GetCurrentDirectoryW(MAX_PATH, origin_path); @@ -758,23 +747,23 @@ static void test_Current_set(void) ok(p_Current_set(temp_path), "p_Current_set to temp_path failed\n"); ret = p_Current_get(current_path); ok(ret == TRUE, "p_Current_get returned %u\n", ret); - wcscat(current_path, backslashW); + wcscat(current_path, L"\\"); ok(!wcscmp(temp_path, current_path), "p_Current_get(): expect: %s, got %s\n", wine_dbgstr_w(temp_path), wine_dbgstr_w(current_path)); - ok(p_Current_set(testW), "p_Current_set to temp_path failed\n"); + ok(p_Current_set(L"./"), "p_Current_set to temp_path failed\n"); ret = p_Current_get(current_path); ok(ret == TRUE, "p_Current_get returned %u\n", ret); - wcscat(current_path, backslashW); + wcscat(current_path, L"\\"); ok(!wcscmp(temp_path, current_path), "p_Current_get(): expect: %s, got %s\n", wine_dbgstr_w(temp_path), wine_dbgstr_w(current_path)); errno = 0xdeadbeef; - ok(!p_Current_set(not_exit_dirW), "p_Current_set to not_exist_dir succeed\n"); + ok(!p_Current_set(L"not_exist_dir"), "p_Current_set to not_exist_dir succeed\n"); ok(errno == 0xdeadbeef, "errno = %d\n", errno); errno = 0xdeadbeef; - ok(!p_Current_set(invalid_nameW), "p_Current_set to ??invalid_name>> succeed\n"); + ok(!p_Current_set(L"??invalid_name>>"), "p_Current_set to ??invalid_name>> succeed\n"); ok(errno == 0xdeadbeef, "errno = %d\n", errno); ok(p_Current_set(origin_path), "p_Current_set to origin_path failed\n"); @@ -790,14 +779,6 @@ static void test_Stat(void) HANDLE file; DWORD attr; enum file_type val; - WCHAR test_dirW[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r',0}; - WCHAR test_f1W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','1',0}; - WCHAR test_f2W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','2',0}; - WCHAR pipeW[] = {'\\','\\','.','\\','P','i','P','e','\\','t','e','s','t','s','_','p','i','p','e','.','c', 0}; - WCHAR test_neW[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','n','e',0}; - WCHAR test_invW[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','\\','?','?','i','n','v','a','l','i','d','_','n','a','m','e','>','>',0}; - WCHAR test_f1_linkW[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','\\','f','1','_','l','i','n','k',0}; - WCHAR test_dir_linkW[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','\\','d','i','r','_','l','i','n','k',0}; WCHAR sys_path[MAX_PATH], origin_path[MAX_PATH], temp_path[MAX_PATH]; struct { WCHAR const *path; @@ -806,60 +787,63 @@ static void test_Stat(void) int is_todo; } tests[] = { { NULL, file_not_found, 0xdeadbeef, FALSE }, - { test_dirW, directory_file, 0777, FALSE }, - { test_f1W, regular_file, 0777, FALSE }, - { test_f2W, regular_file, 0555, FALSE }, - { test_neW, file_not_found, 0xdeadbeef, FALSE }, - { test_invW, file_not_found, 0xdeadbeef, FALSE }, - { test_f1_linkW, regular_file, 0777, TRUE }, - { test_dir_linkW, directory_file, 0777, TRUE }, + { L"wine_test_dir", directory_file, 0777, FALSE }, + { L"wine_test_dir/f1", regular_file, 0777, FALSE }, + { L"wine_test_dir/f2", regular_file, 0555, FALSE }, + { L"wine_test_dir/ne", file_not_found, 0xdeadbeef, FALSE }, + { L"wine_test_dir\\??invalid_name>>", file_not_found, 0xdeadbeef, FALSE }, + { L"wine_test_dir\\f1_link", regular_file, 0777, TRUE }, + { L"wine_test_dir\\dir_link", directory_file, 0777, TRUE }, }; GetCurrentDirectoryW(MAX_PATH, origin_path); GetTempPathW(MAX_PATH, temp_path); ok(SetCurrentDirectoryW(temp_path), "SetCurrentDirectoryW to temp_path failed\n"); - CreateDirectoryW(test_dirW, NULL); + CreateDirectoryW(L"wine_test_dir", NULL); - file = CreateFileW(test_f1W, 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + file = CreateFileW(L"wine_test_dir/f1", 0, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); ok(CloseHandle(file), "CloseHandle\n"); - file = CreateFileW(test_f2W, 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + file = CreateFileW(L"wine_test_dir/f2", 0, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); ok(CloseHandle(file), "CloseHandle\n"); - SetFileAttributesW(test_f2W, FILE_ATTRIBUTE_READONLY); + SetFileAttributesW(L"wine_test_dir/f2", FILE_ATTRIBUTE_READONLY); SetLastError(0xdeadbeef); - ret = pCreateSymbolicLinkW && pCreateSymbolicLinkW(test_f1_linkW, test_f1W, 0); - if(!ret && (!pCreateSymbolicLinkW || GetLastError()==ERROR_PRIVILEGE_NOT_HELD||GetLastError()==ERROR_INVALID_FUNCTION)) { + ret = pCreateSymbolicLinkW && pCreateSymbolicLinkW( + L"wine_test_dir\\f1_link", L"wine_test_dir/f1", 0); + if(!ret && (!pCreateSymbolicLinkW || GetLastError()==ERROR_PRIVILEGE_NOT_HELD + || GetLastError()==ERROR_INVALID_FUNCTION)) { tests[6].ret = tests[7].ret = file_not_found; tests[6].perms = tests[7].perms = 0xdeadbeef; win_skip("Privilege not held or symbolic link not supported, skipping symbolic link tests.\n"); }else { ok(ret, "CreateSymbolicLinkW failed\n"); - ok(pCreateSymbolicLinkW(test_dir_linkW, test_dirW, 1), "CreateSymbolicLinkW failed\n"); + ok(pCreateSymbolicLinkW(L"wine_test_dir\\dir_link", L"wine_test_dir", 1), + "CreateSymbolicLinkW failed\n"); } - file = CreateNamedPipeW(pipeW, + file = CreateNamedPipeW(L"\\\\.\\PiPe\\tests_pipe.c", PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_WAIT, 2, 1024, 1024, NMPWAIT_USE_DEFAULT_WAIT, NULL); ok(file != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); perms = 0xdeadbeef; - val = p_Stat(pipeW, &perms); + val = p_Stat(L"\\\\.\\PiPe\\tests_pipe.c", &perms); todo_wine ok(regular_file == val, "_Stat(): expect: regular, got %d\n", val); todo_wine ok(0777 == perms, "_Stat(): perms expect: 0777, got 0%o\n", perms); perms = 0xdeadbeef; - val = p_Lstat(pipeW, &perms); + val = p_Lstat(L"\\\\.\\PiPe\\tests_pipe.c", &perms); ok(status_unknown == val, "_Lstat(): expect: unknown, got %d\n", val); ok(0xdeadbeef == perms, "_Lstat(): perms expect: 0xdeadbeef, got %x\n", perms); ok(CloseHandle(file), "CloseHandle\n"); - file = CreateNamedPipeW(pipeW, + file = CreateNamedPipeW(L"\\\\.\\PiPe\\tests_pipe.c", PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_WAIT, 2, 1024, 1024, NMPWAIT_USE_DEFAULT_WAIT, NULL); ok(file != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); perms = 0xdeadbeef; - val = p_Lstat(pipeW, &perms); + val = p_Lstat(L"\\\\.\\PiPe\\tests_pipe.c", &perms); todo_wine ok(regular_file == val, "_Lstat(): expect: regular, got %d\n", val); todo_wine ok(0777 == perms, "_Lstat(): perms expect: 0777, got 0%o\n", perms); ok(CloseHandle(file), "CloseHandle\n"); @@ -898,13 +882,15 @@ static void test_Stat(void) ok(perms == expected_perms, "_Stat(): perms expect: 0%o, got 0%o\n", expected_perms, perms); if(ret) { - todo_wine ok(DeleteFileW(test_f1_linkW), "expect wine_test_dir/f1_link to exist\n"); - todo_wine ok(RemoveDirectoryW(test_dir_linkW), "expect wine_test_dir/dir_link to exist\n"); + todo_wine ok(DeleteFileW(L"wine_test_dir\\f1_link"), + "expect wine_test_dir/f1_link to exist\n"); + todo_wine ok(RemoveDirectoryW(L"wine_test_dir\\dir_link"), + "expect wine_test_dir/dir_link to exist\n"); } - ok(DeleteFileW(test_f1W), "expect wine_test_dir/f1 to exist\n"); - SetFileAttributesW(test_f2W, FILE_ATTRIBUTE_NORMAL); - ok(DeleteFileW(test_f2W), "expect wine_test_dir/f2 to exist\n"); - ok(RemoveDirectoryW(test_dirW), "expect wine_test_dir to exist\n"); + ok(DeleteFileW(L"wine_test_dir/f1"), "expect wine_test_dir/f1 to exist\n"); + SetFileAttributesW(L"wine_test_dir/f2", FILE_ATTRIBUTE_NORMAL); + ok(DeleteFileW(L"wine_test_dir/f2"), "expect wine_test_dir/f2 to exist\n"); + ok(RemoveDirectoryW(L"wine_test_dir"), "expect wine_test_dir to exist\n"); ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); } @@ -916,42 +902,27 @@ static void test_dir_operation(void) HANDLE file, result_handle; enum file_type type; int err, num_of_f1 = 0, num_of_f2 = 0, num_of_sub_dir = 0, num_of_other_files = 0; - WCHAR test_dirW[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r',0}; - WCHAR test_f1W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','1',0}; - WCHAR test_f2W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','2',0}; - WCHAR test_sub_dirW[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','s','u','b','_','d','i','r',0}; - WCHAR test_sub_dir_f1W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r', - '/','s','u','b','_','d','i','r','/','f','1',0}; - WCHAR backslashW[] = {'\\',0}; - WCHAR sW[] = {'s',0}; - WCHAR f1W[] = {'f','1',0}; - WCHAR f2W[] = {'f','2',0}; - WCHAR sub_dirW[] = {'s','u','b','_','d','i','r',0}; - WCHAR not_existW[] = {'n','o','t','_','e','x','i','s','t',0}; - WCHAR empty_dirW[] = {'e','m','p','t','y','_','d','i','r',0}; GetCurrentDirectoryW(MAX_PATH, origin_path); GetTempPathW(MAX_PATH, temp_path); ok(SetCurrentDirectoryW(temp_path), "SetCurrentDirectoryW to temp_path failed\n"); - CreateDirectoryW(test_dirW, NULL); - file = CreateFileW(test_f1W, 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + CreateDirectoryW(L"wine_test_dir", NULL); + file = CreateFileW(L"wine_test_dir/f1", 0, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); CloseHandle(file); - file = CreateFileW(test_f2W, 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + file = CreateFileW(L"wine_test_dir/f2", 0, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); CloseHandle(file); - CreateDirectoryW(test_sub_dirW, NULL); - file = CreateFileW(test_sub_dir_f1W, 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + CreateDirectoryW(L"wine_test_dir/sub_dir", NULL); + file = CreateFileW(L"wine_test_dir/sub_dir/f1", 0, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); CloseHandle(file); memcpy(longer_path, temp_path, sizeof(longer_path)); - wcscat(longer_path, backslashW); - wcscat(longer_path, test_dirW); - wcscat(longer_path, backslashW); + wcscat(longer_path, L"\\wine_test_dir\\"); while(lstrlenW(longer_path) < MAX_PATH-1) - wcscat(longer_path, sW); + wcscat(longer_path, L"s"); memset(first_file_name, 0xff, sizeof(first_file_name)); type = err = 0xdeadbeef; result_handle = NULL; @@ -965,18 +936,18 @@ static void test_dir_operation(void) memset(dest, 0, sizeof(dest)); err = type = 0xdeadbeef; result_handle = NULL; - result_handle = p_Open_dir(first_file_name, test_dirW, &err, &type); + result_handle = p_Open_dir(first_file_name, L"wine_test_dir", &err, &type); ok(result_handle != NULL, "_Open_dir(): expect: not NULL, got %p\n", result_handle); ok(err == ERROR_SUCCESS, "_Open_dir(): expect: ERROR_SUCCESS, got %d\n", err); file_name = first_file_name; while(*file_name) { - if (!wcscmp(file_name, f1W)) { + if (!wcscmp(file_name, L"f1")) { ++num_of_f1; ok(type == regular_file, "expect regular_file, got %d\n", type); - }else if(!wcscmp(file_name, f2W)) { + }else if(!wcscmp(file_name, L"f2")) { ++num_of_f2; ok(type == regular_file, "expect regular_file, got %d\n", type); - }else if(!wcscmp(file_name, sub_dirW)) { + }else if(!wcscmp(file_name, L"sub_dir")) { ++num_of_sub_dir; ok(type == directory_file, "expect directory_file, got %d\n", type); }else { @@ -995,17 +966,17 @@ static void test_dir_operation(void) memset(first_file_name, 0xff, sizeof(first_file_name)); err = type = 0xdeadbeef; result_handle = file; - result_handle = p_Open_dir(first_file_name, not_existW, &err, &type); + result_handle = p_Open_dir(first_file_name, L"not_exist", &err, &type); ok(result_handle == NULL, "_Open_dir(): expect: NULL, got %p\n", result_handle); ok(err == ERROR_BAD_PATHNAME, "_Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); ok((int)type == 0xdeadbeef, "_Open_dir(): expect: 0xdeadbeef, got %d\n", type); ok(!*first_file_name, "_Open_dir(): expect: 0, got %s\n", wine_dbgstr_w(first_file_name)); - CreateDirectoryW(empty_dirW, NULL); + CreateDirectoryW(L"empty_dir", NULL); memset(first_file_name, 0xff, sizeof(first_file_name)); err = type = 0xdeadbeef; result_handle = file; - result_handle = p_Open_dir(first_file_name, empty_dirW, &err, &type); + result_handle = p_Open_dir(first_file_name, L"empty_dir", &err, &type); ok(result_handle == NULL, "_Open_dir(): expect: NULL, got %p\n", result_handle); ok(err == ERROR_SUCCESS, "_Open_dir(): expect: ERROR_SUCCESS, got %d\n", err); ok(type == status_unknown, "_Open_dir(): expect: status_unknown, got %d\n", type); @@ -1013,12 +984,12 @@ static void test_dir_operation(void) p_Close_dir(result_handle); ok(result_handle == NULL, "_Open_dir(): expect: NULL, got %p\n", result_handle); - ok(RemoveDirectoryW(empty_dirW), "expect empty_dir to exist\n"); - ok(DeleteFileW(test_sub_dir_f1W), "expect wine_test_dir/sub_dir/sub_f1 to exist\n"); - ok(RemoveDirectoryW(test_sub_dirW), "expect wine_test_dir/sub_dir to exist\n"); - ok(DeleteFileW(test_f1W), "expect wine_test_dir/f1 to exist\n"); - ok(DeleteFileW(test_f2W), "expect wine_test_dir/f2 to exist\n"); - ok(RemoveDirectoryW(test_dirW), "expect wine_test_dir to exist\n"); + ok(RemoveDirectoryW(L"empty_dir"), "expect empty_dir to exist\n"); + ok(DeleteFileW(L"wine_test_dir/sub_dir/f1"), "expect wine_test_dir/sub_dir/sub_f1 to exist\n"); + ok(RemoveDirectoryW(L"wine_test_dir/sub_dir"), "expect wine_test_dir/sub_dir to exist\n"); + ok(DeleteFileW(L"wine_test_dir/f1"), "expect wine_test_dir/f1 to exist\n"); + ok(DeleteFileW(L"wine_test_dir/f2"), "expect wine_test_dir/f2 to exist\n"); + ok(RemoveDirectoryW(L"wine_test_dir"), "expect wine_test_dir to exist\n"); ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); } @@ -1029,29 +1000,17 @@ static void test_Unlink(void) int ret, i; HANDLE file; LARGE_INTEGER file_size; - static const WCHAR f1_symlinkW[] = - {'w','i','n','e','_','t','e','s','t','_','d','i','r','\\','f','1','_','s','y','m','l','i','n','k',0}; - static const WCHAR f1_linkW[] = - {'w','i','n','e','_','t','e','s','t','_','d','i','r','\\','f','1','_','l','i','n','k',0}; - static const WCHAR f1W[] = - {'w','i','n','e','_','t','e','s','t','_','d','i','r','\\','f','1',0}; - static const WCHAR wine_test_dirW[] = - {'w','i','n','e','_','t','e','s','t','_','d','i','r',0}; - static const WCHAR not_existW[] = - {'n','o','t','_','e','x','i','s','t',0}; - static const WCHAR not_exist_fileW[] = - {'n','o','t','_','e','x','i','s','t','_','d','i','r','\\','n','o','t','_','e','x','i','s','t','_','f','i','l','e',0}; struct { WCHAR const *path; int last_error; MSVCP_bool is_todo; } tests[] = { - { f1_symlinkW, ERROR_SUCCESS, TRUE }, - { f1_linkW, ERROR_SUCCESS, FALSE }, - { f1W, ERROR_SUCCESS, FALSE }, - { wine_test_dirW, ERROR_ACCESS_DENIED, FALSE }, - { not_existW, ERROR_FILE_NOT_FOUND, FALSE }, - { not_exist_fileW, ERROR_PATH_NOT_FOUND, FALSE }, + { L"wine_test_dir\\f1_symlink", ERROR_SUCCESS, TRUE }, + { L"wine_test_dir\\f1_link", ERROR_SUCCESS, FALSE }, + { L"wine_test_dir\\f1", ERROR_SUCCESS, FALSE }, + { L"wine_test_dir", ERROR_ACCESS_DENIED, FALSE }, + { L"not_exist", ERROR_FILE_NOT_FOUND, FALSE }, + { L"not_exist_dir\\not_exist_file", ERROR_PATH_NOT_FOUND, FALSE }, { NULL, ERROR_PATH_NOT_FOUND, FALSE } }; @@ -1059,23 +1018,23 @@ static void test_Unlink(void) GetTempPathW(MAX_PATH, temp_path); ok(SetCurrentDirectoryW(temp_path), "SetCurrentDirectoryW to temp_path failed\n"); - ret = p_Make_dir(wine_test_dirW); + ret = p_Make_dir(L"wine_test_dir"); ok(ret == 1, "_Make_dir(): expect 1 got %d\n", ret); - file = CreateFileW(f1W, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + file = CreateFileW(L"wine_test_dir\\f1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); file_size.QuadPart = 7; ok(SetFilePointerEx(file, file_size, NULL, FILE_BEGIN), "SetFilePointerEx failed\n"); ok(SetEndOfFile(file), "SetEndOfFile failed\n"); CloseHandle(file); - ret = p_Symlink(f1W, f1_symlinkW); + ret = p_Symlink(L"wine_test_dir\\f1", L"wine_test_dir\\f1_symlink"); if(ret==ERROR_PRIVILEGE_NOT_HELD || ret==ERROR_INVALID_FUNCTION || ret==ERROR_CALL_NOT_IMPLEMENTED) { tests[0].last_error = ERROR_FILE_NOT_FOUND; win_skip("Privilege not held or symbolic link not supported, skipping symbolic link tests.\n"); }else { ok(ret == ERROR_SUCCESS, "_Symlink(): expect: ERROR_SUCCESS, got %d\n", ret); } - ret = p_Link(f1W, f1_linkW); + ret = p_Link(L"wine_test_dir\\f1", L"wine_test_dir\\f1_link"); ok(ret == ERROR_SUCCESS, "_Link(): expect: ERROR_SUCCESS, got %d\n", ret); for(i=0; i',0}; static const struct { const WCHAR *old_path; const WCHAR *new_path; int val; } tests[] = { - { f1W, f1_renameW, ERROR_SUCCESS }, - { f1W, NULL, ERROR_FILE_NOT_FOUND }, - { f1W, f1_renameW, ERROR_FILE_NOT_FOUND }, - { NULL, f1_rename2W, ERROR_PATH_NOT_FOUND }, - { f1_renameW, invalidW, ERROR_INVALID_NAME }, - { not_existW, not_exist2W, ERROR_FILE_NOT_FOUND }, - { not_existW, invalidW, ERROR_FILE_NOT_FOUND } + { L"wine_test_dir\\f1", L"wine_test_dir\\f1_rename", ERROR_SUCCESS }, + { L"wine_test_dir\\f1", NULL, ERROR_FILE_NOT_FOUND }, + { L"wine_test_dir\\f1", L"wine_test_dir\\f1_rename", ERROR_FILE_NOT_FOUND }, + { NULL, L"wine_test_dir\\f1_rename2", ERROR_PATH_NOT_FOUND }, + { L"wine_test_dir\\f1_rename", L"wine_test_dir\\??invalid>", ERROR_INVALID_NAME }, + { L"wine_test_dir\\not_exist2", L"wine_test_dir\\not_exist2", ERROR_FILE_NOT_FOUND }, + { L"wine_test_dir\\not_exist2", L"wine_test_dir\\??invalid>", ERROR_FILE_NOT_FOUND } }; GetCurrentDirectoryW(MAX_PATH, current_path); GetTempPathW(MAX_PATH, temp_path); ok(SetCurrentDirectoryW(temp_path), "SetCurrentDirectoryW to temp_path failed\n"); - ret = p_Make_dir(wine_test_dirW); + ret = p_Make_dir(L"wine_test_dir"); ok(ret == 1, "_Make_dir(): expect 1 got %d\n", ret); - file = CreateFileW(f1W, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + file = CreateFileW(L"wine_test_dir\\f1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); CloseHandle(file); - ret = p_Rename(f1W, f1W); + ret = p_Rename(L"wine_test_dir\\f1", L"wine_test_dir\\f1"); ok(ERROR_SUCCESS == ret, "_Rename(): expect: ERROR_SUCCESS, got %d\n", ret); for(i=0; i