archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

- fix for [ #4678 ] ALL Blender versions crashes when pasting empty windows clipboard!

Browse Source 
quickly sneaked in last minute before release ;)
This commit is contained in:
Andrea Weikert
2006-07-13 17:13:31 +00:00
parent 5ee3d1da10
commit 11f70391d2
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/src/drawtext.c
View File

@@ -1288,8 +1288,10 @@ void txt_paste_clipboard(Text *text) {
if ( OpenClipboard(NULL) ) {
HANDLE hData = GetClipboardData( CF_TEXT );
buffer = (char*)GlobalLock( hData );
buffer = unixNewLine(buffer);
txt_insert_buf(text, buffer);
if (buffer) {
buffer = unixNewLine(buffer);
if (buffer) txt_insert_buf(text, buffer);
}
GlobalUnlock( hData );
CloseClipboard();
MEM_freeN(buffer);
@@ -1304,17 +1306,19 @@ void txt_copy_clipboard(Text *text) {
if (OpenClipboard(NULL)) {
HLOCAL clipbuffer;
char* buffer;
if (copybuffer) {
copybuffer = winNewLine(copybuffer);
copybuffer = winNewLine(copybuffer);
EmptyClipboard();
clipbuffer = LocalAlloc(LMEM_FIXED,((bufferlength+1)));
buffer = (char *) LocalLock(clipbuffer);
EmptyClipboard();
clipbuffer = LocalAlloc(LMEM_FIXED,((bufferlength+1)));
buffer = (char *) LocalLock(clipbuffer);
strncpy(buffer, copybuffer, bufferlength);
buffer[bufferlength] = '\0';
LocalUnlock(clipbuffer);
SetClipboardData(CF_TEXT,clipbuffer);
strncpy(buffer, copybuffer, bufferlength);
buffer[bufferlength] = '\0';
LocalUnlock(clipbuffer);
SetClipboardData(CF_TEXT,clipbuffer);
}
CloseClipboard();
}