From 1a980ed93d2321e4c6b4bc56020efabf723ad637 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 1 Apr 2020 10:16:47 +1100 Subject: [PATCH] Rebase against 5c0e699dbad3e4b4494852c6482125bd8bda9148 --- .../0001-comctl32-Bump-version-to-6.0.patch | 8 ++-- ...for-sys-eventfd.h-ppoll-and-shm_open.patch | 16 ++++---- patches/patchinstall.sh | 2 +- ...all-NtOpenFile-through-syscall-thunk.patch | 38 +++++++++---------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/patches/comctl32-version_6/0001-comctl32-Bump-version-to-6.0.patch b/patches/comctl32-version_6/0001-comctl32-Bump-version-to-6.0.patch index a260245d..8ddaa16e 100644 --- a/patches/comctl32-version_6/0001-comctl32-Bump-version-to-6.0.patch +++ b/patches/comctl32-version_6/0001-comctl32-Bump-version-to-6.0.patch @@ -1,4 +1,4 @@ -From 3a94f82a0cf783abf7c7d17335914bed3c6791bb Mon Sep 17 00:00:00 2001 +From c88a1acf9ac625cb2a7cbfc90ac3bb2d426889a0 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Tue, 12 Nov 2019 18:13:20 +0800 Subject: [PATCH] comctl32: Bump version to 6.0. @@ -14,12 +14,12 @@ Signed-off-by: Dmitry Timoshkov 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h -index 78e97983381..42b434a96d9 100644 +index 66b341ae5ad..1af9baea7ee 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h -@@ -192,7 +192,7 @@ INT Str_GetPtrAtoW (LPCSTR lpSrc, LPWSTR lpDest, INT nMaxLen) DECLSPEC_HIDDEN; - BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN; +@@ -193,7 +193,7 @@ BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN; BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN; + BOOL imagelist_has_alpha(HIMAGELIST, UINT) DECLSPEC_HIDDEN; -#define COMCTL32_VERSION_MINOR 81 +#define COMCTL32_VERSION_MINOR 0 diff --git a/patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch b/patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch index a7d898cf..9f144db4 100644 --- a/patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch +++ b/patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch @@ -1,4 +1,4 @@ -From 3c98dd79ccad72249122925b6b748c6ec84db003 Mon Sep 17 00:00:00 2001 +From e0719eabba7a7c187767441b361acedd50766234 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Wed, 13 Jun 2018 10:44:49 -0500 Subject: [PATCH] configure: Check for sys/eventfd.h, ppoll(), and shm_open(). @@ -11,18 +11,18 @@ Although perhaps we shouldn't since the server doesn't do this. 1 file changed, 12 insertions(+) diff --git a/configure.ac b/configure.ac -index 4f1c925bf95..662d510317a 100644 +index da5f24aba5f..6c2653c4c82 100644 --- a/configure.ac +++ b/configure.ac -@@ -511,6 +511,7 @@ AC_CHECK_HEADERS(\ - sys/elf32.h \ +@@ -509,6 +509,7 @@ AC_CHECK_HEADERS(\ + sys/cdio.h \ sys/epoll.h \ sys/event.h \ + sys/eventfd.h \ - sys/exec_elf.h \ sys/filio.h \ sys/ioctl.h \ -@@ -2130,6 +2131,7 @@ AC_CHECK_FUNCS(\ + sys/ipc.h \ +@@ -2191,6 +2192,7 @@ AC_CHECK_FUNCS(\ pipe2 \ poll \ port_create \ @@ -30,7 +30,7 @@ index 4f1c925bf95..662d510317a 100644 prctl \ pread \ proc_pidinfo \ -@@ -2204,6 +2206,16 @@ case $host_os in +@@ -2265,6 +2267,16 @@ case $host_os in ;; esac @@ -48,5 +48,5 @@ index 4f1c925bf95..662d510317a 100644 if test "x$with_ldap" != "xno" then -- -2.20.1 +2.25.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index d1140391..796ff6de 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "9bcb1f5195d1e65e0e7afb288d36fee716fe3a60" + echo "5c0e699dbad3e4b4494852c6482125bd8bda9148" } # Show version information diff --git a/patches/winebuild-Fake_Dlls/0011-ntdll-Call-NtOpenFile-through-syscall-thunk.patch b/patches/winebuild-Fake_Dlls/0011-ntdll-Call-NtOpenFile-through-syscall-thunk.patch index 0ccb09ea..f107149f 100644 --- a/patches/winebuild-Fake_Dlls/0011-ntdll-Call-NtOpenFile-through-syscall-thunk.patch +++ b/patches/winebuild-Fake_Dlls/0011-ntdll-Call-NtOpenFile-through-syscall-thunk.patch @@ -1,4 +1,4 @@ -From bf7e50ee28fcab7b47800412c27a05934e1da7ee Mon Sep 17 00:00:00 2001 +From ed1f5ed8e90ddfa5d9534edd11d9bdc86ba20a7a Mon Sep 17 00:00:00 2001 From: Paul Gofman Date: Fri, 3 Jan 2020 17:39:08 +0300 Subject: [PATCH] ntdll: Call NtOpenFile through syscall thunk. @@ -15,10 +15,10 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48410 7 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c -index b6306fdbac5..9bda553ccb8 100644 +index 1ca14827a79..6f3bc369f82 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c -@@ -2893,7 +2893,7 @@ static NTSTATUS open_nt_file( HANDLE *handle, UNICODE_STRING *name ) +@@ -2892,7 +2892,7 @@ static NTSTATUS open_nt_file( HANDLE *handle, UNICODE_STRING *name ) attr.ObjectName = name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; @@ -27,7 +27,7 @@ index b6306fdbac5..9bda553ccb8 100644 } static NTSTATUS get_manifest_in_module( struct actctx_loader* acl, struct assembly_identity* ai, -@@ -3210,7 +3210,7 @@ static NTSTATUS lookup_winsxs(struct actctx_loader* acl, struct assembly_identit +@@ -3209,7 +3209,7 @@ static NTSTATUS lookup_winsxs(struct actctx_loader* acl, struct assembly_identit attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; @@ -37,10 +37,10 @@ index b6306fdbac5..9bda553ccb8 100644 { sxs_ai = *ai; diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c -index 1783b8ad438..1c7388b6d75 100644 +index 624c534ce92..c29112d3b0f 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c -@@ -3011,7 +3011,7 @@ NTSTATUS DIR_get_unix_cwd( char **cwd ) +@@ -3010,7 +3010,7 @@ NTSTATUS DIR_get_unix_cwd( char **cwd ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; @@ -50,10 +50,10 @@ index 1783b8ad438..1c7388b6d75 100644 RtlFreeUnicodeString( &dirW ); if (status != STATUS_SUCCESS) goto done; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c -index 524d8ea72d4..7187dee032d 100644 +index 947ae103fcc..78a27fef94b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c -@@ -2373,7 +2373,7 @@ static NTSTATUS open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, +@@ -2372,7 +2372,7 @@ static NTSTATUS open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, attr.ObjectName = nt_name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; @@ -63,10 +63,10 @@ index 524d8ea72d4..7187dee032d 100644 FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE ))) { diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c -index 63d0bf3e98a..ca04f638cd0 100644 +index ff9d7136247..2efd47f0e0d 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c -@@ -659,7 +659,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) +@@ -662,7 +662,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) return STATUS_NO_MEMORY; valueW.Length = NTDLL_swprintf( valueW.Buffer, pathfmtW, dir, name ) * sizeof(WCHAR); InitializeObjectAttributes( &attr, &valueW, 0, 0, NULL ); @@ -75,9 +75,9 @@ index 63d0bf3e98a..ca04f638cd0 100644 if (!status) TRACE( "found %s\n", debugstr_w( valueW.Buffer )); RtlFreeUnicodeString( &valueW ); if (status != STATUS_OBJECT_NAME_NOT_FOUND) return status; -@@ -683,7 +683,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) - strcatW( valueW.Buffer, name ); - valueW.Length = strlenW(valueW.Buffer) * sizeof(WCHAR); +@@ -686,7 +686,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) + wcscat( valueW.Buffer, name ); + valueW.Length = wcslen(valueW.Buffer) * sizeof(WCHAR); InitializeObjectAttributes( &attr, &valueW, 0, 0, NULL ); - status = NtOpenFile( file, GENERIC_READ, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); + status = __syscall_NtOpenFile( file, GENERIC_READ, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); @@ -85,10 +85,10 @@ index 63d0bf3e98a..ca04f638cd0 100644 } RtlFreeUnicodeString( &valueW ); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index d8ae4301467..cad17f6fd09 100644 +index c7865a28d47..63e03d88366 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h -@@ -326,4 +326,12 @@ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) +@@ -336,4 +336,12 @@ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) while (len--) *dst++ = (unsigned char)*src++; } @@ -102,10 +102,10 @@ index d8ae4301467..cad17f6fd09 100644 + #endif diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c -index 2f7b031d81d..276eb29bd93 100644 +index 32e1f951af5..71ae44dd498 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c -@@ -1021,7 +1021,7 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir) +@@ -1020,7 +1020,7 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; @@ -115,10 +115,10 @@ index 2f7b031d81d..276eb29bd93 100644 if (nts != STATUS_SUCCESS) goto out; diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c -index 17335126e4a..1fa5316c509 100644 +index b38c5e21b83..0c8181df0c7 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c -@@ -1396,7 +1396,7 @@ static NTSTATUS get_pe_file_info( UNICODE_STRING *path, ULONG attributes, +@@ -1395,7 +1395,7 @@ static NTSTATUS get_pe_file_info( UNICODE_STRING *path, ULONG attributes, memset( info, 0, sizeof(*info) ); InitializeObjectAttributes( &attr, path, attributes, 0, 0 );