September 2017 - Wine-Commits

Jacek Caban : mshtml: Initialize DispatchEx in HTMLDOMNode_Init.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

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

Ihsan Akmal : include: Add dxgi1_6.idl.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

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

Ihsan Akmal : include: Add dxgi1_5.idl.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

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_4.idl.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

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

Jacek Caban : mshtml: Introduce EventTarget_QI.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

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

Henri Verbeet : include: Convert dcommon.h to IDL.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

Module: wine Branch: master Commit: 4091704bf4a9663b9fc4efc7993036cd4fab6734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4091704bf4a9663b9fc4efc79… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 21 22:29:33 2017 +0200 include: Convert dcommon.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/d2d1.idl | 2 +- include/{dcommon.h => dcommon.idl} | 17 ++++++++++------- include/dwrite.idl | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 41a23d3..1f6656a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -53,6 +53,7 @@ IDL_SRCS = \ dbinit.idl \ dbprop.idl \ dbs.idl \ + dcommon.idl \ ddstream.idl \ devenum.idl \ devicetopology.idl \ @@ -294,7 +295,6 @@ HEADER_SRCS = \ dbt.h \ dciddi.h \ dciman.h \ - dcommon.h \ dde.h \ dde.rh \ ddeml.h \ diff --git a/include/d2d1.idl b/include/d2d1.idl index 4a62f7c..fbfb40d 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -17,7 +17,7 @@ */ import "unknwn.idl"; -import "dcommon.h"; +import "dcommon.idl"; import "d2dbasetypes.h"; import "d3d10_1.idl"; import "d2derr.h"; diff --git a/include/dcommon.h b/include/dcommon.idl similarity index 90% rename from include/dcommon.h rename to include/dcommon.idl index a516e8a..b77ec48 100644 --- a/include/dcommon.h +++ b/include/dcommon.idl @@ -16,10 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_DCOMMON_H -#define __WINE_DCOMMON_H +import "dxgiformat.h"; -#include "dxgiformat.h" +cpp_quote("#if 0") +typedef struct +{ + long x, y; +} POINT; +typedef unsigned int UINT32; +cpp_quote("#endif") typedef enum DWRITE_MEASURING_MODE { @@ -45,8 +50,8 @@ typedef struct D2D1_PIXEL_FORMAT typedef struct D2D_POINT_2F { - FLOAT x; - FLOAT y; + float x; + float y; } D2D_POINT_2F, D2D1_POINT_2F; typedef POINT D2D_POINT_2L, D2D1_POINT_2L; @@ -56,5 +61,3 @@ typedef struct D2D_SIZE_U UINT32 width; UINT32 height; } D2D_SIZE_U, D2D1_SIZE_U; - -#endif /* __WINE_DCOMMON_H */ diff --git a/include/dwrite.idl b/include/dwrite.idl index 06ae767..115f958 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -17,7 +17,7 @@ */ import "unknwn.idl"; -import "dcommon.h"; +import "dcommon.idl"; interface IDWriteFactory; interface IDWriteFontCollection;

1 0

Rosanne DiMesio : Fix Extra comments field
by Jeremy Newman Sept. 22, 2017

Sept. 22, 2017

