Mercurial > hg > openttd
changeset 6275:95966cefdddc draft
(svn r9084) -Fix: [win9x] Clipboard paste for Windows95 (doesn't have CF_UNICODETEXT) correctly converts the input to the current locale.
author | Darkvater <Darkvater@openttd.org> |
---|---|
date | Sat, 10 Mar 2007 00:27:20 +0000 |
parents | a51753c89fad |
children | 6b0bcf707d8d |
files | src/win32.cpp |
diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/win32.cpp +++ b/src/win32.cpp @@ -993,25 +993,26 @@ 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; }