dxdiagn: Add paged memory display string properties to the DxDiag_SystemInfo container.

dlls/dxdiagn/dxdiagn.rc

@@ -23,6 +23,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 STRINGTABLE
 {
     IDS_REGIONAL_SETTING    "Regional Setting"
+    IDS_PAGE_FILE_FORMAT    "%uMB used, %uMB available"
 }
 
 #define WINE_FILEDESCRIPTION_STR "Wine DxDiag 8"

dlls/dxdiagn/provider.c

@@ -534,16 +534,19 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node)
     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 szPhysicalMemoryEnglish[] = {'s','z','P','h','y','s','i','c','a','l','M','e','m','o','r','y','E','n','g','l','i','s','h',0};
+    static const WCHAR szPageFileLocalized[] = {'s','z','P','a','g','e','F','i','l','e','L','o','c','a','l','i','z','e','d',0};
+    static const WCHAR szPageFileEnglish[] = {'s','z','P','a','g','e','F','i','l','e','E','n','g','l','i','s','h',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};
 
+    static const WCHAR pagefile_fmtW[] = {'%','u','M','B',' ','u','s','e','d',',',' ','%','u','M','B',' ','a','v','a','i','l','a','b','l','e',0};
     static const WCHAR physmem_fmtW[] = {'%','u','M','B',' ','R','A','M',0};
 
     HRESULT hr;
     MEMORYSTATUSEX msex;
     OSVERSIONINFOW info;
-    DWORD count;
-    WCHAR buffer[MAX_PATH], computer_name[MAX_COMPUTERNAME_LENGTH + 1], print_buf[200];
+    DWORD count, usedpage_mb, availpage_mb;
+    WCHAR buffer[MAX_PATH], computer_name[MAX_COMPUTERNAME_LENGTH + 1], print_buf[200], localized_pagefile_fmt[200];
 
     hr = add_ui4_property(node, dwDirectXVersionMajor, 9);
     if (FAILED(hr))
@@ -621,6 +624,21 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node)
     if (FAILED(hr))
         return hr;
 
+    usedpage_mb = (DWORD)((msex.ullTotalPageFile - msex.ullAvailPageFile) / (1024 * 1024));
+    availpage_mb = (DWORD)(msex.ullAvailPageFile / (1024 * 1024));
+    LoadStringW(dxdiagn_instance, IDS_PAGE_FILE_FORMAT, localized_pagefile_fmt, sizeof(localized_pagefile_fmt)/sizeof(WCHAR));
+    snprintfW(print_buf, sizeof(print_buf)/sizeof(WCHAR), localized_pagefile_fmt, usedpage_mb, availpage_mb);
+
+    hr = add_bstr_property(node, szPageFileLocalized, print_buf);
+    if (FAILED(hr))
+        return hr;
+
+    snprintfW(print_buf, sizeof(print_buf)/sizeof(WCHAR), pagefile_fmtW, usedpage_mb, availpage_mb);
+
+    hr = add_bstr_property(node, szPageFileEnglish, print_buf);
+    if (FAILED(hr))
+        return hr;
+
     GetWindowsDirectoryW(buffer, MAX_PATH);
 
     hr = add_bstr_property(node, szWindowsDir, buffer);

dlls/dxdiagn/resource.h

@@ -21,3 +21,4 @@
 #include <windef.h>
 
 #define IDS_REGIONAL_SETTING 1
+#define IDS_PAGE_FILE_FORMAT 2

dlls/dxdiagn/tests/container.c

@@ -789,6 +789,8 @@ static void test_DxDiag_SystemInfo(void)
     static const WCHAR szTimeLocalized[] = {'s','z','T','i','m','e','L','o','c','a','l','i','z','e','d',0};
     static const WCHAR szTimeEnglish[] = {'s','z','T','i','m','e','E','n','g','l','i','s','h',0};
     static const WCHAR szPhysicalMemoryEnglish[] = {'s','z','P','h','y','s','i','c','a','l','M','e','m','o','r','y','E','n','g','l','i','s','h',0};
+    static const WCHAR szPageFileLocalized[] = {'s','z','P','a','g','e','F','i','l','e','L','o','c','a','l','i','z','e','d',0};
+    static const WCHAR szPageFileEnglish[] = {'s','z','P','a','g','e','F','i','l','e','E','n','g','l','i','s','h',0};
 
     static const struct
     {
@@ -820,6 +822,8 @@ static void test_DxDiag_SystemInfo(void)
         {szTimeLocalized, VT_BSTR},
         {szTimeEnglish, VT_BSTR},
         {szPhysicalMemoryEnglish, VT_BSTR},
+        {szPageFileLocalized, VT_BSTR},
+        {szPageFileEnglish, VT_BSTR},
     };
 
     HRESULT hr;

