dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed bug #1412159 - NSIS 2.13 doesn't work on Win 95/98/NT

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4498 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2006-01-24 17:54:35 +00:00
parent 80cca71694
commit b747052c7f
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/exehead/Ui.c
View file

@ -248,13 +248,13 @@ FORCE_INLINE int NSISCALL ui_doinstall(void)
} }
else else
{ {
*(WORD*)state_language = CHAR2_TO_WORD('0', 'x'); *(DWORD*)state_language = CHAR4_TO_DWORD('0', 'x', 0, 0);
{ {
// Windows 9x // Windows 9x
static const char reg_9x_locale[] = "Control Panel\\Desktop\\ResourceLocale"; 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]) 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_key[] = ".DEFAULT\\Control Panel\\International";
static const char reg_nt_locale_val[] = "Locale"; 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 // set default language