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 89ef7b59f548a76960b2278d819a8f915c81e132.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-04-26 04:01:25 +02:00
parent af6b4ace35
commit 229bb38973
5 changed files with 42 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
patches/ntdll-User_Shared_Data/0001-ntdll-Move-code-to-update-user-shared-data-into-a-se.patch
View File

@ -1,4 +1,4 @@
From f620c720c8a3920dc189f1ef2147126ce1d469d7 Mon Sep 17 00:00:00 2001
From 0874ce1fc3986b06f1331a5bf1edd3760d6fa046 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 26 Nov 2014 10:46:09 +0100
Subject: ntdll: Move code to update user shared data into a separate function.
@ -9,10 +9,10 @@ Subject: ntdll: Move code to update user shared data into a separate function.
2 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 270d7ff..173bb22 100644
index 66618fc111..827195e576 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -1439,3 +1439,6 @@
@@ -1493,3 +1493,6 @@
@ cdecl wine_nt_to_unix_file_name(ptr ptr long long)
@ cdecl wine_unix_to_nt_file_name(ptr ptr)
@ cdecl __wine_init_windows_dir(wstr wstr)
@ -20,12 +20,12 @@ index 270d7ff..173bb22 100644
+# User shared data
+@ cdecl __wine_user_shared_data()
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index 3696c8e..7411e48 100644
index 830dd3a030..a2c0cf48fd 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -202,6 +202,26 @@ static ULONG64 get_dyld_image_info_addr(void)
@@ -251,6 +251,26 @@ static ULONG_PTR get_image_addr(void)
}
#endif /* __APPLE__ */
#endif
+
+/**************************************************************************
@ -50,7 +50,7 @@ index 3696c8e..7411e48 100644
/***********************************************************************
* thread_init
*
@@ -215,7 +235,6 @@ HANDLE thread_init(void)
@@ -264,7 +284,6 @@ HANDLE thread_init(void)
void *addr;
SIZE_T size, info_size;
HANDLE exe_file = 0;
@ -58,7 +58,7 @@ index 3696c8e..7411e48 100644
NTSTATUS status;
struct ntdll_thread_data *thread_data;
static struct debug_info debug_info; /* debug info for initial thread */
@@ -331,15 +350,8 @@ HANDLE thread_init(void)
@@ -375,15 +394,8 @@ HANDLE thread_init(void)
wine_server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params.hStdError );
}
@ -77,5 +77,5 @@ index 3696c8e..7411e48 100644
NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 );
--
2.4.3
2.12.2

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

