winecfg: Use sound tree view for driver selection.

programs/winecfg/.gitignore

 Makefile
+idb_checkbox.bmp
 idb_wine.bmp
 winecfg
 winecfg.res

programs/winecfg/Bg.rc

@@ -22,6 +22,14 @@
 
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
+IDR_WINECFG MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Configure", IDC_AUDIO_CONFIGURE
+    END
+END
+
 IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270
 STYLE WS_CHILD
 FONT 8, "MS Shell Dlg"
@@ -154,18 +162,14 @@ IDD_AUDIOCFG DIALOG DISCARDABLE  0, 0, 260, 250
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT	" : ",IDC_STATIC,10,20,60,8
-    COMBOBOX	IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    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
-    CONTROL     "",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
-
+    GROUPBOX        " Driver Selection ",IDC_STATIC,8,4,244,195
+    LTEXT	    "  ",IDC_STATIC,15,20,227,30
+    CONTROL         "",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140
+    PUSHBUTTON	    " ",IDC_AUDIO_CONTROL_PANEL,170,50,69,14
+    GROUPBOX        " DirectSound ",IDC_STATIC,8,75,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

programs/winecfg/De.rc

@@ -22,6 +22,14 @@
 
 LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
 
+IDR_WINECFG MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Configure", IDC_AUDIO_CONFIGURE
+    END
+END
+
 IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270
 STYLE WS_CHILD
 FONT 8, "MS Shell Dlg"
@@ -151,16 +159,14 @@ IDD_AUDIOCFG DIALOG DISCARDABLE  0, 0, 260, 250
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT       "Audio Treiber: ",IDC_STATIC,10,20,60,8
-    COMBOBOX    IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON  "Automatisch",IDC_AUDIO_AUTODETECT,170,20,59,14
-    PUSHBUTTON  "Konfigurieren",IDC_AUDIO_CONFIGURE,170,40,59,14
-    PUSHBUTTON  "Kontrollschirm",IDC_AUDIO_CONTROL_PANEL,170,60,59,14
-    CONTROL     "Gerte",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160
-    GROUPBOX    " DirectSound ",IDC_STATIC,8,205,244,60    
-    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
+    GROUPBOX        " Driver Selection ",IDC_STATIC,8,4,244,195
+    LTEXT           "Audio Treiber: ",IDC_STATIC,15,20,227,30
+    CONTROL         "Gerte",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,50,140,140
+    PUSHBUTTON      "Kontrollschirm",IDC_AUDIO_CONTROL_PANEL,170,50,59,14
+    GROUPBOX        " DirectSound ",IDC_STATIC,8,205,244,60    
+    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

programs/winecfg/En.rc

@@ -24,6 +24,14 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
+IDR_WINECFG MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Configure", IDC_AUDIO_CONFIGURE
+    END
+END
+
 IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270
 STYLE WS_CHILD
 FONT 8, "MS Shell Dlg"
@@ -153,16 +161,14 @@ 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
+    GROUPBOX        " Driver Selection ",IDC_STATIC,8,4,244,195
+    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 recomended. 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,140,140 
+    PUSHBUTTON	    "Control Panel",IDC_AUDIO_CONTROL_PANEL,170,50,59,14
+    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

programs/winecfg/Es.rc

@@ -22,6 +22,14 @@
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
+IDR_WINECFG MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Configure", IDC_AUDIO_CONFIGURE
+    END
+END
+
 IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270
 STYLE WS_CHILD
 FONT 8, "MS Shell Dlg"
