wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against c55e8822ae3bbb8b1d3ab9b363214e4ad2f478d9

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2020-01-24 09:53:05 +11:00
parent 00f288b12e
commit 050435f28e
9 changed files with 52 additions and 665 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
patches/directmanipulation-new-dll/0001-include-Add-directmanipulation.idl.patch
View File

@ -1,136 +0,0 @@
From c61d77e4a22c35890ac4cc789a879d6a70a942e2 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 17 Jul 2019 08:17:16 +1000
Subject: [PATCH 1/6] include: Add directmanipulation.idl
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
---
include/Makefile.in | 1 +
include/directmanipulation.idl | 103 +++++++++++++++++++++++++++++++++
2 files changed, 104 insertions(+)
create mode 100644 include/directmanipulation.idl
diff --git a/include/Makefile.in b/include/Makefile.in
index 69135879a9..a7fd4dc929 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -199,6 +199,7 @@ SOURCES = \
dimm.idl \
dinput.h \
dinputd.h \
+ directmanipulation.idl \
dispdib.h \
dispex.idl \
dlgs.h \
diff --git a/include/directmanipulation.idl b/include/directmanipulation.idl
new file mode 100644
index 0000000000..9dc2366cc3
--- /dev/null
+++ b/include/directmanipulation.idl
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2019 Alistair Leslie-Hughes
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+import "oaidl.idl";
+import "ocidl.idl";
+
+cpp_quote("#if 0")
+typedef void* HWND;
+cpp_quote("#endif")
+
+typedef enum DIRECTMANIPULATION_HITTEST_TYPE
+{
+ DIRECTMANIPULATION_HITTEST_TYPE_ASYNCHRONOUS = 0x00000000,
+ DIRECTMANIPULATION_HITTEST_TYPE_SYNCHRONOUS = 0x00000001,
+ DIRECTMANIPULATION_HITTEST_TYPE_AUTO_SYNCHRONOUS = 0x00000002
+} DIRECTMANIPULATION_HITTEST_TYPE;
+
+[
+ local,
+ object,
+ uuid(fb759dba-6f4c-4c01-874e-19c8a05907f9),
+ pointer_default(unique)
+]
+interface IDirectManipulationFrameInfoProvider : IUnknown
+{
+ HRESULT GetNextFrameInfo([out] ULONGLONG *time, [out] ULONGLONG *process, [out] ULONGLONG *composition);
+}
+
+[
+ local,
+ object,
+ uuid(fbf5d3b4-70c7-4163-9322-5a6f660d6fbc),
+ pointer_default(unique)
+]
+interface IDirectManipulationManager : IUnknown
+{
+ HRESULT Activate([in] HWND window);
+
+ HRESULT Deactivate([in] HWND window);
+
+ HRESULT RegisterHitTestTarget([in] HWND window, [in] HWND hittest, [in] DIRECTMANIPULATION_HITTEST_TYPE type);
+
+ HRESULT ProcessInput([in] const MSG *msg, [out, retval] BOOL *handled);
+
+ HRESULT GetUpdateManager([in] REFIID riid, [out, iid_is(riid), retval,] void **obj);
+
+ HRESULT CreateViewport([in] IDirectManipulationFrameInfoProvider *frame, [in] HWND window,
+ [in] REFIID riid, [out, iid_is(riid), retval] void **obj);
+
+ HRESULT CreateContent([in] IDirectManipulationFrameInfoProvider *frame, [in] REFCLSID clsid,
+ [in] REFIID riid, [out, iid_is(riid), retval] void **obj);
+}
+
+[
+ local,
+ object,
+ uuid(fa1005e9-3d16-484c-bfc9-62b61e56ec4e),
+ pointer_default(unique)
+]
+interface IDirectManipulationManager2 : IDirectManipulationManager
+{
+ HRESULT CreateBehavior([in] REFCLSID clsid, [in] REFIID riid, [out, iid_is(riid), retval] void **obj);
+}
+
+[
+ uuid(9fbedf98-f6d8-4e3b-b488-fa66dbf5e9f3),
+ version(1.0)
+]
+library DirectManipulation
+{
+ [
+ uuid(54e211b6-3650-4f75-8334-fa359598e1c5)
+ ]
+ coclass DirectManipulationManager
+ {
+ interface IDirectManipulationManager2;
+ [default] interface IDirectManipulationManager;
+ }
+
+ [
+ uuid(99793286-77cc-4b57-96db-3b354f6f9fb5)
+ ]
+ coclass DirectManipulationSharedManager
+ {
+ interface IDirectManipulationManager2;
+ [default] interface IDirectManipulationManager;
+ }
+}
--
2.17.1

108
patches/directmanipulation-new-dll/0005-include-Add-DCompManipulationCompositor-coclass-and-.patch
View File

@ -1,108 +0,0 @@
From 6ee51b2ae31c53d05fef808c0aa1cfd47534e6af Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Fri, 19 Jul 2019 08:46:01 +1000
Subject: [PATCH 5/6] include: Add DCompManipulationCompositor coclass and
supporting interfaces.
---
include/directmanipulation.idl | 79 ++++++++++++++++++++++++++++++++++
1 file changed, 79 insertions(+)
diff --git a/include/directmanipulation.idl b/include/directmanipulation.idl
index 9dc2366cc3..c2fd831c6c 100644
--- a/include/directmanipulation.idl
+++ b/include/directmanipulation.idl
@@ -66,6 +66,76 @@ interface IDirectManipulationManager : IUnknown
[in] REFIID riid, [out, iid_is(riid), retval] void **obj);
}
+[
+ local,
+ object,
+ uuid(b89962cb-3d89-442b-bb58-5098fa0f9f16),
+ pointer_default(unique)
+]
+interface IDirectManipulationContent : IUnknown
+{
+ HRESULT GetContentRect([out] RECT *size);
+
+ HRESULT SetContentRect([in] const RECT *size);
+
+ HRESULT GetViewport([in] REFIID riid, [out, iid_is(riid)] void **object);
+
+ HRESULT GetTag([in] REFIID riid, [out, iid_is(riid)] void **object, [out] UINT32 *id);
+
+ HRESULT SetTag([in, unique] IUnknown *object, [in] UINT32 id);
+
+ HRESULT GetOutputTransform([out] float *matrix, [in] DWORD count);
+
+ HRESULT GetContentTransform([out] float *matrix, [in] DWORD count);
+
+ HRESULT SyncContentTransform([in] const float *matrix, [in] DWORD count);
+}
+
+[
+ local,
+ object,
+ uuid(790b6337-64f8-4ff5-a269-b32bc2af27a7),
+ pointer_default(unique)
+]
+interface IDirectManipulationUpdateHandler : IUnknown
+{
+ HRESULT Update();
+}
+
+[
+ local,
+ object,
+ uuid(b0ae62fd-be34-46e7-9caa-d361facbb9cc),
+ pointer_default(unique)
+]
+interface IDirectManipulationUpdateManager : IUnknown
+{
+ HRESULT RegisterWaitHandleCallback([in] HANDLE handle, [in] IDirectManipulationUpdateHandler *handler,
+ [out] DWORD *cookie);
+
+ HRESULT UnregisterWaitHandleCallback([in] DWORD cookie);
+
+ HRESULT Update([in] IDirectManipulationFrameInfoProvider *provider);
+}
+
+[
+ local,
+ object,
+ uuid(537a0825-0387-4efa-b62f-71eb1f085a7e),
+ pointer_default(unique)
+]
+interface IDirectManipulationCompositor : IUnknown
+{
+ HRESULT AddContent([in] IDirectManipulationContent *content, [in] IUnknown *device,
+ [in] IUnknown *parent, [in] IUnknown *child);
+
+ HRESULT RemoveContent([in] IDirectManipulationContent *content);
+
+ HRESULT SetUpdateManager([in] IDirectManipulationUpdateManager *manager);
+
+ HRESULT Flush();
+}
+
[
local,
object,
@@ -100,4 +170,13 @@ library DirectManipulation
interface IDirectManipulationManager2;
[default] interface IDirectManipulationManager;
}
+
+ [
+ uuid(79dea627-a08a-43ac-8ef5-6900b9299126)
+ ]
+ coclass DCompManipulationCompositor
+ {
+ [default] interface IDirectManipulationCompositor;
+ interface IDirectManipulationFrameInfoProvider;
+ }
}
--
2.17.1