@ -1,4 +1,4 @@
From 1cb822449427e537c098bb6b738bb983a0cf8ec1 Mon Sep 17 00:00:00 2001
From 7fd25e2e5a4397a4a4134ec50bb982b365f13534 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: ntdll: Setup a temporary signal handler during process startup to
@ -15,7 +15,7 @@ Subject: ntdll: Setup a temporary signal handler during process startup to
7 files changed, 79 insertions(+)
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index f5b5339..8d985d9 100644
index f78e4fe8f3..74e3c0a002 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -68,6 +68,7 @@ extern NTSTATUS signal_alloc_thread( TEB **teb ) DECLSPEC_HIDDEN;
@ -27,7 +27,7 @@ index f5b5339..8d985d9 100644
extern void debug_init(void) DECLSPEC_HIDDEN;
extern HANDLE thread_init(void) DECLSPEC_HIDDEN;
diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c
index 1f6da96..cfb9df1 100644
index cb5f67db75..b9ec7fb874 100644
--- a/dlls/ntdll/signal_arm.c
+++ b/dlls/ntdll/signal_arm.c
@@ -974,6 +974,12 @@ void signal_init_process(void)
@ -44,7 +44,7 @@ index 1f6da96..cfb9df1 100644
/**********************************************************************
* __wine_enter_vm86 (NTDLL.@)
diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c
index bd91d81..3bd705f 100644
index 14c5260c14..7967310355 100644
--- a/dlls/ntdll/signal_arm64.c
+++ b/dlls/ntdll/signal_arm64.c
@@ -846,6 +846,12 @@ void signal_init_process(void)
@ -61,10 +61,10 @@ index bd91d81..3bd705f 100644
/**********************************************************************
* __wine_enter_vm86 (NTDLL.@)
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index cf20483..7275233 100644
index bee6ab8694..ee8855a24c 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -2035,6 +2035,31 @@ static void usr2_handler( int signal, siginfo_t *siginfo, void *sigcontext )
@@ -2056,6 +2056,31 @@ static void usr2_handler( int signal, siginfo_t *siginfo, void *sigcontext )
/**********************************************************************
@ -96,7 +96,7 @@ index cf20483..7275233 100644
* segv_handler
*
* Handler for SIGSEGV and related errors.
@@ -2466,6 +2491,34 @@ void signal_init_process(void)
@@ -2493,6 +2518,34 @@ void signal_init_process(void)
exit(1);
}
@ -132,7 +132,7 @@ index cf20483..7275233 100644
#ifdef __HAVE_VM86
/**********************************************************************
diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c
index 886da86..d2e7819 100644
index 507490a526..6adf0c343b 100644
--- a/dlls/ntdll/signal_powerpc.c
+++ b/dlls/ntdll/signal_powerpc.c
@@ -1048,6 +1048,12 @@ void signal_init_process(void)
@ -149,10 +149,10 @@ index 886da86..d2e7819 100644
/**********************************************************************
* __wine_enter_vm86 (NTDLL.@)
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index 9b98894..60170cc 100644
index 61bb2ddce6..1870c061c3 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -2826,6 +2826,12 @@ void signal_init_process(void)
@@ -3005,6 +3005,12 @@ void signal_init_process(void)
exit(1);
}
@ -166,11 +166,11 @@ index 9b98894..60170cc 100644
/**********************************************************************
* RtlAddFunctionTable (NTDLL.@)
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index 3696c8e..a5d10e5 100644
index 6b5e9f5c9c..3a3d6c0efd 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -224,6 +224,7 @@ HANDLE thread_init(void)
#endif
@@ -270,6 +270,7 @@ HANDLE thread_init(void)
static struct debug_info debug_info; /* debug info for initial thread */
virtual_init();
+ signal_init_early();
@ -178,5 +178,5 @@ index 3696c8e..a5d10e5 100644
/* reserve space for shared user data */
--
2.4.3
2.12.2

4
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "e49feb63f489141c08a967a9c47930559e1de4f7"
echo "89ef7b59f548a76960b2278d819a8f915c81e132"
}
# Show version information
@ -7615,7 +7615,7 @@ fi
# | * [#42106] Implement user32.GetAutoRotationState
# |
# | Modified files:
# | * dlls/user32/sysparams.c, dlls/user32/tests/sysparams.c, dlls/user32/user32.spec, include/winuser.h
# | * dlls/user32/sysparams.c, dlls/user32/tests/sysparams.c
# |
if test "$enable_user32_GetAutoRotationState" -eq 1; then
patch_apply user32-GetAutoRotationState/0001-user32-Add-semi-stub-for-GetAutoRotationState.patch

69
patches/user32-GetAutoRotationState/0001-user32-Add-semi-stub-for-GetAutoRotationState.patch
View File

