ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-29 12:23:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Partially sync locale.c with Wine

Browse Source 
svn path=/trunk/; revision=42689
This commit is contained in:
Dmitry Chapyshev
2009-08-15 10:01:28 +00:00
parent 8d16b803eb
commit 16992e50bd
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/lib/sdk/crt/locale/locale.c
+5 -4
View File
@@ -234,7 +234,8 @@ find_best_locale_proc(HMODULE hModule, LPCSTR type, LPCSTR name, WORD LangID, LO
res->match_flags = flags;
res->found_lang_id = LangID;
}
if (flags & (FOUND_LANGUAGE & FOUND_COUNTRY & FOUND_CODEPAGE))
if ((flags & (FOUND_LANGUAGE | FOUND_COUNTRY | FOUND_CODEPAGE)) ==
(FOUND_LANGUAGE | FOUND_COUNTRY | FOUND_CODEPAGE))
{
TRACE(":found exact locale match\n");
return STOP_LOOKING;
@@ -316,7 +317,7 @@ static void msvcrt_set_ctype(unsigned int codepage, LCID lcid)
{
int i;
char str[3];
unsigned char *traverse = (unsigned char *)cp.LeadByte;
unsigned char *traverse = cp.LeadByte;
memset(MSVCRT_current_ctype, 0, sizeof(MSVCRT__ctype));
MSVCRT___lc_codepage = codepage;
@@ -387,8 +388,8 @@ char *setlocale(int category, const char *locale)
{
MSVCRT_current_lc_all[0] = 'C';
MSVCRT_current_lc_all[1] = '\0';
MSVCRT___lc_codepage = 1252;
MSVCRT___lc_collate_cp = 1252;
MSVCRT___lc_codepage = GetACP();
MSVCRT___lc_collate_cp = GetACP();
switch (category) {
case MSVCRT_LC_ALL: