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

wbemprox: Add FreePhysicalMemory to Win32_OperatingSystem. 

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Müller 2018-03-02 11:54:57 +01:00 committed by Alexandre Julliard
parent 0197f54a8e
commit fe6127dc67
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/wbemprox/builtin.c
View File

@ -231,6 +231,8 @@ static const WCHAR prop_flavorW[] =
{'F','l','a','v','o','r',0}; {'F','l','a','v','o','r',0};
static const WCHAR prop_freespaceW[] = static const WCHAR prop_freespaceW[] =
{'F','r','e','e','S','p','a','c','e',0}; {'F','r','e','e','S','p','a','c','e',0};
static const WCHAR prop_freephysicalmemoryW[] =
{'F','r','e','e','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0};
static const WCHAR prop_handleW[] = static const WCHAR prop_handleW[] =
{'H','a','n','d','l','e',0}; {'H','a','n','d','l','e',0};
static const WCHAR prop_horizontalresolutionW[] = static const WCHAR prop_horizontalresolutionW[] =
@ -559,6 +561,7 @@ static const struct column col_os[] =
{ prop_codesetW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_codesetW, CIM_STRING|COL_FLAG_DYNAMIC },
{ prop_countrycodeW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_countrycodeW, CIM_STRING|COL_FLAG_DYNAMIC },
{ prop_csdversionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_csdversionW, CIM_STRING|COL_FLAG_DYNAMIC },
{ prop_freephysicalmemoryW, CIM_UINT64 },
{ prop_installdateW, CIM_DATETIME }, { prop_installdateW, CIM_DATETIME },
{ prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC },
{ prop_localdatetimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_localdatetimeW, CIM_DATETIME|COL_FLAG_DYNAMIC },
@ -972,6 +975,7 @@ struct record_operatingsystem
const WCHAR *codeset; const WCHAR *codeset;
const WCHAR *countrycode; const WCHAR *countrycode;
const WCHAR *csdversion; const WCHAR *csdversion;
UINT64 freephysicalmemory;
const WCHAR *installdate; const WCHAR *installdate;
const WCHAR *lastbootuptime; const WCHAR *lastbootuptime;
const WCHAR *localdatetime; const WCHAR *localdatetime;
@ -1362,6 +1366,15 @@ static UINT64 get_total_physical_memory(void)
return status.ullTotalPhys; return status.ullTotalPhys;
} }
static UINT64 get_available_physical_memory(void)
{
MEMORYSTATUSEX status;
status.dwLength = sizeof(status);
if (!GlobalMemoryStatusEx( &status )) return 1024 * 1024 * 1024;
return status.ullAvailPhys;
}
static WCHAR *get_computername(void) static WCHAR *get_computername(void)
{ {
WCHAR *ret; WCHAR *ret;
@ -2941,6 +2954,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond )
rec->codeset = get_codeset(); rec->codeset = get_codeset();
rec->countrycode = get_countrycode(); rec->countrycode = get_countrycode();
rec->csdversion = ver.szCSDVersion[0] ? heap_strdupW( ver.szCSDVersion ) : NULL; rec->csdversion = ver.szCSDVersion[0] ? heap_strdupW( ver.szCSDVersion ) : NULL;
rec->freephysicalmemory = get_available_physical_memory() / 1024;
rec->installdate = os_installdateW; rec->installdate = os_installdateW;
rec->lastbootuptime = get_lastbootuptime(); rec->lastbootuptime = get_lastbootuptime();
rec->localdatetime = get_localdatetime(); rec->localdatetime = get_localdatetime();