From b747052c7fb30185b150d86a8bc4ab04b440acd9 Mon Sep 17 00:00:00 2001 From: kichik Date: Tue, 24 Jan 2006 17:54:35 +0000 Subject: [PATCH] fixed bug #1412159 - NSIS 2.13 doesn't work on Win 95/98/NT git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4498 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/exehead/Ui.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/exehead/Ui.c b/Source/exehead/Ui.c index 3fa76ada..f20c633a 100644 --- a/Source/exehead/Ui.c +++ b/Source/exehead/Ui.c @@ -248,13 +248,13 @@ FORCE_INLINE int NSISCALL ui_doinstall(void) } else { - *(WORD*)state_language = CHAR2_TO_WORD('0', 'x'); + *(DWORD*)state_language = CHAR4_TO_DWORD('0', 'x', 0, 0); { // Windows 9x static const char reg_9x_locale[] = "Control Panel\\Desktop\\ResourceLocale"; - myRegGetStr(HKEY_CURRENT_USER, reg_9x_locale, NULL, state_language + 2); + myRegGetStr(HKEY_CURRENT_USER, reg_9x_locale, NULL, g_tmp); } if (!state_language[2]) @@ -264,8 +264,10 @@ FORCE_INLINE int NSISCALL ui_doinstall(void) static const char reg_nt_locale_key[] = ".DEFAULT\\Control Panel\\International"; static const char reg_nt_locale_val[] = "Locale"; - myRegGetStr(HKEY_USERS, reg_nt_locale_key, reg_nt_locale_val, state_language + 2); + myRegGetStr(HKEY_USERS, reg_nt_locale_key, reg_nt_locale_val, g_tmp); } + + mystrcat(state_language, g_tmp); } // set default language