po/ar.po

@@ -1972,6 +1972,10 @@ msgstr ""
 msgid "Regional Setting"
 msgstr ""
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr ""

po/bg.po

@@ -1982,6 +1982,10 @@ msgstr ""
 msgid "Regional Setting"
 msgstr "Default Settings"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr ""

po/ca.po

@@ -1948,6 +1948,10 @@ msgstr ""
 msgid "Regional Setting"
 msgstr ""
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr ""

po/cs.po

@@ -2027,6 +2027,10 @@ msgstr "Standardní zařízení MidiOut"
 msgid "Regional Setting"
 msgstr "Standardní nastavení"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Volby"

po/da.po

@@ -2032,6 +2032,10 @@ msgstr "Standard MidiOut Enhed"
 msgid "Regional Setting"
 msgstr "Standard indstillinger"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 #, fuzzy
 msgid "Options"

po/de.po

@@ -2029,6 +2029,10 @@ msgstr "Standard MidiOut - Gerät"
 msgid "Regional Setting"
 msgstr "Standardeinstellungen"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Einstellungen"

po/el.po

@@ -1971,6 +1971,10 @@ msgstr ""
 msgid "Regional Setting"
 msgstr ""
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Επιλογές"

po/en.po

@@ -1950,6 +1950,10 @@ msgstr "Default MidiOut Device"
 msgid "Regional Setting"
 msgstr "Regional Setting"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Options"

po/en_US.po

@@ -2014,6 +2014,10 @@ msgstr "Default MidiOut Device"
 msgid "Regional Setting"
 msgstr "Regional Setting"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr "%uMB used, %uMB available"
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Options"

po/eo.po

@@ -1992,6 +1992,10 @@ msgstr ""
 msgid "Regional Setting"
 msgstr "Defaýltaj Agordoj"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr ""

po/es.po

@@ -2022,6 +2022,10 @@ msgstr "Dispositivo MidiOut por defecto"
 msgid "Regional Setting"
 msgstr "Configuración por defecto"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Opciones"

po/fa.po

@@ -1972,6 +1972,10 @@ msgstr ""
 msgid "Regional Setting"
 msgstr ""
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr ""

po/fi.po

@@ -1988,6 +1988,10 @@ msgstr ""
 msgid "Regional Setting"
 msgstr "Default Settings"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Valinnat"

po/fr.po

@@ -2029,6 +2029,10 @@ msgstr "Périphérique MidiOut par défaut"
 msgid "Regional Setting"
 msgstr "Paramètres par défaut"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Options"

po/he.po

@@ -1981,6 +1981,10 @@ msgstr "התקן ה־MidiOut כבררת מחדל"
 msgid "Regional Setting"
 msgstr "תצורה - הגדרות בררת המחדל"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "אפשרויות"

po/hi.po

@@ -1952,6 +1952,10 @@ msgstr ""
 msgid "Regional Setting"
 msgstr ""
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr ""

po/hu.po

@@ -2044,6 +2044,10 @@ msgstr "Alapértelmezett MidiOut eszköz"
 msgid "Regional Setting"
 msgstr "Default Settings"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Opciók"

po/it.po

@@ -2119,6 +2119,10 @@ msgstr "Dispositivo MidiOut predefinito"
 msgid "Regional Setting"
 msgstr "Impostazioni predefinite"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Opzioni"

po/ja.po

@@ -2009,6 +2009,10 @@ msgstr "デフォルト MidiOut デバイス"
 msgid "Regional Setting"
 msgstr "既定の設定"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "オプション"

po/ko.po

@@ -2010,6 +2010,10 @@ msgstr "기본 미디출력 장치"
 msgid "Regional Setting"
 msgstr "기본 설정"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "옵션"

po/lt.po

@@ -2020,6 +2020,10 @@ msgstr "Numatytasis MidiOut įrenginys"
 msgid "Regional Setting"
 msgstr "Numatytosios nuostatos"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Parinktys"

po/ml.po

@@ -1952,6 +1952,10 @@ msgstr ""
 msgid "Regional Setting"
 msgstr ""
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr ""

po/nb_NO.po

