Added patch to open current working directory with FILE_TRAVERSE access.

patches/ntdll-RtlSetCurrentDirectory_U/0001-ntdll-Open-current-working-directory-with-FILE_TRAVE.patch

@@ -0,0 +1,107 @@
+From 09a50547e7f7653e79a5baa47e425ea91f0ae885 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
+Date: Sun, 18 Sep 2016 07:05:14 +0200
+Subject: ntdll: Open current working directory with FILE_TRAVERSE access.
+
+---
+ dlls/kernel32/tests/directory.c | 49 +++++++++++++++++++++++++++++++++++++++++
+ dlls/ntdll/path.c               |  3 ++-
+ 2 files changed, 51 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/kernel32/tests/directory.c b/dlls/kernel32/tests/directory.c
+index a3af052..6c7bad8 100644
+--- a/dlls/kernel32/tests/directory.c
++++ b/dlls/kernel32/tests/directory.c
+@@ -20,10 +20,23 @@
+ 
+ #include <stdarg.h>
+ 
++#include "ntstatus.h"
++#define WIN32_NO_STATUS
+ #include "wine/test.h"
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winerror.h"
++#include "winternl.h"
++
++static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE,OBJECT_INFORMATION_CLASS,PVOID,ULONG,PULONG);
++
++static void init_ntdll(void)
++{
++    HMODULE hntdll = GetModuleHandleA("ntdll.dll");
++    if (!hntdll) return;
++
++    pNtQueryObject = (void *)GetProcAddress(hntdll, "NtQueryObject");
++}
+ 
+ /* If you change something in these tests, please do the same
+  * for GetSystemDirectory tests.
+@@ -486,15 +499,51 @@ static void test_RemoveDirectoryW(void)
+ 
+ static void test_SetCurrentDirectoryA(void)
+ {
++    OBJECT_BASIC_INFORMATION info;
++    WCHAR curdir[MAX_PATH];
++    char tmpdir[MAX_PATH];
++    NTSTATUS status;
++    HANDLE handle;
++
+     SetLastError(0);
+     ok( !SetCurrentDirectoryA( "\\some_dummy_dir" ), "SetCurrentDirectoryA succeeded\n" );
+     ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %d\n", GetLastError() );
+     ok( !SetCurrentDirectoryA( "\\some_dummy\\subdir" ), "SetCurrentDirectoryA succeeded\n" );
+     ok( GetLastError() == ERROR_PATH_NOT_FOUND, "wrong error %d\n", GetLastError() );
++
++    GetTempPathA( MAX_PATH, tmpdir );
++    lstrcatA( tmpdir, "Please Remove Me" );
++    ok( CreateDirectoryA( tmpdir, NULL ), "CreateDirectoryA failed\n" );
++
++    GetCurrentDirectoryW( MAX_PATH, curdir );
++    ok( SetCurrentDirectoryA( tmpdir ), "SetCurrentDirectoryA failed\n" );
++
++    SetLastError( 0xdeadbeef );
++    ok( !RemoveDirectoryA( tmpdir ), "RemoveDirectoryA succeeded\n" );
++    ok( GetLastError() == ERROR_SHARING_VIOLATION,
++        "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError() );
++
++    if (pNtQueryObject)
++    {
++        handle = NtCurrentTeb()->Peb->ProcessParameters->CurrentDirectory.Handle;
++        ok( handle != NULL, "current directory handle is NULL\n" );
++
++        status = pNtQueryObject( handle, ObjectBasicInformation, &info, sizeof(info), NULL );
++        ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
++        ok( info.GrantedAccess == (FILE_TRAVERSE|SYNCHRONIZE),
++            "Expected FILE_TRAVERSE|SYNCHRONIZE, got %08x\n", info.GrantedAccess );
++    }
++    else
++        win_skip( "Failed to get pointer to NtQueryObject, skipping handle permission test\n" );
++
++    SetCurrentDirectoryW( curdir );
++    RemoveDirectoryA( tmpdir );
+ }
+ 
+ START_TEST(directory)
+ {
++    init_ntdll();
++
+     test_GetWindowsDirectoryA();
+     test_GetWindowsDirectoryW();
+ 
+diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c
+index ac4807f..e76ce3f 100644
+--- a/dlls/ntdll/path.c
++++ b/dlls/ntdll/path.c
+@@ -984,7 +984,8 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir)
+     attr.SecurityDescriptor = NULL;
+     attr.SecurityQualityOfService = NULL;
+ 
+-    nts = NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, 0, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT );
++    nts = NtOpenFile( &handle, FILE_TRAVERSE | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE,
++                      FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT );
+     if (nts != STATUS_SUCCESS) goto out;
+ 
+     /* don't keep the directory handle open on removable media */
+-- 
+2.9.0
+

patches/ntdll-RtlSetCurrentDirectory_U/definition

@@ -0,0 +1 @@
+Fixes: [27671] Open current working directory with FILE_TRAVERSE access

patches/patchinstall.sh

@@ -231,6 +231,7 @@ patch_enable_all ()
 	enable_ntdll_RtlIpStringToAddress_Stubs="$1"
 	enable_ntdll_RtlIpStringToAddress_Tests="$1"
 	enable_ntdll_RtlQueryPackageIdentity="$1"
+	enable_ntdll_RtlSetCurrentDirectory_U="$1"
 	enable_ntdll_Serial_Port_Detection="$1"
 	enable_ntdll_Stack_Guard_Page="$1"
 	enable_ntdll_Stack_Overflow="$1"
@@ -872,6 +873,9 @@ patch_enable ()
 		ntdll-RtlQueryPackageIdentity)
 			enable_ntdll_RtlQueryPackageIdentity="$2"
 			;;
+		ntdll-RtlSetCurrentDirectory_U)
+			enable_ntdll_RtlSetCurrentDirectory_U="$2"
+			;;
 		ntdll-Serial_Port_Detection)
 			enable_ntdll_Serial_Port_Detection="$2"
 			;;
@@ -5192,6 +5196,21 @@ if test "$enable_ntdll_RtlIpStringToAddress_Tests" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset ntdll-RtlSetCurrentDirectory_U
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#27671] Open current working directory with FILE_TRAVERSE access
+# |
+# | Modified files:
+# |   *	dlls/kernel32/tests/directory.c, dlls/ntdll/path.c
+# |
+if test "$enable_ntdll_RtlSetCurrentDirectory_U" -eq 1; then
+	patch_apply ntdll-RtlSetCurrentDirectory_U/0001-ntdll-Open-current-working-directory-with-FILE_TRAVE.patch
+	(
+		echo '+    { "Michael Müller", "ntdll: Open current working directory with FILE_TRAVERSE access.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset ntdll-Serial_Port_Detection
 # |
 # | This patchset fixes the following Wine bugs: