009-06-16 Brent Fulgham <bfulgham@gmail.com>
authorbfulgham@webkit.org <bfulgham@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Jun 2009 16:44:25 +0000 (16:44 +0000)
committerbfulgham@webkit.org <bfulgham@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Jun 2009 16:44:25 +0000 (16:44 +0000)
        Reviewed by Darin Adler.

        Use consistent GUID comparison functions.
        https://bugs.webkit.org/show_bug.cgi?id=26427

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@44723 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/win/WCDataObject.cpp
WebKit/win/ChangeLog
WebKit/win/WebView.cpp

index af5c848..3482fae 100644 (file)
@@ -1,3 +1,13 @@
+2009-06-16  Brent Fulgham  <bfulgham@gmail.com>
+
+        Reviewed by Darin Adler.
+
+        Use consistent GUID comparison functions.
+        https://bugs.webkit.org/show_bug.cgi?id=26427
+
+        * platform/win/WCDataObject.cpp:
+        (WebCore::WCDataObject::QueryInterface):
+
 2009-06-16  Xan Lopez  <xlopez@igalia.com>
 
         Reviewed by Gustavo Noronha.
index 5201bfa..aaa41cf 100644 (file)
@@ -74,8 +74,7 @@ WCEnumFormatEtc::WCEnumFormatEtc(const Vector<FORMATETC*>& formats)
 STDMETHODIMP  WCEnumFormatEtc::QueryInterface(REFIID riid, void** ppvObject)
 {
     *ppvObject = 0;
-    if (IsEqualIID(riid, IID_IUnknown) || 
-        IsEqualIID(riid, IID_IEnumFORMATETC)) {
+    if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_IEnumFORMATETC)) {
         *ppvObject = this;
         AddRef();
         return S_OK;
@@ -178,8 +177,10 @@ WCDataObject::~WCDataObject()
 STDMETHODIMP WCDataObject::QueryInterface(REFIID riid,void** ppvObject)
 {
     *ppvObject = 0;
-    if (IID_IUnknown==riid || IID_IDataObject==riid)
+    if (IsEqualIID(riid, IID_IUnknown) || 
+        IsEqualIID(riid, IID_IDataObject)) {
         *ppvObject=this;
+    }
     if (*ppvObject) {
         AddRef();
         return S_OK;
index 5281123..804da53 100644 (file)
@@ -1 +1,11 @@
+2009-06-16  Brent Fulgham  <bfulgham@gmail.com>
+
+        Reviewed by Darin Adler.
+
+        Use consistent Windows GUID Comparison Functions.
+        https://bugs.webkit.org/show_bug.cgi?id=26427.
+
+        * WebView.cpp:
+        (EnumTextMatches::QueryInterface):
+
 == Rolled over to ChangeLog-2009-06-16 ==
index bed876d..6ac07cb 100644 (file)
@@ -5213,7 +5213,7 @@ public:
 
     virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppv)
     {
-        if (riid == IID_IUnknown || riid == IID_IEnumTextMatches) {
+        if (IsEqualGUID(riid, IID_IUnknown) || IsEqualGUID(riid, IID_IEnumTextMatches)) {
             *ppv = this;
             AddRef();
         }