Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 01:39:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WBEMPROX]

Browse source 
* Sync with Wine 1.7.2. Hello LocalDateTime.

svn path=/trunk/; revision=60759
This commit is contained in:
Amine Khaldi 2013-10-26 21:29:03 +00:00
parent ccdf36a380
commit a9f9ecd76f
2 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
reactos/dll/win32/wbemprox/builtin.c
View file

@ -166,6 +166,8 @@ static const WCHAR prop_intvalueW[] =
{'I','n','t','e','g','e','r','V','a','l','u','e',0}; {'I','n','t','e','g','e','r','V','a','l','u','e',0};
static const WCHAR prop_lastbootuptimeW[] = static const WCHAR prop_lastbootuptimeW[] =
{'L','a','s','t','B','o','o','t','U','p','T','i','m','e',0}; {'L','a','s','t','B','o','o','t','U','p','T','i','m','e',0};
static const WCHAR prop_localdatetimeW[] =
{'L','o','c','a','l','D','a','t','e','T','i','m','e',0};
static const WCHAR prop_localeW[] = static const WCHAR prop_localeW[] =
{'L','o','c','a','l','e',0}; {'L','o','c','a','l','e',0};
static const WCHAR prop_macaddressW[] = static const WCHAR prop_macaddressW[] =
@ -345,6 +347,7 @@ static const struct column col_os[] =
{ prop_countrycodeW, 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_localdatetimeW, CIM_DATETIME|COL_FLAG_DYNAMIC },
{ prop_localeW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_localeW, CIM_STRING|COL_FLAG_DYNAMIC },
{ prop_osarchitectureW, CIM_STRING }, { prop_osarchitectureW, CIM_STRING },
{ prop_oslanguageW, CIM_UINT32, VT_I4 }, { prop_oslanguageW, CIM_UINT32, VT_I4 },
@ -597,6 +600,7 @@ struct record_operatingsystem
const WCHAR *countrycode; const WCHAR *countrycode;
const WCHAR *csdversion; const WCHAR *csdversion;
const WCHAR *lastbootuptime; const WCHAR *lastbootuptime;
const WCHAR *localdatetime;
const WCHAR *locale; const WCHAR *locale;
const WCHAR *osarchitecture; const WCHAR *osarchitecture;
UINT32 oslanguage; UINT32 oslanguage;
@ -1787,6 +1791,31 @@ static WCHAR *get_lastbootuptime(void)
sprintfW( ret, fmtW, tf.Year, tf.Month, tf.Day, tf.Hour, tf.Minute, tf.Second, tf.Milliseconds * 1000 ); sprintfW( ret, fmtW, tf.Year, tf.Month, tf.Day, tf.Hour, tf.Minute, tf.Second, tf.Milliseconds * 1000 );
return ret; return ret;
} }
static WCHAR *get_localdatetime(void)
{
static const WCHAR fmtW[] =
{'%','0','4','u','%','0','2','u','%','0','2','u','%','0','2','u','%','0','2','u','%','0','2','u',
'.','%','0','6','u','%','+','0','3','d',0};
TIME_ZONE_INFORMATION tzi;
SYSTEMTIME st;
WCHAR *ret;
DWORD Status;
LONG Bias;
Status = GetTimeZoneInformation(&tzi);
if(Status == TIME_ZONE_ID_INVALID) return NULL;
Bias = tzi.Bias;
if(Status == TIME_ZONE_ID_DAYLIGHT)
Bias+= tzi.DaylightBias;
else
Bias+= tzi.StandardBias;
if (!(ret = heap_alloc( 26 * sizeof(WCHAR) ))) return NULL;
GetLocalTime(&st);
sprintfW( ret, fmtW, st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds * 1000, -Bias);
return ret;
}
static WCHAR *get_systemdirectory(void) static WCHAR *get_systemdirectory(void)
{ {
void *redir; void *redir;
@ -1832,6 +1861,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond )
rec->countrycode = get_countrycode(); rec->countrycode = get_countrycode();
rec->csdversion = os_csdversionW; rec->csdversion = os_csdversionW;
rec->lastbootuptime = get_lastbootuptime(); rec->lastbootuptime = get_lastbootuptime();
rec->localdatetime = get_localdatetime();
rec->locale = get_locale(); rec->locale = get_locale();
rec->osarchitecture = get_osarchitecture(); rec->osarchitecture = get_osarchitecture();
rec->oslanguage = GetSystemDefaultLangID(); rec->oslanguage = GetSystemDefaultLangID();

2
reactos/media/doc/README.WINE
View file

@ -199,7 +199,7 @@ reactos/dll/win32/usp10 # Synced to Wine-1.7.1
reactos/dll/win32/uxtheme # Forked reactos/dll/win32/uxtheme # Forked
reactos/dll/win32/vbscript # Synced to Wine-1.7.1 reactos/dll/win32/vbscript # Synced to Wine-1.7.1
reactos/dll/win32/version # Autosync reactos/dll/win32/version # Autosync
reactos/dll/win32/wbemprox # Synced to Wine-1.7.1 reactos/dll/win32/wbemprox # Synced to Wine-1.7.2
reactos/dll/win32/wer # Autosync reactos/dll/win32/wer # Autosync
reactos/dll/win32/windowscodecs # Synced to Wine-1.7.1 reactos/dll/win32/windowscodecs # Synced to Wine-1.7.1
reactos/dll/win32/windowscodecsext # Synced to Wine-1.7.1 reactos/dll/win32/windowscodecsext # Synced to Wine-1.7.1