From 4e2dc89043bbe3de177b293e994fe35dab889f6e Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Wed, 31 Mar 2021 16:49:32 -0500 Subject: [PATCH] Rebase against 29d9659095fd76e303f204050ab4c85d0a0486e4. --- ...implementation-for-deferred-contexts.patch | 38 +++--- ...t-for-hiding-wine-version-informatio.patch | 18 +-- patches/patchinstall.sh | 111 +---------------- ...r-ITextPara-interface-and-implement-.patch | 112 +++++++++--------- ...-repeated-FIXMEs-triggered-by-Adobe-.patch | 27 +---- patches/user32-rawinput-hid/definition | 3 +- .../definition | 3 +- patches/user32-rawinput-mouse/definition | 4 +- ...ice-Load-some-common-drivers-and-fix.patch | 12 +- patches/winex11.drv-mouse-coorrds/definition | 2 + staging/upstream-commit | 2 +- 11 files changed, 107 insertions(+), 225 deletions(-) diff --git a/patches/d3d11-Deferred_Context/0003-d3d11-Initial-implementation-for-deferred-contexts.patch b/patches/d3d11-Deferred_Context/0003-d3d11-Initial-implementation-for-deferred-contexts.patch index 06688116..b6864987 100644 --- a/patches/d3d11-Deferred_Context/0003-d3d11-Initial-implementation-for-deferred-contexts.patch +++ b/patches/d3d11-Deferred_Context/0003-d3d11-Initial-implementation-for-deferred-contexts.patch @@ -1,4 +1,4 @@ -From 504969929eb7932fe22880768461f2172080f0eb Mon Sep 17 00:00:00 2001 +From 4527c01f3e96ad841fb26002c1e73a2b4d9ac55e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 19 Jan 2017 16:56:56 +0100 Subject: [PATCH] d3d11: Initial implementation for deferred contexts. @@ -8,7 +8,7 @@ Subject: [PATCH] d3d11: Initial implementation for deferred contexts. 1 file changed, 1041 insertions(+), 31 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c -index 454003128dc..4beb7cea4fa 100644 +index 47f43a796e3..ca21e9be6ea 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -16,6 +16,7 @@ @@ -18,8 +18,8 @@ index 454003128dc..4beb7cea4fa 100644 +#include "wine/list.h" #define NONAMELESSUNION - #include "d3d11_private.h" -@@ -48,6 +49,174 @@ static BOOL d3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, S + #define WINE_NO_NAMELESS_EXTENSION +@@ -49,6 +50,174 @@ static BOOL d3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, S return TRUE; } @@ -194,7 +194,7 @@ index 454003128dc..4beb7cea4fa 100644 /* ID3D11DeviceContext - deferred context */ struct d3d11_deferred_context { -@@ -55,9 +224,532 @@ struct d3d11_deferred_context +@@ -56,9 +225,532 @@ struct d3d11_deferred_context ID3D11Device *device; LONG refcount; @@ -727,7 +727,7 @@ index 454003128dc..4beb7cea4fa 100644 static void STDMETHODCALLTYPE d3d_null_wined3d_object_destroyed(void *parent) {} static const struct wined3d_parent_ops d3d_null_wined3d_parent_ops = -@@ -1415,7 +2107,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D +@@ -1428,7 +2120,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D static void STDMETHODCALLTYPE d3d11_immediate_context_ExecuteCommandList(ID3D11DeviceContext1 *iface, ID3D11CommandList *command_list, BOOL restore_state) { @@ -749,7 +749,7 @@ index 454003128dc..4beb7cea4fa 100644 } static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShaderResources(ID3D11DeviceContext1 *iface, -@@ -3169,6 +3874,7 @@ static ULONG STDMETHODCALLTYPE d3d11_deferred_context_Release(ID3D11DeviceContex +@@ -3167,6 +3872,7 @@ static ULONG STDMETHODCALLTYPE d3d11_deferred_context_Release(ID3D11DeviceContex if (!refcount) { @@ -757,7 +757,7 @@ index 454003128dc..4beb7cea4fa 100644 wined3d_private_store_cleanup(&context->private_store); ID3D11Device_Release(context->device); HeapFree(GetProcessHeap(), 0, context); -@@ -3220,43 +3926,86 @@ static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_SetPrivateDataInterface( +@@ -3218,43 +3924,86 @@ static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_SetPrivateDataInterface( static void STDMETHODCALLTYPE d3d11_deferred_context_VSSetConstantBuffers(ID3D11DeviceContext *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { @@ -850,7 +850,7 @@ index 454003128dc..4beb7cea4fa 100644 } static void STDMETHODCALLTYPE d3d11_deferred_context_Draw(ID3D11DeviceContext *iface, -@@ -3269,53 +4018,169 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_Draw(ID3D11DeviceContext *i +@@ -3267,53 +4016,169 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_Draw(ID3D11DeviceContext *i static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_Map(ID3D11DeviceContext *iface, ID3D11Resource *resource, UINT subresource_idx, D3D11_MAP map_type, UINT map_flags, D3D11_MAPPED_SUBRESOURCE *mapped_subresource) { @@ -1029,7 +1029,7 @@ index 454003128dc..4beb7cea4fa 100644 } static void STDMETHODCALLTYPE d3d11_deferred_context_DrawInstanced(ID3D11DeviceContext *iface, -@@ -3344,7 +4209,16 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetShader(ID3D11DeviceCon +@@ -3342,7 +4207,16 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetShader(ID3D11DeviceCon static void STDMETHODCALLTYPE d3d11_deferred_context_IASetPrimitiveTopology(ID3D11DeviceContext *iface, D3D11_PRIMITIVE_TOPOLOGY topology) { @@ -1047,7 +1047,7 @@ index 454003128dc..4beb7cea4fa 100644 } static void STDMETHODCALLTYPE d3d11_deferred_context_VSSetShaderResources(ID3D11DeviceContext *iface, -@@ -3404,8 +4278,28 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargets(ID3D11De +@@ -3402,8 +4276,28 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargets(ID3D11De UINT render_target_view_count, ID3D11RenderTargetView *const *render_target_views, ID3D11DepthStencilView *depth_stencil_view) { @@ -1077,7 +1077,7 @@ index 454003128dc..4beb7cea4fa 100644 } static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargetsAndUnorderedAccessViews( -@@ -3425,15 +4319,44 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargetsAndUnorde +@@ -3423,15 +4317,44 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargetsAndUnorde static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetBlendState(ID3D11DeviceContext *iface, ID3D11BlendState *blend_state, const float blend_factor[4], UINT sample_mask) { @@ -1124,7 +1124,7 @@ index 454003128dc..4beb7cea4fa 100644 } static void STDMETHODCALLTYPE d3d11_deferred_context_SOSetTargets(ID3D11DeviceContext *iface, UINT buffer_count, -@@ -3475,13 +4398,34 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_DispatchIndirect(ID3D11Devi +@@ -3473,13 +4396,34 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_DispatchIndirect(ID3D11Devi static void STDMETHODCALLTYPE d3d11_deferred_context_RSSetState(ID3D11DeviceContext *iface, ID3D11RasterizerState *rasterizer_state) { @@ -1161,7 +1161,7 @@ index 454003128dc..4beb7cea4fa 100644 } static void STDMETHODCALLTYPE d3d11_deferred_context_RSSetScissorRects(ID3D11DeviceContext *iface, -@@ -3596,8 +4540,18 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShaderResources(ID3D11 +@@ -3594,8 +4538,18 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShaderResources(ID3D11 static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShader(ID3D11DeviceContext *iface, ID3D11HullShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { @@ -1181,7 +1181,7 @@ index 454003128dc..4beb7cea4fa 100644 } static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetSamplers(ID3D11DeviceContext *iface, -@@ -3610,36 +4564,62 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetSamplers(ID3D11DeviceC +@@ -3608,36 +4562,62 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetSamplers(ID3D11DeviceC static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetConstantBuffers(ID3D11DeviceContext *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { @@ -1249,7 +1249,7 @@ index 454003128dc..4beb7cea4fa 100644 } static void STDMETHODCALLTYPE d3d11_deferred_context_CSSetShaderResources(ID3D11DeviceContext *iface, -@@ -3940,7 +4920,15 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_CSGetConstantBuffers(ID3D11 +@@ -3938,7 +4918,15 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_CSGetConstantBuffers(ID3D11 static void STDMETHODCALLTYPE d3d11_deferred_context_ClearState(ID3D11DeviceContext *iface) { @@ -1266,7 +1266,7 @@ index 454003128dc..4beb7cea4fa 100644 } static void STDMETHODCALLTYPE d3d11_deferred_context_Flush(ID3D11DeviceContext *iface) -@@ -3965,9 +4953,29 @@ static UINT STDMETHODCALLTYPE d3d11_deferred_context_GetContextFlags(ID3D11Devic +@@ -3963,9 +4951,29 @@ static UINT STDMETHODCALLTYPE d3d11_deferred_context_GetContextFlags(ID3D11Devic static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_FinishCommandList(ID3D11DeviceContext *iface, BOOL restore, ID3D11CommandList **command_list) { @@ -1298,7 +1298,7 @@ index 454003128dc..4beb7cea4fa 100644 } static const struct ID3D11DeviceContextVtbl d3d11_deferred_context_vtbl = -@@ -4582,6 +5590,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device +@@ -4580,6 +5588,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device object->device = (ID3D11Device *)iface; object->refcount = 1; @@ -1308,5 +1308,5 @@ index 454003128dc..4beb7cea4fa 100644 wined3d_private_store_init(&object->private_store); -- -2.30.0 +2.30.2 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 e9d829ad..00f27f13 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,4 +1,4 @@ -From 1669a5998c69cf1f99b52d8917d0b0f977862374 Mon Sep 17 00:00:00 2001 +From b8a8aafd5c57dba6be726cf5974dfce006ea8d06 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 @@ -10,7 +10,7 @@ Subject: [PATCH] ntdll: Add support for hiding wine version information from 2 files changed, 103 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c -index 61951663866..dca5551cdb7 100644 +index 336b11c6344..46f74df7130 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -74,6 +74,9 @@ BOOL is_wow64 = FALSE; @@ -20,10 +20,10 @@ index 61951663866..dca5551cdb7 100644 +#define IS_OPTION_TRUE(ch) ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') + + + static BOOL is_prefix_bootstrap; /* are we bootstrapping the prefix? */ 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 */ -@@ -91,6 +94,8 @@ struct dll_dir_entry +@@ -92,6 +95,8 @@ struct dll_dir_entry static struct list dll_dir_list = LIST_INIT( dll_dir_list ); /* extra dirs from LdrAddDllDirectory */ @@ -32,7 +32,7 @@ index 61951663866..dca5551cdb7 100644 struct ldr_notification { struct list entry; -@@ -1729,6 +1734,96 @@ NTSTATUS WINAPI LdrUnlockLoaderLock( ULONG flags, ULONG_PTR magic ) +@@ -1673,6 +1678,96 @@ NTSTATUS WINAPI LdrUnlockLoaderLock( ULONG flags, ULONG_PTR magic ) } @@ -129,7 +129,7 @@ index 61951663866..dca5551cdb7 100644 /****************************************************************** * LdrGetProcedureAddress (NTDLL.@) */ -@@ -1748,7 +1843,7 @@ NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE module, const ANSI_STRING *name, +@@ -1692,7 +1787,7 @@ NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE module, const ANSI_STRING *name, { void *proc = name ? find_named_export( module, exports, exp_size, name->Buffer, -1, NULL ) : find_ordinal_export( module, exports, exp_size, ord - exports->Base, NULL ); @@ -138,7 +138,7 @@ index 61951663866..dca5551cdb7 100644 { *address = proc; ret = STATUS_SUCCESS; -@@ -1993,6 +2088,8 @@ static void build_ntdll_module(void) +@@ -1934,6 +2029,8 @@ static void build_ntdll_module(void) assert( wm ); wm->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS; if (TRACE_ON(relay)) RELAY_SetupDLL( meminfo.AllocationBase ); @@ -148,10 +148,10 @@ index 61951663866..dca5551cdb7 100644 diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index 9ebdeaebfe0..39bb0c1ff6f 100644 +index 400ac9398a5..55695f2c370 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h -@@ -136,6 +136,11 @@ static inline TEB64 *NtCurrentTeb64(void) { return (TEB64 *)NtCurrentTeb()->GdiB +@@ -100,6 +100,11 @@ static inline TEB64 *NtCurrentTeb64(void) { return (TEB64 *)NtCurrentTeb()->GdiB NTSTATUS WINAPI RtlHashUnicodeString(PCUNICODE_STRING,BOOLEAN,ULONG,ULONG*); diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index db07110f..50e9b68f 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "7c62e6b169f18f4a5d5809490f8aebdb5a9375eb" + echo "29d9659095fd76e303f204050ab4c85d0a0486e4" } # Show version information @@ -241,9 +241,6 @@ patch_enable_all () enable_user32_ScrollWindowEx="$1" enable_user32_message_order="$1" enable_user32_msgbox_Support_WM_COPY_mesg="$1" - enable_user32_rawinput_hid="$1" - enable_user32_rawinput_mouse="$1" - enable_user32_rawinput_mouse_experimental="$1" enable_user32_recursive_activation="$1" enable_uxtheme_CloseThemeClass="$1" enable_version_VerQueryValue="$1" @@ -288,7 +285,6 @@ patch_enable_all () enable_winex11_key_translation="$1" enable_winex11_wglShareLists="$1" enable_winex11_drv_Query_server_position="$1" - enable_winex11_drv_mouse_coorrds="$1" enable_wininet_Cleanup="$1" enable_winmm_mciSendCommandA="$1" enable_wintab32_improvements="$1" @@ -785,15 +781,6 @@ patch_enable () user32-msgbox-Support-WM_COPY-mesg) enable_user32_msgbox_Support_WM_COPY_mesg="$2" ;; - user32-rawinput-hid) - enable_user32_rawinput_hid="$2" - ;; - user32-rawinput-mouse) - enable_user32_rawinput_mouse="$2" - ;; - user32-rawinput-mouse-experimental) - enable_user32_rawinput_mouse_experimental="$2" - ;; user32-recursive-activation) enable_user32_recursive_activation="$2" ;; @@ -926,9 +913,6 @@ patch_enable () winex11.drv-Query_server_position) enable_winex11_drv_Query_server_position="$2" ;; - winex11.drv-mouse-coorrds) - enable_winex11_drv_mouse_coorrds="$2" - ;; wininet-Cleanup) enable_wininet_Cleanup="$2" ;; @@ -1340,27 +1324,6 @@ if test "$enable_wineboot_ProxySettings" -eq 1; then enable_wineboot_drivers_etc_Stubs=1 fi -if test "$enable_user32_rawinput_mouse_experimental" -eq 1; then - if test "$enable_user32_rawinput_mouse" -gt 1; then - abort "Patchset user32-rawinput-mouse disabled, but user32-rawinput-mouse-experimental depends on that." - fi - enable_user32_rawinput_mouse=1 -fi - -if test "$enable_user32_rawinput_hid" -eq 1; then - if test "$enable_user32_rawinput_mouse" -gt 1; then - abort "Patchset user32-rawinput-mouse disabled, but user32-rawinput-hid depends on that." - fi - enable_user32_rawinput_mouse=1 -fi - -if test "$enable_user32_rawinput_mouse" -eq 1; then - if test "$enable_winex11_drv_mouse_coorrds" -gt 1; then - abort "Patchset winex11.drv-mouse-coorrds disabled, but user32-rawinput-mouse depends on that." - fi - enable_winex11_drv_mouse_coorrds=1 -fi - if test "$enable_stdole32_tlb_SLTG_Typelib" -eq 1; then if test "$enable_widl_SLTG_Typelib_Support" -gt 1; then abort "Patchset widl-SLTG_Typelib_Support disabled, but stdole32.tlb-SLTG_Typelib depends on that." @@ -3902,78 +3865,6 @@ if test "$enable_user32_msgbox_Support_WM_COPY_mesg" -eq 1; then patch_apply user32-msgbox-Support-WM_COPY-mesg/0002-user32-msgbox-Use-a-windows-hook-to-trap-Ctrl-C.patch fi -# Patchset winex11.drv-mouse-coorrds -# | -# | This patchset fixes the following Wine bugs: -# | * [#46309] winex11.drv: Use root-relative coordinates for events, if possible. -# | -# | Modified files: -# | * dlls/winex11.drv/mouse.c -# | -if test "$enable_winex11_drv_mouse_coorrds" -eq 1; then - patch_apply winex11.drv-mouse-coorrds/0001-winex11.drv-mouse-Use-root-relative-coordinates-for-ev.patch -fi - -# Patchset user32-rawinput-mouse -# | -# | This patchset has the following (direct or indirect) dependencies: -# | * winex11.drv-mouse-coorrds -# | -# | This patchset fixes the following Wine bugs: -# | * [#42631] Mouse drift, jump or don't react to small slow movements in Unity-engine games and Fallout 4 (partly fixed in -# | Unity games, have walkaround in Fallout4 ) -# | * [#42675] Overwatch: Phantom mouse input / view pulled up to ceiling -# | -# | Modified files: -# | * dlls/user32/input.c, dlls/user32/user32.spec, dlls/wineandroid.drv/keyboard.c, dlls/wineandroid.drv/window.c, -# | dlls/winemac.drv/ime.c, dlls/winemac.drv/keyboard.c, dlls/winemac.drv/mouse.c, dlls/winex11.drv/event.c, -# | dlls/winex11.drv/keyboard.c, dlls/winex11.drv/mouse.c, dlls/winex11.drv/window.c, dlls/winex11.drv/x11drv.h, -# | dlls/winex11.drv/x11drv_main.c, include/winuser.h, server/protocol.def, server/queue.c -# | -if test "$enable_user32_rawinput_mouse" -eq 1; then - patch_apply user32-rawinput-mouse/0006-server-Add-send_hardware_message-flags-for-rawinput-.patch - patch_apply user32-rawinput-mouse/0007-user32-Add-__wine_send_input-flags-to-hint-raw-input.patch - patch_apply user32-rawinput-mouse/0008-winex11.drv-Advertise-XInput2-version-2.1-support.patch - patch_apply user32-rawinput-mouse/0009-winex11.drv-Keep-track-of-pointer-and-device-button-.patch - patch_apply user32-rawinput-mouse/0010-winex11.drv-Listen-to-RawMotion-and-RawButton-events.patch - patch_apply user32-rawinput-mouse/0011-winex11.drv-Move-header-order.patch -fi - -# Patchset user32-rawinput-hid -# | -# | This patchset has the following (direct or indirect) dependencies: -# | * winex11.drv-mouse-coorrds, user32-rawinput-mouse -# | -# | Modified files: -# | * dlls/hidclass.sys/device.c, dlls/hidclass.sys/hid.h, dlls/hidclass.sys/pnp.c, dlls/user32/message.c, -# | dlls/user32/rawinput.c, dlls/user32/user_private.h, server/protocol.def, server/queue.c, server/trace.c -# | -if test "$enable_user32_rawinput_hid" -eq 1; then - patch_apply user32-rawinput-hid/0001-server-Add-process-argument-to-find_rawinput_device.patch - patch_apply user32-rawinput-hid/0002-server-Allow-extra-data-for-hardware_msg_data-messag.patch - patch_apply user32-rawinput-hid/0003-server-Make-it-possible-to-queue-rawinput-message-on.patch - patch_apply user32-rawinput-hid/0004-server-Add-HID-input-message-type-to-send_hardware_m.patch - patch_apply user32-rawinput-hid/0005-hidclass.sys-Send-input-message-to-server-when-HID-r.patch -fi - -# Patchset user32-rawinput-mouse-experimental -# | -# | This patchset has the following (direct or indirect) dependencies: -# | * winex11.drv-mouse-coorrds, user32-rawinput-mouse -# | -# | This patchset fixes the following Wine bugs: -# | * [#45882] - Raw Input should use untransformed mouse values (affects Overwatch, several Source games). -# | -# | Modified files: -# | * dlls/user32/rawinput.c, dlls/winex11.drv/mouse.c, dlls/winex11.drv/x11drv.h, dlls/winex11.drv/x11drv_main.c, -# | server/queue.c -# | -if test "$enable_user32_rawinput_mouse_experimental" -eq 1; then - patch_apply user32-rawinput-mouse-experimental/0001-winex11.drv-Add-support-for-absolute-RawMotion-event.patch - patch_apply user32-rawinput-mouse-experimental/0002-winex11.drv-Send-relative-RawMotion-events-unprocess.patch - patch_apply user32-rawinput-mouse-experimental/0003-winex11.drv-Accumulate-mouse-movement-to-avoid-round.patch -fi - # Patchset user32-recursive-activation # | # | This patchset fixes the following Wine bugs: diff --git a/patches/riched20-IText_Interface/0003-riched20-Stub-for-ITextPara-interface-and-implement-.patch b/patches/riched20-IText_Interface/0003-riched20-Stub-for-ITextPara-interface-and-implement-.patch index 33c9af26..3471ce31 100644 --- a/patches/riched20-IText_Interface/0003-riched20-Stub-for-ITextPara-interface-and-implement-.patch +++ b/patches/riched20-IText_Interface/0003-riched20-Stub-for-ITextPara-interface-and-implement-.patch @@ -1,4 +1,4 @@ -From bd691edcc2cedd99ca55b1628980c46b93ddf90d Mon Sep 17 00:00:00 2001 +From 565f80adaf7cc5c83f4661bbcf7d89bef679a29f Mon Sep 17 00:00:00 2001 From: Jactry Zeng Date: Sun, 10 Aug 2014 22:17:57 +0800 Subject: [PATCH] riched20: Stub for ITextPara interface and implement @@ -10,14 +10,14 @@ Subject: [PATCH] riched20: Stub for ITextPara interface and implement 2 files changed, 472 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c -index c1119200153..724113404b4 100644 +index 72840a4cafa..1588009432f 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c -@@ -3422,6 +3422,16 @@ static ULONG WINAPI TextPara_Release(ITextPara *iface) +@@ -3551,6 +3551,16 @@ static ULONG WINAPI TextPara_Release(ITextPara *iface) return ref; } -+static IRichEditOleImpl *para_get_reole(ITextParaImpl *This) ++static struct text_services *para_get_reole(ITextParaImpl *This) +{ + if (This->range) + { @@ -30,7 +30,7 @@ index c1119200153..724113404b4 100644 static HRESULT WINAPI TextPara_GetTypeInfoCount(ITextPara *iface, UINT *pctinfo) { ITextParaImpl *This = impl_from_ITextPara(iface); -@@ -3489,6 +3499,10 @@ static HRESULT WINAPI TextPara_GetDuplicate(ITextPara *iface, ITextPara **ret) +@@ -3618,6 +3628,10 @@ static HRESULT WINAPI TextPara_GetDuplicate(ITextPara *iface, ITextPara **ret) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, ret); @@ -41,7 +41,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3496,6 +3510,10 @@ static HRESULT WINAPI TextPara_SetDuplicate(ITextPara *iface, ITextPara *para) +@@ -3625,6 +3639,10 @@ static HRESULT WINAPI TextPara_SetDuplicate(ITextPara *iface, ITextPara *para) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, para); @@ -52,7 +52,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3503,6 +3521,10 @@ static HRESULT WINAPI TextPara_CanChange(ITextPara *iface, LONG *ret) +@@ -3632,6 +3650,10 @@ static HRESULT WINAPI TextPara_CanChange(ITextPara *iface, LONG *ret) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, ret); @@ -63,7 +63,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3510,6 +3532,10 @@ static HRESULT WINAPI TextPara_IsEqual(ITextPara *iface, ITextPara *para, LONG * +@@ -3639,6 +3661,10 @@ static HRESULT WINAPI TextPara_IsEqual(ITextPara *iface, ITextPara *para, LONG * { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p %p)\n", This, para, ret); @@ -74,7 +74,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3517,6 +3543,10 @@ static HRESULT WINAPI TextPara_Reset(ITextPara *iface, LONG value) +@@ -3646,6 +3672,10 @@ static HRESULT WINAPI TextPara_Reset(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); @@ -85,7 +85,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3524,6 +3554,10 @@ static HRESULT WINAPI TextPara_GetStyle(ITextPara *iface, LONG *value) +@@ -3653,6 +3683,10 @@ static HRESULT WINAPI TextPara_GetStyle(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -96,7 +96,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3531,6 +3565,10 @@ static HRESULT WINAPI TextPara_SetStyle(ITextPara *iface, LONG value) +@@ -3660,6 +3694,10 @@ static HRESULT WINAPI TextPara_SetStyle(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); @@ -107,7 +107,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3538,6 +3576,10 @@ static HRESULT WINAPI TextPara_GetAlignment(ITextPara *iface, LONG *value) +@@ -3667,6 +3705,10 @@ static HRESULT WINAPI TextPara_GetAlignment(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -118,7 +118,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3545,6 +3587,10 @@ static HRESULT WINAPI TextPara_SetAlignment(ITextPara *iface, LONG value) +@@ -3674,6 +3716,10 @@ static HRESULT WINAPI TextPara_SetAlignment(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); @@ -129,7 +129,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3552,6 +3598,10 @@ static HRESULT WINAPI TextPara_GetHyphenation(ITextPara *iface, LONG *value) +@@ -3681,6 +3727,10 @@ static HRESULT WINAPI TextPara_GetHyphenation(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -140,7 +140,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3559,6 +3609,10 @@ static HRESULT WINAPI TextPara_SetHyphenation(ITextPara *iface, LONG value) +@@ -3688,6 +3738,10 @@ static HRESULT WINAPI TextPara_SetHyphenation(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); @@ -151,7 +151,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3566,6 +3620,10 @@ static HRESULT WINAPI TextPara_GetFirstLineIndent(ITextPara *iface, FLOAT *value +@@ -3695,6 +3749,10 @@ static HRESULT WINAPI TextPara_GetFirstLineIndent(ITextPara *iface, FLOAT *value { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -162,7 +162,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3573,6 +3631,10 @@ static HRESULT WINAPI TextPara_GetKeepTogether(ITextPara *iface, LONG *value) +@@ -3702,6 +3760,10 @@ static HRESULT WINAPI TextPara_GetKeepTogether(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -173,7 +173,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3580,6 +3642,10 @@ static HRESULT WINAPI TextPara_SetKeepTogether(ITextPara *iface, LONG value) +@@ -3709,6 +3771,10 @@ static HRESULT WINAPI TextPara_SetKeepTogether(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); @@ -184,7 +184,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3587,6 +3653,10 @@ static HRESULT WINAPI TextPara_GetKeepWithNext(ITextPara *iface, LONG *value) +@@ -3716,6 +3782,10 @@ static HRESULT WINAPI TextPara_GetKeepWithNext(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -195,7 +195,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3594,6 +3664,10 @@ static HRESULT WINAPI TextPara_SetKeepWithNext(ITextPara *iface, LONG value) +@@ -3723,6 +3793,10 @@ static HRESULT WINAPI TextPara_SetKeepWithNext(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); @@ -206,7 +206,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3601,6 +3675,10 @@ static HRESULT WINAPI TextPara_GetLeftIndent(ITextPara *iface, FLOAT *value) +@@ -3730,6 +3804,10 @@ static HRESULT WINAPI TextPara_GetLeftIndent(ITextPara *iface, FLOAT *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -217,7 +217,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3608,6 +3686,10 @@ static HRESULT WINAPI TextPara_GetLineSpacing(ITextPara *iface, FLOAT *value) +@@ -3737,6 +3815,10 @@ static HRESULT WINAPI TextPara_GetLineSpacing(ITextPara *iface, FLOAT *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -228,7 +228,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3615,6 +3697,10 @@ static HRESULT WINAPI TextPara_GetLineSpacingRule(ITextPara *iface, LONG *value) +@@ -3744,6 +3826,10 @@ static HRESULT WINAPI TextPara_GetLineSpacingRule(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -239,7 +239,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3622,6 +3708,10 @@ static HRESULT WINAPI TextPara_GetListAlignment(ITextPara *iface, LONG *value) +@@ -3751,6 +3837,10 @@ static HRESULT WINAPI TextPara_GetListAlignment(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -250,7 +250,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3629,6 +3719,10 @@ static HRESULT WINAPI TextPara_SetListAlignment(ITextPara *iface, LONG value) +@@ -3758,6 +3848,10 @@ static HRESULT WINAPI TextPara_SetListAlignment(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); @@ -261,7 +261,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3636,6 +3730,10 @@ static HRESULT WINAPI TextPara_GetListLevelIndex(ITextPara *iface, LONG *value) +@@ -3765,6 +3859,10 @@ static HRESULT WINAPI TextPara_GetListLevelIndex(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -272,7 +272,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3643,6 +3741,10 @@ static HRESULT WINAPI TextPara_SetListLevelIndex(ITextPara *iface, LONG value) +@@ -3772,6 +3870,10 @@ static HRESULT WINAPI TextPara_SetListLevelIndex(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); @@ -283,7 +283,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3650,6 +3752,10 @@ static HRESULT WINAPI TextPara_GetListStart(ITextPara *iface, LONG *value) +@@ -3779,6 +3881,10 @@ static HRESULT WINAPI TextPara_GetListStart(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -294,7 +294,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3657,6 +3763,10 @@ static HRESULT WINAPI TextPara_SetListStart(ITextPara *iface, LONG value) +@@ -3786,6 +3892,10 @@ static HRESULT WINAPI TextPara_SetListStart(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); @@ -305,7 +305,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3664,6 +3774,10 @@ static HRESULT WINAPI TextPara_GetListTab(ITextPara *iface, FLOAT *value) +@@ -3793,6 +3903,10 @@ static HRESULT WINAPI TextPara_GetListTab(ITextPara *iface, FLOAT *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -316,7 +316,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3671,6 +3785,10 @@ static HRESULT WINAPI TextPara_SetListTab(ITextPara *iface, FLOAT value) +@@ -3800,6 +3914,10 @@ static HRESULT WINAPI TextPara_SetListTab(ITextPara *iface, FLOAT value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%.2f)\n", This, value); @@ -327,7 +327,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3678,6 +3796,10 @@ static HRESULT WINAPI TextPara_GetListType(ITextPara *iface, LONG *value) +@@ -3807,6 +3925,10 @@ static HRESULT WINAPI TextPara_GetListType(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -338,7 +338,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3685,6 +3807,10 @@ static HRESULT WINAPI TextPara_SetListType(ITextPara *iface, LONG value) +@@ -3814,6 +3936,10 @@ static HRESULT WINAPI TextPara_SetListType(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); @@ -349,7 +349,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3692,6 +3818,10 @@ static HRESULT WINAPI TextPara_GetNoLineNumber(ITextPara *iface, LONG *value) +@@ -3821,6 +3947,10 @@ static HRESULT WINAPI TextPara_GetNoLineNumber(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -360,7 +360,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3699,6 +3829,10 @@ static HRESULT WINAPI TextPara_SetNoLineNumber(ITextPara *iface, LONG value) +@@ -3828,6 +3958,10 @@ static HRESULT WINAPI TextPara_SetNoLineNumber(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); @@ -371,7 +371,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3706,6 +3840,10 @@ static HRESULT WINAPI TextPara_GetPageBreakBefore(ITextPara *iface, LONG *value) +@@ -3835,6 +3969,10 @@ static HRESULT WINAPI TextPara_GetPageBreakBefore(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -382,7 +382,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3713,6 +3851,10 @@ static HRESULT WINAPI TextPara_SetPageBreakBefore(ITextPara *iface, LONG value) +@@ -3842,6 +3980,10 @@ static HRESULT WINAPI TextPara_SetPageBreakBefore(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); @@ -393,7 +393,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3720,6 +3862,10 @@ static HRESULT WINAPI TextPara_GetRightIndent(ITextPara *iface, FLOAT *value) +@@ -3849,6 +3991,10 @@ static HRESULT WINAPI TextPara_GetRightIndent(ITextPara *iface, FLOAT *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -404,7 +404,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3727,6 +3873,10 @@ static HRESULT WINAPI TextPara_SetRightIndent(ITextPara *iface, FLOAT value) +@@ -3856,6 +4002,10 @@ static HRESULT WINAPI TextPara_SetRightIndent(ITextPara *iface, FLOAT value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%.2f)\n", This, value); @@ -415,7 +415,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3734,6 +3884,10 @@ static HRESULT WINAPI TextPara_SetIndents(ITextPara *iface, FLOAT StartIndent, F +@@ -3863,6 +4013,10 @@ static HRESULT WINAPI TextPara_SetIndents(ITextPara *iface, FLOAT StartIndent, F { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%.2f %.2f %.2f)\n", This, StartIndent, LeftIndent, RightIndent); @@ -426,7 +426,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3741,6 +3895,10 @@ static HRESULT WINAPI TextPara_SetLineSpacing(ITextPara *iface, LONG LineSpacing +@@ -3870,6 +4024,10 @@ static HRESULT WINAPI TextPara_SetLineSpacing(ITextPara *iface, LONG LineSpacing { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d %.2f)\n", This, LineSpacingRule, LineSpacing); @@ -437,7 +437,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3748,6 +3906,10 @@ static HRESULT WINAPI TextPara_GetSpaceAfter(ITextPara *iface, FLOAT *value) +@@ -3877,6 +4035,10 @@ static HRESULT WINAPI TextPara_GetSpaceAfter(ITextPara *iface, FLOAT *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -448,7 +448,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3755,6 +3917,10 @@ static HRESULT WINAPI TextPara_SetSpaceAfter(ITextPara *iface, FLOAT value) +@@ -3884,6 +4046,10 @@ static HRESULT WINAPI TextPara_SetSpaceAfter(ITextPara *iface, FLOAT value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%.2f)\n", This, value); @@ -459,7 +459,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3762,6 +3928,10 @@ static HRESULT WINAPI TextPara_GetSpaceBefore(ITextPara *iface, FLOAT *value) +@@ -3891,6 +4057,10 @@ static HRESULT WINAPI TextPara_GetSpaceBefore(ITextPara *iface, FLOAT *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -470,7 +470,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3769,6 +3939,10 @@ static HRESULT WINAPI TextPara_SetSpaceBefore(ITextPara *iface, FLOAT value) +@@ -3898,6 +4068,10 @@ static HRESULT WINAPI TextPara_SetSpaceBefore(ITextPara *iface, FLOAT value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%.2f)\n", This, value); @@ -481,7 +481,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3776,6 +3950,10 @@ static HRESULT WINAPI TextPara_GetWidowControl(ITextPara *iface, LONG *value) +@@ -3905,6 +4079,10 @@ static HRESULT WINAPI TextPara_GetWidowControl(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -492,7 +492,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3783,6 +3961,10 @@ static HRESULT WINAPI TextPara_SetWidowControl(ITextPara *iface, LONG value) +@@ -3912,6 +4090,10 @@ static HRESULT WINAPI TextPara_SetWidowControl(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d)\n", This, value); @@ -503,7 +503,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3790,6 +3972,10 @@ static HRESULT WINAPI TextPara_GetTabCount(ITextPara *iface, LONG *value) +@@ -3919,6 +4101,10 @@ static HRESULT WINAPI TextPara_GetTabCount(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -514,7 +514,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3797,6 +3983,10 @@ static HRESULT WINAPI TextPara_AddTab(ITextPara *iface, FLOAT tbPos, LONG tbAlig +@@ -3926,6 +4112,10 @@ static HRESULT WINAPI TextPara_AddTab(ITextPara *iface, FLOAT tbPos, LONG tbAlig { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%.2f %d %d)\n", This, tbPos, tbAlign, tbLeader); @@ -525,7 +525,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3804,6 +3994,10 @@ static HRESULT WINAPI TextPara_ClearAllTabs(ITextPara *iface) +@@ -3933,6 +4123,10 @@ static HRESULT WINAPI TextPara_ClearAllTabs(ITextPara *iface) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)\n", This); @@ -536,7 +536,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3811,6 +4005,10 @@ static HRESULT WINAPI TextPara_DeleteTab(ITextPara *iface, FLOAT pos) +@@ -3940,6 +4134,10 @@ static HRESULT WINAPI TextPara_DeleteTab(ITextPara *iface, FLOAT pos) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%.2f)\n", This, pos); @@ -547,7 +547,7 @@ index c1119200153..724113404b4 100644 return E_NOTIMPL; } -@@ -3818,6 +4016,10 @@ static HRESULT WINAPI TextPara_GetTab(ITextPara *iface, LONG iTab, FLOAT *ptbPos +@@ -3947,6 +4145,10 @@ static HRESULT WINAPI TextPara_GetTab(ITextPara *iface, LONG iTab, FLOAT *ptbPos { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%d %p %p %p)\n", This, iTab, ptbPos, ptbAlign, ptbLeader); @@ -559,10 +559,10 @@ index c1119200153..724113404b4 100644 } diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c -index 70646202f04..6dadf622732 100644 +index e6329c5b1b6..20910c0617d 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c -@@ -3808,6 +3808,274 @@ static void test_MoveEnd(void) +@@ -4100,6 +4100,274 @@ static void test_clipboard(void) ITextRange_Release(range); } @@ -837,7 +837,7 @@ index 70646202f04..6dadf622732 100644 START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in -@@ -3828,6 +4096,8 @@ START_TEST(richole) +@@ -4120,6 +4388,8 @@ START_TEST(richole) test_ITextRange_SetRange(); test_ITextRange_GetDuplicate(); test_ITextRange_Collapse(); @@ -847,5 +847,5 @@ index 70646202f04..6dadf622732 100644 test_IOleWindow_GetWindow(); test_IOleInPlaceSite_GetWindow(); -- -2.17.1 +2.30.2 diff --git a/patches/riched20-IText_Interface/0010-riched20-Silence-repeated-FIXMEs-triggered-by-Adobe-.patch b/patches/riched20-IText_Interface/0010-riched20-Silence-repeated-FIXMEs-triggered-by-Adobe-.patch index 963fdf82..21c67532 100644 --- a/patches/riched20-IText_Interface/0010-riched20-Silence-repeated-FIXMEs-triggered-by-Adobe-.patch +++ b/patches/riched20-IText_Interface/0010-riched20-Silence-repeated-FIXMEs-triggered-by-Adobe-.patch @@ -1,33 +1,18 @@ -From fc7edfef4776f6ce7577a0597f78ad4971fe776d Mon Sep 17 00:00:00 2001 +From c4c4f61276c87b7e88b232a6515c755c6b5291d0 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 1 Nov 2014 22:51:34 +0100 Subject: [PATCH] riched20: Silence repeated FIXMEs triggered by Adobe Reader. Adobe Reader calls these functions very often while scrolling through a document. --- - dlls/riched20/richole.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) + dlls/riched20/richole.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c -index 724113404b4..5a620c537d5 100644 +index 932ed9ea383..de039b513bf 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c -@@ -951,6 +951,14 @@ static HRESULT WINAPI IRichEditOleImpl_inner_fnQueryInterface(IUnknown *iface, R - IUnknown_AddRef((IUnknown *)*ppvObj); - return S_OK; - } -+ -+ if (IsEqualGUID(riid, &IID_ITextServices)) -+ { -+ static int once; -+ if (!once++) FIXME("%p: unhandled interface IID_ITextServices\n", This); -+ return E_NOINTERFACE; -+ } -+ - FIXME("%p: unhandled interface %s\n", This, debugstr_guid(riid)); - - return E_NOINTERFACE; -@@ -3575,7 +3583,9 @@ static HRESULT WINAPI TextPara_SetStyle(ITextPara *iface, LONG value) +@@ -3704,7 +3704,9 @@ static HRESULT WINAPI TextPara_SetStyle(ITextPara *iface, LONG value) static HRESULT WINAPI TextPara_GetAlignment(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); @@ -39,5 +24,5 @@ index 724113404b4..5a620c537d5 100644 if (!para_get_reole(This)) return CO_E_RELEASED; -- -2.17.1 +2.30.2 diff --git a/patches/user32-rawinput-hid/definition b/patches/user32-rawinput-hid/definition index efc2784e..ead6aab3 100644 --- a/patches/user32-rawinput-hid/definition +++ b/patches/user32-rawinput-hid/definition @@ -1 +1,2 @@ -Depends: user32-rawinput-mouse +# Depends: user32-rawinput-mouse +Disabled: true diff --git a/patches/user32-rawinput-mouse-experimental/definition b/patches/user32-rawinput-mouse-experimental/definition index fe2d8d5e..c3a3b748 100644 --- a/patches/user32-rawinput-mouse-experimental/definition +++ b/patches/user32-rawinput-mouse-experimental/definition @@ -1,2 +1,3 @@ Fixes: [45882] - Raw Input should use untransformed mouse values (affects Overwatch, several Source games). -Depends: user32-rawinput-mouse +# Depends: user32-rawinput-mouse +Disabled: true diff --git a/patches/user32-rawinput-mouse/definition b/patches/user32-rawinput-mouse/definition index 7a0df938..3be1b003 100644 --- a/patches/user32-rawinput-mouse/definition +++ b/patches/user32-rawinput-mouse/definition @@ -1,3 +1,5 @@ Fixes: [42631] Mouse drift, jump or don't react to small slow movements in Unity-engine games and Fallout 4 (partly fixed in Unity games, have walkaround in Fallout4 ) Fixes: [42675] Overwatch: Phantom mouse input / view pulled up to ceiling -Depends: winex11.drv-mouse-coorrds +# Depends: winex11.drv-mouse-coorrds +# Dependency is in the process of upstreaming. +Disabled: true diff --git a/patches/winedevice-Default_Drivers/0004-programs-winedevice-Load-some-common-drivers-and-fix.patch b/patches/winedevice-Default_Drivers/0004-programs-winedevice-Load-some-common-drivers-and-fix.patch index 28d65b1b..408c9c20 100644 --- a/patches/winedevice-Default_Drivers/0004-programs-winedevice-Load-some-common-drivers-and-fix.patch +++ b/patches/winedevice-Default_Drivers/0004-programs-winedevice-Load-some-common-drivers-and-fix.patch @@ -1,4 +1,4 @@ -From e4dea5ee77c25ec502104dca8c503d5016e1a1d4 Mon Sep 17 00:00:00 2001 +From be83f47da548774293bf47411d6e128a1aa5d817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 8 Jun 2017 23:50:03 +0200 Subject: [PATCH] programs/winedevice: Load some common drivers and fix ldr @@ -99,17 +99,17 @@ index d9d712418ee..808f304b258 100644 /* Allow unloading of the driver */ driver->DriverUnload = driver_Unload; diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c -index 3acc5e8a799..f16f6204efe 100644 +index 3acc5e8a799..adaabedf68f 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -115,8 +115,16 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) { -+ static const WCHAR ntoskrnlW[] = {'n','t','o','s','k','r','n','l','.','e','x','e',0}; -+ static const WCHAR win32kW[] = {'w','i','n','3','2','k','.','s','y','s',0}; -+ static const WCHAR dxgkrnlW[] = {'d','x','g','k','r','n','l','.','s','y','s',0}; -+ static const WCHAR dxgmms1W[] = {'d','x','g','m','m','s','1','.','s','y','s',0}; ++ static const WCHAR ntoskrnlW[] = L"C:\\windows\\system32\\ntoskrnl.exe"; ++ static const WCHAR win32kW[] = L"C:\\windows\\system32\\win32k.sys"; ++ static const WCHAR dxgkrnlW[] = L"C:\\windows\\system32\\drivers\\dxgkrnl.sys"; ++ static const WCHAR dxgmms1W[] = L"C:\\windows\\system32\\drivers\\dxgmms1.sys"; + static const WCHAR *stubs[] = { win32kW, dxgkrnlW, dxgmms1W }; WCHAR driver_dir[MAX_PATH]; const WCHAR *service_group = (argc >= 2) ? argv[1] : argv[0]; diff --git a/patches/winex11.drv-mouse-coorrds/definition b/patches/winex11.drv-mouse-coorrds/definition index e215119b..1bba7e43 100644 --- a/patches/winex11.drv-mouse-coorrds/definition +++ b/patches/winex11.drv-mouse-coorrds/definition @@ -1 +1,3 @@ Fixes: [46309] winex11.drv: Use root-relative coordinates for events, if possible. +# In the process of upstreaming... +Disabled: true diff --git a/staging/upstream-commit b/staging/upstream-commit index 8b18cc62..e2bc5b17 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -7c62e6b169f18f4a5d5809490f8aebdb5a9375eb +29d9659095fd76e303f204050ab4c85d0a0486e4