215
patches/directmanipulation-new-dll/0010-include-Add-IDirectManipulationViewport2-interface.patch
View File

@ -1,215 +0,0 @@
From d71134e27429531e7ebf25f4b5db8e9047ecbaad Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 24 Jul 2019 10:05:35 +1000
Subject: [PATCH] include: Add IDirectManipulationViewport2 interface
---
include/directmanipulation.idl | 173 +++++++++++++++++++++++++++++++++
1 file changed, 173 insertions(+)
diff --git a/include/directmanipulation.idl b/include/directmanipulation.idl
index c2fd831c6c..443b31a0ce 100644
--- a/include/directmanipulation.idl
+++ b/include/directmanipulation.idl
@@ -23,6 +23,8 @@ cpp_quote("#if 0")
typedef void* HWND;
cpp_quote("#endif")
+interface IDirectManipulationViewportEventHandler;
+
typedef enum DIRECTMANIPULATION_HITTEST_TYPE
{
DIRECTMANIPULATION_HITTEST_TYPE_ASYNCHRONOUS = 0x00000000,
@@ -30,6 +32,68 @@ typedef enum DIRECTMANIPULATION_HITTEST_TYPE
DIRECTMANIPULATION_HITTEST_TYPE_AUTO_SYNCHRONOUS = 0x00000002
} DIRECTMANIPULATION_HITTEST_TYPE;
+typedef enum DIRECTMANIPULATION_STATUS
+{
+ DIRECTMANIPULATION_BUILDING = 0,
+ DIRECTMANIPULATION_ENABLED = 1,
+ DIRECTMANIPULATION_DISABLED = 2,
+ DIRECTMANIPULATION_RUNNING = 3,
+ DIRECTMANIPULATION_INERTIA = 4,
+ DIRECTMANIPULATION_READY = 5,
+ DIRECTMANIPULATION_SUSPENDED = 6
+} DIRECTMANIPULATION_STATUS;
+
+typedef enum DIRECTMANIPULATION_VIEWPORT_OPTIONS
+{
+ DIRECTMANIPULATION_VIEWPORT_OPTIONS_DEFAULT = 0x0000,
+ DIRECTMANIPULATION_VIEWPORT_OPTIONS_AUTODISABLE = 0x0001,
+ DIRECTMANIPULATION_VIEWPORT_OPTIONS_MANUALUPDATE = 0x0002,
+ DIRECTMANIPULATION_VIEWPORT_OPTIONS_INPUT = 0x0004,
+ DIRECTMANIPULATION_VIEWPORT_OPTIONS_EXPLICITHITTEST = 0x0008,
+ DIRECTMANIPULATION_VIEWPORT_OPTIONS_DISABLEPIXELSNAPPING = 0x0010,
+} DIRECTMANIPULATION_VIEWPORT_OPTIONS;
+
+typedef enum DIRECTMANIPULATION_CONFIGURATION
+{
+ DIRECTMANIPULATION_CONFIGURATION_NONE = 0x00000000,
+ DIRECTMANIPULATION_CONFIGURATION_INTERACTION = 0x00000001,
+ DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_X = 0x00000002,
+ DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_Y = 0x00000004,
+ DIRECTMANIPULATION_CONFIGURATION_SCALING = 0x00000010,
+ DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_INERTIA = 0x00000020,
+ DIRECTMANIPULATION_CONFIGURATION_SCALING_INERTIA = 0x00000080,
+ DIRECTMANIPULATION_CONFIGURATION_RAILS_X = 0x00000100,
+ DIRECTMANIPULATION_CONFIGURATION_RAILS_Y = 0x00000200,
+} DIRECTMANIPULATION_CONFIGURATION;
+
+typedef enum DIRECTMANIPULATION_GESTURE_CONFIGURATION
+{
+ DIRECTMANIPULATION_GESTURE_NONE = 0x00000000,
+ DIRECTMANIPULATION_GESTURE_DEFAULT = 0x00000000,
+ DIRECTMANIPULATION_GESTURE_CROSS_SLIDE_VERTICAL = 0x00000008,
+ DIRECTMANIPULATION_GESTURE_CROSS_SLIDE_HORIZONTAL = 0x00000010,
+ DIRECTMANIPULATION_GESTURE_PINCH_ZOOM = 0x00000020,
+} DIRECTMANIPULATION_GESTURE_CONFIGURATION;
+
+typedef enum DIRECTMANIPULATION_MOTION_TYPES
+{
+ DIRECTMANIPULATION_MOTION_NONE = 0x0000,
+ DIRECTMANIPULATION_MOTION_TRANSLATEX = 0x0001,
+ DIRECTMANIPULATION_MOTION_TRANSLATEY = 0x0002,
+ DIRECTMANIPULATION_MOTION_ZOOM = 0x0004,
+ DIRECTMANIPULATION_MOTION_CENTERX = 0x0010,
+ DIRECTMANIPULATION_MOTION_CENTERY = 0x0020,
+ DIRECTMANIPULATION_MOTION_ALL = DIRECTMANIPULATION_MOTION_TRANSLATEX | DIRECTMANIPULATION_MOTION_TRANSLATEY |
+ DIRECTMANIPULATION_MOTION_ZOOM | DIRECTMANIPULATION_MOTION_CENTERX |
+ DIRECTMANIPULATION_MOTION_CENTERY
+} DIRECTMANIPULATION_MOTION_TYPES;
+
+typedef enum DIRECTMANIPULATION_INPUT_MODE
+{
+ DIRECTMANIPULATION_INPUT_MODE_AUTOMATIC = 0,
+ DIRECTMANIPULATION_INPUT_MODE_MANUAL = 1
+} DIRECTMANIPULATION_INPUT_MODE;
+
[
local,
object,
@@ -136,6 +200,104 @@ interface IDirectManipulationCompositor : IUnknown
HRESULT Flush();
}
+[
+ local,
+ object,
+ uuid(28b85a3d-60a0-48bd-9ba1-5ce8d9ea3a6d),
+ pointer_default(unique)
+]
+interface IDirectManipulationViewport : IUnknown
+{
+ HRESULT Enable();
+
+ HRESULT Disable();
+
+ HRESULT SetContact([in] UINT32 id);
+
+ HRESULT ReleaseContact([in] UINT32 id);
+
+ HRESULT ReleaseAllContacts();
+
+ HRESULT GetStatus([out] DIRECTMANIPULATION_STATUS *status);
+
+ HRESULT GetTag([in] REFIID riid, [out, iid_is(riid)] void **object, [out] UINT32 *id);
+
+ HRESULT SetTag([in, unique] IUnknown *object, [in] UINT32 id);
+
+ HRESULT GetViewportRect([out, retval] RECT *viewport);
+
+ HRESULT SetViewportRect([in] const RECT *viewport);
+
+ HRESULT ZoomToRect([in] const float left, [in] const float top, [in] const float right,
+ [in] const float bottom, [in] BOOL animate);
+
+ HRESULT SetViewportTransform([in] const float *matrix, [in] DWORD count);
+
+ HRESULT SyncDisplayTransform([in] const float *matrix, [in] DWORD count);
+
+ HRESULT GetPrimaryContent([in] REFIID riid, [out, iid_is(riid)] void **object);
+
+ HRESULT AddContent([in, unique] IDirectManipulationContent *content);
+
+ HRESULT RemoveContent([in, unique] IDirectManipulationContent *content);
+
+ HRESULT SetViewportOptions([in] DIRECTMANIPULATION_VIEWPORT_OPTIONS options);
+
+ HRESULT AddConfiguration([in] DIRECTMANIPULATION_CONFIGURATION configuration);
+
+ HRESULT RemoveConfiguration([in] DIRECTMANIPULATION_CONFIGURATION configuration);
+
+ HRESULT ActivateConfiguration([in] DIRECTMANIPULATION_CONFIGURATION configuration);
+
+ HRESULT SetManualGesture([in] DIRECTMANIPULATION_GESTURE_CONFIGURATION configuration);
+
+ HRESULT SetChaining([in] DIRECTMANIPULATION_MOTION_TYPES enabledTypes);
+
+ HRESULT AddEventHandler([in] HWND window, [in] IDirectManipulationViewportEventHandler *eventHandler,
+ [out, retval] DWORD *cookie);
+
+ HRESULT RemoveEventHandler([in] DWORD cookie);
+
+ HRESULT SetInputMode([in] DIRECTMANIPULATION_INPUT_MODE mode);
+
+ HRESULT SetUpdateMode([in] DIRECTMANIPULATION_INPUT_MODE mode);
+
+ HRESULT Stop();
+
+ HRESULT Abandon();
+}
+
+[
+ local,
+ object,
+ uuid(923ccaac-61e1-4385-b726-017af189882a),
+ pointer_default(unique)
+]
+interface IDirectManipulationViewport2 : IDirectManipulationViewport
+{
+ HRESULT AddBehavior([in] IUnknown *behavior, [out, retval] DWORD *cookie);
+
+ HRESULT RemoveBehavior([in] DWORD cookie);
+
+ HRESULT RemoveAllBehaviors();
+}
+
+[
+ local,
+ object,
+ uuid(952121DA-D69F-45F9-B0F9-F23944321A6D),
+ pointer_default(unique)
+]
+interface IDirectManipulationViewportEventHandler : IUnknown
+{
+ HRESULT OnViewportStatusChanged([in] IDirectManipulationViewport *viewport, [in] DIRECTMANIPULATION_STATUS current,
+ [in] DIRECTMANIPULATION_STATUS previous);
+
+ HRESULT OnViewportUpdated([in] IDirectManipulationViewport *viewport);
+
+ HRESULT OnContentUpdated([in] IDirectManipulationViewport *viewport, [in] IDirectManipulationContent *content);
+}
+
[
local,
object,
@@ -179,4 +341,15 @@ library DirectManipulation
[default] interface IDirectManipulationCompositor;
interface IDirectManipulationFrameInfoProvider;
}
+
+ [
+ noncreatable,
+ hidden,
+ uuid(34e211b6-3650-4f75-8334-fa359598e1c5)
+ ]
+ coclass DirectManipulationViewport
+ {
+ interface IDirectManipulationViewport2;
+ [default] interface IDirectManipulationViewport;
+ }
}
--
2.17.1

