[PATCH] winecfg: Add tab for most Direct3D registry settings.

[stephen-wine at digitalnexus.org]

From: Stephen Chao <stephen-wine at digitalnexus.org>

---
 programs/winecfg/Makefile.in |    3 ++-
 programs/winecfg/main.c      |   16 +++++++++++++++-
 programs/winecfg/resource.h  |    8 ++++++++
 programs/winecfg/winecfg.h   |    1 +
 programs/winecfg/winecfg.rc  |   12 ++++++++++++
 5 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in
index 0190854..1db9fec 100644
--- a/programs/winecfg/Makefile.in
+++ b/programs/winecfg/Makefile.in
@@ -13,7 +13,8 @@ C_SRCS = \
 	main.c \
 	theme.c \
 	winecfg.c \
-	x11drvdlg.c
+	x11drvdlg.c \
+	direct3d.c
 
 RC_SRCS = winecfg.rc
 PO_SRCS = winecfg.rc
diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c
index 7376309..ccd59b0 100644
--- a/programs/winecfg/main.c
+++ b/programs/winecfg/main.c
@@ -60,7 +60,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam)
     return 0;
 }
 
-#define NUM_PROPERTY_PAGES 7
+#define NUM_PROPERTY_PAGES 8
 
 static INT_PTR
 doPropertySheet (HINSTANCE hInstance, HWND hOwner)
@@ -84,6 +84,20 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner)
     pg++;
 
     /*
+     * Fill out the (Direct3D) PROPSHEETPAGE data structure
+     * for the property sheet
+     */
+    psp[pg].dwSize = sizeof (PROPSHEETPAGEW);
+    psp[pg].dwFlags = PSP_USETITLE;
+    psp[pg].hInstance = hInstance;
+    psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_DIRECT3DCFG);
+    psp[pg].u2.pszIcon = NULL;
+    psp[pg].pfnDlgProc = Direct3DDlgProc;
+    psp[pg].pszTitle = load_string (IDS_TAB_DIRECT3D);
+    psp[pg].lParam = 0;
+    pg++;
+
+    /*
      * Fill out the (Libraries) PROPSHEETPAGE data structure 
      * for the property sheet
      */
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index 6d9c450..826b840 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -45,6 +45,7 @@
 #define IDS_SHELL_FOLDER                16
 #define IDS_LINKS_TO                    17
 #define IDS_WINECFG_TITLE_APP           18   /* App specific title */
+#define IDS_TAB_DIRECT3D                19
 #define IDI_WINECFG                     100
 #define IDD_MAINDLG                     101
 #define IDI_LOGO                        102
@@ -54,6 +55,7 @@
 #define IDD_GRAPHCFG                    110
 #define IDD_DLLCFG                      111
 #define IDD_DRIVECFG                    112
+#define IDD_DIRECT3DCFG                 113
 #define IDD_DESKTOP_INTEGRATION         115
 #define IDB_WINE_LOGO                   200
 #define IDC_TABABOUT                    1001
@@ -197,6 +199,12 @@
 #define IDC_SYSPARAM_COLOR              1416
 #define IDC_SYSPARAM_FONT               1417
 
+/* direct3d tab */
+#define IDC_D3DLIST			1501
+#define IDC_D3DKEY			1502
+#define IDC_D3DCOMBOVAL			1503
+#define IDC_D3DTIP			1504
+
 #define IDC_SYSPARAMS_BUTTON            8400
 #define IDC_SYSPARAMS_BUTTON_TEXT       8401
 #define IDC_SYSPARAMS_DESKTOP           8402
diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h
index 1959409..6775707 100644
--- a/programs/winecfg/winecfg.h
+++ b/programs/winecfg/winecfg.h
@@ -88,6 +88,7 @@ INT_PTR CALLBACK LibrariesDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM l
 INT_PTR CALLBACK AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 INT_PTR CALLBACK ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 INT_PTR CALLBACK AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK Direct3DDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 /* Drive management  */
 BOOL load_drives(void);
diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
index 4ded308..34baad7 100644
--- a/programs/winecfg/winecfg.rc
+++ b/programs/winecfg/winecfg.rc
@@ -38,6 +38,7 @@ BEGIN
     IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration"
     IDS_TAB_AUDIO           "Audio"
     IDS_TAB_ABOUT           "About"
+    IDS_TAB_DIRECT3D        "Direct3D"
     IDS_WINECFG_TITLE       "Wine configuration"
     IDS_WINECFG_TITLE_APP   "Wine configuration for %s"
     IDS_THEMEFILE           "Theme files (*.msstyles; *.theme)"
@@ -153,6 +154,17 @@ BEGIN
     COMBOBOX        IDC_WINVER,100,194,145,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP    
 END
 
+IDD_DIRECT3DCFG DIALOG  0, 0, 260, 220
+STYLE WS_CHILD | WS_DISABLED
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX        "Direct3D Settings", IDC_STATIC, 8, 4, 244, 210
+    CONTROL         "", IDC_D3DLIST, "SysListView32", WS_TABSTOP | WS_BORDER | LVS_ALIGNLEFT | LVS_SINGLESEL | LVS_REPORT, 15, 51, 148, 116
+    COMBOBOX        IDC_D3DCOMBOVAL, 167, 64, 79, 16, WS_TABSTOP | CBS_DROPDOWN | CBS_HASSTRINGS
+    EDITTEXT        IDC_D3DKEY, 167, 52, 79, 12, NOT WS_BORDER | NOT WS_TABSTOP | ES_READONLY
+    EDITTEXT        IDC_D3DTIP, 15, 174, 232, 36, WS_VSCROLL | NOT WS_TABSTOP | ES_MULTILINE | ES_READONLY
+END
+
 IDD_GRAPHCFG DIALOG  0, 0, 260, 220
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
-- 
1.7.8.3