28 Apr
2008
28 Apr
'08
3:14 p.m.
Author: janderwald
Date: Mon Apr 28 10:14:12 2008
New Revision: 33178
URL: http://svn.reactos.org/svn/reactos?rev=33178&view=rev
Log:
- add DirectDraw tests by Pigglesworth (Kamil Hornicek)
- add resources for display page
- start implementing display page
- sync german resources
- display custom service provider for DirectPlay
Added:
trunk/reactos/base/applications/dxdiag/ddtest.c (with props)
Modified:
trunk/reactos/base/applications/dxdiag/display.c
trunk/reactos/base/applications/dxdiag/dxdiag.c
trunk/reactos/base/applications/dxdiag/dxdiag.rbuild
trunk/reactos/base/applications/dxdiag/lang/de-DE.rc
trunk/reactos/base/applications/dxdiag/lang/en-US.rc
trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc
trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc
trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc
trunk/reactos/base/applications/dxdiag/network.c
trunk/reactos/base/applications/dxdiag/precomp.h
trunk/reactos/base/applications/dxdiag/resource.h
Added: trunk/reactos/base/applications/dxdiag/ddtest.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d…
==============================================================================
--- trunk/reactos/base/applications/dxdiag/ddtest.c (added)
+++ trunk/reactos/base/applications/dxdiag/ddtest.c [iso-8859-1] Mon Apr 28 10:14:12 2008
@@ -1,0 +1,336 @@
+/*
+ * PROJECT: ReactX Diagnosis Application
+ * LICENSE: LGPL - See COPYING in the top level directory
+ * FILE: base/applications/dxdiag/ddtest.c
+ * PURPOSE: ReactX DirectDraw tests
+ * COPYRIGHT: Copyright 2008 Kamil Hornicek
+ *
+ */
+
+
+#include "precomp.h"
+
+BOOL DDPrimarySurfaceTest(HWND hWnd);
+BOOL DDOffscreenBufferTest(HWND hWnd, BOOL Fullscreen);
+VOID DDRedrawFrame(LPDIRECTDRAWSURFACE lpDDSurface);
+VOID DDUpdateFrame(LPDIRECTDRAWSURFACE lpDDPrimarySurface ,LPDIRECTDRAWSURFACE
lpDDBackBuffer, BOOL Fullscreen, INT *posX, INT *posY, INT *gainX, INT *gainY, RECT
*rectDD);
+
+#define TEST_DURATION 5000
+#define WIDTH 800
+#define HEIGHT 600
+#define DD_TEST_STEP 5
+#define DD_SQUARE_SIZE 100
+#define DD_SQUARE_STEP 2
+
+
+
+BOOL StartDDTest(HWND hWnd, HINSTANCE hInstance, INT resTestDescription, INT resResult,
INT TestNr)
+{
+ WCHAR szTestDescription[256];
+ WCHAR szCaption[256];
+ WCHAR szResult[256];
+ WCHAR szError[256];
+ BOOL Result;
+
+ LoadStringW(hInstance, IDS_DDTEST_TITLE, szCaption, sizeof(szCaption) /
sizeof(WCHAR));
+ LoadStringW(hInstance, IDS_DDTEST_ERROR, szError, sizeof(szError) / sizeof(WCHAR));
+ LoadStringW(hInstance, resTestDescription, szTestDescription,
sizeof(szTestDescription) / sizeof(WCHAR));
+ LoadStringW(hInstance, resResult, szResult, sizeof(szResult) / sizeof(WCHAR));
+
+ if(MessageBox(NULL, szTestDescription, szCaption, MB_YESNO | MB_ICONQUESTION) ==
IDNO)
+ return FALSE;
+
+ ShowWindow(hWnd, SW_SHOW);
+
+ switch(TestNr){
+ case 1:
+ Result = DDPrimarySurfaceTest(hWnd);
+ break;
+ case 2:
+ Result = DDOffscreenBufferTest(hWnd, FALSE);
+ break;
+ case 3:
+ Result = DDOffscreenBufferTest(hWnd, TRUE);
+ break;
+ default:
+ Result = FALSE;
+ }
+
+ ShowWindow(hWnd, SW_HIDE);
+
+ if(!Result)
+ {
+ MessageBox(NULL, szError, szCaption, MB_OK | MB_ICONERROR);
+ return FALSE;
+ }
+
+ if(MessageBox(NULL, szResult, szCaption, MB_YESNO | MB_ICONQUESTION) == IDYES)
+ return TRUE;
+
+ return FALSE;
+}
+
+VOID DDTests(HWND hWnd, HINSTANCE hInstance)
+{
+ WCHAR szDescription[256];
+ WCHAR szCaption[256];
+
+ LoadStringW(hInstance, IDS_DDTEST_DESCRIPTION, szDescription, sizeof(szDescription) /
sizeof(WCHAR));
+ LoadStringW(hInstance, IDS_DDTEST_DESCRIPTION, szCaption, sizeof(szCaption) /
sizeof(WCHAR));
+ if(MessageBox(NULL, szDescription, szCaption, MB_YESNO | MB_ICONQUESTION) == IDNO)
+ PostQuitMessage(0);
+
+ StartDDTest(hWnd, hInstance, IDS_DDPRIMARY_DESCRIPTION, IDS_DDPRIMARY_RESULT, 1);
+ StartDDTest(hWnd, hInstance, IDS_DDOFFSCREEN_DESCRIPTION, IDS_DDOFFSCREEN_RESULT,
2);
+ StartDDTest(hWnd, hInstance, IDS_DDFULLSCREEN_DESCRIPTION, IDS_DDFULLSCREEN_RESULT,
3);
+}
+
+BOOL DDPrimarySurfaceTest(HWND hWnd){
+ UINT TimerID;
+ MSG msg;
+
+ LPDIRECTDRAW lpDD = NULL;
+ LPDIRECTDRAWSURFACE lpDDSurface = NULL;
+ DDSURFACEDESC DDSurfaceDesc;
+
+ if(DirectDrawCreate(NULL, &lpDD, NULL) != DD_OK)
+ return FALSE;
+
+ if(lpDD->lpVtbl->SetCooperativeLevel(lpDD, hWnd, DDSCL_NORMAL) != DD_OK)
+ {
+ lpDD->lpVtbl->Release(lpDD);
+ return FALSE;
+ }
+
+ /* create our primary surface */
+ ZeroMemory(&DDSurfaceDesc, sizeof(DDSurfaceDesc));
+ DDSurfaceDesc.dwSize = sizeof(DDSurfaceDesc);
+ DDSurfaceDesc.dwFlags = DDSD_CAPS;
+ DDSurfaceDesc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE;
+ DDSurfaceDesc.dwBackBufferCount = 0;
+
+ if(lpDD->lpVtbl->CreateSurface(lpDD, &DDSurfaceDesc, &lpDDSurface,
NULL) != DD_OK)
+ {
+ lpDD->lpVtbl->Release(lpDD);
+ return FALSE;
+ }
+
+ TimerID = SetTimer(hWnd, -1, (UINT)TEST_DURATION, NULL);
+
+ while (TRUE)
+ {
+ if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
+ {
+ if (msg.message == WM_TIMER && TimerID == msg.wParam)
+ break;
+ TranslateMessage(&msg);
+ DispatchMessage(&msg);
+ if (msg.message == WM_PAINT)
+ DDRedrawFrame(lpDDSurface);
+ }
+ }
+ KillTimer(hWnd, TimerID);
+ lpDDSurface->lpVtbl->Release(lpDDSurface);
+ lpDD->lpVtbl->Release(lpDD);
+
+return TRUE;
+}
+
+VOID DDRedrawFrame(LPDIRECTDRAWSURFACE lpDDSurface)
+{
+ HDC hdc;
+
+ if (lpDDSurface->lpVtbl->GetDC(lpDDSurface, &hdc) == DD_OK)
+ {
+ RECT rct;
+ HBRUSH BlackBrush, WhiteBrush;
+ BOOL Colour = FALSE;
+
+ rct.left = (GetSystemMetrics(SM_CXSCREEN) - WIDTH)/2;
+ rct.right = (GetSystemMetrics(SM_CXSCREEN) - WIDTH)/2 + WIDTH;
+ rct.top = (GetSystemMetrics(SM_CYSCREEN) - HEIGHT)/2;
+ rct.bottom = (GetSystemMetrics(SM_CYSCREEN) - HEIGHT)/2 + HEIGHT;
+
+ BlackBrush = CreateSolidBrush(RGB(0,0,0));
+ WhiteBrush = CreateSolidBrush(RGB(255,255,255));
+
+ while((rct.bottom - rct.top) > DD_TEST_STEP){
+ (Colour)? FillRect(hdc, &rct, WhiteBrush) : FillRect(hdc, &rct,
BlackBrush);
+ rct.top += DD_TEST_STEP;
+ rct.bottom -= DD_TEST_STEP;
+ rct.left += DD_TEST_STEP;
+ rct.right -= DD_TEST_STEP;
+ Colour = !Colour;
+ }
+ DeleteObject((HGDIOBJ)BlackBrush);
+ DeleteObject((HGDIOBJ)WhiteBrush);
+ lpDDSurface->lpVtbl->ReleaseDC(lpDDSurface, hdc);
+ }
+}
+
+
+BOOL DDOffscreenBufferTest(HWND hWnd, BOOL Fullscreen){
+ UINT TimerID, TimerIDUpdate;
+ LPDIRECTDRAW lpDD;
+ LPDIRECTDRAWSURFACE lpDDPrimarySurface;
+ LPDIRECTDRAWSURFACE lpDDBackBuffer;
+ DDSURFACEDESC DDSurfaceDesc;
+ DDSURFACEDESC DDBBSurfaceDesc;
+ DDSCAPS DDSCaps;
+ MSG msg;
+ RECT rectDD;
+ POINT wndPoint;
+ INT posX = 0, posY = 10, xGain = DD_SQUARE_STEP, yGain = DD_SQUARE_STEP;
+
+ if(DirectDrawCreate(NULL, &lpDD, NULL) != DD_OK)
+ return FALSE;
+
+ ZeroMemory(&DDSurfaceDesc, sizeof(DDSurfaceDesc));
+ DDSurfaceDesc.dwSize = sizeof(DDSurfaceDesc);
+
+ if(Fullscreen)
+ {
+ if(lpDD->lpVtbl->SetCooperativeLevel(lpDD, hWnd, DDSCL_EXCLUSIVE |
DDSCL_FULLSCREEN) != DD_OK)
+ {
+ lpDD->lpVtbl->Release(lpDD);
+ return FALSE;
+ }
+ if(lpDD->lpVtbl->SetDisplayMode(lpDD, WIDTH, HEIGHT, 32) != DD_OK)
+ {
+ lpDD->lpVtbl->Release(lpDD);
+ return FALSE;
+ }
+ DDSurfaceDesc.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT;
+ DDSurfaceDesc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_FLIP |
DDSCAPS_COMPLEX;
+ DDSurfaceDesc.dwBackBufferCount = 1;
+ }
+ else
+ {
+ if(lpDD->lpVtbl->SetCooperativeLevel(lpDD, hWnd, DDSCL_NORMAL) != DD_OK)
+ {
+ lpDD->lpVtbl->Release(lpDD);
+ return FALSE;
+ }
+ DDSurfaceDesc.dwFlags = DDSD_CAPS;
+ DDSurfaceDesc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
+ }
+
+
+ if(lpDD->lpVtbl->CreateSurface(lpDD, &DDSurfaceDesc,
&lpDDPrimarySurface, NULL) != DD_OK)
+ {
+ lpDD->lpVtbl->Release(lpDD);
+ return FALSE;
+ }
+
+ if(Fullscreen)
+ {
+ DDSCaps.dwCaps = DDSCAPS_BACKBUFFER;
+ if (lpDDPrimarySurface->lpVtbl->GetAttachedSurface(lpDDPrimarySurface,
&DDSCaps,&lpDDBackBuffer) != DD_OK)
+ {
+ lpDDPrimarySurface->lpVtbl->Release(lpDDPrimarySurface);
+ lpDD->lpVtbl->Release(lpDD);
+ return FALSE;
+ }
+ }
+ else
+ {
+ /* create our offscreen back buffer */
+ ZeroMemory(&DDBBSurfaceDesc,sizeof(DDBBSurfaceDesc));
+ DDBBSurfaceDesc.dwSize = sizeof(DDBBSurfaceDesc);
+ DDBBSurfaceDesc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
+ DDBBSurfaceDesc.dwHeight = HEIGHT;
+ DDBBSurfaceDesc.dwWidth = WIDTH;
+ DDBBSurfaceDesc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN;
+
+ if(lpDD->lpVtbl->CreateSurface(lpDD, &DDBBSurfaceDesc,
&lpDDBackBuffer, NULL) != DD_OK)
+ {
+ lpDD->lpVtbl->Release(lpDD);
+ lpDDPrimarySurface->lpVtbl->Release(lpDDPrimarySurface);
+ return FALSE;
+ }
+ wndPoint.x = 0;
+ wndPoint.y = 0;
+ ClientToScreen(hWnd, &wndPoint);
+ GetClientRect(hWnd, &rectDD);
+ OffsetRect(&rectDD, wndPoint.x, wndPoint.y);
+ }
+
+ /* set our timers, TimerID - for test timeout, TimerIDUpdate - for frame updating */
+ TimerID = SetTimer(hWnd, -1, (UINT)TEST_DURATION, NULL);
+ TimerIDUpdate = SetTimer(hWnd, 2, (UINT)10, NULL);
+
+ while (TRUE)
+ {
+ if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
+ {
+ if (msg.message == WM_TIMER)
+ {
+ if(msg.wParam == TimerID)
+ {
+ break;
+ }
+ else
+ {
+ DDUpdateFrame(lpDDPrimarySurface,lpDDBackBuffer,
Fullscreen,&posX, &posY, &xGain, &yGain, &rectDD);
+ }
+ }
+ TranslateMessage(&msg);
+ DispatchMessage(&msg);
+ }
+ }
+
+ lpDDPrimarySurface->lpVtbl->Release(lpDDPrimarySurface);
+ /* backbuffer is released automatically when in fullscreen */
+ if(!Fullscreen)
+ lpDDBackBuffer->lpVtbl->Release(lpDDBackBuffer);
+ lpDD->lpVtbl->Release(lpDD);
+
+return TRUE;
+}
+
+
+VOID DDUpdateFrame(LPDIRECTDRAWSURFACE lpDDPrimarySurface ,LPDIRECTDRAWSURFACE
lpDDBackBuffer, BOOL Fullscreen, INT *posX, INT *posY, INT *gainX, INT *gainY, RECT
*rectDD)
+{
+ HDC hdc;
+ DDBLTFX DDBlitFx;
+
+ /* clear back buffer and paint it black */
+ ZeroMemory(&DDBlitFx, sizeof(DDBlitFx));
+ DDBlitFx.dwSize = sizeof(DDBlitFx);
+ DDBlitFx.dwFillColor = 0;
+
+ lpDDBackBuffer->lpVtbl->Blt(lpDDBackBuffer, NULL, NULL, NULL, DDBLT_COLORFILL |
DDBLT_WAIT, &DDBlitFx);
+
+ if (lpDDBackBuffer->lpVtbl->GetDC(lpDDBackBuffer, &hdc) == DD_OK)
+ {
+ RECT rct;
+ HBRUSH WhiteBrush;
+
+ rct.left = *posX;
+ rct.right = *posX+DD_SQUARE_SIZE;
+ rct.top = *posY;
+ rct.bottom = *posY+DD_SQUARE_SIZE;
+
+ WhiteBrush = CreateSolidBrush(RGB(255,255,255));
+ FillRect(hdc, &rct, WhiteBrush);
+
+ if(*posX >= (WIDTH - DD_SQUARE_SIZE)) *gainX = -(*gainX);
+ if(*posY >= (HEIGHT - DD_SQUARE_SIZE)) *gainY = -(*gainY);
+ if(*posX < 0) *gainX = -1*(*gainX);
+ if(*posY < 0) *gainY = -1*(*gainY);
+
+ *posX += *gainX;
+ *posY += *gainY;
+
+ lpDDBackBuffer->lpVtbl->ReleaseDC(lpDDBackBuffer, hdc);
+
+ if(Fullscreen)
+ {
+ lpDDPrimarySurface->lpVtbl->Flip(lpDDPrimarySurface, NULL,
DDFLIP_WAIT);
+ }
+ else
+ {
+ lpDDPrimarySurface->lpVtbl->Blt(lpDDPrimarySurface, rectDD,
lpDDBackBuffer, NULL, DDBLT_WAIT, NULL);
+ }
+ }
+}
Propchange: trunk/reactos/base/applications/dxdiag/ddtest.c
------------------------------------------------------------------------------
svn:eol-style = native
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] Mon Apr 28 10:14:12
2008
@@ -8,17 +8,81 @@
*/
#include "precomp.h"
+#include <initguid.h>
+#include <devguid.h>
+
+static
+BOOL
+InitializeDialog(HWND hwndDlg)
+{
+ HDEVINFO hInfo;
+ SP_DEVICE_INTERFACE_DATA InterfaceData;
+ SP_DEVINFO_DATA InfoData;
+ DWORD dwIndex = 0;
+ WCHAR szText[100];
+
+ hInfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, hwndDlg,
DIGCF_PRESENT|DIGCF_PROFILE);
+ if (hInfo == INVALID_HANDLE_VALUE)
+ return FALSE;
+
+ do
+ {
+ ZeroMemory(&InterfaceData, sizeof(InterfaceData));
+ InterfaceData.cbSize = sizeof(InterfaceData);
+ InfoData.cbSize = sizeof(InfoData);
+
+ if (SetupDiEnumDeviceInfo(hInfo, dwIndex, &InfoData))
+ {
+ /* set device name */
+ if (SetupDiGetDeviceRegistryPropertyW(hInfo, &InfoData, SPDRP_DEVICEDESC,
NULL, (PBYTE)szText, sizeof(szText), NULL))
+ SendDlgItemMessageW(hwndDlg, IDC_STATIC_ADAPTER_ID, WM_SETTEXT, 0,
(LPARAM)szText);
+
+ }
+ /* FIXME
+ * only enumerate the first display adapter
+ */
+ break;
+
+ if (GetLastError() == ERROR_NO_MORE_ITEMS)
+ break;
+
+ dwIndex++;
+ }while(TRUE);
+
+
+ SetupDiDestroyDeviceInfoList(hInfo);
+ return TRUE;
+}
INT_PTR CALLBACK
DisplayPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{
- UNREFERENCED_PARAMETER(lParam);
- UNREFERENCED_PARAMETER(wParam);
- switch (message) {
+ PDXDIAG_CONTEXT pContext = (PDXDIAG_CONTEXT)GetWindowLongPtr(hDlg, DWLP_USER);
+ switch (message)
+ {
case WM_INITDIALOG:
{
+ pContext = (PDXDIAG_CONTEXT) lParam;
+ SetWindowLongPtr(hDlg, DWLP_USER, (LONG_PTR)pContext);
SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER |
SWP_NOSIZE | SWP_NOZORDER);
+ InitializeDialog(hDlg);
return TRUE;
+ }
+ case WM_COMMAND:
+ {
+ switch(LOWORD(wParam))
+ {
+ case IDC_BUTTON_TESTDD:
+ /* FIXME log result errors */
+ ShowWindow(pContext->hMainDialog, SW_HIDE);
+ StartDDTest(pContext->hMainDialog, hInst,
IDS_DDPRIMARY_DESCRIPTION, IDS_DDPRIMARY_RESULT, 1);
+ StartDDTest(pContext->hMainDialog, hInst,
IDS_DDOFFSCREEN_DESCRIPTION, IDS_DDOFFSCREEN_RESULT, 2);
+ StartDDTest(pContext->hMainDialog, hInst,
IDS_DDFULLSCREEN_DESCRIPTION, IDS_DDFULLSCREEN_RESULT, 3);
+ ShowWindow(pContext->hMainDialog, SW_SHOW);
+ /* FIXME resize window */
+ break;
+ }
+ break;
}
}
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] Mon Apr 28 10:14:12 2008
@@ -104,6 +104,9 @@
if (!pContext)
return;
+ /* store window handle */
+ pContext->hMainDialog = hwndDlg;
+
/* store the context */
SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pContext);
Modified: trunk/reactos/base/applications/dxdiag/dxdiag.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d…
==============================================================================
--- trunk/reactos/base/applications/dxdiag/dxdiag.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/dxdiag/dxdiag.rbuild [iso-8859-1] Mon Apr 28 10:14:12
2008
@@ -13,9 +13,12 @@
<library>shell32</library>
<library>version</library>
<library>dinput8</library>
+ <library>setupapi</library>
<library>dxguid</library>
<library>dsound</library>
+ <library>ddraw</library>
<library>version</library>
+ <library>gdi32</library>
<file>system.c</file>
<file>display.c</file>
<file>sound.c</file>
@@ -25,5 +28,6 @@
<file>help.c</file>
<file>dxdiag.c</file>
<file>dxdiag.rc</file>
+ <file>ddtest.c</file>
<pch>precomp.h</pch>
</module>
Modified: trunk/reactos/base/applications/dxdiag/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l…
==============================================================================
--- trunk/reactos/base/applications/dxdiag/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/dxdiag/lang/de-DE.rc [iso-8859-1] Mon Apr 28 10:14:12
2008
@@ -1,26 +1,26 @@
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 260
+IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 478, 280
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
WS_THICKFRAME
CAPTION "ReactX-Diagnoseprogramm"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL
"Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,374,230
- PUSHBUTTON "&Hilfe", IDC_BUTTON_HELP, 2, 241, 50, 14, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
- DEFPUSHBUTTON "&Nächste Seite", IDC_BUTTON_NEXT, 137, 241, 50, 14,
WS_CHILD | WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "Alle &Informationen speichern...", IDC_BUTTON_SAVE_INFO,
200, 241, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "&Beenden", IDC_BUTTON_EXIT, 323, 241, 50, 14, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
+ CONTROL
"Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,474,250
+ PUSHBUTTON "&Hilfe", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
+ DEFPUSHBUTTON "&Nächste Seite", IDC_BUTTON_NEXT, 137, 261, 50, 14,
WS_CHILD | WS_VISIBLE | WS_TABSTOP
+ PUSHBUTTON "Alle &Informationen speichern...", IDC_BUTTON_SAVE_INFO,
200, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+ PUSHBUTTON "&Beenden", IDC_BUTTON_EXIT, 323, 261, 50, 14, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
END
-IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Dieses Hilfsprogramm gibt detailierte Informationen über die
ReactX-Komponenten und -Treiber dieses Computers an.", -1, 10, 10, 343, 17
- LTEXT "Wählen Sie die entsprechende Registerkarte oben, wenn Sie den Bereich des
Problems bereits kennen. Klicken Sie andernfalls auf ""Nächste
Seite"", um alle Seiten nacheinander zu durchsuchen.", -1, 10, 30, 343, 25
- GROUPBOX "Systeminformationen", -1, 10, 55, 343, 130, SS_RIGHT
+ LTEXT "Dieses Hilfsprogramm gibt detailierte Informationen über die
ReactX-Komponenten und -Treiber dieses Computers an.", -1, 10, 10, 443, 17
+ LTEXT "Wählen Sie die entsprechende Registerkarte oben, wenn Sie den Bereich des
Problems bereits kennen. Klicken Sie andernfalls auf ""Nächste
Seite"", um alle Seiten nacheinander zu durchsuchen.", -1, 10, 30, 443, 25
+ GROUPBOX "Systeminformationen", -1, 10, 55, 443, 130, SS_RIGHT
LTEXT "Aktuelles Datum/Zeit:", -1, 70, 70, 80, 10, SS_RIGHT
LTEXT "Computername:", -1, 70, 80, 80, 10, SS_RIGHT
LTEXT "Betriebssystem:", -1, 70, 90, 80, 10, SS_RIGHT
@@ -45,39 +45,94 @@
LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
END
-IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Gerät", -1, 10, 10, 220, 100
+ RTEXT "Name:", -1, 20, 25, 70, 10
+ RTEXT "Hersteller:", -1, 20, 35, 70, 10
+ RTEXT "Chiptyp:", -1, 20, 45, 70, 10
+ RTEXT "DAC-Typ:", -1, 20, 55, 70, 10
+ RTEXT "Gesamtspeicher ca.:", -1, 20, 65, 70, 10
+ RTEXT "Anzeigemodus:", -1, 20, 75, 70, 10
+ RTEXT "Monitor:", -1, 20, 85, 70, 10
+ LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 130, 10
+
+ GROUPBOX "Treiber", -1, 240, 10, 220, 100
+ RTEXT "Hauptreiber:", -1, 245, 30, 55, 10
+ RTEXT "Version:", -1, 245, 40, 55, 10
+ RTEXT "Datum:", -1, 245, 50, 55, 10
+ RTEXT "Mit WHQL-Logo:", -1, 245, 60, 55, 10
+ RTEXT "Mini-VDD:", -1, 245, 70, 55, 10
+ RTEXT "VDD:", -1, 245, 80, 55, 10
+ RTEXT "DDI-Version:", -1, 245, 90, 55, 10
+ LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 305, 30, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_VERSION, 305, 40, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_DATE, 305, 50, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_LOGO, 305, 60, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 305, 70, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_VDD, 305, 80, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_DDI, 305, 90, 130, 10
+
+ GROUPBOX "ReactX-Funktionen", -1, 10, 115, 450, 60
+ RTEXT "DirectDraw-Beschleunigung:", -1, 15, 130, 110, 12
+ RTEXT "Direct3D-Beschleunigung:", -1, 15, 145, 110, 12
+ RTEXT "AGP-Oberflächenbeschleunigung:", -1, 15, 160, 110, 12
+ LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
+ LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
+ LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
+ PUSHBUTTON "Aktivieren", IDC_BUTTON_DDRAW, 170, 130, 60, 12, WS_DISABLED
+ PUSHBUTTON "Aktivieren", IDC_BUTTON_D3D, 170, 145, 60, 12, WS_DISABLED
+ PUSHBUTTON "Aktivieren", IDC_BUTTON_AGP, 170, 160, 60, 12, WS_DISABLED
+ PUSHBUTTON "DirectDraw &testen", IDC_BUTTON_TESTDD, 250, 130, 80, 12
+ PUSHBUTTON "Direct3D t&esten", IDC_BUTTON_TEST3D, 250, 145, 80, 12,
WS_DISABLED
+
+ GROUPBOX "Hinweise", -1, 10, 180, 450, 40
+ EDITTEXT IDC_TEXT_INFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP
+END
+
+
+IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+END
+
+IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 220
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
END
-IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
+ GROUPBOX "DirectInput Geräte", -1, 10, 10, 452, 80
+ CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT |
WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 432, 60
+ GROUPBOX "Eingabebezogene Geräte", -1, 10, 100, 452, 60
+ CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS |
TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE |
WS_BORDER | WS_TABSTOP, 20, 110, 432, 40, 0x00000200
+ GROUPBOX "Hinweis", -1, 10, 170, 452, 50
+ EDITTEXT IDC_RICH_INFO, 20, 180, 432, 30, WS_DISABLED | WS_TABSTOP
END
-IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
+ GROUPBOX "Registrierte DirectPlay-Dienstanbieter", -1, 10, 10, 452, 80
+ CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT |
WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 432, 60
END
-
-IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-END
-
-IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-END
-
-IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
@@ -98,4 +153,37 @@
IDS_FORMAT_UNIPROC "%s (%u CPU)"
IDS_FORMAT_MPPROC "%s (%u CPUs)"
IDS_VERSION_UNKNOWN "Unbekannte Version"
+ IDS_DEVICE_STATUS_ATTACHED "Angeschlossen"
+ IDS_DEVICE_STATUS_MISSING "Entfernt"
+ IDS_DEVICE_STATUS_UNKNOWN "Unbekannt"
+ IDS_DEVICE_NAME "Gerätename"
+ IDS_DEVICE_STATUS "Status"
+ IDS_DEVICE_CONTROLLER "Controllererkennung"
+ IDS_DEVICE_MANUFACTURER "Herstellererkennung"
+ IDS_DEVICE_PRODUCT "Produkterkennung"
+ IDS_DEVICE_FORCEFEEDBACK "Force Feedback-Treiber"
+ IDS_NOT_APPLICABLE "Nicht zutreffend"
+ IDS_OPTION_YES "Ja"
+ IDS_DIRECTPLAY_COL_NAME1 "Name"
+ IDS_DIRECTPLAY_COL_NAME2 "Registrierung"
+ IDS_DIRECTPLAY_COL_NAME3 "Datei"
+ IDS_DIRECTPLAY_COL_NAME4 "Version"
+ IDS_DIRECTPLAY8_MODEMSP "DirectPlay8-Modemdienstanbieter"
+ IDS_DIRECTPLAY8_SERIALSP "DirectPlay8 serieller Dienstanbieter"
+ IDS_DIRECTPLAY8_IPXSP "DirectPlay8-IPX-Dienstanbieter"
+ IDS_DIRECTPLAY8_TCPSP "DirectPlay8-TCP/IP-Dienstanbieter"
+ IDS_DIRECTPLAY_TCPCONN "TCP/IP Verbindung für DirectPlay"
+ IDS_DIRECTPLAY_IPXCONN "IPX Verbindung für DirectPlay"
+ IDS_DIRECTPLAY_MODEMCONN "Modemverbindung für DirectPlay"
+ IDS_DIRECTPLAY_SERIALCONN "Serielle Verbindung für DirectPlay"
+ IDS_REG_SUCCESS "OK"
+ IDS_REG_FAIL "Fehler"
+ IDS_DDTEST_ERROR "Test failed!"
+ IDS_DDTEST_DESCRIPTION "This will start DirecDraw interface test. Continue?"
+ IDS_DDPRIMARY_DESCRIPTION "This test will use DirectDraw to draw on primary
surface. Black and white rectangles should be drawn. Continue?"
+ IDS_DDPRIMARY_RESULT "Did you see black and white rectangles?"
+ IDS_DDOFFSCREEN_DESCRIPTION "This test will use DirectDraw to draw in an offscreen
buffer. Moving white rectangle should be drawn. Continue?"
+ IDS_DDOFFSCREEN_RESULT "Did you see white moving reactangle?"
+ IDS_DDFULLSCREEN_DESCRIPTION "This test will use DirectDraw to draw in a fullscreen
mode. Moving white rectangle should be drawn. Continue?"
+ IDS_DDFULLSCREEN_RESULT "Did you see white moving reactangle in a fullscreen
mode?"
END
Modified: trunk/reactos/base/applications/dxdiag/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l…
==============================================================================
--- trunk/reactos/base/applications/dxdiag/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/dxdiag/lang/en-US.rc [iso-8859-1] Mon Apr 28 10:14:12
2008
@@ -1,26 +1,26 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 280
+IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 478, 280
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
WS_THICKFRAME
CAPTION "ReactX-Diagnostic program"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL
"Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,374,250
+ CONTROL
"Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,474,250
PUSHBUTTON "&Help", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
DEFPUSHBUTTON "&Next Page", IDC_BUTTON_NEXT, 137, 261, 50, 14, WS_CHILD
| WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "&Save All Information...", IDC_BUTTON_SAVE_INFO, 201, 261,
110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "&Exit", IDC_BUTTON_EXIT, 323, 261, 50, 14, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
END
-IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "This tool reports detailed information about the ReactX components and
drivers installed on your system.", -1, 10, 10, 343, 17
- LTEXT "If you know what area is causing the problem, click the appropiate tab
above. Otherwise you can use the ""Next Page"" button below to visit
each page in sequence.", -1, 10, 30, 343, 25
- GROUPBOX "System Information", -1, 10, 55, 343, 130, SS_RIGHT
+ LTEXT "This tool reports detailed information about the ReactX components and
drivers installed on your system.", -1, 10, 10, 443, 17
+ LTEXT "If you know what area is causing the problem, click the appropiate tab
above. Otherwise you can use the ""Next Page"" button below to visit
each page in sequence.", -1, 10, 30, 443, 25
+ GROUPBOX "System Information", -1, 10, 55, 443, 130, SS_RIGHT
LTEXT "Current Date/Time:", -1, 70, 70, 80, 10, SS_RIGHT
LTEXT "Computer Name:", -1, 70, 80, 80, 10, SS_RIGHT
LTEXT "Operating System:", -1, 70, 90, 80, 10, SS_RIGHT
@@ -45,47 +45,94 @@
LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
END
-IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Device", -1, 10, 10, 220, 100
+ RTEXT "Name:", -1, 20, 25, 70, 10
+ RTEXT "Manufacturer:", -1, 20, 35, 70, 10
+ RTEXT "Chip Type:", -1, 20, 45, 70, 10
+ RTEXT "DAC Type:", -1, 20, 55, 70, 10
+ RTEXT "Approx. Total Memory:", -1, 20, 65, 70, 10
+ RTEXT "Current Display Mode:", -1, 20, 75, 70, 10
+ RTEXT "Monitor:", -1, 20, 85, 70, 10
+ LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 130, 10
+
+ GROUPBOX "Driver", -1, 240, 10, 220, 100
+ RTEXT "Main Driver:", -1, 245, 30, 55, 10
+ RTEXT "Version:", -1, 245, 40, 55, 10
+ RTEXT "Date:", -1, 245, 50, 55, 10
+ RTEXT "WHQL-Logo:", -1, 245, 60, 55, 10
+ RTEXT "Mini-VDD:", -1, 245, 70, 55, 10
+ RTEXT " vvdddVDD:", -1, 245, 80, 55, 10
+ RTEXT "DDI Version:", -1, 245, 90, 55, 10
+ LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 305, 30, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_VERSION, 305, 40, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_DATE, 305, 50, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_LOGO, 305, 60, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 305, 70, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_VDD, 305, 80, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_DDI, 305, 90, 130, 10
+
+ GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60
+ RTEXT "DirectDraw Acceleration:", -1, 15, 130, 110, 12
+ RTEXT "Direct3D Acceleration:", -1, 15, 145, 110, 12
+ RTEXT "AGP Texture Acceleration:", -1, 15, 160, 110, 12
+ LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
+ LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
+ LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
+ PUSHBUTTON "Enable", IDC_BUTTON_DDRAW, 170, 130, 60, 12, WS_DISABLED
+ PUSHBUTTON "Enable", IDC_BUTTON_D3D, 170, 145, 60, 12, WS_DISABLED
+ PUSHBUTTON "Enable", IDC_BUTTON_AGP, 170, 160, 60, 12, WS_DISABLED
+ PUSHBUTTON "Test DirectDraw", IDC_BUTTON_TESTDD, 250, 130, 80, 12
+ PUSHBUTTON "Test Direct3D", IDC_BUTTON_TEST3D, 250, 145, 80, 12,
WS_DISABLED
+
+ GROUPBOX "Notes", -1, 10, 180, 450, 40
+ EDITTEXT IDC_TEXT_INFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP
+END
+
+
+IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+END
+
+IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
END
-IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
+ GROUPBOX "DirectInput Devices", -1, 10, 10, 452, 80
+ CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT |
WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 432, 60
+ GROUPBOX "Input Devices", -1, 10, 100, 452, 60
+ CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS |
TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE |
WS_BORDER | WS_TABSTOP, 20, 110, 432, 40, 0x00000200
+ GROUPBOX "Information", -1, 10, 170, 352, 50
+ EDITTEXT IDC_RICH_INFO, 20, 180, 432, 30, WS_DISABLED | WS_TABSTOP
END
-IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
+ GROUPBOX "Registered DirectPlay Service Provider", -1, 10, 10, 452, 80
+ CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT |
WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 432, 60
END
-
-IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
- GROUPBOX "DirectInput Devices", -1, 10, 10, 352, 80
- CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT |
WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 332, 60
- GROUPBOX "Input Devices", -1, 10, 100, 352, 60
- CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS |
TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE |
WS_BORDER | WS_TABSTOP, 20, 110, 332, 40, 0x00000200
- GROUPBOX "Information", -1, 10, 170, 352, 50
- EDITTEXT IDC_RICH_INFO, 20, 180, 332, 30, WS_DISABLED | WS_TABSTOP
-END
-
-IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
- GROUPBOX "Registered DirectPlay Service Provider", -1, 10, 10, 352, 80
- CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT |
WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 332, 60
-END
-
-IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
@@ -131,4 +178,12 @@
IDS_DIRECTPLAY_SERIALCONN "Serial Connection For DirectPlay"
IDS_REG_SUCCESS "OK"
IDS_REG_FAIL "Error"
+ IDS_DDTEST_ERROR "Test failed!"
+ IDS_DDTEST_DESCRIPTION "This will start DirecDraw interface test. Continue?"
+ IDS_DDPRIMARY_DESCRIPTION "This test will use DirectDraw to draw on primary
surface. Black and white rectangles should be drawn. Continue?"
+ IDS_DDPRIMARY_RESULT "Did you see black and white rectangles?"
+ IDS_DDOFFSCREEN_DESCRIPTION "This test will use DirectDraw to draw in an offscreen
buffer. Moving white rectangle should be drawn. Continue?"
+ IDS_DDOFFSCREEN_RESULT "Did you see white moving reactangle?"
+ IDS_DDFULLSCREEN_DESCRIPTION "This test will use DirectDraw to draw in a fullscreen
mode. Moving white rectangle should be drawn. Continue?"
+ IDS_DDFULLSCREEN_RESULT "Did you see white moving reactangle in a fullscreen
mode?"
END
Modified: trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l…
==============================================================================
--- trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc [iso-8859-1] Mon Apr 28 10:14:12
2008
@@ -1,13 +1,13 @@
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 280
+IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 478, 280
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
WS_THICKFRAME
CAPTION "ReactX - Programme de diagnostic"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL
"Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,374,250
+ CONTROL
"Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,474,250
PUSHBUTTON "Aide", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE |
WS_TABSTOP
DEFPUSHBUTTON "Page suiva&nte", IDC_BUTTON_NEXT, 137, 261, 50, 14,
WS_CHILD | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "Enregi&strer toutes les informations...",
IDC_BUTTON_SAVE_INFO, 201, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
@@ -18,9 +18,9 @@
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "This tool reports detailed information about the ReactX components and
drivers installed on your system.", -1, 10, 10, 343, 17
- LTEXT "If you know what area is causing the problem, click the appropiate tab
above. Otherwise you can use the ""Next Page"" button below to visit
each page in sequence.", -1, 10, 30, 343, 25
- GROUPBOX "System Information", -1, 10, 55, 343, 130, SS_RIGHT
+ LTEXT "This tool reports detailed information about the ReactX components and
drivers installed on your system.", -1, 10, 10, 443, 17
+ LTEXT "If you know what area is causing the problem, click the appropiate tab
above. Otherwise you can use the ""Next Page"" button below to visit
each page in sequence.", -1, 10, 30, 443, 25
+ GROUPBOX "System Information", -1, 10, 55, 443, 130, SS_RIGHT
LTEXT "Current Date/Time:", -1, 70, 70, 80, 10, SS_RIGHT
LTEXT "Computer Name:", -1, 70, 80, 80, 10, SS_RIGHT
LTEXT "Operating System:", -1, 70, 90, 80, 10, SS_RIGHT
@@ -45,47 +45,94 @@
LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
END
-IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Device", -1, 10, 10, 220, 100
+ RTEXT "Name:", -1, 20, 25, 70, 10
+ RTEXT "Manufacturer:", -1, 20, 35, 70, 10
+ RTEXT "Chip Type:", -1, 20, 45, 70, 10
+ RTEXT "DAC Type:", -1, 20, 55, 70, 10
+ RTEXT "Approx. Total Memory:", -1, 20, 65, 70, 10
+ RTEXT "Current Display Mode:", -1, 20, 75, 70, 10
+ RTEXT "Monitor:", -1, 20, 85, 70, 10
+ LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 130, 10
+
+ GROUPBOX "Driver", -1, 240, 10, 220, 100
+ RTEXT "Main Driver:", -1, 245, 30, 55, 10
+ RTEXT "Version:", -1, 245, 40, 55, 10
+ RTEXT "Date:", -1, 245, 50, 55, 10
+ RTEXT "WHQL-Logo:", -1, 245, 60, 55, 10
+ RTEXT "Mini-VDD:", -1, 245, 70, 55, 10
+ RTEXT " vvdddVDD:", -1, 245, 80, 55, 10
+ RTEXT "DDI Version:", -1, 245, 90, 55, 10
+ LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 305, 30, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_VERSION, 305, 40, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_DATE, 305, 50, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_LOGO, 305, 60, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 305, 70, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_VDD, 305, 80, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_DDI, 305, 90, 130, 10
+
+ GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60
+ RTEXT "DirectDraw Acceleration:", -1, 15, 130, 110, 12
+ RTEXT "Direct3D Acceleration:", -1, 15, 145, 110, 12
+ RTEXT "AGP Texture Acceleration:", -1, 15, 160, 110, 12
+ LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
+ LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
+ LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
+ PUSHBUTTON "Enable", IDC_BUTTON_DDRAW, 170, 130, 60, 12, WS_DISABLED
+ PUSHBUTTON "Enable", IDC_BUTTON_D3D, 170, 145, 60, 12, WS_DISABLED
+ PUSHBUTTON "Enable", IDC_BUTTON_AGP, 170, 160, 60, 12, WS_DISABLED
+ PUSHBUTTON "Test DirectDraw", IDC_BUTTON_TESTDD, 250, 130, 80, 12
+ PUSHBUTTON "Test Direct3D", IDC_BUTTON_TEST3D, 250, 145, 80, 12,
WS_DISABLED
+
+ GROUPBOX "Notes", -1, 10, 180, 450, 40
+ EDITTEXT IDC_TEXT_INFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP
+END
+
+
+IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+END
+
+IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
END
-IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
+ GROUPBOX "DirectInput Devices", -1, 10, 10, 452, 80
+ CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT |
WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 432, 60
+ GROUPBOX "Input Devices", -1, 10, 100, 452, 60
+ CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS |
TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE |
WS_BORDER | WS_TABSTOP, 20, 110, 432, 40, 0x00000200
+ GROUPBOX "Information", -1, 10, 170, 452, 50
+ EDITTEXT IDC_RICH_INFO, 20, 180, 432, 30, WS_DISABLED | WS_TABSTOP
END
-IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 220
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
+ GROUPBOX "Registered DirectPlay Service Provider", -1, 10, 10, 452, 80
+ CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT |
WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 432, 60
END
-
-IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
- GROUPBOX "DirectInput Devices", -1, 10, 10, 352, 80
- CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT |
WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 332, 60
- GROUPBOX "Input Devices", -1, 10, 100, 352, 60
- CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS |
TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE |
WS_BORDER | WS_TABSTOP, 20, 110, 332, 40, 0x00000200
- GROUPBOX "Information", -1, 10, 170, 352, 50
- EDITTEXT IDC_RICH_INFO, 20, 180, 332, 30, WS_DISABLED | WS_TABSTOP
-END
-
-IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
- GROUPBOX "Registered DirectPlay Service Provider", -1, 10, 10, 352, 80
- CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT |
WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 332, 60
-END
-
-IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
@@ -131,4 +178,12 @@
IDS_DIRECTPLAY_SERIALCONN "Serial Connection For DirectPlay"
IDS_REG_SUCCESS "OK"
IDS_REG_FAIL "Error"
+ IDS_DDTEST_ERROR "Test failed!"
+ IDS_DDTEST_DESCRIPTION "This will start DirecDraw interface test. Continue?"
+ IDS_DDPRIMARY_DESCRIPTION "This test will use DirectDraw to draw on primary
surface. Black and white rectangles should be drawn. Continue?"
+ IDS_DDPRIMARY_RESULT "Did you see black and white rectangles?"
+ IDS_DDOFFSCREEN_DESCRIPTION "This test will use DirectDraw to draw in an offscreen
buffer. Moving white rectangle should be drawn. Continue?"
+ IDS_DDOFFSCREEN_RESULT "Did you see white moving reactangle?"
+ IDS_DDFULLSCREEN_DESCRIPTION "This test will use DirectDraw to draw in a fullscreen
mode. Moving white rectangle should be drawn. Continue?"
+ IDS_DDFULLSCREEN_RESULT "Did you see white moving reactangle in a fullscreen
mode?"
END
Modified: trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l…
==============================================================================
--- trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] Mon Apr 28 10:14:12
2008
@@ -7,27 +7,27 @@
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 280
+IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 478, 280
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
WS_THICKFRAME
CAPTION "Narzêdzie diagnostyki ReactX"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL
"Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,374,250
+ CONTROL
"Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,474,250
PUSHBUTTON "&Pomoc", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
DEFPUSHBUTTON "&Nastêpna Strona", IDC_BUTTON_NEXT, 137, 261, 50, 14,
WS_CHILD | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "&Zapisz wszystkie informacje...", IDC_BUTTON_SAVE_INFO,
201, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "&Wyjcie", IDC_BUTTON_EXIT, 323, 261, 50, 14, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
END
-IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 190
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "This tool reports detailed information about the ReactX components and
drivers installed on your system.", -1, 10, 10, 343, 17
- LTEXT "If you know what area is causing the problem, click the appropiate tab
above. Otherwise you can use the ""Next Page"" button below to visit
each page in sequence.", -1, 10, 30, 343, 25
- GROUPBOX "System Information", -1, 10, 55, 343, 130, SS_RIGHT
+ LTEXT "This tool reports detailed information about the ReactX components and
drivers installed on your system.", -1, 10, 10, 443, 17
+ LTEXT "If you know what area is causing the problem, click the appropiate tab
above. Otherwise you can use the ""Next Page"" button below to visit
each page in sequence.", -1, 10, 30, 443, 25
+ GROUPBOX "System Information", -1, 10, 55, 443, 130, SS_RIGHT
LTEXT "Current Date/Time:", -1, 70, 70, 80, 10, SS_RIGHT
LTEXT "Computer Name:", -1, 70, 80, 80, 10, SS_RIGHT
LTEXT "Operating System:", -1, 70, 90, 80, 10, SS_RIGHT
@@ -52,49 +52,96 @@
LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
END
-IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Device", -1, 10, 10, 220, 100
+ RTEXT "Name:", -1, 20, 25, 70, 10
+ RTEXT "Manufacturer:", -1, 20, 35, 70, 10
+ RTEXT "Chip Type:", -1, 20, 45, 70, 10
+ RTEXT "DAC Type:", -1, 20, 55, 70, 10
+ RTEXT "Approx. Total Memory:", -1, 20, 65, 70, 10
+ RTEXT "Current Display Mode:", -1, 20, 75, 70, 10
+ RTEXT "Monitor:", -1, 20, 85, 70, 10
+ LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 130, 10
+
+ GROUPBOX "Driver", -1, 240, 10, 220, 100
+ RTEXT "Main Driver:", -1, 245, 30, 55, 10
+ RTEXT "Version:", -1, 245, 40, 55, 10
+ RTEXT "Date:", -1, 245, 50, 55, 10
+ RTEXT "WHQL-Logo:", -1, 245, 60, 55, 10
+ RTEXT "Mini-VDD:", -1, 245, 70, 55, 10
+ RTEXT " vvdddVDD:", -1, 245, 80, 55, 10
+ RTEXT "DDI Version:", -1, 245, 90, 55, 10
+ LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 305, 30, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_VERSION, 305, 40, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_DATE, 305, 50, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_LOGO, 305, 60, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 305, 70, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_VDD, 305, 80, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_DDI, 305, 90, 130, 10
+
+ GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60
+ RTEXT "DirectDraw Acceleration:", -1, 15, 130, 110, 12
+ RTEXT "Direct3D Acceleration:", -1, 15, 145, 110, 12
+ RTEXT "AGP Texture Acceleration:", -1, 15, 160, 110, 12
+ LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
+ LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
+ LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
+ PUSHBUTTON "Enable", IDC_BUTTON_DDRAW, 170, 130, 60, 12, WS_DISABLED
+ PUSHBUTTON "Enable", IDC_BUTTON_D3D, 170, 145, 60, 12, WS_DISABLED
+ PUSHBUTTON "Enable", IDC_BUTTON_AGP, 170, 160, 60, 12, WS_DISABLED
+ PUSHBUTTON "Test DirectDraw", IDC_BUTTON_TESTDD, 250, 130, 80, 12
+ PUSHBUTTON "Test Direct3D", IDC_BUTTON_TEST3D, 250, 145, 80, 12,
WS_DISABLED
+
+ GROUPBOX "Notes", -1, 10, 180, 450, 40
+ EDITTEXT IDC_TEXT_INFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP
+END
+
+
+IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+END
+
+IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
END
-IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "DirectInput Devices", -1, 10, 10, 452, 80
+ CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT |
WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 432, 60
+ GROUPBOX "Input Devices", -1, 10, 100, 452, 60
+ CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS |
TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE |
WS_BORDER | WS_TABSTOP, 20, 110, 432, 40, 0x00000200
+ GROUPBOX "Information", -1, 10, 170, 452, 50
+ EDITTEXT IDC_RICH_INFO, 20, 180, 432, 30, WS_DISABLED | WS_TABSTOP
+END
+
+IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
END
-IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
-END
-
-
-IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
- GROUPBOX "DirectInput Devices", -1, 10, 10, 352, 80
- CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT |
WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 332, 60
- GROUPBOX "Input Devices", -1, 10, 100, 352, 60
- CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS |
TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE |
WS_BORDER | WS_TABSTOP, 20, 110, 332, 40, 0x00000200
- GROUPBOX "Information", -1, 10, 170, 352, 50
- EDITTEXT IDC_RICH_INFO, 20, 180, 332, 30, WS_DISABLED | WS_TABSTOP
-END
-
-IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-END
-
-IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
- GROUPBOX "Registered DirectPlay Service Provider", -1, 10, 10, 352, 80
+ GROUPBOX "Registered DirectPlay Service Provider", -1, 10, 10, 452, 80
CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT |
WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 332, 60
END
@@ -138,4 +185,12 @@
IDS_DIRECTPLAY_SERIALCONN "Serial Connection For DirectPlay"
IDS_REG_SUCCESS "OK"
IDS_REG_FAIL "Error"
+ IDS_DDTEST_ERROR "Test failed!"
+ IDS_DDTEST_DESCRIPTION "This will start DirecDraw interface test. Continue?"
+ IDS_DDPRIMARY_DESCRIPTION "This test will use DirectDraw to draw on primary
surface. Black and white rectangles should be drawn. Continue?"
+ IDS_DDPRIMARY_RESULT "Did you see black and white rectangles?"
+ IDS_DDOFFSCREEN_DESCRIPTION "This test will use DirectDraw to draw in an offscreen
buffer. Moving white rectangle should be drawn. Continue?"
+ IDS_DDOFFSCREEN_RESULT "Did you see white moving reactangle?"
+ IDS_DDFULLSCREEN_DESCRIPTION "This test will use DirectDraw to draw in a fullscreen
mode. Moving white rectangle should be drawn. Continue?"
+ IDS_DDFULLSCREEN_RESULT "Did you see white moving reactangle in a fullscreen
mode?"
END
Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l…
==============================================================================
--- trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] Mon Apr 28 10:14:12
2008
@@ -1,26 +1,26 @@
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 280
+IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 478, 280
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
WS_THICKFRAME
CAPTION "Ñðåäñòâî äèàãíîñòèêè ReactX"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL
"Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,374,250
+ CONTROL
"Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,474,250
PUSHBUTTON "&Ñïðàâêà", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
DEFPUSHBUTTON "&Ñëåäóþùàÿ ñòðàíèöà", IDC_BUTTON_NEXT, 101, 261, 94, 14,
WS_CHILD | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "Ñ&îõðàíèòü âñþ èíôîðìàöèþ...", IDC_BUTTON_SAVE_INFO, 199,
261, 120, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "&Âûõîä", IDC_BUTTON_EXIT, 323, 261, 50, 14, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
END
-IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 190
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Äàííàÿ ïðîãðàììà ïîçâîëÿåò ïîëó÷èòü ïîäðîáíûå ñâåäåíèÿ îá óñòàíîâëåííûõ
êîìïîíåíòàõ è äðàéâåðàõ ReactX.", -1, 10, 10, 343, 17
- LTEXT "Åñëè èçâåñòíà âîçìîæíàÿ ïðè÷èíà íåïîëàäêè, ìîæíî ñðàçó âûáðàòü
ñîîòâåòñòâóþùóþ âêëàäêó.  ïðîòèâíîì ñëó÷àå èñïîëüçóéòå êíîïêó ""Ñëåäóþùàÿ
ñòðàíèöà"" äëÿ ïîñëåäîâàòåëüíîãî ïðîñìîòðà ñòðàíèö.", -1, 10, 30, 343, 25
- GROUPBOX "Ñâåäåíèÿ î ñèñòåìå", -1, 10, 58, 343, 130, SS_RIGHT
+ LTEXT "Äàííàÿ ïðîãðàììà ïîçâîëÿåò ïîëó÷èòü ïîäðîáíûå ñâåäåíèÿ îá óñòàíîâëåííûõ
êîìïîíåíòàõ è äðàéâåðàõ ReactX.", -1, 10, 10, 443, 17
+ LTEXT "Åñëè èçâåñòíà âîçìîæíàÿ ïðè÷èíà íåïîëàäêè, ìîæíî ñðàçó âûáðàòü
ñîîòâåòñòâóþùóþ âêëàäêó.  ïðîòèâíîì ñëó÷àå èñïîëüçóéòå êíîïêó ""Ñëåäóþùàÿ
ñòðàíèöà"" äëÿ ïîñëåäîâàòåëüíîãî ïðîñìîòðà ñòðàíèö.", -1, 10, 30, 443, 25
+ GROUPBOX "Ñâåäåíèÿ î ñèñòåìå", -1, 10, 58, 443, 130, SS_RIGHT
LTEXT "Òåêóùèå âðåìÿ è äàòà:", -1, 70, 70, 80, 10, SS_RIGHT
LTEXT "Èìÿ êîìïüþòåðà:", -1, 70, 80, 80, 10, SS_RIGHT
LTEXT "Îïåðàöèîííàÿ ñèñòåìà:", -1, 70, 90, 100, 10, SS_RIGHT
@@ -45,50 +45,97 @@
LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
END
-IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Device", -1, 10, 10, 220, 100
+ RTEXT "Name:", -1, 20, 25, 70, 10
+ RTEXT "Manufacturer:", -1, 20, 35, 70, 10
+ RTEXT "Chip Type:", -1, 20, 45, 70, 10
+ RTEXT "DAC Type:", -1, 20, 55, 70, 10
+ RTEXT "Approx. Total Memory:", -1, 20, 65, 70, 10
+ RTEXT "Current Display Mode:", -1, 20, 75, 70, 10
+ RTEXT "Monitor:", -1, 20, 85, 70, 10
+ LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 130, 10
+
+ GROUPBOX "Driver", -1, 240, 10, 220, 100
+ RTEXT "Main Driver:", -1, 245, 30, 55, 10
+ RTEXT "Version:", -1, 245, 40, 55, 10
+ RTEXT "Date:", -1, 245, 50, 55, 10
+ RTEXT "WHQL-Logo:", -1, 245, 60, 55, 10
+ RTEXT "Mini-VDD:", -1, 245, 70, 55, 10
+ RTEXT " vvdddVDD:", -1, 245, 80, 55, 10
+ RTEXT "DDI Version:", -1, 245, 90, 55, 10
+ LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 305, 30, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_VERSION, 305, 40, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_DATE, 305, 50, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_LOGO, 305, 60, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 305, 70, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_VDD, 305, 80, 130, 10
+ LTEXT "", IDC_STATIC_ADAPTER_DDI, 305, 90, 130, 10
+
+ GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60
+ RTEXT "DirectDraw Acceleration:", -1, 15, 130, 110, 12
+ RTEXT "Direct3D Acceleration:", -1, 15, 145, 110, 12
+ RTEXT "AGP Texture Acceleration:", -1, 15, 160, 110, 12
+ LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
+ LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
+ LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
+ PUSHBUTTON "Enable", IDC_BUTTON_DDRAW, 170, 130, 60, 12, WS_DISABLED
+ PUSHBUTTON "Enable", IDC_BUTTON_D3D, 170, 145, 60, 12, WS_DISABLED
+ PUSHBUTTON "Enable", IDC_BUTTON_AGP, 170, 160, 60, 12, WS_DISABLED
+ PUSHBUTTON "Test DirectDraw", IDC_BUTTON_TESTDD, 250, 130, 80, 12
+ PUSHBUTTON "Test Direct3D", IDC_BUTTON_TEST3D, 250, 145, 80, 12,
WS_DISABLED
+
+ GROUPBOX "Notes", -1, 10, 180, 450, 40
+ EDITTEXT IDC_TEXT_INFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP
+END
+
+
+IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+END
+
+IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
END
-IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Óñòðîéñòâà DirectInput", -1, 10, 10, 352, 80
+ CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT |
WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 432, 60
+ GROUPBOX "Óñòðîéñòâà ââîäà", -1, 10, 100, 452, 60
+ CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS |
TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE |
WS_BORDER | WS_TABSTOP, 20, 110, 432, 40, 0x00000200
+ GROUPBOX "Èíôîðìàöèÿ", -1, 10, 170, 452, 50
+ EDITTEXT IDC_RICH_INFO, 20, 180, 432, 30, WS_DISABLED | WS_TABSTOP
+END
+
+IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
END
-IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
+IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
-END
-
-
-IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
- GROUPBOX "Óñòðîéñòâà DirectInput", -1, 10, 10, 352, 80
- CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT |
WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 332, 60
- GROUPBOX "Óñòðîéñòâà ââîäà", -1, 10, 100, 352, 60
- CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS |
TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE |
WS_BORDER | WS_TABSTOP, 20, 110, 332, 40, 0x00000200
- GROUPBOX "Èíôîðìàöèÿ", -1, 10, 170, 352, 50
- EDITTEXT IDC_RICH_INFO, 20, 180, 332, 30, WS_DISABLED | WS_TABSTOP
-END
-
-IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-END
-
-IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
- GROUPBOX "Registered DirectPlay Service Provider", -1, 10, 10, 352, 80
- CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT |
WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 332, 60
+ GROUPBOX "Registered DirectPlay Service Provider", -1, 10, 10, 452, 80
+ CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT |
WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 432, 60
END
STRINGTABLE DISCARDABLE
@@ -130,5 +177,13 @@
IDS_DIRECTPLAY_MODEMCONN "Modem Connection For DirectPlay"
IDS_DIRECTPLAY_SERIALCONN "Serial Connection For DirectPlay"
IDS_REG_SUCCESS "OK"
+ IDS_DDTEST_ERROR "Test failed!"
+ IDS_DDTEST_DESCRIPTION "This will start DirecDraw interface test. Continue?"
+ IDS_DDPRIMARY_DESCRIPTION "This test will use DirectDraw to draw on primary
surface. Black and white rectangles should be drawn. Continue?"
+ IDS_DDPRIMARY_RESULT "Did you see black and white rectangles?"
+ IDS_DDOFFSCREEN_DESCRIPTION "This test will use DirectDraw to draw in an offscreen
buffer. Moving white rectangle should be drawn. Continue?"
+ IDS_DDOFFSCREEN_RESULT "Did you see white moving reactangle?"
+ IDS_DDFULLSCREEN_DESCRIPTION "This test will use DirectDraw to draw in a fullscreen
mode. Moving white rectangle should be drawn. Continue?"
+ IDS_DDFULLSCREEN_RESULT "Did you see white moving reactangle in a fullscreen
mode?"
IDS_REG_FAIL "Error"
END
Modified: trunk/reactos/base/applications/dxdiag/network.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/n…
==============================================================================
--- trunk/reactos/base/applications/dxdiag/network.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/dxdiag/network.c [iso-8859-1] Mon Apr 28 10:14:12
2008
@@ -212,8 +212,26 @@
ProviderIndex = UINT_MAX;
if (GetRegValue(hKey, szName, L"GUID", REG_SZ, szGUID,
sizeof(szGUID)))
ProviderIndex = FindProviderIndex(szGUID, PreDefProviders);
- else
- ProviderIndex = UINT_MAX;
+
+ if (ProviderIndex == UINT_MAX)
+ {
+ /* a custom service provider was found */
+ lResult = ListView_GetItemCount(hDlgCtrl);
+ Item.iItem = lResult;
+
+ /* FIXME
+ * on Windows Vista we need to use RegLoadMUIString which is not
available for older systems
+ */
+ if (!GetRegValue(hKey, szName, L"Friendly Name", REG_SZ,
szResult, sizeof(szResult)))
+ if (!GetRegValue(hKey, szName, L"DescriptionW", REG_SZ,
szResult, sizeof(szResult)))
+ szResult[0] = L'\0';
+
+ /* insert the new provider */
+ Item.iSubItem = 0;
+ lResult = SendMessageW(hDlgCtrl, LVM_INSERTITEM, 0, (LPARAM)&Item);
+ /* adjust index */
+ ProviderIndex = lResult - ItemCount;
+ }
szResult[0] = L'\0';
/* check if the 'Path' key is available */
@@ -224,7 +242,10 @@
wcscpy(&szTemp[6], szGUID);
wcscpy(&szTemp[44], L"\\InProcServer32");
if (!GetRegValue(HKEY_CLASSES_ROOT, szTemp, NULL, REG_SZ, szResult,
sizeof(szResult)))
+ {
szResult[0] = L'\0';
+ ProviderIndex = UINT_MAX;
+ }
}
if (szResult[0])
{
@@ -245,7 +266,7 @@
Item.pszText = szResult;
}
- if (ProviderIndex != UINT_MAX)
+ if (ProviderIndex != UINT_MAX)
{
RegProviders |= (1 << ProviderIndex);
szResult[0] = L'\0';
Modified: trunk/reactos/base/applications/dxdiag/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/p…
==============================================================================
--- trunk/reactos/base/applications/dxdiag/precomp.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/dxdiag/precomp.h [iso-8859-1] Mon Apr 28 10:14:12
2008
@@ -3,20 +3,23 @@
#define DIRECTINPUT_VERSION 0x0800
#define DIRECTSOUND_VERSION 0x0800
+#define D3D_OVERLOADS
+
#include <stdio.h>
#include <windows.h>
#include <limits.h>
#include <setupapi.h>
-#include <devguid.h>
#include <commctrl.h>
+#include <dinput.h>
+#include <ddraw.h>
-#include <dinput.h>
#include <dsound.h>
#include "resource.h"
typedef struct
{
- HWND hDialogs[7];
+ HWND hMainDialog;
+ HWND hDialogs[7];
}DXDIAG_CONTEXT, *PDXDIAG_CONTEXT;
@@ -35,5 +38,7 @@
INT_PTR CALLBACK HelpPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
BOOL GetRegValue(HKEY hBaseKey, LPWSTR SubKey, LPWSTR ValueName, DWORD Type, LPWSTR
Result, DWORD Size);
+/* DirectDraw tests */
+BOOL StartDDTest(HWND hWnd, HINSTANCE hInstance, INT resTestDescription, INT resResult,
INT TestNr);
#endif
Modified: trunk/reactos/base/applications/dxdiag/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/r…
==============================================================================
--- trunk/reactos/base/applications/dxdiag/resource.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/dxdiag/resource.h [iso-8859-1] Mon Apr 28 10:14:12
2008
@@ -33,6 +33,32 @@
#define IDC_STATIC_SWAP 2009
#define IDC_STATIC_VERSION 2010
+/* DDraw dialog constants */
+#define IDC_STATIC_ADAPTER_ID 3000
+#define IDC_STATIC_ADAPTER_VENDOR 3001
+#define IDC_STATIC_ADAPTER_CHIP 3002
+#define IDC_STATIC_ADAPTER_DAC 3003
+#define IDC_STATIC_ADAPTER_MEM 3004
+#define IDC_STATIC_ADAPTER_MODE 3005
+#define IDC_STATIC_ADAPTER_MONITOR 3006
+#define IDC_STATIC_ADAPTER_DRIVER 3007
+#define IDC_STATIC_ADAPTER_VERSION 3008
+#define IDC_STATIC_ADAPTER_DATE 3009
+#define IDC_STATIC_ADAPTER_LOGO 3010
+#define IDC_STATIC_ADAPTER_MINIVDD 3011
+#define IDC_STATIC_ADAPTER_VDD 3012
+#define IDC_STATIC_ADAPTER_DDI 3013
+
+
+#define IDC_BUTTON_DDRAW 2011
+#define IDC_BUTTON_D3D 2012
+#define IDC_BUTTON_AGP 2013
+#define IDC_BUTTON_TESTDD 2014
+#define IDC_BUTTON_TEST3D 2015
+#define IDC_STATIC_DDSTATE 2016
+#define IDC_STATIC_D3DSTATE 2017
+#define IDC_STATIC_AGPSTATE 2018
+#define IDC_TEXT_INFO 2019
/* DirectInput dialog constants */
@@ -84,6 +110,15 @@
#define IDS_DIRECTPLAY_SERIALCONN 10113
#define IDS_REG_FAIL 10114
#define IDS_REG_SUCCESS 10115
+#define IDS_DDTEST_ERROR 10116
+#define IDS_DDTEST_DESCRIPTION 10117
+#define IDS_DDPRIMARY_DESCRIPTION 10118
+#define IDS_DDPRIMARY_RESULT 10119
+#define IDS_DDOFFSCREEN_DESCRIPTION 10120
+#define IDS_DDOFFSCREEN_RESULT 10121
+#define IDS_DDFULLSCREEN_DESCRIPTION 10122
+#define IDS_DDFULLSCREEN_RESULT 10123
+#define IDS_DDTEST_TITLE 10124
/* icon resource constants */
#define IDI_APPICON 20000