fix typo from previous commit

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

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index efec456070eb5368882199fdca7b30dfc407cb21..3932c8d9ecef5f6c771ac8a58e7939bbc5a1c735 100644 (file)
--- a/src/msw/ole/oleutils.cpp
+++ b/src/msw/ole/oleutils.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        ole/oleutils.cpp
+// Name:        src/msw/ole/oleutils.cpp

 // Purpose:     implementation of OLE helper functions
 // Author:      Vadim Zeitlin
 // 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>
 // Created:     19.02.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,70 +17,137 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-#pragma implementation "oleutils.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 // For compilers that support precompilation, includes "wx.h".

-#define IN_WX_MAIN_CPP

 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)

-#pragma hdrstop
+    #pragma hdrstop
+#endif
+
+#if wxUSE_OLE
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include  <wx/setup.h>
+#ifndef __CYGWIN10__

 
 

-#if USE_DRAG_AND_DROP
+#include "wx/msw/private.h"

 
 

-#include  <wx/log.h>
+#ifdef __WXWINCE__
+    #include <winreg.h>
+    #include <ole2.h>

 
 

-#include <windows.h>
+    #define GUID_DEFINED
+    #define UUID_DEFINED
+#endif

 
 // OLE
 
 // 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"

 
 

-#if defined(_MSC_VER) && (_MSC_VER > 1000)
-#include  <docobj.h>
+#if defined(__VISUALC__) && (__VISUALC__ > 1000)
+    #include  <docobj.h>

 #endif
 
 // ============================================================================
 // Implementation
 // ============================================================================
 
 #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] )
 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;
+}
+
+WXDLLEXPORT BSTR wxConvertStringToOle(const wxString& str)
+{
+    return wxBasicString(str).Get();
+}
+
+WXDLLEXPORT wxString wxConvertStringFromOle(BSTR bStr)
+{
+    // NULL BSTR is equivalent to an empty string (this is the convention used
+    // by VB and hence we must follow it)
+    if ( !bStr )
+        return wxString();
+
+    const int len = SysStringLen(bStr);
+
+#if wxUSE_UNICODE
+    wxString str(bStr, len);
+#else
+    wxString str;
+    if (len)
+    {
+        wxStringBufferLength buf(str, len); // asserts if len == 0
+        buf.SetLength(WideCharToMultiByte(CP_ACP, 0 /* no flags */,
+                                  bStr, len /* not necessarily NUL-terminated */,
+                                  buf, len,
+                                  NULL, NULL /* no default char */));
+    }
+#endif
+
+    return str;
+}
+
+// ----------------------------------------------------------------------------
+// wxBasicString
+// ----------------------------------------------------------------------------
+
+wxBasicString::wxBasicString(const wxString& str)
+{
+    m_bstrBuf = SysAllocString(str.wc_str(*wxConvCurrent));
+}
+
+wxBasicString::wxBasicString(const wxBasicString& src)
+{
+    m_bstrBuf = src.Get();
+}
+
+wxBasicString& wxBasicString::operator=(const wxBasicString& src)
+{
+    SysReAllocString(&m_bstrBuf, src);
+    return *this;

 }
 
 }
 

+wxBasicString::~wxBasicString()
+{
+    SysFreeString(m_bstrBuf);
+}
+
+#if wxUSE_DATAOBJ
+

 // ----------------------------------------------------------------------------
 // Debug support
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // Debug support
 // ----------------------------------------------------------------------------
 

-#if defined(__WXDEBUG__) && defined(_MSC_VER) && (_MSC_VER > 1000)
-const char *GetIidName(REFIID riid)
+#if wxDEBUG_LEVEL && ( ( 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;
 {
   // 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
   };
 
   // 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),
 
   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),
     ADD_KNOWN_IID(ContinueCallback),
     ADD_KNOWN_IID(EnumOleDocumentViews),
     ADD_KNOWN_IID(OleCommandTarget),


@@ -88,6 +155,7 @@ const char *GetIidName(REFIID riid)
     ADD_KNOWN_IID(OleDocumentSite),
     ADD_KNOWN_IID(OleDocumentView),
     ADD_KNOWN_IID(Print),
     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),
     ADD_KNOWN_IID(DataAdviseHolder),
     ADD_KNOWN_IID(DataObject),
     ADD_KNOWN_IID(Debug),


@@ -165,28 +233,35 @@ const char *GetIidName(REFIID riid)
     }
   }
 
     }
   }
 

+#ifndef __WXWINCE__

   // unknown IID, just transform to string
   // 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 char *szInterface, REFIID riid)
+void wxLogQueryInterface(const wxChar *szInterface, REFIID riid)

 {
 {

-  wxLogTrace("%s::QueryInterface (iid = %s)", szInterface, GetIidName(riid));
+  wxLogTrace(wxTRACE_OleCalls, wxT("%s::QueryInterface (iid = %s)"),
+             szInterface, GetIidName(riid).c_str());

 }
 
 }
 

-void wxLogAddRef(const char *szInterface, ULONG cRef)
+void wxLogAddRef(const wxChar *szInterface, ULONG cRef)

 {
 {

-  wxLogTrace("After %s::AddRef: m_cRef = %d", szInterface, cRef + 1);
+  wxLogTrace(wxTRACE_OleCalls, wxT("After %s::AddRef: m_cRef = %d"), szInterface, cRef + 1);

 }
 
 }
 

-void wxLogRelease(const char *szInterface, ULONG cRef)
+void wxLogRelease(const wxChar *szInterface, ULONG cRef)

 {
 {

-  wxLogTrace("After %s::Release: m_cRef = %d", szInterface, cRef - 1);
+  wxLogTrace(wxTRACE_OleCalls, wxT("After %s::Release: m_cRef = %d"), szInterface, cRef - 1);

 }
 
 }
 

-#endif  //WXDEBUG
+#endif  // wxDEBUG_LEVEL

 
 

-#endif
-  // USE_DRAG_AND_DROP
+#endif // wxUSE_DRAG_AND_DROP
+
+#endif // __CYGWIN10__
+
+#endif // wxUSE_OLE