ole32: Use IsEqualIID instead of memcmp to compare REFIIDs.
Michael Stefaniuc
mstefani at redhat.de
Fri Jul 23 04:30:00 CDT 2010
---
dlls/ole32/datacache.c | 3 +--
dlls/ole32/oleobj.c | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c
index 1c7be2b..2f26363 100644
--- a/dlls/ole32/datacache.c
+++ b/dlls/ole32/datacache.c
@@ -2284,8 +2284,7 @@ HRESULT WINAPI CreateDataCache(
* This is necessary because it's the only time the non-delegating
* IUnknown pointer can be returned to the outside.
*/
- if ( (pUnkOuter!=NULL) &&
- (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) != 0) )
+ if ( pUnkOuter && !IsEqualIID(&IID_IUnknown, riid) )
return CLASS_E_NOAGGREGATION;
/*
diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c
index 584e796..7e131ae 100644
--- a/dlls/ole32/oleobj.c
+++ b/dlls/ole32/oleobj.c
@@ -615,8 +615,8 @@ static HRESULT WINAPI DataAdviseHolder_QueryInterface(
/*
* Compare the riid with the interface IDs implemented by this object.
*/
- if ( (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) ||
- (memcmp(&IID_IDataAdviseHolder, riid, sizeof(IID_IDataAdviseHolder)) == 0) )
+ if ( IsEqualIID(&IID_IUnknown, riid) ||
+ IsEqualIID(&IID_IDataAdviseHolder, riid) )
{
*ppvObject = iface;
}
--
1.7.1.1
More information about the wine-patches
mailing list