Page MenuHome
Files F20967

GHOST_SystemWin32.cpp.patch
Public
Actions

Authored By
Sv. Lockal (lockal)
Nov 13 2013, 4:29 PM
Size
1 KB
Subscribers
None

GHOST_SystemWin32.cpp.patch
View Options

Index: intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- intern/ghost/intern/GHOST_SystemWin32.cpp (revision 43263)
+++ intern/ghost/intern/GHOST_SystemWin32.cpp (working copy)
@@ -1240,26 +1240,25 @@
GHOST_TUns8* GHOST_SystemWin32::getClipboard(bool selection) const
{
- char *buffer;
+ wchar_t *buffer;
char *temp_buff;
- if ( IsClipboardFormatAvailable(CF_TEXT) && OpenClipboard(NULL) ) {
+ if ( IsClipboardFormatAvailable(CF_UNICODETEXT) && OpenClipboard(NULL) ) {
size_t len = 0;
- HANDLE hData = GetClipboardData( CF_TEXT );
+ HANDLE hData = GetClipboardData( CF_UNICODETEXT );
if (hData == NULL) {
CloseClipboard();
return NULL;
}
- buffer = (char*)GlobalLock( hData );
+ buffer = (wchar_t*)GlobalLock( hData );
if (!buffer) {
CloseClipboard();
return NULL;
}
- len = strlen(buffer);
- temp_buff = (char*) malloc(len+1);
- strncpy(temp_buff, buffer, len);
- temp_buff[len] = '\0';
+ len = WideCharToMultiByte(CP_UTF8, 0, buffer, -1, NULL, 0, NULL, NULL);
+ temp_buff = (char*) malloc(len);
+ WideCharToMultiByte(CP_UTF8, 0, buffer, -1, temp_buff, len, NULL, NULL);
/* Buffer mustn't be accessed after CloseClipboard
it would like accessing free-d memory */
@@ -1278,18 +1277,20 @@
if (OpenClipboard(NULL)) {
HLOCAL clipbuffer;
- char *data;
+ wchar_t *data;
if (buffer) {
EmptyClipboard();
- clipbuffer = LocalAlloc(LMEM_FIXED,((strlen(buffer)+1)));
- data = (char*)GlobalLock(clipbuffer);
-
- strcpy(data, (char*)buffer);
- data[strlen(buffer)] = '\0';
+ int wlen = MultiByteToWideChar(CP_UTF8, 0, buffer, -1, NULL, 0);
+
+ clipbuffer = LocalAlloc(LMEM_FIXED, wlen * sizeof(wchar_t));
+ data = (wchar_t*)GlobalLock(clipbuffer);
+
+ MultiByteToWideChar(CP_UTF8, 0, buffer, -1, data, wlen);
+
LocalUnlock(clipbuffer);
- SetClipboardData(CF_TEXT,clipbuffer);
+ SetClipboardData(CF_UNICODETEXT,clipbuffer);
}
CloseClipboard();
} else {

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
ab/cc/0dee75a13a8d2927e9b2a52c99cc

Event Timeline