organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-09 15:27:38 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-10870 Use GetGeoInfoW version of GetGeoInfo

Browse source 
X-SVN-Rev: 35700
This commit is contained in:
Michael Ow 2014-05-09 19:11:50 +00:00
parent d3f2a4ba93
commit f3fc05d4a6
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
icu4c/source/common/wintz.c
View file

@ -1,6 +1,6 @@
/*
********************************************************************************
* Copyright (C) 2005-2013, International Business Machines
* Copyright (C) 2005-2014, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@ -255,7 +255,8 @@ uprv_detectWindowsTimeZone() {
int32_t len;
int id;
int errorCode;
char ISOcode[3]; /* 2 letter iso code */
UChar ISOcodeW[3]; /* 2 letter iso code in UTF-16*/
char ISOcodeA[3]; /* 2 letter iso code in ansi */
LONG result;
TZI tziKey;
@ -282,7 +283,8 @@ uprv_detectWindowsTimeZone() {
tmpid[0] = 0;
id = GetUserGeoID(GEOCLASS_NATION);
errorCode = GetGeoInfo(id,GEO_ISO2,ISOcode,3,0);
errorCode = GetGeoInfoW(id,GEO_ISO2,ISOcodeW,3,0);
u_strToUTF8(ISOcodeA, 3, NULL, ISOcodeW, 3, &status);
bundle = ures_openDirect(NULL, "windowsZones", &status);
ures_getByKey(bundle, "mapTimezones", bundle, &status);
@ -308,7 +310,7 @@ uprv_detectWindowsTimeZone() {
if (uprv_memcmp((char *)&tziKey, (char*)&tziReg, sizeof(tziKey)) == 0) {
const UChar* icuTZ = NULL;
if (errorCode != 0) {
icuTZ = ures_getStringByKey(winTZ, ISOcode, &len, &status);
icuTZ = ures_getStringByKey(winTZ, ISOcodeA, &len, &status);
}
if (errorCode==0 || icuTZ==NULL) {
/* fallback to default "001" and reset status */