September 2017 - Wine-commits

Henri Verbeet : include: Convert dxgiformat.h to IDL.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: 00990782fdc26cf404ed18996f21d76eac2ddbf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00990782fdc26cf404ed18996… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 21 22:29:34 2017 +0200 include: Convert dxgiformat.h to IDL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 2 +- include/dcommon.idl | 2 +- include/dxgiformat.h | 147 ------------------------------------------------- include/dxgiformat.idl | 145 ++++++++++++++++++++++++++++++++++++++++++++++++ include/dxgitype.idl | 2 +- 5 files changed, 148 insertions(+), 150 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00990782fdc26cf404ed1…

1 0

Ihsan Akmal : include: Add dxgicommon.idl.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: f5268feeacbd86fd680f88cdfb337ceca14ad03e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5268feeacbd86fd680f88cdf… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Thu Sep 21 22:29:35 2017 +0200 include: Add dxgicommon.idl. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/dxgicommon.idl | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/dxgitype.idl | 13 +---------- 3 files changed, 63 insertions(+), 12 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index edb4c3c..9acb0bf 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -70,6 +70,7 @@ IDL_SRCS = \ dxgi.idl \ dxgi1_2.idl \ dxgi1_3.idl \ + dxgicommon.idl \ dxgiformat.idl \ dxgitype.idl \ dxva2api.idl \ diff --git a/include/dxgicommon.idl b/include/dxgicommon.idl new file mode 100644 index 0000000..99ace03 --- /dev/null +++ b/include/dxgicommon.idl @@ -0,0 +1,61 @@ +/* + * Copyright 2017 Ihsan Akmal + * + * 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 + */ + +cpp_quote("#if 0") +typedef unsigned int UINT; +cpp_quote("#endif") + +const UINT DXGI_STANDARD_MULTISAMPLE_QUALITY_PATTERN = 0xffffffff; +const UINT DXGI_CENTER_MULTISAMPLE_QUALITY_PATTERN = 0xfffffffe; + +typedef enum DXGI_COLOR_SPACE_TYPE +{ + DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709 = 0x00, + DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709 = 0x01, + DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P709 = 0x02, + DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P2020 = 0x03, + DXGI_COLOR_SPACE_RESERVED = 0x04, + DXGI_COLOR_SPACE_YCBCR_FULL_G22_NONE_P709_X601 = 0x05, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P601 = 0x06, + DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P601 = 0x07, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P709 = 0x08, + DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P709 = 0x09, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P2020 = 0x0a, + DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P2020 = 0x0b, + DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020 = 0x0c, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G2084_LEFT_P2020 = 0x0d, + DXGI_COLOR_SPACE_RGB_STUDIO_G2084_NONE_P2020 = 0x0e, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_TOPLEFT_P2020 = 0x0f, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G2084_TOPLEFT_P2020 = 0x10, + DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P2020 = 0x11, + DXGI_COLOR_SPACE_YCBCR_STUDIO_GHLG_TOPLEFT_P2020 = 0x12, + DXGI_COLOR_SPACE_YCBCR_FULL_GHLG_TOPLEFT_P2020 = 0x13, + DXGI_COLOR_SPACE_CUSTOM = 0xffffffff, +} DXGI_COLOR_SPACE_TYPE; + +typedef struct DXGI_SAMPLE_DESC +{ + UINT Count; + UINT Quality; +} DXGI_SAMPLE_DESC; + +typedef struct DXGI_RATIONAL +{ + UINT Numerator; + UINT Denominator; +} DXGI_RATIONAL; diff --git a/include/dxgitype.idl b/include/dxgitype.idl index e7d2b43..a9ed571 100644 --- a/include/dxgitype.idl +++ b/include/dxgitype.idl @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +import "dxgicommon.idl"; import "dxgiformat.idl"; cpp_quote("#if 0") @@ -59,18 +60,6 @@ typedef struct _D3DCOLORVALUE cpp_quote("#endif") typedef D3DCOLORVALUE DXGI_RGBA; -typedef struct DXGI_SAMPLE_DESC -{ - UINT Count; - UINT Quality; -} DXGI_SAMPLE_DESC; - -typedef struct DXGI_RATIONAL -{ - UINT Numerator; - UINT Denominator; -} DXGI_RATIONAL; - typedef struct DXGI_MODE_DESC { UINT Width;

1 0

Ihsan Akmal : include: Add dxgi1_4.idl.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: 67aa02726b4595e126c8648b734538f7b7a29394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67aa02726b4595e126c8648b7… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Thu Sep 21 22:29:36 2017 +0200 include: Add dxgi1_4.idl. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/dxgi1_4.idl | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 9acb0bf..f21d120 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -70,6 +70,7 @@ IDL_SRCS = \ dxgi.idl \ dxgi1_2.idl \ dxgi1_3.idl \ + dxgi1_4.idl \ dxgicommon.idl \ dxgiformat.idl \ dxgitype.idl \ diff --git a/include/dxgi1_4.idl b/include/dxgi1_4.idl new file mode 100644 index 0000000..0f63df2 --- /dev/null +++ b/include/dxgi1_4.idl @@ -0,0 +1,140 @@ +/* + * Copyright 2017 Ihsan Akmal + * + * 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 "dxgi1_3.idl"; + +typedef enum DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG +{ + DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_PRESENT = 0x1, + DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_OVERLAY_PRESENT = 0x2, +} DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG; + +typedef enum DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG +{ + DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG_PRESENT = 0x1, +} DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG; + +typedef enum DXGI_MEMORY_SEGMENT_GROUP +{ + DXGI_MEMORY_SEGMENT_GROUP_LOCAL = 0x0, + DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL = 0x1, +} DXGI_MEMORY_SEGMENT_GROUP; + +typedef struct DXGI_QUERY_VIDEO_MEMORY_INFO +{ + UINT64 Budget; + UINT64 CurrentUsage; + UINT64 AvailableForReservation; + UINT64 CurrentReservation; +} DXGI_QUERY_VIDEO_MEMORY_INFO; + +[ + object, + uuid(94d99bdb-f1f8-4ab0-b236-7da0170edab1), + local, + pointer_default(unique) +] +interface IDXGISwapChain3 : IDXGISwapChain2 +{ + UINT GetCurrentBackBufferIndex(); + HRESULT CheckColorSpaceSupport( + [in] DXGI_COLOR_SPACE_TYPE colour_space, + [out] UINT *colour_space_support + ); + HRESULT SetColorSpace1( + [in] DXGI_COLOR_SPACE_TYPE colour_space + ); + HRESULT ResizeBuffers1( + [in] UINT buffer_count, + [in] UINT width, + [in] UINT height, + [in] DXGI_FORMAT format, + [in] UINT flags, + [in] const UINT *node_mask, + [in] IUnknown *const *present_queue + ); +} + +[ + object, + uuid(dc7dca35-2196-414d-9F53-617884032a60), + local, + pointer_default(unique) +] +interface IDXGIOutput4 : IDXGIOutput3 +{ + HRESULT CheckOverlayColorSpaceSupport( + [in] DXGI_FORMAT format, + [in] DXGI_COLOR_SPACE_TYPE colour_space, + [in] IUnknown *device, + [out] UINT *flags + ); +} + +[ + object, + uuid(1bc6ea02-ef36-464f-bf0c-21ca39e5168a), + local, + pointer_default(unique) +] +interface IDXGIFactory4 : IDXGIFactory3 +{ + HRESULT EnumAdapterByLuid( + [in] LUID luid, + [in] REFIID iid, + [out] void **adapter + ); + HRESULT EnumWarpAdapter( + [in] REFIID iid, + [out] void **adapter + ); +} + +[ + object, + uuid(645967a4-1392-4310-a798-8053ce3e93fd), + local, + pointer_default(unique) +] +interface IDXGIAdapter3 : IDXGIAdapter2 +{ + HRESULT RegisterHardwareContentProtectionTeardownStatusEvent( + [in] HANDLE event, + [out] DWORD *cookie + ); + void UnregisterHardwareContentProtectionTeardownStatus( + [in] DWORD cookie + ); + HRESULT QueryVideoMemoryInfo( + [in] UINT node_index, + [in] DXGI_MEMORY_SEGMENT_GROUP segment_group, + [out] DXGI_QUERY_VIDEO_MEMORY_INFO *memory_info + ); + HRESULT SetVideoMemoryReservation( + [in] UINT node_index, + [in] DXGI_MEMORY_SEGMENT_GROUP segment_group, + [in] UINT64 reservation + ); + HRESULT RegisterVideoMemoryBudgetChangeNotificationEvent( + [in] HANDLE event, + [out] DWORD *cookie + ); + void UnregisterVideoMemoryBudgetChangeNotification( + [in] DWORD cookie + ); +}

1 0

Ihsan Akmal : include: Add dxgi1_5.idl.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: 5b4d0f17e3553c74f463ee81e72f347c8fcb15f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b4d0f17e3553c74f463ee81e… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Thu Sep 21 22:29:37 2017 +0200 include: Add dxgi1_5.idl. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/dxgi1_5.idl | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index f21d120..04665ef 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -71,6 +71,7 @@ IDL_SRCS = \ dxgi1_2.idl \ dxgi1_3.idl \ dxgi1_4.idl \ + dxgi1_5.idl \ dxgicommon.idl \ dxgiformat.idl \ dxgitype.idl \ diff --git a/include/dxgi1_5.idl b/include/dxgi1_5.idl new file mode 100644 index 0000000..d88d141 --- /dev/null +++ b/include/dxgi1_5.idl @@ -0,0 +1,127 @@ +/* + * Copyright 2017 Ihsan Akmal + * + * 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 "dxgi1_4.idl"; + +typedef enum DXGI_OUTDUPL_FLAG +{ + DXGI_OUTDUPL_COMPOSITED_UI_CAPTURE_ONLY = 0x1, +} DXGI_OUTDUPL_FLAG; + +typedef enum DXGI_HDR_METADATA_TYPE +{ + DXGI_HDR_METADATA_TYPE_NONE = 0x0, + DXGI_HDR_METADATA_TYPE_HDR10 = 0x1, +} DXGI_HDR_METADATA_TYPE; + +typedef enum _DXGI_OFFER_RESOURCE_FLAGS +{ + DXGI_OFFER_RESOURCE_FLAG_ALLOW_DECOMMIT = 0x1, +} DXGI_OFFER_RESOURCE_FLAGS; + +typedef enum _DXGI_RECLAIM_RESOURCE_RESULTS +{ + DXGI_RECLAIM_RESOURCE_RESULT_OK = 0x0, + DXGI_RECLAIM_RESOURCE_RESULT_DISCARDED = 0x1, + DXGI_RECLAIM_RESOURCE_RESULT_NOT_COMMITTED = 0x2, +} DXGI_RECLAIM_RESOURCE_RESULTS; + +typedef enum DXGI_FEATURE +{ + DXGI_FEATURE_PRESENT_ALLOW_TEARING = 0x0, +} DXGI_FEATURE; + +typedef struct DXGI_HDR_METADATA_HDR10 +{ + UINT16 RedPrimary[2]; + UINT16 GreenPrimary[2]; + UINT16 BluePrimary[2]; + UINT16 WhitePoint[2]; + UINT MaxMasteringLuminance; + UINT MinMasteringLuminance; + UINT16 MaxContentLightLevel; + UINT16 MaxFrameAverageLightLevel; +} DXGI_HDR_METADATA_HDR10; + +[ + object, + uuid(80a07424-ab52-42eb-833c-0c42fd282d98), + local, + pointer_default(unique) +] +interface IDXGIOutput5 : IDXGIOutput4 +{ + HRESULT DuplicateOutput1( + [in] IUnknown *device, + [in] UINT flags, + [in] UINT format_count, + [in] const DXGI_FORMAT *formats, + [out] IDXGIOutputDuplication **duplication + ); +} + +[ + object, + uuid(3d585d5a-bd4a-489e-b1f4-3dbcb6452ffb), + local, + pointer_default(unique) +] +interface IDXGISwapChain4 : IDXGISwapChain3 +{ + HRESULT SetHDRMetaData( + [in] DXGI_HDR_METADATA_TYPE type, + [in] UINT size, + [in] void *metadata + ); +} + +[ + object, + uuid(95b4f95f-d8da-4ca4-9ee6-3b76d5968a10), + local, + pointer_default(unique) +] +interface IDXGIDevice4 : IDXGIDevice3 +{ + HRESULT OfferResources1( + [in] UINT resource_count, + [in] IDXGIResource *const *resources, + [in] DXGI_OFFER_RESOURCE_PRIORITY priority, + [in] UINT flags + ); + HRESULT ReclaimResources1( + [in] UINT resource_count, + [in] IDXGIResource *const *resources, + [out] DXGI_RECLAIM_RESOURCE_RESULTS *results + ); +} + +[ + object, + uuid(7632e1f5-ee65-4dca-87fd-84cd75f8838d), + local, + pointer_default(unique) +] +interface IDXGIFactory5 : IDXGIFactory4 +{ + HRESULT CheckFeatureSupport( + DXGI_FEATURE feature, + [in, out] void *support_data, + UINT support_data_size + ); +}

1 0

Ihsan Akmal : include: Add dxgi1_6.idl.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: 54483fc7966213e44401482176095cae07c50131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54483fc7966213e4440148217… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Thu Sep 21 22:29:38 2017 +0200 include: Add dxgi1_6.idl. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/dxgi1_6.idl | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 04665ef..fd52a5f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -72,6 +72,7 @@ IDL_SRCS = \ dxgi1_3.idl \ dxgi1_4.idl \ dxgi1_5.idl \ + dxgi1_6.idl \ dxgicommon.idl \ dxgiformat.idl \ dxgitype.idl \ diff --git a/include/dxgi1_6.idl b/include/dxgi1_6.idl new file mode 100644 index 0000000..9dcf9f2 --- /dev/null +++ b/include/dxgi1_6.idl @@ -0,0 +1,98 @@ +/* + * Copyright 2017 Ihsan Akmal + * + * 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 "dxgi1_5.idl"; + +typedef enum DXGI_ADAPTER_FLAG3 +{ + DXGI_ADAPTER_FLAG3_NONE = 0x0, + DXGI_ADAPTER_FLAG3_REMOTE = 0x1, + DXGI_ADAPTER_FLAG3_SOFTWARE = 0x2, + DXGI_ADAPTER_FLAG3_ACG_COMPATIBLE = 0x4, + DXGI_ADAPTER_FLAG3_FORCE_DWORD = 0xffffffff, +} DXGI_ADAPTER_FLAG3; + +typedef enum DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS +{ + DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAG_FULLSCREEN = 0x1, + DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAG_WINDOWED = 0x2, + DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAG_CURSOR_STRETCHED = 0x4, +} DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS; + +typedef struct DXGI_ADAPTER_DESC3 +{ + WCHAR Description[128]; + UINT VendorId; + UINT DeviceId; + UINT SubSysId; + UINT Revision; + SIZE_T DedicatedVideoMemory; + SIZE_T DedicatedSystemMemory; + SIZE_T SharedSystemMemory; + LUID AdapterLuid; + DXGI_ADAPTER_FLAG3 Flags; + DXGI_GRAPHICS_PREEMPTION_GRANULARITY GraphicsPreemptionGranularity; + DXGI_COMPUTE_PREEMPTION_GRANULARITY ComputePreemptionGranularity; +} DXGI_ADAPTER_DESC3; + +typedef struct DXGI_OUTPUT_DESC1 +{ + WCHAR DeviceName[32]; + RECT DesktopCoordinates; + BOOL AttachedToDesktop; + DXGI_MODE_ROTATION Rotation; + HMONITOR Monitor; + UINT BitsPerColor; + DXGI_COLOR_SPACE_TYPE ColorSpace; + FLOAT RedPrimary[2]; + FLOAT GreenPrimary[2]; + FLOAT BluePrimary[2]; + FLOAT WhitePoint[2]; + FLOAT MinLuminance; + FLOAT MaxLuminance; + FLOAT MaxFullFrameLuminance; +} DXGI_OUTPUT_DESC1; + +[ + object, + uuid(3c8d99d1-4fbf-4181-a82c-af66bf7bd24e), + local, + pointer_default(unique) +] +interface IDXGIAdapter4 : IDXGIAdapter3 +{ + HRESULT GetDesc3( + [out] DXGI_ADAPTER_DESC3 *desc + ); +} + +[ + object, + uuid(068346e8-aaec-4b84-add7-137f513f77a1), + local, + pointer_default(unique) +] +interface IDXGIOutput6 : IDXGIOutput5 +{ + HRESULT GetDesc1( + [out] DXGI_OUTPUT_DESC1 *desc + ); + HRESULT CheckHardwareCompositionSupport( + [out] UINT *flags + ); +}

1 0

Jacek Caban : mshtml: Initialize DispatchEx in HTMLDOMNode_Init.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: 1b09514c820228bc6414e2d8d26574c37c19c1ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b09514c820228bc6414e2d8d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 21 23:25:17 2017 +0200 mshtml: Initialize DispatchEx in HTMLDOMNode_Init. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcomment.c | 2 +- dlls/mshtml/htmldoc.c | 6 ++---- dlls/mshtml/htmlelem.c | 4 +--- dlls/mshtml/htmlnode.c | 19 +++++++++++++++++-- dlls/mshtml/htmltextnode.c | 5 +---- dlls/mshtml/mshtml_private.h | 2 +- 6 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index ed6a740..85eceef 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -217,7 +217,7 @@ HRESULT HTMLCommentElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTM ret->IHTMLCommentElement_iface.lpVtbl = &HTMLCommentElementVtbl; HTMLElement_Init(&ret->element, doc, NULL, &HTMLCommentElement_dispex); - HTMLDOMNode_Init(doc, &ret->element.node, nsnode); + HTMLDOMNode_Init(doc, &ret->element.node, nsnode, &HTMLCommentElement_dispex); *elem = &ret->element; return S_OK; diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0a2d243..f4ff2f7 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5025,8 +5025,6 @@ static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLInnerWindo doc->basedoc.window = window->base.outer_window; doc->window = window; - init_dispex(&doc->node.event_target.dispex, (IUnknown*)&doc->node.IHTMLDOMNode_iface, - &HTMLDocumentNode_dispex); init_doc(&doc->basedoc, (IUnknown*)&doc->node.IHTMLDOMNode_iface, &doc->node.event_target.dispex.IDispatchEx_iface); HTMLDocumentNode_SecMgr_Init(doc); @@ -5049,7 +5047,7 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob if(!doc_obj->basedoc.window || window->base.outer_window == doc_obj->basedoc.window) doc->basedoc.cp_container.forward_container = &doc_obj->basedoc.cp_container; - HTMLDOMNode_Init(doc, &doc->node, (nsIDOMNode*)nsdoc); + HTMLDOMNode_Init(doc, &doc->node, (nsIDOMNode*)nsdoc, &HTMLDocumentNode_dispex); nsIDOMHTMLDocument_AddRef(nsdoc); doc->nsdoc = nsdoc; @@ -5074,7 +5072,7 @@ static HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *do IHTMLWindow2_AddRef(&doc_frag->window->base.IHTMLWindow2_iface); - HTMLDOMNode_Init(doc_node, &doc_frag->node, nsnode); + HTMLDOMNode_Init(doc_node, &doc_frag->node, nsnode, &HTMLDocumentNode_dispex); doc_frag->node.vtbl = &HTMLDocumentFragmentImplVtbl; doc_frag->node.cp_container = &doc_frag->basedoc.cp_container; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index a87bdf0..ea65042 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5396,11 +5396,9 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMHTMLElemen if(dispex_data && !dispex_data->vtbl) dispex_data->vtbl = &HTMLElement_dispex_vtbl; - init_dispex_with_compat_mode(&This->node.event_target.dispex, (IUnknown*)&This->IHTMLElement_iface, - dispex_data ? dispex_data : &HTMLElement_dispex, doc->document_mode); if(nselem) { - HTMLDOMNode_Init(doc, &This->node, (nsIDOMNode*)nselem); + HTMLDOMNode_Init(doc, &This->node, (nsIDOMNode*)nselem, dispex_data ? dispex_data : &HTMLElement_dispex); /* No AddRef, share reference with HTMLDOMNode */ assert((nsIDOMNode*)nselem == This->node.nsnode); diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 80bf31d..e90f4e3 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1441,7 +1441,7 @@ static const NodeImplVtbl HTMLDOMNodeImplVtbl = { HTMLDOMNode_clone }; -void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsnode) +void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsnode, dispex_static_data_t *dispex_data) { nsresult nsres; @@ -1450,6 +1450,8 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno node->IHTMLDOMNode3_iface.lpVtbl = &HTMLDOMNode3Vtbl; ccref_init(&node->ccref, 1); + init_dispex_with_compat_mode(&node->event_target.dispex, (IUnknown*)&node->IHTMLDOMNode_iface, + dispex_data, doc->document_mode); init_event_target(&node->event_target); if(&doc->node != node) @@ -1463,6 +1465,17 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno assert(nsres == NS_OK); } +static const tid_t HTMLDOMNode_iface_tids[] = { + IHTMLDOMNode_tid, + 0 +}; +static dispex_static_data_t HTMLDOMNode_dispex = { + NULL, + IHTMLDOMNode_tid, + HTMLDOMNode_iface_tids, + HTMLDOMNode_init_dispex_info +}; + static HRESULT create_node(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDOMNode **ret) { UINT16 node_type; @@ -1500,12 +1513,14 @@ static HRESULT create_node(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDOMNod default: { HTMLDOMNode *node; + FIXME("unimplemented node type %u\n", node_type); + node = heap_alloc_zero(sizeof(HTMLDOMNode)); if(!node) return E_OUTOFMEMORY; node->vtbl = &HTMLDOMNodeImplVtbl; - HTMLDOMNode_Init(doc, node, nsnode); + HTMLDOMNode_Init(doc, node, nsnode, &HTMLDOMNode_dispex); *ret = node; } } diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index a5587c1..f9d7eec 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -378,10 +378,7 @@ HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDO ret->IHTMLDOMTextNode_iface.lpVtbl = &HTMLDOMTextNodeVtbl; ret->IHTMLDOMTextNode2_iface.lpVtbl = &HTMLDOMTextNode2Vtbl; - init_dispex_with_compat_mode(&ret->node.event_target.dispex, (IUnknown*)&ret->IHTMLDOMTextNode_iface, - &HTMLDOMTextNode_dispex, doc->document_mode); - - HTMLDOMNode_Init(doc, &ret->node, nsnode); + HTMLDOMNode_Init(doc, &ret->node, nsnode, &HTMLDOMTextNode_dispex); nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMText, (void**)&ret->nstext); assert(nsres == NS_OK && (nsIDOMNode*)ret->nstext == ret->node.nsnode); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ecd72b8..45bf98c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1035,7 +1035,7 @@ HRESULT HTMLTextAreaElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElem HRESULT HTMLTitleElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLGenericElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**) DECLSPEC_HIDDEN; -void HTMLDOMNode_Init(HTMLDocumentNode*,HTMLDOMNode*,nsIDOMNode*) DECLSPEC_HIDDEN; +void HTMLDOMNode_Init(HTMLDocumentNode*,HTMLDOMNode*,nsIDOMNode*,dispex_static_data_t*) DECLSPEC_HIDDEN; void HTMLElement_Init(HTMLElement*,HTMLDocumentNode*,nsIDOMHTMLElement*,dispex_static_data_t*) DECLSPEC_HIDDEN; void HTMLTextContainer_Init(HTMLTextContainer*,HTMLDocumentNode*,nsIDOMHTMLElement*,dispex_static_data_t*) DECLSPEC_HIDDEN; void HTMLFrameBase_Init(HTMLFrameBase*,HTMLDocumentNode*,nsIDOMHTMLElement*,dispex_static_data_t*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Introduce EventTarget_Init.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: d69f1f01e59385ffc04d29febccea75a7ce6e0b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d69f1f01e59385ffc04d29feb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 21 23:25:27 2017 +0200 mshtml: Introduce EventTarget_Init. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 4 +++- dlls/mshtml/htmlevent.h | 1 - dlls/mshtml/htmlnode.c | 4 +--- dlls/mshtml/htmlwindow.c | 4 ++-- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/xmlhttprequest.c | 5 ++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 40f26de..c47b71d 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1643,8 +1643,10 @@ static int event_id_cmp(const void *key, const struct wine_rb_entry *entry) return (INT_PTR)key - WINE_RB_ENTRY_VALUE(entry, handler_vector_t, entry)->event_id; } -void init_event_target(EventTarget *event_target) +void EventTarget_Init(EventTarget *event_target, IUnknown *outer, dispex_static_data_t *dispex_data, + compat_mode_t compat_mode) { + init_dispex_with_compat_mode(&event_target->dispex, outer, dispex_data, compat_mode); wine_rb_init(&event_target->handler_map, event_id_cmp); } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index b88f32f3..c47f20f 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -57,7 +57,6 @@ typedef enum { eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN; -void init_event_target(EventTarget*) DECLSPEC_HIDDEN; void release_event_target(EventTarget*) DECLSPEC_HIDDEN; void fire_event(HTMLDocumentNode*,eventid_t,BOOL,HTMLDOMNode*,nsIDOMEvent*,IDispatch*) DECLSPEC_HIDDEN; HRESULT set_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index e90f4e3..730e2a8 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1450,9 +1450,7 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno node->IHTMLDOMNode3_iface.lpVtbl = &HTMLDOMNode3Vtbl; ccref_init(&node->ccref, 1); - init_dispex_with_compat_mode(&node->event_target.dispex, (IUnknown*)&node->IHTMLDOMNode_iface, - dispex_data, doc->document_mode); - init_event_target(&node->event_target); + EventTarget_Init(&node->event_target, (IUnknown*)&node->IHTMLDOMNode_iface, dispex_data, doc->document_mode); if(&doc->node != node) htmldoc_addref(&doc->basedoc); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index dc18f84..f61aa91 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3078,8 +3078,8 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, IMoniker *mon, window->base.outer_window = outer_window; window->base.inner_window = window; - init_event_target(&window->event_target); - init_dispex(&window->event_target.dispex, (IUnknown*)&window->base.IHTMLWindow2_iface, &HTMLWindow_dispex); + EventTarget_Init(&window->event_target, (IUnknown*)&window->base.IHTMLWindow2_iface, + &HTMLWindow_dispex, COMPAT_MODE_NONE); window->task_magic = get_task_target_magic(); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 45bf98c..5d46317 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1040,6 +1040,8 @@ void HTMLElement_Init(HTMLElement*,HTMLDocumentNode*,nsIDOMHTMLElement*,dispex_s void HTMLTextContainer_Init(HTMLTextContainer*,HTMLDocumentNode*,nsIDOMHTMLElement*,dispex_static_data_t*) DECLSPEC_HIDDEN; void HTMLFrameBase_Init(HTMLFrameBase*,HTMLDocumentNode*,nsIDOMHTMLElement*,dispex_static_data_t*) DECLSPEC_HIDDEN; +void EventTarget_Init(EventTarget*,IUnknown*,dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; + HRESULT HTMLDOMNode_QI(HTMLDOMNode*,REFIID,void**) DECLSPEC_HIDDEN; void HTMLDOMNode_destructor(HTMLDOMNode*) DECLSPEC_HIDDEN; void HTMLDOMNode_init_dispex_info(dispex_data_t*,compat_mode_t) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 35e91fc..e257bbc 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -901,9 +901,8 @@ static HRESULT WINAPI HTMLXMLHttpRequestFactory_create(IHTMLXMLHttpRequestFactor ret->IHTMLXMLHttpRequest_iface.lpVtbl = &HTMLXMLHttpRequestVtbl; ret->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; - init_event_target(&ret->event_target); - init_dispex(&ret->event_target.dispex, (IUnknown*)&ret->IHTMLXMLHttpRequest_iface, - &HTMLXMLHttpRequest_dispex); + EventTarget_Init(&ret->event_target, (IUnknown*)&ret->IHTMLXMLHttpRequest_iface, + &HTMLXMLHttpRequest_dispex, COMPAT_MODE_NONE); ret->ref = 1; *p = &ret->IHTMLXMLHttpRequest_iface;

1 0

Jacek Caban : mshtml: Introduce EventTarget_QI.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: 632d897c1035d0ec98b2aaaf45f19f9cd26f1515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=632d897c1035d0ec98b2aaaf4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 21 23:25:36 2017 +0200 mshtml: Introduce EventTarget_QI. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 10 ++++++++++ dlls/mshtml/htmlnode.c | 6 +----- dlls/mshtml/htmlwindow.c | 4 +--- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/xmlhttprequest.c | 6 +----- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c47b71d..0061384 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1638,6 +1638,16 @@ HRESULT doc_init_events(HTMLDocumentNode *doc) return S_OK; } +HRESULT EventTarget_QI(EventTarget *event_target, REFIID riid, void **ppv) +{ + if(dispex_query_interface(&event_target->dispex, riid, ppv)) + return *ppv ? S_OK : E_NOINTERFACE; + + WARN("(%p)->(%s %p)\n", event_target, debugstr_mshtml_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; +} + static int event_id_cmp(const void *key, const struct wine_rb_entry *entry) { return (INT_PTR)key - WINE_RB_ENTRY_VALUE(entry, handler_vector_t, entry)->event_id; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 730e2a8..8f03b4a 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1399,12 +1399,8 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_nsCycleCollectionISupports, riid)) { *ppv = &This->IHTMLDOMNode_iface; return S_OK; - }else if(dispex_query_interface(&This->event_target.dispex, riid, ppv)) { - return *ppv ? S_OK : E_NOINTERFACE; }else { - *ppv = NULL; - WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - return E_NOINTERFACE; + return EventTarget_QI(&This->event_target, riid, ppv); } IUnknown_AddRef((IUnknown*)*ppv); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index f61aa91..6dd66f2 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -198,9 +198,7 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii assert(!*ppv); return E_NOINTERFACE; }else { - *ppv = NULL; - WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - return E_NOINTERFACE; + return EventTarget_QI(&This->inner_window->event_target, riid, ppv); } IUnknown_AddRef((IUnknown*)*ppv); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5d46317..f509b43 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1041,6 +1041,7 @@ void HTMLTextContainer_Init(HTMLTextContainer*,HTMLDocumentNode*,nsIDOMHTMLEleme void HTMLFrameBase_Init(HTMLFrameBase*,HTMLDocumentNode*,nsIDOMHTMLElement*,dispex_static_data_t*) DECLSPEC_HIDDEN; void EventTarget_Init(EventTarget*,IUnknown*,dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; +HRESULT EventTarget_QI(EventTarget*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT HTMLDOMNode_QI(HTMLDOMNode*,REFIID,void**) DECLSPEC_HIDDEN; void HTMLDOMNode_destructor(HTMLDOMNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index e257bbc..7e2da4b 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -223,12 +223,8 @@ static HRESULT WINAPI HTMLXMLHttpRequest_QueryInterface(IHTMLXMLHttpRequest *ifa *ppv = &This->IProvideClassInfo2_iface; }else if(IsEqualGUID(&IID_IProvideClassInfo2, riid)) { *ppv = &This->IProvideClassInfo2_iface; - }else if(dispex_query_interface(&This->event_target.dispex, riid, ppv)) { - return *ppv ? S_OK : E_NOINTERFACE; }else { - *ppv = NULL; - WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - return E_NOINTERFACE; + return EventTarget_QI(&This->event_target, riid, ppv); } IUnknown_AddRef((IUnknown*)*ppv);

1 0

Jacek Caban : mshtml: Added IEventTarget stub implementation.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: 455d68467116dd962caceb844a74d8ee4ef8484c URL: http://source.winehq.org/git/wine.git/?a=commit;h=455d68467116dd962caceb844… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 21 23:25:55 2017 +0200 mshtml: Added IEventTarget stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 8 ++- dlls/mshtml/htmlevent.c | 126 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/dom.c | 28 ++++++++++ 4 files changed, 162 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 95c17b8..de478f3 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1346,6 +1346,11 @@ HRESULT remove_attribute(DispatchEx *This, DISPID id, VARIANT_BOOL *success) } } +compat_mode_t dispex_compat_mode(DispatchEx *dispex) +{ + return dispex->info->desc->vtbl->get_compat_mode(dispex); +} + static dispex_data_t *ensure_dispex_info(dispex_static_data_t *desc, compat_mode_t compat_mode) { if(!desc->info_cache[compat_mode]) { @@ -1362,8 +1367,7 @@ static BOOL ensure_real_info(DispatchEx *dispex) if(dispex->info != dispex->info->desc->delayed_init_info) return TRUE; - dispex->info = ensure_dispex_info(dispex->info->desc, - dispex->info->desc->vtbl->get_compat_mode(dispex)); + dispex->info = ensure_dispex_info(dispex->info->desc, dispex_compat_mode(dispex)); return dispex->info != NULL; } diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0061384..4372066 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1638,8 +1638,120 @@ HRESULT doc_init_events(HTMLDocumentNode *doc) return S_OK; } +static inline EventTarget *impl_from_IEventTarget(IEventTarget *iface) +{ + return CONTAINING_RECORD(iface, EventTarget, IEventTarget_iface); +} + +static HRESULT WINAPI EventTarget_QueryInterface(IEventTarget *iface, REFIID riid, void **ppv) +{ + EventTarget *This = impl_from_IEventTarget(iface); + return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); +} + +static ULONG WINAPI EventTarget_AddRef(IEventTarget *iface) +{ + EventTarget *This = impl_from_IEventTarget(iface); + return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); +} + +static ULONG WINAPI EventTarget_Release(IEventTarget *iface) +{ + EventTarget *This = impl_from_IEventTarget(iface); + return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); +} + +static HRESULT WINAPI EventTarget_GetTypeInfoCount(IEventTarget *iface, UINT *pctinfo) +{ + EventTarget *This = impl_from_IEventTarget(iface); + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI EventTarget_GetTypeInfo(IEventTarget *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + EventTarget *This = impl_from_IEventTarget(iface); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI EventTarget_GetIDsOfNames(IEventTarget *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + EventTarget *This = impl_from_IEventTarget(iface); + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, + rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI EventTarget_Invoke(IEventTarget *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + EventTarget *This = impl_from_IEventTarget(iface); + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, + riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI EventTarget_addEventListener(IEventTarget *iface, BSTR type, + IDispatch *listener, VARIANT_BOOL capture) +{ + EventTarget *This = impl_from_IEventTarget(iface); + FIXME("(%p)->(%s %p %x)\n", This, debugstr_w(type), listener, capture); + return E_NOTIMPL; +} + +static HRESULT WINAPI EventTarget_removeEventListener(IEventTarget *iface, BSTR type, + IDispatch *listener, VARIANT_BOOL capture) +{ + EventTarget *This = impl_from_IEventTarget(iface); + FIXME("(%p)->(%s %p %x)\n", This, debugstr_w(type), listener, capture); + return E_NOTIMPL; +} + +static HRESULT WINAPI EventTarget_dispatchEvent(IEventTarget *iface, IDOMEvent *event, VARIANT_BOOL *result) +{ + EventTarget *This = impl_from_IEventTarget(iface); + FIXME("(%p)->(%p %p)\n", This, event, result); + return E_NOTIMPL; +} + +static const IEventTargetVtbl EventTargetVtbl = { + EventTarget_QueryInterface, + EventTarget_AddRef, + EventTarget_Release, + EventTarget_GetTypeInfoCount, + EventTarget_GetTypeInfo, + EventTarget_GetIDsOfNames, + EventTarget_Invoke, + EventTarget_addEventListener, + EventTarget_removeEventListener, + EventTarget_dispatchEvent +}; + +#define DELAY_INIT_VTBL ((const IEventTargetVtbl*)1) + +static BOOL use_event_quirks(EventTarget *event_target) +{ + if(event_target->IEventTarget_iface.lpVtbl == DELAY_INIT_VTBL) { + event_target->IEventTarget_iface.lpVtbl = + dispex_compat_mode(&event_target->dispex) >= COMPAT_MODE_IE9 + ? &EventTargetVtbl : NULL; + } + return !event_target->IEventTarget_iface.lpVtbl; +} + HRESULT EventTarget_QI(EventTarget *event_target, REFIID riid, void **ppv) { + if(IsEqualGUID(riid, &IID_IEventTarget)) { + if(use_event_quirks(event_target)) { + WARN("IEventTarget queried, but not supported by in document mode\n"); + *ppv = NULL; + return E_NOINTERFACE; + } + IEventTarget_AddRef(&event_target->IEventTarget_iface); + *ppv = &event_target->IEventTarget_iface; + return S_OK; + } + if(dispex_query_interface(&event_target->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; @@ -1658,6 +1770,20 @@ void EventTarget_Init(EventTarget *event_target, IUnknown *outer, dispex_static_ { init_dispex_with_compat_mode(&event_target->dispex, outer, dispex_data, compat_mode); wine_rb_init(&event_target->handler_map, event_id_cmp); + + /* + * IEventTarget is supported by the object or not depending on compatibility mode. + * We use NULL vtbl for objects in compatibility mode not supporting the interface. + * For targets that don't know compatibility mode at creation time, we set vtbl + * to special DELAY_INIT_VTBL value so that vtbl will be set to proper value + * when it's needed. + */ + if(compat_mode == COMPAT_MODE_QUIRKS && dispex_data->vtbl && dispex_data->vtbl->get_compat_mode) + event_target->IEventTarget_iface.lpVtbl = DELAY_INIT_VTBL; + else if(compat_mode < COMPAT_MODE_IE9) + event_target->IEventTarget_iface.lpVtbl = NULL; + else + event_target->IEventTarget_iface.lpVtbl = &EventTargetVtbl; } void release_event_target(EventTarget *event_target) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f509b43..1727f2c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -333,6 +333,7 @@ void release_typelib(void) DECLSPEC_HIDDEN; HRESULT get_class_typeinfo(const CLSID*,ITypeInfo**) DECLSPEC_HIDDEN; const dispex_static_data_vtbl_t *dispex_get_vtbl(DispatchEx*) DECLSPEC_HIDDEN; void dispex_info_add_interface(dispex_data_t*,tid_t,const DISPID*) DECLSPEC_HIDDEN; +compat_mode_t dispex_compat_mode(DispatchEx*) DECLSPEC_HIDDEN; static inline void init_dispex(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *desc) { @@ -379,6 +380,7 @@ typedef struct { struct EventTarget { DispatchEx dispex; + IEventTarget IEventTarget_iface; struct wine_rb_tree handler_map; }; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d7cfedd..0ce4872 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -10582,7 +10582,10 @@ static float expected_document_mode; static void test_document_mode(IHTMLDocument2 *doc2) { + IEventTarget *event_target; + IHTMLDocument2 *doc_node; IHTMLDocument6 *doc; + IHTMLElement *body; VARIANT v; HRESULT hres; @@ -10605,6 +10608,31 @@ static void test_document_mode(IHTMLDocument2 *doc2) ok(V_VT(&v) == VT_R4, "V_VT(documentMode) = %u\n", V_VT(&v)); ok(V_R4(&v) == expected_document_mode, "documentMode = %f\n", V_R4(&v)); IHTMLDocument6_Release(doc); + + doc_node = get_doc_node(doc2); + + hres = IHTMLDocument2_QueryInterface(doc_node, &IID_IEventTarget, (void**)&event_target); + if(expected_document_mode >= 9) { + ok(hres == S_OK, "Could not get IEventTarget interface: %08x\n", hres); + IEventTarget_Release(event_target); + }else { + ok(hres == E_NOINTERFACE, "QI(IEventTarget) returned %08x\n", hres); + } + + IHTMLDocument2_Release(doc_node); + + + body = doc_get_body(doc2); + + hres = IHTMLElement_QueryInterface(body, &IID_IEventTarget, (void**)&event_target); + if(expected_document_mode >= 9) { + ok(hres == S_OK, "Could not get IEventTarget interface: %08x\n", hres); + IEventTarget_Release(event_target); + }else { + ok(hres == E_NOINTERFACE, "QI(IEventTarget) returned %08x\n", hres); + } + + IHTMLElement_Release(body); } static void test_quirks_mode(void)

1 0

Zebediah Figura : include: Update BrowserNavConstants enum for Win10.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: 52e45d8f505f393e3a347426b7b0dc3ac4dcf64a URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e45d8f505f393e3a347426b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 21 13:55:40 2017 -0500 include: Update BrowserNavConstants enum for Win10. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/exdisp.idl | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/include/exdisp.idl b/include/exdisp.idl index b665ce3..90cc266 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -64,14 +64,35 @@ interface IWebBrowser : IDispatch { typedef enum BrowserNavConstants { - navOpenInNewWindow = 0x1, - navNoHistory = 0x2, - navNoReadFromCache = 0x4, - navNoWriteToCache = 0x8, - navAllowAutosearch = 0x10, - navBrowserBar = 0x20, - navHyperlink = 0x40, - navEnforceRestricted = 0x80 + navOpenInNewWindow = 0x00000001, + navNoHistory = 0x00000002, + navNoReadFromCache = 0x00000004, + navNoWriteToCache = 0x00000008, + navAllowAutosearch = 0x00000010, + navBrowserBar = 0x00000020, + navHyperlink = 0x00000040, + navEnforceRestricted = 0x00000080, + navNewWindowsManaged = 0x00000100, + navUntrustedForDownload = 0x00000200, + navTrustedForActiveX = 0x00000400, + navOpenInNewTab = 0x00000800, + navOpenInBackgroundTab = 0x00001000, + navKeepWordWheelText = 0x00002000, + navVirtualTab = 0x00004000, + navBlockRedirectsXDomain = 0x00008000, + navOpenNewForegroundTab = 0x00010000, + navTravelLogScreenshot = 0x00020000, + navDeferUnload = 0x00040000, + navSpeculative = 0x00080000, + navSuggestNewWindow = 0x00100000, + navSuggestNewTab = 0x00200000, + navReserved1 = 0x00400000, + navHomepageNavigate = 0x00800000, + navRefresh = 0x01000000, + navHostNavigation = 0x02000000, + navReserved2 = 0x04000000, + navReserved3 = 0x08000000, + navReserved4 = 0x10000000, } BrowserNavConstants; typedef enum RefreshConstants

1 0