91
patches/directmanipulation-new-dll/0014-include-Add-IDirectManipulationPrimaryContent-interf.patch
View File

@ -1,91 +0,0 @@
From 34c03e1857d977ef7ec913628a358092f749394b Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 31 Jul 2019 10:03:26 +1000
Subject: [PATCH 2/4] include: Add IDirectManipulationPrimaryContent interface
---
include/directmanipulation.idl | 61 ++++++++++++++++++++++++++++++++++
1 file changed, 61 insertions(+)
diff --git a/include/directmanipulation.idl b/include/directmanipulation.idl
index 443b31a0ce..a49f368d11 100644
--- a/include/directmanipulation.idl
+++ b/include/directmanipulation.idl
@@ -88,6 +88,39 @@ typedef enum DIRECTMANIPULATION_MOTION_TYPES
DIRECTMANIPULATION_MOTION_CENTERY
} DIRECTMANIPULATION_MOTION_TYPES;
+typedef enum DIRECTMANIPULATION_SNAPPOINT_TYPE
+{
+ DIRECTMANIPULATION_SNAPPOINT_MANDATORY = 0,
+ DIRECTMANIPULATION_SNAPPOINT_OPTIONAL = 1,
+ DIRECTMANIPULATION_SNAPPOINT_MANDATORY_SINGLE = 2,
+ DIRECTMANIPULATION_SNAPPOINT_OPTIONAL_SINGLE = 3
+} DIRECTMANIPULATION_SNAPPOINT_TYPE;
+
+typedef enum DIRECTMANIPULATION_SNAPPOINT_COORDINATE
+{
+ DIRECTMANIPULATION_COORDINATE_BOUNDARY = 0x00,
+ DIRECTMANIPULATION_COORDINATE_ORIGIN = 0x01,
+ DIRECTMANIPULATION_COORDINATE_MIRRORED = 0x10
+} DIRECTMANIPULATION_SNAPPOINT_COORDINATE;
+
+typedef enum DIRECTMANIPULATION_HORIZONTALALIGNMENT
+{
+ DIRECTMANIPULATION_HORIZONTALALIGNMENT_NONE = 0x00,
+ DIRECTMANIPULATION_HORIZONTALALIGNMENT_LEFT = 0x01,
+ DIRECTMANIPULATION_HORIZONTALALIGNMENT_CENTER = 0x02,
+ DIRECTMANIPULATION_HORIZONTALALIGNMENT_RIGHT = 0x04,
+ DIRECTMANIPULATION_HORIZONTALALIGNMENT_UNLOCKCENTER = 0x08
+} DIRECTMANIPULATION_HORIZONTALALIGNMENT;
+
+typedef enum DIRECTMANIPULATION_VERTICALALIGNMENT
+{
+ DIRECTMANIPULATION_VERTICALALIGNMENT_NONE = 0x00,
+ DIRECTMANIPULATION_VERTICALALIGNMENT_TOP = 0x01,
+ DIRECTMANIPULATION_VERTICALALIGNMENT_CENTER = 0x02,
+ DIRECTMANIPULATION_VERTICALALIGNMENT_BOTTOM = 0x04,
+ DIRECTMANIPULATION_VERTICALALIGNMENT_UNLOCKCENTER = 0x08
+} DIRECTMANIPULATION_VERTICALALIGNMENT;
+
typedef enum DIRECTMANIPULATION_INPUT_MODE
{
DIRECTMANIPULATION_INPUT_MODE_AUTOMATIC = 0,
@@ -309,6 +342,34 @@ interface IDirectManipulationManager2 : IDirectManipulationManager
HRESULT CreateBehavior([in] REFCLSID clsid, [in] REFIID riid, [out, iid_is(riid), retval] void **obj);
}
+[
+ local,
+ object,
+ uuid(c12851e4-1698-4625-b9b1-7ca3ec18630b),
+ pointer_default(unique)
+]
+interface IDirectManipulationPrimaryContent : IUnknown
+{
+ HRESULT SetSnapInterval([in] DIRECTMANIPULATION_MOTION_TYPES motion, [in] float interval, [in] float offset);
+
+ HRESULT SetSnapPoints([in] DIRECTMANIPULATION_MOTION_TYPES motion, [in] const float *points, [in] DWORD count);
+
+ HRESULT SetSnapType([in] DIRECTMANIPULATION_MOTION_TYPES motion, [in] DIRECTMANIPULATION_SNAPPOINT_TYPE type);
+
+ HRESULT SetSnapCoordinate([in] DIRECTMANIPULATION_MOTION_TYPES motion, [in] DIRECTMANIPULATION_SNAPPOINT_COORDINATE coordinate,
+ [in] float origin);
+
+ HRESULT SetZoomBoundaries([in] float minimum, [in] float maximum);
+
+ HRESULT SetHorizontalAlignment([in] DIRECTMANIPULATION_HORIZONTALALIGNMENT alignment);
+
+ HRESULT SetVerticalAlignment([in] DIRECTMANIPULATION_VERTICALALIGNMENT alignment);
+
+ HRESULT GetInertiaEndTransform([out] float *matrix, [in] DWORD count);
+
+ HRESULT GetCenterPoint([out] float *x, [out] float *y);
+}
+
[
uuid(9fbedf98-f6d8-4e3b-b488-fa66dbf5e9f3),
version(1.0)
--
2.17.1

34
patches/dxva2-Video_Decoder/0004-dxva2-Implement-stubbed-DirectX-Software-VideoProces.patch
View File

@ -1,22 +1,22 @@
From 7387aaf6f9344405a95f7fb6c27dfd0f87870d94 Mon Sep 17 00:00:00 2001
From e0e77d995edd90bdc3d67cd60cf870d6c4a68b18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 21 Feb 2015 15:06:03 +0100
Subject: dxva2: Implement stubbed DirectX Software VideoProcessor interface.
Subject: [PATCH] dxva2: Implement stubbed DirectX Software VideoProcessor
interface.
---
dlls/dxva2/Makefile.in | 3 +-
dlls/dxva2/dxva2_private.h | 3 +
dlls/dxva2/softwareprocessor.c | 209 +++++++++++++++++++++++++++++++++++++++++
dlls/dxva2/videoservices.c | 17 +++-
include/dxva2api.idl | 5 +
5 files changed, 234 insertions(+), 3 deletions(-)
dlls/dxva2/softwareprocessor.c | 209 +++++++++++++++++++++++++++++++++
dlls/dxva2/videoservices.c | 17 ++-
4 files changed, 229 insertions(+), 3 deletions(-)
create mode 100644 dlls/dxva2/softwareprocessor.c
diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in
index b517921190b..d484cb14bf2 100644
index c86b165e890..e4c90b5231e 100644
--- a/dlls/dxva2/Makefile.in
+++ b/dlls/dxva2/Makefile.in
@@ -4,4 +4,5 @@ IMPORTS = ole32
@@ -6,4 +6,5 @@ EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
devicemanager.c \
main.c \
@ -289,22 +289,6 @@ index 936aa37b43c..46e431a7f29 100644
return E_NOTIMPL;
}
diff --git a/include/dxva2api.idl b/include/dxva2api.idl
index 8dd1d961335..838411b22eb 100644
--- a/include/dxva2api.idl
+++ b/include/dxva2api.idl
@@ -86,6 +86,11 @@ cpp_quote("#define DXVA2_ModeVC1_VLD DXVA2_ModeVC1_D")
/* Encryption */
cpp_quote("DEFINE_GUID(DXVA_NoEncrypt, 0x1b81bed0, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+/* Video Processor */
+cpp_quote("DEFINE_GUID(DXVA2_VideoProcProgressiveDevice, 0x5a54a0c9, 0xc7ec,0x4bd9, 0x8e, 0xde, 0xf3, 0xc7, 0x5d, 0xc4, 0x39, 0x3b);")
+cpp_quote("DEFINE_GUID(DXVA2_VideoProcBobDevice, 0x335aa36e, 0x7884,0x43a4, 0x9c, 0x91, 0x7f, 0x87, 0xfa, 0xf3, 0xe3, 0x7e);")
+cpp_quote("DEFINE_GUID(DXVA2_VideoProcSoftwareDevice, 0x4553d47f, 0xee7e,0x4e3f, 0x94, 0x75, 0xdb, 0xf1, 0x37, 0x6c, 0x48, 0x10);")
+
cpp_quote("#ifndef REFERENCE_TIME_DEFINED")
cpp_quote("#define REFERENCE_TIME_DEFINED")
typedef LONGLONG REFERENCE_TIME;
--
2.14.1
2.17.1

25
patches/include-LdrData/0001-include-winternl.h-Add-Vista-PEB_LDR_DATA-structure-.patch
View File

@ -1,25 +0,0 @@
From 4a62c326b24ecb2f7c19b2fbc25ff1d20e362db7 Mon Sep 17 00:00:00 2001
From: Paul Gofman <gofmanp@gmail.com>
Date: Wed, 18 Dec 2019 02:54:18 +0300
Subject: [PATCH] include/winternl.h: Add Vista+ PEB_LDR_DATA structure fields.
---
include/winternl.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/winternl.h b/include/winternl.h
index 9e7e2bad93..33b1260323 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -213,6 +213,8 @@ typedef struct _PEB_LDR_DATA
LIST_ENTRY InMemoryOrderModuleList;
LIST_ENTRY InInitializationOrderModuleList;
PVOID EntryInProgress;
+ BOOLEAN ShutdownInProgress;
+ HANDLE ShutdownThreadId;
} PEB_LDR_DATA, *PPEB_LDR_DATA;
typedef struct _GDI_TEB_BATCH
--
2.23.0

