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

Jacek Caban : mshtml.idl: Added HTMLIFrame coclass declaration.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 8d467a4bd0e391562f62df45d8be20c3d74e4a92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d467a4bd0e391562f62df45d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:23:40 2017 +0200 mshtml.idl: Added HTMLIFrame coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmliframe.c | 4 ++-- include/mshtml.idl | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 14f545d..83ce952 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -31,12 +31,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLIFrame { HTMLFrameBase framebase; IHTMLIFrameElement IHTMLIFrameElement_iface; IHTMLIFrameElement2 IHTMLIFrameElement2_iface; IHTMLIFrameElement3 IHTMLIFrameElement3_iface; -} HTMLIFrame; +}; static inline HTMLIFrame *impl_from_IHTMLIFrameElement(IHTMLIFrameElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index ff67650..1b4ba2a 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -19603,6 +19603,29 @@ methods: } /***************************************************************************** + * HTMLIFrame coclass + */ +[ + noncreatable, + uuid(3050f316-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLIFrame +{ + [default] dispinterface DispHTMLIFrame; + /* [source, default] dispinterface HTMLControlElementEvents; */ + /* [source] dispinterface HTMLControlElementEvents2; */ + WINE_HTMLDATAELEMENT_INTERFACES; + interface IHTMLControlElement; + interface IHTMLFrameBase; + interface IHTMLFrameBase2; + /* interface IHTMLFrameBase3; */ + interface IHTMLIFrameElement; + interface IHTMLIFrameElement2; + interface IHTMLIFrameElement3; + /* interface IGetSVGDocument; */ +} + +/***************************************************************************** * IHTMLStyleElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLFrameElement coclass declaration.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 39460707e27e84e976f4f5acfdc5f8db02b2aa89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39460707e27e84e976f4f5acf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:23:33 2017 +0200 mshtml.idl: Added HTMLFrameElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlframe.c | 4 ++-- include/mshtml.idl | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index fd76fa2..1a2772b 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -31,10 +31,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLFrameElement { HTMLFrameBase framebase; IHTMLFrameElement3 IHTMLFrameElement3_iface; -} HTMLFrameElement; +}; static inline HTMLFrameElement *impl_from_IHTMLFrameElement3(IHTMLFrameElement3 *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index 0bdd473..ff67650 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -19428,6 +19428,29 @@ methods: } /***************************************************************************** + * HTMLFrameElement coclass + */ +[ + noncreatable, + uuid(3050f314-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLFrameElement +{ + [default] dispinterface DispHTMLFrameElement; + /* [source, default] dispinterface HTMLControlElementEvents; */ + /* [source] dispinterface HTMLControlElementEvents2; */ + WINE_HTMLDATAELEMENT_INTERFACES; + interface IHTMLControlElement; + interface IHTMLFrameBase; + interface IHTMLFrameBase2; + /* interface IHTMLFrameBase3; */ + /* interface IHTMLFrameElement; */ + /* interface IHTMLFrameElement2; */ + interface IHTMLFrameElement3; + /* interface IGetSVGDocument; */ +} + +/***************************************************************************** * IHTMLIFrameElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLObjectElement coclass declaration.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 887641070a157dac4272f25034c81945d2bf4409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=887641070a157dac4272f2503… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:23:27 2017 +0200 mshtml.idl: Added HTMLObjectElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlobject.c | 4 ++-- include/mshtml.idl | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 89913cb..47c1e8b 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -34,14 +34,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLObjectElement { HTMLPluginContainer plugin_container; IHTMLObjectElement IHTMLObjectElement_iface; IHTMLObjectElement2 IHTMLObjectElement2_iface; nsIDOMHTMLObjectElement *nsobject; -} HTMLObjectElement; +}; static inline HTMLObjectElement *impl_from_IHTMLObjectElement(IHTMLObjectElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index f734356..0bdd473 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -19089,6 +19089,28 @@ methods: } /***************************************************************************** + * HTMLObjectElement coclass + */ +[ + noncreatable, + uuid(3050f24e-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLObjectElement +{ + [default] dispinterface DispHTMLObjectElement; + /* [source, default] dispinterface HTMLObjectElementEvents; */ + /* [source] dispinterface HTMLObjectElementEvents2; */ + WINE_HTMLDATAELEMENT_INTERFACES; + interface IHTMLControlElement; + interface IHTMLObjectElement; + interface IHTMLObjectElement2; + /* interface IHTMLObjectElement3; */ + /* interface IHTMLObjectElement4; */ + /* interface IGetSVGDocument; */ + /* interface IHTMLObjectElement5; */ +} + +/***************************************************************************** * DispHTMLParamElement dispinterface */ [

1 0

Austin English : ntoskrnl.exe: Add IoReportResourceForDetection stub.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 18c94886d7ca3f5c9df71e0b6268b3114ada25e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c94886d7ca3f5c9df71e0b6… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 20 18:26:14 2017 +0200 ntoskrnl.exe: Add IoReportResourceForDetection stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c87f105..4b8a005 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1453,6 +1453,20 @@ VOID WINAPI IoUnregisterShutdownNotification( PDEVICE_OBJECT obj ) /*********************************************************************** + * IoReportResourceForDetection (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoReportResourceForDetection( DRIVER_OBJECT *drv_obj, CM_RESOURCE_LIST *drv_list, ULONG drv_size, + DEVICE_OBJECT *dev_obj, CM_RESOURCE_LIST *dev_list, ULONG dev_size, + BOOLEAN *conflict ) +{ + FIXME( "(%p, %p, %u, %p, %p, %u, %p): stub\n", drv_obj, drv_list, drv_size, + dev_obj, dev_list, dev_size, conflict ); + + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * IoReportResourceUsage (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoReportResourceUsage( UNICODE_STRING *name, DRIVER_OBJECT *drv_obj, CM_RESOURCE_LIST *drv_list, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7cd5146..25649c9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -441,7 +441,7 @@ @ stub IoRemoveShareAccess @ stub IoReportDetectedDevice @ stub IoReportHalResourceUsage -@ stub IoReportResourceForDetection +@ stdcall IoReportResourceForDetection(ptr ptr long ptr ptr long ptr) @ stdcall IoReportResourceUsage(ptr ptr ptr long ptr ptr long long ptr) @ stub IoReportTargetDeviceChange @ stub IoReportTargetDeviceChangeAsynchronous

1 0

Jacek Caban : mshtml.idl: Added HTMLTableCell coclass declaration.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 16189147c6d0fa84ee8790bbbbc5e1ed2727d05d URL: http://source.winehq.org/git/wine.git/?a=commit;h=16189147c6d0fa84ee8790bbb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:09:21 2017 +0200 mshtml.idl: Added HTMLTableCell coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmltablecell.c | 4 ++-- include/mshtml.idl | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltablecell.c b/dlls/mshtml/htmltablecell.c index 12895a2..ef903dd 100644 --- a/dlls/mshtml/htmltablecell.c +++ b/dlls/mshtml/htmltablecell.c @@ -32,13 +32,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLTableCell { HTMLElement element; IHTMLTableCell IHTMLTableCell_iface; nsIDOMHTMLTableCellElement *nscell; -} HTMLTableCell; +}; static inline HTMLTableCell *impl_from_IHTMLTableCell(IHTMLTableCell *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index a1edef2..4e5503e 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -18472,6 +18472,26 @@ methods: } /***************************************************************************** + * HTMLTableCell coclass + */ +[ + noncreatable, + uuid(3050f246-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLTableCell +{ + [default] dispinterface DispHTMLTableCell; + [source, default] dispinterface HTMLTextContainerEvents; + [source] dispinterface HTMLTextContainerEvents2; + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLControlElement; + interface IHTMLTextContainer; + interface IHTMLTableCell; + /* interface IHTMLTableCell2; */ + /* interface IHTMLTableCell3; */ +} + +/***************************************************************************** * IHTMLScriptElement interface */ [

1 0

Nikolay Sivov : include: Added DB_MODE_* constants.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 479811169272e2805f30cc4400d6ccb8c026f965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=479811169272e2805f30cc440… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 20 13:05:31 2017 +0300 include: Added DB_MODE_* constants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbs.idl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/dbs.idl b/include/dbs.idl index 00e16f9..53caded 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -519,6 +519,13 @@ cpp_quote("#define DBPROPVAL_OS_CLIENTCURSOR __MSABI_LONG(0x00000004)" cpp_quote("#define DBPROPVAL_OS_ENABLEALL __MSABI_LONG(0xffffffff)") cpp_quote("#define DBPROPVAL_BI_CROSSROWSET __MSABI_LONG(0x00000001)") +cpp_quote("#define DB_MODE_READ 0x01") +cpp_quote("#define DB_MODE_WRITE 0x02") +cpp_quote("#define DB_MODE_READWRITE 0x03") +cpp_quote("#define DB_MODE_SHARE_DENY_READ 0x04") +cpp_quote("#define DB_MODE_SHARE_DENY_WRITE 0x08") +cpp_quote("#define DB_MODE_SHARE_EXCLUSIVE 0x0c") +cpp_quote("#define DB_MODE_SHARE_DENY_NONE 0x10") typedef struct tagDBCOLUMNACCESS {

1 0

Hugh McMaster : regedit: Only show the context menu if the mouse is over a treeitem.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 6f667d1c428bf2589eab4b177d6b1a798cc4a102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f667d1c428bf2589eab4b177… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 17 09:15:46 2017 +0000 regedit: Only show the context menu if the mouse is over a treeitem. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index df7c640..6ee0cdb 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -376,10 +376,11 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa TVHITTESTINFO ht; ht.pt = pt; ScreenToClient(g_pChildWnd->hTreeWnd, &ht.pt); - if (SendMessageW(g_pChildWnd->hTreeWnd, TVM_HITTEST, 0, (LPARAM)&ht)) + if (SendMessageW(g_pChildWnd->hTreeWnd, TVM_HITTEST, 0, (LPARAM)&ht)) { SendMessageW(g_pChildWnd->hTreeWnd, TVM_SELECTITEM, TVGN_CARET, (LPARAM)ht.hItem); - TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON, - pt.x, pt.y, 0, hFrameWnd, NULL); + TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON, + pt.x, pt.y, 0, hFrameWnd, NULL); + } } case WM_KEYDOWN:

1 0

Hugh McMaster : regedit: Call TrackPopupMenu() from WM_CONTEXTMENU.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 4dc5a764c781fa50530fcec7baf6a1e53256368c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc5a764c781fa50530fcec7b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 17 09:15:25 2017 +0000 regedit: Call TrackPopupMenu() from WM_CONTEXTMENU. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 2211d68..4d184c3 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -292,6 +292,9 @@ static void set_last_key(HWND hwndTV) } } +#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) +#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) + /******************************************************************************* * * FUNCTION: ChildWndProc(HWND, unsigned, WORD, LONG) @@ -368,6 +371,12 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa draw_splitbar(hWnd, last_split); break; + case WM_CONTEXTMENU: { + int x = GET_X_LPARAM(lParam); + int y = GET_Y_LPARAM(lParam); + TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON, x, y, 0, hFrameWnd, NULL); + } + case WM_KEYDOWN: if (wParam == VK_ESCAPE) if (GetCapture() == hWnd) { @@ -419,13 +428,6 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa case NM_SETFOCUS: g_pChildWnd->nFocusPanel = 0; break; - case NM_RCLICK: { - POINT pt; - GetCursorPos(&pt); - TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), - TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL); - break; - } case TVN_BEGINLABELEDITW: { HKEY hRootKey; LPWSTR path;

1 0

Jacek Caban : mshtml.idl: Added HTMLEmbed coclass declaration.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: e4a436ee5efbd1b54d6c010b045ca4ca844d79ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a436ee5efbd1b54d6c010b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:09:04 2017 +0200 mshtml.idl: Added HTMLEmbed coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlembed.c | 60 ++++++++++++++++++++++++------------------------- include/mshtml.idl | 19 ++++++++++++++++ 2 files changed, 49 insertions(+), 30 deletions(-) diff --git a/dlls/mshtml/htmlembed.c b/dlls/mshtml/htmlembed.c index 1b98f1b..d74f1b8 100644 --- a/dlls/mshtml/htmlembed.c +++ b/dlls/mshtml/htmlembed.c @@ -32,49 +32,49 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLEmbed { HTMLElement element; IHTMLEmbedElement IHTMLEmbedElement_iface; -} HTMLEmbedElement; +}; -static inline HTMLEmbedElement *impl_from_IHTMLEmbedElement(IHTMLEmbedElement *iface) +static inline HTMLEmbed *impl_from_IHTMLEmbedElement(IHTMLEmbedElement *iface) { - return CONTAINING_RECORD(iface, HTMLEmbedElement, IHTMLEmbedElement_iface); + return CONTAINING_RECORD(iface, HTMLEmbed, IHTMLEmbedElement_iface); } static HRESULT WINAPI HTMLEmbedElement_QueryInterface(IHTMLEmbedElement *iface, REFIID riid, void **ppv) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); } static ULONG WINAPI HTMLEmbedElement_AddRef(IHTMLEmbedElement *iface) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); } static ULONG WINAPI HTMLEmbedElement_Release(IHTMLEmbedElement *iface) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); } static HRESULT WINAPI HTMLEmbedElement_GetTypeInfoCount(IHTMLEmbedElement *iface, UINT *pctinfo) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLEmbedElement_GetTypeInfo(IHTMLEmbedElement *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } @@ -82,7 +82,7 @@ static HRESULT WINAPI HTMLEmbedElement_GetTypeInfo(IHTMLEmbedElement *iface, UIN static HRESULT WINAPI HTMLEmbedElement_GetIDsOfNames(IHTMLEmbedElement *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); } @@ -91,105 +91,105 @@ static HRESULT WINAPI HTMLEmbedElement_Invoke(IHTMLEmbedElement *iface, DISPID d REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLEmbedElement_put_hidden(IHTMLEmbedElement *iface, BSTR v) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_hidden(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_palette(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_pluginspage(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_put_src(IHTMLEmbedElement *iface, BSTR v) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_src(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_put_units(IHTMLEmbedElement *iface, BSTR v) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_units(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_put_name(IHTMLEmbedElement *iface, BSTR v) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_name(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_put_width(IHTMLEmbedElement *iface, VARIANT v) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_width(IHTMLEmbedElement *iface, VARIANT *p) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_put_height(IHTMLEmbedElement *iface, VARIANT v) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_height(IHTMLEmbedElement *iface, VARIANT *p) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } @@ -218,14 +218,14 @@ static const IHTMLEmbedElementVtbl HTMLEmbedElementVtbl = { HTMLEmbedElement_get_height }; -static inline HTMLEmbedElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) +static inline HTMLEmbed *impl_from_HTMLDOMNode(HTMLDOMNode *iface) { - return CONTAINING_RECORD(iface, HTMLEmbedElement, element.node); + return CONTAINING_RECORD(iface, HTMLEmbed, element.node); } static HRESULT HTMLEmbedElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) { - HTMLEmbedElement *This = impl_from_HTMLDOMNode(iface); + HTMLEmbed *This = impl_from_HTMLDOMNode(iface); TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); @@ -245,7 +245,7 @@ static HRESULT HTMLEmbedElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) static void HTMLEmbedElement_destructor(HTMLDOMNode *iface) { - HTMLEmbedElement *This = impl_from_HTMLDOMNode(iface); + HTMLEmbed *This = impl_from_HTMLDOMNode(iface); HTMLElement_destructor(&This->element.node); } @@ -273,7 +273,7 @@ static dispex_static_data_t HTMLEmbedElement_dispex = { HRESULT HTMLEmbedElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement **elem) { - HTMLEmbedElement *ret; + HTMLEmbed *ret; ret = heap_alloc_zero(sizeof(*ret)); if(!ret) diff --git a/include/mshtml.idl b/include/mshtml.idl index 505fb29..4c7e095 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -16676,6 +16676,25 @@ methods: } /***************************************************************************** + * HTMLEmbed coclass + */ +[ + noncreatable, + uuid(3050f25d-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLEmbed +{ + [default] dispinterface DispHTMLEmbed; + /* [source, default] dispinterface HTMLControlElementEvents; */ + /* [source] dispinterface HTMLControlElementEvents2; */ + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLControlElement; + interface IHTMLEmbedElement; + /* interface IHTMLEmbedElement2; */ + /* interface IGetSVGDocument; */ +} + +/***************************************************************************** * IHTMLCommentElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLWindow2 coclass declaration.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 68952c4c75ba7a39014c6ec28fd5f5d9fa645edf URL: http://source.winehq.org/git/wine.git/?a=commit;h=68952c4c75ba7a39014c6ec28… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:08:50 2017 +0200 mshtml.idl: Added HTMLWindow2 coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtml.idl | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/include/mshtml.idl b/include/mshtml.idl index ebaac7b..505fb29 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -11832,6 +11832,22 @@ methods: } /***************************************************************************** + * HTMLUnknownElement coclass + */ +[ + noncreatable, + uuid(3050f268-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLUnknownElement +{ + [default] dispinterface DispHTMLUnknownElement; + [source, default] dispinterface HTMLElementEvents; + [source] dispinterface HTMLElementEvents2; + WINE_HTMLELEMENT_INTERFACES; + /* interface IHTMLUnknownElement; */ +} + +/***************************************************************************** * IOmHistory interface */ [ @@ -13594,6 +13610,30 @@ methods: } /***************************************************************************** + * HTMLWindow2 coclass + */ +[ + noncreatable, + uuid(d48a6ec6-6a4a-11cf-94a7-444553540000) +] +coclass HTMLWindow2 +{ + [default] dispinterface DispHTMLWindow2; + [source, default] dispinterface HTMLWindowEvents; + [source] dispinterface HTMLWindowEvents2; + /* [source] dispinterface HTMLWindowEvents3; */ + interface IHTMLWindow2; + interface IHTMLWindow3; + interface IHTMLWindow4; + interface IHTMLWindow5; + interface IHTMLWindow6; + /* interface IHTMLWindow7; */ + /* interface IHTMLWindow8; */ + interface IHTMLDOMConstructor; + interface IEventTarget; +} + +/***************************************************************************** * DispHTMLWindowProxy dispinterface */ [

1 0