Markus Weiland : dxdiagn: Implemented ullPhysicalMemory property for DXDiagSystemInfoContainer.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2a87ef68c57022bf40137691d552dd5a173f3bef
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2a87ef68c57022bf40137691d5...

Author: Markus Weiland <kde(a)graph-ix.net>
Date:   Tue Apr 29 18:24:59 2008 +0200

dxdiagn: Implemented ullPhysicalMemory property for DXDiagSystemInfoContainer.

---

 dlls/dxdiagn/provider.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c
index 23da024..006310a 100644
--- a/dlls/dxdiagn/provider.c
+++ b/dlls/dxdiagn/provider.c
@@ -269,6 +269,7 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont)
   static const WCHAR szDirectXVersionEnglish_v[] = {'4','.','0','9','.','0','0','0','0','.','0','9','0','4',0};
   static const WCHAR szDirectXVersionLongEnglish[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','L','o','n','g','E','n','g','l','i','s','h',0};
   static const WCHAR szDirectXVersionLongEnglish_v[] = {'=',' ','"','D','i','r','e','c','t','X',' ','9','.','0','c',' ','(','4','.','0','9','.','0','0','0','0','.','0','9','0','4',')',0};
+  static const WCHAR ullPhysicalMemory[] = {'u','l','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0};
   /*static const WCHAR szDxDiagVersion[] = {'s','z','D','x','D','i','a','g','V','e','r','s','i','o','n',0};*/
   /*szWindowsDir*/
   /*szWindowsDir*/
@@ -276,6 +277,7 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont)
   /*"dwOSMinorVersion"*/
   /*"dwOSBuildNumber"*/
   /*"dwOSPlatformID"*/
+  MEMORYSTATUSEX msex;
   VARIANT v;
 
   V_VT(&v) = VT_UI4; V_UI4(&v) = 9;
@@ -297,6 +299,13 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont)
   hr = IDxDiagContainerImpl_AddProp(pSubCont, bDebug, &v);
   VariantClear(&v);
 
+  msex.dwLength = sizeof(msex);
+  GlobalMemoryStatusEx( &msex );
+  V_VT(&v) = VT_UI8;
+  V_UI8(&v) = msex.ullTotalPhys;
+  hr = IDxDiagContainerImpl_AddProp(pSubCont, ullPhysicalMemory, &v);
+  VariantClear(&v);
+
   return hr;
 }