adding tests

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

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 408a2599b929f6ef5366715fefd2c03cbf5fc6bf..07884ba7ede2f9f8609e4bb6e72e7e3380383a3e 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -27,6 +27,8 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"
+    #include "wx/wxcrtvararg.h"

 #endif
 
 #include "wx/dataobj.h"
 #endif
 
 #include "wx/dataobj.h"


@@ -59,11 +61,11 @@
 // functions
 // ----------------------------------------------------------------------------
 
 // functions
 // ----------------------------------------------------------------------------
 

-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL

     static const wxChar *GetTymedName(DWORD tymed);
     static const wxChar *GetTymedName(DWORD tymed);

-#else // !Debug
+#else // !wxDEBUG_LEVEL

     #define GetTymedName(tymed) wxEmptyString
     #define GetTymedName(tymed) wxEmptyString

-#endif // Debug/!Debug
+#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL

 
 // ----------------------------------------------------------------------------
 // wxIEnumFORMATETC interface implementation
 
 // ----------------------------------------------------------------------------
 // wxIEnumFORMATETC interface implementation


@@ -88,7 +90,7 @@ private:
     ULONG       m_nCount,   // number of formats we support
                 m_nCurrent; // current enum position
 
     ULONG       m_nCount,   // number of formats we support
                 m_nCurrent; // current enum position
 

-    DECLARE_NO_COPY_CLASS(wxIEnumFORMATETC)
+    wxDECLARE_NO_COPY_CLASS(wxIEnumFORMATETC);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -124,7 +126,7 @@ private:
 
     bool m_mustDelete;
 
 
     bool m_mustDelete;
 

-    DECLARE_NO_COPY_CLASS(wxIDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxIDataObject);

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -135,9 +137,9 @@ private:
 // wxDataFormat
 // ----------------------------------------------------------------------------
 
 // wxDataFormat
 // ----------------------------------------------------------------------------
 

