From c24cb89257f76370f96f2f6f72e17d473a218a54 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 2 Oct 2019 10:10:08 +1000 Subject: [PATCH] Rebase against b360cd67e8f7f8c01f09457bacb032fd4a248d0a --- ...-Add-stub-deferred-rendering-context.patch | 15 ++--- ...stem-DEP-policy-affect-GetProcessDEP.patch | 59 ++++++++++--------- ...t-for-hiding-wine-version-informatio.patch | 32 ++++++---- ...dd-support-for-deleting-junction-poi.patch | 27 ++++----- ...nt-CreateSymbolicLink-A-W-with-ntdll.patch | 55 +++++++++-------- patches/patchinstall.sh | 2 +- 6 files changed, 103 insertions(+), 87 deletions(-) diff --git a/patches/d3d11-Deferred_Context/0001-d3d11-Add-stub-deferred-rendering-context.patch b/patches/d3d11-Deferred_Context/0001-d3d11-Add-stub-deferred-rendering-context.patch index cb88e633..1d7817c1 100644 --- a/patches/d3d11-Deferred_Context/0001-d3d11-Add-stub-deferred-rendering-context.patch +++ b/patches/d3d11-Deferred_Context/0001-d3d11-Add-stub-deferred-rendering-context.patch @@ -1,15 +1,15 @@ -From 50dfa70735f6a0f8cf9e77c70143a91555627a5a Mon Sep 17 00:00:00 2001 +From 896b9be78dfd979ddea8f098ae66473956d4147c Mon Sep 17 00:00:00 2001 From: Kimmo Myllyvirta Date: Sat, 24 Sep 2016 06:51:24 +0300 Subject: [PATCH] d3d11: Add stub deferred rendering context. --- - dlls/d3d11/device.c | 1267 +++++++++++++++++++++++++++++++++----- + dlls/d3d11/device.c | 1268 +++++++++++++++++++++++++++++++++----- dlls/d3d11/tests/d3d11.c | 4 +- - 2 files changed, 1132 insertions(+), 139 deletions(-) + 2 files changed, 1132 insertions(+), 140 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c -index 08579164bd..dca5a88caa 100644 +index 31c7f35fc25..dca5a88caa0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -22,6 +22,16 @@ @@ -1352,13 +1352,14 @@ index 08579164bd..dca5a88caa 100644 iface, byte_code, byte_code_length, class_linkage, shader); if (class_linkage) -@@ -3362,9 +4340,22 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateCounter(ID3D11Device2 *iface +@@ -3362,10 +4340,22 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateCounter(ID3D11Device2 *iface static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device2 *iface, UINT flags, ID3D11DeviceContext **context) { - FIXME("iface %p, flags %#x, context %p stub!\n", iface, flags, context); + struct d3d11_deferred_context *object; +- *context = NULL; - return E_NOTIMPL; + TRACE("iface %p, flags %#x, context %p.\n", iface, flags, context); + @@ -1378,7 +1379,7 @@ index 08579164bd..dca5a88caa 100644 static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource(ID3D11Device2 *iface, HANDLE resource, REFIID iid, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c -index d58319df58..e653fb30b2 100644 +index da4627d7a85..dadeac27662 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2231,6 +2231,8 @@ static void test_create_deferred_context(void) @@ -1400,5 +1401,5 @@ index d58319df58..e653fb30b2 100644 goto done; refcount = get_refcount(device); -- -2.21.0 +2.23.0 diff --git a/patches/kernel32-SetProcessDEPPolicy/0003-kernel32-Make-system-DEP-policy-affect-GetProcessDEP.patch b/patches/kernel32-SetProcessDEPPolicy/0003-kernel32-Make-system-DEP-policy-affect-GetProcessDEP.patch index b489b3ae..1fbe7902 100644 --- a/patches/kernel32-SetProcessDEPPolicy/0003-kernel32-Make-system-DEP-policy-affect-GetProcessDEP.patch +++ b/patches/kernel32-SetProcessDEPPolicy/0003-kernel32-Make-system-DEP-policy-affect-GetProcessDEP.patch @@ -1,43 +1,44 @@ -From 76e5668f6371a5e3fe8bc524fc25080e375fb680 Mon Sep 17 00:00:00 2001 +From 54e9832efd935277864c1faa0cb070676d2079a9 Mon Sep 17 00:00:00 2001 From: "Olivier F. R. Dierick" Date: Tue, 19 Apr 2016 07:36:41 +0200 -Subject: [PATCH 3/3] kernel32: Make system DEP policy affect +Subject: [PATCH] kernel32: Make system DEP policy affect GetProcessDEPPolicy(). --- - dlls/kernel32/process.c | 15 +++++++++++---- - 1 file changed, 11 insertions(+), 4 deletions(-) + dlls/kernel32/process.c | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c -index 6bf31516ca..2446491b10 100644 +index 958b437cea..d7a444a314 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c -@@ -4629,14 +4629,21 @@ BOOL WINAPI GetProcessDEPPolicy(HANDLE process, LPDWORD flags, PBOOL permanent) - if (flags) - { - *flags = 0; -- if (dep_flags & MEM_EXECUTE_OPTION_DISABLE) -- *flags |= PROCESS_DEP_ENABLE; -- if (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION) -- *flags |= PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION; -+ if (system_DEP_policy != AlwaysOff) -+ { -+ if (dep_flags & MEM_EXECUTE_OPTION_DISABLE || system_DEP_policy == AlwaysOn) -+ *flags |= PROCESS_DEP_ENABLE; -+ if (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION) -+ *flags |= PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION; -+ } - } - - if (permanent) +@@ -3904,13 +3904,21 @@ BOOL WINAPI GetProcessDEPPolicy(HANDLE process, LPDWORD flags, PBOOL permanent) + if (flags) + { + *flags = 0; +- if (dep_flags & MEM_EXECUTE_OPTION_DISABLE) +- *flags |= PROCESS_DEP_ENABLE; +- if (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION) +- *flags |= PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION; ++ if (system_DEP_policy != AlwaysOff) + { - *permanent = (dep_flags & MEM_EXECUTE_OPTION_PERMANENT) != 0; -+ if (system_DEP_policy == AlwaysOn || system_DEP_policy == AlwaysOff) -+ *permanent = TRUE; ++ if (dep_flags & MEM_EXECUTE_OPTION_DISABLE || system_DEP_policy == AlwaysOn) ++ *flags |= PROCESS_DEP_ENABLE; ++ if (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION) ++ *flags |= PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION; + } - } - if (status) SetLastError( RtlNtStatusToDosError(status) ); + +- if (permanent) *permanent = (dep_flags & MEM_EXECUTE_OPTION_PERMANENT) != 0; ++ if (permanent) ++ { ++ *permanent = (dep_flags & MEM_EXECUTE_OPTION_PERMANENT) != 0; ++ if (system_DEP_policy == AlwaysOn || system_DEP_policy == AlwaysOff) ++ *permanent = TRUE; ++ } + return TRUE; + } + -- -2.17.1 +2.23.0 diff --git a/patches/ntdll-Hide_Wine_Exports/0001-ntdll-Add-support-for-hiding-wine-version-informatio.patch b/patches/ntdll-Hide_Wine_Exports/0001-ntdll-Add-support-for-hiding-wine-version-informatio.patch index c01425e1..a0ba199a 100644 --- a/patches/ntdll-Hide_Wine_Exports/0001-ntdll-Add-support-for-hiding-wine-version-informatio.patch +++ b/patches/ntdll-Hide_Wine_Exports/0001-ntdll-Add-support-for-hiding-wine-version-informatio.patch @@ -1,32 +1,42 @@ -From c9e0926469230f97d3cee6bc22b7d27099f1d555 Mon Sep 17 00:00:00 2001 +From c887ee94a053fbec2f9e97d749539be97f614b08 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 30 May 2015 02:23:15 +0200 Subject: [PATCH] ntdll: Add support for hiding wine version information from applications. --- - dlls/ntdll/loader.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++- + dlls/ntdll/loader.c | 98 ++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/ntdll_misc.h | 5 +++ - 2 files changed, 100 insertions(+), 1 deletion(-) + 2 files changed, 102 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c -index 7588d5a..8073434 100644 +index 9c82d31447b..2e57e2115d3 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c -@@ -68,9 +68,12 @@ typedef void (CALLBACK *LDRENUMPROC)(LDR_MODULE *, void *, BOOLEAN *); +@@ -68,17 +68,22 @@ typedef void (CALLBACK *LDRENUMPROC)(LDR_MODULE *, void *, BOOLEAN *); const WCHAR system_dir[] = {'C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\',0}; ++ + /* system search path */ + static const WCHAR system_path[] = + {'C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2',';', + 'C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m',';', + 'C',':','\\','w','i','n','d','o','w','s',';',0}; + +#define IS_OPTION_TRUE(ch) ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') ++ + static BOOL imports_fixup_done = FALSE; /* set once the imports have been fixed up, before attaching them */ static BOOL process_detaching = FALSE; /* set on process detach to avoid deadlocks with thread detach */ static int free_lib_count; /* recursion depth of LdrUnloadDll calls */ + static ULONG path_safe_mode; /* path mode set by RtlSetSearchPathMode */ + static UNICODE_STRING dll_directory; /* extra path for LdrSetDllDirectory */ +static BOOL hide_wine_exports = FALSE; /* try to hide ntdll wine exports from applications */ struct ldr_notification { -@@ -1602,6 +1605,96 @@ NTSTATUS WINAPI LdrUnlockLoaderLock( ULONG flags, ULONG_PTR magic ) +@@ -1695,6 +1700,96 @@ NTSTATUS WINAPI LdrUnlockLoaderLock( ULONG flags, ULONG_PTR magic ) } @@ -123,7 +133,7 @@ index 7588d5a..8073434 100644 /****************************************************************** * LdrGetProcedureAddress (NTDLL.@) */ -@@ -1622,7 +1715,7 @@ NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE module, const ANSI_STRING *name, +@@ -1715,7 +1810,7 @@ NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE module, const ANSI_STRING *name, LPCWSTR load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; void *proc = name ? find_named_export( module, exports, exp_size, name->Buffer, -1, load_path ) : find_ordinal_export( module, exports, exp_size, ord - exports->Base, load_path ); @@ -132,7 +142,7 @@ index 7588d5a..8073434 100644 { *address = proc; ret = STATUS_SUCCESS; -@@ -3576,6 +3669,7 @@ void __wine_process_init(void) +@@ -4040,6 +4135,7 @@ void __wine_process_init(void) NtCurrentTeb()->Peb->LoaderLock = &loader_section; update_user_process_params( &wm->ldr.FullDllName ); version_init( wm->ldr.FullDllName.Buffer ); @@ -141,10 +151,10 @@ index 7588d5a..8073434 100644 LdrQueryImageFileExecutionOptions( &wm->ldr.FullDllName, globalflagW, REG_DWORD, diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index c21ec79..0dba878 100644 +index a1115305343..e7bf510c28e 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h -@@ -260,6 +260,11 @@ extern SYSTEM_CPU_INFORMATION cpu_info DECLSPEC_HIDDEN; +@@ -269,6 +269,11 @@ extern SYSTEM_CPU_INFORMATION cpu_info DECLSPEC_HIDDEN; NTSTATUS WINAPI RtlHashUnicodeString(PCUNICODE_STRING,BOOLEAN,ULONG,ULONG*); void WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR); @@ -157,5 +167,5 @@ index c21ec79..0dba878 100644 extern BOOL read_process_time(int unix_pid, int unix_tid, unsigned long clk_tck, LARGE_INTEGER *kernel, LARGE_INTEGER *user) DECLSPEC_HIDDEN; -- -1.9.1 +2.23.0 diff --git a/patches/ntdll-Junction_Points/0005-kernel32-ntdll-Add-support-for-deleting-junction-poi.patch b/patches/ntdll-Junction_Points/0005-kernel32-ntdll-Add-support-for-deleting-junction-poi.patch index 58dcc982..ddf87cee 100644 --- a/patches/ntdll-Junction_Points/0005-kernel32-ntdll-Add-support-for-deleting-junction-poi.patch +++ b/patches/ntdll-Junction_Points/0005-kernel32-ntdll-Add-support-for-deleting-junction-poi.patch @@ -1,20 +1,20 @@ -From 641f298192f9c21e2e02f0e5296771454d3467d3 Mon Sep 17 00:00:00 2001 +From b53336eeca65aa2dbf11c2d80a731ca904fe81de Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Thu, 16 Jan 2014 21:02:11 -0700 -Subject: kernel32,ntdll: Add support for deleting junction points with +Subject: [PATCH] kernel32,ntdll: Add support for deleting junction points with RemoveDirectory. Signed-off-by: Erich E. Hoover --- - dlls/kernel32/path.c | 20 +++++++++++++------- + dlls/kernel32/path.c | 19 +++++++++++++------ dlls/ntdll/tests/file.c | 34 +++++++++++++++++++++++++++++++++- - 2 files changed, 46 insertions(+), 8 deletions(-) + 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c -index 5fed28da0e..5ef66b5913 100644 +index b580e367561..9fa7d4c9f27 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c -@@ -1696,6 +1696,7 @@ BOOL WINAPI CreateDirectoryExW( LPCWSTR template, LPCWSTR path, LPSECURITY_ATTRI +@@ -1058,6 +1058,7 @@ BOOL WINAPI CreateDirectoryExA( LPCSTR template, LPCSTR path, LPSECURITY_ATTRIBU */ BOOL WINAPI RemoveDirectoryW( LPCWSTR path ) { @@ -22,15 +22,14 @@ index 5fed28da0e..5ef66b5913 100644 OBJECT_ATTRIBUTES attr; UNICODE_STRING nt_name; ANSI_STRING unix_name; -@@ -1729,16 +1730,21 @@ BOOL WINAPI RemoveDirectoryW( LPCWSTR path ) +@@ -1089,15 +1090,21 @@ BOOL WINAPI RemoveDirectoryW( LPCWSTR path ) } status = wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN, FALSE ); - RtlFreeUnicodeString( &nt_name ); -- if (status != STATUS_SUCCESS) +- if (!set_ntstatus( status )) + if (status == STATUS_SUCCESS) { -- SetLastError( RtlNtStatusToDosError(status) ); - NtClose( handle ); - return FALSE; + status = NtQueryAttributesFile( &attr, &info ); @@ -43,7 +42,7 @@ index 5fed28da0e..5ef66b5913 100644 + RtlFreeAnsiString( &unix_name ); } + else -+ SetLastError( RtlNtStatusToDosError(status) ); ++ set_ntstatus( status ); + RtlFreeUnicodeString( &nt_name ); - if (!(ret = (rmdir( unix_name.Buffer ) != -1))) FILE_SetDosError(); @@ -52,10 +51,10 @@ index 5fed28da0e..5ef66b5913 100644 return ret; } diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c -index e1f216370d..71e7dd56f3 100644 +index d7b2f9aa0d9..e8cdb661772 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c -@@ -4869,7 +4869,7 @@ static void test_reparse_points(void) +@@ -4938,7 +4938,7 @@ static void test_reparse_points(void) REPARSE_GUID_DATA_BUFFER guid_buffer; static const WCHAR dotW[] = {'.',0}; REPARSE_DATA_BUFFER *buffer = NULL; @@ -64,7 +63,7 @@ index e1f216370d..71e7dd56f3 100644 INT buffer_len, string_len; IO_STATUS_BLOCK iosb; UNICODE_STRING nameW; -@@ -4958,6 +4958,38 @@ static void test_reparse_points(void) +@@ -5027,6 +5027,38 @@ static void test_reparse_points(void) "Junction point folder's access time does not match.\n"); CloseHandle(handle); @@ -104,5 +103,5 @@ index e1f216370d..71e7dd56f3 100644 /* Cleanup */ pRtlFreeUnicodeString(&nameW); -- -2.17.1 +2.23.0 diff --git a/patches/ntdll-Junction_Points/0019-kernel32-Implement-CreateSymbolicLink-A-W-with-ntdll.patch b/patches/ntdll-Junction_Points/0019-kernel32-Implement-CreateSymbolicLink-A-W-with-ntdll.patch index d82055aa..3d1b8599 100644 --- a/patches/ntdll-Junction_Points/0019-kernel32-Implement-CreateSymbolicLink-A-W-with-ntdll.patch +++ b/patches/ntdll-Junction_Points/0019-kernel32-Implement-CreateSymbolicLink-A-W-with-ntdll.patch @@ -1,19 +1,19 @@ -From f8bce6f4c951b6d5b1b3473b272a3fe20df0aa39 Mon Sep 17 00:00:00 2001 +From 9761db5bf17b98a9ae7f47fc5cf3e4eb98911af1 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Wed, 13 Mar 2019 16:02:05 -0600 -Subject: kernel32: Implement CreateSymbolicLink[A|W] with ntdll reparse - points. +Subject: [PATCH] kernel32: Implement CreateSymbolicLink[A|W] with ntdll + reparse points. Signed-off-by: Erich E. Hoover --- dlls/kernel32/path.c | 124 +++++++++++++++++++++++++++++++-- - dlls/kernel32/tests/path.c | 94 +++++++++++++++++++++++++ + dlls/kernel32/tests/path.c | 96 +++++++++++++++++++++++++ dlls/msvcp120/tests/msvcp120.c | 75 +++++++++----------- dlls/msvcp140/tests/msvcp140.c | 63 +++++++---------- - 4 files changed, 275 insertions(+), 81 deletions(-) + 4 files changed, 277 insertions(+), 81 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c -index 227473f71a..fd69cdede4 100644 +index 31da8fed4f5..2e57a3b38c9 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -34,6 +34,8 @@ @@ -25,7 +25,7 @@ index 227473f71a..fd69cdede4 100644 #include "kernel_private.h" #include "wine/unicode.h" -@@ -2087,8 +2089,106 @@ WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ) +@@ -1260,8 +1262,106 @@ WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ) */ BOOLEAN WINAPI CreateSymbolicLinkW(LPCWSTR link, LPCWSTR target, DWORD flags) { @@ -134,7 +134,7 @@ index 227473f71a..fd69cdede4 100644 } /************************************************************************* -@@ -2096,8 +2196,24 @@ BOOLEAN WINAPI CreateSymbolicLinkW(LPCWSTR link, LPCWSTR target, DWORD flags) +@@ -1269,8 +1369,24 @@ BOOLEAN WINAPI CreateSymbolicLinkW(LPCWSTR link, LPCWSTR target, DWORD flags) */ BOOLEAN WINAPI CreateSymbolicLinkA(LPCSTR link, LPCSTR target, DWORD flags) { @@ -162,10 +162,10 @@ index 227473f71a..fd69cdede4 100644 /************************************************************************* diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c -index f15cc09ee5..346591990f 100644 +index 876ca743bc1..976993c9221 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c -@@ -81,6 +81,9 @@ static void (WINAPI *pReleaseActCtx)(HANDLE); +@@ -87,6 +87,9 @@ static void (WINAPI *pReleaseActCtx)(HANDLE); static BOOL (WINAPI *pCheckNameLegalDOS8Dot3W)(const WCHAR *, char *, DWORD, BOOL *, BOOL *); static BOOL (WINAPI *pCheckNameLegalDOS8Dot3A)(const char *, char *, DWORD, BOOL *, BOOL *); @@ -175,16 +175,21 @@ index f15cc09ee5..346591990f 100644 /* a structure to deal with wine todos somewhat cleanly */ typedef struct { DWORD shortlen; -@@ -2202,6 +2205,7 @@ static void init_pointers(void) +@@ -2209,9 +2212,12 @@ static void init_pointers(void) MAKEFUNC(ReleaseActCtx); MAKEFUNC(CheckNameLegalDOS8Dot3W); MAKEFUNC(CheckNameLegalDOS8Dot3A); + MAKEFUNC(CreateSymbolicLinkW); ++ + mod = GetModuleHandleA("ntdll.dll"); + MAKEFUNC(RtlGetSearchPath); + MAKEFUNC(RtlReleasePath); ++ #undef MAKEFUNC } -@@ -2458,6 +2462,95 @@ static void test_SetSearchPathMode(void) - RemoveDirectoryA( dir ); +@@ -2549,6 +2555,95 @@ static void test_RtlGetSearchPath(void) + SetEnvironmentVariableW( pathW, old_path ); } +static void test_CreateSymbolicLink(void) @@ -279,17 +284,17 @@ index f15cc09ee5..346591990f 100644 START_TEST(path) { CHAR origdir[MAX_PATH],curdir[MAX_PATH], curDrive, otherDrive; -@@ -2492,4 +2585,5 @@ START_TEST(path) - test_GetFullPathNameW(); +@@ -2584,4 +2679,5 @@ START_TEST(path) test_CheckNameLegalDOS8Dot3(); test_SetSearchPathMode(); + test_RtlGetSearchPath(); + test_CreateSymbolicLink(); } diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c -index c416a1020b..e0c97ebcaa 100644 +index 8f7b75aab4b..77d8c377549 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c -@@ -1636,15 +1636,14 @@ static void test_tr2_sys__Stat(void) +@@ -1622,15 +1622,14 @@ static void test_tr2_sys__Stat(void) char const *path; enum file_type ret; int err_code; @@ -312,7 +317,7 @@ index c416a1020b..e0c97ebcaa 100644 }; WCHAR testW[] = {'t','r','2','_','t','e','s','t','_','d','i','r',0}; WCHAR testW2[] = {'t','r','2','_','t','e','s','t','_','d','i','r','/','f','1',0}; -@@ -1689,16 +1688,14 @@ static void test_tr2_sys__Stat(void) +@@ -1675,16 +1674,14 @@ static void test_tr2_sys__Stat(void) for(i=0; i