Commit ff1285ac authored by Andrew Nguyen's avatar Andrew Nguyen Committed by Alexandre Julliard

dxdiagn: Add some machine name properties to the DxDiag_SystemInfo container.

parent 71c6f482
...@@ -366,11 +366,14 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) ...@@ -366,11 +366,14 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node)
static const WCHAR dwOSBuildNumber[] = {'d','w','O','S','B','u','i','l','d','N','u','m','b','e','r',0}; static const WCHAR dwOSBuildNumber[] = {'d','w','O','S','B','u','i','l','d','N','u','m','b','e','r',0};
static const WCHAR dwOSPlatformID[] = {'d','w','O','S','P','l','a','t','f','o','r','m','I','D',0}; static const WCHAR dwOSPlatformID[] = {'d','w','O','S','P','l','a','t','f','o','r','m','I','D',0};
static const WCHAR szCSDVersion[] = {'s','z','C','S','D','V','e','r','s','i','o','n',0}; static const WCHAR szCSDVersion[] = {'s','z','C','S','D','V','e','r','s','i','o','n',0};
static const WCHAR szMachineNameLocalized[] = {'s','z','M','a','c','h','i','n','e','N','a','m','e','L','o','c','a','l','i','z','e','d',0};
static const WCHAR szMachineNameEnglish[] = {'s','z','M','a','c','h','i','n','e','N','a','m','e','E','n','g','l','i','s','h',0};
HRESULT hr; HRESULT hr;
MEMORYSTATUSEX msex; MEMORYSTATUSEX msex;
OSVERSIONINFOW info; OSVERSIONINFOW info;
WCHAR buffer[MAX_PATH]; DWORD count;
WCHAR buffer[MAX_PATH], computer_name[MAX_COMPUTERNAME_LENGTH + 1];
hr = add_ui4_property(node, dwDirectXVersionMajor, 9); hr = add_ui4_property(node, dwDirectXVersionMajor, 9);
if (FAILED(hr)) if (FAILED(hr))
...@@ -440,6 +443,18 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) ...@@ -440,6 +443,18 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node)
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
count = sizeof(computer_name)/sizeof(WCHAR);
if (!GetComputerNameW(computer_name, &count))
return E_FAIL;
hr = add_bstr_property(node, szMachineNameLocalized, computer_name);
if (FAILED(hr))
return hr;
hr = add_bstr_property(node, szMachineNameEnglish, computer_name);
if (FAILED(hr))
return hr;
return S_OK; return S_OK;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment