diff --git a/docs/changes.txt b/docs/changes.txt
index 3a4d193342..0e615bdc58 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -136,6 +136,8 @@ wxMSW:
 - wxTaskBarIcon must be explicitly destroyed now, otherwise the application
   won't exit even though there are no top level windows
 - wxFileName::GetModificationTime() works with opened files too now
+- wxDC::GetClippingBox() now works even for clipping regions created by Windows
+- fixed wxFileDataObject in Unicode build (Alex D)
 
 wxMotif:
 
diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 9c70b15cb0..14da1ff70c 100644
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -1082,7 +1082,7 @@ bool wxFileDataObject::GetDataHere(void *pData) const
     {
         // copy filename to pbuf and add null terminator
         size_t len = m_filenames[i].Len();
-        memcpy(pbuf, m_filenames[i], len);
+        memcpy(pbuf, m_filenames[i], len*sizeof(wxChar));
         pbuf += len;
         *pbuf++ = wxT('\0');
     }