2
patches/include-LdrData/definition
View File

@ -1,2 +0,0 @@
Fixes: [48289] Grand Theft Auto 5 crashes after loading.

74
patches/libs-Unicode_Collation/0001-libs-Fix-most-problems-with-CompareString.patch
View File

@ -1,19 +1,19 @@
From b1b0fe600eb400b8a7ba8f03614ebb92b76b989a Mon Sep 17 00:00:00 2001
From b32efb18bf0042e1d6fd80956ae69e3189665c82 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dtimoshkov@codeweavers.com>
Date: Mon, 28 Jul 2003 07:39:25 -0500
Subject: [PATCH] libs: Fix most problems with CompareString.
---
dlls/kernel32/tests/locale.c | 9 +++---
dlls/kernelbase/collation.c | 60 ++++++++++++++++++------------------
libs/port/collation.c | 60 ++++++++++++++++++------------------
3 files changed, 64 insertions(+), 65 deletions(-)
dlls/kernel32/tests/locale.c | 9 +++--
dlls/kernelbase/collation.c | 64 +++++++++++++++++++-----------------
libs/port/collation.c | 64 +++++++++++++++++++-----------------
3 files changed, 72 insertions(+), 65 deletions(-)
diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index c8cc90479..2455cc58e 100644
index ad52473591c..4b3dbcf495c 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -1948,13 +1948,13 @@ static void test_CompareStringA(void)
@@ -1944,13 +1944,13 @@ static void test_CompareStringA(void)
todo_wine ok(ret != CSTR_EQUAL, "\\2 vs \\1 expected unequal\n");
ret = CompareStringA(lcid, NORM_IGNORECASE | LOCALE_USE_CP_ACP, "#", -1, ".", -1);
@ -30,7 +30,7 @@ index c8cc90479..2455cc58e 100644
lcid = MAKELCID(MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT), SORT_DEFAULT);
@@ -6337,6 +6337,5 @@ START_TEST(locale)
@@ -6304,6 +6304,5 @@ START_TEST(locale)
test_SetThreadUILanguage();
test_NormalizeString();
test_SpecialCasing();
@ -39,10 +39,10 @@ index c8cc90479..2455cc58e 100644
+ test_sorting();
}
diff --git a/dlls/kernelbase/collation.c b/dlls/kernelbase/collation.c
index f56cf02c2..d4f15c396 100644
index 26e9512fede..e1d945a1cd8 100644
--- a/dlls/kernelbase/collation.c
+++ b/dlls/kernelbase/collation.c
@@ -77,34 +77,34 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
@@ -44,34 +44,35 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
0x00000000, 0x02010111, 0x02020111, 0x02030111, 0x02040111, 0x02050111, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
@ -90,10 +90,11 @@ index f56cf02c2..d4f15c396 100644
- 0x0b530111, 0x0bd70111, 0x0bd70111, 0x0bd70111, 0x0bd70111, 0x0c070111, 0x0c3b0111, 0x0c070111,
+ 0x0a5d0111, 0x0b330111, 0x0b4b0111, 0x0b4b0111, 0x0b4b0111, 0x0b4b0111, 0x0b4b0111, 0x03a30111,
+ 0x0b530111, 0x0bd70111, 0x0bd70111, 0x0bd70111, 0x0bd70111, 0x0c070111, 0x0bd40111, 0x0c070111,
/* 0x0100 .. 0x01ff */
+ /* 0x0100 .. 0x01ff */
0x0a150151, 0x0a150111, 0x0a150151, 0x0a150111, 0x0a150151, 0x0a150111, 0x0a3d0151, 0x0a3d0111,
0x0a3d0151, 0x0a3d0111, 0x0a3d0151, 0x0a3d0111, 0x0a3d0151, 0x0a3d0111, 0x0a490151, 0x0a490111,
@@ -191,7 +191,7 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
0x0a4d0121, 0x0a4d0111, 0x0a650151, 0x0a650111, 0x0a650151, 0x0a650111, 0x0a650151, 0x0a650111,
@@ -155,7 +156,7 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0x020d0111, 0x02140111, 0x0c910121, 0x025f0111,
0x0c950131, 0x0c990121, 0x0c9b0121, 0xffffffff, 0x0ca20121, 0xffffffff, 0x0ca80121, 0x0cac0121,
0x0c9b0111, 0x0c910121, 0x0c920131, 0x0c930121, 0x0c940121, 0x0c950131, 0x0c980121, 0x0c990121,
@ -102,12 +103,13 @@ index f56cf02c2..d4f15c396 100644
0x0ca30131, 0x0ca50131, 0xffffffff, 0x0ca60131, 0x0ca70121, 0x0ca80121, 0x0ca90131, 0x0caa0121,
0x0cab0121, 0x0cac0121, 0x0c9b0121, 0x0ca80121, 0x0c910111, 0x0c950111, 0x0c990111, 0x0c9b0111,
0x0ca80111, 0x0c910111, 0x0c920111, 0x0c930111, 0x0c940111, 0x0c950111, 0x0c980111, 0x0c990111,
@@ -931,12 +931,12 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
@@ -904,12 +905,13 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
0x0ca80121, 0x0ca80121, 0x0ca80121, 0x0ca80121, 0x0ca50131, 0x02140111, 0x02140111, 0x020c0111,
0xffffffff, 0xffffffff, 0x0cac0111, 0x0cac0111, 0x0cac0111, 0xffffffff, 0x0cac0111, 0x0cac0111,
0x0ca20121, 0x0ca20121, 0x0cac0121, 0x0cac0121, 0x0cac0121, 0x020d0111, 0x02180111, 0xffffffff,
/* 0x2000 .. 0x20ff */
- 0x02090131, 0x02090131, 0x02090131, 0x02090131, 0x02090131, 0x02090131, 0x02090131, 0x02090141,
- 0x02090131, 0x02090131, 0x02090131, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ /* 0x2000 .. 0x20ff */
+ 0x02090121, 0x02090121, 0x02090121, 0x02090121, 0x02090121, 0x02090121, 0x02090121, 0x02090131,
+ 0x02090121, 0x02090121, 0x02090121, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x02250111, 0x02250121, 0x02260111, 0x02270111, 0x02280111, 0x02290111, 0x03a90111, 0x021c0111,
@ -118,16 +120,17 @@ index f56cf02c2..d4f15c396 100644
0x02ac0111, 0x02ad0111, 0x02b60111, 0x02b60121, 0x02b60121, 0x02b70111, 0x02b70121, 0x02b70121,
0x02b90111, 0x026e0111, 0x026f0111, 0x02ba0111, 0x024b0131, 0x02540111, 0x02110111, 0x02bb0111,
0x02bc0111, 0x02bd0111, 0x02be0111, 0x02b30111, 0x02a50111, 0x02860111, 0x02870111, 0xffffffff,
@@ -1294,7 +1294,7 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
@@ -1256,7 +1258,8 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
0x09a90111, 0x09aa0111, 0x09ab0111, 0x09ac0111, 0x09ad0111, 0x09ae0111, 0x09af0111, 0x09b00111,
0x09b10111, 0x09b20111, 0x09b30111, 0x09b40111, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
/* 0x3000 .. 0x30ff */
- 0x02090121, 0x02340111, 0x025e0111, 0x02b80111, 0x09b50111, 0x09d70111, 0x192c0111, 0x0a0b0111,
+ /* 0x3000 .. 0x30ff */
+ 0x02090111, 0x02340111, 0x025e0111, 0x02b80111, 0x09b50111, 0x09d70111, 0x192c0111, 0x0a0b0111,
0x02880111, 0x02890111, 0x028a0111, 0x028b0111, 0x028c0111, 0x028d0111, 0x028e0111, 0x028f0111,
0x02900111, 0x02910111, 0x09b60111, 0x09b70111, 0x02920111, 0x02930111, 0x02940111, 0x02950111,
0x02960111, 0x02970111, 0x02980111, 0x02990111, 0x022a0111, 0x02750111, 0x02760111, 0x02770111,
@@ -1409,14 +1409,14 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
@@ -1368,14 +1371,14 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
0x0a0c0131, 0x0a0c0131, 0x0a0c0131, 0x0a0c0131, 0x0a0d0131, 0x0a0d0131, 0x0a0d0131, 0x0a0d0131,
0x0a0d0131, 0x0ab901a1, 0x0a490191, 0x0a1501a1, 0x0a290181, 0x0b4b01b1, 0x0b670181, 0xffffffff,
0xffffffff, 0xffffffff, 0xffffffff, 0xfb400151, 0xfb400151, 0xfb400151, 0xfb400151, 0xfb400151,
@ -148,7 +151,7 @@ index f56cf02c2..d4f15c396 100644
0x0af70171, 0x0b2b01b1, 0x0a150191, 0x0a290191, 0x0a3d01a1, 0x0a3d01a1, 0x0a3d01b1, 0x0a3d01b1,
0x0a490191, 0x0a990181, 0x0ab901a1, 0x0ab901b1, 0x0ad301b1, 0x0af70181, 0x0af70181, 0x0af70171,
0x0b0301c1, 0x0b0301c1, 0x0b0301c1, 0x0b0301c1, 0x0b2b01a1, 0x0b2b01a1, 0x0b2b01a1, 0x0b670191,
@@ -1603,7 +1603,7 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
@@ -1556,7 +1559,7 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
0xffffffff, 0x02110121, 0x02110121, 0x02110121, 0x02110121, 0x021b0131, 0x021b0131, 0x021b0131,
0x022d0131, 0x02340121, 0x02550141, 0xffffffff, 0x02350131, 0x02370131, 0x024e0141, 0x024b0141,
0x02280121, 0x027a0141, 0x027b0131, 0x027e0131, 0x027f0131, 0x02920121, 0x02930121, 0x02a90131,
@ -157,22 +160,23 @@ index f56cf02c2..d4f15c396 100644
0x02a60131, 0x09e00131, 0x02aa0131, 0x02a10131, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
0x00006831, 0x00006821, 0x00006921, 0xffffffff, 0x00006a21, 0xffffffff, 0x00006b31, 0x00006b21,
0x00006c31, 0x00006c21, 0x00006d31, 0x00006d21, 0x00006e31, 0x00006e21, 0x00006f31, 0x00006f21,
@@ -1624,8 +1624,8 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
@@ -1576,8 +1579,9 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
0x0f330131, 0x0f390151, 0x0f390141, 0x0f390121, 0x0f390131, 0x0f3e0141, 0x0f3e0131, 0x0f480151,
0x0f480141, 0x0f490161, 0x0f490151, 0x0f490131, 0x0f490141, 0x0f2d0151, 0x0f2d0141, 0x0f2d0151,
0x0f2d0141, 0x0f2d0151, 0x0f2d0141, 0x0f2d0151, 0x0f2d0141, 0xffffffff, 0xffffffff, 0x00000000,
/* 0xff00 .. 0xffff */
- 0xffffffff, 0x024b0121, 0x02700121, 0x02a90121, 0x09e00121, 0x02aa0121, 0x02a70121, 0x02690121,
- 0x027a0121, 0x027b0121, 0x02a20121, 0x039f0121, 0x022d0121, 0x02210121, 0x02550121, 0x02a40121,
+ /* 0xff00 .. 0xffff */
+ 0xffffffff, 0x024b0121, 0x02700121, 0x02a90121, 0x09e00121, 0x02aa0121, 0x02a70121, 0x02690111,
+ 0x027a0121, 0x027b0121, 0x02a20121, 0x039f0121, 0x022d0121, 0x02210111, 0x02550121, 0x02a40121,
0x0a0b0121, 0x0a0c0121, 0x0a0d0121, 0x0a0e0121, 0x0a0f0121, 0x0a100121, 0x0a110121, 0x0a120121,
0x0a130121, 0x0a140121, 0x02370121, 0x02350121, 0x03a30121, 0x03a40121, 0x03a50121, 0x024e0121,
0x02a10121, 0x0a150161, 0x0a290151, 0x0a3d0161, 0x0a490161, 0x0a650161, 0x0a910161, 0x0a990161,
diff --git a/libs/port/collation.c b/libs/port/collation.c
index f56cf02c2..d4f15c396 100644
index 26e9512fede..e1d945a1cd8 100644
--- a/libs/port/collation.c
+++ b/libs/port/collation.c
@@ -77,34 +77,34 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
@@ -44,34 +44,35 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
0x00000000, 0x02010111, 0x02020111, 0x02030111, 0x02040111, 0x02050111, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
@ -220,10 +224,11 @@ index f56cf02c2..d4f15c396 100644
- 0x0b530111, 0x0bd70111, 0x0bd70111, 0x0bd70111, 0x0bd70111, 0x0c070111, 0x0c3b0111, 0x0c070111,
+ 0x0a5d0111, 0x0b330111, 0x0b4b0111, 0x0b4b0111, 0x0b4b0111, 0x0b4b0111, 0x0b4b0111, 0x03a30111,
+ 0x0b530111, 0x0bd70111, 0x0bd70111, 0x0bd70111, 0x0bd70111, 0x0c070111, 0x0bd40111, 0x0c070111,
/* 0x0100 .. 0x01ff */
+ /* 0x0100 .. 0x01ff */
0x0a150151, 0x0a150111, 0x0a150151, 0x0a150111, 0x0a150151, 0x0a150111, 0x0a3d0151, 0x0a3d0111,
0x0a3d0151, 0x0a3d0111, 0x0a3d0151, 0x0a3d0111, 0x0a3d0151, 0x0a3d0111, 0x0a490151, 0x0a490111,
@@ -191,7 +191,7 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
0x0a4d0121, 0x0a4d0111, 0x0a650151, 0x0a650111, 0x0a650151, 0x0a650111, 0x0a650151, 0x0a650111,
@@ -155,7 +156,7 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0x020d0111, 0x02140111, 0x0c910121, 0x025f0111,
0x0c950131, 0x0c990121, 0x0c9b0121, 0xffffffff, 0x0ca20121, 0xffffffff, 0x0ca80121, 0x0cac0121,
0x0c9b0111, 0x0c910121, 0x0c920131, 0x0c930121, 0x0c940121, 0x0c950131, 0x0c980121, 0x0c990121,
@ -232,12 +237,13 @@ index f56cf02c2..d4f15c396 100644
0x0ca30131, 0x0ca50131, 0xffffffff, 0x0ca60131, 0x0ca70121, 0x0ca80121, 0x0ca90131, 0x0caa0121,
0x0cab0121, 0x0cac0121, 0x0c9b0121, 0x0ca80121, 0x0c910111, 0x0c950111, 0x0c990111, 0x0c9b0111,
0x0ca80111, 0x0c910111, 0x0c920111, 0x0c930111, 0x0c940111, 0x0c950111, 0x0c980111, 0x0c990111,
@@ -931,12 +931,12 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
@@ -904,12 +905,13 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
0x0ca80121, 0x0ca80121, 0x0ca80121, 0x0ca80121, 0x0ca50131, 0x02140111, 0x02140111, 0x020c0111,
0xffffffff, 0xffffffff, 0x0cac0111, 0x0cac0111, 0x0cac0111, 0xffffffff, 0x0cac0111, 0x0cac0111,
0x0ca20121, 0x0ca20121, 0x0cac0121, 0x0cac0121, 0x0cac0121, 0x020d0111, 0x02180111, 0xffffffff,
/* 0x2000 .. 0x20ff */
- 0x02090131, 0x02090131, 0x02090131, 0x02090131, 0x02090131, 0x02090131, 0x02090131, 0x02090141,
- 0x02090131, 0x02090131, 0x02090131, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ /* 0x2000 .. 0x20ff */
+ 0x02090121, 0x02090121, 0x02090121, 0x02090121, 0x02090121, 0x02090121, 0x02090121, 0x02090131,
+ 0x02090121, 0x02090121, 0x02090121, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x02250111, 0x02250121, 0x02260111, 0x02270111, 0x02280111, 0x02290111, 0x03a90111, 0x021c0111,
@ -248,16 +254,17 @@ index f56cf02c2..d4f15c396 100644
0x02ac0111, 0x02ad0111, 0x02b60111, 0x02b60121, 0x02b60121, 0x02b70111, 0x02b70121, 0x02b70121,
0x02b90111, 0x026e0111, 0x026f0111, 0x02ba0111, 0x024b0131, 0x02540111, 0x02110111, 0x02bb0111,
0x02bc0111, 0x02bd0111, 0x02be0111, 0x02b30111, 0x02a50111, 0x02860111, 0x02870111, 0xffffffff,
@@ -1294,7 +1294,7 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
@@ -1256,7 +1258,8 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
0x09a90111, 0x09aa0111, 0x09ab0111, 0x09ac0111, 0x09ad0111, 0x09ae0111, 0x09af0111, 0x09b00111,
0x09b10111, 0x09b20111, 0x09b30111, 0x09b40111, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
/* 0x3000 .. 0x30ff */
- 0x02090121, 0x02340111, 0x025e0111, 0x02b80111, 0x09b50111, 0x09d70111, 0x192c0111, 0x0a0b0111,
+ /* 0x3000 .. 0x30ff */
+ 0x02090111, 0x02340111, 0x025e0111, 0x02b80111, 0x09b50111, 0x09d70111, 0x192c0111, 0x0a0b0111,
0x02880111, 0x02890111, 0x028a0111, 0x028b0111, 0x028c0111, 0x028d0111, 0x028e0111, 0x028f0111,
0x02900111, 0x02910111, 0x09b60111, 0x09b70111, 0x02920111, 0x02930111, 0x02940111, 0x02950111,
0x02960111, 0x02970111, 0x02980111, 0x02990111, 0x022a0111, 0x02750111, 0x02760111, 0x02770111,
@@ -1409,14 +1409,14 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
@@ -1368,14 +1371,14 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
0x0a0c0131, 0x0a0c0131, 0x0a0c0131, 0x0a0c0131, 0x0a0d0131, 0x0a0d0131, 0x0a0d0131, 0x0a0d0131,
0x0a0d0131, 0x0ab901a1, 0x0a490191, 0x0a1501a1, 0x0a290181, 0x0b4b01b1, 0x0b670181, 0xffffffff,
0xffffffff, 0xffffffff, 0xffffffff, 0xfb400151, 0xfb400151, 0xfb400151, 0xfb400151, 0xfb400151,
@ -278,7 +285,7 @@ index f56cf02c2..d4f15c396 100644
0x0af70171, 0x0b2b01b1, 0x0a150191, 0x0a290191, 0x0a3d01a1, 0x0a3d01a1, 0x0a3d01b1, 0x0a3d01b1,
0x0a490191, 0x0a990181, 0x0ab901a1, 0x0ab901b1, 0x0ad301b1, 0x0af70181, 0x0af70181, 0x0af70171,
0x0b0301c1, 0x0b0301c1, 0x0b0301c1, 0x0b0301c1, 0x0b2b01a1, 0x0b2b01a1, 0x0b2b01a1, 0x0b670191,
@@ -1603,7 +1603,7 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
@@ -1556,7 +1559,7 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
0xffffffff, 0x02110121, 0x02110121, 0x02110121, 0x02110121, 0x021b0131, 0x021b0131, 0x021b0131,
0x022d0131, 0x02340121, 0x02550141, 0xffffffff, 0x02350131, 0x02370131, 0x024e0141, 0x024b0141,
0x02280121, 0x027a0141, 0x027b0131, 0x027e0131, 0x027f0131, 0x02920121, 0x02930121, 0x02a90131,
@ -287,17 +294,18 @@ index f56cf02c2..d4f15c396 100644
0x02a60131, 0x09e00131, 0x02aa0131, 0x02a10131, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
0x00006831, 0x00006821, 0x00006921, 0xffffffff, 0x00006a21, 0xffffffff, 0x00006b31, 0x00006b21,
0x00006c31, 0x00006c21, 0x00006d31, 0x00006d21, 0x00006e31, 0x00006e21, 0x00006f31, 0x00006f21,
@@ -1624,8 +1624,8 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
@@ -1576,8 +1579,9 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
0x0f330131, 0x0f390151, 0x0f390141, 0x0f390121, 0x0f390131, 0x0f3e0141, 0x0f3e0131, 0x0f480151,
0x0f480141, 0x0f490161, 0x0f490151, 0x0f490131, 0x0f490141, 0x0f2d0151, 0x0f2d0141, 0x0f2d0151,
0x0f2d0141, 0x0f2d0151, 0x0f2d0141, 0x0f2d0151, 0x0f2d0141, 0xffffffff, 0xffffffff, 0x00000000,
/* 0xff00 .. 0xffff */
- 0xffffffff, 0x024b0121, 0x02700121, 0x02a90121, 0x09e00121, 0x02aa0121, 0x02a70121, 0x02690121,
- 0x027a0121, 0x027b0121, 0x02a20121, 0x039f0121, 0x022d0121, 0x02210121, 0x02550121, 0x02a40121,
+ /* 0xff00 .. 0xffff */
+ 0xffffffff, 0x024b0121, 0x02700121, 0x02a90121, 0x09e00121, 0x02aa0121, 0x02a70121, 0x02690111,
+ 0x027a0121, 0x027b0121, 0x02a20121, 0x039f0121, 0x022d0121, 0x02210111, 0x02550121, 0x02a40121,
0x0a0b0121, 0x0a0c0121, 0x0a0d0121, 0x0a0e0121, 0x0a0f0121, 0x0a100121, 0x0a110121, 0x0a120121,
0x0a130121, 0x0a140121, 0x02370121, 0x02350121, 0x03a30121, 0x03a40121, 0x03a50121, 0x024e0121,
0x02a10121, 0x0a150161, 0x0a290151, 0x0a3d0161, 0x0a490161, 0x0a650161, 0x0a910161, 0x0a990161,
--
2.24.0
2.17.1

