mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rebase against 67ef5151744b347d4a30c985da6712fb0061e675.
This commit is contained in:
Alistair Leslie-Hughes
parent
03f5adcafb
commit
02913f754f
@ -1,24 +1,23 @@
|
||||
From 42a9d6a0464a17831ae2c16df222f4de7638349e Mon Sep 17 00:00:00 2001
|
||||
From 9cdc9d195760a55263ba0bb7926e6e4d776cbd04 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 4 Oct 2014 02:53:22 +0200
|
||||
Subject: [PATCH] ntdll: Setup a temporary signal handler during process
|
||||
startup to handle page faults. (v2)
|
||||
|
||||
---
|
||||
dlls/ntdll/unix/loader.c | 1 +
|
||||
dlls/ntdll/unix/signal_arm.c | 6 ++++
|
||||
dlls/ntdll/unix/signal_arm64.c | 7 +++++
|
||||
dlls/ntdll/unix/signal_i386.c | 52 ++++++++++++++++++++++++++++++++
|
||||
dlls/ntdll/unix/signal_powerpc.c | 6 ++++
|
||||
dlls/ntdll/unix/signal_x86_64.c | 6 ++++
|
||||
dlls/ntdll/unix/unix_private.h | 1 +
|
||||
7 files changed, 79 insertions(+)
|
||||
dlls/ntdll/unix/loader.c | 1 +
|
||||
dlls/ntdll/unix/signal_arm.c | 6 ++++
|
||||
dlls/ntdll/unix/signal_arm64.c | 7 +++++
|
||||
dlls/ntdll/unix/signal_i386.c | 52 +++++++++++++++++++++++++++++++++
|
||||
dlls/ntdll/unix/signal_x86_64.c | 6 ++++
|
||||
dlls/ntdll/unix/unix_private.h | 1 +
|
||||
6 files changed, 73 insertions(+)
|
||||
|
||||
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
|
||||
index eac43ba42c4..48910dd4d50 100644
|
||||
index 4db78fec823..91b98c44b3f 100644
|
||||
--- a/dlls/ntdll/unix/loader.c
|
||||
+++ b/dlls/ntdll/unix/loader.c
|
||||
@@ -1418,6 +1418,7 @@ void __wine_main( int argc, char *argv[], char *envp[] )
|
||||
@@ -1244,6 +1244,7 @@ void __wine_main( int argc, char *argv[], char *envp[] )
|
||||
#endif
|
||||
|
||||
virtual_init();
|
||||
@ -27,7 +26,7 @@ index eac43ba42c4..48910dd4d50 100644
|
||||
module = load_ntdll();
|
||||
fixup_ntdll_imports( &__wine_spec_nt_header, module );
|
||||
diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c
|
||||
index 1ef3ff6618b..5e0b25cec5d 100644
|
||||
index faa2952a483..43e0fb848a3 100644
|
||||
--- a/dlls/ntdll/unix/signal_arm.c
|
||||
+++ b/dlls/ntdll/unix/signal_arm.c
|
||||
@@ -869,6 +869,12 @@ void signal_init_process(void)
|
||||
@ -44,7 +43,7 @@ index 1ef3ff6618b..5e0b25cec5d 100644
|
||||
/***********************************************************************
|
||||
* init_thread_context
|
||||
diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c
|
||||
index 6c9083664e0..3a4e7d5b9cb 100644
|
||||
index e2c52a1a4f6..f3c67e1f5f4 100644
|
||||
--- a/dlls/ntdll/unix/signal_arm64.c
|
||||
+++ b/dlls/ntdll/unix/signal_arm64.c
|
||||
@@ -791,6 +791,13 @@ void signal_init_process(void)
|
||||
@ -62,7 +61,7 @@ index 6c9083664e0..3a4e7d5b9cb 100644
|
||||
* init_thread_context
|
||||
*/
|
||||
diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
|
||||
index 7ae4cda33a6..1a86b6e05f3 100644
|
||||
index adf622ca673..44d0848a1ee 100644
|
||||
--- a/dlls/ntdll/unix/signal_i386.c
|
||||
+++ b/dlls/ntdll/unix/signal_i386.c
|
||||
@@ -1644,6 +1644,30 @@ static BOOL handle_interrupt( unsigned int interrupt, ucontext_t *sigcontext, st
|
||||
@ -131,25 +130,8 @@ index 7ae4cda33a6..1a86b6e05f3 100644
|
||||
|
||||
/***********************************************************************
|
||||
* init_thread_context
|
||||
diff --git a/dlls/ntdll/unix/signal_powerpc.c b/dlls/ntdll/unix/signal_powerpc.c
|
||||
index f98d6fc9713..fdc5f66d092 100644
|
||||
--- a/dlls/ntdll/unix/signal_powerpc.c
|
||||
+++ b/dlls/ntdll/unix/signal_powerpc.c
|
||||
@@ -978,6 +978,12 @@ void signal_init_process(void)
|
||||
exit(1);
|
||||
}
|
||||
|
||||
+/**********************************************************************
|
||||
+ * signal_init_early
|
||||
+ */
|
||||
+void signal_init_early(void)
|
||||
+{
|
||||
+}
|
||||
|
||||
/***********************************************************************
|
||||
* signal_exit_thread
|
||||
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
|
||||
index d4a6e821a4c..98bd7bb8bed 100644
|
||||
index 1bf8f5e8b8e..73c6ba4c34e 100644
|
||||
--- a/dlls/ntdll/unix/signal_x86_64.c
|
||||
+++ b/dlls/ntdll/unix/signal_x86_64.c
|
||||
@@ -1415,6 +1415,12 @@ void signal_init_process(void)
|
||||
@ -166,10 +148,10 @@ index d4a6e821a4c..98bd7bb8bed 100644
|
||||
/***********************************************************************
|
||||
* init_thread_context
|
||||
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
|
||||
index 3e61111cba5..1319ca90b96 100644
|
||||
index 95d4e2c2441..d88cf97f4b7 100644
|
||||
--- a/dlls/ntdll/unix/unix_private.h
|
||||
+++ b/dlls/ntdll/unix/unix_private.h
|
||||
@@ -163,6 +163,7 @@ extern NTSTATUS signal_alloc_thread( TEB *teb ) DECLSPEC_HIDDEN;
|
||||
@@ -193,6 +193,7 @@ extern NTSTATUS signal_alloc_thread( TEB *teb ) DECLSPEC_HIDDEN;
|
||||
extern void signal_free_thread( TEB *teb ) DECLSPEC_HIDDEN;
|
||||
extern void signal_init_thread( TEB *teb ) DECLSPEC_HIDDEN;
|
||||
extern void signal_init_process(void) DECLSPEC_HIDDEN;
|
||||
@ -178,5 +160,5 @@ index 3e61111cba5..1319ca90b96 100644
|
||||
BOOL suspend, void *relay, TEB *teb ) DECLSPEC_HIDDEN;
|
||||
extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int) ) DECLSPEC_HIDDEN;
|
||||
--
|
||||
2.26.2
|
||||
2.27.0
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "f56e409c2feb62056eb133e53fe398eadd0a503e"
|
||||
echo "67ef5151744b347d4a30c985da6712fb0061e675"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From feb53ed39179603391eff600ea59edc41407b238 Mon Sep 17 00:00:00 2001
|
||||
From cae4c8ad24a127367a3cf8bcc1333af72eea8cc9 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Gofman <gofmanp@gmail.com>
|
||||
Date: Fri, 3 Jan 2020 17:39:08 +0300
|
||||
Subject: [PATCH] ntdll: Call NtOpenFile through syscall thunk.
|
||||
@ -6,19 +6,18 @@ Subject: [PATCH] ntdll: Call NtOpenFile through syscall thunk.
|
||||
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48410
|
||||
---
|
||||
dlls/ntdll/actctx.c | 4 ++--
|
||||
dlls/ntdll/directory.c | 2 +-
|
||||
dlls/ntdll/loader.c | 2 +-
|
||||
dlls/ntdll/locale.c | 4 ++--
|
||||
dlls/ntdll/ntdll_misc.h | 8 ++++++++
|
||||
dlls/ntdll/path.c | 2 +-
|
||||
dlls/ntdll/process.c | 2 +-
|
||||
7 files changed, 16 insertions(+), 8 deletions(-)
|
||||
6 files changed, 15 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c
|
||||
index a25cefa555ac..34ba0dc813c6 100644
|
||||
index e1051745db3..fcc22774338 100644
|
||||
--- a/dlls/ntdll/actctx.c
|
||||
+++ b/dlls/ntdll/actctx.c
|
||||
@@ -2894,7 +2894,7 @@ static NTSTATUS open_nt_file( HANDLE *handle, UNICODE_STRING *name )
|
||||
@@ -2928,7 +2928,7 @@ static NTSTATUS open_nt_file( HANDLE *handle, UNICODE_STRING *name )
|
||||
attr.ObjectName = name;
|
||||
attr.SecurityDescriptor = NULL;
|
||||
attr.SecurityQualityOfService = NULL;
|
||||
@ -27,7 +26,7 @@ index a25cefa555ac..34ba0dc813c6 100644
|
||||
}
|
||||
|
||||
static NTSTATUS get_manifest_in_module( struct actctx_loader* acl, struct assembly_identity* ai,
|
||||
@@ -3211,7 +3211,7 @@ static NTSTATUS lookup_winsxs(struct actctx_loader* acl, struct assembly_identit
|
||||
@@ -3245,7 +3245,7 @@ static NTSTATUS lookup_winsxs(struct actctx_loader* acl, struct assembly_identit
|
||||
attr.SecurityDescriptor = NULL;
|
||||
attr.SecurityQualityOfService = NULL;
|
||||
|
||||
@ -36,21 +35,8 @@ index a25cefa555ac..34ba0dc813c6 100644
|
||||
FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ))
|
||||
{
|
||||
sxs_ai = *ai;
|
||||
diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c
|
||||
index 18428658a5b5..7a9de26ccb0c 100644
|
||||
--- a/dlls/ntdll/directory.c
|
||||
+++ b/dlls/ntdll/directory.c
|
||||
@@ -3071,7 +3071,7 @@ NTSTATUS DIR_get_unix_cwd( char **cwd )
|
||||
attr.SecurityDescriptor = NULL;
|
||||
attr.SecurityQualityOfService = NULL;
|
||||
|
||||
- status = NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, 0,
|
||||
+ status = __syscall_NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, 0,
|
||||
FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT );
|
||||
RtlFreeUnicodeString( &dirW );
|
||||
if (status != STATUS_SUCCESS) goto done;
|
||||
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
|
||||
index 51d989f30b45..8f1653b0d626 100644
|
||||
index 316e5fa0b5b..675d767c5a1 100644
|
||||
--- a/dlls/ntdll/loader.c
|
||||
+++ b/dlls/ntdll/loader.c
|
||||
@@ -2521,7 +2521,7 @@ static NTSTATUS open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm,
|
||||
@ -63,10 +49,10 @@ index 51d989f30b45..8f1653b0d626 100644
|
||||
FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE )))
|
||||
{
|
||||
diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c
|
||||
index 15ccdeb2e637..928edcb04e2c 100644
|
||||
index d6bde700e42..16a7f911173 100644
|
||||
--- a/dlls/ntdll/locale.c
|
||||
+++ b/dlls/ntdll/locale.c
|
||||
@@ -660,7 +660,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file )
|
||||
@@ -654,7 +654,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,7 +61,7 @@ index 15ccdeb2e637..928edcb04e2c 100644
|
||||
if (!status) TRACE( "found %s\n", debugstr_w( valueW.Buffer ));
|
||||
RtlFreeUnicodeString( &valueW );
|
||||
if (status != STATUS_OBJECT_NAME_NOT_FOUND && status != STATUS_OBJECT_PATH_NOT_FOUND) return status;
|
||||
@@ -684,7 +684,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file )
|
||||
@@ -678,7 +678,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 );
|
||||
@ -85,10 +71,10 @@ index 15ccdeb2e637..928edcb04e2c 100644
|
||||
}
|
||||
RtlFreeUnicodeString( &valueW );
|
||||
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
|
||||
index 9091d1ae8c77..f8e81ae49eaf 100644
|
||||
index af30044ad1f..d7076c7a2b8 100644
|
||||
--- a/dlls/ntdll/ntdll_misc.h
|
||||
+++ b/dlls/ntdll/ntdll_misc.h
|
||||
@@ -329,4 +329,12 @@ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len )
|
||||
@@ -282,4 +282,12 @@ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len )
|
||||
while (len--) *dst++ = (unsigned char)*src++;
|
||||
}
|
||||
|
||||
@ -102,10 +88,10 @@ index 9091d1ae8c77..f8e81ae49eaf 100644
|
||||
+
|
||||
#endif
|
||||
diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c
|
||||
index 32e1f951af5c..71ae44dd4988 100644
|
||||
index 5f4eb11316f..d2112d1af0d 100644
|
||||
--- a/dlls/ntdll/path.c
|
||||
+++ b/dlls/ntdll/path.c
|
||||
@@ -1020,7 +1020,7 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir)
|
||||
@@ -929,7 +929,7 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir)
|
||||
attr.SecurityDescriptor = NULL;
|
||||
attr.SecurityQualityOfService = NULL;
|
||||
|
||||
@ -115,10 +101,10 @@ index 32e1f951af5c..71ae44dd4988 100644
|
||||
if (nts != STATUS_SUCCESS) goto out;
|
||||
|
||||
diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c
|
||||
index 884141da060c..32a1f5107f06 100644
|
||||
index 533fe963cae..fd0e86ce147 100644
|
||||
--- a/dlls/ntdll/process.c
|
||||
+++ b/dlls/ntdll/process.c
|
||||
@@ -1357,7 +1357,7 @@ static NTSTATUS get_pe_file_info( UNICODE_STRING *path, ULONG attributes,
|
||||
@@ -396,7 +396,7 @@ static NTSTATUS get_pe_file_info( UNICODE_STRING *path, ULONG attributes,
|
||||
|
||||
memset( info, 0, sizeof(*info) );
|
||||
InitializeObjectAttributes( &attr, path, attributes, 0, 0 );
|
||||
@ -128,5 +114,5 @@ index 884141da060c..32a1f5107f06 100644
|
||||
{
|
||||
BOOL is_64bit;
|
||||
--
|
||||
2.26.2
|
||||
2.27.0
|
||||
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
From 1867195b928ed636b61830abf45594591b40c834 Mon Sep 17 00:00:00 2001
|
||||
From 823ca34bded08b0a861641ba317400b5d8a47a50 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Henrie <alexhenrie24@gmail.com>
|
||||
Date: Sun, 1 Mar 2020 17:58:12 -0700
|
||||
Subject: [PATCH 1/2] winemenubuilder: Blacklist desktop integration for
|
||||
certain associations
|
||||
Subject: [PATCH] winemenubuilder: Blacklist desktop integration for certain
|
||||
associations
|
||||
|
||||
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41275
|
||||
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
|
||||
---
|
||||
dlls/mshtml/mshtml.inf | 6 +++
|
||||
loader/wine.inf.in | 10 ++++
|
||||
programs/winemenubuilder/winemenubuilder.c | 54 +++++++++++++++++++---
|
||||
3 files changed, 63 insertions(+), 7 deletions(-)
|
||||
loader/wine.inf.in | 10 +++++
|
||||
programs/winemenubuilder/winemenubuilder.c | 52 +++++++++++++++++++---
|
||||
3 files changed, 62 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf
|
||||
index 4a650b444f..548739f432 100644
|
||||
index 4a650b444fc..548739f4326 100644
|
||||
--- a/dlls/mshtml/mshtml.inf
|
||||
+++ b/dlls/mshtml/mshtml.inf
|
||||
@@ -111,6 +111,7 @@ HKCR,"giffile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,,"
|
||||
@ -65,10 +65,10 @@ index 4a650b444f..548739f432 100644
|
||||
;; PS
|
||||
HKCR,"MIME\Database\Content Type\application/postscript","Extension",,".ps"
|
||||
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
|
||||
index 8267ef34dc..6c34e20d58 100644
|
||||
index badbd9b4b5a..4784533301b 100644
|
||||
--- a/loader/wine.inf.in
|
||||
+++ b/loader/wine.inf.in
|
||||
@@ -501,6 +501,16 @@ HKCR,MIME\Database\Charset\us-ascii,"AliasForCharset",,iso-8859-1
|
||||
@@ -506,6 +506,16 @@ HKCR,MIME\Database\Charset\us-ascii,"AliasForCharset",,iso-8859-1
|
||||
HKCR,MIME\Database\Charset\visual,"AliasForCharset",,iso-8859-8
|
||||
HKCR,MIME\Database\Charset\Windows-1254,"AliasForCharset",,iso-8859-9
|
||||
|
||||
@ -86,19 +86,19 @@ index 8267ef34dc..6c34e20d58 100644
|
||||
HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"WBreakerClass",,"{369647e0-17b0-11ce-9950-00aa004bbb1f}"
|
||||
HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"StemmerClass",,""
|
||||
diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
|
||||
index fa700f8c19..6f1dd7c571 100644
|
||||
index 65fbecca526..28e86565c06 100644
|
||||
--- a/programs/winemenubuilder/winemenubuilder.c
|
||||
+++ b/programs/winemenubuilder/winemenubuilder.c
|
||||
@@ -2465,7 +2465,7 @@ static BOOL write_freedesktop_mime_type_entry(const char *packages_dir, const ch
|
||||
@@ -2479,7 +2479,7 @@ static BOOL write_freedesktop_mime_type_entry(const char *packages_dir, const ch
|
||||
return ret;
|
||||
}
|
||||
|
||||
-static BOOL is_extension_blacklisted(LPCWSTR extension)
|
||||
+static BOOL is_hard_blacklisted(const WCHAR *extension)
|
||||
-static BOOL is_extension_banned(LPCWSTR extension)
|
||||
+static BOOL is_extension_banned(const WCHAR *extension)
|
||||
{
|
||||
/* These are managed through external tools like wine.desktop, to evade malware created file type associations */
|
||||
static const WCHAR comW[] = {'.','c','o','m',0};
|
||||
@@ -2479,6 +2479,42 @@ static BOOL is_extension_blacklisted(LPCWSTR extension)
|
||||
@@ -2493,6 +2493,42 @@ static BOOL is_extension_banned(LPCWSTR extension)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@ -141,16 +141,7 @@ index fa700f8c19..6f1dd7c571 100644
|
||||
static const char* get_special_mime_type(LPCWSTR extension)
|
||||
{
|
||||
static const WCHAR lnkW[] = {'.','l','n','k',0};
|
||||
@@ -2552,7 +2588,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package
|
||||
size *= 2;
|
||||
} while (ret == ERROR_MORE_DATA);
|
||||
|
||||
- if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_extension_blacklisted(extensionW))
|
||||
+ if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_hard_blacklisted(extensionW))
|
||||
{
|
||||
char *extensionA = NULL;
|
||||
WCHAR *commandW = NULL;
|
||||
@@ -2570,6 +2606,15 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package
|
||||
@@ -2591,6 +2627,15 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package
|
||||
char *progIdA = NULL;
|
||||
char *mimeProgId = NULL;
|
||||
|
||||
@ -166,7 +157,7 @@ index fa700f8c19..6f1dd7c571 100644
|
||||
extensionA = wchars_to_utf8_chars(strlwrW(extensionW));
|
||||
if (extensionA == NULL)
|
||||
{
|
||||
@@ -2638,11 +2683,6 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package
|
||||
@@ -2659,11 +2704,6 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package
|
||||
}
|
||||
}
|
||||
|
||||
@ -179,5 +170,5 @@ index fa700f8c19..6f1dd7c571 100644
|
||||
if (executableW)
|
||||
openWithIconA = extract_icon(executableW, 0, NULL, FALSE);
|
||||
--
|
||||
2.25.1
|
||||
2.27.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 679dcbe5add05885cf675a43b529e569f8b5c8af Mon Sep 17 00:00:00 2001
|
||||
From 87580d2eef0c3d91a89be07e912dea3053c26d71 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 6 Sep 2015 12:41:17 +0200
|
||||
Subject: [PATCH] ws2_32: Invalidate client-side file descriptor cache in
|
||||
@ -10,11 +10,11 @@ Subject: [PATCH] ws2_32: Invalidate client-side file descriptor cache in
|
||||
dlls/ntdll/unix/loader.c | 1 +
|
||||
dlls/ntdll/unix/server.c | 20 ++++++++++++++++++++
|
||||
dlls/ntdll/unix/unix_private.h | 1 +
|
||||
dlls/ntdll/unixlib.h | 3 ++-
|
||||
dlls/ntdll/unixlib.h | 1 +
|
||||
dlls/ws2_32/socket.c | 1 +
|
||||
dlls/ws2_32/tests/sock.c | 5 +----
|
||||
include/wine/server.h | 1 +
|
||||
9 files changed, 36 insertions(+), 5 deletions(-)
|
||||
9 files changed, 35 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
|
||||
index a9422723b71..e4f2f0e9c2b 100644
|
||||
@ -48,10 +48,10 @@ index 9e1cc85a36e..3f4ba60b7bb 100644
|
||||
/***********************************************************************
|
||||
* wine_server_release_fd (NTDLL.@)
|
||||
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
|
||||
index 0d4313089d6..1d288770573 100644
|
||||
index 91b98c44b3f..105dc07c085 100644
|
||||
--- a/dlls/ntdll/unix/loader.c
|
||||
+++ b/dlls/ntdll/unix/loader.c
|
||||
@@ -955,6 +955,7 @@ static struct unix_funcs unix_funcs =
|
||||
@@ -974,6 +974,7 @@ static struct unix_funcs unix_funcs =
|
||||
exec_process,
|
||||
wine_server_call,
|
||||
server_send_fd,
|
||||
@ -60,10 +60,10 @@ index 0d4313089d6..1d288770573 100644
|
||||
server_fd_to_handle,
|
||||
server_handle_to_fd,
|
||||
diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
|
||||
index 5faca657783..2e278480896 100644
|
||||
index a4d1bdf9373..eacc38c984d 100644
|
||||
--- a/dlls/ntdll/unix/server.c
|
||||
+++ b/dlls/ntdll/unix/server.c
|
||||
@@ -1003,6 +1003,26 @@ static int remove_fd_from_cache( HANDLE handle )
|
||||
@@ -1001,6 +1001,26 @@ static int remove_fd_from_cache( HANDLE handle )
|
||||
return fd;
|
||||
}
|
||||
|
||||
@ -91,10 +91,10 @@ index 5faca657783..2e278480896 100644
|
||||
/***********************************************************************
|
||||
* server_get_unix_fd
|
||||
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
|
||||
index 2d4996a12f2..f19c8924008 100644
|
||||
index 9361092f0f1..fc5269ed1ec 100644
|
||||
--- a/dlls/ntdll/unix/unix_private.h
|
||||
+++ b/dlls/ntdll/unix/unix_private.h
|
||||
@@ -96,6 +96,7 @@ extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN;
|
||||
@@ -100,6 +100,7 @@ extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN;
|
||||
extern void CDECL virtual_set_large_address_space(void) DECLSPEC_HIDDEN;
|
||||
|
||||
extern void CDECL server_send_fd( int fd ) DECLSPEC_HIDDEN;
|
||||
@ -103,19 +103,10 @@ index 2d4996a12f2..f19c8924008 100644
|
||||
int *needs_close, enum server_fd_type *type,
|
||||
unsigned int *options ) DECLSPEC_HIDDEN;
|
||||
diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h
|
||||
index 7fd483dcabe..dbe68a1b486 100644
|
||||
index 4169e3e8ece..0709c7e7441 100644
|
||||
--- a/dlls/ntdll/unixlib.h
|
||||
+++ b/dlls/ntdll/unixlib.h
|
||||
@@ -28,7 +28,7 @@ struct ldt_copy;
|
||||
struct msghdr;
|
||||
|
||||
/* increment this when you change the function table */
|
||||
-#define NTDLL_UNIXLIB_VERSION 51
|
||||
+#define NTDLL_UNIXLIB_VERSION 52
|
||||
|
||||
struct unix_funcs
|
||||
{
|
||||
@@ -290,6 +290,7 @@ struct unix_funcs
|
||||
@@ -291,6 +291,7 @@ struct unix_funcs
|
||||
/* server functions */
|
||||
unsigned int (CDECL *server_call)( void *req_ptr );
|
||||
void (CDECL *server_send_fd)( int fd );
|
||||
|
||||
@ -1 +1 @@
|
||||
f56e409c2feb62056eb133e53fe398eadd0a503e
|
||||
67ef5151744b347d4a30c985da6712fb0061e675
|
||||
|
||||
Loading…
Reference in New Issue
Block a user