dxdiagn: Add language properties to the DxDiag_SystemInfo container.

This commit is contained in:
Andrew Nguyen 2011-04-03 20:55:32 -05:00 committed by Alexandre Julliard
parent 8aaf3233db
commit f9c8e46517
52 changed files with 287 additions and 3 deletions

2
configure vendored
View File

@ -15046,7 +15046,7 @@ wine_fn_config_test dlls/dsound/tests dsound_test
wine_fn_config_dll dssenh enable_dssenh
wine_fn_config_dll dswave enable_dswave
wine_fn_config_dll dwmapi enable_dwmapi implib
wine_fn_config_dll dxdiagn enable_dxdiagn
wine_fn_config_dll dxdiagn enable_dxdiagn po
wine_fn_config_test dlls/dxdiagn/tests dxdiagn_test
wine_fn_config_lib dxerr8
wine_fn_config_lib dxerr9

View File

@ -2514,7 +2514,7 @@ WINE_CONFIG_TEST(dlls/dsound/tests)
WINE_CONFIG_DLL(dssenh)
WINE_CONFIG_DLL(dswave)
WINE_CONFIG_DLL(dwmapi,,[implib])
WINE_CONFIG_DLL(dxdiagn)
WINE_CONFIG_DLL(dxdiagn,,[po])
WINE_CONFIG_TEST(dlls/dxdiagn/tests)
WINE_CONFIG_LIB(dxerr8)
WINE_CONFIG_LIB(dxerr9)

View File

@ -6,7 +6,8 @@ C_SRCS = \
dxdiag_main.c \
provider.c
RC_SRCS = version.rc
RC_SRCS = dxdiagn.rc
PO_SRCS = dxdiagn.rc
IDL_H_SRCS = fil_data.idl

View File

@ -29,6 +29,7 @@
#include "wine/list.h"
#include "dxdiag.h"
#include "resource.h"
/* DXDiag Interfaces: */
typedef struct IDxDiagProviderImpl IDxDiagProviderImpl;

View File

@ -16,6 +16,15 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "resource.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE
{
IDS_REGIONAL_SETTING "Regional Setting"
}
#define WINE_FILEDESCRIPTION_STR "Wine DxDiag 8"
#define WINE_FILENAME_STR "dxdiagn.dll"
#define WINE_FILEVERSION 5,3,1,904

View File

@ -346,6 +346,40 @@ static inline HRESULT add_ull_as_bstr_property(IDxDiagContainerImpl_Container *n
return S_OK;
}
static HRESULT fill_language_information(IDxDiagContainerImpl_Container *node)
{
static const WCHAR regional_setting_engW[] = {'R','e','g','i','o','n','a','l',' ','S','e','t','t','i','n','g',0};
static const WCHAR languages_fmtW[] = {'%','s',' ','(','%','s',':',' ','%','s',')',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 szLanguagesEnglish[] = {'s','z','L','a','n','g','u','a','g','e','s','E','n','g','l','i','s','h',0};
WCHAR system_lang[80], regional_setting[100], user_lang[80], language_str[300];
HRESULT hr;
/* szLanguagesLocalized */
GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SNATIVELANGNAME, system_lang, sizeof(system_lang)/sizeof(WCHAR));
LoadStringW(dxdiagn_instance, IDS_REGIONAL_SETTING, regional_setting, sizeof(regional_setting)/sizeof(WCHAR));
GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SNATIVELANGNAME, user_lang, sizeof(user_lang)/sizeof(WCHAR));
snprintfW(language_str, sizeof(language_str)/sizeof(WCHAR), languages_fmtW, system_lang, regional_setting, user_lang);
hr = add_bstr_property(node, szLanguagesLocalized, language_str);
if (FAILED(hr))
return hr;
/* szLanguagesEnglish */
GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SENGLANGUAGE, system_lang, sizeof(system_lang)/sizeof(WCHAR));
GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SENGLANGUAGE, user_lang, sizeof(user_lang)/sizeof(WCHAR));
snprintfW(language_str, sizeof(language_str)/sizeof(WCHAR), languages_fmtW, system_lang, regional_setting_engW, user_lang);
hr = add_bstr_property(node, szLanguagesEnglish, language_str);
if (FAILED(hr))
return hr;
return S_OK;
}
static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node)
{
static const WCHAR dwDirectXVersionMajor[] = {'d','w','D','i','r','e','c','t','X','V','e','r','s','i','o','n','M','a','j','o','r',0};
@ -455,6 +489,10 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node)
if (FAILED(hr))
return hr;
hr = fill_language_information(node);
if (FAILED(hr))
return hr;
return S_OK;
}

23
dlls/dxdiagn/resource.h Normal file
View File

