[WINECFG] show sound card drivers and devices (revised)
Robert Reif
reif at earthlink.net
Tue Dec 6 06:47:39 CST 2005
Show all sound card drivers and their devices.
This difference between this patch and the previous
set is that the button positions have not been
moved to allow room for wide buttons in some languages.
The .rc file cleanups have been incorporated into this patch.
A resource.h typo was fixed.
-------------- next part --------------
cvs diff: Diffing programs/winecfg
Index: programs/winecfg/Bg.rc
===================================================================
RCS file: /home/wine/wine/programs/winecfg/Bg.rc,v
retrieving revision 1.3
diff -p -u -r1.3 Bg.rc
--- programs/winecfg/Bg.rc 27 Oct 2005 11:24:02 -0000 1.3
+++ programs/winecfg/Bg.rc 6 Dec 2005 12:37:48 -0000
@@ -159,13 +159,11 @@ BEGIN
PUSHBUTTON "Îòêðèâàíå",IDC_AUDIO_AUTODETECT,170,20,69,14
PUSHBUTTON "Íàñòðîéêà",IDC_AUDIO_CONFIGURE,170,40,69,14
PUSHBUTTON "Êîíòðîëåí ïàíåë",IDC_AUDIO_CONTROL_PANEL,170,60,69,14
-
- GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120
-
- LTEXT "Õàðäóåðíî óñêîðåíèå: ",IDC_STATIC,15,85,90,10
- COMBOBOX IDC_DSOUND_HW_ACCEL,100,83,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- CONTROL "Ñîôòóåðíà åìóëàöèÿ",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10
-
+ CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160
+ GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60
+ LTEXT "Õàðäóåðíî óñêîðåíèå: ",IDC_STATIC,15,215,90,10
+ COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Ñîôòóåðíà åìóëàöèÿ",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10
END
IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250
Index: programs/winecfg/Cs.rc
===================================================================
RCS file: /home/wine/wine/programs/winecfg/Cs.rc,v
retrieving revision 1.2
diff -p -u -r1.2 Cs.rc
--- programs/winecfg/Cs.rc 4 May 2005 09:49:22 -0000 1.2
+++ programs/winecfg/Cs.rc 6 Dec 2005 12:37:49 -0000
@@ -159,6 +159,13 @@ BEGIN
LTEXT "Ovladaè zvukové karty: ",IDC_STATIC,10,20,60,8
COMBOBOX IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Autodetekce",IDC_AUDIO_AUTODETECT,170,20,49,14
+ PUSHBUTTON "Configure",IDC_AUDIO_CONFIGURE,170,40,59,14
+ PUSHBUTTON "Control Panel",IDC_AUDIO_CONTROL_PANEL,170,60,59,14
+ CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160
+ GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60
+ LTEXT "Hardware Acceleration: ",IDC_STATIC,15,215,90,10
+ COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Driver Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10
END
STRINGTABLE DISCARDABLE
Index: programs/winecfg/De.rc
===================================================================
RCS file: /home/wine/wine/programs/winecfg/De.rc,v
retrieving revision 1.15
diff -p -u -r1.15 De.rc
--- programs/winecfg/De.rc 27 Oct 2005 11:24:02 -0000 1.15
+++ programs/winecfg/De.rc 6 Dec 2005 12:37:49 -0000
@@ -156,13 +156,11 @@ BEGIN
PUSHBUTTON "Automatisch",IDC_AUDIO_AUTODETECT,170,20,49,14
PUSHBUTTON "Konfigurieren",IDC_AUDIO_CONFIGURE,170,40,49,14
PUSHBUTTON "Kontrollschirm",IDC_AUDIO_CONTROL_PANEL,170,60,49,14
-
- GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120
-
- LTEXT "Hardware Beschleunigung: ", IDC_STATIC,15,85,90,10
- COMBOBOX IDC_DSOUND_HW_ACCEL,100,83,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- CONTROL "Treiber Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10
-
+ CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160
+ GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,120
+ LTEXT "Hardware Beschleunigung: ", IDC_STATIC,15,215,90,10
+ COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Treiber Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10
END
IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250
Index: programs/winecfg/En.rc
===================================================================
RCS file: /home/wine/wine/programs/winecfg/En.rc,v
retrieving revision 1.54
diff -p -u -r1.54 En.rc
--- programs/winecfg/En.rc 27 Oct 2005 11:24:02 -0000 1.54
+++ programs/winecfg/En.rc 6 Dec 2005 12:37:49 -0000
@@ -155,16 +155,14 @@ FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Audio driver: ",IDC_STATIC,10,20,60,8
COMBOBOX IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "Autodetect",IDC_AUDIO_AUTODETECT,170,20,49,14
- PUSHBUTTON "Configure",IDC_AUDIO_CONFIGURE,170,40,49,14
- PUSHBUTTON "Control Panel",IDC_AUDIO_CONTROL_PANEL,170,60,49,14
-
- GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120
-
- LTEXT "Hardware Acceleration: ",IDC_STATIC,15,85,90,10
- COMBOBOX IDC_DSOUND_HW_ACCEL,100,83,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- CONTROL "Driver Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10
-
+ PUSHBUTTON "Autodetect",IDC_AUDIO_AUTODETECT,170,20,59,14
+ PUSHBUTTON "Configure",IDC_AUDIO_CONFIGURE,170,40,59,14
+ PUSHBUTTON "Control Panel",IDC_AUDIO_CONTROL_PANEL,170,60,59,14
+ CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160
+ GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60
+ LTEXT "Hardware Acceleration: ",IDC_STATIC,15,215,90,10
+ COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Driver Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10
END
IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250
Index: programs/winecfg/Es.rc
===================================================================
RCS file: /home/wine/wine/programs/winecfg/Es.rc,v
retrieving revision 1.16
diff -p -u -r1.16 Es.rc
--- programs/winecfg/Es.rc 4 May 2005 09:49:22 -0000 1.16
+++ programs/winecfg/Es.rc 6 Dec 2005 12:37:49 -0000
@@ -156,6 +156,13 @@ BEGIN
LTEXT "Manejador de audio:",IDC_STATIC,10,20,60,16
COMBOBOX IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Autodetectar",IDC_AUDIO_AUTODETECT,170,20,49,14
+ PUSHBUTTON "Configure",IDC_AUDIO_CONFIGURE,170,40,59,14
+ PUSHBUTTON "Control Panel",IDC_AUDIO_CONTROL_PANEL,170,60,59,14
+ CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160
+ GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60
+ LTEXT "Hardware Acceleration: ",IDC_STATIC,15,215,90,10
+ COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Driver Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10
END
STRINGTABLE DISCARDABLE
Index: programs/winecfg/Fi.rc
===================================================================
RCS file: /home/wine/wine/programs/winecfg/Fi.rc,v
retrieving revision 1.3
diff -p -u -r1.3 Fi.rc
--- programs/winecfg/Fi.rc 27 Oct 2005 11:24:02 -0000 1.3
+++ programs/winecfg/Fi.rc 6 Dec 2005 12:37:50 -0000
@@ -155,12 +155,11 @@ BEGIN
PUSHBUTTON "&Tunnista automaattisesti",IDC_AUDIO_AUTODETECT,170,20,79,14
PUSHBUTTON "&Määritä",IDC_AUDIO_CONFIGURE,170,40,79,14
PUSHBUTTON "&Hallintapaneeli",IDC_AUDIO_CONTROL_PANEL,170,60,79,14
-
- GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120
-
- LTEXT "Laitteistopohjainen kiihdytys:",IDC_STATIC,15,85,110,10
- COMBOBOX IDC_DSOUND_HW_ACCEL,125,83,100,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- CONTROL "Ajurin &emulointi",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10
+ CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160
+ GROUPBOX " DirectSound ",IDC_STATIC,8,215,244,120
+ LTEXT "Laitteistopohjainen kiihdytys:",IDC_STATIC,15,215,110,10
+ COMBOBOX IDC_DSOUND_HW_ACCEL,125,213,100,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Ajurin &emulointi",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10
END
IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250
Index: programs/winecfg/Fr.rc
===================================================================
RCS file: /home/wine/wine/programs/winecfg/Fr.rc,v
retrieving revision 1.12
diff -p -u -r1.12 Fr.rc
--- programs/winecfg/Fr.rc 27 Oct 2005 11:24:02 -0000 1.12
+++ programs/winecfg/Fr.rc 6 Dec 2005 12:37:50 -0000
@@ -157,9 +157,8 @@ BEGIN
PUSHBUTTON "Autodétection",IDC_AUDIO_AUTODETECT,170,20,85,14
PUSHBUTTON "Configurer",IDC_AUDIO_CONFIGURE,170,40,85,14
PUSHBUTTON "Panneau de configuration",IDC_AUDIO_CONTROL_PANEL,170,60,85,14
-
+ CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160
GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120
-
LTEXT "Accélération matérielle: ",IDC_STATIC,15,85,90,10
COMBOBOX IDC_DSOUND_HW_ACCEL,100,83,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Emulation pilote",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10
Index: programs/winecfg/It.rc
===================================================================
RCS file: /home/wine/wine/programs/winecfg/It.rc,v
retrieving revision 1.7
diff -p -u -r1.7 It.rc
--- programs/winecfg/It.rc 4 May 2005 09:49:22 -0000 1.7
+++ programs/winecfg/It.rc 6 Dec 2005 12:37:50 -0000
@@ -156,7 +156,14 @@ FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Driver audio: ",IDC_STATIC,10,20,60,8
COMBOBOX IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "Rileva automaticamente",IDC_AUDIO_AUTODETECT,170,20,49,14
+ PUSHBUTTON "Rileva automaticamente",IDC_AUDIO_AUTODETECT,170,20,59,14
+ PUSHBUTTON "Configure",IDC_AUDIO_CONFIGURE,170,40,59,14
+ PUSHBUTTON "Control Panel",IDC_AUDIO_CONTROL_PANEL,170,60,59,14
+ CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160
+ GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60
+ LTEXT "Hardware Acceleration: ",IDC_STATIC,15,215,90,10
+ COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Driver Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10
END
STRINGTABLE DISCARDABLE
Index: programs/winecfg/Ja.rc
===================================================================
RCS file: /home/wine/wine/programs/winecfg/Ja.rc,v
retrieving revision 1.5
diff -p -u -r1.5 Ja.rc
--- programs/winecfg/Ja.rc 27 Oct 2005 11:24:02 -0000 1.5
+++ programs/winecfg/Ja.rc 6 Dec 2005 12:37:50 -0000
@@ -158,13 +158,11 @@ BEGIN
PUSHBUTTON "Ž©“®ŒŸo",IDC_AUDIO_AUTODETECT,170,20,49,14
PUSHBUTTON "Ý’è",IDC_AUDIO_CONFIGURE,170,40,49,14
PUSHBUTTON "ƒRƒ“ƒgƒ[ƒ‹ƒpƒlƒ‹",IDC_AUDIO_CONTROL_PANEL,170,60,49,14
-
- GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120
-
- LTEXT "ƒn[ƒhƒEƒFƒAEƒAƒNƒZƒ‰ƒŒ[ƒVƒ‡ƒ“: ",IDC_STATIC,15,85,90,10
- COMBOBOX IDC_DSOUND_HW_ACCEL,100,83,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- CONTROL "ƒhƒ‰ƒCƒoEƒGƒ~ƒ…ƒŒ[ƒVƒ‡ƒ“",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10
-
+ CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160
+ GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,120
+ LTEXT "ƒn[ƒhƒEƒFƒAEƒAƒNƒZƒ‰ƒŒ[ƒVƒ‡ƒ“: ",IDC_STATIC,15,205,90,10
+ COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ CONTROL "ƒhƒ‰ƒCƒoEƒGƒ~ƒ…ƒŒ[ƒVƒ‡ƒ“",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10
END
IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250
Index: programs/winecfg/Ko.rc
===================================================================
RCS file: /home/wine/wine/programs/winecfg/Ko.rc,v
retrieving revision 1.4
diff -p -u -r1.4 Ko.rc
--- programs/winecfg/Ko.rc 28 Nov 2005 11:01:35 -0000 1.4
+++ programs/winecfg/Ko.rc 6 Dec 2005 12:37:50 -0000
@@ -159,13 +159,11 @@ BEGIN
PUSHBUTTON "ÀÚµ¿°Ë»ö",IDC_AUDIO_AUTODETECT,170,20,49,14
PUSHBUTTON "¼³Á¤",IDC_AUDIO_CONFIGURE,170,40,49,14
PUSHBUTTON "Á¦¾îÆÇ",IDC_AUDIO_CONTROL_PANEL,170,60,49,14
-
- GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120
-
- LTEXT "Çϵå¿þ¾î °¡¼Ó: ",IDC_STATIC,15,85,90,10
- COMBOBOX IDC_DSOUND_HW_ACCEL,100,83,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- CONTROL "µå¶óÀ̹ö ¾Ö¹Ä",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10
-
+ CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160
+ GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,120
+ LTEXT "Çϵå¿þ¾î °¡¼Ó: ",IDC_STATIC,15,215,90,10
+ COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ CONTROL "µå¶óÀ̹ö ¾Ö¹Ä",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10
END
IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250
Index: programs/winecfg/Nl.rc
===================================================================
RCS file: /home/wine/wine/programs/winecfg/Nl.rc,v
retrieving revision 1.12
diff -p -u -r1.12 Nl.rc
--- programs/winecfg/Nl.rc 27 Oct 2005 11:24:02 -0000 1.12
+++ programs/winecfg/Nl.rc 6 Dec 2005 12:37:51 -0000
@@ -156,11 +156,11 @@ BEGIN
PUSHBUTTON "Automatisch detecteren",IDC_AUDIO_AUTODETECT,170,18,79,14
PUSHBUTTON "Configureer",IDC_AUDIO_CONFIGURE,170,38,49,14
PUSHBUTTON "Configuratiescherm",IDC_AUDIO_CONTROL_PANEL,170,58,69,14
-
- GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120
- LTEXT "Hardwareversnelling: ",IDC_STATIC,15,85,90,10
- COMBOBOX IDC_DSOUND_HW_ACCEL,100,83,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- CONTROL "Stuurprogramma emulatie",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10
+ CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160
+ GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,120
+ LTEXT "Hardwareversnelling: ",IDC_STATIC,15,215,90,10
+ COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Stuurprogramma emulatie",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10
END
IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250
Index: programs/winecfg/No.rc
===================================================================
RCS file: /home/wine/wine/programs/winecfg/No.rc,v
retrieving revision 1.5
diff -p -u -r1.5 No.rc
--- programs/winecfg/No.rc 5 Dec 2005 14:56:38 -0000 1.5
+++ programs/winecfg/No.rc 6 Dec 2005 12:37:51 -0000
@@ -157,13 +157,11 @@ BEGIN
PUSHBUTTON "Automatisk",IDC_AUDIO_AUTODETECT,170,20,49,14
PUSHBUTTON "Konfigurer",IDC_AUDIO_CONFIGURE,170,40,49,14
PUSHBUTTON "Kontrollpanel",IDC_AUDIO_CONTROL_PANEL,170,60,49,14
-
- GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120
-
- LTEXT "Maskinvareakselerasjon: ",IDC_STATIC,15,85,90,10
- COMBOBOX IDC_DSOUND_HW_ACCEL,100,83,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- CONTROL "Driveremulering",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10
-
+ CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160
+ GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,120
+ LTEXT "Maskinvareakselerasjon: ",IDC_STATIC,15,215,90,10
+ COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Driveremulering",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10
END
IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250
Index: programs/winecfg/Pt.rc
===================================================================
RCS file: /home/wine/wine/programs/winecfg/Pt.rc,v
retrieving revision 1.19
diff -p -u -r1.19 Pt.rc
--- programs/winecfg/Pt.rc 4 May 2005 09:49:22 -0000 1.19
+++ programs/winecfg/Pt.rc 6 Dec 2005 12:37:51 -0000
@@ -195,7 +195,14 @@ FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Driver de áudio: ",IDC_STATIC,10,20,60,8
COMBOBOX IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "Autodetectar",IDC_AUDIO_AUTODETECT,170,20,49,14
+ PUSHBUTTON "Autodetectar",IDC_AUDIO_AUTODETECT,170,20,59,14
+ PUSHBUTTON "Configure",IDC_AUDIO_CONFIGURE,170,40,59,14
+ PUSHBUTTON "Control Panel",IDC_AUDIO_CONTROL_PANEL,170,60,59,14
+ CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160
+ GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60
+ LTEXT "Hardware Acceleration: ",IDC_STATIC,15,215,90,10
+ COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Driver Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10
END
Index: programs/winecfg/Ru.rc
===================================================================
RCS file: /home/wine/wine/programs/winecfg/Ru.rc,v
retrieving revision 1.17
diff -p -u -r1.17 Ru.rc
--- programs/winecfg/Ru.rc 27 Oct 2005 11:24:02 -0000 1.17
+++ programs/winecfg/Ru.rc 6 Dec 2005 12:37:51 -0000
@@ -156,16 +156,14 @@ FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Çâóêîâîé äðàéâåð: ",IDC_STATIC,40,20,90,8
COMBOBOX IDC_AUDIO_DRIVER,40,40,75,105,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "Îïðåäåëèòü àâòîìàòè÷åñêè",IDC_AUDIO_AUTODETECT,150,20,100,14
+ PUSHBUTTON "Îïðåäåëèòü àâòîìàòè÷åñêè",IDC_AUDIO_AUTODETECT,170,20,100,14
PUSHBUTTON "Íàñòðîèòü",IDC_AUDIO_CONFIGURE,170,40,80,14
PUSHBUTTON "Ïàíåëü óïðàâëåíèÿ",IDC_AUDIO_CONTROL_PANEL,170,60,80,14
-
- GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120
-
- LTEXT "Àïïàðàòíîå óñêîðåíèå: ",IDC_STATIC,15,85,90,10
- COMBOBOX IDC_DSOUND_HW_ACCEL,100,83,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- CONTROL "Ïðîãðàììíàÿ ýìóëÿöèÿ",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10
-
+ CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160
+ GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,120
+ LTEXT "Àïïàðàòíîå óñêîðåíèå: ",IDC_STATIC,15,215,90,10
+ COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Ïðîãðàììíàÿ ýìóëÿöèÿ",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10
END
IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250
Index: programs/winecfg/Si.rc
===================================================================
RCS file: /home/wine/wine/programs/winecfg/Si.rc,v
retrieving revision 1.10
diff -p -u -r1.10 Si.rc
--- programs/winecfg/Si.rc 4 May 2005 09:49:22 -0000 1.10
+++ programs/winecfg/Si.rc 6 Dec 2005 12:37:51 -0000
@@ -83,6 +83,22 @@ FONT 8, "MS Shell Dlg"
BEGIN
END
+IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 260, 250
+STYLE WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Audio driver: ",IDC_STATIC,10,20,60,8
+ COMBOBOX IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ PUSHBUTTON "Autodetect",IDC_AUDIO_AUTODETECT,170,20,59,14
+ PUSHBUTTON "Configure",IDC_AUDIO_CONFIGURE,170,40,59,14
+ PUSHBUTTON "Control Panel",IDC_AUDIO_CONTROL_PANEL,170,60,59,14
+ CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160
+ GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60
+ LTEXT "Hardware Acceleration: ",IDC_STATIC,15,215,90,10
+ COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Driver Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10
+END
+
STRINGTABLE DISCARDABLE
BEGIN
IDS_WINE_VERSION "CVS"
Index: programs/winecfg/audio.c
===================================================================
RCS file: /home/wine/wine/programs/winecfg/audio.c,v
retrieving revision 1.15
diff -p -u -r1.15 audio.c
--- programs/winecfg/audio.c 3 Nov 2005 19:31:45 -0000 1.15
+++ programs/winecfg/audio.c 6 Dec 2005 12:37:52 -0000
@@ -38,6 +38,9 @@
#include <shlwapi.h>
#include <shlobj.h>
#include <mmsystem.h>
+#include <mmreg.h>
+#include <mmsystem.h>
+#include <mmddk.h>
#include "winecfg.h"
#include "resource.h"
@@ -116,6 +119,268 @@ static void configureAudioDriver(HWND hD
}
}
+static void initAudioDeviceTree(HWND hDlg)
+{
+ const AUDIO_DRIVER *pAudioDrv = NULL;
+ int i, j;
+ TVINSERTSTRUCT insert;
+ HTREEITEM root, driver[10];
+ HWND tree = NULL;
+
+ tree = GetDlgItem(hDlg, IDC_AUDIO_TREE);
+
+ if (!tree)
+ return;
+
+ SetWindowLong(tree, GWL_STYLE, GetWindowLong(tree, GWL_STYLE) | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT);
+
+ insert.hParent = TVI_ROOT;
+ insert.hInsertAfter = TVI_LAST;
+ insert.item.mask = TVIF_TEXT | TVIF_CHILDREN;
+ insert.item.pszText = "Sound Drivers";
+ insert.item.cChildren = 1;
+
+ root = (HTREEITEM)SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM) &insert);
+
+ pAudioDrv = getAudioDrivers();
+
+ for (i = 0; *pAudioDrv->szName; i++, pAudioDrv++)
+ {
+ HDRVR hdrv;
+ char name[MAX_PATH];
+ char text[MAX_PATH];
+
+ sprintf(name, "wine%s.drv", pAudioDrv->szDriver);
+ sprintf(text, "%s Driver", pAudioDrv->szName);
+
+ hdrv = OpenDriverA(name, 0, 0);
+ if (hdrv == 0) /* no driver loaded */
+ {
+ insert.hParent = root;
+ insert.item.mask = TVIF_TEXT;
+ insert.item.pszText = text;
+
+ driver[i] = (HTREEITEM)SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM) &insert);
+ }
+ else
+ {
+ DWORD (WINAPI * wodMessagePtr)(UINT, UINT, DWORD, DWORD, DWORD);
+ DWORD (WINAPI * widMessagePtr)(UINT, UINT, DWORD, DWORD, DWORD);
+ DWORD (WINAPI * modMessagePtr)(UINT, UINT, DWORD, DWORD, DWORD);
+ DWORD (WINAPI * midMessagePtr)(UINT, UINT, DWORD, DWORD, DWORD);
+ DWORD (WINAPI * auxMessagePtr)(UINT, UINT, DWORD, DWORD, DWORD);
+ DWORD (WINAPI * mxdMessagePtr)(UINT, UINT, DWORD, DWORD, DWORD);
+ HINSTANCE lib;
+
+ lib = LoadLibrary(name);
+ if (lib)
+ {
+ int num_wod = 0, num_wid = 0, num_mod = 0, num_mid = 0, num_aux = 0, num_mxd = 0;
+ wodMessagePtr = (void *)GetProcAddress(lib, "wodMessage");
+ widMessagePtr = (void *)GetProcAddress(lib, "widMessage");
+ modMessagePtr = (void *)GetProcAddress(lib, "modMessage");
+ midMessagePtr = (void *)GetProcAddress(lib, "midMessage");
+ auxMessagePtr = (void *)GetProcAddress(lib, "auxMessage");
+ mxdMessagePtr = (void *)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.item.mask = TVIF_TEXT;
+ insert.item.pszText = text;
+
+ driver[i] = (HTREEITEM)SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM) &insert);
+ }
+ else
+ {
+ HTREEITEM type;
+
+ insert.hParent = root;
+ insert.item.mask = TVIF_TEXT | TVIF_CHILDREN;
+ insert.item.pszText = text;
+ insert.item.cChildren = 1;
+
+ driver[i] = (HTREEITEM)SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM) &insert);
+
+ if (num_wod)
+ {
+ insert.hParent = driver[i];
+ insert.item.mask = TVIF_TEXT | TVIF_CHILDREN;
+ insert.item.pszText = "Wave Out Devices";
+ insert.item.cChildren = 1;
+
+ type = (HTREEITEM)SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM) &insert);
+
+ for (j = 0; j < num_wod; j++)
+ {
+ WAVEOUTCAPSW caps;
+ char szPname[MAXPNAMELEN];
+
+ wodMessagePtr(j, WODM_GETDEVCAPS, 0, (DWORD)&caps, sizeof(caps));
+ WideCharToMultiByte(CP_ACP, 0, caps.szPname, -1, szPname, MAXPNAMELEN, 0, 0);
+
+ insert.hParent = type;
+ insert.item.mask = TVIF_TEXT;
+ insert.item.pszText = (LPSTR)szPname;
+
+ SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM) &insert);
+ }
+ }
+
+ if (num_wid)
+ {
+ insert.hParent = driver[i];
+ insert.item.mask = TVIF_TEXT | TVIF_CHILDREN;
+ insert.item.pszText = "Wave In Devices";
+ insert.item.cChildren = 1;
+
+ type = (HTREEITEM)SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM) &insert);
+
+ for (j = 0; j < num_wid; j++)
+ {
+ WAVEINCAPSW caps;
+ char szPname[MAXPNAMELEN];
+
+ widMessagePtr(j, WIDM_GETDEVCAPS, 0, (DWORD)&caps, sizeof(caps));
+ WideCharToMultiByte(CP_ACP, 0, caps.szPname, -1, szPname, MAXPNAMELEN, 0, 0);
+
+ insert.hParent = type;
+ insert.item.mask = TVIF_TEXT;
+ insert.item.pszText = (LPSTR)szPname;
+
+ SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM) &insert);
+ }
+ }
+
+ if (num_mod)
+ {
+ insert.hParent = driver[i];
+ insert.item.mask = TVIF_TEXT | TVIF_CHILDREN;
+ insert.item.pszText = "MIDI Out Devices";
+ insert.item.cChildren = 1;
+
+ type = (HTREEITEM)SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM) &insert);
+
+ for (j = 0; j < num_mod; j++)
+ {
+ MIDIOUTCAPSW caps;
+ char szPname[MAXPNAMELEN];
+
+ modMessagePtr(j, MODM_GETDEVCAPS, 0, (DWORD)&caps, sizeof(caps));
+ WideCharToMultiByte(CP_ACP, 0, caps.szPname, -1, szPname, MAXPNAMELEN, 0, 0);
+
+ insert.hParent = type;
+ insert.item.mask = TVIF_TEXT;
+ insert.item.pszText = (LPSTR)szPname;
+
+ SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM) &insert);
+ }
+ }
+
+ if (num_mid)
+ {
+ insert.hParent = driver[i];
+ insert.item.mask = TVIF_TEXT | TVIF_CHILDREN;
+ insert.item.pszText = "MIDI In Devices";
+ insert.item.cChildren = 1;
+
+ type = (HTREEITEM)SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM) &insert);
+
+ for (j = 0; j < num_mid; j++)
+ {
+ MIDIINCAPSW caps;
+ char szPname[MAXPNAMELEN];
+
+ midMessagePtr(j, MIDM_GETDEVCAPS, 0, (DWORD)&caps, sizeof(caps));
+ WideCharToMultiByte(CP_ACP, 0, caps.szPname, -1, szPname, MAXPNAMELEN, 0, 0);
+
+ insert.hParent = type;
+ insert.item.mask = TVIF_TEXT;
+ insert.item.pszText = (LPSTR)szPname;
+
+ SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM) &insert);
+ }
+ }
+
+ if (num_aux)
+ {
+ insert.hParent = driver[i];
+ insert.item.mask = TVIF_TEXT | TVIF_CHILDREN;
+ insert.item.pszText = "Aux Devices";
+ insert.item.cChildren = 1;
+
+ type = (HTREEITEM)SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM) &insert);
+
+ for (j = 0; j < num_aux; j++)
+ {
+ AUXCAPSW caps;
+ char szPname[MAXPNAMELEN];
+
+ auxMessagePtr(j, AUXDM_GETDEVCAPS, 0, (DWORD)&caps, sizeof(caps));
+ WideCharToMultiByte(CP_ACP, 0, caps.szPname, -1, szPname, MAXPNAMELEN, 0, 0);
+
+ insert.hParent = type;
+ insert.item.mask = TVIF_TEXT;
+ insert.item.pszText = (LPSTR)szPname;
+
+ SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM) &insert);
+ }
+ }
+
+ if (num_mxd)
+ {
+ insert.hParent = driver[i];
+ insert.item.mask = TVIF_TEXT | TVIF_CHILDREN;
+ insert.item.pszText = "Mixer Devices";
+ insert.item.cChildren = 1;
+
+ type = (HTREEITEM)SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM) &insert);
+
+ for (j = 0; j < num_mxd; j++)
+ {
+ MIXERCAPSW caps;
+ char szPname[MAXPNAMELEN];
+
+ mxdMessagePtr(j, MXDM_GETDEVCAPS, 0, (DWORD)&caps, sizeof(caps));
+ WideCharToMultiByte(CP_ACP, 0, caps.szPname, -1, szPname, MAXPNAMELEN, 0, 0);
+
+ insert.hParent = type;
+ insert.item.mask = TVIF_TEXT;
+ insert.item.pszText = (LPSTR)szPname;
+
+ SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM) &insert);
+ }
+ }
+ }
+ FreeLibrary(lib);
+ }
+ }
+ }
+
+ 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]);
+}
+
static void initAudioDlg (HWND hDlg)
{
char *curAudioDriver = get_reg_key(config_key, "Drivers", "Audio", "alsa");
@@ -134,6 +399,7 @@ static void initAudioDlg (HWND hDlg)
}
}
+ initAudioDeviceTree(hDlg);
SendDlgItemMessage(hDlg, IDC_DSOUND_HW_ACCEL, CB_RESETCONTENT, 0, 0);
for (i = 0; NULL != DSound_HW_Accels[i]; ++i) {
Index: programs/winecfg/resource.h
===================================================================
RCS file: /home/wine/wine/programs/winecfg/resource.h,v
retrieving revision 1.33
diff -p -u -r1.33 resource.h
--- programs/winecfg/resource.h 27 Oct 2005 11:24:02 -0000 1.33
+++ programs/winecfg/resource.h 6 Dec 2005 12:37:52 -0000
@@ -139,6 +139,7 @@
#define IDC_AUDIO_CONTROL_PANEL 1303
#define IDC_DSOUND_HW_ACCEL 1304
#define IDC_DSOUND_DRV_EMUL 1305
+#define IDC_AUDIO_TREE 1306
/* appearance tab */
#define IDC_THEME_COLORCOMBO 1401
@@ -147,3 +148,4 @@
#define IDC_THEME_SIZETEXT 1404
#define IDC_THEME_THEMECOMBO 1405
#define IDC_THEME_INSTALL 1406
+
More information about the wine-patches
mailing list