From: Piotr Caban piotr@codeweavers.com
--- dlls/msvcp140/tests/msvcp140.c | 14 +++---- dlls/msvcrt/msvcrt.h | 13 +++++- dlls/ucrtbase/tests/file.c | 73 +++++++++------------------------- 3 files changed, 36 insertions(+), 64 deletions(-)
diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 9c18afd76fc..128ea20add2 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1709,14 +1709,13 @@ static void test__Fiopen(void) static const struct { const char *loc; const char *path; - int is_todo; } tests[] = { - { "German.utf8", "t\xc3\xa4\xc3\x8f\xc3\xb6\xc3\x9f.txt", TRUE }, - { "Polish.utf8", "t\xc4\x99\xc5\x9b\xc4\x87.txt", TRUE }, - { "Turkish.utf8", "t\xc3\x87\xc4\x9e\xc4\xb1\xc4\xb0\xc5\x9e.txt", TRUE }, - { "Arabic.utf8", "t\xd8\xaa\xda\x86.txt", TRUE }, - { "Japanese.utf8", "t\xe3\x82\xaf\xe3\x83\xa4.txt", TRUE }, - { "Chinese.utf8", "t\xe4\xb8\x82\xe9\xbd\xab.txt", TRUE }, + { "German.utf8", "t\xc3\xa4\xc3\x8f\xc3\xb6\xc3\x9f.txt" }, + { "Polish.utf8", "t\xc4\x99\xc5\x9b\xc4\x87.txt" }, + { "Turkish.utf8", "t\xc3\x87\xc4\x9e\xc4\xb1\xc4\xb0\xc5\x9e.txt" }, + { "Arabic.utf8", "t\xd8\xaa\xda\x86.txt" }, + { "Japanese.utf8", "t\xe3\x82\xaf\xe3\x83\xa4.txt" }, + { "Chinese.utf8", "t\xe4\xb8\x82\xe9\xbd\xab.txt" }, };
for(i=0; i<ARRAY_SIZE(tests); i++) { @@ -1734,7 +1733,6 @@ static void test__Fiopen(void) p_fclose(f);
f = p__Fiopen_wchar(wpath, OPENMODE_in, SH_DENYNO); - todo_wine_if(tests[i].is_todo && GetACP() != CP_UTF8) ok(!!f, "failed to open %s with locale %s\n", wine_dbgstr_w(wpath), tests[i].loc); if(f) p_fclose(f);
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 39349345de0..2c17fc43a56 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -53,6 +53,7 @@ typedef struct _iobuf #endif
#include <errno.h> +#include <locale.h> #include <stdarg.h> #include <stdint.h> #define _NO_CRT_STDIO_INLINE @@ -414,12 +415,20 @@ extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t,
static inline int convert_acp_utf8_to_wcs(const char *str, wchar_t *wstr, int len) { - return MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, str, -1, wstr, len); + UINT cp = CP_ACP; +#if _MSVCR_VER>=140 + if (___lc_codepage_func() == CP_UTF8) cp = CP_UTF8; +#endif + return MultiByteToWideChar(cp, MB_PRECOMPOSED, str, -1, wstr, len); }
static inline int convert_wcs_to_acp_utf8(const wchar_t *wstr, char *str, int len) { - return WideCharToMultiByte(CP_ACP, 0, wstr, -1, str, len, NULL, NULL); + UINT cp = CP_ACP; +#if _MSVCR_VER>=140 + if (___lc_codepage_func() == CP_UTF8) cp = CP_UTF8; +#endif + return WideCharToMultiByte(cp, 0, wstr, -1, str, len, NULL, NULL); }
static inline wchar_t* wstrdupa_utf8(const char *str) diff --git a/dlls/ucrtbase/tests/file.c b/dlls/ucrtbase/tests/file.c index 1a1b1cc5832..e48958455f2 100644 --- a/dlls/ucrtbase/tests/file.c +++ b/dlls/ucrtbase/tests/file.c @@ -181,14 +181,13 @@ static void test_fopen(void) static const struct { const char *loc; const char *path; - int is_todo; } tests[] = { - { "German.utf8", "t\xc3\xa4\xc3\x8f\xc3\xb6\xc3\x9f.txt", TRUE }, - { "Polish.utf8", "t\xc4\x99\xc5\x9b\xc4\x87.txt", TRUE }, - { "Turkish.utf8", "t\xc3\x87\xc4\x9e\xc4\xb1\xc4\xb0\xc5\x9e.txt", TRUE }, - { "Arabic.utf8", "t\xd8\xaa\xda\x86.txt", TRUE }, - { "Japanese.utf8", "t\xe3\x82\xaf\xe3\x83\xa4.txt", TRUE }, - { "Chinese.utf8", "t\xe4\xb8\x82\xe9\xbd\xab.txt", TRUE }, + { "German.utf8", "t\xc3\xa4\xc3\x8f\xc3\xb6\xc3\x9f.txt" }, + { "Polish.utf8", "t\xc4\x99\xc5\x9b\xc4\x87.txt" }, + { "Turkish.utf8", "t\xc3\x87\xc4\x9e\xc4\xb1\xc4\xb0\xc5\x9e.txt" }, + { "Arabic.utf8", "t\xd8\xaa\xda\x86.txt" }, + { "Japanese.utf8", "t\xe3\x82\xaf\xe3\x83\xa4.txt" }, + { "Chinese.utf8", "t\xe4\xb8\x82\xe9\xbd\xab.txt" }, { "Japanese", "t\xb8\xd5.txt" },
}; @@ -209,7 +208,6 @@ static void test_fopen(void) fclose(f);
f = _wfsopen(wpath, L"r", SH_DENYNO); - todo_wine_if(tests[i].is_todo && GetACP() != CP_UTF8) ok(!!f, "failed to open %s with locale %s\n", debugstr_a(tests[i].path), tests[i].loc); if(f) fclose(f); @@ -220,18 +218,6 @@ static void test_fopen(void) setlocale(LC_ALL, "C"); }
-static BOOL is_lossless_convertion(const char *str) -{ - wchar_t bufW[32]; - char buf[32]; - - if (!MultiByteToWideChar(CP_ACP, 0, str, -1, bufW, ARRAY_SIZE(bufW))) - return FALSE; - if (!WideCharToMultiByte(CP_ACP, 0, bufW, -1, buf, ARRAY_SIZE(buf), NULL, NULL)) - return FALSE; - return !strcmp(str, buf); -} - static void test_utf8(const char *argv0) { const char file[] = "file\xc4\x99\xc5\x9b\xc4\x87.a"; @@ -270,22 +256,19 @@ static void test_utf8(const char *argv0) ok(p == buf, "_getcwd returned %p, errno %d\n", p, errno); p = strrchr(p, '\'); ok(!!p, "strrchr returned NULL, buf = %s\n", debugstr_a(buf)); - todo_wine_if(!is_lossless_convertion(dir)) - ok(!strcmp(p + 1, dir), "unexpected working directory: %s\n", debugstr_a(buf)); + ok(!strcmp(p + 1, dir), "unexpected working directory: %s\n", debugstr_a(buf));
p = _getdcwd(_getdrive(), buf, sizeof(buf)); ok(p == buf, "_getdcwd returned %p, errno %d\n", p, errno); p = strrchr(p, '\'); ok(!!p, "strrchr returned NULL, buf = %s\n", debugstr_a(buf)); - todo_wine_if(!is_lossless_convertion(dir)) - ok(!strcmp(p + 1, dir), "unexpected working directory: %s\n", debugstr_a(buf)); + ok(!strcmp(p + 1, dir), "unexpected working directory: %s\n", debugstr_a(buf));
p = _fullpath(buf, NULL, sizeof(buf)); ok(p == buf, "_fulpath returned %p, errno %d\n", p, errno); p = strrchr(p, '\'); ok(!!p, "strrchr returned NULL, buf = %s\n", debugstr_a(buf)); - todo_wine_if(!is_lossless_convertion(dir)) - ok(!strcmp(p + 1, dir), "unexpected working directory: %s\n", debugstr_a(buf)); + ok(!strcmp(p + 1, dir), "unexpected working directory: %s\n", debugstr_a(buf));
f = fopen(file, "w"); ok(!!f, "fopen returned %d, error %d\n", ret, errno); @@ -328,14 +311,12 @@ static void test_utf8(const char *argv0) fdata32.name[0] = 'x'; hfind = _findfirst32(buf, &fdata32); ok(hfind != -1, "_findfirst32 returned %Id, errno %d\n", hfind, errno); - todo_wine_if(!is_lossless_convertion(dir)) - ok(!memcmp(file, fdata32.name, sizeof(file) - 1), "fdata32.name = %s\n", debugstr_a(fdata32.name)); + ok(!memcmp(file, fdata32.name, sizeof(file) - 1), "fdata32.name = %s\n", debugstr_a(fdata32.name));
fdata32.name[0] = 'x'; ret = _findnext32(hfind, &fdata32); ok(!ret, "_findnext32 returned %d, errno %d\n", ret, errno); - todo_wine_if(!is_lossless_convertion(dir)) - ok(!memcmp(file, fdata32.name, sizeof(file) - 1), "fdata32.name = %s\n", debugstr_a(fdata32.name)); + ok(!memcmp(file, fdata32.name, sizeof(file) - 1), "fdata32.name = %s\n", debugstr_a(fdata32.name)); ret = _findclose(hfind); ok(!ret, "_findclose returned %d, errno %d\n", ret, errno);
@@ -345,14 +326,12 @@ static void test_utf8(const char *argv0) fdata64.name[0] = 'x'; hfind = _findfirst64(buf, &fdata64); ok(hfind != -1, "_findfirst64 returned %Id, errno %d\n", hfind, errno); - todo_wine_if(!is_lossless_convertion(dir)) - ok(!memcmp(file, fdata64.name, sizeof(file) - 1), "fdata64.name = %s\n", debugstr_a(fdata64.name)); + ok(!memcmp(file, fdata64.name, sizeof(file) - 1), "fdata64.name = %s\n", debugstr_a(fdata64.name));
fdata64.name[0] = 'x'; ret = _findnext64(hfind, &fdata64); ok(!ret, "_findnext64 returned %d, errno %d\n", ret, errno); - todo_wine_if(!is_lossless_convertion(dir)) - ok(!memcmp(file, fdata64.name, sizeof(file) - 1), "fdata64.name = %s\n", debugstr_a(fdata64.name)); + ok(!memcmp(file, fdata64.name, sizeof(file) - 1), "fdata64.name = %s\n", debugstr_a(fdata64.name)); ret = _findclose(hfind); ok(!ret, "_findclose returned %d, errno %d\n", ret, errno);
@@ -361,14 +340,12 @@ static void test_utf8(const char *argv0) fdata64i32.name[0] = 'x'; hfind = _findfirst64i32(buf, &fdata64i32); ok(hfind != -1, "_findfirst64i32 returned %Id, errno %d\n", hfind, errno); - todo_wine_if(!is_lossless_convertion(dir)) - ok(!memcmp(file, fdata64i32.name, sizeof(file) - 1), "fdata64i32.name = %s\n", debugstr_a(fdata64i32.name)); + ok(!memcmp(file, fdata64i32.name, sizeof(file) - 1), "fdata64i32.name = %s\n", debugstr_a(fdata64i32.name));
fdata64i32.name[0] = 'x'; ret = _findnext64i32(hfind, &fdata64i32); ok(!ret, "_findnext64i32 returned %d, errno %d\n", ret, errno); - todo_wine_if(!is_lossless_convertion(dir)) - ok(!memcmp(file, fdata64i32.name, sizeof(file) - 1), "fdata64i32.name = %s\n", debugstr_a(fdata64i32.name)); + ok(!memcmp(file, fdata64i32.name, sizeof(file) - 1), "fdata64i32.name = %s\n", debugstr_a(fdata64i32.name)); ret = _findclose(hfind); ok(!ret, "_findclose returned %d, errno %d\n", ret, errno);
@@ -379,27 +356,16 @@ static void test_utf8(const char *argv0) _searchenv(file, "env", buf); p = strrchr(buf, '\'); ok(!!p, "buf = %s\n", debugstr_a(buf)); - todo_wine_if(!is_lossless_convertion(file)) - ok(!strcmp(p + 1, file), "buf = %s\n", debugstr_a(buf)); + ok(!strcmp(p + 1, file), "buf = %s\n", debugstr_a(buf));
ret = _wunlink(fileW); - todo_wine_if(GetACP() != CP_UTF8) ok(!ret, "_wunlink returned %d, errno %d\n", ret, errno); - if (ret) - { - ret = _unlink(file); - ok(!ret, "_unlink returned %d, errno %d\n", ret, errno); - } + ok(!ret, "_wunlink returned %d, errno %d\n", ret, errno);
ret = _chdir(".."); ok(!ret, "_chdir returned %d, error %d\n", ret, errno);
ret = _wrmdir(dirW); - todo_wine_if(GetACP() != CP_UTF8) ok(!ret, "_wrmdir returned %d, errno %d\n", ret, errno); - if (ret) - { - ret = _rmdir(dir); - ok(!ret, "_rmdir returned %d, errno %d\n", ret, errno); - } + ok(!ret, "_wrmdir returned %d, errno %d\n", ret, errno);
p = _tempnam(NULL, file); ok(!!p, "_tempnam returned NULL, error %d\n", errno); @@ -464,8 +430,7 @@ static void test_utf8_argument(void)
p = wcsrchr(cmdline, ' '); ok(!!p, "cmdline = %s\n", debugstr_w(cmdline)); - todo_wine_if(GetACP() != CP_UTF8) - ok(!wcscmp(p + 1, L"file\x0119\x015b\x0107.a"), "cmdline = %s\n", debugstr_w(cmdline)); + ok(!wcscmp(p + 1, L"file\x0119\x015b\x0107.a"), "cmdline = %s\n", debugstr_w(cmdline)); }
START_TEST(file)