Implemented an array of 26 drives and interface functions for adding,

programs/winecfg/En.rc

@@ -139,28 +139,28 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Drive Configuration"
 FONT 8, "MS Sans Serif"
 BEGIN
-    DEFPUSHBUTTON   "&Close",ID_BUTTON_OK,145,150,50,13
+    DEFPUSHBUTTON   "&Ok",ID_BUTTON_OK,145,150,50,16
     LTEXT           "Letter:",IDC_STATIC,5,23,26,9
-    EDITTEXT        IDC_EDIT_LABEL,63,114,78,13,ES_AUTOHSCROLL
-    LTEXT           "Label:",IDC_STATIC_LABEL,33,117,29,12
-    LTEXT           "Type:",IDC_STATIC,5,54,21,10
+    EDITTEXT        IDC_EDIT_LABEL,63,108,78,13,ES_AUTOHSCROLL
+    LTEXT           "Label:",IDC_STATIC_LABEL,33,111,29,12
+    LTEXT           "Serial:",IDC_STATIC_SERIAL,33,127,29,12
+    EDITTEXT        IDC_EDIT_SERIAL,63,124,78,13,ES_AUTOHSCROLL
+    LTEXT           "Type:",IDC_STATIC_TYPE,5,39,21,10
     EDITTEXT        IDC_EDIT_PATH,31,5,117,13,ES_AUTOHSCROLL
-    LTEXT           "Path:",IDC_STATIC,5,9,20,9
-    LTEXT           "Names:",IDC_STATIC,5,39,25,9
-    EDITTEXT        IDC_EDIT_SERIAL,63,129,78,13,ES_AUTOHSCROLL
-    LTEXT           "Serial:",IDC_STATIC_SERIAL,33,130,29,12
-    COMBOBOX        IDC_COMBO_LETTER,31,20,78,60,CBS_DROPDOWNLIST  | 
+    LTEXT           "Path:",IDC_STATIC,5,8,20,9
+    COMBOBOX        IDC_COMBO_LETTER,31,20,77,60,CBS_DROPDOWNLIST  | 
                     WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Browse...",IDC_BUTTON_BROWSE_PATH,154,5,40,13
-    COMBOBOX        IDC_COMBO_TYPE,31,52,78,60,CBS_DROPDOWNLIST | 
+    COMBOBOX        IDC_COMBO_TYPE,31,36,77,60,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Show Advanced",IDC_BUTTON_SHOW_HIDE_ADVANCED,134,34,60,16
     CONTROL         "Autodetect from Device:",IDC_RADIO_AUTODETECT,"Button",
-                    BS_AUTORADIOBUTTON,21,79,93,10
-    EDITTEXT        IDC_EDIT_DEVICE,33,89,108,13,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_BUTTON_BROWSE_DEVICE,148,89,40,13
+                    BS_AUTORADIOBUTTON,21,69,93,10
+    EDITTEXT        IDC_EDIT_DEVICE,33,79,108,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_BUTTON_BROWSE_DEVICE,148,79,40,13
     CONTROL         "Manually Assign:",IDC_RADIO_ASSIGN,"Button",
-                    BS_AUTORADIOBUTTON,21,104,69,10
-    GROUPBOX        "Label and Serial Number",IDC_BOX_LABELSERIAL,6,68,189,79
+                    BS_AUTORADIOBUTTON,21,98,69,10
+    GROUPBOX        "Label and serial number",IDC_BOX_LABELSERIAL,6,58,189,85
 END
 
 IDD_AUDIOCFG 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 user32 advapi32
+IMPORTS   = comdlg32 comctl32 user32 advapi32 kernel32
 
 C_SRCS = \
 	appdefaults.c \

programs/winecfg/resource.h

@@ -108,19 +108,21 @@
 #define IDC_STATIC_LABEL                1073
 #define IDC_ENABLE_DESKTOP              1074
 #define IDS_DRIVE_NO_C                  1075
+#define IDC_BUTTON_SHOW_HIDE_ADVANCED   1076
+#define IDC_STATIC_TYPE                 1077
 
 /* x11drv */
-#define IDC_ENABLE_MANAGED              1076
-#define IDC_SCREEN_DEPTH                1077
-#define IDC_DX_MOUSE_GRAB               1078
-#define IDC_USE_TAKE_FOCUS              1079
-#define IDC_DOUBLE_BUFFER               1080
+#define IDC_ENABLE_MANAGED              1100
+#define IDC_SCREEN_DEPTH                1101
+#define IDC_DX_MOUSE_GRAB               1102
+#define IDC_USE_TAKE_FOCUS              1103
+#define IDC_DOUBLE_BUFFER               1104
 
 /* applications tab */
-#define IDC_APP_TREEVIEW                1021
-#define IDC_APP_ADDAPP                  1081
-#define IDC_APP_REMOVEAPP               1082
+#define IDC_APP_TREEVIEW                1200
+#define IDC_APP_ADDAPP                  1201
+#define IDC_APP_REMOVEAPP               1202
 
 /* audio tab */
-#define IDC_AUDIO_AUTODETECT            1085
-#define IDC_AUDIO_DRIVER                1086
+#define IDC_AUDIO_AUTODETECT            1300
+#define IDC_AUDIO_DRIVER                1301

programs/winecfg/winecfg.c

@@ -293,3 +293,13 @@ char *getDialogItemText(HWND hDlg, WORD controlID) {
     if (GetWindowText(item, result, len) == 0) return NULL;
     return result;
 }
+
+void PRINTERROR(void)
+{
+        LPSTR msg;
+
+        FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
+                       0, GetLastError(), MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),
+                       (LPSTR)&msg, 0, NULL);
+        WINE_TRACE("error: '%s'\n", msg);
+}

programs/winecfg/winecfg.h

@@ -118,6 +118,7 @@ INT_PTR CALLBACK AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 char *getDialogItemText(HWND hDlg, WORD controlID);
 #define disable(id) EnableWindow(GetDlgItem(dialog, id), 0);
 #define enable(id) EnableWindow(GetDlgItem(dialog, id), 1);
+void PRINTERROR(void); /* WINE_TRACE() the plaintext error message from GetLastError() */
 
 #define WINE_KEY_ROOT "Software\\Wine\\Wine\\Config"