Skip to content

W
wine-winehq
Commit 84248a5a authored by Andreas Mohr's avatar Andreas Mohr Committed by Alexandre Julliard
Browse files
Options

Fixes for LANG_NEUTRAL.

parent 3bf623d7
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
include/winnls.h
View file @ 84248a5a
...@@ -141,6 +141,7 @@ ...@@ -141,6 +141,7 @@
#define LANG_USER_DEFAULT (MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)) #define LANG_USER_DEFAULT (MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT))
#define LOCALE_SYSTEM_DEFAULT (MAKELCID(LANG_SYSTEM_DEFAULT, SORT_DEFAULT)) #define LOCALE_SYSTEM_DEFAULT (MAKELCID(LANG_SYSTEM_DEFAULT, SORT_DEFAULT))
#define LOCALE_USER_DEFAULT (MAKELCID(LANG_USER_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) */ /* Language IDs (were in winnt.h, for some reason) */
......
ole/ole2nls.c
View file @ 84248a5a
...@@ -472,8 +472,9 @@ INT32 WINAPI GetLocaleInfo32A(LCID lcid,LCTYPE LCType,LPSTR buf,INT32 len) ...@@ -472,8 +472,9 @@ INT32 WINAPI GetLocaleInfo32A(LCID lcid,LCTYPE LCType,LPSTR buf,INT32 len)
found=0; i=0; lang=lcid; found=0; i=0; lang=lcid;
if (lang ==0x400) /*LANG_NEUTRAL ==> US English*/ if ((lang & 0xff) == 0x00) /*LANG_NEUTRAL ==> US English*/
{ lang = 0x409; {
lang = 0x409;
WARN(ole,"no language set, assume LANG_ENGLISH_US \n"); WARN(ole,"no language set, assume LANG_ENGLISH_US \n");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment