Removed rogue continue statement (bug 1560636)

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

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index b00c440a15573a2f42852b31de2323a509a5d4bb..50eea047b9c0977927428151142bdae956873f66 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "dataobj.h"
-#endif
-

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


@@ -79,14 +75,14 @@ public:
     wxIEnumFORMATETC(const wxDataFormat* formats, ULONG nCount);
     virtual ~wxIEnumFORMATETC() { delete [] m_formats; }
 
     wxIEnumFORMATETC(const wxDataFormat* formats, ULONG nCount);
     virtual ~wxIEnumFORMATETC() { delete [] m_formats; }
 

-    DECLARE_IUNKNOWN_METHODS;
-

     // IEnumFORMATETC
     STDMETHODIMP Next(ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched);
     STDMETHODIMP Skip(ULONG celt);
     STDMETHODIMP Reset();
     STDMETHODIMP Clone(IEnumFORMATETC **ppenum);
 
     // IEnumFORMATETC
     STDMETHODIMP Next(ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched);
     STDMETHODIMP Skip(ULONG celt);
     STDMETHODIMP Reset();
     STDMETHODIMP Clone(IEnumFORMATETC **ppenum);
 

+    DECLARE_IUNKNOWN_METHODS;
+

 private:
     CLIPFORMAT *m_formats;  // formats we can provide data in
     ULONG       m_nCount,   // number of formats we support
 private:
     CLIPFORMAT *m_formats;  // formats we can provide data in
     ULONG       m_nCount,   // number of formats we support


@@ -106,12 +102,10 @@ public:
     virtual ~wxIDataObject();
 
     // normally, wxDataObject controls our lifetime (i.e. we're deleted when it
     virtual ~wxIDataObject();
 
     // normally, wxDataObject controls our lifetime (i.e. we're deleted when it

-    // is), but in some cases, the situation is inversed, that is we delete it
+    // is), but in some cases, the situation is reversed, that is we delete it

     // when this object is deleted - setting this flag enables such logic
     void SetDeleteFlag() { m_mustDelete = true; }
 
     // when this object is deleted - setting this flag enables such logic
     void SetDeleteFlag() { m_mustDelete = true; }
 

-    DECLARE_IUNKNOWN_METHODS;
-

     // IDataObject
     STDMETHODIMP GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium);
     STDMETHODIMP GetDataHere(FORMATETC *pformatetc, STGMEDIUM *pmedium);
     // IDataObject
     STDMETHODIMP GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium);
     STDMETHODIMP GetDataHere(FORMATETC *pformatetc, STGMEDIUM *pmedium);


@@ -123,6 +117,8 @@ public:
     STDMETHODIMP DUnadvise(DWORD dwConnection);
     STDMETHODIMP EnumDAdvise(IEnumSTATDATA **ppenumAdvise);
 
     STDMETHODIMP DUnadvise(DWORD dwConnection);
     STDMETHODIMP EnumDAdvise(IEnumSTATDATA **ppenumAdvise);
 

+    DECLARE_IUNKNOWN_METHODS;
+

 private:
     wxDataObject *m_pDataObject;      // pointer to C++ class we belong to
 
 private:
     wxDataObject *m_pDataObject;      // pointer to C++ class we belong to
 


@@ -323,13 +319,8 @@ STDMETHODIMP wxIDataObject::GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium)
                 return DV_E_FORMATETC;
             }
 
                 return DV_E_FORMATETC;
             }
 

-            if ( !format.IsStandard() ) {
-                // for custom formats, put the size with the data - alloc the
-                // space for it
-                // MB: not completely sure this is correct,
-                //     even if I can't figure out what's wrong
-                size += m_pDataObject->GetBufferOffset( format );
-            }
+            // we may need extra space for the buffer size
+            size += m_pDataObject->GetBufferOffset( format );

 
             HGLOBAL hGlobal = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, size);
             if ( hGlobal == NULL ) {
 
             HGLOBAL hGlobal = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, size);
             if ( hGlobal == NULL ) {


@@ -391,10 +382,14 @@ STDMETHODIMP wxIDataObject::GetDataHere(FORMATETC *pformatetc,
                 }
 
                 wxDataFormat format = pformatetc->cfFormat;
                 }
 
                 wxDataFormat format = pformatetc->cfFormat;

