Don't use Windows handles directly in headers

[wxWidgets.git] / src / msw / ole / oleutils.cpp

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index 39165f2aac1f91956f74f7a2d04654ef40de0e95..6a026d1d031e608c4cf6bfa4c3a1db245e6eeb12 100644 (file)
--- a/src/msw/ole/oleutils.cpp
+++ b/src/msw/ole/oleutils.cpp
@@ -2,11 +2,11 @@
 // Name:        ole/oleutils.cpp
 // Purpose:     implementation of OLE helper functions
 // Author:      Vadim Zeitlin
-// Modified by: 
+// Modified by:
 // Created:     19.02.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,71 +17,80 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-#pragma implementation "oleutils.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
-#define IN_WX_MAIN_CPP
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
 #pragma hdrstop
 #endif
 
-#include  <wx/setup.h>
+#include  "wx/setup.h"
+#include  "wx/log.h"
 
-#if USE_DRAG_AND_DROP
+#if wxUSE_OLE
 
-#include  <wx/log.h>
+#ifndef __CYGWIN10__
 
-#include <windows.h>
+#include "wx/msw/private.h"
+
+#ifdef __WXWINCE__
+    #include <winreg.h>
+    #include <ole2.h>
+
+    #define GUID_DEFINED
+    #define UUID_DEFINED
+#endif
 
 // OLE
-#include  <wx/msw/ole/uuid.h>
-#include  <wx/msw/ole/oleutils.h>
+#ifndef __WXWINCE__
+#include  "wx/msw/ole/uuid.h"
+#endif
+
+#include  "wx/msw/ole/oleutils.h"
 
-#ifndef __BORLANDC__
-#include  <docobj.h>
+#if defined(__VISUALC__) && (__VISUALC__ > 1000)
+    #include  <docobj.h>
 #endif
 
 // ============================================================================
 // Implementation
 // ============================================================================
 
-// return TRUE if the iid is in the array
+// return true if the iid is in the array
 bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount)
 {
   for ( size_t i = 0; i < nCount; i++ ) {
     if ( riid == *aIids[i] )
-      return TRUE;
+      return true;
   }
 
-  return FALSE;
+  return false;
 }
 
+#if wxUSE_DATAOBJ
+
 // ----------------------------------------------------------------------------
 // Debug support
 // ----------------------------------------------------------------------------
 
-#ifdef  __DEBUG__
-
-const char *GetIidName(REFIID riid)
+#if defined(__WXDEBUG__) && ( ( defined(__VISUALC__) && (__VISUALC__ > 1000) ) || defined(__MWERKS__) )
+static wxString GetIidName(REFIID riid)
 {
   // an association between symbolic name and numeric value of an IID
   struct KNOWN_IID {
     const IID  *pIid;
-    const char *szName;
+    const wxChar *szName;
   };
 
   // construct the table containing all known interfaces
-  #define ADD_KNOWN_IID(name) { &IID_I##name, #name }
+  #define ADD_KNOWN_IID(name) { &IID_I##name, _T(#name) }
 
   static const KNOWN_IID aKnownIids[] = {
     ADD_KNOWN_IID(AdviseSink),
     ADD_KNOWN_IID(AdviseSink2),
     ADD_KNOWN_IID(BindCtx),
     ADD_KNOWN_IID(ClassFactory),
+#if ( !defined( __VISUALC__) || (__VISUALC__!=1010) ) && !defined(__MWERKS__)
     ADD_KNOWN_IID(ContinueCallback),
     ADD_KNOWN_IID(EnumOleDocumentViews),
     ADD_KNOWN_IID(OleCommandTarget),
@@ -89,6 +98,7 @@ const char *GetIidName(REFIID riid)
     ADD_KNOWN_IID(OleDocumentSite),
     ADD_KNOWN_IID(OleDocumentView),
     ADD_KNOWN_IID(Print),
+#endif
     ADD_KNOWN_IID(DataAdviseHolder),
     ADD_KNOWN_IID(DataObject),
     ADD_KNOWN_IID(Debug),
@@ -160,21 +170,43 @@ const char *GetIidName(REFIID riid)
   #undef ADD_KNOWN_IID
 
   // try to find the interface in the table
-  for ( uint ui = 0; ui < WXSIZEOF(aKnownIids); ui++ ) {
+  for ( size_t ui = 0; ui < WXSIZEOF(aKnownIids); ui++ ) {
     if ( riid == *aKnownIids[ui].pIid ) {
       return aKnownIids[ui].szName;
     }
   }
 
+#ifndef __WXWINCE__
   // unknown IID, just transform to string
-  static Uuid s_uuid;
-  s_uuid.Set(riid);
-  return s_uuid;
+  Uuid uuid(riid);
+  return wxString((const wxChar *)uuid);
+#else
+  return wxEmptyString;
+#endif
+}
+
+void wxLogQueryInterface(const wxChar *szInterface, REFIID riid)
+{
+  wxLogTrace(wxTRACE_OleCalls, wxT("%s::QueryInterface (iid = %s)"),
+             szInterface, GetIidName(riid).c_str());
+}
+
+void wxLogAddRef(const wxChar *szInterface, ULONG cRef)
+{
+  wxLogTrace(wxTRACE_OleCalls, wxT("After %s::AddRef: m_cRef = %d"), szInterface, cRef + 1);
+}
+
+void wxLogRelease(const wxChar *szInterface, ULONG cRef)
+{
+  wxLogTrace(wxTRACE_OleCalls, wxT("After %s::Release: m_cRef = %d"), szInterface, cRef - 1);
 }
 
+#elif defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ <= 1000)
+
+// For VC++ 4
 void wxLogQueryInterface(const char *szInterface, REFIID riid)
 {
-  wxLogTrace("%s::QueryInterface (iid = %s)", szInterface, GetIidName(riid));
+  wxLogTrace("%s::QueryInterface", szInterface);
 }
 
 void wxLogAddRef(const char *szInterface, ULONG cRef)
@@ -187,7 +219,14 @@ void wxLogRelease(const char *szInterface, ULONG cRef)
   wxLogTrace("After %s::Release: m_cRef = %d", szInterface, cRef - 1);
 }
 
-#endif  //DEBUG
+#endif  // __WXDEBUG__
+
+#endif
+  // wxUSE_DRAG_AND_DROP
+
+#endif
+  // __CYGWIN10__
 
 #endif
-  // USE_DRAG_AND_DROP
+  // wxUSE_OLE
+