dxdiag: Avoid C99 list initialization constructs.

programs/dxdiag/information.c

@@ -29,6 +29,31 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(dxdiag);
 
+static const WCHAR szTimeEnglish[] = {'s','z','T','i','m','e','E','n','g','l','i','s','h',0};
+static const WCHAR szTimeLocalized[] = {'s','z','T','i','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 szOSExLongEnglish[] = {'s','z','O','S','E','x','L','o','n','g','E','n','g','l','i','s','h',0};
+static const WCHAR szOSExLocalized[] = {'s','z','O','S','E','x','L','o','c','a','l','i','z','e','d',0};
+static const WCHAR szLanguagesEnglish[] = {'s','z','L','a','n','g','u','a','g','e','s','E','n','g','l','i','s','h',0};
+static const WCHAR szLanguagesLocalized[] = {'s','z','L','a','n','g','u','a','g','e','s','L','o','c','a','l','i','z','e','d',0};
+static const WCHAR szSystemManufacturerEnglish[] = {'s','z','S','y','s','t','e','m','M','a','n','u','f','a','c','t','u','r','e','r','E','n','g','l','i','s','h',0};
+static const WCHAR szSystemModelEnglish[] = {'s','z','S','y','s','t','e','m','M','o','d','e','l','E','n','g','l','i','s','h',0};
+static const WCHAR szBIOSEnglish[] = {'s','z','B','I','O','S','E','n','g','l','i','s','h',0};
+static const WCHAR szProcessorEnglish[] = {'s','z','P','r','o','c','e','s','s','o','r','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 szPageFileEnglish[] = {'s','z','P','a','g','e','F','i','l','e','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 szWindowsDir[] = {'s','z','W','i','n','d','o','w','s','D','i','r',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 szSetupParamEnglish[] = {'s','z','S','e','t','u','p','P','a','r','a','m','E','n','g','l','i','s','h',0};
+static const WCHAR szDxDiagVersion[] = {'s','z','D','x','D','i','a','g','V','e','r','s','i','o','n',0};
+
+struct property_list
+{
+    const WCHAR *property_name;
+    WCHAR **output;
+};
+
 static BOOL property_to_string(IDxDiagContainer *container, const WCHAR *property, WCHAR **output)
 {
     VARIANT var;
@@ -60,81 +85,76 @@ static BOOL property_to_string(IDxDiagContainer *container, const WCHAR *propert
 static void free_system_information(struct dxdiag_information *dxdiag_info)
 {
     struct system_information *system_info = &dxdiag_info->system_info;
-    size_t i;
-    WCHAR *strings[] =
-    {
-        system_info->szTimeEnglish,
-        system_info->szTimeLocalized,
-        system_info->szMachineNameEnglish,
-        system_info->szOSExLongEnglish,
-        system_info->szOSExLocalized,
-        system_info->szLanguagesEnglish,
-        system_info->szLanguagesLocalized,
-        system_info->szSystemManufacturerEnglish,
-        system_info->szSystemModelEnglish,
-        system_info->szBIOSEnglish,
-        system_info->szProcessorEnglish,
-        system_info->szPhysicalMemoryEnglish,
-        system_info->szPageFileEnglish,
-        system_info->szPageFileLocalized,
-        system_info->szWindowsDir,
-        system_info->szDirectXVersionLongEnglish,
-        system_info->szSetupParamEnglish,
-        system_info->szDxDiagVersion,
-    };
-
-    for (i = 0; i < sizeof(strings)/sizeof(strings[0]); i++)
-        HeapFree(GetProcessHeap(), 0, strings[i]);
+
+    HeapFree(GetProcessHeap(), 0, system_info->szTimeEnglish);
+    HeapFree(GetProcessHeap(), 0, system_info->szTimeLocalized);
+    HeapFree(GetProcessHeap(), 0, system_info->szMachineNameEnglish);
+    HeapFree(GetProcessHeap(), 0, system_info->szOSExLongEnglish);
+    HeapFree(GetProcessHeap(), 0, system_info->szOSExLocalized);
+    HeapFree(GetProcessHeap(), 0, system_info->szLanguagesEnglish);
+    HeapFree(GetProcessHeap(), 0, system_info->szLanguagesLocalized);
+    HeapFree(GetProcessHeap(), 0, system_info->szSystemManufacturerEnglish);
+    HeapFree(GetProcessHeap(), 0, system_info->szSystemModelEnglish);
+    HeapFree(GetProcessHeap(), 0, system_info->szBIOSEnglish);
+    HeapFree(GetProcessHeap(), 0, system_info->szProcessorEnglish);
+    HeapFree(GetProcessHeap(), 0, system_info->szPhysicalMemoryEnglish);
+    HeapFree(GetProcessHeap(), 0, system_info->szPageFileEnglish);
+    HeapFree(GetProcessHeap(), 0, system_info->szPageFileLocalized);
+    HeapFree(GetProcessHeap(), 0, system_info->szWindowsDir);
+    HeapFree(GetProcessHeap(), 0, system_info->szDirectXVersionLongEnglish);
+    HeapFree(GetProcessHeap(), 0, system_info->szSetupParamEnglish);
+    HeapFree(GetProcessHeap(), 0, system_info->szDxDiagVersion);
 }
 
-static BOOL fill_system_information(IDxDiagContainer *container, struct dxdiag_information *dxdiag_info)
+static inline void fill_system_property_list(struct dxdiag_information *dxdiag_info, struct property_list *list)
 {
-    static const WCHAR szTimeEnglish[] = {'s','z','T','i','m','e','E','n','g','l','i','s','h',0};
-    static const WCHAR szTimeLocalized[] = {'s','z','T','i','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 szOSExLongEnglish[] = {'s','z','O','S','E','x','L','o','n','g','E','n','g','l','i','s','h',0};
-    static const WCHAR szOSExLocalized[] = {'s','z','O','S','E','x','L','o','c','a','l','i','z','e','d',0};
-    static const WCHAR szLanguagesEnglish[] = {'s','z','L','a','n','g','u','a','g','e','s','E','n','g','l','i','s','h',0};
-    static const WCHAR szLanguagesLocalized[] = {'s','z','L','a','n','g','u','a','g','e','s','L','o','c','a','l','i','z','e','d',0};
-    static const WCHAR szSystemManufacturerEnglish[] = {'s','z','S','y','s','t','e','m','M','a','n','u','f','a','c','t','u','r','e','r','E','n','g','l','i','s','h',0};
-    static const WCHAR szSystemModelEnglish[] = {'s','z','S','y','s','t','e','m','M','o','d','e','l','E','n','g','l','i','s','h',0};
-    static const WCHAR szBIOSEnglish[] = {'s','z','B','I','O','S','E','n','g','l','i','s','h',0};
-    static const WCHAR szProcessorEnglish[] = {'s','z','P','r','o','c','e','s','s','o','r','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 szPageFileEnglish[] = {'s','z','P','a','g','e','F','i','l','e','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 szWindowsDir[] = {'s','z','W','i','n','d','o','w','s','D','i','r',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 szSetupParamEnglish[] = {'s','z','S','e','t','u','p','P','a','r','a','m','E','n','g','l','i','s','h',0};
-    static const WCHAR szDxDiagVersion[] = {'s','z','D','x','D','i','a','g','V','e','r','s','i','o','n',0};
+    struct system_information *system_info = &dxdiag_info->system_info;
 
+    list[0].property_name = szTimeEnglish;
+    list[0].output = &system_info->szTimeEnglish;
+    list[1].property_name = szTimeLocalized;
+    list[1].output = &system_info->szTimeLocalized;
+    list[2].property_name = szMachineNameEnglish;
+    list[2].output = &system_info->szMachineNameEnglish;
+    list[3].property_name = szOSExLongEnglish;
+    list[3].output = &system_info->szOSExLongEnglish;
+    list[4].property_name = szOSExLocalized;
+    list[4].output = &system_info->szOSExLocalized;
+    list[5].property_name = szLanguagesEnglish;
+    list[5].output = &system_info->szLanguagesEnglish;
+    list[6].property_name = szLanguagesLocalized;
+    list[6].output = &system_info->szLanguagesLocalized;
+    list[7].property_name = szSystemManufacturerEnglish;
+    list[7].output = &system_info->szSystemManufacturerEnglish;
+    list[8].property_name = szSystemModelEnglish;
+    list[8].output = &system_info->szSystemModelEnglish;
+    list[9].property_name = szBIOSEnglish;
+    list[9].output = &system_info->szBIOSEnglish;
+    list[10].property_name = szProcessorEnglish;
+    list[10].output = &system_info->szProcessorEnglish;
+    list[11].property_name = szPhysicalMemoryEnglish;
+    list[11].output = &system_info->szPhysicalMemoryEnglish;
+    list[12].property_name = szPageFileEnglish;
+    list[12].output = &system_info->szPageFileEnglish;
+    list[13].property_name = szPageFileLocalized;
+    list[13].output = &system_info->szPageFileLocalized;
+    list[14].property_name = szWindowsDir;
+    list[14].output = &system_info->szWindowsDir;
+    list[15].property_name = szDirectXVersionLongEnglish;
+    list[15].output = &system_info->szDirectXVersionLongEnglish;
+    list[16].property_name = szSetupParamEnglish;
+    list[16].output = &system_info->szSetupParamEnglish;
+    list[17].property_name = szDxDiagVersion;
+    list[17].output = &system_info->szDxDiagVersion;
+}
+
+static BOOL fill_system_information(IDxDiagContainer *container, struct dxdiag_information *dxdiag_info)
+{
     struct system_information *system_info = &dxdiag_info->system_info;
     size_t i;
-    const struct
-    {
-        const WCHAR *property_name;
-        WCHAR **output;
-    } property_list[] =
-    {
-        {szTimeEnglish, &system_info->szTimeEnglish},
-        {szTimeLocalized, &system_info->szTimeLocalized},
-        {szMachineNameEnglish, &system_info->szMachineNameEnglish},
-        {szOSExLongEnglish, &system_info->szOSExLongEnglish},
-        {szOSExLocalized, &system_info->szOSExLocalized},
-        {szLanguagesEnglish, &system_info->szLanguagesEnglish},
-        {szLanguagesLocalized, &system_info->szLanguagesLocalized},
-        {szSystemManufacturerEnglish, &system_info->szSystemManufacturerEnglish},
-        {szSystemModelEnglish, &system_info->szSystemModelEnglish},
-        {szBIOSEnglish, &system_info->szBIOSEnglish},
-        {szProcessorEnglish, &system_info->szProcessorEnglish},
-        {szPhysicalMemoryEnglish, &system_info->szPhysicalMemoryEnglish},
-        {szPageFileEnglish, &system_info->szPageFileEnglish},
-        {szPageFileLocalized, &system_info->szPageFileLocalized},
-        {szWindowsDir, &system_info->szWindowsDir},
-        {szDirectXVersionLongEnglish, &system_info->szDirectXVersionLongEnglish},
-        {szSetupParamEnglish, &system_info->szSetupParamEnglish},
-        {szDxDiagVersion, &system_info->szDxDiagVersion},
-    };
+    struct property_list property_list[18];
+
+    fill_system_property_list(dxdiag_info, property_list);
 
     for (i = 0; i < sizeof(property_list)/sizeof(property_list[0]); i++)
     {
@@ -184,7 +204,7 @@ struct dxdiag_information *collect_dxdiag_information(BOOL whql_check)
     IDxDiagProvider *pddp = NULL;
     IDxDiagContainer *root = NULL;
     struct dxdiag_information *ret = NULL;
-    DXDIAG_INIT_PARAMS params = {sizeof(DXDIAG_INIT_PARAMS), DXDIAG_DX9_SDK_VERSION, whql_check};
+    DXDIAG_INIT_PARAMS params = {sizeof(DXDIAG_INIT_PARAMS), DXDIAG_DX9_SDK_VERSION};
     HRESULT hr;
     size_t i;
 
@@ -197,6 +217,7 @@ struct dxdiag_information *collect_dxdiag_information(BOOL whql_check)
         goto error;
     }
 
+    params.bAllowWHQLChecks = whql_check;
     hr = IDxDiagProvider_Initialize(pddp, &params);
     if (FAILED(hr))
         goto error;

programs/dxdiag/output.c

@@ -55,6 +55,18 @@ static const WCHAR DxDiagVersion[] = {'D','x','D','i','a','g','V','e','r','s','i
 static const WCHAR DxDiagUnicode[] = {'D','x','D','i','a','g','U','n','i','c','o','d','e',0};
 static const WCHAR DxDiag64Bit[] = {'D','x','D','i','a','g','6','4','B','i','t',0};
 
+struct text_information_field
+{
+    const char *field_name;
+    const WCHAR *value;
+};
+
+struct xml_information_field
+{
+    const WCHAR *tag_name;
+    const WCHAR *value;
+};
+
 static BOOL output_text_header(HANDLE hFile, const char *caption)
 {
     DWORD len = strlen(caption);
@@ -110,43 +122,55 @@ static BOOL output_crlf(HANDLE hFile)
     return WriteFile(hFile, crlf, sizeof(crlf), NULL, NULL);
 }
 
+static inline void fill_system_text_output_table(struct dxdiag_information *dxdiag_info, struct text_information_field *fields)
+{
+    fields[0].field_name = "Time of this report";
+    fields[0].value = dxdiag_info->system_info.szTimeEnglish;
+    fields[1].field_name = "Machine name";
+    fields[1].value = dxdiag_info->system_info.szMachineNameEnglish;
+    fields[2].field_name = "Operating System";
+    fields[2].value = dxdiag_info->system_info.szOSExLongEnglish;
+    fields[3].field_name = "Language";
+    fields[3].value = dxdiag_info->system_info.szLanguagesEnglish;
+    fields[4].field_name = "System Manufacturer";
+    fields[4].value = dxdiag_info->system_info.szSystemManufacturerEnglish;
+    fields[5].field_name = "System Model";
+    fields[5].value = dxdiag_info->system_info.szSystemModelEnglish;
+    fields[6].field_name = "BIOS";
+    fields[6].value = dxdiag_info->system_info.szBIOSEnglish;
+    fields[7].field_name = "Processor";
+    fields[7].value = dxdiag_info->system_info.szProcessorEnglish;
+    fields[8].field_name = "Memory";
+    fields[8].value = dxdiag_info->system_info.szPhysicalMemoryEnglish;
+    fields[9].field_name = "Page File";
+    fields[9].value = dxdiag_info->system_info.szPageFileEnglish;
+    fields[10].field_name = "Windows Dir";
+    fields[10].value = dxdiag_info->system_info.szWindowsDir;
+    fields[11].field_name = "DirectX Version";
+    fields[11].value = dxdiag_info->system_info.szDirectXVersionLongEnglish;
+    fields[12].field_name = "DX Setup Parameters";
+    fields[12].value = dxdiag_info->system_info.szSetupParamEnglish;
+    fields[13].field_name = "DxDiag Version";
+    fields[13].value = dxdiag_info->system_info.szDxDiagVersion;
+}
+
 static BOOL output_text_information(struct dxdiag_information *dxdiag_info, const WCHAR *filename)
 {
-    const struct information_block
+    struct information_block
     {
         const char *caption;
-        size_t field_width;
-        struct information_field
-        {
-            const char *field_name;
-            const WCHAR *value;
-        } fields[50];
+        const size_t field_width;
+        struct text_information_field fields[50];
     } output_table[] =
     {
-        {"System Information", 19,
-            {
-                {"Time of this report", dxdiag_info->system_info.szTimeEnglish},
-                {"Machine name", dxdiag_info->system_info.szMachineNameEnglish},
-                {"Operating System", dxdiag_info->system_info.szOSExLongEnglish},
-                {"Language", dxdiag_info->system_info.szLanguagesEnglish},
-                {"System Manufacturer", dxdiag_info->system_info.szSystemManufacturerEnglish},
-                {"System Model", dxdiag_info->system_info.szSystemManufacturerEnglish},
-                {"BIOS", dxdiag_info->system_info.szSystemManufacturerEnglish},
-                {"Processor", dxdiag_info->system_info.szProcessorEnglish},
-                {"Memory", dxdiag_info->system_info.szPhysicalMemoryEnglish},
-                {"Page File", dxdiag_info->system_info.szPageFileEnglish},
-                {"Windows Dir", dxdiag_info->system_info.szWindowsDir},
-                {"DirectX Version", dxdiag_info->system_info.szDirectXVersionLongEnglish},
-                {"DX Setup Parameters", dxdiag_info->system_info.szSetupParamEnglish},
-                {"DxDiag Version", dxdiag_info->system_info.szDxDiagVersion},
-                {NULL, NULL},
-            }
-        },
+        {"System Information", 19},
     };
 
     HANDLE hFile;
     size_t i;
 
+    fill_system_text_output_table(dxdiag_info, output_table[0].fields);
+
     hFile = CreateFileW(filename, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
                         NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
     if (hFile == INVALID_HANDLE_VALUE)
@@ -157,7 +181,7 @@ static BOOL output_text_information(struct dxdiag_information *dxdiag_info, cons
 
     for (i = 0; i < sizeof(output_table)/sizeof(output_table[0]); i++)
     {
-        const struct information_field *fields = output_table[i].fields;
+        const struct text_information_field *fields = output_table[i].fields;
         unsigned int j;
 
         output_text_header(hFile, output_table[i].caption);
@@ -217,42 +241,54 @@ static HRESULT save_xml_document(IXMLDOMDocument *xmldoc, const WCHAR *filename)
     return hr;
 }
 
-static BOOL output_xml_information(struct dxdiag_information *dxdiag_info, const WCHAR *filename)
+static inline void fill_system_xml_output_table(struct dxdiag_information *dxdiag_info, struct xml_information_field *fields)
 {
     static const WCHAR zeroW[] = {'0',0};
     static const WCHAR oneW[] = {'1',0};
 
-    const struct information_block
-    {
-        const WCHAR *tag_name;
-        struct information_field
+    fields[0].tag_name = Time;
+    fields[0].value = dxdiag_info->system_info.szTimeEnglish;
+    fields[1].tag_name = MachineName;
+    fields[1].value = dxdiag_info->system_info.szMachineNameEnglish;
+    fields[2].tag_name = OperatingSystem;
+    fields[2].value = dxdiag_info->system_info.szOSExLongEnglish;
+    fields[3].tag_name = Language;
+    fields[3].value = dxdiag_info->system_info.szLanguagesEnglish;
+    fields[4].tag_name = SystemManufacturer;
+    fields[4].value = dxdiag_info->system_info.szSystemManufacturerEnglish;
+    fields[5].tag_name = SystemModel;
+    fields[5].value = dxdiag_info->system_info.szSystemModelEnglish;
+    fields[6].tag_name = BIOS;
+    fields[6].value = dxdiag_info->system_info.szBIOSEnglish;
+    fields[7].tag_name = Processor;
+    fields[7].value = dxdiag_info->system_info.szProcessorEnglish;
+    fields[8].tag_name = Memory;
+    fields[8].value = dxdiag_info->system_info.szPhysicalMemoryEnglish;
+    fields[9].tag_name = PageFile;
+    fields[9].value = dxdiag_info->system_info.szPageFileEnglish;
+    fields[10].tag_name = WindowsDir;
+    fields[10].value = dxdiag_info->system_info.szWindowsDir;
+    fields[11].tag_name = DirectXVersion;
+    fields[11].value = dxdiag_info->system_info.szDirectXVersionLongEnglish;
+    fields[12].tag_name = DXSetupParameters;
+    fields[12].value = dxdiag_info->system_info.szSetupParamEnglish;
+    fields[13].tag_name = DxDiagVersion;
+    fields[13].value = dxdiag_info->system_info.szDxDiagVersion;
+    fields[14].tag_name = DxDiagUnicode;
+    fields[14].value = oneW;
+    fields[15].tag_name = DxDiag64Bit;
+    fields[15].value = dxdiag_info->system_info.win64 ? oneW : zeroW;
+}
+
+static BOOL output_xml_information(struct dxdiag_information *dxdiag_info, const WCHAR *filename)
+{
+    struct information_block
     {
         const WCHAR *tag_name;
-            const WCHAR *value;
-        } fields[50];
+        struct xml_information_field fields[50];
     } output_table[] =
     {
-        {SystemInformation,
-            {
-                {Time, dxdiag_info->system_info.szTimeEnglish},
-                {MachineName, dxdiag_info->system_info.szMachineNameEnglish},
-                {OperatingSystem, dxdiag_info->system_info.szOSExLongEnglish},
-                {Language, dxdiag_info->system_info.szLanguagesEnglish},
-                {SystemManufacturer, dxdiag_info->system_info.szSystemManufacturerEnglish},
-                {SystemModel, dxdiag_info->system_info.szSystemManufacturerEnglish},
-                {BIOS, dxdiag_info->system_info.szSystemManufacturerEnglish},
-                {Processor, dxdiag_info->system_info.szProcessorEnglish},
-                {Memory, dxdiag_info->system_info.szPhysicalMemoryEnglish},
-                {PageFile, dxdiag_info->system_info.szPageFileEnglish},
-                {WindowsDir, dxdiag_info->system_info.szWindowsDir},
-                {DirectXVersion, dxdiag_info->system_info.szDirectXVersionLongEnglish},
-                {DXSetupParameters, dxdiag_info->system_info.szSetupParamEnglish},
-                {DxDiagVersion, dxdiag_info->system_info.szDxDiagVersion},
-                {DxDiagUnicode, oneW},
-                {DxDiag64Bit, dxdiag_info->system_info.win64 ? oneW : zeroW},
-                {NULL, NULL},
-            }
-        },
+        {SystemInformation},
     };
 
     IXMLDOMDocument *xmldoc = NULL;
@@ -260,6 +296,8 @@ static BOOL output_xml_information(struct dxdiag_information *dxdiag_info, const
     HRESULT hr;
     size_t i;
 
+    fill_system_xml_output_table(dxdiag_info, output_table[0].fields);
+
     hr = CoCreateInstance(&CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER,
                           &IID_IXMLDOMDocument, (void **)&xmldoc);
     if (FAILED(hr))
@@ -278,7 +316,7 @@ static BOOL output_xml_information(struct dxdiag_information *dxdiag_info, const
     for (i = 0; i < sizeof(output_table)/sizeof(output_table[0]); i++)
     {
         IXMLDOMElement *info_element = xml_create_element(xmldoc, output_table[i].tag_name);
-        const struct information_field *fields = output_table[i].fields;
+        const struct xml_information_field *fields = output_table[i].fields;
         unsigned int j = 0;
 
         if (!info_element)