summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2007-01-18 14:06:30 +0000
committerDarkvater <darkvater@openttd.org>2007-01-18 14:06:30 +0000
commitd3a58ba36b0373e8ed7bdf8de4f21781a3eff47d (patch)
tree8696903fb72bff5bc050ac9f888098c2543322f1
parent147ca220600392d3c3394bfe194cb31de8d9f6ec (diff)
downloadopenttd-d3a58ba36b0373e8ed7bdf8de4f21781a3eff47d.tar.xz
(svn r8239) -Regression (r7278): Help window was empty for UNICODE builds
-rw-r--r--src/win32.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/win32.cpp b/src/win32.cpp
index 82611513e..018d5c8c2 100644
--- a/src/win32.cpp
+++ b/src/win32.cpp
@@ -371,7 +371,7 @@ static INT_PTR CALLBACK CrashDialogFunc(HWND wnd,UINT msg,WPARAM wParam,LPARAM l
case WM_INITDIALOG: {
#if defined(UNICODE)
/* We need to put the crash-log in a seperate buffer because the default
- * buffer in MB_TO_WIDE is not large enough (256 chars) */
+ * buffer in MB_TO_WIDE is not large enough (512 chars) */
wchar_t crash_msgW[8096];
#endif
SetDlgItemText(wnd, 10, _crash_desc);
@@ -841,12 +841,16 @@ void ShowInfo(const char *str)
fprintf(stderr, "%s\n", str);
} else {
bool old;
-
+#if defined(UNICODE)
+ /* We need to put the text in a seperate buffer because the default
+ * buffer in MB_TO_WIDE might not be large enough (512 chars) */
+ wchar_t help_msgW[4096];
+#endif
ReleaseCapture();
_left_button_clicked =_left_button_down = false;
old = MyShowCursor(true);
- if (MessageBox(GetActiveWindow(), MB_TO_WIDE(str), _T("OpenTTD"), MB_ICONINFORMATION | MB_OKCANCEL) == IDCANCEL) {
+ if (MessageBox(GetActiveWindow(), MB_TO_WIDE_BUFFER(str, help_msgW, lengthof(help_msgW)), _T("OpenTTD"), MB_ICONINFORMATION | MB_OKCANCEL) == IDCANCEL) {
CreateConsole();
}
MyShowCursor(old);