Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unicode fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-11-02 16:27:42 +00:00
parent 8b85d24e4c
commit dd10a64696
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/msw/ole/dataobj.cpp
View File

@@ -963,17 +963,19 @@ size_t wxFileDataObject::GetDataSize() const
// a double null at the end // 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) return 0; if ( m_filenames.GetCount() == 0 )
return 0;
// inital size of DROPFILES struct + null byte // inital size of DROPFILES struct + null byte
size_t sz = sizeof(DROPFILES) + 1; size_t sz = sizeof(DROPFILES) + 1;
int i; size_t count = m_filenames.GetCount();
for (i=0; i<m_filenames.GetCount(); ++i) for ( size_t i = 0; i < count; i++ )
{ {
// add filename length plus null byte // add filename length plus null byte
sz += m_filenames[i].Len() + 1; sz += m_filenames[i].Len() + 1;
} }
return sz; return sz;
} }
@@ -983,29 +985,35 @@ bool wxFileDataObject::GetDataHere(void *pData) const
// created using the size returned by GetDataSize() // created using the size returned by GetDataSize()
// if pData is NULL, or there are no files, return // if pData is NULL, or there are no files, return
if (!pData || m_filenames.GetCount() == 0) return FALSE; if ( !pData || m_filenames.GetCount() == 0 )
return FALSE;
// convert data pointer to a DROPFILES struct pointer // convert data pointer to a DROPFILES struct pointer
LPDROPFILES pDrop = (LPDROPFILES) pData; LPDROPFILES pDrop = (LPDROPFILES) pData;
// initialize DROPFILES struct // initialize DROPFILES struct
pDrop->pFiles = sizeof(DROPFILES); pDrop->pFiles = sizeof(DROPFILES);
pDrop->fNC = FALSE; pDrop->fNC = FALSE; // not non-client coords
#if wxUSE_UNICODE
pDrop->fWide = TRUE;
#else // ANSI
pDrop->fWide = FALSE; pDrop->fWide = FALSE;
#endif // Unicode/Ansi
// set start of filenames list (null separated) // set start of filenames list (null separated)
char *pbuf = (char*)pDrop + sizeof(DROPFILES); wxChar *pbuf = (BYTE *)pDrop + sizeof(DROPFILES);
size_t i; size_t count = m_filenames.GetCount();
for (i=0; i<m_filenames.GetCount(); ++i) 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(); size_t len = m_filenames[i].Len();
memcpy(pbuf, m_filenames[i], len); memcpy(pbuf, m_filenames[i], len);
pbuf += len; pbuf += len;
*pbuf++ = '\0'; *pbuf++ = wxT('\0');
} }
*pbuf = '\0'; // add final null terminator
*pbuf = wxT('\0'); // add final null terminator
return TRUE; return TRUE;
} }