-                if ( !format.IsStandard() ) {
-                    // for custom formats, put the size with the data
-                    pBuf = m_pDataObject->SetSizeInBuffer( pBuf, GlobalSize(hGlobal), format );
-                }
+
+                // possibly put the size in the beginning of the buffer
+                pBuf = m_pDataObject->SetSizeInBuffer
+                                      (
+                                        pBuf,
+                                        ::GlobalSize(hGlobal),
+                                        format
+                                      );

 
                 if ( !m_pDataObject->GetDataHere(format, pBuf) )
                     return E_UNEXPECTED;
 
                 if ( !m_pDataObject->GetDataHere(format, pBuf) )
                     return E_UNEXPECTED;


@@ -496,14 +491,9 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
                         break;
 #endif
                     default:
                         break;
 #endif
                     default:

-                        {
-                            // we suppose that the size precedes the data
-                            pBuf = m_pDataObject->GetSizeFromBuffer( pBuf, &size, format );
-                            if (! format.IsStandard() ) {
-                                // see GetData for coresponding increment
-                                size -= m_pDataObject->GetBufferOffset( format  );
-                            }
-                        }
+                        pBuf = m_pDataObject->
+                                    GetSizeFromBuffer(pBuf, &size, format);
+                        size -= m_pDataObject->GetBufferOffset(format);

                 }
 
                 bool ok = m_pDataObject->SetData(format, size, pBuf);
                 }
 
                 bool ok = m_pDataObject->SetData(format, size, pBuf);


@@ -624,7 +614,7 @@ STDMETHODIMP wxIDataObject::EnumFormatEtc(DWORD dwDir,
     wxDataObject::Direction dir = dwDir == DATADIR_GET ? wxDataObject::Get
                                                        : wxDataObject::Set;
 
     wxDataObject::Direction dir = dwDir == DATADIR_GET ? wxDataObject::Get
                                                        : wxDataObject::Set;
 

-    size_t nFormatCount = m_pDataObject->GetFormatCount(dir);
+    ULONG nFormatCount = wx_truncate_cast(ULONG, m_pDataObject->GetFormatCount(dir));

     wxDataFormat format;
     wxDataFormat *formats;
     formats = nFormatCount == 1 ? &format : new wxDataFormat[nFormatCount];
     wxDataFormat format;
     wxDataFormat *formats;
     formats = nFormatCount == 1 ? &format : new wxDataFormat[nFormatCount];


@@ -687,27 +677,53 @@ void wxDataObject::SetAutoDelete()
     m_pIDataObject = NULL;
 }
 
     m_pIDataObject = NULL;
 }
 

-size_t wxDataObject::GetBufferOffset( const wxDataFormat& WXUNUSED(format) )
+size_t wxDataObject::GetBufferOffset(const wxDataFormat& format )

 {
 {

-    return sizeof(size_t);
+    // if we prepend the size of the data to the buffer itself, account for it
+    return NeedsVerbatimData(format) ? 0 : sizeof(size_t);

 }
 
 const void* wxDataObject::GetSizeFromBuffer( const void* buffer, size_t* size,
 }
 
 const void* wxDataObject::GetSizeFromBuffer( const void* buffer, size_t* size,

-                                             const wxDataFormat& WXUNUSED(format) )
+                                               const wxDataFormat& format )

 {
 {

-    size_t* p = (size_t*)buffer;
-    *size = *p;
+    // hack: the third parameter is declared non-const in Wine's headers so
+    // cast away the const
+    size_t realsz = ::HeapSize(::GetProcessHeap(), 0,
+                               wx_const_cast(void*, buffer));
+    if ( realsz == (size_t)-1 )
+    {
+        // note that HeapSize() does not set last error
+        wxLogApiError(wxT("HeapSize"), 0);
+        return NULL;
+    }

 
 

-    return p + 1;
+    *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;

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

-                                       const wxDataFormat& WXUNUSED(format) )
+                                      const wxDataFormat& format )

 {
 {

-    size_t* p = (size_t*)buffer;
-    *p = size;
+    size_t* p = (size_t *)buffer;
+    if ( !NeedsVerbatimData(format) )
+    {
+        // prepend the size to the data and skip it
+        *p++ = size;
+    }

 
 

-    return p + 1;
+    return p;

 }
 
 #ifdef __WXDEBUG__
 }
 
 #ifdef __WXDEBUG__