@@ -151,16 +159,14 @@ IDD_AUDIOCFG DIALOG DISCARDABLE  0, 0, 260, 250
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT       "Manejador audio:",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,59,14
-    PUSHBUTTON  "Configurar",IDC_AUDIO_CONFIGURE,170,40,59,14
-    PUSHBUTTON  "Panel de control",IDC_AUDIO_CONTROL_PANEL,170,60,59,14
-    CONTROL     "Dispositivos",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160
-    GROUPBOX    " DirectSound ",IDC_STATIC,8,205,244,60
-    LTEXT       "Aceleracin Hardware: ",IDC_STATIC,15,215,90,10
-    COMBOBOX	IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL     "Emulacin del manejador",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10
+    GROUPBOX        " Driver Selection ",IDC_STATIC,8,4,244,195
+    LTEXT           "Manejador audio:",IDC_STATIC,15,20,227,30
+    CONTROL         "Dispositivos",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140
+    PUSHBUTTON      "Panel de control",IDC_AUDIO_CONTROL_PANEL,170,50,59,14
+    GROUPBOX        " DirectSound ",IDC_STATIC,8,205,244,60
+    LTEXT           "Aceleracin Hardware: ",IDC_STATIC,15,215,90,10
+    COMBOBOX	    IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Emulacin del manejador",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10
 END
 
 IDD_APPEARANCE DIALOG DISCARDABLE  0, 0, 260, 250

programs/winecfg/Fi.rc

@@ -22,6 +22,14 @@
 
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 
+IDR_WINECFG MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Configure", IDC_AUDIO_CONFIGURE
+    END
+END
+
 IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270
 STYLE WS_CHILD
 FONT 8, "MS Shell Dlg"
@@ -150,17 +158,14 @@ IDD_AUDIOCFG DIALOG DISCARDABLE  0, 0, 260, 250
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT	"niajuri: ",IDC_STATIC,10,20,60,8
-    COMBOBOX	IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON	"&Tunnista automaattisesti",IDC_AUDIO_AUTODETECT,170,20,79,14
-    PUSHBUTTON	"&Mrit",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
+    GROUPBOX        " Driver Selection ",IDC_STATIC,8,4,244,195
+    LTEXT	    "niajuri: ",IDC_STATIC,15,20,227,30
+    CONTROL         "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140
+    PUSHBUTTON	    "&Hallintapaneeli",IDC_AUDIO_CONTROL_PANEL,170,50,79,14
+    GROUPBOX        " DirectSound ",IDC_STATIC,8,205,244,60
+    LTEXT	    "Laitteistopohjainen kiihdytys:",IDC_STATIC,15,215,90,10
+    COMBOBOX	    IDC_DSOUND_HW_ACCEL,100,213,150,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

programs/winecfg/Fr.rc

@@ -22,6 +22,14 @@
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
+IDR_WINECFG MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Configure", IDC_AUDIO_CONFIGURE
+    END
+END
+
 IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270
 STYLE WS_CHILD
 FONT 8, "MS Shell Dlg"
@@ -152,17 +160,14 @@ IDD_AUDIOCFG DIALOG DISCARDABLE  0, 0, 260, 250
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT	"Pilote audio: ",IDC_STATIC,10,20,60,8
-    COMBOBOX	IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON	"Autodtection",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
-
-    GROUPBOX    " DirectSound ",IDC_STATIC,8,75,244,120
-
-    LTEXT	"Acclration matrielle: ",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
+    GROUPBOX        " Driver Selection ",IDC_STATIC,8,4,244,195
+    LTEXT	    "Pilote audio: ",IDC_STATIC,15,20,227,30
+    CONTROL         "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140
+    PUSHBUTTON	    "Panneau de configuration",IDC_AUDIO_CONTROL_PANEL,170,50,85,14
+    GROUPBOX        " DirectSound ",IDC_STATIC,8,205,244,60
+    LTEXT	    "Acclration matrielle: ",IDC_STATIC,15,215,90,10
+    COMBOBOX	    IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Emulation pilote",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10
 END
 
 IDD_APPEARANCE DIALOG DISCARDABLE  0, 0, 260, 250

programs/winecfg/Ja.rc

@@ -24,6 +24,14 @@
 
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
+IDR_WINECFG MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Configure", IDC_AUDIO_CONFIGURE
+    END
+END
+
 IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270
 STYLE WS_CHILD
 FONT 9, "MS UI Gothic"
