ole32: Use IsEqualIID instead of memcmp to compare REFIIDs.

ffac31da · Michael Stefaniuc · Alexandre Julliard · c2c98ae0 · ffac31da · ffac31da
Commit ffac31da authored Jul 23, 2010 by Michael Stefaniuc Committed by Alexandre Julliard Jul 23, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

datacache.c dlls/ole32/datacache.c +1 -2

oleobj.c dlls/ole32/oleobj.c +2 -2

No files found.
--- 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) &&
+  if ( pUnkOuter && !IsEqualIID(&IID_IUnknown, riid) )
-       (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) != 0) )
    return CLASS_E_NOAGGREGATION;
  /*

--- 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) ||
+  if ( IsEqualIID(&IID_IUnknown, riid) ||
-       (memcmp(&IID_IDataAdviseHolder, riid, sizeof(IID_IDataAdviseHolder)) == 0)  )
+       IsEqualIID(&IID_IDataAdviseHolder, riid)  )
  {
    *ppvObject = iface;
  }