wuapi: Remove unused IUnknown *outer parameter from object constructors.

This commit is contained in:
Dmitry Timoshkov 2013-12-30 18:21:15 +09:00 committed by Alexandre Julliard
parent ab8237c8c5
commit 5cf3c1f4a6
3 changed files with 13 additions and 16 deletions

View file

@ -35,7 +35,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(wuapi); WINE_DEFAULT_DEBUG_CHANNEL(wuapi);
typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj ); typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj );
typedef struct _wucf typedef struct _wucf
{ {
@ -85,14 +85,11 @@ static HRESULT WINAPI wucf_CreateInstance( IClassFactory *iface, LPUNKNOWN pOute
if (pOuter) if (pOuter)
return CLASS_E_NOAGGREGATION; return CLASS_E_NOAGGREGATION;
r = This->pfnCreateInstance( pOuter, (LPVOID *)&punk ); r = This->pfnCreateInstance( (LPVOID *)&punk );
if (FAILED(r)) if (FAILED(r))
return r; return r;
r = IUnknown_QueryInterface( punk, riid, ppobj ); r = IUnknown_QueryInterface( punk, riid, ppobj );
if (FAILED(r))
return r;
IUnknown_Release( punk ); IUnknown_Release( punk );
return r; return r;
} }

View file

@ -179,7 +179,7 @@ static HRESULT WINAPI update_session_CreateUpdateSearcher(
IUpdateSearcher **retval ) IUpdateSearcher **retval )
{ {
TRACE("%p\n", This); TRACE("%p\n", This);
return UpdateSearcher_create( NULL, (LPVOID *)retval ); return UpdateSearcher_create( (LPVOID *)retval );
} }
static HRESULT WINAPI update_session_CreateUpdateDownloader( static HRESULT WINAPI update_session_CreateUpdateDownloader(
@ -187,7 +187,7 @@ static HRESULT WINAPI update_session_CreateUpdateDownloader(
IUpdateDownloader **retval ) IUpdateDownloader **retval )
{ {
TRACE("%p\n", This); TRACE("%p\n", This);
return UpdateDownloader_create( NULL, (LPVOID *)retval ); return UpdateDownloader_create( (LPVOID *)retval );
} }
static HRESULT WINAPI update_session_CreateUpdateInstaller( static HRESULT WINAPI update_session_CreateUpdateInstaller(
@ -195,7 +195,7 @@ static HRESULT WINAPI update_session_CreateUpdateInstaller(
IUpdateInstaller **retval ) IUpdateInstaller **retval )
{ {
TRACE("%p\n", This); TRACE("%p\n", This);
return UpdateInstaller_create( NULL, (LPVOID *)retval ); return UpdateInstaller_create( (LPVOID *)retval );
} }
static const struct IUpdateSessionVtbl update_session_vtbl = static const struct IUpdateSessionVtbl update_session_vtbl =
@ -217,11 +217,11 @@ static const struct IUpdateSessionVtbl update_session_vtbl =
update_session_CreateUpdateInstaller update_session_CreateUpdateInstaller
}; };
HRESULT UpdateSession_create( IUnknown *pUnkOuter, LPVOID *ppObj ) HRESULT UpdateSession_create( LPVOID *ppObj )
{ {
update_session *session; update_session *session;
TRACE("(%p,%p)\n", pUnkOuter, ppObj); TRACE("(%p)\n", ppObj);
session = HeapAlloc( GetProcessHeap(), 0, sizeof(*session) ); session = HeapAlloc( GetProcessHeap(), 0, sizeof(*session) );
if (!session) return E_OUTOFMEMORY; if (!session) return E_OUTOFMEMORY;

View file

@ -16,9 +16,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
extern HRESULT AutomaticUpdates_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; extern HRESULT AutomaticUpdates_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
extern HRESULT UpdateSession_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; extern HRESULT UpdateSession_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
extern HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; extern HRESULT UpdateSearcher_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
extern HRESULT UpdateDownloader_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; extern HRESULT UpdateDownloader_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
extern HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; extern HRESULT UpdateInstaller_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;
extern HRESULT SystemInformation_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; extern HRESULT SystemInformation_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;