Module: appdb Branch: master Commit: 2bc14bd60f0a804e10a98e2f3c2fc38619c7d503 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2bc14bd60f0a804e10a98e2f… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri Sep 22 11:48:26 2017 -0500 Fix Extra comments field Fixes bug 43755. Also fixes a typo in the Hardware section. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/testData.php b/include/testData.php index 86771d2..baf69f3 100644 --- a/include/testData.php +++ b/include/testData.php @@ -21,7 +21,7 @@ class testData{ var $sUsedWorkaround; var $shWorkarounds; var $sTestedRating; - var $sComments; + var $shComments; var $sSubmitTime; var $iSubmitterId; var $sGpuMfr; @@ -61,7 +61,7 @@ class testData{ $this->sUsedWorkaround = $oRow->usedWorkaround; $this->shWorkarounds = $oRow->workarounds; $this->sTestedRating = $oRow->testedRating; - $this->sComments = $oRow->comments; + $this->shComments = $oRow->comments; $this->sSubmitTime = $oRow->submitTime; $this->iSubmitterId = $oRow->submitterId; $this->sState = $oRow->state; @@ -102,7 +102,7 @@ class testData{ $this->sUsedWorkaround, $this->shWorkarounds, $this->sTestedRating, - $this->sComments, + $this->shComments, date("Y-m-d H:i:s"), $_SESSION['current']->iUserId, $this->sState, @@ -176,10 +176,10 @@ class testData{ $oOldTest->shWhatNotTested."'\nto\n'$this->shWhatNotTested'.\n"; } - if($this->sComments != $oOldTest->sComments) + if($this->shComments != $oOldTest->shComments) { $sWhatChanged .= "Extra comments was changed from\n'". - $oOldTest->sComments."'\nto\n'$this->sComments'.\n"; + $oOldTest->shComments."'\nto\n'$this->shComments'.\n"; } if($this->iDistributionId != $oOldTest->iDistributionId) @@ -271,7 +271,7 @@ class testData{ $this->sUsedWorkaround, $this->shWorkarounds, $this->sTestedRating, - $this->sComments, + $this->shComments, $this->sState, $this->sGpuMfr, $this->sGraphicsDriver, @@ -583,8 +583,8 @@ class testData{ "What does not\n{$this->shWhatDoesnt}\n". "Workarounds\n{$this->shWorkarounds}\n". "What was not tested\n{$this->shWhatNotTested}\n". - "Hardware tested\nGraphics: </ul><li>GPU: {$this->sGpuMfr}</li><li>Driver: {$this->sGraphicsDriver}</li></ul>". - "Additional Comments\n{$this->sComments}\n"; + "Hardware tested\nGraphics: <ul><li>GPU: {$this->sGpuMfr}</li><li>Driver: {$this->sGraphicsDriver}</li></ul>". + "Additional Comments\n{$this->shComments}\n"; } function CreateTestTable() @@ -907,8 +907,8 @@ class testData{ echo '<a href="https://wiki.winehq.org/AppDB_Maintainer_Rating_Definitions" target="_blank">Rating definitions</a></td></tr>',"\n"; // extra comments echo '<tr valign=top><td>Extra comments</td>',"\n"; - echo '<td><textarea name="sComments" id="extra_comments" rows=20 cols=80 class="wysiwyg">'; - echo $this->sComments.'</textarea></td></tr>',"\n"; + echo '<td><textarea name="shComments" id="extra_comments" rows=20 cols=80 class="wysiwyg">'; + echo $this->shComments.'</textarea></td></tr>',"\n"; /* Graphics hardware/driver this section could be expanded to include info on other hardware (e.g., CPU, audio) */ @@ -1100,7 +1100,7 @@ class testData{ $this->sRuns = $aValues['sRuns']; $this->sUsedWorkaround = $aValues['sUsedWorkaround']; $this->sTestedRating = $aValues['sTestedRating']; - $this->sComments = $aValues['sComments']; + $this->shComments = $aValues['shComments']; $this->sGpuMfr = $aValues['sGpuMfr']; $this->sGraphicsDriver = $aValues['sGraphicsDriver']; }

1 0

Matteo Bruni : wined3d: Advertise AUTOGENMIPMAP only for renderable and filterable formats.
by Alexandre Julliard Sept. 21, 2017

Sept. 21, 2017

Module: wine Branch: master Commit: 25a8773d21d0113dc5e4f9dee49d9d9dbeed347b URL: http://source.winehq.org/git/wine.git/?a=commit;h=25a8773d21d0113dc5e4f9dee… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 21 01:07:07 2017 +0200 wined3d: Advertise AUTOGENMIPMAP only for renderable and filterable formats. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 1 - dlls/wined3d/directx.c | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 1d8b8a9..b24136a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6963,7 +6963,6 @@ static void test_mipmap_gen(void) D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, formats[i])); hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, formats[i]); - todo_wine_if (!renderable && hr == D3D_OK) ok((hr == D3D_OK && renderable) || hr == D3DOK_NOAUTOGEN, "Got unexpected hr %#x for %srenderable format %#x.\n", hr, renderable ? "" : "non", formats[i]); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 168e494..da66ad3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5364,7 +5364,9 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad return WINED3DERR_NOTAVAILABLE; } - if ((usage & WINED3DUSAGE_AUTOGENMIPMAP) && !gl_info->supported[SGIS_GENERATE_MIPMAP]) + if ((usage & WINED3DUSAGE_AUTOGENMIPMAP) && (!gl_info->supported[SGIS_GENERATE_MIPMAP] + || (format->flags[gl_type] & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING)) + != (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING))) { TRACE("No WINED3DUSAGE_AUTOGENMIPMAP support, returning WINED3DOK_NOAUTOGEN.\n"); return WINED3DOK_NOAUTOGEN;

1 0

Ihsan Akmal : dxgiformat.h: Add missing DXGI_FORMAT enums.
by Alexandre Julliard Sept. 21, 2017

Sept. 21, 2017

Module: wine Branch: master Commit: 7babc38c235aeecbc56b2db2992bd99b2fac183f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7babc38c235aeecbc56b2db29… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Wed Sep 20 18:43:33 2017 +0800 dxgiformat.h: Add missing DXGI_FORMAT enums. 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/dxgiformat.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/dxgiformat.h b/include/dxgiformat.h index 6bb9d00..4c315cb 100644 --- a/include/dxgiformat.h +++ b/include/dxgiformat.h @@ -138,6 +138,9 @@ typedef enum DXGI_FORMAT { DXGI_FORMAT_P8 = 113, DXGI_FORMAT_A8P8 = 114, DXGI_FORMAT_B4G4R4A4_UNORM = 115, + DXGI_FORMAT_P208 = 130, + DXGI_FORMAT_V208 = 131, + DXGI_FORMAT_V408 = 132, DXGI_FORMAT_FORCE_UINT = 0xffffffff } DXGI_FORMAT;

1 0

Alexandre Julliard : ws2_32/tests: Add some tests for write watches.
by Alexandre Julliard Sept. 21, 2017

Sept. 21, 2017

Module: wine Branch: master Commit: 1c72e594e32714d12f086714d6d0b37c188e50dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c72e594e32714d12f086714d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 21 19:41:17 2017 +0200 ws2_32/tests: Add some tests for write watches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 195 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 897839a..02f7473 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6849,6 +6849,200 @@ end: WSACloseEvent(event); } +struct write_watch_thread_args +{ + int func; + SOCKET dest; + void *base; + DWORD size; + const char *expect; +}; + +static DWORD CALLBACK write_watch_thread( void *arg ) +{ + struct write_watch_thread_args *args = arg; + struct sockaddr addr; + int addr_len, ret; + DWORD bytes, flags = 0; + WSABUF buf[1]; + + switch (args->func) + { + case 0: + ret = recv( args->dest, args->base, args->size, 0 ); + ok( ret == strlen(args->expect) + 1, "wrong len %d\n", ret ); + ok( !strcmp( args->base, args->expect ), "wrong data\n" ); + break; + case 1: + ret = recvfrom( args->dest, args->base, args->size, 0, &addr, &addr_len ); + ok( ret == strlen(args->expect) + 1, "wrong len %d\n", ret ); + ok( !strcmp( args->base, args->expect ), "wrong data\n" ); + break; + case 2: + buf[0].len = args->size; + buf[0].buf = args->base; + ret = WSARecv( args->dest, buf, 1, &bytes, &flags, NULL, NULL ); + ok( !ret, "WSARecv failed %u\n", GetLastError() ); + ok( bytes == strlen(args->expect) + 1, "wrong len %d\n", bytes ); + ok( !strcmp( args->base, args->expect ), "wrong data\n" ); + break; + case 3: + buf[0].len = args->size; + buf[0].buf = args->base; + ret = WSARecvFrom( args->dest, buf, 1, &bytes, &flags, &addr, &addr_len, NULL, NULL ); + ok( !ret, "WSARecvFrom failed %u\n", GetLastError() ); + ok( bytes == strlen(args->expect) + 1, "wrong len %d\n", bytes ); + ok( !strcmp( args->base, args->expect ), "wrong data\n" ); + break; + } + return 0; +} + +static void test_write_watch(void) +{ + SOCKET src, dest; + WSABUF bufs[2]; + WSAOVERLAPPED ov; + struct write_watch_thread_args args; + DWORD bytesReturned, flags, size; + struct sockaddr addr; + int addr_len, ret; + HANDLE thread, event; + char *base; + void *results[64]; + ULONG_PTR count; + ULONG pagesize; + UINT (WINAPI *pGetWriteWatch)(DWORD,LPVOID,SIZE_T,LPVOID*,ULONG_PTR*,ULONG*); + + pGetWriteWatch = (void *)GetProcAddress( GetModuleHandleA("kernel32.dll"), "GetWriteWatch" ); + if (!pGetWriteWatch) + { + win_skip( "write watched not supported\n" ); + return; + } + + tcp_socketpair(&src, &dest); + if (src == INVALID_SOCKET || dest == INVALID_SOCKET) + { + skip("failed to create sockets\n"); + return; + } + + memset(&ov, 0, sizeof(ov)); + ov.hEvent = event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(ov.hEvent != NULL, "could not create event object, errno = %d\n", GetLastError()); + + flags = 0; + + size = 0x10000; + base = VirtualAlloc( 0, size, MEM_RESERVE | MEM_COMMIT | MEM_WRITE_WATCH, PAGE_READWRITE ); + ok( base != NULL, "VirtualAlloc failed %u\n", GetLastError() ); + + memset( base, 0, size ); + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 16, "wrong count %lu\n", count ); + + bufs[0].len = 5; + bufs[0].buf = base; + bufs[1].len = 0x8000; + bufs[1].buf = base + 0x4000; + + ret = WSARecv( dest, bufs, 2, NULL, &flags, &ov, NULL); + ok(ret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, + "WSARecv failed - %d error %d\n", ret, GetLastError()); + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 9, "wrong count %lu\n", count ); + ok( !base[0], "data set\n" ); + + send(src, "test message", sizeof("test message"), 0); + + ret = GetOverlappedResult( (HANDLE)dest, &ov, &bytesReturned, TRUE ); + todo_wine + { + ok( ret, "GetOverlappedResult failed %u\n", GetLastError() ); + ok( bytesReturned == sizeof("test message"), "wrong size %u\n", bytesReturned ); + ok( !memcmp( base, "test ", 5 ), "wrong data %s\n", base ); + ok( !memcmp( base + 0x4000, "message", 8 ), "wrong data %s\n", base + 0x4000 ); + } + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 0, "wrong count %lu\n", count ); + + memset( base, 0, size ); + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 16, "wrong count %lu\n", count ); + + bufs[1].len = 0x4000; + bufs[1].buf = base + 0x2000; + ret = WSARecvFrom( dest, bufs, 2, NULL, &flags, &addr, &addr_len, &ov, NULL); + todo_wine + ok(ret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, + "WSARecv failed - %d error %d\n", ret, GetLastError()); + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 5, "wrong count %lu\n", count ); + todo_wine + ok( !base[0], "data set\n" ); + + send(src, "test message", sizeof("test message"), 0); + + ret = GetOverlappedResult( (HANDLE)dest, &ov, &bytesReturned, TRUE ); + ok( ret, "GetOverlappedResult failed %u\n", GetLastError() ); + ok( bytesReturned == sizeof("test message"), "wrong size %u\n", bytesReturned ); + ok( !memcmp( base, "test ", 5 ), "wrong data %s\n", base ); + ok( !memcmp( base + 0x2000, "message", 8 ), "wrong data %s\n", base + 0x2000 ); + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 0, "wrong count %lu\n", count ); + + memset( base, 0, size ); + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 16, "wrong count %lu\n", count ); + + args.dest = dest; + args.base = base; + args.size = 0x7002; + args.expect = "test message"; + for (args.func = 0; args.func < 4; args.func++) + { + thread = CreateThread( NULL, 0, write_watch_thread, &args, 0, NULL ); + Sleep( 200 ); + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 8, "wrong count %lu\n", count ); + + send(src, "test message", sizeof("test message"), 0); + WaitForSingleObject( thread, 10000 ); + CloseHandle( thread ); + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 0, "wrong count %lu\n", count ); + } + WSACloseEvent( event ); + closesocket( dest ); + closesocket( src ); + VirtualFree( base, 0, MEM_FREE ); +} + #define POLL_CLEAR() ix = 0 #define POLL_SET(s, ev) {fds[ix].fd = s; fds[ix++].events = ev;} #define POLL_ISSET(s, rev) poll_isset(fds, ix, s, rev) @@ -10662,6 +10856,7 @@ START_TEST( sock ) test_WSASendTo(); test_WSARecv(); test_WSAPoll(); + test_write_watch(); test_events(0); test_events(1);

1 0