@@ -2106,6 +2106,10 @@ msgstr "Standard enhet for MIDI-avspilling"
 msgid "Regional Setting"
 msgstr "Globale innstillinger"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 #, fuzzy
 msgid "Options"

po/nl.po

@@ -2023,6 +2023,10 @@ msgstr "Standaardapparaat MidiOut"
 msgid "Regional Setting"
 msgstr "Standaardinstellingen"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Instellingen"

po/or.po

@@ -1952,6 +1952,10 @@ msgstr ""
 msgid "Regional Setting"
 msgstr ""
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr ""

po/pa.po

@@ -1952,6 +1952,10 @@ msgstr ""
 msgid "Regional Setting"
 msgstr ""
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr ""

po/pl.po

@@ -2019,6 +2019,10 @@ msgstr "Standardowe urządzenie Device"
 msgid "Regional Setting"
 msgstr "Ustawienia standardowe"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Opcje"

po/pt_BR.po

@@ -2103,6 +2103,10 @@ msgstr "Dispositivo padrão MidiOut"
 msgid "Regional Setting"
 msgstr "Configurações Padrão"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Opções"

po/pt_PT.po

@@ -2117,6 +2117,10 @@ msgstr "Dispositivo padrão MidiOut"
 msgid "Regional Setting"
 msgstr "Definições Predefinidas"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Opções"

po/rm.po

@@ -1965,6 +1965,10 @@ msgstr ""
 msgid "Regional Setting"
 msgstr "Default"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 #, fuzzy
 msgid "Options"

po/ro.po

@@ -2162,6 +2162,10 @@ msgstr "Dispozitiv MidiOut implicit"
 msgid "Regional Setting"
 msgstr "Setări implicite"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Opțiuni"

po/ru.po

@@ -2012,6 +2012,10 @@ msgstr "Устройство вывода MIDI по умолчанию"
 msgid "Regional Setting"
 msgstr "Установки по умолчанию"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Настройки"

po/sk.po

@@ -1973,6 +1973,10 @@ msgstr ""
 msgid "Regional Setting"
 msgstr "Default"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr ""

po/sl.po

@@ -2024,6 +2024,10 @@ msgstr "Privzeta MidiOut naprava"
 msgid "Regional Setting"
 msgstr "Privzete (sistemske) nastavitve"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Možnosti"

po/sr_RS@cyrillic.po

@@ -2001,6 +2001,10 @@ msgstr "Подразумевани MidiOut уређај"
 msgid "Regional Setting"
 msgstr "Поставке интернета"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Опције"

po/sr_RS@latin.po

@@ -2025,6 +2025,10 @@ msgstr "Podrazumevani MidiOut uređaj"
 msgid "Regional Setting"
 msgstr "Osnovno podešavanje"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Opcije"

po/sv.po

@@ -2015,6 +2015,10 @@ msgstr "Förvald MidiOut-enhet"
 msgid "Regional Setting"
 msgstr "Standardinställningar"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Alternativ"

po/te.po

@@ -1952,6 +1952,10 @@ msgstr ""
 msgid "Regional Setting"
 msgstr ""
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr ""

po/th.po

@@ -1971,6 +1971,10 @@ msgstr ""
 msgid "Regional Setting"
 msgstr ""
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr ""

po/tr.po

@@ -2012,6 +2012,10 @@ msgstr ""
 msgid "Regional Setting"
 msgstr "Öntanımlı Ayarlar"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Seçenekler"

po/uk.po

@@ -2016,6 +2016,10 @@ msgstr "Пристрій виводу Midi по замовчуванні"
 msgid "Regional Setting"
 msgstr "Стандартні налаштування"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "Параметри"

po/wa.po

@@ -1979,6 +1979,10 @@ msgstr ""
 msgid "Regional Setting"
 msgstr "Default"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr ""

po/wine.pot

@@ -1945,6 +1945,10 @@ msgstr ""
 msgid "Regional Setting"
 msgstr ""
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr ""

po/zh_CN.po

@@ -1992,6 +1992,10 @@ msgstr ""
 msgid "Regional Setting"
 msgstr "默认设置"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "选项"

po/zh_TW.po

@@ -2003,6 +2003,10 @@ msgstr ""
 msgid "Regional Setting"
 msgstr "預設設定"
 
+#: dxdiagn.rc:26
+msgid "%uMB used, %uMB available"
+msgstr ""
+
 #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
 msgid "Options"
 msgstr "選項"