Michael Stefaniuc : wuapi: Use an iface instead of a vtbl pointer in update_searcher.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b0c925cdb2bbcd60cf7449ba5b95e7ddc1f3833b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b0c925cdb2bbcd60cf7449ba5b...

Author: Michael Stefaniuc 
Date:   Fri Dec 10 09:32:12 2010 +0100

wuapi: Use an iface instead of a vtbl pointer in update_searcher.

---

dlls/wuapi/searcher.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/wuapi/searcher.c b/dlls/wuapi/searcher.c
index 8105681..da3dd81 100644
--- a/dlls/wuapi/searcher.c
+++ b/dlls/wuapi/searcher.c
@@ -35,13 +35,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(wuapi);

typedef struct _update_searcher
 {
-    const struct IUpdateSearcherVtbl *vtbl;
+    IUpdateSearcher IUpdateSearcher_iface;
     LONG refs;
 } update_searcher;

static inline update_searcher *impl_from_IUpdateSearcher( IUpdateSearcher *iface )
 {
-    return (update_searcher *)((char *)iface - FIELD_OFFSET( update_searcher, vtbl ));
+    return CONTAINING_RECORD(iface, update_searcher, IUpdateSearcher_iface);
 }

static ULONG WINAPI update_searcher_AddRef(
@@ -247,10 +247,10 @@ HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj )
     searcher = HeapAlloc( GetProcessHeap(), 0, sizeof(*searcher) );
     if (!searcher) return E_OUTOFMEMORY;

-    searcher->vtbl = &update_searcher_vtbl;
+    searcher->IUpdateSearcher_iface.lpVtbl = &update_searcher_vtbl;
     searcher->refs = 1;

-    *ppObj = &searcher->vtbl;
+    *ppObj = &searcher->IUpdateSearcher_iface;

TRACE("returning iface %p\n", *ppObj);
     return S_OK;