[DXDIAG]

[reactos.git] / reactos / base / applications / dxdiag / display.c

diff --git a/reactos/base/applications/dxdiag/display.c b/reactos/base/applications/dxdiag/display.c
index 5cef4ef..66b00a5 100644 (file)
--- a/reactos/base/applications/dxdiag/display.c
+++ b/reactos/base/applications/dxdiag/display.c
@@ -8,6 +8,7 @@
  */
 
 #include "precomp.h"
+
 #include <d3d9.h>
 
 BOOL
@@ -213,13 +214,15 @@ InitializeDialog(HWND hwndDlg, PDISPLAY_DEVICEW pDispDevice)
     HKEY hKey;
     HWND hDlgCtrls[5];
     DWORD dwMemory;
-    DEVMODE DevMode;
-    IDirect3D9 * ppObj;
+    DEVMODEW DevMode;
+    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);
@@ -276,7 +279,7 @@ InitializeDialog(HWND hwndDlg, PDISPLAY_DEVICEW pDispDevice)
     }
 
     /* retrieve current display mode */
-    DevMode.dmSize = sizeof(DEVMODE);
+    DevMode.dmSize = sizeof(DEVMODEW);
     if (EnumDisplaySettingsW(pDispDevice->DeviceName, ENUM_CURRENT_SETTINGS, &DevMode))
     {
         szFormat[0] = L'\0';
@@ -337,7 +340,7 @@ void InitializeDisplayAdapters(PDXDIAG_CONTEXT pContext)
             break;
 
         pContext->hDisplayWnd = hDlgs;
-        hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY_DIALOG), pContext->hMainDialog, DisplayPageWndProc, (LPARAM)pContext);
+        hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY_DIALOG), pContext->hMainDialog, DisplayPageWndProc, (LPARAM)pContext); EnableDialogTheme(hwndDlg);
         if (!hwndDlg)
            break;