Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:23:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WBEMPROX] Sync with Wine Staging 2.16. CORE-13762

Browse source 
65d7ff8 wbemprox: Add FreePhysicalMemory to Win32_OperatingSystem.

svn path=/trunk/; revision=75942
This commit is contained in:
Amine Khaldi 2017-09-24 11:17:27 +00:00
parent f8f96865c6
commit 3e1315cb4b
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -196,6 +196,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[] =
@ -530,6 +532,7 @@ static const struct column col_os[] =
{ prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC },
{ prop_totalvirtualmemorysizeW, CIM_UINT64 }, { prop_totalvirtualmemorysizeW, CIM_UINT64 },
{ prop_totalvisiblememorysizeW, CIM_UINT64 }, { prop_totalvisiblememorysizeW, CIM_UINT64 },
{ prop_freephysicalmemoryW, CIM_UINT64 },
{ prop_versionW, CIM_STRING|COL_FLAG_DYNAMIC } { prop_versionW, CIM_STRING|COL_FLAG_DYNAMIC }
}; };
static const struct column col_param[] = static const struct column col_param[] =
@ -934,6 +937,7 @@ struct record_operatingsystem
const WCHAR *systemdirectory; const WCHAR *systemdirectory;
UINT64 totalvirtualmemorysize; UINT64 totalvirtualmemorysize;
UINT64 totalvisiblememorysize; UINT64 totalvisiblememorysize;
UINT64 freephysicalmemory;
const WCHAR *version; const WCHAR *version;
}; };
struct record_param struct record_param
@ -1307,6 +1311,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;
@ -2897,6 +2910,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond )
rec->systemdirectory = get_systemdirectory(); rec->systemdirectory = get_systemdirectory();
rec->totalvirtualmemorysize = get_total_physical_memory() / 1024; rec->totalvirtualmemorysize = get_total_physical_memory() / 1024;
rec->totalvisiblememorysize = rec->totalvirtualmemorysize; rec->totalvisiblememorysize = rec->totalvirtualmemorysize;
rec->freephysicalmemory = get_available_physical_memory() / 1024;
rec->version = get_osversion( &ver ); rec->version = get_osversion( &ver );
if (!match_row( table, row, cond, &status )) free_row_values( table, row ); if (!match_row( table, row, cond, &status )) free_row_values( table, row );
else row++; else row++;

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

@ -195,7 +195,7 @@ reactos/dll/win32/vbscript # Synced to WineStaging-2.9
reactos/dll/win32/version # Synced to WineStaging-2.9 reactos/dll/win32/version # Synced to WineStaging-2.9
reactos/dll/win32/vssapi # Synced to WineStaging-2.9 reactos/dll/win32/vssapi # Synced to WineStaging-2.9
reactos/dll/win32/wbemdisp # Synced to WineStaging-2.16 reactos/dll/win32/wbemdisp # Synced to WineStaging-2.16
reactos/dll/win32/wbemprox # Synced to WineStaging-2.9 reactos/dll/win32/wbemprox # Synced to WineStaging-2.16
reactos/dll/win32/windowscodecs # Synced to WineStaging-2.9 reactos/dll/win32/windowscodecs # Synced to WineStaging-2.9
reactos/dll/win32/windowscodecsext # Synced to WineStaging-2.9 reactos/dll/win32/windowscodecsext # Synced to WineStaging-2.9
reactos/dll/win32/winemp3.acm # Synced to WineStaging-2.9 reactos/dll/win32/winemp3.acm # Synced to WineStaging-2.9