[PATCH v2 0/2] MR7093: msvcr120: Fix _fsopen and _Fiopen test failures.

[Piotr Caban (＠piotr)]

--
  v2: msvcp120/tests: Skip _Fiopen tests if file can't be created.
      msvcr120/tests: Skip _fsopen tests if file can't be created.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7093

[PATCH v2 1/2] msvcr120/tests: Skip _fsopen tests if file can't be created.

[Piotr Caban]

From: Piotr Caban <piotr(a)codeweavers.com>

---
 dlls/msvcr120/tests/msvcr120.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c
index 9ee2890d8e6..2c9569f750d 100644
--- a/dlls/msvcr120/tests/msvcr120.c
+++ b/dlls/msvcr120/tests/msvcr120.c
@@ -1840,6 +1840,7 @@ static void test__fsopen(void)
     int i, ret;
     FILE *f;
     wchar_t wpath[MAX_PATH];
+    HANDLE h;
     static const struct {
         const char *loc;
         const char *path;
@@ -1862,8 +1863,17 @@ static void test__fsopen(void)
         ok(ret, "MultiByteToWideChar failed on %s with locale %s: %lx\n",
             tests[i].path, tests[i].loc, GetLastError());
 
-        f = p__fsopen(tests[i].path, "w", SH_DENYNO);
-        ok(!!f, "failed to create %s with locale %s\n", tests[i].path, tests[i].loc);
+        h = CreateFileW(wpath, GENERIC_READ | GENERIC_WRITE, 0, NULL,
+                CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+        if (h == INVALID_HANDLE_VALUE)
+        {
+            skip("can't create test file (%s)\n", wine_dbgstr_w(wpath));
+            continue;
+        }
+        CloseHandle(h);
+
+        f = p__fsopen(tests[i].path, "r", SH_DENYNO);
+        ok(!!f, "failed to create %s with locale %s\n", wine_dbgstr_a(tests[i].path), tests[i].loc);
         p_fclose(f);
 
         f = p__wfsopen(wpath, L"r", SH_DENYNO);
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/7093

[PATCH v2 2/2] msvcp120/tests: Skip _Fiopen tests if file can't be created.

[Piotr Caban]

From: Piotr Caban <piotr(a)codeweavers.com>

---
 dlls/msvcp120/tests/msvcp120.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c
index b3dbacd082a..26bbf5b6535 100644
--- a/dlls/msvcp120/tests/msvcp120.c
+++ b/dlls/msvcp120/tests/msvcp120.c
@@ -3377,6 +3377,7 @@ static void test__Fiopen(void)
     int i, ret;
     FILE *f;
     wchar_t wpath[MAX_PATH];
+    HANDLE h;
     static const struct {
         const char *loc;
         const char *path;
@@ -3399,8 +3400,17 @@ static void test__Fiopen(void)
         ok(ret, "MultiByteToWideChar failed on %s with locale %s: %lx\n",
             tests[i].path, tests[i].loc, GetLastError());
 
-        f = p__Fiopen(tests[i].path, OPENMODE_out, SH_DENYNO);
-        ok(!!f, "failed to create %s with locale %s\n", tests[i].path, tests[i].loc);
+        h = CreateFileW(wpath, GENERIC_READ | GENERIC_WRITE, 0, NULL,
+                CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+        if (h == INVALID_HANDLE_VALUE)
+        {
+            skip("can't create test file (%s)\n", wine_dbgstr_w(wpath));
+            continue;
+        }
+        CloseHandle(h);
+
+        f = p__Fiopen(tests[i].path, OPENMODE_in, SH_DENYNO);
+        ok(!!f, "failed to create %s with locale %s\n", wine_dbgstr_a(tests[i].path), tests[i].loc);
         p_fclose(f);
 
         f = p__Fiopen_wchar(wpath, OPENMODE_in, SH_DENYNO);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/7093