From 6f36db349f55ef9079e71ff816d6cdd39d12dc11 Mon Sep 17 00:00:00 2001 From: Darkvater Date: Sat, 10 Mar 2007 00:27:20 +0000 Subject: (svn r9084) -Fix: [win9x] Clipboard paste for Windows95 (doesn't have CF_UNICODETEXT) correctly converts the input to the current locale. --- src/win32.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/win32.cpp b/src/win32.cpp index 33e5fd964..232fdc6ad 100644 --- a/src/win32.cpp +++ b/src/win32.cpp @@ -993,25 +993,26 @@ bool InsertTextBufferClipboard(Textbuf *tb) uint16 width, length; if (IsClipboardFormatAvailable(CF_UNICODETEXT)) { - const char *ret; - OpenClipboard(NULL); cbuf = GetClipboardData(CF_UNICODETEXT); ptr = (const char*)GlobalLock(cbuf); - ret = convert_from_fs((wchar_t*)ptr, utf8_buf, lengthof(utf8_buf)); + const char *ret = convert_from_fs((wchar_t*)ptr, utf8_buf, lengthof(utf8_buf)); GlobalUnlock(cbuf); CloseClipboard(); if (*ret == '\0') return false; +#if !defined(UNICODE) } else if (IsClipboardFormatAvailable(CF_TEXT)) { OpenClipboard(NULL); cbuf = GetClipboardData(CF_TEXT); ptr = (const char*)GlobalLock(cbuf); - ttd_strlcpy(utf8_buf, ptr, lengthof(utf8_buf)); + ttd_strlcpy(utf8_buf, FS2OTTD(ptr), lengthof(utf8_buf)); + GlobalUnlock(cbuf); CloseClipboard(); +#endif /* UNICODE */ } else { return false; } -- cgit v1.2.3-54-g00ecf