[ros-diffs] [janderwald] 59113: [DXDIAG] - Disable call to Direct3DCreate9 [HACK] - Use the correct parent window handle when creating the system dialogs. - Fix the next page button - TODO: ReactOS needs to ch...

Author: janderwald
Date: Thu May 30 08:12:13 2013
New Revision: 59113

URL: http://svn.reactos.org/svn/reactos?rev=59113&view=rev
Log:
[DXDIAG]
- Disable call to Direct3DCreate9 [HACK]
- Use the correct parent window handle when creating the system dialogs.
- Fix the next page button
- TODO: ReactOS needs to check whether a correct parent window handle was provided
- Fixes dxdiag tab problem

Modified:
    trunk/reactos/base/applications/dxdiag/display.c
    trunk/reactos/base/applications/dxdiag/dxdiag.c
    trunk/reactos/base/applications/dxdiag/sound.c

Modified: trunk/reactos/base/applications/dxdiag/display.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d…
==============================================================================
--- trunk/reactos/base/applications/dxdiag/display.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/dxdiag/display.c	[iso-8859-1] Thu May 30 08:12:13
2013
@@ -214,12 +214,14 @@
     HWND hDlgCtrls[5];
     DWORD dwMemory;
     DEVMODEW DevMode;
-    IDirect3D9 * ppObj;
+    IDirect3D9 * ppObj = NULL;
     D3DADAPTER_IDENTIFIER9 Identifier;
     HRESULT hResult;
 
     szText[0] = L'\0';
-    ppObj = Direct3DCreate9(D3D_SDK_VERSION);
+
+    /* fix wine */
+    //ppObj = Direct3DCreate9(D3D_SDK_VERSION);
     if (ppObj)
     {
         hResult = IDirect3D9_GetAdapterIdentifier(ppObj, D3DADAPTER_DEFAULT ,
2/*D3DENUM_WHQL_LEVEL*/, &Identifier);

Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d…
==============================================================================
--- trunk/reactos/base/applications/dxdiag/dxdiag.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/dxdiag/dxdiag.c	[iso-8859-1] Thu May 30 08:12:13 2013
@@ -119,11 +119,11 @@
     pContext->hTabCtrl = hTabCtrlWnd;
 
     /* create the dialogs */
-    pContext->hDialogs[0] = CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_SYSTEM_DIALOG), hTabCtrlWnd, SystemPageWndProc, (LPARAM)pContext);
-    pContext->hDialogs[1] = CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_MUSIC_DIALOG), hTabCtrlWnd, MusicPageWndProc, (LPARAM)pContext);
-    pContext->hDialogs[2] = CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_INPUT_DIALOG), hTabCtrlWnd, InputPageWndProc, (LPARAM)pContext);
-    pContext->hDialogs[3] = CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_NETWORK_DIALOG), hTabCtrlWnd, NetworkPageWndProc, (LPARAM)pContext);
-    pContext->hDialogs[4] = CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_HELP_DIALOG), hTabCtrlWnd, HelpPageWndProc, (LPARAM)pContext);
+    pContext->hDialogs[0] = CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_SYSTEM_DIALOG), pContext->hMainDialog, SystemPageWndProc,
(LPARAM)pContext);
+    pContext->hDialogs[1] = CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_MUSIC_DIALOG), pContext->hMainDialog, MusicPageWndProc,
(LPARAM)pContext);
+    pContext->hDialogs[2] = CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_INPUT_DIALOG), pContext->hMainDialog, InputPageWndProc,
(LPARAM)pContext);
+    pContext->hDialogs[3] = CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_NETWORK_DIALOG), pContext->hMainDialog, NetworkPageWndProc,
(LPARAM)pContext);
+    pContext->hDialogs[4] = CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_HELP_DIALOG), pContext->hMainDialog, HelpPageWndProc,
(LPARAM)pContext);
 
     /* insert tab ctrl items */
     InsertTabCtrlItem(hTabCtrlWnd, 0, MAKEINTRESOURCEW(IDS_SYSTEM_DIALOG));
@@ -197,9 +197,11 @@
                EnableWindow(GetDlgItem(hwndDlg, IDC_BUTTON_NEXT), 
                             (CurSel != TabCtrl_GetItemCount(hTabCtrlWnd) - 1));
                
-               /* switch to next page */
+               /* switch to next tab */
                SendMessageW(hTabCtrlWnd, TCM_SETCURSEL, CurSel, 0L);
-                
+
+               /* show next page */
+               TabCtrl_OnSelChange(pContext);
                return TRUE;
             }
 

Modified: trunk/reactos/base/applications/dxdiag/sound.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/s…
==============================================================================
--- trunk/reactos/base/applications/dxdiag/sound.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/dxdiag/sound.c	[iso-8859-1] Thu May 30 08:12:13 2013
@@ -243,8 +243,6 @@
 
     /* set further device details */
     SetDeviceDetails(hwndDlg, &GUID_DEVCLASS_MEDIA, lpcstrDescription);
-
-
 
     /* load sound resource string */
     szSound[0] = L'\0';