From: Andrew Eikum Subject: [PATCH 3/3] winecfg: Remove driver selection from Audio tab Message-Id: <20110831200447.GC30867@foghorn.codeweavers.com> Date: Wed, 31 Aug 2011 15:04:47 -0500 This should be done automatically now. If users need, a driver can be chosen explicitly via this registry entry: Key: HKCU\Software\Wine\Drivers Value: Audio="driver" --- programs/winecfg/Bg.rc | 20 +- programs/winecfg/Cs.rc | 20 +- programs/winecfg/Da.rc | 20 +- programs/winecfg/De.rc | 20 +- programs/winecfg/En.rc | 20 +- programs/winecfg/Es.rc | 20 +- programs/winecfg/Fi.rc | 20 +- programs/winecfg/Fr.rc | 20 +- programs/winecfg/Hu.rc | 20 +- programs/winecfg/It.rc | 20 +- programs/winecfg/Ja.rc | 20 +- programs/winecfg/Ko.rc | 20 +- programs/winecfg/Lt.rc | 20 +- programs/winecfg/Nl.rc | 20 +- programs/winecfg/No.rc | 20 +- programs/winecfg/Pl.rc | 20 +- programs/winecfg/Pt.rc | 40 +-- programs/winecfg/Ro.rc | 20 +- programs/winecfg/Ru.rc | 20 +- programs/winecfg/Si.rc | 20 +- programs/winecfg/Sr.rc | 20 +- programs/winecfg/Sv.rc | 20 +- programs/winecfg/Tr.rc | 20 +- programs/winecfg/Uk.rc | 20 +- programs/winecfg/Zh.rc | 40 +-- programs/winecfg/audio.c | 744 +++---------------------------------------- programs/winecfg/resource.h | 22 -- programs/winecfg/winecfg.c | 3 - programs/winecfg/winecfg.rc | 25 -- 29 files changed, 263 insertions(+), 1071 deletions(-) diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc index 9e12757..fd33fa3 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc @@ -158,18 +158,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " ????? ?? ??????? ",IDC_STATIC,8,4,244,160 - LTEXT "???????? ?????? ??????? ???? ??????? ??????? ?? ??????? ?? ??? ???????. ???? ?? ????????? ????? ???? ?? ???????? ??????? ???????. ?????????? ?? ?????? ?? ???? ??????? ?? ? ??????????????. ???? ?? ????????? ???????? ???? ???????? ????? ???? ? ?????? ????? ?? ???????.",IDC_STATIC,15,20,227,50 - CONTROL "??????????",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,70,140,85 - PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,170,70,59,14 - PUSHBUTTON "????????? ?????",IDC_AUDIO_CONTROL_PANEL,170,90,69,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "????????? ?????????: ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Default &Sample Rate:",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Default &Bits Per Sample:",IDC_STATIC,137,197,80,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,45 + LTEXT "????????? ?????????: ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Default &Sample Rate:",IDC_STATIC,15,31,70,8 + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Default &Bits Per Sample:",IDC_STATIC,137,31,80,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,8,51,59,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc index 71fc00f..497a395 100644 --- a/programs/winecfg/Cs.rc +++ b/programs/winecfg/Cs.rc @@ -158,18 +158,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Ovlada? zvukov? karty ",IDC_STATIC,8,4,244,160 - LTEXT "Vyberte ovlada? zvukov? karty za?krtnut?m pol??ka u p??slu?n?ho ovlada?e. Kdy? neza?krtnete ani jeden ovlada?, zvuk se vypne. Vybrat v?ce jak jeden ovlada? se nedoporu?uje. Detailn? vlastnosti ovlada?e m??ete upravit prav?m kliknut?m na zvolen? ovlada?.",IDC_STATIC,15,20,227,50 - CONTROL "Za??zen?",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,65,140,92 - PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,170,65,59,14 - PUSHBUTTON "Ovl?dac? panel",IDC_AUDIO_CONTROL_PANEL,170,85,59,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "Hardwarov? akcelerace: ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Vzorkovac? frekvence:",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Po?et bit? na vzorek:",IDC_STATIC,137,197,80,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,45 + LTEXT "Hardwarov? akcelerace: ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Vzorkovac? frekvence:",IDC_STATIC,15,31,70,8 + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Po?et bit? na vzorek:",IDC_STATIC,137,31,80,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,8,51,59,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc index ea92598..3b76dbc 100644 --- a/programs/winecfg/Da.rc +++ b/programs/winecfg/Da.rc @@ -165,18 +165,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Driver valg ",IDC_STATIC,8,4,244,160 - LTEXT "V??lg en lyd driver ved at afkrydse den ??nskede driver. Sl?? lyden fra ved at frav??lge alle drivere. Valg af flere drivere er ikke anbefalet. Konfigur??r driver ved at h??jre klikke p?? den.",IDC_STATIC,15,20,227,30 - CONTROL "Enheder",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,105 - PUSHBUTTON "&Test lyd",IDC_AUDIO_TEST,170,50,59,14 - PUSHBUTTON "&Kontrol panel",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "&Hardware Accelerering: ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Std. sample &frekvens:",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Std. &bits pr. sample:",IDC_STATIC,137,197,80,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,45 + LTEXT "&Hardware Accelerering: ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Std. sample &frekvens:",IDC_STATIC,15,31,70,8 + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Std. &bits pr. sample:",IDC_STATIC,137,31,80,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Test lyd",IDC_AUDIO_TEST,8,51,59,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index a1bdbd0..4b16314 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -164,18 +164,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Treiberauswahl ",IDC_STATIC,8,4,244,160 - LTEXT "W??hlen Sie einen Sound-Treiber durch ankreuzen des gew??nschten Treibers. Ist kein Treiber ausgew??hlt, wird der Sound deaktiviert. Die Auswahl mehrerer Treiber ist nicht empfohlen. Ein Treiber kann durch Rechtsklicken konfiguriert werden.",IDC_STATIC,15,15,227,35 - CONTROL "Ger??te",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,105 - PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,170,50,59,14 - PUSHBUTTON "&Einstellungen",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "&Hardware-Beschleunigung: ", IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,105,178,140,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Abtastrate:",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Bits pro Abtastung:",IDC_STATIC,137,197,80,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,45 + LTEXT "&Hardware-Beschleunigung: ", IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,105,12,140,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Abtastrate:",IDC_STATIC,15,31,70,8 + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Bits pro Abtastung:",IDC_STATIC,137,31,80,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,8,51,59,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index f3ad6c3..1eed4e6 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -164,18 +164,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Driver Selection ",IDC_STATIC,8,4,244,160 - LTEXT "Select a sound driver by checking the box of the desired driver. Disable sound by not selecting any driver. Selection of multiple drivers is not recommended. Configure a driver by right-clicking on it.",IDC_STATIC,15,20,227,30 - CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,155,105 - PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,180,50,59,14 - PUSHBUTTON "&Control Panel",IDC_AUDIO_CONTROL_PANEL,180,70,59,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,44 - LTEXT "&Hardware Acceleration: ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Default &Sample Rate:",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Default &Bits Per Sample:",IDC_STATIC,137,197,80,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,44 + LTEXT "&Hardware Acceleration: ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Default &Sample Rate:",IDC_STATIC,15,31,70,8 + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Default &Bits Per Sample:",IDC_STATIC,137,31,80,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,8,50,59,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc index 2b70ce8..018a7b0 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -163,18 +163,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Selecci?n de controlador ",IDC_STATIC,8,4,244,160 - LTEXT "Seleccione un controlador de sonido marcando la casilla del deseado. Para deshabilitar el sonido no seleccione ninguno. No se recomienda la selecci?n de m?s de un controlador. Para configurar un controlador haga doble clic sobre ?l.",IDC_STATIC,15,15,227,35 - CONTROL "Dispositivos",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,105 - PUSHBUTTON "Probar &sonido",IDC_AUDIO_TEST,170,50,59,14 - PUSHBUTTON "&Panel de control",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "Aceleraci?n &Hardware: ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Frecuencia muestreo:",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Bits por muestra:",IDC_STATIC,137,197,80,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,45 + LTEXT "Aceleraci?n &Hardware: ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Frecuencia muestreo:",IDC_STATIC,15,31,70,8 + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Bits por muestra:",IDC_STATIC,137,31,80,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Probar &sonido",IDC_AUDIO_TEST,8,51,59,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc index 3cf2661..6bda2b3 100644 --- a/programs/winecfg/Fi.rc +++ b/programs/winecfg/Fi.rc @@ -153,18 +153,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Ajurin valinta ",IDC_STATIC,8,4,244,160 - LTEXT "??niajuri: ",IDC_STATIC,15,20,227,30 - CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,105 - PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,170,50,59,14 - PUSHBUTTON "&Hallintapaneeli",IDC_AUDIO_CONTROL_PANEL,170,70,79,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,168,244,47 - LTEXT "Laitteistopohjainen kiihdytys:",IDC_STATIC,15,178,90,16 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Oletusn?ytetaajuus:",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,86,195,36,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "N?ytteiden oletusbittim??r?:",IDC_STATIC,126,197,94,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,47 + LTEXT "Laitteistopohjainen kiihdytys:",IDC_STATIC,15,14,90,16 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,14,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Oletusn?ytetaajuus:",IDC_STATIC,15,33,70,8 + COMBOBOX IDC_DSOUND_RATES,86,31,36,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "N?ytteiden oletusbittim??r?:",IDC_STATIC,126,33,94,8 + COMBOBOX IDC_DSOUND_BITS,220,31,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,8,53,59,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index d73f782..d1c32a1 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -166,18 +166,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " S??lection du pilote ",IDC_STATIC,8,4,244,160 - LTEXT "S??lectionnez un pilote audio en cochant la case en regard du pilote d??sir??. D??sactivez le son en ne s??lectionnant aucun pilote. La s??lection de pilotes multiples n'est pas recommand??e. Configurez le pilote en effectuant un clic droit dessus.",IDC_STATIC,15,20,227,35 - CONTROL "Mat??riel",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,55,140,105 - PUSHBUTTON "&Tester le son",IDC_AUDIO_TEST,159,56,89,14 - PUSHBUTTON "Panneau de &configuration",IDC_AUDIO_CONTROL_PANEL,159,76,89,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "Acc??l??ration mat??rielle : ",IDC_STATIC,15,180,80,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,148,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "??chantillonage (d??faut) :",IDC_STATIC,15,195,80,8 - COMBOBOX IDC_DSOUND_RATES,100,193,38,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Bits par ??chantillon :",IDC_STATIC,153,195,80,8 - COMBOBOX IDC_DSOUND_BITS,223,193,25,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,45 + LTEXT "Acc??l??ration mat??rielle : ",IDC_STATIC,15,14,80,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,148,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "??chantillonage (d??faut) :",IDC_STATIC,15,29,80,8 + COMBOBOX IDC_DSOUND_RATES,100,27,38,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Bits par ??chantillon :",IDC_STATIC,153,29,80,8 + COMBOBOX IDC_DSOUND_BITS,223,27,25,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Tester le son",IDC_AUDIO_TEST,8,51,89,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc index e02474d..4456c5d 100644 --- a/programs/winecfg/Hu.rc +++ b/programs/winecfg/Hu.rc @@ -152,18 +152,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Meghajt?program v?laszt?s ",IDC_STATIC,8,4,244,160 - LTEXT "V?lasszon egy hangmeghajt?t a kiv?lasztott meghajt?program el?tti n?gyzet bejl?l?s?vel. A hang letilthat?, ha nem jel?l be egy meghajt?t sem. T?bb meghajt?program bejel?l?se nem aj?nlott. Az ?sszes meghajt? be?ll?that?, ha r?juk kattint jobb eg?rgombbal.",IDC_STATIC,15,15,227,35 - CONTROL "Eszk?z?k",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,105 - PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,170,50,59,14 - PUSHBUTTON "Vez?rl?pult",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "Hardveres gyors?t?s: ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Default &Sample Rate:",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Default &Bits Per Sample:",IDC_STATIC,137,197,80,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,45 + LTEXT "Hardveres gyors?t?s: ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Default &Sample Rate:",IDC_STATIC,15,31,70,8 + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Default &Bits Per Sample:",IDC_STATIC,137,31,80,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,8,51,59,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index 02da49b..28741c8 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc @@ -166,18 +166,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Selezione del driver ",IDC_STATIC,8,4,244,160 - LTEXT "Seleziona un driver audio spuntando la casella del driver desiderato. Per disabilitare l'audio, non selezionare alcun driver. La selezione di molteplici drivers non ?? raccomandata. Configura un driver cliccando con il tasto destro su di esso.",IDC_STATIC,15,15,227,32 - CONTROL "Dispositivi",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,155,105 - PUSHBUTTON "&Test dell'audio",IDC_AUDIO_TEST,175,50,69,14 - PUSHBUTTON "Pannello di &controllo",IDC_AUDIO_CONTROL_PANEL,175,70,69,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "Accelerazione &hardware: ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Sample Rate normale:",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Bit Per Sample normale:",IDC_STATIC,137,197,80,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,45 + LTEXT "Accelerazione &hardware: ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Sample Rate normale:",IDC_STATIC,15,31,70,8 + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Bit Per Sample normale:",IDC_STATIC,137,31,80,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Test dell'audio",IDC_AUDIO_TEST,8,51,69,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index 3b85efc..40f8349 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -167,18 +167,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX " ????????????????????? ",IDC_STATIC,8,4,244,160 - LTEXT "???????????????????????????: ",IDC_STATIC,15,20,227,30 - CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,105 - PUSHBUTTON "???????????????(&T)",IDC_AUDIO_TEST,170,50,59,14 - PUSHBUTTON "?????????????????? ?????????(&C)",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "?????????????????? ???????????????????????????(&H): ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "??????????????????????????????(&S):",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "??????????????????????????????(&B):",IDC_STATIC,137,197,80,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,45 + LTEXT "?????????????????? ???????????????????????????(&H): ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "??????????????????????????????(&S):",IDC_STATIC,15,31,70,8 + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "??????????????????????????????(&B):",IDC_STATIC,137,31,80,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "???????????????(&T)",IDC_AUDIO_TEST,8,51,59,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 6451bb5..244eb5f 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -168,18 +168,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX " ???????????? ?????? ",IDC_STATIC,8,4,244,160 - LTEXT "????????? ??????????????? ????????? ???????????? ????????? ??????????????? ???????????????. ?????? ??????????????? ???????????? ????????? ???????????? ???????????????. ?????? ??????????????? ???????????? ?????? ???????????? ????????????. ???????????? ????????? ????????? ????????? ?????? ???????????? ??????????????? ???????????????.",IDC_STATIC,16,17,227,33 - CONTROL "??????",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,155,105 - PUSHBUTTON "?????? ?????????(&T)",IDC_AUDIO_TEST,180,50,59,14 - PUSHBUTTON "?????????(&C)",IDC_AUDIO_CONTROL_PANEL,180,70,59,14 - GROUPBOX " ???????????? ????????? ",IDC_STATIC,8,170,244,44 - LTEXT "???????????? ??????(&H): ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "?????? ?????? ??????(&S):",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "?????? ??????/??????(&B):",IDC_STATIC,197,247,80,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " ???????????? ????????? ",IDC_STATIC,8,4,244,44 + LTEXT "???????????? ??????(&H): ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "?????? ?????? ??????(&S):",IDC_STATIC,15,31,70,8 + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "?????? ??????/??????(&B):",IDC_STATIC,197,31,80,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "?????? ?????????(&T)",IDC_AUDIO_TEST,8,50,59,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc index e705120..a4bf55d 100644 --- a/programs/winecfg/Lt.rc +++ b/programs/winecfg/Lt.rc @@ -165,18 +165,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Tvarkykli?? parinkimas ",IDC_STATIC,8,4,244,144 - LTEXT "Pasirinkite garso tvarkykl?? pa??ym??dami norimos tvarkykl??s langel??. Gars?? i??jungti galima nepa??ymint n?? vienos tvarkykl??s. Keli?? tvarkykli?? pasirinkimas yra nerekomenduojamas. Tvarkykl?? konfig??ruoti galima spustel??jus de??iniuoju pel??s klavi??u.",IDC_STATIC,15,15,227,35 - CONTROL "??renginiai",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,89 - PUSHBUTTON "&Testuoti gars??",IDC_AUDIO_TEST,170,50,63,14 - PUSHBUTTON "Valdymo &skydelis",IDC_AUDIO_CONTROL_PANEL,170,70,63,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,154,244,60 - LTEXT "&Aparatinis spartinimas: ",IDC_STATIC,15,165,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,163,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Numatytasis garso elemento &da??nis:",IDC_STATIC,15,180,140,8 - COMBOBOX IDC_DSOUND_RATES,160,178,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Numatytasis garso elemento &bit?? skai??ius:",IDC_STATIC,15,195,140,8 - COMBOBOX IDC_DSOUND_BITS,160,193,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,60 + LTEXT "&Aparatinis spartinimas: ",IDC_STATIC,15,15,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,13,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Numatytasis garso elemento &da??nis:",IDC_STATIC,15,30,140,8 + COMBOBOX IDC_DSOUND_RATES,160,28,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Numatytasis garso elemento &bit?? skai??ius:",IDC_STATIC,15,45,140,8 + COMBOBOX IDC_DSOUND_BITS,160,43,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Testuoti gars??",IDC_AUDIO_TEST,8,66,63,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index 625ee53..6ca3d0a 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -166,18 +166,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Stuurprogrammaselectie ",IDC_STATIC,8,4,244,160 - LTEXT "Selecteer een geluidsstuurprogramma door het gewenste stuurprogramma aan te vinken. Zet het geluid uit door geen stuurprogramma te selecteren. Het selecteren van meerdere stuurprogramma's wordt niet aanbevolen. Rechtsklik op een stuurprogramma om het te configureren.",IDC_STATIC,15,20,227,45 - CONTROL "Apparaten",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,65,140,90 - PUSHBUTTON "Geluidstest",IDC_AUDIO_TEST,165,65,79,14 - PUSHBUTTON "Configuratiescherm",IDC_AUDIO_CONTROL_PANEL,165,85,79,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "Hardwareversnelling: ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Samplefrequentie:",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Bits per sample:",IDC_STATIC,157,197,60,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,45 + LTEXT "Hardwareversnelling: ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Samplefrequentie:",IDC_STATIC,15,31,70,8 + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Bits per sample:",IDC_STATIC,157,31,60,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Geluidstest",IDC_AUDIO_TEST,8,51,79,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index 73ceb6d..0afca00 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -165,18 +165,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Valg av driver ",IDC_STATIC,8,4,244,160 - LTEXT "Velg en lyddriver ved ?? krysse av i boksen ved siden av den du vil bruke. Deaktiver lyd ved ?? ikke velge noen. Det anbefales ikke ?? velge flere drivere. Driverens oppsett kan endres ved ?? h??yreklikke p?? den.",IDC_STATIC,15,20,227,30 - CONTROL "Enheter",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,105 - PUSHBUTTON "&Test",IDC_AUDIO_TEST,170,50,59,14 - PUSHBUTTON "Kontrollpanel",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "Maskinvareakselerasjon: ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Std. samplingsrate:",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Std. biter per pr??ve:",IDC_STATIC,137,197,80,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,45 + LTEXT "Maskinvareakselerasjon: ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Std. samplingsrate:",IDC_STATIC,15,31,70,8 + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Std. biter per pr??ve:",IDC_STATIC,137,31,80,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Test",IDC_AUDIO_TEST,8,51,59,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc index 200e807..5140643 100644 --- a/programs/winecfg/Pl.rc +++ b/programs/winecfg/Pl.rc @@ -166,18 +166,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Wyb?r sterownika ",IDC_STATIC,8,4,244,160 - LTEXT "Wybierz sterownik przez wstawienie krzy?yka. Je?eli chcesz wy??czy? d?wi?k, zostaw wszystkie pola puste. Wyb?r wielu sterownik?w na raz nie jest zalecany. Aby skonfigurowa? sterownik kliknij prawym przyciskiem myszy na nim.",IDC_STATIC,15,20,227,40 - CONTROL "Urz?dzenia",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,58,140,97 - PUSHBUTTON "Test d?wi?ku",IDC_AUDIO_TEST,165,58,69,14 - PUSHBUTTON "Panel sterowania",IDC_AUDIO_CONTROL_PANEL,165,78,69,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "Przy?pieszenie sprz?towe: ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Domy?lna cz?sto?? pr?bkowania:",IDC_STATIC,15,195,105,8 - COMBOBOX IDC_DSOUND_RATES,121,193,38,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Bit?w na pr?bk?:",IDC_STATIC,165,195,55,8 - COMBOBOX IDC_DSOUND_BITS,223,193,27,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,45 + LTEXT "Przy?pieszenie sprz?towe: ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Domy?lna cz?sto?? pr?bkowania:",IDC_STATIC,15,29,105,8 + COMBOBOX IDC_DSOUND_RATES,121,27,38,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Bit?w na pr?bk?:",IDC_STATIC,165,29,55,8 + COMBOBOX IDC_DSOUND_BITS,223,27,27,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Test d?wi?ku",IDC_AUDIO_TEST,8,51,69,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc index cdff87b..034416c 100644 --- a/programs/winecfg/Pt.rc +++ b/programs/winecfg/Pt.rc @@ -333,18 +333,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Sele????o de Driver ",IDC_STATIC,8,4,244,160 - LTEXT "Selecione um driver de som selecionando a caixa do driver desejado. N??o marque nenhuma op????o para desabilitar o som. N??o ?? recomendado selecionar mais de um driver. Configure um driver clicando com o bot??o direito sobre ele.:",IDC_STATIC,15,18,227,35 - CONTROL "Dispositivos",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,55,140,105 - PUSHBUTTON "&Testar Som",IDC_AUDIO_TEST,170,55,65,14 - PUSHBUTTON "Painel de &Controle",IDC_AUDIO_CONTROL_PANEL,170,75,65,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "Acelera????o via &Hardware: ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,110,178,140,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Taxa de Amo&stra:",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Bits por Amostra:",IDC_STATIC,137,197,80,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,45 + LTEXT "Acelera????o via &Hardware: ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,110,12,140,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Taxa de Amo&stra:",IDC_STATIC,15,31,70,8 + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Bits por Amostra:",IDC_STATIC,137,31,80,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Testar Som",IDC_AUDIO_TEST,8,51,65,14 END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE @@ -353,18 +349,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Selec????o do Controlador ",IDC_STATIC,8,4,244,160 - LTEXT "Seleccione um controlador de som marcando o desejado. Desactive o som n??o seleccionado qualquer controlador. N??o ?? recomendada a selec????o de v??rios controladores . Configure um controlador seleccionado-o com o clique direito.",IDC_STATIC,15,18,227,35 - CONTROL "Dispositivos",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,55,140,105 - PUSHBUTTON "&Testar Som",IDC_AUDIO_TEST,170,55,65,14 - PUSHBUTTON "Painel de &Controlo",IDC_AUDIO_CONTROL_PANEL,170,75,65,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "Acelera????o do &Material: ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Taxa de Amo&stra Predefinida:",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Bits Predefinidos por Amostra:",IDC_STATIC,137,197,80,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,45 + LTEXT "Acelera????o do &Material: ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Taxa de Amo&stra Predefinida:",IDC_STATIC,15,31,70,8 + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Bits Predefinidos por Amostra:",IDC_STATIC,137,31,80,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Testar Som",IDC_AUDIO_TEST,8,51,65,14 END diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc index e3ea02b..daac136 100644 --- a/programs/winecfg/Ro.rc +++ b/programs/winecfg/Ro.rc @@ -164,18 +164,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Selectare driver ",IDC_STATIC,8,4,244,160 - LTEXT "Alege??i un driver de sunet prin bifarea c??su??ei corespunz??toare. Sunetul este dezactivat dac?? nu alege??i un driver. Selec??ionarea mai multor drivere nu este recomandat??. Configura??i un driver cu un clic dreapta pe el.",IDC_STATIC,15,20,227,30 - CONTROL "Dispozitive",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,105 - PUSHBUTTON "&Testeaz?? sunetul",IDC_AUDIO_TEST,170,50,59,14 - PUSHBUTTON "Panou de &control",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "Accelera??ie &hardware: ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "R&ata de e??antionare implicit??:",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Nr. implicit &bi??i/e??antion:",IDC_STATIC,137,197,80,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,45 + LTEXT "Accelera??ie &hardware: ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "R&ata de e??antionare implicit??:",IDC_STATIC,15,31,70,8 + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Nr. implicit &bi??i/e??antion:",IDC_STATIC,137,31,80,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Testeaz?? sunetul",IDC_AUDIO_TEST,8,51,59,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index 89ae32d..9a4ed89 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -169,18 +169,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " ?????????? ???????????????? ",IDC_STATIC,8,4,244,160 - LTEXT "???????????????? ??????????????: ",IDC_STATIC,15,20,227,30 - CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,105 - PUSHBUTTON "&?????????????????? ????????",IDC_AUDIO_TEST,170,50,59,14 - PUSHBUTTON "???????????? ????????????????????",IDC_AUDIO_CONTROL_PANEL,170,70,80,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "???????????????????? ??????????????????: ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "?????????????? (????????):",IDC_STATIC,15,195,70,8 - COMBOBOX IDC_DSOUND_RATES,100,193,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "?????????????????????? (??????):",IDC_STATIC,144,195,80,8 - COMBOBOX IDC_DSOUND_BITS,216,193,30,52,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,45 + LTEXT "???????????????????? ??????????????????: ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "?????????????? (????????):",IDC_STATIC,15,29,70,8 + COMBOBOX IDC_DSOUND_RATES,100,27,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "?????????????????????? (??????):",IDC_STATIC,144,29,80,8 + COMBOBOX IDC_DSOUND_BITS,216,27,30,52,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&?????????????????? ????????",IDC_AUDIO_TEST,8,51,59,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc index c5604c4..409ed64 100644 --- a/programs/winecfg/Si.rc +++ b/programs/winecfg/Si.rc @@ -164,18 +164,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Izbira gonilnika ",IDC_STATIC,8,4,244,160 - LTEXT "Omogo??ite ??eleni zvo??ni gonilnik tako, da ga obkljukate. Zvo??ni gonilniki, ki niso izbrani, bodo onemogo??eni. Izbira ve?? zvo??nih gonilnikov ni priporo??ljiva. ??e ??elite urediti nastavitve zvo??nega gonilnika, kliknite nanj z desnim gumbom.",IDC_STATIC,15,20,227,40 - CONTROL "Naprave",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,60,140,95 - PUSHBUTTON "&Preizkusi zvok",IDC_AUDIO_TEST,170,60,59,14 - PUSHBUTTON "&Nadzorna plo????a",IDC_AUDIO_CONTROL_PANEL,170,80,59,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "&Strojno pospe??evanje: ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Frekvenca vzor??enja:",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "??tevilo &bitov na vzorec:",IDC_STATIC,137,197,80,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,45 + LTEXT "&Strojno pospe??evanje: ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Frekvenca vzor??enja:",IDC_STATIC,15,31,70,8 + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "??tevilo &bitov na vzorec:",IDC_STATIC,31,197,80,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Preizkusi zvok",IDC_AUDIO_TEST,8,51,59,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/Sr.rc b/programs/winecfg/Sr.rc index 98cd62e..9d8991d 100644 --- a/programs/winecfg/Sr.rc +++ b/programs/winecfg/Sr.rc @@ -165,18 +165,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Odabir drivera ",IDC_STATIC,8,4,244,160 - LTEXT "Izaberi drajver za zvuk ??ekiranjem kockice ??eljenog drivera. Isklju??i zvuk tako ??to ne izabere?? nijedan drajver. Odavir vi??e drivera se ne preporu??uje. Podesi driver sa desnim klikom na njega.",IDC_STATIC,15,20,227,30 - CONTROL "Naprave",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,155,105 - PUSHBUTTON "&Probaj zvuk",IDC_AUDIO_TEST,180,50,59,14 - PUSHBUTTON "&Kontorlni prozor",IDC_AUDIO_CONTROL_PANEL,180,70,59,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,44 - LTEXT "&Ubrzanje hardvera: ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Osnovni &zvuk:",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Iskljuci &Bitove po zvuku:",IDC_STATIC,137,197,80,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,44 + LTEXT "&Ubrzanje hardvera: ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Osnovni &zvuk:",IDC_STATIC,15,31,70,8 + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Iskljuci &Bitove po zvuku:",IDC_STATIC,137,31,80,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Probaj zvuk",IDC_AUDIO_TEST,8,50,59,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc index cffc415..ac9130c 100644 --- a/programs/winecfg/Sv.rc +++ b/programs/winecfg/Sv.rc @@ -162,18 +162,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Enhetsval ",IDC_STATIC,8,4,244,160 - LTEXT "V?lj en ljuddrivrutin genom att kryssa i rutan f?r den ?nskade drivrutinen. Inaktivera ljud genom att inte v?lja n?gon drivrutin. Val av flera drivrutiner rekommenderas inte. Konfigurera en drivrutin genom att h?gerklicka p? den.",IDC_STATIC,15,20,227,30 - CONTROL "Enheter",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,105 - PUSHBUTTON "&Testa ljud",IDC_AUDIO_TEST,170,50,59,14 - PUSHBUTTON "&Kontrollpanel",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "&H?rdvaruaccelerering: ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Samplingsfrekvens som standard:",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Bitar per sampling som standard:",IDC_STATIC,137,197,80,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,45 + LTEXT "&H?rdvaruaccelerering: ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Samplingsfrekvens som standard:",IDC_STATIC,15,31,70,8 + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Bitar per sampling som standard:",IDC_STATIC,137,31,80,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Testa ljud",IDC_AUDIO_TEST,8,51,59,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc index 13fcfb7..2843ba7 100644 --- a/programs/winecfg/Tr.rc +++ b/programs/winecfg/Tr.rc @@ -152,18 +152,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " S?r?c? Se?imi ",IDC_STATIC,8,4,244,160 - LTEXT "?stedi?iniz s?r?c?n?n kutusunu i?aretleyerek bir ses s?r?c?s? se?in. Hi?bir s?r?c? se?meyerek sesi etkisizle?tirebilirsiniz. Birden fazla s?r?c? se?imi ?nerilmez. ?zerine sa? t?klayarak bir s?r?c?y? yap?land?r?n.",IDC_STATIC,15,20,227,30 - CONTROL "Ayg?tlar",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,105 - PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,170,50,59,14 - PUSHBUTTON "Denetim Masas?",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "Donan?m H?zland?rmas?: ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "?ntan?ml? ?rnekleme H?z?:",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "?rnek Ba??na Bit Say?s?:",IDC_STATIC,137,197,80,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,45 + LTEXT "Donan?m H?zland?rmas?: ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "?ntan?ml? ?rnekleme H?z?:",IDC_STATIC,15,31,70,8 + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "?rnek Ba??na Bit Say?s?:",IDC_STATIC,137,31,80,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,8,51,59,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/Uk.rc b/programs/winecfg/Uk.rc index c139412..f2712d2 100644 --- a/programs/winecfg/Uk.rc +++ b/programs/winecfg/Uk.rc @@ -168,18 +168,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " ?????????? ???????????????? ",IDC_STATIC,8,4,244,160 - LTEXT "???????????????? ?????????????????? ???????????????? ??????????????. ???????????????? ???????? ???? ???????????????????? ?????????????? ????????????????. ?????????? ?????????????????? ?????????????????? ???? ????????????????????????????. ???????????????????? ?????????????? ???????????? ???????????? ????????.",IDC_STATIC,15,20,227,30 - CONTROL "????????????????",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,155,105 - PUSHBUTTON "&???????? ??????????",IDC_AUDIO_TEST,177,50,65,14 - PUSHBUTTON "&???????????? ??????????????????",IDC_AUDIO_CONTROL_PANEL,177,70,65,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,44 - LTEXT "&???????????????? ??????????????????????: ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&?????????????? (????????):",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&?????????????????? (??????):",IDC_STATIC,137,197,80,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,44 + LTEXT "&???????????????? ??????????????????????: ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&?????????????? (????????):",IDC_STATIC,15,31,70,8 + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&?????????????????? (??????):",IDC_STATIC,137,31,80,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&???????? ??????????",IDC_AUDIO_TEST,8,50,65,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc index 6c71fb8..3067bd7 100644 --- a/programs/winecfg/Zh.rc +++ b/programs/winecfg/Zh.rc @@ -167,18 +167,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX " ?????????????????? ",IDC_STATIC,8,4,244,160 - LTEXT "?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????",IDC_STATIC,15,20,227,30 - CONTROL "??????",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,105 - PUSHBUTTON "????????????(&T)",IDC_AUDIO_TEST,170,50,59,14 - PUSHBUTTON "????????????(&C)",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "????????????(&H)???",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "??????????????????(&S)???",IDC_STATIC,15,197,70,8 /* ????????????????????? */ - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "?????????????????????(&B)???",IDC_STATIC,137,197,80,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,45 + LTEXT "????????????(&H)???",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "??????????????????(&S)???",IDC_STATIC,15,31,70,8 /* ????????????????????? */ + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "?????????????????????(&B)???",IDC_STATIC,137,31,80,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "????????????(&T)",IDC_AUDIO_TEST,8,51,59,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 @@ -338,18 +334,14 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX " ?????????????????? ",IDC_STATIC,8,4,244,160 - LTEXT "?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????",IDC_STATIC,15,20,227,30 - CONTROL "??????",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,105 - PUSHBUTTON "????????????(&T)",IDC_AUDIO_TEST,170,50,59,14 - PUSHBUTTON "?????????(&C)",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "????????????(&H)??? ",IDC_STATIC,15,180,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,178,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "??????????????????(&S)???",IDC_STATIC,15,197,70,8 - COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "?????????????????????&B)???",IDC_STATIC,137,197,80,8 - COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " DirectSound ",IDC_STATIC,8,4,244,45 + LTEXT "????????????(&H)??? ",IDC_STATIC,15,14,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "??????????????????(&S)???",IDC_STATIC,15,31,70,8 + COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "?????????????????????&B)???",IDC_STATIC,137,31,80,8 + COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "????????????(&T)",IDC_AUDIO_TEST,8,51,59,14 END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index eacfa6f..f8b84d4 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -31,6 +31,7 @@ #include #include +#define COBJMACROS #include #include #include @@ -42,17 +43,18 @@ #include #include +#include "ole2.h" +#include "initguid.h" +#include "devpkey.h" +#include "mmdeviceapi.h" +#include "audioclient.h" +#include "audiopolicy.h" + #include "winecfg.h" #include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(winecfg); -#define DRIVER_MASK 0x80000000 -#define DEVICE_MASK 0x40000000 -#define MAX_NAME_LENGTH 64 - -typedef DWORD (WINAPI * MessagePtr)(UINT, UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR); - static struct DSOUNDACCEL { UINT displayID; @@ -82,551 +84,6 @@ static const char* DSound_Bits[] = { NULL }; -typedef struct -{ - UINT nameID; - const char *szDriver; - HDRVR hDriver; -} AUDIO_DRIVER; - -static AUDIO_DRIVER sAudioDrivers[] = { - {IDS_DRIVER_ALSA, "alsa"}, - {IDS_DRIVER_OSS, "oss"}, - {IDS_DRIVER_COREAUDIO, "coreaudio"}, - {0, ""} -}; - -/* list of available drivers */ -static AUDIO_DRIVER * loadedAudioDrv; - -/* local copy of registry setting */ -static char curAudioDriver[1024]; - -/* driver index to configure */ -static int toConfigure; - -/* display a driver specific configuration dialog */ -static void configureAudioDriver(HWND hDlg) -{ - const AUDIO_DRIVER *pAudioDrv = &loadedAudioDrv[toConfigure]; - - if (strlen(pAudioDrv->szDriver) != 0) - { - HDRVR hdrvr; - char wine_driver[MAX_NAME_LENGTH + 9]; - sprintf(wine_driver, "wine%s.drv", pAudioDrv->szDriver); - hdrvr = pAudioDrv->hDriver; - if (hdrvr != 0) - { - if (SendDriverMessage(hdrvr, DRV_QUERYCONFIGURE, 0, 0) != 0) - { - DRVCONFIGINFO dci; - dci.dwDCISize = sizeof (dci); - dci.lpszDCISectionName = NULL; - dci.lpszDCIAliasName = NULL; - SendDriverMessage(hdrvr, DRV_CONFIGURE, 0, (LONG_PTR)&dci); - } - } - else - { - WCHAR wine_driverW[MAX_NAME_LENGTH+9]; - WCHAR messageStr[256]; - WCHAR str[1024]; - - MultiByteToWideChar (CP_ACP, 0, wine_driver, -1, wine_driverW, - sizeof (wine_driverW)/sizeof(wine_driverW[0])); - - LoadStringW (GetModuleHandle (NULL), IDS_OPEN_DRIVER_ERROR, messageStr, - sizeof(messageStr)/sizeof(messageStr[0])); - wsprintfW (str, messageStr, wine_driverW); - MessageBoxW (hDlg, str, NULL, MB_OK | MB_ICONERROR); - } - } -} - -/* is driver in local copy of driver registry string */ -static BOOL isDriverSet(const char * driver) -{ - WINE_TRACE("driver = %s, curAudioDriver = %s\n", driver, curAudioDriver); - - if (strstr(curAudioDriver, driver)) - return TRUE; - - return FALSE; -} - -/* add driver to local copy of driver registry string */ -static void addDriver(const char * driver) -{ - if (!isDriverSet(driver)) - { - if (strlen(curAudioDriver)) - strcat(curAudioDriver, ","); - strcat(curAudioDriver, driver); - } -} - -/* remove driver from local copy of driver registry string */ -static void removeDriver(const char * driver) -{ - char pattern[32], *p; - int drvlen, listlen; - - strcpy(pattern, ","); - strcat(pattern, driver); - strcat(pattern, ","); - drvlen = strlen(driver); - listlen = strlen(curAudioDriver); - - p = strstr(curAudioDriver, pattern); - if (p) /* somewhere in the middle */ - memmove(p, p+drvlen+1, strlen(p+drvlen+1)+1); - else if (!strncmp(curAudioDriver, pattern+1, drvlen+1)) /* the head */ - memmove(curAudioDriver, curAudioDriver+drvlen+1, listlen-drvlen); - else if (!strncmp(curAudioDriver+listlen-drvlen-1, pattern, drvlen+1)) /* the tail */ - curAudioDriver[listlen-drvlen-1] = 0; - else if (!strcmp(curAudioDriver, driver)) /* only one entry (head&tail) */ - curAudioDriver[0] = 0; - else - WINE_FIXME("driver '%s' is not in the list, please report!\n", driver); -} - -static void initAudioDeviceTree(HWND hDlg) -{ - AUDIO_DRIVER *pAudioDrv = NULL; - int i, j; - TVINSERTSTRUCTW insert; - HTREEITEM root, driver[10]; - HWND tree = NULL; - HIMAGELIST hImageList; - HBITMAP hBitMap; - HCURSOR old_cursor; - WCHAR driver_type[64], dev_type[64]; - - tree = GetDlgItem(hDlg, IDC_AUDIO_TREE); - - if (!tree) - return; - - /* set tree view style */ - SetWindowLong(tree, GWL_STYLE, GetWindowLong(tree, GWL_STYLE) | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT); - - /* state checkbox */ - hImageList = ImageList_Create(16, 16, FALSE, 3, 0); - hBitMap = LoadBitmap(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_CHECKBOX)); - ImageList_Add(hImageList, hBitMap, NULL); - DeleteObject(hBitMap); - SendMessageW( tree, TVM_SETIMAGELIST, TVSIL_STATE, (LPARAM)hImageList ); - - /* root item */ - LoadStringW (GetModuleHandle (NULL), IDS_SOUNDDRIVERS, driver_type, - sizeof(driver_type)/sizeof(driver_type[0])); - insert.hParent = TVI_ROOT; - insert.hInsertAfter = TVI_LAST; - insert.u.item.mask = TVIF_TEXT | TVIF_CHILDREN; - insert.u.item.pszText = driver_type; - insert.u.item.cChildren = 1; - root = (HTREEITEM)SendDlgItemMessageW (hDlg, IDC_AUDIO_TREE, TVM_INSERTITEMW, 0, (LPARAM)&insert); - - /* change to the wait cursor because this can take a while if there is a - * misbehaving driver that takes a long time to open - */ - old_cursor = SetCursor(LoadCursor(0, IDC_WAIT)); - - /* iterate over list of loaded drivers */ - for (pAudioDrv = loadedAudioDrv, i = 0; pAudioDrv->nameID; i++, pAudioDrv++) { - HDRVR hdrv; - char name[MAX_PATH]; - WCHAR text[MAX_PATH]; - - sprintf(name, "wine%s.drv", pAudioDrv->szDriver); - LoadStringW (GetModuleHandle (NULL), pAudioDrv->nameID, text, - sizeof(text)/sizeof(text[0])); - - if ((hdrv = pAudioDrv->hDriver)) - { - HMODULE lib; - if ((lib = GetDriverModuleHandle(hdrv))) - { - int num_wod = 0, num_wid = 0, num_mod = 0, num_mid = 0, num_aux = 0, num_mxd = 0; - MessagePtr wodMessagePtr = (MessagePtr)GetProcAddress(lib, "wodMessage"); - MessagePtr widMessagePtr = (MessagePtr)GetProcAddress(lib, "widMessage"); - MessagePtr modMessagePtr = (MessagePtr)GetProcAddress(lib, "modMessage"); - MessagePtr midMessagePtr = (MessagePtr)GetProcAddress(lib, "midMessage"); - MessagePtr auxMessagePtr = (MessagePtr)GetProcAddress(lib, "auxMessage"); - MessagePtr mxdMessagePtr = (MessagePtr)GetProcAddress(lib, "mxdMessage"); - - if (wodMessagePtr) - num_wod = wodMessagePtr(0, WODM_GETNUMDEVS, 0, 0, 0); - - if (widMessagePtr) - num_wid = widMessagePtr(0, WIDM_GETNUMDEVS, 0, 0, 0); - - if (modMessagePtr) - num_mod = modMessagePtr(0, MODM_GETNUMDEVS, 0, 0, 0); - - if (midMessagePtr) - num_mid = midMessagePtr(0, MIDM_GETNUMDEVS, 0, 0, 0); - - if (auxMessagePtr) - num_aux = auxMessagePtr(0, AUXDM_GETNUMDEVS, 0, 0, 0); - - if (mxdMessagePtr) - num_mxd = mxdMessagePtr(0, MXDM_GETNUMDEVS, 0, 0, 0); - - if (num_wod == 0 && num_wid == 0 && num_mod == 0 && num_mid == 0 && num_aux == 0 && num_mxd == 0) - { - insert.hParent = root; - insert.u.item.mask = TVIF_TEXT | TVIF_STATE | TVIF_PARAM; - insert.u.item.pszText = text; - insert.u.item.stateMask = TVIS_STATEIMAGEMASK; - insert.u.item.lParam = i + DRIVER_MASK; - if (isDriverSet(pAudioDrv->szDriver)) - insert.u.item.state = INDEXTOSTATEIMAGEMASK(2); - else - insert.u.item.state = INDEXTOSTATEIMAGEMASK(1); - - driver[i] = (HTREEITEM)SendDlgItemMessageW (hDlg, IDC_AUDIO_TREE, TVM_INSERTITEMW, 0, (LPARAM)&insert); - } - else - { - HTREEITEM type; - - insert.hParent = root; - insert.u.item.mask = TVIF_TEXT | TVIF_CHILDREN | TVIF_STATE | TVIF_PARAM; - insert.u.item.pszText = text; - insert.u.item.cChildren = 1; - insert.u.item.stateMask = TVIS_STATEIMAGEMASK; - insert.u.item.lParam = i + DRIVER_MASK; - - if (isDriverSet(pAudioDrv->szDriver)) - insert.u.item.state = INDEXTOSTATEIMAGEMASK(2); - else - insert.u.item.state = INDEXTOSTATEIMAGEMASK(1); - - driver[i] = (HTREEITEM)SendDlgItemMessageW (hDlg, IDC_AUDIO_TREE, TVM_INSERTITEMW, 0, (LPARAM)&insert); - - if (num_wod) - { - LoadStringW (GetModuleHandle (NULL), IDS_DEVICES_WAVEOUT, dev_type, - sizeof(dev_type)/sizeof(dev_type[0])); - - insert.hParent = driver[i]; - insert.u.item.mask = TVIF_TEXT | TVIF_CHILDREN; - insert.u.item.pszText = dev_type; - insert.u.item.cChildren = 1; - - type = (HTREEITEM)SendDlgItemMessageW (hDlg, IDC_AUDIO_TREE, TVM_INSERTITEMW, 0, (LPARAM)&insert); - - for (j = 0; j < num_wod; j++) - { - WAVEOUTCAPSW caps; - - wodMessagePtr(j, WODM_GETDEVCAPS, 0, (DWORD_PTR)&caps, sizeof(caps)); - - insert.hParent = type; - insert.u.item.mask = TVIF_TEXT | TVIF_PARAM; - insert.u.item.pszText = caps.szPname; - insert.u.item.lParam = j + DEVICE_MASK; - - SendDlgItemMessageW (hDlg, IDC_AUDIO_TREE, TVM_INSERTITEMW, 0, (LPARAM)&insert); - } - } - - if (num_wid) - { - LoadStringW (GetModuleHandle (NULL), IDS_DEVICES_WAVEIN, dev_type, - sizeof(dev_type)/sizeof(dev_type[0])); - - insert.hParent = driver[i]; - insert.u.item.mask = TVIF_TEXT | TVIF_CHILDREN; - insert.u.item.pszText = dev_type; - insert.u.item.cChildren = 1; - - type = (HTREEITEM)SendDlgItemMessageW (hDlg, IDC_AUDIO_TREE, TVM_INSERTITEMW, 0, (LPARAM)&insert); - - for (j = 0; j < num_wid; j++) - { - WAVEINCAPSW caps; - - widMessagePtr(j, WIDM_GETDEVCAPS, 0, (DWORD_PTR)&caps, sizeof(caps)); - - insert.hParent = type; - insert.u.item.mask = TVIF_TEXT | TVIF_PARAM; - insert.u.item.pszText = caps.szPname; - insert.u.item.lParam = j + DEVICE_MASK; - - SendDlgItemMessageW (hDlg, IDC_AUDIO_TREE, TVM_INSERTITEMW, 0, (LPARAM)&insert); - } - } - - if (num_mod) - { - LoadStringW (GetModuleHandle (NULL), IDS_DEVICES_MIDIOUT, dev_type, - sizeof(dev_type)/sizeof(dev_type[0])); - - insert.hParent = driver[i]; - insert.u.item.mask = TVIF_TEXT | TVIF_CHILDREN; - insert.u.item.pszText = dev_type; - insert.u.item.cChildren = 1; - - type = (HTREEITEM)SendDlgItemMessageW (hDlg, IDC_AUDIO_TREE, TVM_INSERTITEMW, 0, (LPARAM)&insert); - - for (j = 0; j < num_mod; j++) - { - MIDIOUTCAPSW caps; - - modMessagePtr(j, MODM_GETDEVCAPS, 0, (DWORD_PTR)&caps, sizeof(caps)); - - insert.hParent = type; - insert.u.item.mask = TVIF_TEXT | TVIF_PARAM; - insert.u.item.pszText = caps.szPname; - insert.u.item.lParam = j + DEVICE_MASK; - - SendDlgItemMessageW (hDlg, IDC_AUDIO_TREE, TVM_INSERTITEMW, 0, (LPARAM)&insert); - } - } - - if (num_mid) - { - LoadStringW (GetModuleHandle (NULL), IDS_DEVICES_MIDIIN, dev_type, - sizeof(dev_type)/sizeof(dev_type[0])); - - insert.hParent = driver[i]; - insert.u.item.mask = TVIF_TEXT | TVIF_CHILDREN; - insert.u.item.pszText = dev_type; - insert.u.item.cChildren = 1; - - type = (HTREEITEM)SendDlgItemMessageW (hDlg, IDC_AUDIO_TREE, TVM_INSERTITEMW, 0, (LPARAM)&insert); - - for (j = 0; j < num_mid; j++) - { - MIDIINCAPSW caps; - - midMessagePtr(j, MIDM_GETDEVCAPS, 0, (DWORD_PTR)&caps, sizeof(caps)); - - insert.hParent = type; - insert.u.item.mask = TVIF_TEXT | TVIF_PARAM; - insert.u.item.pszText = caps.szPname; - insert.u.item.lParam = j + DEVICE_MASK; - - SendDlgItemMessageW (hDlg, IDC_AUDIO_TREE, TVM_INSERTITEMW, 0, (LPARAM)&insert); - } - } - - if (num_aux) - { - LoadStringW (GetModuleHandle (NULL), IDS_DEVICES_AUX, dev_type, - sizeof(dev_type)/sizeof(dev_type[0])); - - insert.hParent = driver[i]; - insert.u.item.mask = TVIF_TEXT | TVIF_CHILDREN; - insert.u.item.pszText = dev_type; - insert.u.item.cChildren = 1; - - type = (HTREEITEM)SendDlgItemMessageW (hDlg, IDC_AUDIO_TREE, TVM_INSERTITEMW, 0, (LPARAM)&insert); - - for (j = 0; j < num_aux; j++) - { - AUXCAPSW caps; - - auxMessagePtr(j, AUXDM_GETDEVCAPS, 0, (DWORD_PTR)&caps, sizeof(caps)); - - insert.hParent = type; - insert.u.item.mask = TVIF_TEXT | TVIF_PARAM; - insert.u.item.pszText = caps.szPname; - insert.u.item.lParam = j + DEVICE_MASK; - - SendDlgItemMessageW (hDlg, IDC_AUDIO_TREE, TVM_INSERTITEMW, 0, (LPARAM)&insert); - } - } - - if (num_mxd) - { - LoadStringW (GetModuleHandle (NULL), IDS_DEVICES_MIXER, dev_type, - sizeof(dev_type)/sizeof(dev_type[0])); - - insert.hParent = driver[i]; - insert.u.item.mask = TVIF_TEXT | TVIF_CHILDREN; - insert.u.item.pszText = dev_type; - insert.u.item.cChildren = 1; - - type = (HTREEITEM)SendDlgItemMessageW (hDlg, IDC_AUDIO_TREE, TVM_INSERTITEMW, 0, (LPARAM)&insert); - - for (j = 0; j < num_mxd; j++) - { - MIXERCAPSW caps; - - mxdMessagePtr(j, MXDM_GETDEVCAPS, 0, (DWORD_PTR)&caps, sizeof(caps)); - - insert.hParent = type; - insert.u.item.mask = TVIF_TEXT | TVIF_PARAM; - insert.u.item.pszText = caps.szPname; - insert.u.item.lParam = j + DEVICE_MASK; - - SendDlgItemMessageW (hDlg, IDC_AUDIO_TREE, TVM_INSERTITEMW, 0, (LPARAM)&insert); - } - } - } - } - } - } - - /* restore the original cursor */ - SetCursor(old_cursor); - - SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_SELECTITEM, 0, 0); - SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_EXPAND, TVE_EXPAND, (LPARAM)root); - for (j = 0; j < i; j++) - SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_EXPAND, TVE_EXPAND, (LPARAM)driver[j]); -} - -/* find all drivers that can be loaded */ -static void findAudioDrivers(void) -{ - int numFound = 0; - AUDIO_DRIVER *pAudioDrv = NULL; - HCURSOR old_cursor; - - /* delete an existing list */ - HeapFree(GetProcessHeap(), 0, loadedAudioDrv); - loadedAudioDrv = 0; - - /* change to the wait cursor because this can take a while if there is a - * misbehaving driver that takes a long time to open - */ - old_cursor = SetCursor(LoadCursor(0, IDC_WAIT)); - - for (pAudioDrv = sAudioDrivers; pAudioDrv->nameID; pAudioDrv++) - { - if (strlen(pAudioDrv->szDriver)) - { - HDRVR hdrv; - char driver[MAX_PATH]; - - sprintf(driver, "wine%s.drv", pAudioDrv->szDriver); - - hdrv = pAudioDrv->hDriver; - if (!pAudioDrv->hDriver && (hdrv = OpenDriverA(driver, 0, 0))) { - HMODULE lib = GetDriverModuleHandle(hdrv); - MessagePtr wodMessagePtr = (MessagePtr)GetProcAddress(lib, "wodMessage"); - MessagePtr widMessagePtr = (MessagePtr)GetProcAddress(lib, "widMessage"); - MessagePtr modMessagePtr = (MessagePtr)GetProcAddress(lib, "modMessage"); - MessagePtr midMessagePtr = (MessagePtr)GetProcAddress(lib, "midMessage"); - MessagePtr auxMessagePtr = (MessagePtr)GetProcAddress(lib, "auxMessage"); - MessagePtr mxdMessagePtr = (MessagePtr)GetProcAddress(lib, "mxdMessage"); - - pAudioDrv->hDriver = hdrv; - - if (wodMessagePtr) - wodMessagePtr(0, DRVM_INIT, 0, 0, 0); - - if (widMessagePtr) - widMessagePtr(0, DRVM_INIT, 0, 0, 0); - - if (modMessagePtr) - modMessagePtr(0, DRVM_INIT, 0, 0, 0); - - if (midMessagePtr) - midMessagePtr(0, DRVM_INIT, 0, 0, 0); - - if (auxMessagePtr) - auxMessagePtr(0, DRVM_INIT, 0, 0, 0); - - if (mxdMessagePtr) - mxdMessagePtr(0, DRVM_INIT, 0, 0, 0); - } - if (hdrv) - { - if (loadedAudioDrv) - loadedAudioDrv = HeapReAlloc(GetProcessHeap(), 0, loadedAudioDrv, (numFound + 1) * sizeof(AUDIO_DRIVER)); - else - loadedAudioDrv = HeapAlloc(GetProcessHeap(), 0, sizeof(AUDIO_DRIVER)); - - CopyMemory(&loadedAudioDrv[numFound], pAudioDrv, sizeof(AUDIO_DRIVER)); - numFound++; - } - } - } - - /* restore the original cursor */ - SetCursor(old_cursor); - - /* terminate list with empty driver */ - if (numFound) { - loadedAudioDrv = HeapReAlloc(GetProcessHeap(), 0, loadedAudioDrv, (numFound + 1) * sizeof(AUDIO_DRIVER)); - CopyMemory(&loadedAudioDrv[numFound], pAudioDrv, sizeof(AUDIO_DRIVER)); - } else { - loadedAudioDrv = HeapAlloc(GetProcessHeap(), 0, sizeof(AUDIO_DRIVER)); - CopyMemory(&loadedAudioDrv[0], pAudioDrv, sizeof(AUDIO_DRIVER)); - } -} - -/* check local copy of registry string for unloadable drivers */ -static void checkRegistrySetting(HWND hDlg) -{ - const AUDIO_DRIVER *pAudioDrv; - char * token, * tokens; - - tokens = HeapAlloc(GetProcessHeap(), 0, strlen(curAudioDriver)+1); - strcpy(tokens, curAudioDriver); - -start_over: - token = strtok(tokens, ","); - while (token != NULL) - { - BOOL found = FALSE; - for (pAudioDrv = loadedAudioDrv; pAudioDrv->nameID; pAudioDrv++) - { - if (strcmp(token, pAudioDrv->szDriver) == 0) - { - found = TRUE; - break; - } - } - if (found == FALSE) - { - WCHAR tokenW[MAX_NAME_LENGTH+1]; - WCHAR messageStr[256]; - WCHAR str[1024]; - WCHAR caption[64]; - - MultiByteToWideChar (CP_ACP, 0, token, -1, tokenW, sizeof(tokenW)/sizeof(tokenW[0])); - - LoadStringW (GetModuleHandle (NULL), IDS_UNAVAILABLE_DRIVER, messageStr, - sizeof(messageStr)/sizeof(messageStr[0])); - wsprintfW (str, messageStr, tokenW); - LoadStringW (GetModuleHandle (NULL), IDS_WARNING, caption, - sizeof(caption)/sizeof(caption[0])); - if (MessageBoxW (hDlg, str, caption, MB_ICONWARNING | MB_YESNOCANCEL) == IDYES) - { - removeDriver(token); - strcpy(tokens, curAudioDriver); - goto start_over; - } - } - token = strtok(NULL, ","); - } - HeapFree(GetProcessHeap(), 0, tokens); -} - -static void selectDriver(HWND hDlg, const char * driver) -{ - WCHAR text[1024]; - WCHAR caption[64]; - - strcpy(curAudioDriver, driver); - set_reg_key(config_key, "Drivers", "Audio", curAudioDriver); - - if (LoadStringW(GetModuleHandle(NULL), IDS_AUDIO_MISSING, text, sizeof(text)/sizeof(text[0]))) - { - if (LoadStringW(GetModuleHandle(NULL), IDS_WINECFG_TITLE, caption, sizeof(caption)/sizeof(caption[0]))) - MessageBoxW(hDlg, text, caption, MB_OK | MB_ICONINFORMATION); - } - - SendMessage(GetParent(hDlg), PSM_CHANGED, (WPARAM) hDlg, 0); /* enable apply button */ -} - static void initAudioDlg (HWND hDlg) { int i, j, found; @@ -634,31 +91,6 @@ static void initAudioDlg (HWND hDlg) WINE_TRACE("\n"); - /* make a list of all drivers that can be loaded */ - findAudioDrivers(); - - /* get current registry setting if available */ - buf = get_reg_key(config_key, "Drivers", "Audio", NULL); - - /* check for first time install and set a default driver - * select first available driver, and if that fails: none - */ - if (buf == NULL) - { - /* select first available driver */ - if (*loadedAudioDrv->szDriver) - selectDriver(hDlg, loadedAudioDrv->szDriver); - } - else /* make a local copy of the current registry setting */ - strcpy(curAudioDriver, buf); - - WINE_TRACE("curAudioDriver = %s\n", curAudioDriver); - - /* check for drivers that can't be loaded */ - checkRegistrySetting(hDlg); - - initAudioDeviceTree(hDlg); - SendDlgItemMessage(hDlg, IDC_DSOUND_HW_ACCEL, CB_RESETCONTENT, 0, 0); buf = get_reg_key(config_key, keypath("DirectSound"), "HardwareAcceleration", "Full"); @@ -720,24 +152,18 @@ AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { case WM_COMMAND: - switch (LOWORD(wParam)) { - case IDC_AUDIO_CONFIGURE: - configureAudioDriver(hDlg); - break; + switch (LOWORD(wParam)) { case IDC_AUDIO_TEST: - if(!PlaySound(MAKEINTRESOURCE(IDW_TESTSOUND), NULL, SND_RESOURCE | SND_SYNC)) - MessageBox(NULL, "Audio test failed!", "Error", MB_OK | MB_ICONERROR); - break; - case IDC_AUDIO_CONTROL_PANEL: - MessageBox(NULL, "Launching audio control panel not implemented yet!", "Fixme", MB_OK | MB_ICONERROR); - break; + if(!PlaySound(MAKEINTRESOURCE(IDW_TESTSOUND), NULL, SND_RESOURCE | SND_SYNC)) + MessageBox(NULL, "Audio test failed!", "Error", MB_OK | MB_ICONERROR); + break; case IDC_DSOUND_HW_ACCEL: - if (HIWORD(wParam) == CBN_SELCHANGE) { - int selected_dsound_accel; + if (HIWORD(wParam) == CBN_SELCHANGE) { + int selected_dsound_accel; int i, j = 0; - SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); - selected_dsound_accel = SendDlgItemMessage(hDlg, IDC_DSOUND_HW_ACCEL, CB_GETCURSEL, 0, 0); + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + selected_dsound_accel = SendDlgItemMessage(hDlg, IDC_DSOUND_HW_ACCEL, CB_GETCURSEL, 0, 0); for (i = 0; DSound_HW_Accels[i].settingStr; ++i) { if (DSound_HW_Accels[i].visible) @@ -751,122 +177,46 @@ AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) j++; } } - } - break; + } + break; case IDC_DSOUND_RATES: - if (HIWORD(wParam) == CBN_SELCHANGE) { - int selected_dsound_rate; - SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); - selected_dsound_rate = SendDlgItemMessage(hDlg, IDC_DSOUND_RATES, CB_GETCURSEL, 0, 0); - set_reg_key(config_key, keypath("DirectSound"), "DefaultSampleRate", DSound_Rates[selected_dsound_rate]); - } - break; + if (HIWORD(wParam) == CBN_SELCHANGE) { + int selected_dsound_rate; + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + selected_dsound_rate = SendDlgItemMessage(hDlg, IDC_DSOUND_RATES, CB_GETCURSEL, 0, 0); + set_reg_key(config_key, keypath("DirectSound"), "DefaultSampleRate", DSound_Rates[selected_dsound_rate]); + } + break; case IDC_DSOUND_BITS: - if (HIWORD(wParam) == CBN_SELCHANGE) { - int selected_dsound_bits; - SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); - selected_dsound_bits = SendDlgItemMessage(hDlg, IDC_DSOUND_BITS, CB_GETCURSEL, 0, 0); - set_reg_key(config_key, keypath("DirectSound"), "DefaultBitsPerSample", DSound_Bits[selected_dsound_bits]); - } - break; - } - break; - + if (HIWORD(wParam) == CBN_SELCHANGE) { + int selected_dsound_bits; + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + selected_dsound_bits = SendDlgItemMessage(hDlg, IDC_DSOUND_BITS, CB_GETCURSEL, 0, 0); + set_reg_key(config_key, keypath("DirectSound"), "DefaultBitsPerSample", DSound_Bits[selected_dsound_bits]); + } + break; + } + break; case WM_SHOWWINDOW: set_window_title(hDlg); break; case WM_NOTIFY: - switch(((LPNMHDR)lParam)->code) { - case PSN_KILLACTIVE: - SetWindowLongPtr(hDlg, DWLP_MSGRESULT, FALSE); - break; - case PSN_APPLY: - set_reg_key(config_key, "Drivers", "Audio", curAudioDriver); + switch(((LPNMHDR)lParam)->code) { + case PSN_KILLACTIVE: + SetWindowLongPtr(hDlg, DWLP_MSGRESULT, FALSE); + break; + case PSN_APPLY: apply(); - SetWindowLongPtr(hDlg, DWLP_MSGRESULT, PSNRET_NOERROR); - break; - case PSN_SETACTIVE: - break; - case NM_CLICK: - if (((LPNMHDR)lParam)->idFrom == IDC_AUDIO_TREE) - { - TVHITTESTINFO ht; - DWORD dwPos = GetMessagePos(); - HWND tree = ((LPNMHDR)lParam)->hwndFrom; - ZeroMemory(&ht, sizeof(ht)); - ht.pt.x = (short)LOWORD(dwPos); - ht.pt.y = (short)HIWORD(dwPos); - MapWindowPoints(HWND_DESKTOP, tree, &ht.pt, 1); - SendMessageW( tree, TVM_HITTEST, 0, (LPARAM)&ht ); - if (TVHT_ONITEMSTATEICON & ht.flags) - { - TVITEM tvItem; - int index; - ZeroMemory(&tvItem, sizeof(tvItem)); - tvItem.hItem = ht.hItem; - SendMessageW( tree, TVM_GETITEMW, 0, (LPARAM) &tvItem ); - - index = TreeView_GetItemState(tree, ht.hItem, TVIS_STATEIMAGEMASK); - if (index == INDEXTOSTATEIMAGEMASK(1)) - { - TreeView_SetItemState(tree, ht.hItem, INDEXTOSTATEIMAGEMASK(2), TVIS_STATEIMAGEMASK); - addDriver(loadedAudioDrv[tvItem.lParam & 0xff].szDriver); - SendMessage(GetParent(hDlg), PSM_CHANGED, (WPARAM) hDlg, 0); /* enable apply button */ - } - else if (index == INDEXTOSTATEIMAGEMASK(2)) - { - TreeView_SetItemState(tree, ht.hItem, INDEXTOSTATEIMAGEMASK(1), TVIS_STATEIMAGEMASK); - removeDriver(loadedAudioDrv[tvItem.lParam & 0xff].szDriver); - SendMessage(GetParent(hDlg), PSM_CHANGED, (WPARAM) hDlg, 0); /* enable apply button */ - } - } - } + SetWindowLongPtr(hDlg, DWLP_MSGRESULT, PSNRET_NOERROR); break; - case NM_RCLICK: - if (((LPNMHDR)lParam)->idFrom == IDC_AUDIO_TREE) - { - TVHITTESTINFO ht; - DWORD dwPos = GetMessagePos(); - HWND tree = ((LPNMHDR)lParam)->hwndFrom; - POINT pt; - ZeroMemory(&ht, sizeof(ht)); - pt.x = (short)LOWORD(dwPos); - pt.y = (short)HIWORD(dwPos); - ht.pt = pt; - MapWindowPoints(HWND_DESKTOP, tree, &ht.pt, 1); - SendMessageW( tree, TVM_HITTEST, 0, (LPARAM)&ht ); - if (TVHT_ONITEMLABEL & ht.flags) - { - TVITEM tvItem; - ZeroMemory(&tvItem, sizeof(tvItem)); - tvItem.hItem = ht.hItem; - tvItem.mask = TVIF_PARAM; - tvItem.lParam = -1; - if (TreeView_GetItem(tree, &tvItem)) - { - if (tvItem.lParam & DRIVER_MASK) - { - if (hPopupMenus) - { - TrackPopupMenu(GetSubMenu(hPopupMenus, 0), TPM_RIGHTBUTTON, pt.x, pt.y, 0, tree, NULL); - toConfigure = tvItem.lParam & ~DRIVER_MASK; - } - } - else if (tvItem.lParam & DEVICE_MASK) - { - /* FIXME TBD */ - } - - } - } - } - } - break; - - case WM_INITDIALOG: - initAudioDlg(hDlg); - break; + case PSN_SETACTIVE: + break; + } + break; + case WM_INITDIALOG: + initAudioDlg(hDlg); + break; } return FALSE; diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 67b912c..267a497 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -169,15 +169,8 @@ #define IDC_APP_REMOVEAPP 1202 /* audio tab */ -#define IDC_AUDIO_CONFIGURE 1300 #define IDC_AUDIO_TEST 1301 -#define IDC_AUDIO_CONTROL_PANEL 1302 #define IDC_DSOUND_HW_ACCEL 1303 -#define IDC_AUDIO_TREE 1305 -#define IDR_WINECFG 1306 -#define IDB_CHECKBOX 1307 -#define IDB_DEVICE 1308 -#define IDS_AUDIO_MISSING 1309 #define IDC_DSOUND_RATES 1310 #define IDC_DSOUND_BITS 1311 #define IDW_TESTSOUND 1312 @@ -185,21 +178,6 @@ #define IDS_ACCEL_STANDARD 8301 #define IDS_ACCEL_BASIC 8302 #define IDS_ACCEL_EMULATION 8303 -#define IDS_DRIVER_ALSA 8304 - -#define IDS_DRIVER_OSS 8307 - -#define IDS_DRIVER_COREAUDIO 8311 -#define IDS_OPEN_DRIVER_ERROR 8312 -#define IDS_SOUNDDRIVERS 8313 -#define IDS_DEVICES_WAVEOUT 8314 -#define IDS_DEVICES_WAVEIN 8315 -#define IDS_DEVICES_MIDIOUT 8316 -#define IDS_DEVICES_MIDIIN 8317 -#define IDS_DEVICES_AUX 8318 -#define IDS_DEVICES_MIXER 8319 -#define IDS_UNAVAILABLE_DRIVER 8320 -#define IDS_WARNING 8321 /* desktop integration tab */ #define IDC_THEME_COLORCOMBO 1401 diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index 8a2f534..cdf3a84 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -759,9 +759,6 @@ int initialize(HINSTANCE hInstance) return 1; } - /* load any menus */ - hPopupMenus = LoadMenu(hInstance, MAKEINTRESOURCE(IDR_WINECFG)); - /* we could probably just have the list as static data */ settings = HeapAlloc(GetProcessHeap(), 0, sizeof(struct list)); list_init(settings); diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 9c936ca..5689e7c 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -25,14 +25,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT -IDR_WINECFG MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "Configure...", IDC_AUDIO_CONFIGURE - END -END - STRINGTABLE BEGIN IDS_TAB_APPLICATIONS "Applications" @@ -50,7 +42,6 @@ BEGIN IDS_WINECFG_TITLE_APP "Wine configuration for %s" IDS_THEMEFILE "Theme files (*.msstyles; *.theme)" IDS_THEMEFILE_SELECT "Select a theme file" - IDS_AUDIO_MISSING "There is no audio driver currently specified in the registry.\n\nA recommended driver has been selected for you.\nYou can use this driver or select another driver if available.\n\nYou must click Apply for the selection to take effect." IDS_SHELL_FOLDER "Folder" IDS_LINKS_TO "Links to" END @@ -97,19 +88,6 @@ BEGIN IDS_ACCEL_STANDARD "Standard" IDS_ACCEL_BASIC "Basic" IDS_ACCEL_EMULATION "Emulation" - IDS_DRIVER_ALSA "ALSA Driver" - IDS_DRIVER_OSS "OSS Driver" - IDS_DRIVER_COREAUDIO "CoreAudio Driver" - IDS_OPEN_DRIVER_ERROR "Couldn't open %s!" - IDS_SOUNDDRIVERS "Sound Drivers" - IDS_DEVICES_WAVEOUT "Wave Out Devices" - IDS_DEVICES_WAVEIN "Wave In Devices" - IDS_DEVICES_MIDIOUT "MIDI Out Devices" - IDS_DEVICES_MIDIIN "MIDI In Devices" - IDS_DEVICES_AUX "Aux Devices" - IDS_DEVICES_MIXER "Mixer Devices" - IDS_UNAVAILABLE_DRIVER "Found driver in registry that is not available!\n\nRemove '%s' from registry?" - IDS_WARNING "Warning" END STRINGTABLE @@ -156,8 +134,5 @@ IDI_WINECFG ICON winecfg.ico /* @makedep: logo.ico */ IDI_LOGO ICON logo.ico -/* @makedep: idb_checkbox.bmp */ -IDB_CHECKBOX BITMAP idb_checkbox.bmp - /* @makedep: idw_testsound.wav */ IDW_TESTSOUND WAVE idw_testsound.wav