@@ -153,18 +161,14 @@ IDD_AUDIOCFG DIALOG DISCARDABLE  0, 0, 260, 250
 STYLE WS_CHILD | WS_DISABLED
 FONT 9, "MS UI Gothic"
 BEGIN
-    LTEXT	"オーディオドライバ: ",IDC_STATIC,10,20,60,8
-    COMBOBOX	IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    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
-
+    GROUPBOX        " Driver Selection ",IDC_STATIC,8,4,244,195
+    LTEXT	    "オーディオドライバ: ",IDC_STATIC,10,20,277,30
+    CONTROL         "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140
+    PUSHBUTTON	    "コントロールパネル",IDC_AUDIO_CONTROL_PANEL,170,50,49,14
+    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

programs/winecfg/Ko.rc

@@ -24,6 +24,14 @@
  */
 
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
+                                                                                
+IDR_WINECFG MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Configure", IDC_AUDIO_CONFIGURE
+    END
+END
 
 IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270
 STYLE WS_CHILD
@@ -154,16 +162,14 @@ IDD_AUDIOCFG DIALOG DISCARDABLE  0, 0, 260, 250
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT	"오디오 드라이버: ",IDC_STATIC,10,20,60,8
-    COMBOBOX	IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON	"자동검색",IDC_AUDIO_AUTODETECT,170,20,59,14
-    PUSHBUTTON	"설정",IDC_AUDIO_CONFIGURE,170,40,59,14
-    PUSHBUTTON	"제어판",IDC_AUDIO_CONTROL_PANEL,170,60,59,14
-    CONTROL     "장치",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
+    GROUPBOX        " Driver Selection ",IDC_STATIC,8,4,244,195
+    LTEXT	    "오디오 드라이버: ",IDC_STATIC,10,20,227,30
+    CONTROL         "장치",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,50,140,140 
+    PUSHBUTTON	    "제어판",IDC_AUDIO_CONTROL_PANEL,170,50,59,14
+    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

programs/winecfg/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winecfg.exe
 APPMODE   = -mwindows
-IMPORTS   = comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 advapi32 kernel32
+IMPORTS   = comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32 kernel32
 
 C_SRCS = \
 	appdefaults.c \
@@ -21,7 +21,9 @@ C_SRCS = \
 
 RC_SRCS = winecfg.rc
 RC_BINSRC = winecfg.rc
-RC_BINARIES = idb_wine.bmp 
+RC_BINARIES = \
+	idb_checkbox.bmp \
+	idb_wine.bmp
 
 @MAKE_PROG_RULES@
 

programs/winecfg/Nl.rc

@@ -22,6 +22,14 @@
  */
 
 LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
+                                                                                
+IDR_WINECFG MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Configure", IDC_AUDIO_CONFIGURE
+    END
+END
 
 IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270
 STYLE WS_CHILD
@@ -151,16 +159,14 @@ IDD_AUDIOCFG DIALOG DISCARDABLE  0, 0, 260, 250
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT	"Geluidsbesturing: ",IDC_STATIC,10,20,60,8
-    COMBOBOX	IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON	"Automatisch detecteren",IDC_AUDIO_AUTODETECT,170,18,79,14
-    PUSHBUTTON	"Configureer",IDC_AUDIO_CONFIGURE,170,38,79,14
-    PUSHBUTTON	"Configuratiescherm",IDC_AUDIO_CONTROL_PANEL,170,58,79,14
-    CONTROL     "Apparaten",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160
-    GROUPBOX    " DirectSound ",IDC_STATIC,8,205,244,60
-    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
+    GROUPBOX        " Driver Selection ",IDC_STATIC,8,4,244,195
+    LTEXT	    "Geluidsbesturing: ",IDC_STATIC,15,20,227,30
+    CONTROL         "Apparaten",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,50,150,160
+    PUSHBUTTON	    "Configuratiescherm",IDC_AUDIO_CONTROL_PANEL,170,50,79,14
+    GROUPBOX        " DirectSound ",IDC_STATIC,8,205,244,60
+    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

