ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wbemprox: Implement Win32_OperatingSystem.CountryCode.

Browse Source
This commit is contained in:
Hans Leidekker 2013-06-14 10:04:43 +02:00 committed by Alexandre Julliard
parent ba3fe55cd4
commit f560bb4801
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/wbemprox/builtin.c
View File

@ -106,6 +106,8 @@ static const WCHAR prop_codesetW[] =
{'C','o','d','e','S','e','t',0}; {'C','o','d','e','S','e','t',0};
static const WCHAR prop_commandlineW[] = static const WCHAR prop_commandlineW[] =
{'C','o','m','m','a','n','d','L','i','n','e',0}; {'C','o','m','m','a','n','d','L','i','n','e',0};
static const WCHAR prop_countrycodeW[] =
{'C','o','u','n','t','r','y','C','o','d','e',0};
static const WCHAR prop_cpustatusW[] = static const WCHAR prop_cpustatusW[] =
{'C','p','u','S','t','a','t','u','s',0}; {'C','p','u','S','t','a','t','u','s',0};
static const WCHAR prop_csdversionW[] = static const WCHAR prop_csdversionW[] =
@ -325,6 +327,7 @@ static const struct column col_os[] =
{ {
{ prop_captionW, CIM_STRING }, { prop_captionW, CIM_STRING },
{ prop_codesetW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_codesetW, CIM_STRING|COL_FLAG_DYNAMIC },
{ prop_countrycodeW, CIM_STRING|COL_FLAG_DYNAMIC },
{ prop_csdversionW, CIM_STRING }, { prop_csdversionW, CIM_STRING },
{ prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC },
{ prop_osarchitectureW, CIM_STRING }, { prop_osarchitectureW, CIM_STRING },
@ -569,6 +572,7 @@ struct record_operatingsystem
{ {
const WCHAR *caption; const WCHAR *caption;
const WCHAR *codeset; const WCHAR *codeset;
const WCHAR *countrycode;
const WCHAR *csdversion; const WCHAR *csdversion;
const WCHAR *lastbootuptime; const WCHAR *lastbootuptime;
const WCHAR *osarchitecture; const WCHAR *osarchitecture;
@ -1763,6 +1767,12 @@ static WCHAR *get_codeset(void)
if (ret) sprintfW( ret, fmtW, GetACP() ); if (ret) sprintfW( ret, fmtW, GetACP() );
return ret; return ret;
} }
static WCHAR *get_countrycode(void)
{
WCHAR *ret = heap_alloc( 6 * sizeof(WCHAR) );
if (ret) GetLocaleInfoW( LOCALE_SYSTEM_DEFAULT, LOCALE_ICOUNTRY, ret, 6 );
return ret;
}
static enum fill_status fill_os( struct table *table, const struct expr *cond ) static enum fill_status fill_os( struct table *table, const struct expr *cond )
{ {
@ -1775,6 +1785,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond )
rec = (struct record_operatingsystem *)table->data; rec = (struct record_operatingsystem *)table->data;
rec->caption = os_captionW; rec->caption = os_captionW;
rec->codeset = get_codeset(); rec->codeset = get_codeset();
rec->countrycode = get_countrycode();
rec->csdversion = os_csdversionW; rec->csdversion = os_csdversionW;
rec->lastbootuptime = get_lastbootuptime(); rec->lastbootuptime = get_lastbootuptime();
rec->osarchitecture = get_osarchitecture(); rec->osarchitecture = get_osarchitecture();