wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 5c756468656afc9207c0f51f774bbc29267e1469.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2021-06-22 09:06:59 +10:00
parent fd5866f6f1
commit 9c8608eea6
5 changed files with 30 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
patches/ntdll-WRITECOPY/0003-ntdll-Setup-a-temporary-signal-handler-during-proces.patch
View File

@ -1,4 +1,4 @@
From 4b4d65ecd081ff464821625bedc77aaf532d23c7 Mon Sep 17 00:00:00 2001
From 3442d399135d784923bda352f26692cc63cc746c 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
@ -28,10 +28,10 @@ index 6c8f3a4996d..5d35b68476b 100644
#ifdef __APPLE__
diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c
index a0d826ea178..313fe4f1f5b 100644
index c24fa3a9b78..516c30a95d2 100644
--- a/dlls/ntdll/unix/signal_arm.c
+++ b/dlls/ntdll/unix/signal_arm.c
@@ -902,6 +902,12 @@ void signal_init_process(void)
@@ -892,6 +892,12 @@ void signal_init_process(void)
exit(1);
}
@ -43,12 +43,12 @@ index a0d826ea178..313fe4f1f5b 100644
+}
/***********************************************************************
* init_thread_context
* call_init_thunk
diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c
index 669e44aaa2b..aba9c8dcf02 100644
index 5b8fff6a406..a005eb3ceaa 100644
--- a/dlls/ntdll/unix/signal_arm64.c
+++ b/dlls/ntdll/unix/signal_arm64.c
@@ -1080,6 +1080,12 @@ void signal_init_process(void)
@@ -1077,6 +1077,12 @@ void signal_init_process(void)
exit(1);
}
@ -60,12 +60,12 @@ index 669e44aaa2b..aba9c8dcf02 100644
+}
/***********************************************************************
* init_thread_context
* call_init_thunk
diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index d04935bb1b2..cb6f48b73dc 100644
index eb69af9ce0e..39a36118e22 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -1781,6 +1781,30 @@ static BOOL handle_syscall_trap( ucontext_t *sigcontext )
@@ -1780,6 +1780,30 @@ static BOOL handle_syscall_trap( ucontext_t *sigcontext )
}
@ -96,7 +96,7 @@ index d04935bb1b2..cb6f48b73dc 100644
/**********************************************************************
* segv_handler
*
@@ -2368,6 +2392,34 @@ void signal_init_process(void)
@@ -2367,6 +2391,34 @@ void signal_init_process(void)
exit(1);
}
@ -130,12 +130,12 @@ index d04935bb1b2..cb6f48b73dc 100644
+}
/***********************************************************************
* init_thread_context
* call_init_thunk
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index c36699589d9..6a5f50c7c55 100644
index ac8eddf739e..116bbaafd79 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -2630,6 +2630,12 @@ void signal_init_process(void)
@@ -2624,6 +2624,12 @@ void signal_init_process(void)
exit(1);
}
@ -147,9 +147,9 @@ index c36699589d9..6a5f50c7c55 100644
+}
/***********************************************************************
* init_thread_context
* call_init_thunk
diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index d3d303397fb..6064082f1a8 100644
index 339a93bf2db..38314688cba 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -237,6 +237,7 @@ extern NTSTATUS signal_alloc_thread( TEB *teb ) DECLSPEC_HIDDEN;
@ -158,7 +158,7 @@ index d3d303397fb..6064082f1a8 100644
extern void signal_init_process(void) DECLSPEC_HIDDEN;
+extern void signal_init_early(void) DECLSPEC_HIDDEN;
extern void DECLSPEC_NORETURN signal_start_thread( PRTL_THREAD_START_ROUTINE entry, void *arg,
BOOL suspend, void *thunk, TEB *teb ) DECLSPEC_HIDDEN;
BOOL suspend, TEB *teb ) DECLSPEC_HIDDEN;
extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int), TEB *teb ) DECLSPEC_HIDDEN;
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index 49dd3aa51e2..35a9b43d577 100644

15
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "1de583a4dac7d704b2d4291ada4a1885cd8cd1c9"
echo "5c756468656afc9207c0f51f774bbc29267e1469"
}
# Show version information
@ -280,7 +280,6 @@ patch_enable_all ()
enable_winmm_mciSendCommandA="$1"
enable_wintab32_improvements="$1"
enable_wintrust_WTHelperGetProvCertFromChain="$1"
enable_ws2_32_Connect_Time="$1"
enable_ws2_32_getsockopt="$1"
enable_wscript_support_d_u_switches="$1"
enable_xactengine_initial="$1"
@ -886,9 +885,6 @@ patch_enable ()
wintrust-WTHelperGetProvCertFromChain)
enable_wintrust_WTHelperGetProvCertFromChain="$2"
;;
ws2_32-Connect_Time)
enable_ws2_32_Connect_Time="$2"
;;
ws2_32-getsockopt)
enable_ws2_32_getsockopt="$2"
;;
@ -4221,15 +4217,6 @@ if test "$enable_wintrust_WTHelperGetProvCertFromChain" -eq 1; then
patch_apply wintrust-WTHelperGetProvCertFromChain/0001-wintrust-Add-parameter-check-in-WTHelperGetProvCertF.patch
fi
# Patchset ws2_32-Connect_Time
# |
# | Modified files:
# | * dlls/ws2_32/socket.c, dlls/ws2_32/tests/sock.c, server/protocol.def, server/sock.c
# |
if test "$enable_ws2_32_Connect_Time" -eq 1; then
patch_apply ws2_32-Connect_Time/0001-ws2_32-Implement-returning-the-proper-time-with-SO_C.patch
fi
# Patchset ws2_32-getsockopt
# |
# | This patchset fixes the following Wine bugs:

22
patches/uxtheme-CloseThemeClass/0001-uxtheme-Protect-CloseThemeData-from-invalid-input.patch
View File

@ -1,4 +1,4 @@
From 21abf2eb3cab9a3dea048171eccd775949cfd548 Mon Sep 17 00:00:00 2001
From 8c7a7c6ba3e1a7752bd0bb5d58e01cc7c3475c88 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Fri, 18 Nov 2016 22:31:29 +0800
Subject: [PATCH] uxtheme: Protect CloseThemeData() from invalid input.
@ -14,7 +14,7 @@ Testcase by Michael Müller <michael@fds-team.de>.
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c
index cd7677e5783..a0ec290eb40 100644
index ed22d923250..21106a5f8e0 100644
--- a/dlls/uxtheme/msstyles.c
+++ b/dlls/uxtheme/msstyles.c
@@ -32,6 +32,7 @@
@ -25,7 +25,7 @@ index cd7677e5783..a0ec290eb40 100644
#include "wine/debug.h"
#include "wine/heap.h"
@@ -50,6 +51,8 @@ extern int alphaBlendMode;
@@ -48,6 +49,8 @@ static HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPC
#define MSSTYLES_VERSION 0x0003
@ -34,7 +34,7 @@ index cd7677e5783..a0ec290eb40 100644
static PTHEME_FILE tfActiveTheme;
/***********************************************************************/
@@ -205,6 +208,7 @@ void MSSTYLES_CloseThemeFile(PTHEME_FILE tf)
@@ -203,6 +206,7 @@ void MSSTYLES_CloseThemeFile(PTHEME_FILE tf)
pcls->partstate = ps->next;
heap_free(ps);
}
@ -42,7 +42,7 @@ index cd7677e5783..a0ec290eb40 100644
heap_free(pcls);
}
}
@@ -433,6 +437,7 @@ static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWST
@@ -431,6 +435,7 @@ static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWST
if(cur) return cur;
cur = heap_alloc(sizeof(*cur));
@ -50,7 +50,7 @@ index cd7677e5783..a0ec290eb40 100644
cur->hTheme = tf->hTheme;
lstrcpyW(cur->szAppName, pszAppName);
lstrcpyW(cur->szClassName, pszClassName);
@@ -1024,6 +1029,23 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList)
@@ -1022,6 +1027,23 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList)
*/
HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc)
{
@ -96,12 +96,12 @@ index 0b7e1ab35cc..ba10ac82b82 100644
} THEME_IMAGE, *PTHEME_IMAGE;
diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c
index 5b6c91dc481..83b8f2ba040 100644
index 869dbe2cdc9..f5097012a2d 100644
--- a/dlls/uxtheme/tests/system.c
+++ b/dlls/uxtheme/tests/system.c
@@ -189,6 +189,10 @@ static void test_OpenThemeData(void)
"Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08x\n",
GetLastError());
@@ -195,6 +195,10 @@ static void test_OpenThemeData(void)
ok( GetLastError() == E_PROP_ID_UNSUPPORTED, "Expected 0x%08x, got 0x%08x\n",
E_PROP_ID_UNSUPPORTED, GetLastError() );
+ /* Close invalid handle */
+ hRes = CloseThemeData((HTHEME)0xdeadbeef);
@ -111,5 +111,5 @@ index 5b6c91dc481..83b8f2ba040 100644
{
SetLastError(0xdeadbeef);
--
2.28.0
2.30.2

1
patches/ws2_32-Connect_Time/definition
View File

@ -1 +1,2 @@
Fixes: SO_CONNECT_TIME returns the appropriate time
Disabled: True

2
staging/upstream-commit
View File

@ -1 +1 @@
c82c5e96a9eb13bfa1fef95fb7467ce17624a341
5c756468656afc9207c0f51f774bbc29267e1469