programs/winecfg/No.rc

@@ -21,6 +21,14 @@
  */
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
+                                                                                
+IDR_WINECFG MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Configure", IDC_AUDIO_CONFIGURE
+    END
+END
 
 IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270
 STYLE WS_CHILD
@@ -150,16 +158,14 @@ IDD_AUDIOCFG DIALOG DISCARDABLE  0, 0, 260, 250
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT	"Lyddriver: ",IDC_STATIC,10,20,60,8
-    COMBOBOX	IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON	"Automatisk",IDC_AUDIO_AUTODETECT,170,20,59,14
-    PUSHBUTTON	"Oppsett",IDC_AUDIO_CONFIGURE,170,40,59,14
-    PUSHBUTTON	"Kontrollpanel",IDC_AUDIO_CONTROL_PANEL,170,60,59,14
-    CONTROL     "Enheter",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160 
-    GROUPBOX    " DirectSound ",IDC_STATIC,8,205,244,60
-    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
+    GROUPBOX        " Driver Selection ",IDC_STATIC,8,4,244,195
+    LTEXT	    "Lyddriver: ",IDC_STATIC,15,20,227,30
+    CONTROL         "Enheter",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 
+    PUSHBUTTON	    "Kontrollpanel",IDC_AUDIO_CONTROL_PANEL,170,50,59,14
+    GROUPBOX        " DirectSound ",IDC_STATIC,8,205,244,60
+    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

programs/winecfg/Ru.rc

@@ -21,6 +21,14 @@
  */
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+                                                                                
+IDR_WINECFG MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Configure", IDC_AUDIO_CONFIGURE
+    END
+END
 
 IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270
 STYLE WS_CHILD
@@ -154,18 +162,14 @@ IDD_AUDIOCFG DIALOG DISCARDABLE  0, 0, 260, 250
 STYLE WS_CHILD | WS_DISABLED
 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_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
-
+    GROUPBOX        " Driver Selection ",IDC_STATIC,8,4,244,195
+    LTEXT	    " : ",IDC_STATIC,15,20,227,30
+    CONTROL         "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140
+    PUSHBUTTON	    " ",IDC_AUDIO_CONTROL_PANEL,170,50,80,14
+    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

programs/winecfg/main.c

@@ -259,7 +259,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrev, LPSTR szCmdLine, int nShow)
         return 0;
     }
 
