April 2019 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Use DispHTMLDOMImplementation for IDispatchEx implementation.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: e0408dd802862474f79364e0e3bba7c4b275aa71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0408dd802862474f79364e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 18 15:36:56 2019 +0200 mshtml: Use DispHTMLDOMImplementation for IDispatchEx implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/omnavigator.c | 2 +- dlls/mshtml/tests/dom.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 53462c6..fadea6b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -95,6 +95,7 @@ typedef struct EventTarget EventTarget; XDIID(DispHTMLCurrentStyle) \ XDIID(DispHTMLDocument) \ XDIID(DispHTMLDOMAttribute) \ + XDIID(DispHTMLDOMImplementation) \ XDIID(DispHTMLDOMTextNode) \ XDIID(DispHTMLElementCollection) \ XDIID(DispHTMLEmbed) \ @@ -171,6 +172,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLDOMAttribute2) \ XIID(IHTMLDOMChildrenCollection) \ XIID(IHTMLDOMImplementation) \ + XIID(IHTMLDOMImplementation2) \ XIID(IHTMLDOMNode) \ XIID(IHTMLDOMNode2) \ XIID(IHTMLDOMNode3) \ diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index cc4ea5a..c036c3c 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -306,7 +306,7 @@ static const tid_t HTMLDOMImplementation_iface_tids[] = { }; static dispex_static_data_t HTMLDOMImplementation_dispex = { NULL, - IHTMLDOMImplementation_tid, + DispHTMLDOMImplementation_tid, HTMLDOMImplementation_iface_tids }; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 02ce914..a51e09a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7010,6 +7010,8 @@ static void test_dom_implementation(IHTMLDocument2 *doc) IHTMLWindow2 *window; IDispatch *disp; + test_disp((IUnknown*)dom_implementation, &DIID_DispHTMLDOMImplementation, NULL, "[object]"); + str = a2bstr("test"); hres = IHTMLDOMImplementation2_createHTMLDocument(dom_implementation2, str, &new_document); ok(hres == S_OK, "createHTMLDocument failed: %08x\n", hres);

1 0

Alistair Leslie-Hughes : include: Remove duplicate extern C from mimeole.idl.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 8fadb2cf4e9629470de2b72a4de3b01cbb480af4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fadb2cf4e9629470de2b72a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 15 22:49:29 2019 +0000 include: Remove duplicate extern C from mimeole.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mimeole.idl | 7 ------- 1 file changed, 7 deletions(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index 29bead2..cc80c12 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -1447,10 +1447,6 @@ cpp_quote("#endif") } } -cpp_quote("#ifdef __cplusplus") -cpp_quote(" extern \"C\" {") -cpp_quote("#endif") - cpp_quote("") cpp_quote("HRESULT WINAPI MimeOleSetCompatMode(DWORD);") cpp_quote("HRESULT WINAPI MimeOleContentTypeFromUrl(LPCSTR,LPCSTR,LPSTR*);") @@ -1538,6 +1534,3 @@ cpp_quote("HRESULT WINAPI MimeEditDocumentFromStream(IStream*,REFIID,void**);") cpp_quote("HRESULT WINAPI MimeOleGetPropertySchema(IMimePropertySchema**);") cpp_quote("HRESULT WINAPI MimeGetAddressFormatW(REFIID,void*,DWORD,ADDRESSFORMAT,WCHAR**);") -cpp_quote("#ifdef __cplusplus") -cpp_quote("}") -cpp_quote("#endif")

1 0

