December 2010 - Wine-Commits

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in HTMLTextAreaElement.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 8d78c7210f236da45f5b876b7b1c7a6a9bdd4267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d78c7210f236da45f5b876b7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:32:05 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLTextAreaElement. --- dlls/mshtml/htmltextarea.c | 89 ++++++++++++++++++++++---------------------- 1 files changed, 44 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d78c7210f236da45f5b8…

1 0

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in HTMLGenericElement.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 5a506d707ade983cb1c0b974ed6d70a91021032c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a506d707ade983cb1c0b974e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:31:29 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLGenericElement. --- dlls/mshtml/htmlgeneric.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlgeneric.c b/dlls/mshtml/htmlgeneric.c index 119f366..2bdb3cf 100644 --- a/dlls/mshtml/htmlgeneric.c +++ b/dlls/mshtml/htmlgeneric.c @@ -35,51 +35,52 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; - const IHTMLGenericElementVtbl *lpHTMLGenericElementVtbl; + IHTMLGenericElement IHTMLGenericElement_iface; } HTMLGenericElement; -#define HTMLGENERIC(x) (&(x)->lpHTMLGenericElementVtbl) - -#define HTMLGENERIC_THIS(iface) DEFINE_THIS(HTMLGenericElement, HTMLGenericElement, iface) +static inline HTMLGenericElement *impl_from_IHTMLGenericElement(IHTMLGenericElement *iface) +{ + return CONTAINING_RECORD(iface, HTMLGenericElement, IHTMLGenericElement_iface); +} static HRESULT WINAPI HTMLGenericElement_QueryInterface(IHTMLGenericElement *iface, REFIID riid, void **ppv) { - HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(&This->element.node), riid, ppv); } static ULONG WINAPI HTMLGenericElement_AddRef(IHTMLGenericElement *iface) { - HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->element.node)); } static ULONG WINAPI HTMLGenericElement_Release(IHTMLGenericElement *iface) { - HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); return IHTMLDOMNode_Release(HTMLDOMNODE(&This->element.node)); } static HRESULT WINAPI HTMLGenericElement_GetTypeInfoCount(IHTMLGenericElement *iface, UINT *pctinfo) { - HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->element.node.dispex), pctinfo); } static HRESULT WINAPI HTMLGenericElement_GetTypeInfo(IHTMLGenericElement *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->element.node.dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLGenericElement_GetIDsOfNames(IHTMLGenericElement *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->element.node.dispex), riid, rgszNames, cNames, lcid, rgDispId); } @@ -87,14 +88,14 @@ static HRESULT WINAPI HTMLGenericElement_Invoke(IHTMLGenericElement *iface, DISP REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); return IDispatchEx_Invoke(DISPATCHEX(&This->element.node.dispex), dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLGenericElement_get_recordset(IHTMLGenericElement *iface, IDispatch **p) { - HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } @@ -102,7 +103,7 @@ static HRESULT WINAPI HTMLGenericElement_get_recordset(IHTMLGenericElement *ifac static HRESULT WINAPI HTMLGenericElement_namedRecordset(IHTMLGenericElement *iface, BSTR dataMember, VARIANT *hierarchy, IDispatch **ppRecordset) { - HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(dataMember), hierarchy, ppRecordset); return E_NOTIMPL; } @@ -129,7 +130,7 @@ static HRESULT HTMLGenericElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv if(IsEqualGUID(&IID_IHTMLGenericElement, riid)) { TRACE("(%p)->(IID_IHTMLGenericElement %p)\n", This, ppv); - *ppv = HTMLGENERIC(This); + *ppv = &This->IHTMLGenericElement_iface; }else { return HTMLElement_QI(&This->element.node, riid, ppv); } @@ -174,7 +175,7 @@ HRESULT HTMLGenericElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsel if(!ret) return E_OUTOFMEMORY; - ret->lpHTMLGenericElementVtbl = &HTMLGenericElementVtbl; + ret->IHTMLGenericElement_iface.lpVtbl = &HTMLGenericElementVtbl; ret->element.node.vtbl = &HTMLGenericElementImplVtbl; HTMLElement_Init(&ret->element, doc, nselem, &HTMLGenericElement_dispex);

1 0

Michael Stefaniuc : mshtml: Change the second vtbl in HTMLInputElement to an iface.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 407a02d7eba249c7b108df3ba4637215436ea5d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=407a02d7eba249c7b108df3ba… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:32:30 2010 +0100 mshtml: Change the second vtbl in HTMLInputElement to an iface. --- dlls/mshtml/htmlinput.c | 76 ++++++++++++++++++++++++----------------------- 1 files changed, 39 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=407a02d7eba249c7b108d…

1 0

Michael Stefaniuc : mshtml: Change the first vtbl in HTMLInputElement to an iface.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: bc4fed3a61cfcab45d8c34e90769482a63db702c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc4fed3a61cfcab45d8c34e90… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:32:25 2010 +0100 mshtml: Change the first vtbl in HTMLInputElement to an iface. --- dlls/mshtml/htmlinput.c | 213 +++++++++++++++++++++++------------------------ 1 files changed, 105 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bc4fed3a61cfcab45d8c3…

1 0

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in HTMLTableRow.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 00324ea8bec139963c8260014c164b439faa0f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00324ea8bec139963c8260014… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:32:02 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLTableRow. --- dlls/mshtml/htmltablerow.c | 69 +++++++++++++++++++++---------------------- 1 files changed, 34 insertions(+), 35 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 91f4e6b..f2b6269 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -34,47 +34,48 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; - const IHTMLTableRowVtbl *lpHTMLTableRowVtbl; + IHTMLTableRow IHTMLTableRow_iface; nsIDOMHTMLTableRowElement *nsrow; } HTMLTableRow; -#define HTMLTABLEROW(x) (&(x)->lpHTMLTableRowVtbl) - -#define HTMLTABLEROW_THIS(iface) DEFINE_THIS(HTMLTableRow, HTMLTableRow, iface) +static inline HTMLTableRow *impl_from_IHTMLTableRow(IHTMLTableRow *iface) +{ + return CONTAINING_RECORD(iface, HTMLTableRow, IHTMLTableRow_iface); +} static HRESULT WINAPI HTMLTableRow_QueryInterface(IHTMLTableRow *iface, REFIID riid, void **ppv) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(&This->element.node), riid, ppv); } static ULONG WINAPI HTMLTableRow_AddRef(IHTMLTableRow *iface) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->element.node)); } static ULONG WINAPI HTMLTableRow_Release(IHTMLTableRow *iface) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); return IHTMLDOMNode_Release(HTMLDOMNODE(&This->element.node)); } static HRESULT WINAPI HTMLTableRow_GetTypeInfoCount(IHTMLTableRow *iface, UINT *pctinfo) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->element.node.dispex), pctinfo); } static HRESULT WINAPI HTMLTableRow_GetTypeInfo(IHTMLTableRow *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->element.node.dispex), iTInfo, lcid, ppTInfo); } @@ -82,7 +83,7 @@ static HRESULT WINAPI HTMLTableRow_GetIDsOfNames(IHTMLTableRow *iface, REFIID ri LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->element.node.dispex), riid, rgszNames, cNames, lcid, rgDispId); } @@ -90,112 +91,112 @@ static HRESULT WINAPI HTMLTableRow_Invoke(IHTMLTableRow *iface, DISPID dispIdMem REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); return IDispatchEx_Invoke(DISPATCHEX(&This->element.node.dispex), dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLTableRow_put_align(IHTMLTableRow *iface, BSTR v) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_get_align(IHTMLTableRow *iface, BSTR *p) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_put_vAlign(IHTMLTableRow *iface, BSTR v) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_get_vAlign(IHTMLTableRow *iface, BSTR *p) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_put_bgColor(IHTMLTableRow *iface, VARIANT v) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_get_bgColor(IHTMLTableRow *iface, VARIANT *p) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_put_borderColor(IHTMLTableRow *iface, VARIANT v) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_get_borderColor(IHTMLTableRow *iface, VARIANT *p) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_put_borderColorLight(IHTMLTableRow *iface, VARIANT v) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_get_borderColorLight(IHTMLTableRow *iface, VARIANT *p) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_put_borderColorDark(IHTMLTableRow *iface, VARIANT v) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_get_borderColorDark(IHTMLTableRow *iface, VARIANT *p) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_get_rowIndex(IHTMLTableRow *iface, LONG *p) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_get_selectionRowIndex(IHTMLTableRow *iface, LONG *p) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_get_cells(IHTMLTableRow *iface, IHTMLElementCollection **p) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); nsIDOMHTMLCollection *nscol; nsresult nsres; @@ -207,7 +208,7 @@ static HRESULT WINAPI HTMLTableRow_get_cells(IHTMLTableRow *iface, IHTMLElementC return E_FAIL; } - *p = create_collection_from_htmlcol(This->element.node.doc, (IUnknown*)HTMLTABLEROW(This), nscol); + *p = create_collection_from_htmlcol(This->element.node.doc, (IUnknown*)&This->IHTMLTableRow_iface, nscol); nsIDOMHTMLCollection_Release(nscol); return S_OK; @@ -215,20 +216,18 @@ static HRESULT WINAPI HTMLTableRow_get_cells(IHTMLTableRow *iface, IHTMLElementC static HRESULT WINAPI HTMLTableRow_insertCell(IHTMLTableRow *iface, LONG index, IDispatch **row) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%d %p)\n", This, index, row); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_deleteCell(IHTMLTableRow *iface, LONG index) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%d)\n", This, index); return E_NOTIMPL; } -#undef HTMLTABLEROW_THIS - static const IHTMLTableRowVtbl HTMLTableRowVtbl = { HTMLTableRow_QueryInterface, HTMLTableRow_AddRef, @@ -266,13 +265,13 @@ static HRESULT HTMLTableRow_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = HTMLTABLEROW(This); + *ppv = &This->IHTMLTableRow_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = HTMLTABLEROW(This); + *ppv = &This->IHTMLTableRow_iface; }else if(IsEqualGUID(&IID_IHTMLTableRow, riid)) { TRACE("(%p)->(IID_IHTMLTableRow %p)\n", This, ppv); - *ppv = HTMLTABLEROW(This); + *ppv = &This->IHTMLTableRow_iface; } if(*ppv) { @@ -323,7 +322,7 @@ HRESULT HTMLTableRow_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HT if(!ret) return E_OUTOFMEMORY; - ret->lpHTMLTableRowVtbl = &HTMLTableRowVtbl; + ret->IHTMLTableRow_iface.lpVtbl = &HTMLTableRowVtbl; ret->element.node.vtbl = &HTMLTableRowImplVtbl; nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTableRowElement, (void**)&ret->nsrow);

