Michael Stefaniuc : devenum: COM cleanup for ICreateDevEnum.
Alexandre Julliard
julliard at winehq.org
Tue Apr 3 12:17:38 CDT 2012
Module: wine
Branch: master
Commit: 1e40dea125b3361c28a6c87f298a49cac8f9cbb3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e40dea125b3361c28a6c87f298a49cac8f9cbb3
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Tue Apr 3 00:15:31 2012 +0200
devenum: COM cleanup for ICreateDevEnum.
---
dlls/devenum/createdevenum.c | 18 +++++++++---------
dlls/devenum/devenum_private.h | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c
index 615305d..266e1d8 100644
--- a/dlls/devenum/createdevenum.c
+++ b/dlls/devenum/createdevenum.c
@@ -59,24 +59,24 @@ static HRESULT DEVENUM_CreateSpecialCategories(void);
/**********************************************************************
* DEVENUM_ICreateDevEnum_QueryInterface (also IUnknown)
*/
-static HRESULT WINAPI DEVENUM_ICreateDevEnum_QueryInterface(
- ICreateDevEnum * iface,
- REFIID riid,
- LPVOID *ppvObj)
+static HRESULT WINAPI DEVENUM_ICreateDevEnum_QueryInterface(ICreateDevEnum *iface, REFIID riid,
+ void **ppv)
{
TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
- if (ppvObj == NULL) return E_POINTER;
+ if (!ppv)
+ return E_POINTER;
if (IsEqualGUID(riid, &IID_IUnknown) ||
IsEqualGUID(riid, &IID_ICreateDevEnum))
{
- *ppvObj = iface;
+ *ppv = iface;
DEVENUM_ICreateDevEnum_AddRef(iface);
return S_OK;
}
FIXME("- no interface IID: %s\n", debugstr_guid(riid));
+ *ppv = NULL;
return E_NOINTERFACE;
}
@@ -463,9 +463,9 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator(
HKEY hkey;
HKEY hbasekey;
HRESULT hr;
- CreateDevEnumImpl *This = (CreateDevEnumImpl *)iface;
- TRACE("(%p)->(%s, %p, %x)\n\tDeviceClass:\t%s\n", This, debugstr_guid(clsidDeviceClass), ppEnumMoniker, dwFlags, debugstr_guid(clsidDeviceClass));
+ TRACE("(%p)->(%s, %p, %x)\n\tDeviceClass:\t%s\n", iface, debugstr_guid(clsidDeviceClass),
+ ppEnumMoniker, dwFlags, debugstr_guid(clsidDeviceClass));
if (!ppEnumMoniker)
return E_POINTER;
@@ -519,7 +519,7 @@ static const ICreateDevEnumVtbl ICreateDevEnum_Vtbl =
/**********************************************************************
* static CreateDevEnum instance
*/
-CreateDevEnumImpl DEVENUM_CreateDevEnum = { &ICreateDevEnum_Vtbl };
+CreateDevEnumImpl DEVENUM_CreateDevEnum = { { &ICreateDevEnum_Vtbl } };
/**********************************************************************
* DEVENUM_CreateAMCategoryKey (INTERNAL)
diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h
index 7515877..0c1800e 100644
--- a/dlls/devenum/devenum_private.h
+++ b/dlls/devenum/devenum_private.h
@@ -62,7 +62,7 @@ typedef struct
typedef struct
{
- const ICreateDevEnumVtbl *lpVtbl;
+ ICreateDevEnum ICreateDevEnum_iface;
} CreateDevEnumImpl;
typedef struct
More information about the wine-cvs
mailing list