[ros-diffs] [akhaldi] 75942: [WBEMPROX] Sync with Wine Staging 2.16. CORE-13762 65d7ff8 wbemprox: Add FreePhysicalMemory to Win32_OperatingSystem.

Author: akhaldi
Date: Sun Sep 24 11:17:27 2017
New Revision: 75942

URL: http://svn.reactos.org/svn/reactos?rev=75942&view=rev
Log:
[WBEMPROX] Sync with Wine Staging 2.16. CORE-13762

65d7ff8 wbemprox: Add FreePhysicalMemory to Win32_OperatingSystem.

Modified:
    trunk/reactos/dll/win32/wbemprox/builtin.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/wbemprox/builtin.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/builtin…
==============================================================================
--- trunk/reactos/dll/win32/wbemprox/builtin.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemprox/builtin.c	[iso-8859-1] Sun Sep 24 11:17:27 2017
@@ -196,6 +196,8 @@
     {'F','l','a','v','o','r',0};
 static const WCHAR prop_freespaceW[] =
    
{'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[] =
     {'H','a','n','d','l','e',0};
 static const WCHAR prop_horizontalresolutionW[] =
@@ -530,6 +532,7 @@
     { prop_systemdirectoryW,        CIM_STRING|COL_FLAG_DYNAMIC },
     { prop_totalvirtualmemorysizeW, CIM_UINT64 },
     { prop_totalvisiblememorysizeW, CIM_UINT64 },
+    { prop_freephysicalmemoryW,     CIM_UINT64 },
     { prop_versionW,                CIM_STRING|COL_FLAG_DYNAMIC }
 };
 static const struct column col_param[] =
@@ -934,6 +937,7 @@
     const WCHAR *systemdirectory;
     UINT64       totalvirtualmemorysize;
     UINT64       totalvisiblememorysize;
+    UINT64       freephysicalmemory;
     const WCHAR *version;
 };
 struct record_param
@@ -1305,6 +1309,15 @@
     status.dwLength = sizeof(status);
     if (!GlobalMemoryStatusEx( &status )) return 1024 * 1024 * 1024;
     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)
@@ -2897,6 +2910,7 @@
     rec->systemdirectory        = get_systemdirectory();
     rec->totalvirtualmemorysize = get_total_physical_memory() / 1024;
     rec->totalvisiblememorysize = rec->totalvirtualmemorysize;
+    rec->freephysicalmemory     = get_available_physical_memory() / 1024;
     rec->version                = get_osversion( &ver );
     if (!match_row( table, row, cond, &status )) free_row_values( table, row );
     else row++;

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Sep 24 11:17:27 2017
@@ -195,7 +195,7 @@
 reactos/dll/win32/version             # 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/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/windowscodecsext    # Synced to WineStaging-2.9
 reactos/dll/win32/winemp3.acm         # Synced to WineStaging-2.9