Jacek Caban : oleaut32: Clean up IPSFactoryBuffer instance.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Sep 7 09:20:14 CDT 2015


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Sep  7 13:38:32 2015 +0200

oleaut32: Clean up IPSFactoryBuffer instance.

---

 dlls/oleaut32/tmarshal.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c
index 6608aed..f4ce311 100644
--- a/dlls/oleaut32/tmarshal.c
+++ b/dlls/oleaut32/tmarshal.c
@@ -2338,17 +2338,12 @@ static const IPSFactoryBufferVtbl psfacbufvtbl = {
     PSFacBuf_CreateStub
 };
 
-/* This is the whole PSFactoryBuffer object, just the vtableptr */
-static const IPSFactoryBufferVtbl *lppsfac = &psfacbufvtbl;
+static IPSFactoryBuffer psfac = { &psfacbufvtbl };
 
 /***********************************************************************
  *           TMARSHAL_DllGetClassObject
  */
-HRESULT TMARSHAL_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv)
+HRESULT TMARSHAL_DllGetClassObject(REFCLSID rclsid, REFIID iid, void **ppv)
 {
-    if (IsEqualIID(iid,&IID_IPSFactoryBuffer)) {
-	*ppv = &lppsfac;
-	return S_OK;
-    }
-    return E_NOINTERFACE;
+    return IPSFactoryBuffer_QueryInterface(&psfac, iid, ppv);
 }




More information about the wine-cvs mailing list