Alistair Leslie-Hughes : include: Remove duplicate extern C from d3dx10core.idl.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: e2eff6743e23426a1baba6ce4b927d535defc7b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2eff6743e23426a1baba6ce… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 15 22:49:27 2019 +0000 include: Remove duplicate extern C from d3dx10core.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dx10core.idl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl index afd77e9..c99ab82 100644 --- a/include/d3dx10core.idl +++ b/include/d3dx10core.idl @@ -65,9 +65,6 @@ interface ID3DX10ThreadPump : IUnknown HRESULT GetQueueStatus([in] UINT *queue, [in] UINT *processqueue, [in] UINT *devicequeue); } -cpp_quote("#ifdef __cplusplus") -cpp_quote("extern \"C\" {") -cpp_quote("#endif") cpp_quote("HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device);") cpp_quote("HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,") cpp_quote(" HMODULE swrast, unsigned int flags, ID3D10Device **device);") @@ -75,6 +72,3 @@ cpp_quote("HRESULT WINAPI D3DX10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, cpp_quote(" HMODULE swrast, unsigned int flags, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain,") cpp_quote(" ID3D10Device **device);") cpp_quote("HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1);") -cpp_quote("#ifdef __cplusplus") -cpp_quote("}") -cpp_quote("#endif")

1 0

Dmitry Timoshkov : cryptui: Implement CryptUIDlgSelectCertificateFromStore.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 0d20dfa9ece8efbc6ba3c762bcc1e57fba2f8563 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d20dfa9ece8efbc6ba3c762… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 17 18:52:03 2019 +0800 cryptui: Implement CryptUIDlgSelectCertificateFromStore. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptui/main.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 41938f5..33f25a4 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -7550,8 +7550,21 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateFromStore(HCERTSTORE hCertStore LPCWSTR pwszDisplayString, DWORD dwDontUseColumn, DWORD dwFlags, void *pvReserved) { - FIXME("%p %p %s %s %d %d %p: stub\n", hCertStore, hwnd, debugstr_w(pwszTitle), debugstr_w(pwszDisplayString), dwDontUseColumn, dwFlags, pvReserved); - return NULL; + CRYPTUI_SELECTCERTIFICATE_STRUCTW sc; + + TRACE("%p %p %s %s %x %x %p\n", hCertStore, hwnd, debugstr_w(pwszTitle), debugstr_w(pwszDisplayString), dwDontUseColumn, dwFlags, pvReserved); + + memset(&sc, 0, sizeof(sc)); + + sc.dwSize = sizeof(sc); + sc.hwndParent = hwnd; + sc.dwFlags = dwFlags; + sc.szTitle = pwszTitle; + sc.szDisplayString = pwszDisplayString; + sc.dwDontUseColumn = dwDontUseColumn; + sc.cDisplayStores = 1; + sc.rghDisplayStores = &hCertStore; + return CryptUIDlgSelectCertificateW(&sc); } BOOL WINAPI CryptUIWizDigitalSign(DWORD flags, HWND parent, LPCWSTR title, PCCRYPTUI_WIZ_DIGITAL_SIGN_INFO info,

1 0

Zebediah Figura : winecfg: Also set the text color for the license and version controls.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 35afdf0f797e86c69d3ac90bba11b6249cb92fcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=35afdf0f797e86c69d3ac90b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 15 20:16:19 2019 -0500 winecfg: Also set the text color for the license and version controls. Otherwise they will default to black and not respect theming. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/about.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/winecfg/about.c b/programs/winecfg/about.c index 879693e..e9f833c 100644 --- a/programs/winecfg/about.c +++ b/programs/winecfg/about.c @@ -168,9 +168,12 @@ AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case IDC_ABT_TITLE_TEXT: /* set the title to a wine color */ SetTextColor((HDC)wParam, 0x0000007F); + SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW)); + return (INT_PTR)GetSysColorBrush(COLOR_WINDOW); case IDC_ABT_PANEL_TEXT: case IDC_ABT_LICENSE_TEXT: case IDC_ABT_WEB_LINK: + SetTextColor((HDC)wParam, GetSysColor(COLOR_WINDOWTEXT)); SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW)); return (INT_PTR)GetSysColorBrush(COLOR_WINDOW); }

1 0

