Michael Stefaniuc : shdocvw: COM cleanup for the ITaskbarList iface.
Alexandre Julliard
julliard at winehq.org
Fri Mar 11 10:23:38 CST 2011
Module: wine
Branch: master
Commit: 4f382430f2176bc576c80e89c8324107278c0ed6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f382430f2176bc576c80e89c8324107278c0ed6
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Fri Mar 11 11:39:07 2011 +0100
shdocvw: COM cleanup for the ITaskbarList iface.
---
dlls/shdocvw/taskbarlist.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/dlls/shdocvw/taskbarlist.c b/dlls/shdocvw/taskbarlist.c
index 2c38080..d853506 100644
--- a/dlls/shdocvw/taskbarlist.c
+++ b/dlls/shdocvw/taskbarlist.c
@@ -27,10 +27,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
struct taskbar_list
{
- const struct ITaskbarListVtbl *lpVtbl;
+ ITaskbarList ITaskbarList_iface;
LONG refcount;
};
+static inline struct taskbar_list *impl_from_ITaskbarList(ITaskbarList *iface)
+{
+ return CONTAINING_RECORD(iface, struct taskbar_list, ITaskbarList_iface);
+}
+
/* IUnknown methods */
static HRESULT STDMETHODCALLTYPE taskbar_list_QueryInterface(ITaskbarList *iface, REFIID riid, void **object)
@@ -53,7 +58,7 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_QueryInterface(ITaskbarList *iface
static ULONG STDMETHODCALLTYPE taskbar_list_AddRef(ITaskbarList *iface)
{
- struct taskbar_list *This = (struct taskbar_list *)iface;
+ struct taskbar_list *This = impl_from_ITaskbarList(iface);
ULONG refcount = InterlockedIncrement(&This->refcount);
TRACE("%p increasing refcount to %u\n", This, refcount);
@@ -63,7 +68,7 @@ static ULONG STDMETHODCALLTYPE taskbar_list_AddRef(ITaskbarList *iface)
static ULONG STDMETHODCALLTYPE taskbar_list_Release(ITaskbarList *iface)
{
- struct taskbar_list *This = (struct taskbar_list *)iface;
+ struct taskbar_list *This = impl_from_ITaskbarList(iface);
ULONG refcount = InterlockedDecrement(&This->refcount);
TRACE("%p decreasing refcount to %u\n", This, refcount);
@@ -150,12 +155,12 @@ HRESULT TaskbarList_Create(IUnknown *outer, REFIID riid, void **taskbar_list)
return E_OUTOFMEMORY;
}
- object->lpVtbl = &taskbar_list_vtbl;
+ object->ITaskbarList_iface.lpVtbl = &taskbar_list_vtbl;
object->refcount = 0;
TRACE("Created ITaskbarList %p\n", object);
- hr = ITaskbarList_QueryInterface((ITaskbarList *)object, riid, taskbar_list);
+ hr = ITaskbarList_QueryInterface(&object->ITaskbarList_iface, riid, taskbar_list);
if (FAILED(hr))
{
HeapFree(GetProcessHeap(), 0, object);
More information about the wine-cvs
mailing list