[PATCH v2 3/3] msvcp140: Use current locale to convert path in _Fiopen.

[Daniel Lehman]

From: Daniel Lehman

---
 dlls/msvcp140/tests/msvcp140.c | 4 +---
 dlls/msvcp90/ios.c             | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c
index 44f999fb838..34d926fa27c 100644
--- a/dlls/msvcp140/tests/msvcp140.c
+++ b/dlls/msvcp140/tests/msvcp140.c
@@ -1708,11 +1708,10 @@ static void test__Fiopen(void)
         const char *loc;
         const WCHAR *wpath;
         const char *apath;
-        int is_todo;
     } tests[] = {
         { "C",          L"utf_\x00e4\x00cf\x00f6\x00df.txt", "utf_\xe4\xcf\xf6\xdf.txt" },
         { "de_DE",      L"utf_\x00e4\x00cf\x00f6\x00df.txt", "utf_\xe4\xcf\xf6\xdf.txt" },
-        { "de_DE.utf8", L"utf_\x00e4\x00cf\x00f6\x00df.txt", "utf_\xc3\xa4\xc3\x8f\xc3\xb6\xc3\x9f.txt", TRUE },
+        { "de_DE.utf8", L"utf_\x00e4\x00cf\x00f6\x00df.txt", "utf_\xc3\xa4\xc3\x8f\xc3\xb6\xc3\x9f.txt" },
     };

oldloc = p_setlocale(LC_ALL, NULL);
@@ -1725,7 +1724,6 @@ static void test__Fiopen(void)
         ok(!!f, "failed to create %s with locale %s\n", wine_dbgstr_w(tests[i].wpath), tests[i].loc);
         if(f) p_fclose(f);
         f = p__Fiopen(tests[i].apath, OPENMODE_in, SH_DENYNO);
-        todo_wine_if(tests[i].is_todo)
         ok(!!f, "failed to read %s with locale %s\n", tests[i].apath, tests[i].loc);
         if(f) p_fclose(f);
         DeleteFileW(tests[i].wpath);
diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c
index 5b791cd4345..50421ecc15b 100644
--- a/dlls/msvcp90/ios.c
+++ b/dlls/msvcp90/ios.c
@@ -3272,7 +3272,7 @@ FILE* __cdecl _Fiopen(const char *name, int mode, int prot)

TRACE("(%s %d %d)\n", name, mode, prot);

-#if _MSVCP_VER >= 80 && _MSVCP_VER <= 90
+#if (_MSVCP_VER >= 80 && _MSVCP_VER <= 90) || _MSVCP_VER >= 140
     if(mbstowcs_s(NULL, nameW, FILENAME_MAX, name, FILENAME_MAX-1) != 0)
         return NULL;
 #else