Cache DISPID->name mappings from CProxiedDispatch::GetIDsOfNames() for logging

Useful when the object being handled doesn't provide any type
information at run-time. Changes

    Word.?<00843628>.33064()

into

    Word.?<00797FA8>.MailMergeMainDocumentType()

(TODO: Yes, that "?" could also be replaced by the actual name, if we
cached the information earlier.)

Author: Tor Lillqvist

include/CProxiedDispatch.hpp

@@ -28,6 +28,10 @@ class CProxiedDispatch : public CProxiedUnknown
 private:
     IDispatch* const mpDispatchToProxy;
 
+    // Cached results from GetIDsOfNames() calls, to use for logging in case no type information is
+    // available.
+    std::map<DISPID, std::string>* mpDispIdToName;
+
 protected:
     CProxiedDispatch(IUnknown* pBaseClassUnknown, IDispatch* pDispatchToProxy,
                      const char* sLibName);
@@ -36,6 +40,20 @@ class CProxiedDispatch : public CProxiedUnknown
     CProxiedDispatch(IUnknown* pBaseClassUnknown, IDispatch* pDispatchToProxy, const IID& rIID1,
                      const IID& rIID2, const char* sLibName);
 
+#if 0
+    // We can't have a non-virtual destructor because of the "class has virtual functions, but
+    // destructor is not virtual" problem and we can't make the destructor virtual because our
+    // vtable should have *only* the entries from IUnknown plus the ones from this class
+    // (corresponding to the entries for IDispatch). So ideally we should delete mpDispIdToName in
+    // Release() when the reference count reaches zero.
+
+    ~CProxiedDispatch()
+    {
+        delete mpDispIdToName;
+    }
+
+#endif
+
 public:
     static CProxiedDispatch* get(IUnknown* pBaseClassUnknown, IDispatch* pDispatchToProxy,
                                  const char* sLibName);

proxies/CProxiedDispatch.cpp

@@ -10,6 +10,7 @@
 #pragma warning(push)
 #pragma warning(disable : 4668 4820 4917)
 
+#include <cassert>
 #include <cstdlib>
 #include <iostream>
 #include <string>
@@ -43,6 +44,7 @@ CProxiedDispatch::CProxiedDispatch(IUnknown* pBaseClassUnknown, IDispatch* pDisp
                                    const IID& rIID1, const IID& rIID2, const char* sLibName)
     : CProxiedUnknown(pBaseClassUnknown, pDispatchToProxy, rIID1, rIID2, sLibName)
     , mpDispatchToProxy(pDispatchToProxy)
+    , mpDispIdToName(new std::map<DISPID, std::string>)
 {
     if (getParam()->mbVerbose)
         std::cout << this << "@CProxiedDispatch::CTOR(" << pBaseClassUnknown << ", "
@@ -232,6 +234,15 @@ HRESULT STDMETHODCALLTYPE CProxiedDispatch::GetIDsOfNames(REFIID riid, LPOLESTR*
     }
     nResult = mpDispatchToProxy->GetIDsOfNames(riid, rgszNames, cNames, lcid, rgDispId);
 
+    if (rgszNames && rgDispId && nResult == S_OK && getParam()->mbTrace)
+    {
+        std::string sName = convertUTF16ToUTF8(rgszNames[0]);
+        if (mpDispIdToName->count(rgDispId[0]))
+            assert((*maDispIdToName)[rgDispId[0]] == sName);
+        else
+            (*mpDispIdToName)[rgDispId[0]] = sName;
+    }
+
     if (getParam()->mbVerbose)
     {
         std::cout << "..." << this << "@CProxiedDispatch::GetIDsOfNames: ";
@@ -312,7 +323,10 @@ HRESULT STDMETHODCALLTYPE CProxiedDispatch::Invoke(DISPID dispIdMember, REFIID r
         std::cout << "<" << (mpBaseClassUnknown ? mpBaseClassUnknown : this) << ">.";
 
         if (pTI == NULL)
-            std::cout << dispIdMember;
+            if (mpDispIdToName->count(dispIdMember))
+                std::cout << (*mpDispIdToName)[dispIdMember];
+            else
+                std::cout << dispIdMember;
         else
         {
             BSTR sFuncName = NULL;