You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against c55e8822ae3bbb8b1d3ab9b363214e4ad2f478d9
This commit is contained in:
Alistair Leslie-Hughes
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user