wiaservc: Remove unused IUnknown *outer parameter from object constructor.

Dmitry Timoshkov dmitry at baikal.ru
Mon Dec 30 03:20:54 CST 2013


Class factory explicitly checks for it:

if (outer) return CLASS_E_NOAGGREGATION;
obj_constructor(outer, &obj);

i.e. outer is always NULL in the object constructor.
---
 dlls/wiaservc/factory.c          | 2 +-
 dlls/wiaservc/wiadevmgr.c        | 4 ++--
 dlls/wiaservc/wiaservc_private.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/wiaservc/factory.c b/dlls/wiaservc/factory.c
index a80b830..c76a363 100644
--- a/dlls/wiaservc/factory.c
+++ b/dlls/wiaservc/factory.c
@@ -77,7 +77,7 @@ WIASERVC_IClassFactory_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnkOuter,
     if (pUnkOuter)
         return CLASS_E_NOAGGREGATION;
 
-    res = wiadevmgr_Constructor(pUnkOuter, (LPVOID*) &punk);
+    res = wiadevmgr_Constructor((LPVOID*) &punk);
     if (FAILED(res))
         return res;
 
diff --git a/dlls/wiaservc/wiadevmgr.c b/dlls/wiaservc/wiadevmgr.c
index fea4e94..2f0907b 100644
--- a/dlls/wiaservc/wiadevmgr.c
+++ b/dlls/wiaservc/wiadevmgr.c
@@ -164,10 +164,10 @@ static const IWiaDevMgrVtbl WIASERVC_IWiaDevMgr_Vtbl =
     wiadevmgr_AddDeviceDlg
 };
 
-HRESULT wiadevmgr_Constructor(IUnknown *pUnkOuter, LPVOID *ppObj)
+HRESULT wiadevmgr_Constructor(LPVOID *ppObj)
 {
     wiadevmgr *This;
-    TRACE("(%p,%p)\n", pUnkOuter, ppObj);
+    TRACE("(%p)\n", ppObj);
     This = HeapAlloc(GetProcessHeap(), 0, sizeof(wiadevmgr));
     if (This)
     {
diff --git a/dlls/wiaservc/wiaservc_private.h b/dlls/wiaservc/wiaservc_private.h
index 5125937..b7faf89 100644
--- a/dlls/wiaservc/wiaservc_private.h
+++ b/dlls/wiaservc/wiaservc_private.h
@@ -34,7 +34,7 @@ typedef struct
     LONG ref;
 } wiadevmgr;
 
-HRESULT wiadevmgr_Constructor(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
+HRESULT wiadevmgr_Constructor(LPVOID *ppObj) DECLSPEC_HIDDEN;
 
 /* Little helper functions */
 static inline char *
-- 
1.8.5.2




More information about the wine-patches mailing list