msvcrt: Check pmode in _wsopen_dispatch.

Signed-off-by: Lauri Kenttä <lauri.kentta@gmail.com> Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Check pmode in _wsopen_dispatch.
27759315 · Lauri Kenttä · Alexandre Julliard · 85214c56 · 27759315 · 27759315
Commit 27759315 authored Feb 04, 2017 by Lauri Kenttä Committed by Alexandre Julliard Feb 06, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

file.c dlls/msvcrt/file.c +2 -2

misc.c dlls/ucrtbase/tests/misc.c +0 -4

No files found.
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -2171,8 +2171,8 @@ int CDECL MSVCRT__wsopen_dispatch( const MSVCRT_wchar_t* path, int oflags, int s
  if (oflags & MSVCRT__O_CREAT)
  {
-    if(pmode & ~(MSVCRT__S_IREAD | MSVCRT__S_IWRITE))
+    if (secure && !MSVCRT_CHECK_PMT(!(pmode & ~(MSVCRT__S_IREAD | MSVCRT__S_IWRITE))))
-      FIXME(": pmode 0x%04x ignored\n", pmode);
+      return MSVCRT_EINVAL;
    if (oflags & MSVCRT__O_EXCL)
      creation = CREATE_NEW;

--- a/dlls/ucrtbase/tests/misc.c
+++ b/dlls/ucrtbase/tests/misc.c
@@ -396,11 +396,9 @@ static void test__sopen_dispatch(void)
    SET_EXPECT(global_invalid_parameter_handler);
    fd = 0;
    ret = p_sopen_dispatch(tempf, _O_CREAT, _SH_DENYWR, 0xff, &fd, 1);
-todo_wine {
    ok(ret == EINVAL, "got %d\n", ret);
    ok(fd == -1, "got fd %d\n", fd);
    CHECK_CALLED(global_invalid_parameter_handler);
-}
    if (fd > 0)
    {
        _close(fd);
@@ -438,11 +436,9 @@ static void test__sopen_s(void)
    SET_EXPECT(global_invalid_parameter_handler);
    fd = 0;
    ret = p_sopen_s(&fd, tempf, _O_CREAT, _SH_DENYWR, 0xff);
-todo_wine {
    ok(ret == EINVAL, "got %d\n", ret);
    ok(fd == -1, "got fd %d\n", fd);
    CHECK_CALLED(global_invalid_parameter_handler);
-}
    p__set_invalid_parameter_handler(NULL);
    free(tempf);