@ -1,29 +1,23 @@
From c5093b9a61cc252beb6b406cc72e7dd5a6642751 Mon Sep 17 00:00:00 2001
From 856606f7a35b0ee7245a41d356d5a6dd902899b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 8 Jan 2017 18:22:30 +0100
Subject: user32: Add semi-stub for GetAutoRotationState.
---
dlls/user32/sysparams.c | 17 +++++++++++++++++
dlls/user32/sysparams.c | 11 +++++++++--
dlls/user32/tests/sysparams.c | 25 +++++++++++++++++++++++++
dlls/user32/user32.spec | 1 +
include/winuser.h | 13 +++++++++++++
4 files changed, 56 insertions(+)
2 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
index 63c4ffe070..c79b53c6e7 100644
index ab3d717300..27560380bd 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -2913,3 +2913,20 @@ BOOL WINAPI IsProcessDPIAware(void)
FIXME( "stub!\n");
return FALSE;
}
+
+/***********************************************************************
+ * GetAutoRotationState (USER32.@)
+ */
+BOOL WINAPI GetAutoRotationState(AR_STATE *state)
+{
@@ -2919,8 +2919,15 @@ BOOL WINAPI IsProcessDPIAware(void)
*/
BOOL WINAPI GetAutoRotationState( AR_STATE *state )
{
- FIXME("(%p): stub\n", state);
- *state = AR_NOT_SUPPORTED;
+ TRACE("(%p)\n", state);
+
+ if (!state)
@ -33,8 +27,9 @@ index 63c4ffe070..c79b53c6e7 100644
+ }
+
+ *state = AR_NOSENSOR;
+ return TRUE;
+}
return TRUE;
}
diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c
index 96b15814d7..3fe21abb90 100644
--- a/dlls/user32/tests/sysparams.c
@ -92,42 +87,6 @@ index 96b15814d7..3fe21abb90 100644
change_counter = 0;
change_last_param = 0;
diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec
index 6f2703a9b7..b3fa5ae532 100644
--- a/dlls/user32/user32.spec
+++ b/dlls/user32/user32.spec
@@ -251,6 +251,7 @@
@ stdcall GetAppCompatFlags(long)
@ stdcall GetAppCompatFlags2(long)
@ stdcall GetAsyncKeyState(long)
+@ stdcall GetAutoRotationState(ptr)
@ stdcall GetCapture()
@ stdcall GetCaretBlinkTime()
@ stdcall GetCaretPos(ptr)
diff --git a/include/winuser.h b/include/winuser.h
index 802b0b0660..ec4b753d02 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -1460,6 +1460,19 @@ DECL_WINELIB_TYPE_AW(LPHELPWININFO)
#define CDS_SETRECT 0x20000000
#define CDS_RESET 0x40000000
+typedef enum tagAR_STATE
+{
+ AR_ENABLED = 0x0,
+ AR_DISABLED = 0x1,
+ AR_SUPPRESSED = 0x2,
+ AR_REMOTESESSION = 0x4,
+ AR_MULTIMON = 0x8,
+ AR_NOSENSOR = 0x10,
+ AR_NOT_SUPPORTED = 0x20,
+ AR_DOCKED = 0x40,
+ AR_LAPTOP = 0x80
+} AR_STATE, *PAR_STATE;
+
typedef struct tagWNDCLASSEXA
{
UINT cbSize;
--
2.11.0
2.12.2

6
patches/wined3d-CSMT_Main/9999-IfDefined.patch
View File

@ -1052,7 +1052,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
wined3d_device_delete_opengl_contexts(device);
if (device->fb.depth_stencil)
@@ -4135,6 +4148,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev
@@ -4165,6 +4178,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev
return WINED3DERR_INVALIDCALL;
}
@ -1060,7 +1060,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
if (dst_texture->sub_resources[dst_sub_resource_idx].map_count)
{
WARN("Destination sub-resource %u is mapped.\n", dst_sub_resource_idx);
@@ -4145,6 +4159,18 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev
@@ -4175,6 +4189,18 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev
{
WARN("Source sub-resource %u is mapped.\n", src_sub_resource_idx);
return WINED3DERR_INVALIDCALL;
@ -1079,7 +1079,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
}
if (!src_box)
@@ -5176,3 +5202,58 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL
@@ -5206,3 +5232,58 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL
else
return CallWindowProcA(proc, window, message, wparam, lparam);
}