32
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "84f2ce5139bb840ee2cf381d039d3787a0cdf2b6"
echo "c55e8822ae3bbb8b1d3ab9b363214e4ad2f478d9"
}
# Show version information
@ -155,7 +155,6 @@ patch_enable_all ()
enable_gdiplus_Performance_Improvements="$1"
enable_imagehlp_BindImageEx="$1"
enable_imm32_message_on_focus="$1"
enable_include_LdrData="$1"
enable_include_winsock="$1"
enable_inseng_Implementation="$1"
enable_iphlpapi_System_Ping="$1"
@ -599,9 +598,6 @@ patch_enable ()
imm32-message_on_focus)
enable_imm32_message_on_focus="$2"
;;
include-LdrData)
enable_include_LdrData="$2"
;;
include-winsock)
enable_include_winsock="$2"
;;
@ -3178,42 +3174,33 @@ fi
# | Modified files:
# | * configure, configure.ac, dlls/directmanipulation/Makefile.in, dlls/directmanipulation/directmanip.idl,
# | dlls/directmanipulation/directmanipulation.c, dlls/directmanipulation/directmanipulation.spec,
# | dlls/directmanipulation/tests/Makefile.in, dlls/directmanipulation/tests/manipulation.c, dlls/uuid/uuid.c,
# | include/Makefile.in, include/directmanipulation.idl
# | dlls/directmanipulation/tests/Makefile.in, dlls/directmanipulation/tests/manipulation.c, dlls/uuid/uuid.c
# |
if test "$enable_directmanipulation_new_dll" -eq 1; then
patch_apply directmanipulation-new-dll/0001-include-Add-directmanipulation.idl.patch
patch_apply directmanipulation-new-dll/0002-directmanipulation-New-dll.patch
patch_apply directmanipulation-new-dll/0003-uuid-Add-directmanipulation.h.patch
patch_apply directmanipulation-new-dll/0004-directmanipulation-Create-DirectManipulationManager-.patch
patch_apply directmanipulation-new-dll/0005-include-Add-DCompManipulationCompositor-coclass-and-.patch
patch_apply directmanipulation-new-dll/0006-directmanipulation-Support-DCompManipulationComposit.patch
patch_apply directmanipulation-new-dll/0007-directmanipulation-Supprot-IDirectManipulationFrameI.patch
patch_apply directmanipulation-new-dll/0008-directmanipulation-Implement-IDirectManipulationMana.patch
patch_apply directmanipulation-new-dll/0009-directmanipulation-Implement-IDirectManipulationComp.patch
patch_apply directmanipulation-new-dll/0010-include-Add-IDirectManipulationViewport2-interface.patch
patch_apply directmanipulation-new-dll/0011-directmanipulation-Implement-IDirectManipulationMana.patch
patch_apply directmanipulation-new-dll/0012-directmanipulation-tests-Initial-tests.patch
patch_apply directmanipulation-new-dll/0013-directmanipulation-Fake-success-from-IDirectManipula.patch
patch_apply directmanipulation-new-dll/0014-include-Add-IDirectManipulationPrimaryContent-interf.patch
patch_apply directmanipulation-new-dll/0015-directmanipulation-Implement-IDirectManipulationView.patch
patch_apply directmanipulation-new-dll/0016-directmanipulation-Support-IDirectManipulationConten.patch
patch_apply directmanipulation-new-dll/0017-directmanipulation-Fake-success-in-some-functions.patch
(
printf '%s\n' '+ { "Alistair Leslie-Hughes", "include: Add directmanipulation.idl.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "directmanipulation: New dll.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "uuid: Add directmanipulation.h.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "directmanipulation: Create DirectManipulationManager/DirectManipulationSharedManager objects.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "include: Add DCompManipulationCompositor coclass and supporting interfaces.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "directmanipulation: Support DCompManipulationCompositor interface.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "directmanipulation: Supprot IDirectManipulationFrameInfoProvider interface in IDirectManipulationCompositor.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "directmanipulation: Implement IDirectManipulationManager2 GetUpdateManager.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "directmanipulation: Implement IDirectManipulationCompositor SetUpdateManager.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "include: Add IDirectManipulationViewport2 interface.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "directmanipulation: Implement IDirectManipulationManager2 CreateViewport.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "directmanipulation/tests: Initial tests.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "directmanipulation: Fake success from IDirectManipulationViewport2 ActivateConfiguration.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "include: Add IDirectManipulationPrimaryContent interface.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "directmanipulation: Implement IDirectManipulationViewport2 GetPrimaryContent.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "directmanipulation: Support IDirectManipulationContent in IDirectManipulationPrimaryContent interface.", 1 },';
printf '%s\n' '+ { "Alistair Leslie-Hughes", "directmanipulation: Fake success in some functions.", 1 },';
@ -4236,21 +4223,6 @@ if test "$enable_imm32_message_on_focus" -eq 1; then
) >> "$patchlist"
fi
# Patchset include-LdrData
# |
# | This patchset fixes the following Wine bugs:
# | * [#48289] Grand Theft Auto 5 crashes after loading.
# |
# | Modified files:
# | * include/winternl.h
# |
if test "$enable_include_LdrData" -eq 1; then
patch_apply include-LdrData/0001-include-winternl.h-Add-Vista-PEB_LDR_DATA-structure-.patch
(
printf '%s\n' '+ { "Paul Gofman", "include/winternl.h: Add Vista+ PEB_LDR_DATA structure fields.", 1 },';
) >> "$patchlist"
fi
# Patchset include-winsock
# |
# | Modified files: