December 2010 - Wine-Commits

Michael Stefaniuc : mshtml: COM cleanup for the IViewObjectEx iface.
by Alexandre Julliard Dec. 23, 2010

Dec. 23, 2010

Module: wine Branch: master Commit: 176358216f80237ff22e96fd5dd36b25e3f801bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=176358216f80237ff22e96fd5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 23 02:21:09 2010 +0100 mshtml: COM cleanup for the IViewObjectEx iface. --- dlls/mshtml/htmldoc.c | 6 +++--- dlls/mshtml/mshtml_private.h | 5 +---- dlls/mshtml/view.c | 39 ++++++++++++++++++++------------------- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5fa5adf..15240de 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1755,13 +1755,13 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IOleInPlaceActiveObject_iface; }else if(IsEqualGUID(&IID_IViewObject, riid)) { TRACE("(%p)->(IID_IViewObject, %p)\n", This, ppv); - *ppv = VIEWOBJ(This); + *ppv = &This->IViewObjectEx_iface; }else if(IsEqualGUID(&IID_IViewObject2, riid)) { TRACE("(%p)->(IID_IViewObject2, %p)\n", This, ppv); - *ppv = VIEWOBJ2(This); + *ppv = &This->IViewObjectEx_iface; }else if(IsEqualGUID(&IID_IViewObjectEx, riid)) { TRACE("(%p)->(IID_IViewObjectEx, %p)\n", This, ppv); - *ppv = VIEWOBJEX(This); + *ppv = &This->IViewObjectEx_iface; }else if(IsEqualGUID(&IID_IOleWindow, riid)) { TRACE("(%p)->(IID_IOleWindow, %p)\n", This, ppv); *ppv = &This->IOleInPlaceActiveObject_iface; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f8e808a..703d5ff 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -355,7 +355,7 @@ struct HTMLDocument { IOleDocument IOleDocument_iface; IOleDocumentView IOleDocumentView_iface; IOleInPlaceActiveObject IOleInPlaceActiveObject_iface; - const IViewObjectExVtbl *lpViewObjectExVtbl; + IViewObjectEx IViewObjectEx_iface; const IOleInPlaceObjectWindowlessVtbl *lpOleInPlaceObjectWindowlessVtbl; const IServiceProviderVtbl *lpServiceProviderVtbl; const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; @@ -625,9 +625,6 @@ struct HTMLDocumentNode { #define HTMLWINDOW2(x) ((IHTMLWindow2*) &(x)->lpHTMLWindow2Vtbl) #define HTMLWINDOW3(x) ((IHTMLWindow3*) &(x)->lpHTMLWindow3Vtbl) #define HTMLWINDOW4(x) ((IHTMLWindow4*) &(x)->lpHTMLWindow4Vtbl) -#define VIEWOBJ(x) ((IViewObject*) &(x)->lpViewObjectExVtbl) -#define VIEWOBJ2(x) ((IViewObject2*) &(x)->lpViewObjectExVtbl) -#define VIEWOBJEX(x) ((IViewObjectEx*) &(x)->lpViewObjectExVtbl) #define INPLACEOBJ(x) ((IOleInPlaceObject*) &(x)->lpOleInPlaceObjectWindowlessVtbl) #define INPLACEWIN(x) ((IOleInPlaceObjectWindowless*) &(x)->lpOleInPlaceObjectWindowlessVtbl) #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index cd716db..1b6a32f 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -759,23 +759,26 @@ static const IOleDocumentViewVtbl OleDocumentViewVtbl = { * IViewObject implementation */ -#define VIEWOBJ_THIS(iface) DEFINE_THIS(HTMLDocument, ViewObjectEx, iface) +static inline HTMLDocument *impl_from_IViewObjectEx(IViewObjectEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IViewObjectEx_iface); +} static HRESULT WINAPI ViewObject_QueryInterface(IViewObjectEx *iface, REFIID riid, void **ppv) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); return htmldoc_query_interface(This, riid, ppv); } static ULONG WINAPI ViewObject_AddRef(IViewObjectEx *iface) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); return htmldoc_addref(This); } static ULONG WINAPI ViewObject_Release(IViewObjectEx *iface) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); return htmldoc_release(This); } @@ -783,7 +786,7 @@ static HRESULT WINAPI ViewObject_Draw(IViewObjectEx *iface, DWORD dwDrawAspect, DVTARGETDEVICE *ptd, HDC hdcTargetDev, HDC hdcDraw, LPCRECTL lprcBounds, LPCRECTL lprcWBounds, BOOL (CALLBACK *pfnContinue)(ULONG_PTR dwContinue), ULONG_PTR dwContinue) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%d %d %p %p %p %p %p %p %p %ld)\n", This, dwDrawAspect, lindex, pvAspect, ptd, hdcTargetDev, hdcDraw, lprcBounds, lprcWBounds, pfnContinue, dwContinue); return E_NOTIMPL; @@ -792,7 +795,7 @@ static HRESULT WINAPI ViewObject_Draw(IViewObjectEx *iface, DWORD dwDrawAspect, static HRESULT WINAPI ViewObject_GetColorSet(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hicTargetDev, LOGPALETTE **ppColorSet) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%d %d %p %p %p %p)\n", This, dwDrawAspect, lindex, pvAspect, ptd, hicTargetDev, ppColorSet); return E_NOTIMPL; } @@ -800,21 +803,21 @@ static HRESULT WINAPI ViewObject_GetColorSet(IViewObjectEx *iface, DWORD dwDrawA static HRESULT WINAPI ViewObject_Freeze(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DWORD *pdwFreeze) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%d %d %p %p)\n", This, dwDrawAspect, lindex, pvAspect, pdwFreeze); return E_NOTIMPL; } static HRESULT WINAPI ViewObject_Unfreeze(IViewObjectEx *iface, DWORD dwFreeze) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%d)\n", This, dwFreeze); return E_NOTIMPL; } static HRESULT WINAPI ViewObject_SetAdvise(IViewObjectEx *iface, DWORD aspects, DWORD advf, IAdviseSink *pAdvSink) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); TRACE("(%p)->(%d %d %p)\n", This, aspects, advf, pAdvSink); @@ -832,7 +835,7 @@ static HRESULT WINAPI ViewObject_SetAdvise(IViewObjectEx *iface, DWORD aspects, static HRESULT WINAPI ViewObject_GetAdvise(IViewObjectEx *iface, DWORD *pAspects, DWORD *pAdvf, IAdviseSink **ppAdvSink) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%p %p %p)\n", This, pAspects, pAdvf, ppAdvSink); return E_NOTIMPL; } @@ -840,21 +843,21 @@ static HRESULT WINAPI ViewObject_GetAdvise(IViewObjectEx *iface, DWORD *pAspects static HRESULT WINAPI ViewObject_GetExtent(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, DVTARGETDEVICE* ptd, LPSIZEL lpsizel) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%d %d %p %p)\n", This, dwDrawAspect, lindex, ptd, lpsizel); return E_NOTIMPL; } static HRESULT WINAPI ViewObject_GetRect(IViewObjectEx *iface, DWORD dwAspect, LPRECTL pRect) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%d %p)\n", This, dwAspect, pRect); return E_NOTIMPL; } static HRESULT WINAPI ViewObject_GetViewStatus(IViewObjectEx *iface, DWORD *pdwStatus) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%p)\n", This, pdwStatus); return E_NOTIMPL; } @@ -862,7 +865,7 @@ static HRESULT WINAPI ViewObject_GetViewStatus(IViewObjectEx *iface, DWORD *pdwS static HRESULT WINAPI ViewObject_QueryHitPoint(IViewObjectEx* iface, DWORD dwAspect, LPCRECT pRectBounds, POINT ptlLoc, LONG lCloseHint, DWORD *pHitResult) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%d %p (%d %d) %d %p)\n", This, dwAspect, pRectBounds, ptlLoc.x, ptlLoc.y, lCloseHint, pHitResult); return E_NOTIMPL; @@ -871,7 +874,7 @@ static HRESULT WINAPI ViewObject_QueryHitPoint(IViewObjectEx* iface, DWORD dwAsp static HRESULT WINAPI ViewObject_QueryHitRect(IViewObjectEx *iface, DWORD dwAspect, LPCRECT pRectBounds, LPCRECT pRectLoc, LONG lCloseHint, DWORD *pHitResult) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%d %p %p %d %p)\n", This, dwAspect, pRectBounds, pRectLoc, lCloseHint, pHitResult); return E_NOTIMPL; } @@ -879,14 +882,12 @@ static HRESULT WINAPI ViewObject_QueryHitRect(IViewObjectEx *iface, DWORD dwAspe static HRESULT WINAPI ViewObject_GetNaturalExtent(IViewObjectEx *iface, DWORD dwAspect, LONG lindex, DVTARGETDEVICE *ptd, HDC hicTargetDev, DVEXTENTINFO *pExtentInfo, LPSIZEL pSizel) { - HTMLDocument *This = VIEWOBJ_THIS(iface); + HTMLDocument *This = impl_from_IViewObjectEx(iface); FIXME("(%p)->(%d %d %p %p %p %p\n", This, dwAspect,lindex, ptd, hicTargetDev, pExtentInfo, pSizel); return E_NOTIMPL; } -#undef VIEWOBJ_THIS - static const IViewObjectExVtbl ViewObjectVtbl = { ViewObject_QueryInterface, ViewObject_AddRef, @@ -908,5 +909,5 @@ static const IViewObjectExVtbl ViewObjectVtbl = { void HTMLDocument_View_Init(HTMLDocument *This) { This->IOleDocumentView_iface.lpVtbl = &OleDocumentViewVtbl; - This->lpViewObjectExVtbl = &ViewObjectVtbl; + This->IViewObjectEx_iface.lpVtbl = &ViewObjectVtbl; }

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IOleInPlaceObjectWindowless iface.
by Alexandre Julliard Dec. 23, 2010

Dec. 23, 2010

Module: wine Branch: master Commit: 62e9961e29487584fa1805e5d502644d295b2634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e9961e29487584fa1805e5d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 23 02:22:21 2010 +0100 mshtml: COM cleanup for the IOleInPlaceObjectWindowless iface. --- dlls/mshtml/htmldoc.c | 6 +++--- dlls/mshtml/mshtml_private.h | 4 +--- dlls/mshtml/oleobj.c | 2 +- dlls/mshtml/olewnd.c | 31 ++++++++++++++++--------------- dlls/mshtml/view.c | 2 +- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 15240de..4898fc6 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1767,10 +1767,10 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IOleInPlaceActiveObject_iface; }else if(IsEqualGUID(&IID_IOleInPlaceObject, riid)) { TRACE("(%p)->(IID_IOleInPlaceObject, %p)\n", This, ppv); - *ppv = INPLACEOBJ(This); + *ppv = &This->IOleInPlaceObjectWindowless_iface; }else if(IsEqualGUID(&IID_IOleInPlaceObjectWindowless, riid)) { TRACE("(%p)->(IID_IOleInPlaceObjectWindowless, %p)\n", This, ppv); - *ppv = INPLACEWIN(This); + *ppv = &This->IOleInPlaceObjectWindowless_iface; }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { TRACE("(%p)->(IID_IServiceProvider, %p)\n", This, ppv); *ppv = SERVPROV(This); @@ -2106,7 +2106,7 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) if(This->hostui) ICustomDoc_SetUIHandler(CUSTOMDOC(This), NULL); if(This->in_place_active) - IOleInPlaceObjectWindowless_InPlaceDeactivate(INPLACEWIN(&This->basedoc)); + IOleInPlaceObjectWindowless_InPlaceDeactivate(&This->basedoc.IOleInPlaceObjectWindowless_iface); if(This->ipsite) IOleDocumentView_SetInPlaceSite(&This->basedoc.IOleDocumentView_iface, NULL); if(This->undomgr) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 703d5ff..2ef0d62 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -356,7 +356,7 @@ struct HTMLDocument { IOleDocumentView IOleDocumentView_iface; IOleInPlaceActiveObject IOleInPlaceActiveObject_iface; IViewObjectEx IViewObjectEx_iface; - const IOleInPlaceObjectWindowlessVtbl *lpOleInPlaceObjectWindowlessVtbl; + IOleInPlaceObjectWindowless IOleInPlaceObjectWindowless_iface; const IServiceProviderVtbl *lpServiceProviderVtbl; const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; const IOleControlVtbl *lpOleControlVtbl; @@ -625,8 +625,6 @@ struct HTMLDocumentNode { #define HTMLWINDOW2(x) ((IHTMLWindow2*) &(x)->lpHTMLWindow2Vtbl) #define HTMLWINDOW3(x) ((IHTMLWindow3*) &(x)->lpHTMLWindow3Vtbl) #define HTMLWINDOW4(x) ((IHTMLWindow4*) &(x)->lpHTMLWindow4Vtbl) -#define INPLACEOBJ(x) ((IOleInPlaceObject*) &(x)->lpOleInPlaceObjectWindowlessVtbl) -#define INPLACEWIN(x) ((IOleInPlaceObjectWindowless*) &(x)->lpOleInPlaceObjectWindowlessVtbl) #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) #define CMDTARGET(x) ((IOleCommandTarget*) &(x)->lpOleCommandTargetVtbl) #define CONTROL(x) ((IOleControl*) &(x)->lpOleControlVtbl) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 8f49a28..166af0c 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -267,7 +267,7 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) FIXME("OLECLOSE_PROMPTSAVE not implemented\n"); if(This->doc_obj->in_place_active) - IOleInPlaceObjectWindowless_InPlaceDeactivate(INPLACEWIN(This)); + IOleInPlaceObjectWindowless_InPlaceDeactivate(&This->IOleInPlaceObjectWindowless_iface); HTMLDocument_LockContainer(This->doc_obj, FALSE); diff --git a/dlls/mshtml/olewnd.c b/dlls/mshtml/olewnd.c index 99d9b9e..18b98f6 100644 --- a/dlls/mshtml/olewnd.c +++ b/dlls/mshtml/olewnd.c @@ -146,44 +146,47 @@ static const IOleInPlaceActiveObjectVtbl OleInPlaceActiveObjectVtbl = { * IOleInPlaceObjectWindowless implementation */ -#define OLEINPLACEWND_THIS(iface) DEFINE_THIS(HTMLDocument, OleInPlaceObjectWindowless, iface) +static inline HTMLDocument *impl_from_IOleInPlaceObjectWindowless(IOleInPlaceObjectWindowless *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IOleInPlaceObjectWindowless_iface); +} static HRESULT WINAPI OleInPlaceObjectWindowless_QueryInterface(IOleInPlaceObjectWindowless *iface, REFIID riid, void **ppv) { - HTMLDocument *This = OLEINPLACEWND_THIS(iface); + HTMLDocument *This = impl_from_IOleInPlaceObjectWindowless(iface); return htmldoc_query_interface(This, riid, ppv); } static ULONG WINAPI OleInPlaceObjectWindowless_AddRef(IOleInPlaceObjectWindowless *iface) { - HTMLDocument *This = OLEINPLACEWND_THIS(iface); + HTMLDocument *This = impl_from_IOleInPlaceObjectWindowless(iface); return htmldoc_addref(This); } static ULONG WINAPI OleInPlaceObjectWindowless_Release(IOleInPlaceObjectWindowless *iface) { - HTMLDocument *This = OLEINPLACEWND_THIS(iface); + HTMLDocument *This = impl_from_IOleInPlaceObjectWindowless(iface); return htmldoc_release(This); } static HRESULT WINAPI OleInPlaceObjectWindowless_GetWindow(IOleInPlaceObjectWindowless *iface, HWND *phwnd) { - HTMLDocument *This = OLEINPLACEWND_THIS(iface); + HTMLDocument *This = impl_from_IOleInPlaceObjectWindowless(iface); return IOleWindow_GetWindow(&This->IOleInPlaceActiveObject_iface, phwnd); } static HRESULT WINAPI OleInPlaceObjectWindowless_ContextSensitiveHelp(IOleInPlaceObjectWindowless *iface, BOOL fEnterMode) { - HTMLDocument *This = OLEINPLACEWND_THIS(iface); + HTMLDocument *This = impl_from_IOleInPlaceObjectWindowless(iface); return IOleWindow_ContextSensitiveHelp(&This->IOleInPlaceActiveObject_iface, fEnterMode); } static HRESULT WINAPI OleInPlaceObjectWindowless_InPlaceDeactivate(IOleInPlaceObjectWindowless *iface) { - HTMLDocument *This = OLEINPLACEWND_THIS(iface); + HTMLDocument *This = impl_from_IOleInPlaceObjectWindowless(iface); TRACE("(%p)\n", This); @@ -224,7 +227,7 @@ static HRESULT WINAPI OleInPlaceObjectWindowless_InPlaceDeactivate(IOleInPlaceOb static HRESULT WINAPI OleInPlaceObjectWindowless_UIDeactivate(IOleInPlaceObjectWindowless *iface) { - HTMLDocument *This = OLEINPLACEWND_THIS(iface); + HTMLDocument *This = impl_from_IOleInPlaceObjectWindowless(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } @@ -232,14 +235,14 @@ static HRESULT WINAPI OleInPlaceObjectWindowless_UIDeactivate(IOleInPlaceObjectW static HRESULT WINAPI OleInPlaceObjectWindowless_SetObjectRects(IOleInPlaceObjectWindowless *iface, LPCRECT lprcPosRect, LPCRECT lprcClipRect) { - HTMLDocument *This = OLEINPLACEWND_THIS(iface); + HTMLDocument *This = impl_from_IOleInPlaceObjectWindowless(iface); FIXME("(%p)->(%p %p)\n", This, lprcPosRect, lprcClipRect); return E_NOTIMPL; } static HRESULT WINAPI OleInPlaceObjectWindowless_ReactivateAndUndo(IOleInPlaceObjectWindowless *iface) { - HTMLDocument *This = OLEINPLACEWND_THIS(iface); + HTMLDocument *This = impl_from_IOleInPlaceObjectWindowless(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } @@ -247,7 +250,7 @@ static HRESULT WINAPI OleInPlaceObjectWindowless_ReactivateAndUndo(IOleInPlaceOb static HRESULT WINAPI OleInPlaceObjectWindowless_OnWindowMessage(IOleInPlaceObjectWindowless *iface, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *lpResult) { - HTMLDocument *This = OLEINPLACEWND_THIS(iface); + HTMLDocument *This = impl_from_IOleInPlaceObjectWindowless(iface); FIXME("(%p)->(%u %lu %lu %p)\n", This, msg, wParam, lParam, lpResult); return E_NOTIMPL; } @@ -255,7 +258,7 @@ static HRESULT WINAPI OleInPlaceObjectWindowless_OnWindowMessage(IOleInPlaceObje static HRESULT WINAPI OleInPlaceObjectWindowless_GetDropTarget(IOleInPlaceObjectWindowless *iface, IDropTarget **ppDropTarget) { - HTMLDocument *This = OLEINPLACEWND_THIS(iface); + HTMLDocument *This = impl_from_IOleInPlaceObjectWindowless(iface); FIXME("(%p)->(%p)\n", This, ppDropTarget); return E_NOTIMPL; } @@ -274,10 +277,8 @@ static const IOleInPlaceObjectWindowlessVtbl OleInPlaceObjectWindowlessVtbl = { OleInPlaceObjectWindowless_GetDropTarget }; -#undef INPLACEWIN_THIS - void HTMLDocument_Window_Init(HTMLDocument *This) { This->IOleInPlaceActiveObject_iface.lpVtbl = &OleInPlaceActiveObjectVtbl; - This->lpOleInPlaceObjectWindowlessVtbl = &OleInPlaceObjectWindowlessVtbl; + This->IOleInPlaceObjectWindowless_iface.lpVtbl = &OleInPlaceObjectWindowlessVtbl; } diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 1b6a32f..1878e15 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -574,7 +574,7 @@ static HRESULT WINAPI OleDocumentView_Show(IOleDocumentView *iface, BOOL fShow) ShowWindow(This->doc_obj->hwnd, SW_HIDE); if(This->doc_obj->in_place_active) - IOleInPlaceObjectWindowless_InPlaceDeactivate(INPLACEWIN(This)); + IOleInPlaceObjectWindowless_InPlaceDeactivate(&This->IOleInPlaceObjectWindowless_iface); if(This->doc_obj->ip_window) { IOleInPlaceUIWindow_Release(This->doc_obj->ip_window);

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IOleDocumentView iface.
by Alexandre Julliard Dec. 23, 2010

Dec. 23, 2010

Module: wine Branch: master Commit: 37c3091f27b7df0d619d1bf697b0d560877cf250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37c3091f27b7df0d619d1bf69… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 23 02:19:14 2010 +0100 mshtml: COM cleanup for the IOleDocumentView iface. --- dlls/mshtml/htmldoc.c | 4 ++-- dlls/mshtml/mshtml_private.h | 4 +--- dlls/mshtml/oleobj.c | 14 +++++++------- dlls/mshtml/olewnd.c | 2 +- dlls/mshtml/view.c | 41 +++++++++++++++++++++-------------------- 5 files changed, 32 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37c3091f27b7df0d619d1…

1 0

Hwang YunSong : hhctl.ocx: Update Korean resource.
by Alexandre Julliard Dec. 23, 2010

Dec. 23, 2010

Module: wine Branch: master Commit: 719b60187d43be317746f388698691e55e99c907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=719b60187d43be317746f3886… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Dec 23 16:38:37 2010 +0900 hhctl.ocx: Update Korean resource. --- dlls/hhctrl.ocx/Ko.rc | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/hhctrl.ocx/Ko.rc b/dlls/hhctrl.ocx/Ko.rc index c641404..9912b92 100644 --- a/dlls/hhctrl.ocx/Ko.rc +++ b/dlls/hhctrl.ocx/Ko.rc @@ -3,7 +3,7 @@ * Korean Language Support * * Copyright 2005 James Hawkins - * Copyright 2005 YunSong Hwang + * Copyright 2005,2010 YunSong Hwang * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,28 +22,30 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_CONTENTS "��(&C)" - IDS_INDEX "�ε��(&N)" - IDS_SEARCH "ã��(&S)" - IDS_FAVORITES "��ã��(&I)" + IDS_CONTENTS "목록(&C)" + IDS_INDEX "인덱스(&N)" + IDS_SEARCH "찾기(&S)" + IDS_FAVORITES "즐겨찾기(&I)" END STRINGTABLE BEGIN - IDTB_EXPAND "��ֱ�" - IDTB_CONTRACT "��" - IDTB_STOP "��" - IDTB_REFRESH "�� ħ" - IDTB_BACK "�ڷ�" - IDTB_HOME "Ȩ" - IDTB_SYNC "��ȭ" - IDTB_PRINT "�μ�" - IDTB_OPTIONS "�ɼ�" - IDTB_FORWARD "��" + IDTB_EXPAND "보여주기" + IDTB_CONTRACT "숨기기" + IDTB_STOP "정지" + IDTB_REFRESH "새로 고침" + IDTB_BACK "뒤로" + IDTB_HOME "홈" + IDTB_SYNC "동기화" + IDTB_PRINT "인쇄" + IDTB_OPTIONS "옵션" + IDTB_FORWARD "앞으로" IDTB_NOTES "IDTB_NOTES" IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" IDTB_BROWSE_BACK "IDT_BROWSE_BACK" @@ -54,8 +56,8 @@ BEGIN IDTB_FAVORITES "IDTB_FAVORITES" IDTB_JUMP1 "Jump1" IDTB_JUMP2 "Jump2" - IDTB_CUSTOMIZE "��" - IDTB_ZOOM "Ȯ��" + IDTB_CUSTOMIZE "사용자정의" + IDTB_ZOOM "확대" IDTB_TOC_NEXT "IDTB_TOC_NEXT" IDTB_TOC_PREV "IDTB_TOC_PREV" END

1 0

Austin English : mscoree/tests: Fix a broken test (LLVM/Clang).
by Alexandre Julliard Dec. 23, 2010

Dec. 23, 2010

Module: wine Branch: master Commit: cccc36e25a83336a996362f7652e839338718787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cccc36e25a83336a996362f76… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 22 22:27:55 2010 -0800 mscoree/tests: Fix a broken test (LLVM/Clang). --- dlls/mscoree/tests/mscoree.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 0155fdd..4226493 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -115,7 +115,7 @@ static void test_versioninfo(void) trace(" installed in directory %s is .net version %s\n", wine_dbgstr_w(path), wine_dbgstr_w(version)); hr = pGetRequestedRuntimeInfo( NULL, v1_1, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, &size); - ok(hr == S_OK || CLR_E_SHIM_RUNTIME /*v1_1 not installed*/, "GetRequestedRuntimeInfo returned %08x\n", hr); + ok(hr == S_OK || hr == CLR_E_SHIM_RUNTIME /*v1_1 not installed*/, "GetRequestedRuntimeInfo returned %08x\n", hr); if(hr == S_OK) trace(" installed in directory %s is .net version %s\n", wine_dbgstr_w(path), wine_dbgstr_w(version)); /* version number NULL not allowed without RUNTIME_INFO_UPGRADE_VERSION flag */

1 0

Austin English : quartz: Avoid %L in traces (LLVM/Clang).
by Alexandre Julliard Dec. 23, 2010

Dec. 23, 2010

Module: wine Branch: master Commit: a5c50a25fbd2401f9a2b616ffd225d4c856ef402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5c50a25fbd2401f9a2b616ff… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 22 23:18:25 2010 -0800 quartz: Avoid %L in traces (LLVM/Clang). --- dlls/quartz/dsoundrender.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index f48cc77..d472145 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -1193,7 +1193,7 @@ static DWORD WINAPI DSoundAdviseThread(LPVOID lpParam) { FIXME("Could not get time: %08x\n", hr); continue; } - TRACE("Time: %Li\n", curtime); + TRACE("Time: %s\n", wine_dbgstr_longlong(curtime)); while (prev->next) { cur = prev->next; if (cur->start > curtime) { @@ -1207,7 +1207,7 @@ static DWORD WINAPI DSoundAdviseThread(LPVOID lpParam) { prev = cur; } else { struct dsoundrender_timer *next = cur->next; - TRACE("Firing %p %Li < %Li\n", cur, cur->start, curtime); + TRACE("Firing %p %s < %s\n", cur, wine_dbgstr_longlong(cur->start), wine_dbgstr_longlong(curtime)); SetEvent(cur->handle); HeapFree(GetProcessHeap(), 0, cur); prev->next = next;

1 0

Frédéric Delanoy : wininet: Update French translation.
by Alexandre Julliard Dec. 23, 2010

Dec. 23, 2010

Module: wine Branch: master Commit: 79f36b2a08daa235cf6a342898bc344052550931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f36b2a08daa235cf6a34289… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 22 23:42:11 2010 +0100 wininet: Update French translation. --- dlls/wininet/wininet_Fr.rc | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/wininet_Fr.rc b/dlls/wininet/wininet_Fr.rc index aa1b463..0cb2a02 100644 --- a/dlls/wininet/wininet_Fr.rc +++ b/dlls/wininet/wininet_Fr.rc @@ -69,6 +69,18 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Annuler", IDCANCEL, 147, 128, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_INVCERTDLG DIALOG 3, 24, 250, 86 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Alerte de sécurité" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Le certificat pour ce site pose problème.", -1, 40, 6, 200, 20 + LTEXT "", IDC_CERT_ERROR, 40, 26, 200, 20 + LTEXT "Voulez-vous tout de même continuer ?", -1, 40, 46, 200, 20 + PUSHBUTTON "Oui", IDOK, 40, 66, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Non", IDCANCEL, 100, 66, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE { IDS_LANCONNECTION "Connexion réseau local (LAN)"

1 0

André Hentschel : shell32/tests: Fix a typo.
by Alexandre Julliard Dec. 23, 2010

Dec. 23, 2010

Module: wine Branch: master Commit: 2bbb9cb88886372a77fa6c1d12f4babf76dd90dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bbb9cb88886372a77fa6c1d1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 23 03:03:22 2010 +0100 shell32/tests: Fix a typo. --- dlls/shell32/tests/shlexec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 47f640f..c32a065 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1714,7 +1714,7 @@ static void test_dde(void) { if (!create_test_association(".sde")) { - skip("Unable to create association for '.sfe'\n"); + skip("Unable to create association for '.sde'\n"); return; } create_test_verb_dde(".sde", "Open", 0, test->command, test->ddeexec,

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IOleDocument iface.
by Alexandre Julliard Dec. 23, 2010

Dec. 23, 2010

Module: wine Branch: master Commit: 041c6ec3627bfd4100f9d8d2884b1ae4f07eafc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=041c6ec3627bfd4100f9d8d28… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 23 02:17:39 2010 +0100 mshtml: COM cleanup for the IOleDocument iface. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/mshtml_private.h | 3 +-- dlls/mshtml/oleobj.c | 21 +++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0c0fb0a..c0aef86 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1746,7 +1746,7 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IOleObject_iface; }else if(IsEqualGUID(&IID_IOleDocument, riid)) { TRACE("(%p)->(IID_IOleDocument, %p)\n", This, ppv); - *ppv = OLEDOC(This); + *ppv = &This->IOleDocument_iface; }else if(IsEqualGUID(&IID_IOleDocumentView, riid)) { TRACE("(%p)->(IID_IOleDocumentView, %p)\n", This, ppv); *ppv = DOCVIEW(This); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 381939e..fa92722 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -352,7 +352,7 @@ struct HTMLDocument { IPersistHistory IPersistHistory_iface; IMonikerProp IMonikerProp_iface; IOleObject IOleObject_iface; - const IOleDocumentVtbl *lpOleDocumentVtbl; + IOleDocument IOleDocument_iface; const IOleDocumentViewVtbl *lpOleDocumentViewVtbl; const IOleInPlaceActiveObjectVtbl *lpOleInPlaceActiveObjectVtbl; const IViewObjectExVtbl *lpViewObjectExVtbl; @@ -626,7 +626,6 @@ struct HTMLDocumentNode { #define HTMLWINDOW3(x) ((IHTMLWindow3*) &(x)->lpHTMLWindow3Vtbl) #define HTMLWINDOW4(x) ((IHTMLWindow4*) &(x)->lpHTMLWindow4Vtbl) -#define OLEDOC(x) ((IOleDocument*) &(x)->lpOleDocumentVtbl) #define DOCVIEW(x) ((IOleDocumentView*) &(x)->lpOleDocumentViewVtbl) #define OLEWIN(x) ((IOleWindow*) &(x)->lpOleInPlaceActiveObjectVtbl) #define ACTOBJ(x) ((IOleInPlaceActiveObject*) &(x)->lpOleInPlaceActiveObjectVtbl) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 2dafbf8..7d63f5d 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -490,30 +490,33 @@ static const IOleObjectVtbl OleObjectVtbl = { * IOleDocument implementation */ -#define OLEDOC_THIS(iface) DEFINE_THIS(HTMLDocument, OleDocument, iface) +static inline HTMLDocument *impl_from_IOleDocument(IOleDocument *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IOleDocument_iface); +} static HRESULT WINAPI OleDocument_QueryInterface(IOleDocument *iface, REFIID riid, void **ppv) { - HTMLDocument *This = OLEDOC_THIS(iface); + HTMLDocument *This = impl_from_IOleDocument(iface); return htmldoc_query_interface(This, riid, ppv); } static ULONG WINAPI OleDocument_AddRef(IOleDocument *iface) { - HTMLDocument *This = OLEDOC_THIS(iface); + HTMLDocument *This = impl_from_IOleDocument(iface); return htmldoc_addref(This); } static ULONG WINAPI OleDocument_Release(IOleDocument *iface) { - HTMLDocument *This = OLEDOC_THIS(iface); + HTMLDocument *This = impl_from_IOleDocument(iface); return htmldoc_release(This); } static HRESULT WINAPI OleDocument_CreateView(IOleDocument *iface, IOleInPlaceSite *pIPSite, IStream *pstm, DWORD dwReserved, IOleDocumentView **ppView) { - HTMLDocument *This = OLEDOC_THIS(iface); + HTMLDocument *This = impl_from_IOleDocument(iface); HRESULT hres; TRACE("(%p)->(%p %p %d %p)\n", This, pIPSite, pstm, dwReserved, ppView); @@ -544,7 +547,7 @@ static HRESULT WINAPI OleDocument_CreateView(IOleDocument *iface, IOleInPlaceSit static HRESULT WINAPI OleDocument_GetDocMiscStatus(IOleDocument *iface, DWORD *pdwStatus) { - HTMLDocument *This = OLEDOC_THIS(iface); + HTMLDocument *This = impl_from_IOleDocument(iface); FIXME("(%p)->(%p)\n", This, pdwStatus); return E_NOTIMPL; } @@ -552,13 +555,11 @@ static HRESULT WINAPI OleDocument_GetDocMiscStatus(IOleDocument *iface, DWORD *p static HRESULT WINAPI OleDocument_EnumViews(IOleDocument *iface, IEnumOleDocumentViews **ppEnum, IOleDocumentView **ppView) { - HTMLDocument *This = OLEDOC_THIS(iface); + HTMLDocument *This = impl_from_IOleDocument(iface); FIXME("(%p)->(%p %p)\n", This, ppEnum, ppView); return E_NOTIMPL; } -#undef OLEDOC_THIS - static const IOleDocumentVtbl OleDocumentVtbl = { OleDocument_QueryInterface, OleDocument_AddRef, @@ -871,7 +872,7 @@ void HTMLDocument_LockContainer(HTMLDocumentObj *This, BOOL fLock) void HTMLDocument_OleObj_Init(HTMLDocument *This) { This->IOleObject_iface.lpVtbl = &OleObjectVtbl; - This->lpOleDocumentVtbl = &OleDocumentVtbl; + This->IOleDocument_iface.lpVtbl = &OleDocumentVtbl; This->lpOleControlVtbl = &OleControlVtbl; This->lpObjectWithSiteVtbl = &ObjectWithSiteVtbl; This->IOleContainer_iface.lpVtbl = &OleContainerVtbl;

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IOleObject iface.
by Alexandre Julliard Dec. 23, 2010

Dec. 23, 2010

Module: wine Branch: master Commit: 6c3bb4de6f4fa8d57bb166cfd223f6a8d25f1c2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c3bb4de6f4fa8d57bb166cfd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 23 02:16:00 2010 +0100 mshtml: COM cleanup for the IOleObject iface. --- dlls/mshtml/hlink.c | 2 +- dlls/mshtml/htmldoc.c | 4 +- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/oleobj.c | 57 +++++++++++++++++++++-------------------- dlls/mshtml/persist.c | 2 +- 5 files changed, 34 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c3bb4de6f4fa8d57bb16…

1 0