@ -0,0 +1,23 @@
/*
* Resource identifiers for dxdiagn
*
* Copyright 2011 Andrew Nguyen
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <windef.h>
#define IDS_REGIONAL_SETTING 1

View File

@ -1968,6 +1968,10 @@ msgstr ""
msgid "Default MidiOut Device"
msgstr ""
#: dxdiagn.rc:25
msgid "Regional Setting"
msgstr ""
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr ""

View File

@ -1977,6 +1977,11 @@ msgstr ""
msgid "Default MidiOut Device"
msgstr ""
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Default Settings"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr ""

View File

@ -1944,6 +1944,10 @@ msgstr ""
msgid "Default MidiOut Device"
msgstr ""
#: dxdiagn.rc:25
msgid "Regional Setting"
msgstr ""
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr ""

View File

@ -2022,6 +2022,11 @@ msgstr "Standardní zařízení WaveOut"
msgid "Default MidiOut Device"
msgstr "Standardní zařízení MidiOut"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Standardní nastavení"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Volby"

View File

@ -2027,6 +2027,11 @@ msgstr "Standard WaveOut Enhed"
msgid "Default MidiOut Device"
msgstr "Standard MidiOut Enhed"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Standard indstillinger"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
#, fuzzy
msgid "Options"

View File

@ -2024,6 +2024,11 @@ msgstr "Standard WaveOut - Gerät"
msgid "Default MidiOut Device"
msgstr "Standard MidiOut - Gerät"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Standardeinstellungen"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Einstellungen"

View File

@ -1967,6 +1967,10 @@ msgstr ""
msgid "Default MidiOut Device"
msgstr ""
#: dxdiagn.rc:25
msgid "Regional Setting"
msgstr ""
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Επιλογές"

View File

@ -1946,6 +1946,10 @@ msgstr "Default WaveOut Device"
msgid "Default MidiOut Device"
msgstr "Default MidiOut Device"
#: dxdiagn.rc:25
msgid "Regional Setting"
msgstr "Regional Setting"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Options"

View File

@ -2010,6 +2010,10 @@ msgstr "Default WaveOut Device"
msgid "Default MidiOut Device"
msgstr "Default MidiOut Device"
#: dxdiagn.rc:25
msgid "Regional Setting"
msgstr "Regional Setting"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Options"

View File

@ -1987,6 +1987,11 @@ msgstr ""
msgid "Default MidiOut Device"
msgstr ""
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Defaýltaj Agordoj"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr ""

View File

@ -2017,6 +2017,11 @@ msgstr "Dispositivo WaveOut por defecto"
msgid "Default MidiOut Device"
msgstr "Dispositivo MidiOut por defecto"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Configuración por defecto"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Opciones"

View File

@ -1968,6 +1968,10 @@ msgstr ""
msgid "Default MidiOut Device"
msgstr ""
#: dxdiagn.rc:25
msgid "Regional Setting"
msgstr ""
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr ""

View File

@ -1983,6 +1983,11 @@ msgstr ""
msgid "Default MidiOut Device"
msgstr ""
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Default Settings"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Valinnat"

View File

@ -2024,6 +2024,11 @@ msgstr "Périphérique WaveOut par défaut"
msgid "Default MidiOut Device"
msgstr "Périphérique MidiOut par défaut"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Paramètres par défaut"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Options"

View File

@ -1976,6 +1976,11 @@ msgstr "התקן ה־WaveOut כבררת מחדל"
msgid "Default MidiOut Device"
msgstr "התקן ה־MidiOut כבררת מחדל"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "תצורה - הגדרות בררת המחדל"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "אפשרויות"

View File

@ -1948,6 +1948,10 @@ msgstr ""
msgid "Default MidiOut Device"
msgstr ""
#: dxdiagn.rc:25
msgid "Regional Setting"
msgstr ""
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr ""

View File

@ -2039,6 +2039,11 @@ msgstr "Alapértelmezett WaveOut eszköz"
msgid "Default MidiOut Device"
msgstr "Alapértelmezett MidiOut eszköz"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Default Settings"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Opciók"

View File

@ -2114,6 +2114,11 @@ msgstr "Dispositivo WaveOut predefinito"
msgid "Default MidiOut Device"
msgstr "Dispositivo MidiOut predefinito"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Impostazioni predefinite"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Opzioni"

View File

@ -2004,6 +2004,11 @@ msgstr "デフォルト WaveOut デバイス"
msgid "Default MidiOut Device"
msgstr "デフォルト MidiOut デバイス"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "既定の設定"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "オプション"

View File

@ -2005,6 +2005,11 @@ msgstr "기본 웨이브 출력 장치"
msgid "Default MidiOut Device"
msgstr "기본 미디출력 장치"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "기본 설정"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "옵션"

View File

@ -2015,6 +2015,11 @@ msgstr "Numatytasis WaveOut įrenginys"
msgid "Default MidiOut Device"
msgstr "Numatytasis MidiOut įrenginys"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Numatytosios nuostatos"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Parinktys"

View File

@ -1948,6 +1948,10 @@ msgstr ""
msgid "Default MidiOut Device"
msgstr ""
#: dxdiagn.rc:25
msgid "Regional Setting"
msgstr ""
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr ""

View File

@ -2101,6 +2101,11 @@ msgstr "Standard enhet for lydavspilling"
msgid "Default MidiOut Device"
msgstr "Standard enhet for MIDI-avspilling"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Globale innstillinger"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
#, fuzzy
msgid "Options"

View File

@ -2018,6 +2018,11 @@ msgstr "Standaardapparaat WaveOut"
msgid "Default MidiOut Device"
msgstr "Standaardapparaat MidiOut"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Standaardinstellingen"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Instellingen"

View File

@ -1948,6 +1948,10 @@ msgstr ""
msgid "Default MidiOut Device"
msgstr ""
#: dxdiagn.rc:25
msgid "Regional Setting"
msgstr ""
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr ""

View File

@ -1948,6 +1948,10 @@ msgstr ""
msgid "Default MidiOut Device"
msgstr ""
#: dxdiagn.rc:25
msgid "Regional Setting"
msgstr ""
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr ""

View File

@ -2014,6 +2014,11 @@ msgstr "Standardowe urządzenie WaveOut"
msgid "Default MidiOut Device"
msgstr "Standardowe urządzenie Device"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Ustawienia standardowe"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Opcje"

View File

@ -2098,6 +2098,11 @@ msgstr "Dispositivo padrão WaveOut"
msgid "Default MidiOut Device"
msgstr "Dispositivo padrão MidiOut"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Configurações Padrão"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Opções"

View File

@ -2112,6 +2112,11 @@ msgstr "Dispositivo padrão WaveOut"
msgid "Default MidiOut Device"
msgstr "Dispositivo padrão MidiOut"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Definições Predefinidas"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Opções"

View File

@ -1960,6 +1960,11 @@ msgstr ""
msgid "Default MidiOut Device"
msgstr ""
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Default"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
#, fuzzy
msgid "Options"

View File

@ -2157,6 +2157,11 @@ msgstr "Dispozitiv WaveOut implicit"
msgid "Default MidiOut Device"
msgstr "Dispozitiv MidiOut implicit"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Setări implicite"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Opțiuni"

View File

@ -2007,6 +2007,11 @@ msgstr "Звуковое устройство вывода по умолчани
msgid "Default MidiOut Device"
msgstr "Устройство вывода MIDI по умолчанию"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Установки по умолчанию"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Настройки"

View File

@ -1968,6 +1968,11 @@ msgstr ""
msgid "Default MidiOut Device"
msgstr ""
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Default"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr ""

View File

@ -2019,6 +2019,11 @@ msgstr "Privzeta WaveOut naprava"
msgid "Default MidiOut Device"
msgstr "Privzeta MidiOut naprava"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Privzete (sistemske) nastavitve"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Možnosti"

View File

@ -1996,6 +1996,11 @@ msgstr "Подразумевани WaveOut уређај"
msgid "Default MidiOut Device"
msgstr "Подразумевани MidiOut уређај"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Поставке интернета"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Опције"

View File

@ -2020,6 +2020,11 @@ msgstr "Podrazumevani WaveOut uređaj"
msgid "Default MidiOut Device"
msgstr "Podrazumevani MidiOut uređaj"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Osnovno podešavanje"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Opcije"

View File

@ -2010,6 +2010,11 @@ msgstr "Förvald WaveOut-enhet"
msgid "Default MidiOut Device"
msgstr "Förvald MidiOut-enhet"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Standardinställningar"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Alternativ"

View File

@ -1948,6 +1948,10 @@ msgstr ""
msgid "Default MidiOut Device"
msgstr ""
#: dxdiagn.rc:25
msgid "Regional Setting"
msgstr ""
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr ""

View File

@ -1967,6 +1967,10 @@ msgstr ""
msgid "Default MidiOut Device"
msgstr ""
#: dxdiagn.rc:25
msgid "Regional Setting"
msgstr ""
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr ""

View File

@ -2007,6 +2007,11 @@ msgstr ""
msgid "Default MidiOut Device"
msgstr ""
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Öntanımlı Ayarlar"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Seçenekler"

View File

@ -2011,6 +2011,11 @@ msgstr "Звуковий пристрій виводу по замовчуван
msgid "Default MidiOut Device"
msgstr "Пристрій виводу Midi по замовчуванні"
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Стандартні налаштування"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "Параметри"

View File

@ -1974,6 +1974,11 @@ msgstr ""
msgid "Default MidiOut Device"
msgstr ""
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "Default"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr ""

View File

@ -1941,6 +1941,10 @@ msgstr ""
msgid "Default MidiOut Device"
msgstr ""
#: dxdiagn.rc:25
msgid "Regional Setting"
msgstr ""
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr ""

View File

@ -1987,6 +1987,11 @@ msgstr ""
msgid "Default MidiOut Device"
msgstr ""
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "默认设置"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "选项"

View File

@ -1998,6 +1998,11 @@ msgstr ""
msgid "Default MidiOut Device"
msgstr ""
#: dxdiagn.rc:25
#, fuzzy
msgid "Regional Setting"
msgstr "預設設定"
#: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155
msgid "Options"
msgstr "選項"