wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 5f0b5d350566a46f0f999e4cff7ad9e280fcfa05

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-12-12 10:49:24 +11:00
parent dc9fa12a14
commit 4522654f1c
3 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/kernelbase-ReOpenFile/0001-kernelbase-Improve-stub-for-ReOpenFile-and-add-small.patch
View File

@ -1,4 +1,4 @@
From 94fa98ee5bb6e098d6d22f05332da3fe814b112b Mon Sep 17 00:00:00 2001
From 540abe549f414881f5e0bd2afb0e4f81d4674850 Mon Sep 17 00:00:00 2001
From: Louis Lenders <xerox.xerox2000x@gmail.com>
Date: Fri, 4 Oct 2019 23:10:29 +0200
Subject: [PATCH] kernelbase: Improve stub for ReOpenFile and add small test
@ -12,7 +12,7 @@ Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
2 files changed, 76 insertions(+), 2 deletions(-)
diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index 5bd168276..0ed5aa6f0 100644
index 5bd168276f9..0ed5aa6f03c 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -59,6 +59,7 @@ static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(LPCWSTR, PUNICODE_STRING, PW
@ -91,19 +91,19 @@ index 5bd168276..0ed5aa6f0 100644
test_OpenFileById();
test_SetFileValidData();
diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c
index 23ca5629a..3a68097f7 100644
index 89c5f85cb20..c2922fac68b 100644
--- a/dlls/kernelbase/file.c
+++ b/dlls/kernelbase/file.c
@@ -43,6 +43,8 @@
@@ -64,6 +64,8 @@ typedef struct
WINE_DEFAULT_DEBUG_CHANNEL(file);
static const UINT max_entry_size = offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[256] );
+extern DWORD WINAPI GetFinalPathNameByHandleW(HANDLE,LPWSTR,DWORD,DWORD);
+
const WCHAR windows_dir[] = {'C',':','\\','w','i','n','d','o','w','s',0};
const WCHAR system_dir[] = {'C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2',0};
@@ -2159,8 +2161,33 @@ HANDLE WINAPI DECLSPEC_HOTPATCH OpenFileById( HANDLE handle, LPFILE_ID_DESCRIPTO
@@ -2555,8 +2557,33 @@ HANDLE WINAPI DECLSPEC_HOTPATCH OpenFileById( HANDLE handle, LPFILE_ID_DESCRIPTO
*/
HANDLE WINAPI /* DECLSPEC_HOTPATCH */ ReOpenFile( HANDLE handle, DWORD access, DWORD sharing, DWORD flags )
{
@ -140,5 +140,5 @@ index 23ca5629a..3a68097f7 100644
--
2.23.0
2.17.1