1 0

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in UndoManager.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 2bef3ad2ef06e2a452dcd62820ad5eff5c9bdb3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bef3ad2ef06e2a452dcd6282… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:32:21 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in UndoManager. --- dlls/mshtml/service.c | 49 ++++++++++++++++++++++++------------------------- 1 files changed, 24 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c index ef5a9d1..ab3d6d6 100644 --- a/dlls/mshtml/service.c +++ b/dlls/mshtml/service.c @@ -35,27 +35,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { - const IOleUndoManagerVtbl *lpOleUndoManagerVtbl; + IOleUndoManager IOleUndoManager_iface; LONG ref; } UndoManager; -#define UNDOMGR(x) ((IOleUndoManager*) &(x)->lpOleUndoManagerVtbl) - -#define UNDOMGR_THIS(iface) DEFINE_THIS(UndoManager, OleUndoManager, iface) +static inline UndoManager *impl_from_IOleUndoManager(IOleUndoManager *iface) +{ + return CONTAINING_RECORD(iface, UndoManager, IOleUndoManager_iface); +} static HRESULT WINAPI OleUndoManager_QueryInterface(IOleUndoManager *iface, REFIID riid, void **ppv) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); *ppv = NULL; if(IsEqualGUID(riid, &IID_IUnknown)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = UNDOMGR(This); + *ppv = &This->IOleUndoManager_iface; }else if(IsEqualGUID(riid, &IID_IOleUndoManager)) { TRACE("(%p)->(IID_IOleUndoManager %p)\n", This, ppv); - *ppv = UNDOMGR(This); + *ppv = &This->IOleUndoManager_iface; } @@ -65,7 +66,7 @@ static HRESULT WINAPI OleUndoManager_QueryInterface(IOleUndoManager *iface, REFI static ULONG WINAPI OleUndoManager_AddRef(IOleUndoManager *iface) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -75,7 +76,7 @@ static ULONG WINAPI OleUndoManager_AddRef(IOleUndoManager *iface) static ULONG WINAPI OleUndoManager_Release(IOleUndoManager *iface) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -88,7 +89,7 @@ static ULONG WINAPI OleUndoManager_Release(IOleUndoManager *iface) static HRESULT WINAPI OleUndoManager_Open(IOleUndoManager *iface, IOleParentUndoUnit *pPUU) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p)\n", This, pPUU); return E_NOTIMPL; } @@ -96,42 +97,42 @@ static HRESULT WINAPI OleUndoManager_Open(IOleUndoManager *iface, IOleParentUndo static HRESULT WINAPI OleUndoManager_Close(IOleUndoManager *iface, IOleParentUndoUnit *pPUU, BOOL fCommit) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p %x)\n", This, pPUU, fCommit); return E_NOTIMPL; } static HRESULT WINAPI OleUndoManager_Add(IOleUndoManager *iface, IOleUndoUnit *pUU) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p)\n", This, pUU); return E_NOTIMPL; } static HRESULT WINAPI OleUndoManager_GetOpenParentState(IOleUndoManager *iface, DWORD *pdwState) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p)\n", This, pdwState); return E_NOTIMPL; } static HRESULT WINAPI OleUndoManager_DiscardFrom(IOleUndoManager *iface, IOleUndoUnit *pUU) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p)\n", This, pUU); return S_OK; } static HRESULT WINAPI OleUndoManager_UndoTo(IOleUndoManager *iface, IOleUndoUnit *pUU) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p)\n", This, pUU); return E_NOTIMPL; } static HRESULT WINAPI OleUndoManager_RedoTo(IOleUndoManager *iface, IOleUndoUnit *pUU) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p)\n", This, pUU); return E_NOTIMPL; } @@ -139,7 +140,7 @@ static HRESULT WINAPI OleUndoManager_RedoTo(IOleUndoManager *iface, IOleUndoUnit static HRESULT WINAPI OleUndoManager_EnumUndoable(IOleUndoManager *iface, IEnumOleUndoUnits **ppEnum) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p)\n", This, ppEnum); return E_NOTIMPL; } @@ -147,34 +148,32 @@ static HRESULT WINAPI OleUndoManager_EnumUndoable(IOleUndoManager *iface, static HRESULT WINAPI OleUndoManager_EnumRedoable(IOleUndoManager *iface, IEnumOleUndoUnits **ppEnum) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p)\n", This, ppEnum); return E_NOTIMPL; } static HRESULT WINAPI OleUndoManager_GetLastUndoDescription(IOleUndoManager *iface, BSTR *pBstr) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p)\n", This, pBstr); return E_NOTIMPL; } static HRESULT WINAPI OleUndoManager_GetLastRedoDescription(IOleUndoManager *iface, BSTR *pBstr) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p)\n", This, pBstr); return E_NOTIMPL; } static HRESULT WINAPI OleUndoManager_Enable(IOleUndoManager *iface, BOOL fEnable) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%x)\n", This, fEnable); return E_NOTIMPL; } -#undef UNDOMGR_THIS - static const IOleUndoManagerVtbl OleUndoManagerVtbl = { OleUndoManager_QueryInterface, OleUndoManager_AddRef, @@ -197,10 +196,10 @@ static IOleUndoManager *create_undomgr(void) { UndoManager *ret = heap_alloc(sizeof(UndoManager)); - ret->lpOleUndoManagerVtbl = &OleUndoManagerVtbl; + ret->IOleUndoManager_iface.lpVtbl = &OleUndoManagerVtbl; ret->ref = 1; - return UNDOMGR(ret); + return &ret->IOleUndoManager_iface; } /**********************************************************

