[DXDIAG] Rename WIDTH, HEIGHT, InitListViewColumns and SetDeviceDetails. Zap WindowPr...

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

diff --git a/base/applications/dxdiag/display.c b/base/applications/dxdiag/display.c
index 5cef4ef..779772f 100644 (file)
--- a/base/applications/dxdiag/display.c
+++ b/base/applications/dxdiag/display.c
@@ -8,6 +8,7 @@
  */
 
 #include "precomp.h"
+
 #include <d3d9.h>
 
 BOOL
@@ -159,7 +160,7 @@ EnumerateDrivers(PVOID Context, HDEVINFO hList, PSP_DEVINFO_DATA pInfoData)
 
 static
 void
-SetDeviceDetails(HWND * hDlgCtrls, LPCGUID classGUID, LPGUID * deviceGUID)
+DisplayPageSetDeviceDetails(HWND * hDlgCtrls, LPCGUID classGUID, LPGUID * deviceGUID)
 {
     HDEVINFO hInfo;
     DWORD dwIndex = 0;
@@ -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);
@@ -233,14 +236,14 @@ InitializeDialog(HWND hwndDlg, PDISPLAY_DEVICEW pDispDevice)
             }
             else
             {
-                LoadStringW(hInst, IDS_OPTION_NO, szText, sizeof(szText)/sizeof(WCHAR));
+                LoadStringW(hInst, IDS_NOT_APPLICABLE, szText, sizeof(szText)/sizeof(WCHAR));
             }
         }
         IDirect3D9_Release(ppObj);
     }
     else
     {
-        LoadStringW(hInst, IDS_DEVICE_STATUS_UNKNOWN, szText, sizeof(szText)/sizeof(WCHAR));
+        LoadStringW(hInst, IDS_NOT_APPLICABLE, szText, sizeof(szText)/sizeof(WCHAR));
     }
     szText[(sizeof(szText)/sizeof(WCHAR))-1] = L'\0';
     SendDlgItemMessageW(hwndDlg, IDC_STATIC_ADAPTER_LOGO, WM_SETTEXT, 0, (LPARAM)szText);
@@ -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';
@@ -302,7 +305,7 @@ InitializeDialog(HWND hwndDlg, PDISPLAY_DEVICEW pDispDevice)
     hDlgCtrls[3] = GetDlgItem(hwndDlg, IDC_STATIC_ADAPTER_VERSION);
     hDlgCtrls[4] = GetDlgItem(hwndDlg, IDC_STATIC_ADAPTER_DATE);
 
-    SetDeviceDetails(hDlgCtrls, &GUID_DEVCLASS_DISPLAY, NULL);
+    DisplayPageSetDeviceDetails(hDlgCtrls, &GUID_DEVCLASS_DISPLAY, NULL);
     return TRUE;
 }
 
@@ -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;