The attached additions are needed for Firefox; some new interfaces, constants, etc.
-tom
From aeb22c3a17cc5d6eb043385f87e3f3c2081d7fc9 Mon Sep 17 00:00:00 2001 From: Tom Ritter <t...@ritter.vg> Date: Thu, 28 Nov 2019 22:20:28 -0600 Subject: [PATCH] Add interfaces to dcomp.h, two constants to dcomptypes.h, inputscope constants, and ASSOCF enum values. --- mingw-w64-headers/include/dcomp.h | 77 ++++++++++++++++++++++++++ mingw-w64-headers/include/dcomptypes.h | 12 ++++ mingw-w64-headers/include/inputscope.h | 12 ++++ mingw-w64-headers/include/shlwapi.h | 28 ++++++---- 4 files changed, 117 insertions(+), 12 deletions(-) mode change 100644 => 100755 mingw-w64-headers/include/dcomp.h mode change 100644 => 100755 mingw-w64-headers/include/dcomptypes.h mode change 100644 => 100755 mingw-w64-headers/include/inputscope.h mode change 100644 => 100755 mingw-w64-headers/include/shlwapi.h diff --git a/mingw-w64-headers/include/dcomp.h b/mingw-w64-headers/include/dcomp.h old mode 100644 new mode 100755 index 9bd9a4ef..53aa4d16 --- a/mingw-w64-headers/include/dcomp.h +++ b/mingw-w64-headers/include/dcomp.h @@ -289,6 +289,83 @@ STDAPI DCompositionCreateDevice(IDXGIDevice *dxgiDevice, REFIID iid, void **dcom STDAPI DCompositionCreateDevice2(IUnknown *renderingDevice, REFIID iid, void **dcompositionDevice); +typedef interface IDCompositionDevice2 IDCompositionDevice2; +typedef interface IDCompositionDeviceDebug IDCompositionDeviceDebug; +typedef interface IDCompositionDesktopDevice IDCompositionDesktopDevice; +typedef interface IDCompositionVisual2 IDCompositionVisual2; +typedef interface IDCompositionVisualDebug IDCompositionVisualDebug; +typedef interface IDCompositionSurfaceFactory IDCompositionSurfaceFactory; + +#undef INTERFACE +#define INTERFACE IDCompositionDevice2 +DECLARE_INTERFACE_IID_(IDCompositionDevice2, IUnknown, "75F6468D-1B8E-447C-9BC6-75FEA80B5B25") +{ + STDMETHOD(Commit)(THIS) PURE; + STDMETHOD(WaitForCommitCompletion)(THIS) PURE; + STDMETHOD(GetFrameStatistics)(THIS_ DCOMPOSITION_FRAME_STATISTICS*) PURE; + STDMETHOD(CreateVisual)(THIS_ IDCompositionVisual2**) PURE; + STDMETHOD(CreateSurfaceFactory)(THIS_ IUnknown*, IDCompositionSurfaceFactory**) PURE; + STDMETHOD(CreateSurface)(THIS_ UINT, UINT, DXGI_FORMAT, DXGI_ALPHA_MODE, IDCompositionSurface**) PURE; + STDMETHOD(CreateVirtualSurface)(THIS_ UINT, UINT, DXGI_FORMAT, DXGI_ALPHA_MODE, IDCompositionVirtualSurface**) PURE; + STDMETHOD(CreateTranslateTransform)(THIS_ IDCompositionTranslateTransform**) PURE; + STDMETHOD(CreateScaleTransform)(THIS_ IDCompositionScaleTransform**) PURE; + STDMETHOD(CreateRotateTransform)(THIS_ IDCompositionRotateTransform**) PURE; + STDMETHOD(CreateSkewTransform)(THIS_ IDCompositionSkewTransform**) PURE; + STDMETHOD(CreateMatrixTransform)(THIS_ IDCompositionMatrixTransform**) PURE; + STDMETHOD(CreateTransformGroup)(THIS_ IDCompositionTransform**, UINT, IDCompositionTransform**) PURE; + STDMETHOD(CreateTranslateTransform3D)(THIS_ IDCompositionTranslateTransform3D**) PURE; + STDMETHOD(CreateScaleTransform3D)(THIS_ IDCompositionScaleTransform3D**) PURE; + STDMETHOD(CreateRotateTransform3D)(THIS_ IDCompositionRotateTransform3D**) PURE; + STDMETHOD(CreateMatrixTransform3D)(THIS_ IDCompositionMatrixTransform3D**) PURE; + STDMETHOD(CreateTransform3DGroup)(THIS_ IDCompositionTransform3D**, UINT, IDCompositionTransform3D**) PURE; + STDMETHOD(CreateEffectGroup)(THIS_ IDCompositionEffectGroup**) PURE; + STDMETHOD(CreateRectangleClip)(THIS_ IDCompositionRectangleClip**) PURE; + STDMETHOD(CreateAnimation)(THIS_ IDCompositionAnimation**) PURE; +}; + +#undef INTERFACE +#define INTERFACE IDCompositionDesktopDevice +DECLARE_INTERFACE_IID_(IDCompositionDesktopDevice, IDCompositionDevice2, "5F4633FE-1E08-4CB8-8C75-CE24333F5602") +{ + STDMETHOD(CreateTargetForHwnd)(THIS_ HWND, BOOL, IDCompositionTarget**) PURE; + STDMETHOD(CreateSurfaceFromHandle)(THIS_ HANDLE, IUnknown**) PURE; + STDMETHOD(CreateSurfaceFromHwnd)(THIS_ HWND, IUnknown**) PURE; +}; + +#undef INTERFACE +#define INTERFACE IDCompositionDeviceDebug +DECLARE_INTERFACE_IID_(IDCompositionDeviceDebug, IUnknown, "A1A3C64A-224F-4A81-9773-4F03A89D3C6C") +{ + STDMETHOD(EnableDebugCounters)(THIS_) PURE; + STDMETHOD(DisableDebugCounters)(THIS_) PURE; +}; + +#undef INTERFACE +#define INTERFACE IDCompositionSurfaceFactory +DECLARE_INTERFACE_IID_(IDCompositionSurfaceFactory, IUnknown, "E334BC12-3937-4E02-85EB-FCF4EB30D2C8") +{ + STDMETHOD(CreateSurface)(THIS_ UINT,UINT, DXGI_FORMAT, DXGI_ALPHA_MODE, IDCompositionSurface**) PURE; + STDMETHOD(CreateVirtualSurface)(THIS_ UINT, UINT, DXGI_FORMAT , DXGI_ALPHA_MODE, IDCompositionVirtualSurface**) PURE; +}; + +#undef INTERFACE +#define INTERFACE IDCompositionVisual2 +DECLARE_INTERFACE_IID_(IDCompositionVisual2, IDCompositionVisual, "E8DE1639-4331-4B26-BC5F-6A321D347A85") +{ + STDMETHOD(SetOpacityMode)(THIS_ DCOMPOSITION_OPACITY_MODE) PURE; + STDMETHOD(SetBackFaceVisibility)(THIS_ DCOMPOSITION_BACKFACE_VISIBILITY) PURE; +}; + +#undef INTERFACE +#define INTERFACE IDCompositionVisualDebug +DECLARE_INTERFACE_IID_(IDCompositionVisualDebug, IDCompositionVisual2, "FED2B808-5EB4-43A0-AEA3-35F65280F91B") +{ + STDMETHOD(EnableHeatMap)(THIS_ const D2D1_COLOR_F &color) PURE; + STDMETHOD(DisableHeatMap)(THIS_) PURE; + STDMETHOD(EnableRedrawRegions)(THIS_) PURE; + STDMETHOD(DisableRedrawRegions)(THIS_) PURE; +}; + #endif #if (_WIN32_WINNT >= 0x0A00) diff --git a/mingw-w64-headers/include/dcomptypes.h b/mingw-w64-headers/include/dcomptypes.h old mode 100644 new mode 100755 index b8a09ed1..fc5483cd --- a/mingw-w64-headers/include/dcomptypes.h +++ b/mingw-w64-headers/include/dcomptypes.h @@ -32,6 +32,18 @@ enum DCOMPOSITION_COMPOSITE_MODE { DCOMPOSITION_COMPOSITE_MODE_INHERIT = 0xffffffff }; +enum DCOMPOSITION_BACKFACE_VISIBILITY { + DCOMPOSITION_BACKFACE_VISIBILITY_VISIBLE = 0, + DCOMPOSITION_BACKFACE_VISIBILITY_HIDDEN = 1, + DCOMPOSITION_BACKFACE_VISIBILITY_INHERIT = 0xffffffff +}; + +enum DCOMPOSITION_OPACITY_MODE { + DCOMPOSITION_OPACITY_MODE_LAYER = 0, + DCOMPOSITION_OPACITY_MODE_MULTIPLY = 1, + DCOMPOSITION_OPACITY_MODE_INHERIT = 0xffffffff +}; + typedef struct { LARGE_INTEGER lastFrameTime; DXGI_RATIONAL currentCompositionRate; diff --git a/mingw-w64-headers/include/inputscope.h b/mingw-w64-headers/include/inputscope.h old mode 100644 new mode 100755 index e0519894..bd63040a --- a/mingw-w64-headers/include/inputscope.h +++ b/mingw-w64-headers/include/inputscope.h @@ -92,6 +92,18 @@ typedef enum __WIDL_inputscope_generated_name_00000013 { IS_CHINESE_HALFWIDTH = 53, IS_CHINESE_FULLWIDTH = 54, IS_NATIVE_SCRIPT = 55, + IS_YOMI = 56, + IS_TEXT = 57, + IS_CHAT = 58, + IS_NAME_OR_PHONENUMBER = 59, + IS_EMAILNAME_OR_ADDRESS = 60, + IS_PRIVATE = 61, + IS_MAPS = 62, + IS_NUMERIC_PASSWORD = 63, + IS_NUMERIC_PIN = 64, + IS_ALPHANUMERIC_PIN = 65, + IS_ALPHANUMERIC_PIN_SET = 66, + IS_FORMULA_NUMBER = 67, IS_PHRASELIST = -1, IS_REGULAREXPRESSION = -2, IS_SRGS = -3, diff --git a/mingw-w64-headers/include/shlwapi.h b/mingw-w64-headers/include/shlwapi.h old mode 100644 new mode 100755 index 1f7794c0..c4780c41 --- a/mingw-w64-headers/include/shlwapi.h +++ b/mingw-w64-headers/include/shlwapi.h @@ -708,18 +708,22 @@ extern "C" { LWSTDAPI_(WINBOOL) SHRegGetBoolUSValueW(LPCWSTR pszSubKey,LPCWSTR pszValue,WINBOOL fIgnoreHKCU,WINBOOL fDefault); enum { - ASSOCF_INIT_NOREMAPCLSID = 0x00000001, - ASSOCF_INIT_BYEXENAME = 0x00000002, - ASSOCF_OPEN_BYEXENAME = 0x00000002, - ASSOCF_INIT_DEFAULTTOSTAR = 0x00000004, - ASSOCF_INIT_DEFAULTTOFOLDER = 0x00000008, - ASSOCF_NOUSERSETTINGS = 0x00000010, - ASSOCF_NOTRUNCATE = 0x00000020, - ASSOCF_VERIFY = 0x00000040, - ASSOCF_REMAPRUNDLL = 0x00000080, - ASSOCF_NOFIXUPS = 0x00000100, - ASSOCF_IGNOREBASECLASS = 0x00000200, - ASSOCF_INIT_IGNOREUNKNOWN = 0x00000400 + ASSOCF_NONE = 0x00000000, + ASSOCF_INIT_NOREMAPCLSID = 0x00000001, + ASSOCF_INIT_BYEXENAME = 0x00000002, + ASSOCF_OPEN_BYEXENAME = 0x00000002, + ASSOCF_INIT_DEFAULTTOSTAR = 0x00000004, + ASSOCF_INIT_DEFAULTTOFOLDER = 0x00000008, + ASSOCF_NOUSERSETTINGS = 0x00000010, + ASSOCF_NOTRUNCATE = 0x00000020, + ASSOCF_VERIFY = 0x00000040, + ASSOCF_REMAPRUNDLL = 0x00000080, + ASSOCF_NOFIXUPS = 0x00000100, + ASSOCF_IGNOREBASECLASS = 0x00000200, + ASSOCF_INIT_IGNOREUNKNOWN = 0x00000400, + ASSOCF_INIT_FIXED_PROGID = 0x00000800, + ASSOCF_IS_PROTOCOL = 0x00001000, + ASSOCF_INIT_FOR_FILE = 0x00002000 }; typedef DWORD ASSOCF; -- 2.17.1
_______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public