-void wxDataFormat::SetId(const wxChar *format)
+void wxDataFormat::SetId(const wxString& format)

 {
 {

-    m_format = (wxDataFormat::NativeFormat)::RegisterClipboardFormat(format);
+    m_format = (wxDataFormat::NativeFormat)::RegisterClipboardFormat(format.wx_str());

     if ( !m_format )
     {
         wxLogError(_("Couldn't register clipboard format '%s'."), format);
     if ( !m_format )
     {
         wxLogError(_("Couldn't register clipboard format '%s'."), format);


@@ -158,6 +160,7 @@ wxString wxDataFormat::GetId() const
     if ( !len )
     {
         wxLogError(_("The clipboard format '%d' doesn't exist."), m_format);
     if ( !len )
     {
         wxLogError(_("The clipboard format '%d' doesn't exist."), m_format);

+        return wxEmptyString;

     }
 
     return s;
     }
 
     return s;


@@ -683,10 +686,14 @@ size_t wxDataObject::GetBufferOffset(const wxDataFormat& format )
     return NeedsVerbatimData(format) ? 0 : sizeof(size_t);
 }
 
     return NeedsVerbatimData(format) ? 0 : sizeof(size_t);
 }
 

-const void* wxDataObject::GetSizeFromBuffer( const void* buffer, size_t* size,
-                                               const wxDataFormat& format )
+const void *wxDataObject::GetSizeFromBuffer(const void *buffer,
+                                            size_t *size,
+                                            const wxDataFormat& WXUNUSED(format))

 {
 {

-    size_t realsz = ::HeapSize(::GetProcessHeap(), 0, buffer);
+    // hack: the third parameter is declared non-const in Wine's headers so
+    // cast away the const
+    const size_t realsz = ::HeapSize(::GetProcessHeap(), 0,
+                                     const_cast<void*>(buffer));

     if ( realsz == (size_t)-1 )
     {
         // note that HeapSize() does not set last error
     if ( realsz == (size_t)-1 )
     {
         // note that HeapSize() does not set last error


@@ -696,18 +703,7 @@ const void* wxDataObject::GetSizeFromBuffer( const void* buffer, size_t* size,
 
     *size = realsz;
 
 
     *size = realsz;
 

-    // check if this data has its size prepended (as it was by default for wx
-    // programs prior 2.6.3):
-    size_t *p = (size_t *)buffer;
-    if ( *p == realsz )
-    {
-        if ( NeedsVerbatimData(format) )
-            wxLogDebug(wxT("Apparent data format mismatch: size not needed"));
-
-        p++; // this data has its size prepended; skip first DWORD
-    }
-
-    return p;
+    return buffer;

 }
 
 void* wxDataObject::SetSizeInBuffer( void* buffer, size_t size,
 }
 
 void* wxDataObject::SetSizeInBuffer( void* buffer, size_t size,


@@ -723,7 +719,7 @@ void* wxDataObject::SetSizeInBuffer( void* buffer, size_t size,
     return p;
 }
 
     return p;
 }
 

-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL

 
 const wxChar *wxDataObject::GetFormatName(wxDataFormat format)
 {
 
 const wxChar *wxDataObject::GetFormatName(wxDataFormat format)
 {


@@ -768,7 +764,7 @@ const wxChar *wxDataObject::GetFormatName(wxDataFormat format)
     #endif // VC++
 }
 
     #endif // VC++
 }
 

-#endif // Debug
+#endif // wxDEBUG_LEVEL

 
 // ----------------------------------------------------------------------------
 // wxBitmapDataObject supports CF_DIB format
 
 // ----------------------------------------------------------------------------
 // wxBitmapDataObject supports CF_DIB format


@@ -1044,22 +1040,44 @@ void wxFileDataObject::AddFile(const wxString& file)
 size_t wxFileDataObject::GetDataSize() const
 {
 #ifndef __WXWINCE__
 size_t wxFileDataObject::GetDataSize() const
 {
 #ifndef __WXWINCE__

-    // size returned will be the size of the DROPFILES structure,
-    // plus the list of filesnames (null byte separated), plus
-    // a double null at the end
+    // size returned will be the size of the DROPFILES structure, plus the list
+    // of filesnames (null byte separated), plus a double null at the end

 
     // if no filenames in list, size is 0
 
     // if no filenames in list, size is 0

-    if ( m_filenames.GetCount() == 0 )
+    if ( m_filenames.empty() )

         return 0;
 
         return 0;
 

+#if wxUSE_UNICODE_MSLU
+    size_t sizeOfChar;
+    if ( wxGetOsVersion() == wxOS_WINDOWS_9X )
+    {
+        // Win9x always uses ANSI file names and MSLU doesn't help with this
+        sizeOfChar = sizeof(char);
+    }
+    else
+    {
+        sizeOfChar = sizeof(wxChar);
+    }
+#else // !wxUSE_UNICODE_MSLU
+    static const size_t sizeOfChar = sizeof(wxChar);
+#endif // wxUSE_UNICODE_MSLU/!wxUSE_UNICODE_MSLU
+

     // inital size of DROPFILES struct + null byte
     // inital size of DROPFILES struct + null byte

-    size_t sz = sizeof(DROPFILES) + (1 * sizeof(wxChar));
+    size_t sz = sizeof(DROPFILES) + sizeOfChar;

 
 

-    size_t count = m_filenames.GetCount();
+    const size_t count = m_filenames.size();

     for ( size_t i = 0; i < count; i++ )
     {
         // add filename length plus null byte
     for ( size_t i = 0; i < count; i++ )
     {
         // add filename length plus null byte

-        sz += (m_filenames[i].Len() + 1) * sizeof(wxChar);
+        size_t len;
+#if wxUSE_UNICODE_MSLU
+        if ( sizeOfChar == sizeof(char) )
+            len = strlen(m_filenames[i].mb_str(*wxConvFileName));
+        else
+#endif // wxUSE_UNICODE_MSLU
+            len = m_filenames[i].length();
+
+        sz += (len + 1) * sizeOfChar;

     }
 
     return sz;
     }
 
     return sz;


@@ -1075,7 +1093,7 @@ bool wxFileDataObject::GetDataHere(void *WXUNUSED_IN_WINCE(pData)) const
     // created using the size returned by GetDataSize()
 
     // if pData is NULL, or there are no files, return
     // created using the size returned by GetDataSize()
 
     // if pData is NULL, or there are no files, return

-    if ( !pData || m_filenames.GetCount() == 0 )
+    if ( !pData || m_filenames.empty() )

         return false;
 
     // convert data pointer to a DROPFILES struct pointer
         return false;
 
     // convert data pointer to a DROPFILES struct pointer


@@ -1084,27 +1102,44 @@ bool wxFileDataObject::GetDataHere(void *WXUNUSED_IN_WINCE(pData)) const
     // initialize DROPFILES struct
     pDrop->pFiles = sizeof(DROPFILES);
     pDrop->fNC = FALSE;                 // not non-client coords
     // initialize DROPFILES struct
     pDrop->pFiles = sizeof(DROPFILES);
     pDrop->fNC = FALSE;                 // not non-client coords

-#if wxUSE_UNICODE
-    pDrop->fWide = TRUE;
-#else // ANSI
-    pDrop->fWide = FALSE;
-#endif // Unicode/Ansi
+#if wxUSE_UNICODE_MSLU
+    pDrop->fWide = wxGetOsVersion() != wxOS_WINDOWS_9X ? TRUE : FALSE;
+#else
+    pDrop->fWide = wxUSE_UNICODE;
+#endif
+
+    const size_t sizeOfChar = pDrop->fWide ? sizeof(wchar_t) : sizeof(char);

 
     // set start of filenames list (null separated)
 
     // set start of filenames list (null separated)

-    wxChar *pbuf = (wxChar*) ((BYTE *)pDrop + sizeof(DROPFILES));
+    BYTE *pbuf = (BYTE *)(pDrop + 1);

 
 

-    size_t count = m_filenames.GetCount();
-    for (size_t i = 0; i < count; i++ )
+    const size_t count = m_filenames.size();
+    for ( size_t i = 0; i < count; i++ )

     {
         // copy filename to pbuf and add null terminator
     {
         // copy filename to pbuf and add null terminator

-        size_t len = m_filenames[i].Len();
-        memcpy(pbuf, m_filenames[i], len*sizeof(wxChar));
-        pbuf += len;
-        *pbuf++ = wxT('\0');
+        size_t len;
+#if wxUSE_UNICODE_MSLU
+        if ( sizeOfChar == sizeof(char) )
+        {
+            wxCharBuffer buf(m_filenames[i].mb_str(*wxConvFileName));
+            len = strlen(buf);
+            memcpy(pbuf, buf, len*sizeOfChar);
+        }
+        else
+#endif // wxUSE_UNICODE_MSLU
+        {
+            len = m_filenames[i].length();
+            memcpy(pbuf, m_filenames[i].wx_str(), len*sizeOfChar);
+        }
+
+        pbuf += len*sizeOfChar;
+
+        memset(pbuf, 0, sizeOfChar);
+        pbuf += sizeOfChar;

     }
 
     // add final null terminator
     }
 
     // add final null terminator

-    *pbuf = wxT('\0');
+    memset(pbuf, 0, sizeOfChar);

 
     return true;
 #else
 
     return true;
 #else


@@ -1116,6 +1151,12 @@ bool wxFileDataObject::GetDataHere(void *WXUNUSED_IN_WINCE(pData)) const
 // wxURLDataObject
 // ----------------------------------------------------------------------------
 
 // wxURLDataObject
 // ----------------------------------------------------------------------------
 

+// Work around bug in Wine headers
+#if defined(__WINE__) && defined(CFSTR_SHELLURL) && wxUSE_UNICODE
+#undef CFSTR_SHELLURL
+#define CFSTR_SHELLURL _T("CFSTR_SHELLURL")
+#endif
+

 class CFSTR_SHELLURLDataObject : public wxCustomDataObject
 {
 public:
 class CFSTR_SHELLURLDataObject : public wxCustomDataObject
 {
 public:


@@ -1158,21 +1199,24 @@ public:
         { return GetDataHere(buf); }
 #endif
 
         { return GetDataHere(buf); }
 #endif
 

-    DECLARE_NO_COPY_CLASS(CFSTR_SHELLURLDataObject)
+    wxDECLARE_NO_COPY_CLASS(CFSTR_SHELLURLDataObject);

 };
 
 
 
 };
 
 
 

-wxURLDataObject::wxURLDataObject()
+wxURLDataObject::wxURLDataObject(const wxString& url)

 {
 {

-    // we support CF_TEXT and CFSTR_SHELLURL formats which are basicly the same
-    // but it seems that some browsers only provide one of them so we have to
-    // support both
+    // we support CF_TEXT and CFSTR_SHELLURL formats which are basically the
+    // same but it seems that some browsers only provide one of them so we have
+    // to support both

     Add(new wxTextDataObject);
     Add(new CFSTR_SHELLURLDataObject());
 
     // we don't have any data yet
     m_dataObjectLast = NULL;
     Add(new wxTextDataObject);
     Add(new CFSTR_SHELLURLDataObject());
 
     // we don't have any data yet
     m_dataObjectLast = NULL;

+
+    if ( !url.empty() )
+        SetURL(url);

 }
 
 bool wxURLDataObject::SetData(const wxDataFormat& format,
 }
 
 bool wxURLDataObject::SetData(const wxDataFormat& format,


@@ -1201,20 +1245,26 @@ wxString wxURLDataObject::GetURL() const
 
 void wxURLDataObject::SetURL(const wxString& url)
 {
 
 void wxURLDataObject::SetURL(const wxString& url)
 {

-    SetData(wxDataFormat(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT),
-            url.Length()+1, url.c_str());
+    wxCharBuffer urlMB(url.mb_str());
+    if ( urlMB )
+    {
+        const size_t len = strlen(urlMB) + 1; // size with trailing NUL
+#if !wxUSE_UNICODE
+        SetData(wxDF_TEXT, len, urlMB);
+#endif
+        SetData(wxDataFormat(CFSTR_SHELLURL), len, urlMB);
+    }

 
 

-    // CFSTR_SHELLURL is always supposed to be ANSI...
-    wxWX2MBbuf urlA = (wxWX2MBbuf)url.mbc_str();
-    size_t len = strlen(urlA);
-    SetData(wxDataFormat(CFSTR_SHELLURL), len+1, (const char*)urlA);
+#if wxUSE_UNICODE
+    SetData(wxDF_UNICODETEXT, url.length() + 1, url.wc_str());
+#endif

 }
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 

-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL

 
 static const wxChar *GetTymedName(DWORD tymed)
 {
 
 static const wxChar *GetTymedName(DWORD tymed)
 {


@@ -1255,12 +1305,10 @@ void wxDataObject::SetAutoDelete()
 {
 }
 
 {
 }
 

-#ifdef __WXDEBUG__

 const wxChar *wxDataObject::GetFormatName(wxDataFormat WXUNUSED(format))
 {
     return NULL;
 }
 const wxChar *wxDataObject::GetFormatName(wxDataFormat WXUNUSED(format))
 {
     return NULL;
 }

-#endif // __WXDEBUG__

 
 #endif // wxUSE_DATAOBJ
 
 
 #endif // wxUSE_DATAOBJ