1 0

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in HTMLSelectElement.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 6d158cf1d5440533981de317952c29a181a88ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d158cf1d5440533981de3179… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:31:55 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLSelectElement. --- dlls/mshtml/htmlselect.c | 87 ++++++++++++++++++++++----------------------- 1 files changed, 43 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d158cf1d5440533981de…

1 0

Thomas Mullaly : include: Added IUriBuilderFactory interface definition.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 2182d7733342c204b04b53ab7d6b51a1f0ad20b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2182d7733342c204b04b53ab7… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Dec 5 20:51:23 2010 -0500 include: Added IUriBuilderFactory interface definition. --- include/urlmon.idl | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index d1eee68..ec0354f 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1829,6 +1829,28 @@ interface IUriBuilder: IUnknown cpp_quote("HRESULT WINAPI CreateIUriBuilder(IUri*,DWORD,DWORD_PTR,IUriBuilder**);") /***************************************************************************** + * IUriBuilderFactory interface + */ +[ + local, + object, + uuid(e982ce48-0b96-440c-bc37-0c869b27a29e), + pointer_default(unique) +] +interface IUriBuilderFactory : IUnknown +{ + HRESULT CreateInitializedIUriBuilder( + [in] DWORD dwFlags, + [in] DWORD_PTR dwReserved, + [out] IUriBuilder **ppIUriBuilder); + + HRESULT CreateIUriBuilder( + [in] DWORD dwFlags, + [in] DWORD_PTR dwReserved, + [out] IUriBuilder **ppIUriBuilder); +}; + +/***************************************************************************** * IInternetProtocolEx interface */ [

1 0

Thomas Mullaly : urlmon: Implemented IUriBuilderFactory interface.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 875f1e939c84f565fc22ef8665f9e61dc001f3c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=875f1e939c84f565fc22ef866… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Dec 6 17:50:37 2010 -0500 urlmon: Implemented IUriBuilderFactory interface. --- dlls/urlmon/tests/uri.c | 93 ++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 119 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 206 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=875f1e939c84f565fc22e…

1 0

Louis Lenders : Add stubbed wmic.exe.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 4b281b2b81a6ad95a1a8a4e444dd9fc0ad7aab29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b281b2b81a6ad95a1a8a4e44… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Dec 6 23:04:20 2010 +0100 Add stubbed wmic.exe. --- configure | 1 + configure.ac | 1 + programs/wmic/Makefile.in | 8 ++++++++ programs/wmic/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 0 deletions(-) diff --git a/configure b/configure index ea28639..5ab08b2 100755 --- a/configure +++ b/configure @@ -15390,6 +15390,7 @@ wine_fn_config_program winhelp.exe16 enable_win16 install wine_fn_config_program winhlp32 enable_winhlp32 install wine_fn_config_program winoldap.mod16 enable_win16 install wine_fn_config_program winver enable_winver install +wine_fn_config_program wmic enable_wmic install wine_fn_config_program wordpad enable_wordpad install wine_fn_config_program write enable_write install wine_fn_config_program wscript enable_wscript install diff --git a/configure.ac b/configure.ac index bb3237d..8ad460d 100644 --- a/configure.ac +++ b/configure.ac @@ -2912,6 +2912,7 @@ WINE_CONFIG_PROGRAM(winhelp.exe16,install,enable_win16) WINE_CONFIG_PROGRAM(winhlp32,install) WINE_CONFIG_PROGRAM(winoldap.mod16,install,enable_win16) WINE_CONFIG_PROGRAM(winver,install) +WINE_CONFIG_PROGRAM(wmic,install) WINE_CONFIG_PROGRAM(wordpad,install) WINE_CONFIG_PROGRAM(write,install) WINE_CONFIG_PROGRAM(wscript,install) diff --git a/programs/wmic/Makefile.in b/programs/wmic/Makefile.in new file mode 100644 index 0000000..4bef274 --- /dev/null +++ b/programs/wmic/Makefile.in @@ -0,0 +1,8 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +MODULE = wmic.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/wmic/main.c b/programs/wmic/main.c new file mode 100644 index 0000000..ba37017 --- /dev/null +++ b/programs/wmic/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2010 Louis Lenders + * + * 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 + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmic); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0