Reviewed by Anders.

        - add QueryInterface capabilities to COMPtr

        * platform/win/COMPtr.h:
        (COMPtr::COMPtr): Added constructor that takes a Query tag and
        does an appropriate QueryInterface.
        (COMPtr::query): Added function to do a queryInterface.
        (COMPtr::copyQueryInterfaceRef): Added private helper used by
        both of the above. Note that when the query fails you get a 0,
        which is the same thing you get if a 0 pointer is passed in.

        * platform/win/FontCacheWin.cpp:
        (WebCore::FontCache::getFontLinkInterface): Convert to using
        the new query as a test case. Also eliminate the unnecessary
        second global variable and use COMPtr objects rather than just
        leaking references.

        * platform/win/WCDataObject.h: Removed unneeded include and
        using statements.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c024904..5de1622 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2007-09-22  Darin Adler  <darin@apple.com>
+
+        Reviewed by Anders.
+
+        - add QueryInterface capabilities to COMPtr
+
+        * platform/win/COMPtr.h:
+        (COMPtr::COMPtr): Added constructor that takes a Query tag and
+        does an appropriate QueryInterface.
+        (COMPtr::query): Added function to do a queryInterface.
+        (COMPtr::copyQueryInterfaceRef): Added private helper used by
+        both of the above. Note that when the query fails you get a 0,
+        which is the same thing you get if a 0 pointer is passed in.
+
+        * platform/win/FontCacheWin.cpp:
+        (WebCore::FontCache::getFontLinkInterface): Convert to using
+        the new query as a test case. Also eliminate the unnecessary
+        second global variable and use COMPtr objects rather than just
+        leaking references.
+
+        * platform/win/WCDataObject.h: Removed unneeded include and
+        using statements.
+
 2007-09-21  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Adam.

diff --git a/WebCore/platform/win/COMPtr.h b/WebCore/platform/win/COMPtr.h
index c06b3d2..4466df2 100644 (file)
--- a/WebCore/platform/win/COMPtr.h
+++ b/WebCore/platform/win/COMPtr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,11 +26,19 @@
 #ifndef COMPtr_h
 #define COMPtr_h
 
+#define NOMINMAX
+
+#include <guiddef.h>
+#include <unknwn.h>
 #include <WTF/Assertions.h>
 
 typedef long HRESULT;
 
+// FIXME: Should we put this into the WebCore namespace and use "using" on it
+// as we do with things in WTF? 
+
 enum AdoptCOMTag { AdoptCOM };
+enum QueryTag { Query };
 
 template <typename T> class COMPtr {
 public:
@@ -39,37 +47,54 @@ public:
     COMPtr(AdoptCOMTag, T* ptr) : m_ptr(ptr) { }
     COMPtr(const COMPtr& o) : m_ptr(o.m_ptr) { if (T* ptr = m_ptr) ptr->AddRef(); }
 
+    inline COMPtr(QueryTag, IUnknown* ptr) : m_ptr(copyQueryInterfaceRef(ptr)) { }
+    template <typename U> inline COMPtr(QueryTag, const COMPtr<U>& ptr) : m_ptr(copyQueryInterfaceRef(ptr)) { }
+
     ~COMPtr() { if (m_ptr) m_ptr->Release(); }
 
-    T *get() const { return m_ptr; }
+    T* get() const { return m_ptr; }
 
     T& operator*() const { return *m_ptr; }
     T* operator->() const { return m_ptr; }
-        
+
     T** operator&() { ASSERT(!m_ptr); return &m_ptr; }
 
     bool operator!() const { return !m_ptr; }
     
     // This conversion operator allows implicit conversion to bool but not to other integer types.
-    typedef T * (COMPtr::*UnspecifiedBoolType)() const;
+    typedef T* (COMPtr::*UnspecifiedBoolType)() const;
     operator UnspecifiedBoolType() const { return m_ptr ? &COMPtr::get : 0; }
 
     COMPtr& operator=(const COMPtr&);
     COMPtr& operator=(T*);
     template <typename U> COMPtr& operator=(const COMPtr<U>&);
-    
+  
+    void query(IUnknown* ptr) { adoptRef(copyQueryInterfaceRef(ptr)); }
+    template <typename U> inline void query(const COMPtr<U>& ptr) { query(ptr.get()); }
+
     HRESULT copyRefTo(T**);
     void adoptRef(T*);
 
 private:
+    static T* copyQueryInterfaceRef(IUnknown*);
+
     T* m_ptr;
 };
 
+template <typename T> inline T* COMPtr<T>::copyQueryInterfaceRef(IUnknown* ptr)
+{
+    if (!ptr)
+        return 0;
+    T* result;
+    if (FAILED(ptr->QueryInterface(&result)))
+        return 0;
+    return result;
+}
+
 template <typename T> inline HRESULT COMPtr<T>::copyRefTo(T** ptr)
 {
     if (!ptr)
         return E_POINTER;
-    
     *ptr = m_ptr;
     if (m_ptr)
         m_ptr->AddRef();

diff --git a/WebCore/platform/win/FontCacheWin.cpp b/WebCore/platform/win/FontCacheWin.cpp
index 4c29184..efde169 100644 (file)
--- a/WebCore/platform/win/FontCacheWin.cpp
+++ b/WebCore/platform/win/FontCacheWin.cpp
@@ -27,19 +27,20 @@
  */
 
 #include "config.h"
-#include <winsock2.h>
 #include "FontCache.h"
+
+#include <winsock2.h>
 #include "FontData.h"
 #include "Font.h"
 #include <windows.h>
 #include <mlang.h>
 #include <ApplicationServices/ApplicationServices.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
+#include "COMPtr.h"
 
 using std::min;
 
-namespace WebCore
-{
+namespace WebCore {
 
 void FontCache::platformInit()
 {
@@ -48,19 +49,15 @@ void FontCache::platformInit()
 
 IMLangFontLink2* FontCache::getFontLinkInterface()
 {
-    static IMultiLanguage *multiLanguage;
-    if (!multiLanguage) {
-        if (CoCreateInstance(CLSID_CMultiLanguage, 0, CLSCTX_ALL, IID_IMultiLanguage, (void**)&multiLanguage) != S_OK)
-            return 0;
-    }
-
-    static IMLangFontLink2* langFontLink;
+    static COMPtr<IMLangFontLink2> langFontLink;
     if (!langFontLink) {
-        if (multiLanguage->QueryInterface(IID_IMLangFontLink2, (void**)&langFontLink) != S_OK)
+        COMPtr<IMultiLanguage> multiLanguage;
+        if (CoCreateInstance(CLSID_CMultiLanguage, 0, CLSCTX_ALL, IID_IMultiLanguage, (void**)&multiLanguage) != S_OK)
             return 0;
+        langFontLink.query(multiLanguage);
     }
 
-    return langFontLink;
+    return langFontLink.get();
 }
 
 const FontData* FontCache::getFontDataForCharacters(const Font& font, const UChar* characters, int length)

diff --git a/WebCore/platform/win/WCDataObject.h b/WebCore/platform/win/WCDataObject.h
index 51e37a0..bdfb013 100644 (file)
--- a/WebCore/platform/win/WCDataObject.h
+++ b/WebCore/platform/win/WCDataObject.h
@@ -26,11 +26,7 @@
 #ifndef WCDataObject_h
 #define WCDataObject_h
 
-#include "COMPtr.h"
 #include <wtf/Vector.h>
-
-using namespace std;
-
 #include <ShlObj.h>
 #include <objidl.h>