Andrew Eikum : dinput: Report controllers as gamepads, not joysticks.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 085e58878f58c8e9fd03f8b56ac5489ab844b3e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=085e58878f58c8e9fd03f8b5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 17 09:11:59 2019 -0500 dinput: Report controllers as gamepads, not joysticks. This matches what Windows does with common controllers like xbox 360. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 9 +++------ dlls/dinput/joystick_linuxinput.c | 9 +++------ dlls/dinput/joystick_osx.c | 7 +++++-- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 963e62f..736a06e 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -316,9 +316,9 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver lpddi->guidProduct = joystick_devices[id].guid_product; /* we only support traditional joysticks for now */ if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); + lpddi->dwDevType = DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8); else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); /* Assume the joystick as HID if it is attached to USB bus and has a valid VID/PID */ if (joystick_devices[id].bus_type == BUS_USB && @@ -326,10 +326,7 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver { lpddi->dwDevType |= DIDEVTYPE_HID; lpddi->wUsagePage = 0x01; /* Desktop */ - if (lpddi->dwDevType == DI8DEVTYPE_JOYSTICK || lpddi->dwDevType == DIDEVTYPE_JOYSTICK) - lpddi->wUsage = 0x04; /* Joystick */ - else - lpddi->wUsage = 0x05; /* Game Pad */ + lpddi->wUsage = 0x05; /* Game Pad */ } MultiByteToWideChar(CP_ACP, 0, joystick_devices[id].name, -1, lpddi->tszInstanceName, MAX_PATH); diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 910e755..cea669b 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -355,9 +355,9 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver lpddi->guidFFDriver = GUID_NULL; if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); + lpddi->dwDevType = DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8); else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); /* Assume the joystick as HID if it is attached to USB bus and has a valid VID/PID */ if (joydevs[id].bus_type == BUS_USB && @@ -365,10 +365,7 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver { lpddi->dwDevType |= DIDEVTYPE_HID; lpddi->wUsagePage = 0x01; /* Desktop */ - if (lpddi->dwDevType == DI8DEVTYPE_JOYSTICK || lpddi->dwDevType == DIDEVTYPE_JOYSTICK) - lpddi->wUsage = 0x04; /* Joystick */ - else - lpddi->wUsage = 0x05; /* Game Pad */ + lpddi->wUsage = 0x05; /* Game Pad */ } MultiByteToWideChar(CP_ACP, 0, joydevs[id].name, -1, lpddi->tszInstanceName, MAX_PATH); diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 0701b9f..daef1a1 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -969,9 +969,12 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS lpddi->guidProduct.Data1 = make_vid_pid(device); /* we only support traditional joysticks for now */ if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); + lpddi->dwDevType = DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8); else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); + lpddi->dwDevType |= DIDEVTYPE_HID; + lpddi->wUsagePage = 0x01; /* Desktop */ + lpddi->wUsage = 0x05; /* Game Pad */ sprintf(lpddi->tszInstanceName, "Joystick %d", id); /* get the device name */

1 0

Jacek Caban : mshtml: Add ISVGElement stub implementation.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 55ea9b37c3a083c4d16a43801555efa5bf0d8c64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55ea9b37c3a083c4d16a4380… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 18 15:36:14 2019 +0200 mshtml: Add ISVGElement stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlelem.c | 24 +++-- dlls/mshtml/mshtml_private.h | 5 +- dlls/mshtml/svg.c | 225 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 16 ++- include/mshtml.idl | 16 +++ 6 files changed, 276 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55ea9b37c3a083c4d16a…

1 0