@@ -979,7 +995,8 @@ bool wxBitmapDataObject::SetData(const wxDataFormat& format,
 // wxFileDataObject
 // ----------------------------------------------------------------------------
 
 // wxFileDataObject
 // ----------------------------------------------------------------------------
 

-bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *pData)
+bool wxFileDataObject::SetData(size_t WXUNUSED(size),
+                               const void *WXUNUSED_IN_WINCE(pData))

 {
 #ifndef __WXWINCE__
     m_filenames.Empty();
 {
 #ifndef __WXWINCE__
     m_filenames.Empty();


@@ -1015,7 +1032,6 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *pData)
 
     return true;
 #else
 
     return true;
 #else

-    wxUnusedVar(pData);

     return false;
 #endif
 }
     return false;
 #endif
 }


@@ -1055,7 +1071,7 @@ size_t wxFileDataObject::GetDataSize() const
 #endif
 }
 
 #endif
 }
 

-bool wxFileDataObject::GetDataHere(void *pData) const
+bool wxFileDataObject::GetDataHere(void *WXUNUSED_IN_WINCE(pData)) const

 {
 #ifndef __WXWINCE__
     // pData points to an externally allocated memory block
 {
 #ifndef __WXWINCE__
     // pData points to an externally allocated memory block


@@ -1095,7 +1111,6 @@ bool wxFileDataObject::GetDataHere(void *pData) const
 
     return true;
 #else
 
     return true;
 #else

-    wxUnusedVar(pData);

     return false;
 #endif
 }
     return false;
 #endif
 }


@@ -1108,7 +1123,7 @@ class CFSTR_SHELLURLDataObject : public wxCustomDataObject
 {
 public:
     CFSTR_SHELLURLDataObject() : wxCustomDataObject(CFSTR_SHELLURL) {}
 {
 public:
     CFSTR_SHELLURLDataObject() : wxCustomDataObject(CFSTR_SHELLURL) {}

-protected:
+

     virtual size_t GetBufferOffset( const wxDataFormat& WXUNUSED(format) )
     {
         return 0;
     virtual size_t GetBufferOffset( const wxDataFormat& WXUNUSED(format) )
     {
         return 0;


@@ -1151,7 +1166,7 @@ protected:
 
 
 
 
 
 

-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
 {
     // 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


@@ -1161,6 +1176,9 @@ wxURLDataObject::wxURLDataObject()
 
     // we don't have any data yet
     m_dataObjectLast = NULL;
 
     // 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,


@@ -1224,6 +1242,7 @@ static const wxChar *GetTymedName(DWORD tymed)
 #endif // Debug
 
 #else // not using OLE at all
 #endif // Debug
 
 #else // not using OLE at all

+

 // ----------------------------------------------------------------------------
 // wxDataObject
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxDataObject
 // ----------------------------------------------------------------------------


@@ -1243,13 +1262,14 @@ void wxDataObject::SetAutoDelete()
 }
 
 #ifdef __WXDEBUG__
 }
 
 #ifdef __WXDEBUG__

-const wxChar *wxDataObject::GetFormatName(wxDataFormat format)
+const wxChar *wxDataObject::GetFormatName(wxDataFormat WXUNUSED(format))

 {
     return NULL;
 }
 {
     return NULL;
 }

-#endif
+#endif // __WXDEBUG__

 
 

-#endif
+#endif // wxUSE_DATAOBJ
+
+#endif // wxUSE_OLE/!wxUSE_OLE

 
 

-#endif