-    if (initialize() != 0) {
+    if (initialize(hInstance) != 0) {
 	WINE_ERR("initialization failed, aborting\n");
 	ExitProcess(1);
     }

programs/winecfg/resource.h

@@ -133,13 +133,14 @@
 #define IDC_APP_REMOVEAPP               1202
 
 /* audio tab */
-#define IDC_AUDIO_AUTODETECT            1300
-#define IDC_AUDIO_DRIVER                1301
-#define IDC_AUDIO_CONFIGURE             1302
-#define IDC_AUDIO_CONTROL_PANEL         1303
-#define IDC_DSOUND_HW_ACCEL             1304
-#define IDC_DSOUND_DRV_EMUL             1305
-#define IDC_AUDIO_TREE			1306
+#define IDC_AUDIO_CONFIGURE             1300
+#define IDC_AUDIO_CONTROL_PANEL         1301
+#define IDC_DSOUND_HW_ACCEL             1302
+#define IDC_DSOUND_DRV_EMUL             1303
+#define IDC_AUDIO_TREE			1304
+#define IDR_WINECFG			1305
+#define IDB_CHECKBOX                    1306
+#define IDB_DEVICE                      1307
 
 /* appearance tab */
 #define IDC_THEME_COLORCOMBO            1401

programs/winecfg/winecfg.c

@@ -38,9 +38,10 @@
 WINE_DEFAULT_DEBUG_CHANNEL(winecfg);
 
 #include "winecfg.h"
+#include "resource.h"
 
 HKEY config_key = NULL;
-
+HMENU hPopupMenus = 0;
 
 
 /* this is called from the WM_SHOWWINDOW handlers of each tab page.
@@ -604,7 +605,8 @@ void PRINTERROR(void)
         WINE_TRACE("error: '%s'\n", msg);
 }
 
-int initialize(void) {
+int initialize(HINSTANCE hInstance)
+{
     DWORD res = RegCreateKey(HKEY_CURRENT_USER, WINE_KEY_ROOT, &config_key);
 
     if (res != ERROR_SUCCESS) {
@@ -612,6 +614,9 @@ int initialize(void) {
 	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);

programs/winecfg/winecfg.h

@@ -65,7 +65,7 @@ char **enumerate_values(HKEY root, char *path);
  */
 char *keypath(const char *section); 
 
-int initialize(void);
+int initialize(HINSTANCE hInstance);
 extern HKEY config_key;
 
 /* hack for the property sheet control  */
@@ -133,4 +133,6 @@ static inline void set_text(HWND dialog, WORD id, const char *text)
 
 #define WINE_KEY_ROOT "Software\\Wine"
 
+extern HMENU     hPopupMenus;
+
 #endif

programs/winecfg/winecfg.rc

@@ -964,3 +964,40 @@ IDB_WINE BITMAP idb_wine.bmp
  '1B 1B 1B 1B 1B 1B 1B 1B 1B 1B 1B 1B 1B 1B 1B 1B'
  '1B 1B 1B 1B 00 00'
 } */
+
+/* BINRES idb_checkbox.bmp */
+IDB_CHECKBOX BITMAP idb_checkbox.bmp
+/* {
+ '42 4D F6 01 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 30 00 00 00 10 00 00 00 01 00 04 00 00 00'
+ '00 00 80 01 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80'
+ '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80'
+ '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF'
+ '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
+ '00 00 FF FF FF 00 FF FF FF FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF 00'
+ '00 00 00 00 00 0F FF 00 00 00 00 00 00 0F FF FF'
+ 'FF FF FF FF FF FF FF 00 00 00 00 00 00 0F FF 00'
+ '00 00 00 00 00 0F FF FF FF FF FF FF FF FF FF 00'
+ 'FF FF FF FF F0 0F FF 00 FF FF FF FF F0 0F FF FF'
+ 'FF FF FF FF FF FF FF 00 FF FF FF FF F0 0F FF 00'
+ 'FF F0 FF FF F0 0F FF FF FF FF FF FF FF FF FF 00'
+ 'FF FF FF FF F0 0F FF 00 FF 00 0F FF F0 0F FF FF'
+ 'FF FF FF FF FF FF FF 00 FF FF FF FF F0 0F FF 00'
+ 'F0 00 00 FF F0 0F FF FF FF FF FF FF FF FF FF 00'
+ 'FF FF FF FF F0 0F FF 00 F0 0F 00 0F F0 0F FF FF'
+ 'FF FF FF FF FF FF FF 00 FF FF FF FF F0 0F FF 00'
+ 'F0 FF F0 00 F0 0F FF FF FF FF FF FF FF FF FF 00'
+ 'FF FF FF FF F0 0F FF 00 FF FF FF 00 F0 0F FF FF'
+ 'FF FF FF FF FF FF FF 00 FF FF FF FF F0 0F FF 00'
+ 'FF FF FF F0 F0 0F FF FF FF FF FF FF FF FF FF 00'
+ 'FF FF FF FF F0 0F FF 00 FF FF FF FF F0 0F FF FF'
+ 'FF FF FF FF FF FF FF 00 00 00 00 00 00 0F FF 00'
+ '00 00 00 00 00 0F FF FF FF FF FF FF FF FF FF 00'
+ '00 00 00 00 00 0F FF 00 00 00 00 00 00 0F FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF'
+} */