Jacek Caban : mshtml/tests: Properly release elem2 in test_elem_bounding_client_rect.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 2e4b264242306bbfd5edd48eaa0b2d42893f2d05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e4b264242306bbfd5edd48e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 18 15:36:01 2019 +0200 mshtml/tests: Properly release elem2 in test_elem_bounding_client_rect. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 19d7b11..c3d11be 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5171,7 +5171,6 @@ static void test_elem_bounding_client_rect(IUnknown *unk) hres = IHTMLElement2_getBoundingClientRect(elem2, &rect); ok(hres == S_OK, "getBoundingClientRect failed: %08x\n", hres); hres = IHTMLElement2_getBoundingClientRect(elem2, &rect2); - IHTMLElement2_Release(elem2); ok(hres == S_OK, "getBoundingClientRect failed: %08x\n", hres); ok(rect != NULL, "rect == NULL\n"); ok(rect != rect2, "rect == rect2\n"); @@ -5207,6 +5206,7 @@ static void test_elem_bounding_client_rect(IUnknown *unk) test_disp((IUnknown*)rects, &IID_IHTMLRectCollection, NULL, "[object]"); IHTMLRectCollection_Release(rects); + IHTMLElement2_Release(elem2); } static void test_elem_col_item(IHTMLElementCollection *col, const char *n,

1 0

Jacek Caban : mshtml: Add ISVGSVGElement stub implementation.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 07ee5cb3415870b46117da4e16948851712d132d URL: https://source.winehq.org/git/wine.git/?a=commit;h=07ee5cb3415870b46117da4e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 18 15:36:25 2019 +0200 mshtml: Add ISVGSVGElement stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 4 +- dlls/mshtml/svg.c | 558 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 1 + 3 files changed, 562 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=07ee5cb3415870b46117…

1 0

Jacek Caban : mshtml: Add ISVGCircleElement stub implementation.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 56f03488b41e96cc8ec1fca5508aa55b1ed3f44b URL: https://source.winehq.org/git/wine.git/?a=commit;h=56f03488b41e96cc8ec1fca5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 18 15:36:34 2019 +0200 mshtml: Add ISVGCircleElement stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/svg.c | 172 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 1 + 3 files changed, 175 insertions(+) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7560215..18b0310 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -131,6 +131,7 @@ typedef struct EventTarget EventTarget; XDIID(DispHTMLW3CComputedStyle) \ XDIID(DispHTMLWindow2) \ XDIID(DispHTMLXMLHttpRequest) \ + XDIID(DispSVGCircleElement) \ XDIID(DispSVGSVGElement) \ XDIID(HTMLDocumentEvents) \ XDIID(HTMLElementEvents2) \ @@ -248,6 +249,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLXMLHttpRequestFactory) \ XIID(IOmHistory) \ XIID(IOmNavigator) \ + XIID(ISVGCircleElement) \ XIID(ISVGElement) \ XIID(ISVGSVGElement) diff --git a/dlls/mshtml/svg.c b/dlls/mshtml/svg.c index f30c7ab..d145c83 100644 --- a/dlls/mshtml/svg.c +++ b/dlls/mshtml/svg.c @@ -761,7 +761,177 @@ static HRESULT create_viewport_element(HTMLDocumentNode *doc, nsIDOMSVGElement * return S_OK; } +struct SVGCircleElement { + SVGElement svg_element; + ISVGCircleElement ISVGCircleElement_iface; +}; + +static inline SVGCircleElement *impl_from_ISVGCircleElement(ISVGCircleElement *iface) +{ + return CONTAINING_RECORD(iface, SVGCircleElement, ISVGCircleElement_iface); +} + +static HRESULT WINAPI SVGCircleElement_QueryInterface(ISVGCircleElement *iface, + REFIID riid, void **ppv) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + + return IHTMLDOMNode_QueryInterface(&This->svg_element.element.node.IHTMLDOMNode_iface, riid, ppv); +} + +static ULONG WINAPI SVGCircleElement_AddRef(ISVGCircleElement *iface) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + + return IHTMLDOMNode_AddRef(&This->svg_element.element.node.IHTMLDOMNode_iface); +} + +static ULONG WINAPI SVGCircleElement_Release(ISVGCircleElement *iface) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + + return IHTMLDOMNode_Release(&This->svg_element.element.node.IHTMLDOMNode_iface); +} + +static HRESULT WINAPI SVGCircleElement_GetTypeInfoCount(ISVGCircleElement *iface, UINT *pctinfo) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + return IDispatchEx_GetTypeInfoCount(&This->svg_element.element.node.event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI SVGCircleElement_GetTypeInfo(ISVGCircleElement *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + return IDispatchEx_GetTypeInfo(&This->svg_element.element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, + ppTInfo); +} + +static HRESULT WINAPI SVGCircleElement_GetIDsOfNames(ISVGCircleElement *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + return IDispatchEx_GetIDsOfNames(&This->svg_element.element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI SVGCircleElement_Invoke(ISVGCircleElement *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + return IDispatchEx_Invoke(&This->svg_element.element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI SVGCircleElement_putref_cx(ISVGCircleElement *iface, ISVGAnimatedLength *v) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + FIXME("(%p)->(%p)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI SVGCircleElement_get_cx(ISVGCircleElement *iface, ISVGAnimatedLength **p) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI SVGCircleElement_putref_cy(ISVGCircleElement *iface, ISVGAnimatedLength *v) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + FIXME("(%p)->(%p)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI SVGCircleElement_get_cy(ISVGCircleElement *iface, ISVGAnimatedLength **p) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI SVGCircleElement_putref_r(ISVGCircleElement *iface, ISVGAnimatedLength *v) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + FIXME("(%p)->(%p)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI SVGCircleElement_get_r(ISVGCircleElement *iface, ISVGAnimatedLength **p) +{ + SVGCircleElement *This = impl_from_ISVGCircleElement(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const ISVGCircleElementVtbl SVGCircleElementVtbl = { + SVGCircleElement_QueryInterface, + SVGCircleElement_AddRef, + SVGCircleElement_Release, + SVGCircleElement_GetTypeInfoCount, + SVGCircleElement_GetTypeInfo, + SVGCircleElement_GetIDsOfNames, + SVGCircleElement_Invoke, + SVGCircleElement_putref_cx, + SVGCircleElement_get_cx, + SVGCircleElement_putref_cy, + SVGCircleElement_get_cy, + SVGCircleElement_putref_r, + SVGCircleElement_get_r +}; + +static inline SVGCircleElement *SVGCircleElement_from_HTMLDOMNode(HTMLDOMNode *iface) +{ + return CONTAINING_RECORD(iface, SVGCircleElement, svg_element.element.node); +} + +static HRESULT SVGCircleElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) +{ + SVGCircleElement *This = SVGCircleElement_from_HTMLDOMNode(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_ISVGCircleElement, riid)) + *ppv = &This->ISVGCircleElement_iface; + else + return SVGElement_QI(&This->svg_element.element.node, riid, ppv); + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static const NodeImplVtbl SVGCircleElementImplVtbl = { + &CLSID_SVGCircleElement, + SVGCircleElement_QI, + HTMLElement_destructor, + HTMLElement_cpc, + HTMLElement_clone, + NULL, + HTMLElement_get_attr_col, +}; + +static HRESULT create_circle_element(HTMLDocumentNode *doc, nsIDOMSVGElement *nselem, HTMLElement **elem) +{ + SVGCircleElement *ret; + + ret = heap_alloc_zero(sizeof(SVGCircleElement)); + if(!ret) + return E_OUTOFMEMORY; + + ret->ISVGCircleElement_iface.lpVtbl = &SVGCircleElementVtbl; + ret->svg_element.element.node.vtbl = &SVGCircleElementImplVtbl; + + init_svg_element(&ret->svg_element, doc, nselem); + + *elem = &ret->svg_element.element; + return S_OK; +} + +static const WCHAR circleW[] = {'c','i','r','c','l','e',0}; static const WCHAR svgW[] = {'s','v','g',0}; HRESULT create_svg_element(HTMLDocumentNode *doc, nsIDOMSVGElement *dom_element, const WCHAR *tag_name, HTMLElement **elem) @@ -772,6 +942,8 @@ HRESULT create_svg_element(HTMLDocumentNode *doc, nsIDOMSVGElement *dom_element, if(!strcmpW(tag_name, svgW)) return create_viewport_element(doc, dom_element, elem); + if(!strcmpW(tag_name, circleW)) + return create_circle_element(doc, dom_element, elem); svg_element = heap_alloc_zero(sizeof(*svg_element)); if(!svg_element) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 77ba7f9..51ed940 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -452,6 +452,7 @@ static const IID * const svg_iids[] = { static const IID * const circle_iids[] = { ELEM_IFACES, &IID_ISVGElement, + &IID_ISVGCircleElement, NULL };

1 0