Fixes for LANG_NEUTRAL.

This commit is contained in:
Andreas Mohr 1998-10-25 10:32:22 +00:00 committed by Alexandre Julliard
parent 3bf623d798
commit 84248a5a08
2 changed files with 4 additions and 2 deletions

View File

@ -141,6 +141,7 @@
#define LANG_USER_DEFAULT (MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT))
#define LOCALE_SYSTEM_DEFAULT (MAKELCID(LANG_SYSTEM_DEFAULT, SORT_DEFAULT))
#define LOCALE_USER_DEFAULT (MAKELCID(LANG_USER_DEFAULT, SORT_DEFAULT))
#define LOCALE_NEUTRAL (MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_NEUTRAL),SORT_DEFAULT))
/* Language IDs (were in winnt.h, for some reason) */

View File

@ -472,8 +472,9 @@ INT32 WINAPI GetLocaleInfo32A(LCID lcid,LCTYPE LCType,LPSTR buf,INT32 len)
found=0; i=0; lang=lcid;
if (lang ==0x400) /*LANG_NEUTRAL ==> US English*/
{ lang = 0x409;
if ((lang & 0xff) == 0x00) /*LANG_NEUTRAL ==> US English*/
{
lang = 0x409;
WARN(ole,"no language set, assume LANG_ENGLISH_US \n");
}