Ros-diffs April 2008

ros-diffs@reactos.org

21 participants
395 discussions

[dchapyshev] 33180: - Update Russian translation
by dchapyshev＠svn.reactos.org 28 Apr '08

28 Apr '08

Author: dchapyshev Date: Mon Apr 28 11:57:57 2008 New Revision: 33180 URL: http://svn.reactos.org/svn/reactos?rev=33180&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc 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 11:57:57 2008 @@ -8,10 +8,10 @@ FONT 8, "MS Shell Dlg" BEGIN 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 + PUSHBUTTON "&Ñïðàâêà", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&Ñëåäóþùàÿ ñòðàíèöà", IDC_BUTTON_NEXT, 203, 260, 94, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Ñ&îõðàíèòü âñþ èíôîðìàöèþ...", IDC_BUTTON_SAVE_INFO, 301, 260, 120, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Âûõîä", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 190 @@ -23,9 +23,9 @@ 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 + LTEXT "Îïåðàöèîííàÿ ñèñòåìà:", -1, 50, 90, 100, 10, SS_RIGHT LTEXT "ßçûê:", -1, 70, 100, 80, 10, SS_RIGHT - LTEXT "Èçãîòîâèòåëü êîìïüþòåðà:", -1, 70, 110, 100, 10, SS_RIGHT + LTEXT "Èçãîòîâèòåëü êîìïüþòåðà:", -1, 50, 110, 100, 10, SS_RIGHT LTEXT "Ìîäåëü êîìïüþòåðà:", -1, 70, 120, 80, 10, SS_RIGHT LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT LTEXT "Ïðîöåññîð:", -1, 70, 140, 80, 10, SS_RIGHT @@ -49,14 +49,14 @@ 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 + GROUPBOX "Óñòðîéñòâî", -1, 10, 10, 220, 100 + RTEXT "Èìÿ:", -1, 20, 25, 70, 10 + RTEXT "Èçãîòîâèòåëü:", -1, 20, 35, 70, 10 + RTEXT "Òèï ìèêðîñõåì:", -1, 20, 45, 70, 10 + RTEXT "Òèï êîíâåðòåðà DAC:", -1, 15, 55, 75, 10 + RTEXT "Âñåãî ïàìÿòè:", -1, 20, 65, 70, 10 + RTEXT "Ðåæèì ýêðàíà:", -1, 20, 75, 70, 10 + RTEXT "Ìîíèòîð:", -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 @@ -65,14 +65,14 @@ 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 + GROUPBOX "Äðàéâåðû", -1, 240, 10, 220, 100 + RTEXT "Ãëàâíûé:", -1, 245, 30, 55, 10 + RTEXT "Âåðñèÿ:", -1, 245, 40, 55, 10 + RTEXT "Äàòà:", -1, 245, 50, 55, 10 + RTEXT "Ïîäïèñü:", -1, 245, 60, 55, 10 + RTEXT "Ìèíè-VDD:", -1, 245, 70, 55, 10 + RTEXT "VDD:", -1, 245, 80, 55, 10 + RTEXT "Âåðñèÿ DDI:", -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 @@ -81,21 +81,21 @@ 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 + GROUPBOX "Âîçìîæíîñòè ReactX", -1, 10, 115, 450, 65 + RTEXT "Óñêîðåíèå DirectDraw:", -1, 15, 130, 110, 12 + RTEXT "Óñêîðåíèå Direct3D:", -1, 15, 145, 110, 12 + RTEXT "Óñêîðåíèå òåêñòóð AGP:", -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 + PUSHBUTTON "Âêëþ÷èòü", IDC_BUTTON_DDRAW, 170, 126, 60, 14, WS_DISABLED + PUSHBUTTON "Âêëþ÷èòü", IDC_BUTTON_D3D, 170, 142, 60, 14, WS_DISABLED + PUSHBUTTON "Âêëþ÷èòü", IDC_BUTTON_AGP, 170, 158, 60, 14, WS_DISABLED + PUSHBUTTON "Ïðîâåðêà DirectDraw", IDC_BUTTON_TESTDD, 250, 126, 80, 14 + PUSHBUTTON "Ïðîâåðêà Direct3D", IDC_BUTTON_TEST3D, 250, 142, 80, 14, WS_DISABLED - GROUPBOX "Notes", -1, 10, 180, 450, 40 - EDITTEXT IDC_TEXT_INFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP + GROUPBOX "Ïðèìå÷àíèÿ", -1, 10, 185, 450, 34 + EDITTEXT IDC_TEXT_INFO, 20, 195, 432, 18, WS_DISABLED | WS_TABSTOP END @@ -116,7 +116,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Óñòðîéñòâà DirectInput", -1, 10, 10, 352, 80 + GROUPBOX "Óñòðîéñòâà DirectInput", -1, 10, 10, 452, 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 @@ -134,7 +134,7 @@ 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 + GROUPBOX "Çàðåãèñòðèðîâàííûå ïîñòàâùèêè DirectPlay", -1, 10, 10, 452, 80 CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 432, 60 END @@ -161,29 +161,29 @@ IDS_DEVICE_CONTROLLER "ID êîíòðîëëåðà" IDS_DEVICE_MANUFACTURER "ID ïðîèçâîäèòåëÿ" IDS_DEVICE_PRODUCT "ID ïðîäóêòà" - IDS_DEVICE_FORCEFEEDBACK "Force Feedback-Driver" + IDS_DEVICE_FORCEFEEDBACK "Äðàéâåð Force Feedback" IDS_NOT_APPLICABLE "Í/Ä" IDS_OPTION_YES "Äà" - IDS_DIRECTPLAY_COL_NAME1 "Name" - IDS_DIRECTPLAY_COL_NAME2 "Registry" - IDS_DIRECTPLAY_COL_NAME3 "File" - IDS_DIRECTPLAY_COL_NAME4 "Version" + IDS_DIRECTPLAY_COL_NAME1 "Èìÿ" + IDS_DIRECTPLAY_COL_NAME2 "Ðååñòð" + IDS_DIRECTPLAY_COL_NAME3 "Ôàéë" + IDS_DIRECTPLAY_COL_NAME4 "Âåðñèÿ" IDS_DIRECTPLAY8_MODEMSP "DirectPlay8-Modem Service Provider" IDS_DIRECTPLAY8_SERIALSP "DirectPlay8 Serial Service Provider" IDS_DIRECTPLAY8_IPXSP "DirectPlay8 IPX Service Provider" IDS_DIRECTPLAY8_TCPSP "DirectPlay8-TCP/IP Service Provider" - IDS_DIRECTPLAY_TCPCONN "Internet TCP/IP Connection For DirectPlay" - IDS_DIRECTPLAY_IPXCONN "IPX Connection For DirectPlay" + IDS_DIRECTPLAY_TCPCONN "Èíòåðíåò-ïîäêëþ÷åíèå TCP/IP äëÿ DirectPlay" + IDS_DIRECTPLAY_IPXCONN "IPX ïîäêëþ÷åíèå äëÿ DirectPlay" 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_DDTEST_ERROR "Ñáîé â ïðîâåðêå!" + IDS_DDTEST_DESCRIPTION "Áóäåò ïðîèçâåäåíà ïðîâåðêà DirecDraw íà ýòîì óñòðîéñòâå. Ïðîäîëæèòü?" 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" + IDS_REG_FAIL "Îøèáêà" END

1 0

[dreimer] 33179: Revert my last commit for a WAAY better Console Window Layout due to popular demand.
by dreimer＠svn.reactos.org 28 Apr '08

28 Apr '08

Author: dreimer Date: Mon Apr 28 10:22:41 2008 New Revision: 33179 URL: http://svn.reactos.org/svn/reactos?rev=33179&view=rev Log: Revert my last commit for a WAAY better Console Window Layout due to popular demand. Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Mon Apr 28 10:22:41 2008 @@ -9,7 +9,6 @@ :: :: @echo off -mode con cols=95 lines=44 if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @echo on @@ -116,11 +115,11 @@ :: environment. :: :RosBE4 - echo ********************************************************************************************** - echo * * - echo * ReactOS Build Environment %_ROSBE_VERSION% * - echo * * - echo ********************************************************************************************** + echo ******************************************************************************* + echo * * + echo * ReactOS Build Environment %_ROSBE_VERSION% * + echo * * + echo ******************************************************************************* echo. echo. ver

1 0

[janderwald] 33178: - 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
by janderwald＠svn.reactos.org 28 Apr '08

28 Apr '08

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

1 0

[janderwald] 33177: - add GUID_DEVCLASS_DISPLAY - fix format
by janderwald＠svn.reactos.org 28 Apr '08

28 Apr '08

Author: janderwald Date: Mon Apr 28 09:55:21 2008 New Revision: 33177 URL: http://svn.reactos.org/svn/reactos?rev=33177&view=rev Log: - add GUID_DEVCLASS_DISPLAY - fix format Modified: trunk/reactos/include/psdk/devguid.h Modified: trunk/reactos/include/psdk/devguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/devguid.h?rev… ============================================================================== --- trunk/reactos/include/psdk/devguid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/devguid.h [iso-8859-1] Mon Apr 28 09:55:21 2008 @@ -15,12 +15,13 @@ * */ -DEFINE_GUID(GUID_DEVCLASS_CDROM, 0x4D36E965, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); -DEFINE_GUID(GUID_DEVCLASS_KEYBOARD, 0x4D36E96B, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); -DEFINE_GUID(GUID_DEVCLASS_MEDIA, 0x4D36E96C, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); -DEFINE_GUID(GUID_DEVCLASS_MOUSE, 0x4D36E96F, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); -DEFINE_GUID(GUID_DEVCLASS_NET, 0x4D36E972, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); -DEFINE_GUID(GUID_DEVCLASS_NETCLIENT, 0x4D36E973, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); -DEFINE_GUID(GUID_DEVCLASS_NETSERVICE, 0x4D36E974, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); -DEFINE_GUID(GUID_DEVCLASS_NETTRANS, 0x4D36E975, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); -DEFINE_GUID(GUID_DEVCLASS_DISKDRIVE, 0x4d36e967L, 0xe325, 0x11ce, 0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_CDROM, 0x4D36E965, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_DISPLAY, 0x4D36E968, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_KEYBOARD, 0x4D36E96B, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_MEDIA, 0x4D36E96C, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_MOUSE, 0x4D36E96F, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_NET, 0x4D36E972, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_NETCLIENT, 0x4D36E973, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_NETSERVICE, 0x4D36E974, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_NETTRANS, 0x4D36E975, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_DISKDRIVE, 0x4D36E967, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18);

1 0

[dreimer] 33176: Increase Window Size to ~800x600.
by dreimer＠svn.reactos.org 28 Apr '08

28 Apr '08

Author: dreimer Date: Mon Apr 28 09:54:20 2008 New Revision: 33176 URL: http://svn.reactos.org/svn/reactos?rev=33176&view=rev Log: Increase Window Size to ~800x600. Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Mon Apr 28 09:54:20 2008 @@ -9,6 +9,7 @@ :: :: @echo off +mode con cols=95 lines=44 if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @echo on @@ -115,11 +116,11 @@ :: environment. :: :RosBE4 - echo ******************************************************************************* - echo * * - echo * ReactOS Build Environment %_ROSBE_VERSION% * - echo * * - echo ******************************************************************************* + echo ********************************************************************************************** + echo * * + echo * ReactOS Build Environment %_ROSBE_VERSION% * + echo * * + echo ********************************************************************************************** echo. echo. ver

1 0

[dchapyshev] 33175: - Add support second keyboard layout - Update all translations
by dchapyshev＠svn.reactos.org 28 Apr '08

28 Apr '08

Author: dchapyshev Date: Mon Apr 28 09:04:22 2008 New Revision: 33175 URL: http://svn.reactos.org/svn/reactos?rev=33175&view=rev Log: - Add support second keyboard layout - Update all translations Modified: trunk/reactos/base/setup/usetup/errorcode.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/settings.c Modified: trunk/reactos/base/setup/usetup/errorcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/errorcod… ============================================================================== --- trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] Mon Apr 28 09:04:22 2008 @@ -64,6 +64,7 @@ ERROR_WRITE_PTABLE, ERROR_ADDING_CODEPAGE, ERROR_UPDATE_LOCALESETTINGS, + ERROR_ADDING_KBLAYOUTS, ERROR_LAST_ERROR_CODE }ERROR_NUMBER; Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Mon Apr 28 09:04:22 2008 @@ -3188,6 +3188,14 @@ return QUIT_PAGE; } + /* Add keyboard layouts */ + CONSOLE_SetStatusText(MUIGetString(STRING_ADDKBLAYOUTS)); + if (!AddKeyboardLayouts()) + { + MUIDisplayError(ERROR_ADDING_KBLAYOUTS, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + /* Update keyboard layout settings */ CONSOLE_SetStatusText(MUIGetString(STRING_KEYBOARDSETTINGSUPDATE)); if (!ProcessKeyboardLayoutRegistry(LayoutList)) Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Mon Apr 28 09:04:22 2008 @@ -1469,6 +1469,11 @@ //ERROR_UPDATE_LOCALESETTINGS, "¥ãá¯¥è® ãáâ ®¢ï¢ ¥ ¬¥áâ¨â¥ áâà®©ª¨.\n" "ENTER = à¥§ ¯ãáª ¥ ª®¬¯îâêà " + }, + { + //ERROR_ADDING_KBLAYOUTS, + "Setup failed to add keyboard layouts to registry.\n" + "ENTER = Reboot computer" }, { NULL, @@ -1689,6 +1694,8 @@ ""}, {STRING_GB, ""}, + {STRING_ADDKBLAYOUTS, + "Adding keyboard layouts"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Mon Apr 28 09:04:22 2008 @@ -1466,6 +1466,11 @@ //ERROR_UPDATE_LOCALESETTINGS, "Nepodaýilo se nastavit m¡stn¡ nastaven¡.\n" "ENTER = Restartovat po¡ta" + }, + { + //ERROR_ADDING_KBLAYOUTS, + "Setup failed to add keyboard layouts to registry.\n" + "ENTER = Reboot computer" }, { NULL, @@ -1686,6 +1691,8 @@ "MB"}, {STRING_GB, "GB"}, + {STRING_ADDKBLAYOUTS, + "Adding keyboard layouts"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Mon Apr 28 09:04:22 2008 @@ -1460,6 +1460,11 @@ //ERROR_UPDATE_LOCALESETTINGS, "Setup konnte die Systemsprache nicht einstellen.\n" "ENTER = Computer neustarten" + }, + { + //ERROR_ADDING_KBLAYOUTS, + "Setup failed to add keyboard layouts to registry.\n" + "ENTER = Reboot computer" }, { NULL, @@ -1680,6 +1685,8 @@ "MB"}, {STRING_GB, "GB"}, + {STRING_ADDKBLAYOUTS, + "Adding keyboard layouts"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Mon Apr 28 09:04:22 2008 @@ -1459,6 +1459,11 @@ { //ERROR_UPDATE_LOCALESETTINGS, "Setup could not set the system locale.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_ADDING_KBLAYOUTS, + "Setup failed to add keyboard layouts to registry.\n" "ENTER = Reboot computer" }, { @@ -1680,6 +1685,8 @@ "MB"}, {STRING_GB, "GB"}, + {STRING_ADDKBLAYOUTS, + "Adding keyboard layouts"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Mon Apr 28 09:04:22 2008 @@ -1459,6 +1459,11 @@ { //ERROR_UPDATE_LOCALESETTINGS, "Setup could not set the system locale.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_ADDING_KBLAYOUTS, + "Setup failed to add keyboard layouts to registry.\n" "ENTER = Reboot computer" }, { @@ -1680,6 +1685,8 @@ "MB"}, {STRING_GB, "GB"}, + {STRING_ADDKBLAYOUTS, + "Adding keyboard layouts"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Mon Apr 28 09:04:22 2008 @@ -1460,6 +1460,11 @@ //ERROR_UPDATE_LOCALESETTINGS, "El instalador no pudo configurar el idioma del sistema.\n" "ENTER = Reiniciar el equipo" + }, + { + //ERROR_ADDING_KBLAYOUTS, + "Setup failed to add keyboard layouts to registry.\n" + "ENTER = Reboot computer" }, { NULL, @@ -1679,6 +1684,8 @@ "MB"}, {STRING_GB, "GB"}, + {STRING_ADDKBLAYOUTS, + "Adding keyboard layouts"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Mon Apr 28 09:04:22 2008 @@ -1472,6 +1472,11 @@ //ERROR_UPDATE_LOCALESETTINGS, "Setup n'a pu changer la langue systme.\n" "ENTER = Redmarrer l'ordinateur" + }, + { + //ERROR_ADDING_KBLAYOUTS, + "Setup failed to add keyboard layouts to registry.\n" + "ENTER = Reboot computer" }, { NULL, @@ -1692,6 +1697,8 @@ "Mo"}, {STRING_GB, "Go"}, + {STRING_ADDKBLAYOUTS, + "Adding keyboard layouts"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Mon Apr 28 09:04:22 2008 @@ -1460,6 +1460,11 @@ //ERROR_UPDATE_LOCALESETTINGS, "Setup non ha potuto impostare la regionalizzazione del sistema.\n" "INVIO = Riavviare il computer" + }, + { + //ERROR_ADDING_KBLAYOUTS, + "Setup failed to add keyboard layouts to registry.\n" + "ENTER = Reboot computer" }, { NULL, @@ -1680,6 +1685,8 @@ "MB"}, {STRING_GB, "GB"}, + {STRING_ADDKBLAYOUTS, + "Adding keyboard layouts"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Mon Apr 28 09:04:22 2008 @@ -1468,6 +1468,11 @@ { //ERROR_UPDATE_LOCALESETTINGS, "Setup could not set the system locale.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_ADDING_KBLAYOUTS, + "Setup failed to add keyboard layouts to registry.\n" "ENTER = Reboot computer" }, { @@ -1689,6 +1694,8 @@ "MB"}, {STRING_GB, "GB"}, + {STRING_ADDKBLAYOUTS, + "Adding keyboard layouts"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Mon Apr 28 09:04:22 2008 @@ -1467,6 +1467,11 @@ //ERROR_UPDATE_LOCALESETTINGS, "Instalator nie m¢g ustawi wersji j©zykowej.\n" "ENTER = Restart komputera" + }, + { + //ERROR_ADDING_KBLAYOUTS, + "Setup failed to add keyboard layouts to registry.\n" + "ENTER = Reboot computer" }, { NULL, @@ -1687,6 +1692,8 @@ "MB"}, {STRING_GB, "GB"}, + {STRING_ADDKBLAYOUTS, + "Adding keyboard layouts"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Mon Apr 28 09:04:22 2008 @@ -1460,6 +1460,11 @@ //ERROR_UPDATE_LOCALESETTINGS, "¥ ã¤ «®áì ãáâ ®¢¨âì «®ª «ì á¨áâ¥¬ë.\n" "ENTER = ¥à¥§ £àã§ª " + }, + { + //ERROR_ADDING_KBLAYOUTS, + "Setup failed to add keyboard layouts to registry.\n" + "ENTER = Reboot computer" }, { NULL, @@ -1680,6 +1685,8 @@ ""}, {STRING_GB, ""}, + {STRING_ADDKBLAYOUTS, + "Adding keyboard layouts"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Mon Apr 28 09:04:22 2008 @@ -1467,6 +1467,11 @@ //ERROR_UPDATE_LOCALESETTINGS, "Setup could not set the system locale.\n" "ENTER = Reçtart po¡taa" + }, + { + //ERROR_ADDING_KBLAYOUTS, + "Setup failed to add keyboard layouts to registry.\n" + "ENTER = Reboot computer" }, { NULL, @@ -1687,6 +1692,8 @@ "MB"}, {STRING_GB, "GB"}, + {STRING_ADDKBLAYOUTS, + "Adding keyboard layouts"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Mon Apr 28 09:04:22 2008 @@ -1459,6 +1459,11 @@ { //ERROR_UPDATE_LOCALESETTINGS, "Setup could not set the system locale.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_ADDING_KBLAYOUTS, + "Setup failed to add keyboard layouts to registry.\n" "ENTER = Reboot computer" }, { @@ -1679,6 +1684,8 @@ "MB"}, {STRING_GB, "GB"}, + {STRING_ADDKBLAYOUTS, + "Adding keyboard layouts"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Mon Apr 28 09:04:22 2008 @@ -1459,6 +1459,11 @@ { //ERROR_UPDATE_LOCALESETTINGS, "Setup could not set the system locale.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_ADDING_KBLAYOUTS, + "Setup failed to add keyboard layouts to registry.\n" "ENTER = Reboot computer" }, { @@ -1680,6 +1685,8 @@ "MB"}, {STRING_GB, "GB"}, + {STRING_ADDKBLAYOUTS, + "Adding keyboard layouts"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Mon Apr 28 09:04:22 2008 @@ -49,36 +49,36 @@ static const MUI_LANGUAGE LanguageList[] = { - /* Lang ID, DefKbdLayout,ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings, other strings */ - {L"00000409", L"00000409", L"1252", L"437", L"10000", L"English", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000401", L"00000401", L"1256", L"720", L"10004", L"Arabic", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000402", L"00000402", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, bgBGStrings }, - {L"00000403", L"00000403", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000804", L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000405", L"00000405", L"1250", L"852", L"10029", L"Czech", csCZPages, csCZErrorEntries, csCZStrings }, - {L"00000406", L"00000406", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000407", L"00000407", L"1252", L"850", L"10000", L"Deutsch", deDEPages, deDEErrorEntries, deDEStrings }, - {L"00000413", L"00000813", L"1252", L"850", L"10000", L"Dutch", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000040B", L"0000040B", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000040C", L"0000040C", L"1252", L"850", L"10000", L"French", frFRPages, frFRErrorEntries, frFRStrings }, - {L"00000408", L"00000408", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries, elGRStrings }, - {L"0000040D", L"0000040D", L"1255", L"862", L"10005", L"Hebrew", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000040E", L"0000040E", L"1250", L"852", L"10029", L"Hungarian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000410", L"00000410", L"1252", L"850", L"10000", L"Italian", itITPages, itITErrorEntries, itITStrings }, - {L"00000411", L"00000411", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000412", L"00000412", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000427", L"00000427", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, ltLTStrings }, - {L"00000414", L"00000414", L"1252", L"850", L"10000", L"Norwegian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000419", L"00000419", L"1251", L"866", L"10007", L"Russkij", ruRUPages, ruRUErrorEntries, ruRUStrings }, - {L"0000041B", L"0000041B", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries, skSKStrings }, - {L"0000040A", L"0000040A", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries, esESStrings }, - {L"00000415", L"00000415", L"1250", L"852", L"10029", L"Polski", plPLPages, plPLErrorEntries, plPLStrings }, - {L"00000816", L"00000816", L"1252", L"850", L"10000", L"Portuguese", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000041D", L"0000041D", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries, svSEStrings }, - {L"0000041E", L"0000041E", L"874", L"874", L"10021", L"Thai", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000041F", L"0000041F", L"1254", L"857", L"10081", L"Turkish", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000422", L"00000422", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries, ukUAStrings }, - {NULL, NULL, NULL, NULL, NULL} + /* Lang ID, DefKbdLayout, SecKbLayout, ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings, other strings */ + {L"00000409", L"00000409", NULL, L"1252", L"437", L"10000", L"English", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000401", L"00000401", L"00000409", L"1256", L"720", L"10004", L"Arabic", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000402", L"00000402", L"00000409", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, bgBGStrings }, + {L"00000403", L"00000403", L"00000409", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000804", L"00000804", L"00000409", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000405", L"00000405", L"00000409", L"1250", L"852", L"10029", L"Czech", csCZPages, csCZErrorEntries, csCZStrings }, + {L"00000406", L"00000406", L"00000409", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000407", L"00000407", L"00000409", L"1252", L"850", L"10000", L"Deutsch", deDEPages, deDEErrorEntries, deDEStrings }, + {L"00000413", L"00000813", L"00000409", L"1252", L"850", L"10000", L"Dutch", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000040B", L"0000040B", L"00000409", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000040C", L"0000040C", L"00000409", L"1252", L"850", L"10000", L"French", frFRPages, frFRErrorEntries, frFRStrings }, + {L"00000408", L"00000408", L"00000409", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries, elGRStrings }, + {L"0000040D", L"0000040D", L"00000409", L"1255", L"862", L"10005", L"Hebrew", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000040E", L"0000040E", L"00000409", L"1250", L"852", L"10029", L"Hungarian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000410", L"00000410", L"00000409", L"1252", L"850", L"10000", L"Italian", itITPages, itITErrorEntries, itITStrings }, + {L"00000411", L"00000411", L"00000409", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000412", L"00000412", L"00000409", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000427", L"00000427", L"00000409", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, ltLTStrings }, + {L"00000414", L"00000414", L"00000409", L"1252", L"850", L"10000", L"Norwegian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000419", L"00000419", L"00000409", L"1251", L"866", L"10007", L"Russkij", ruRUPages, ruRUErrorEntries, ruRUStrings }, + {L"0000041B", L"0000041B", L"00000409", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries, skSKStrings }, + {L"0000040A", L"0000040A", L"00000409", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries, esESStrings }, + {L"00000415", L"00000415", L"00000409", L"1250", L"852", L"10029", L"Polski", plPLPages, plPLErrorEntries, plPLStrings }, + {L"00000816", L"00000816", L"00000409", L"1252", L"850", L"10000", L"Portuguese", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000041D", L"0000041D", L"00000409", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries, svSEStrings }, + {L"0000041E", L"0000041E", L"00000409", L"874", L"874", L"10021", L"Thai", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000041F", L"0000041F", L"00000409", L"1254", L"857", L"10081", L"Turkish", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000422", L"00000422", L"00000409", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries, ukUAStrings }, + {NULL, NULL, NULL, NULL, NULL, NULL} }; extern @@ -247,6 +247,132 @@ POPUP_WAIT_NONE); return "<nostring>"; +} + +static BOOLEAN +AddKbLayoutsToRegistry(IN LPCWSTR DefKbLayout, IN LPCWSTR SecKbLayout) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + HANDLE KeyHandle; + NTSTATUS Status; + ULONG Disposition; + WCHAR szKeyName[48] = L"\\Registry\\User\\.DEFAULT\\Keyboard Layout"; + + // Open the keyboard layout key + RtlInitUnicodeString(&KeyName, + szKeyName); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtCreateKey(&KeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + + if(NT_SUCCESS(Status)) + NtClose(KeyHandle); + else + { + DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); + return FALSE; + } + + KeyName.MaximumLength = sizeof(szKeyName); + Status = RtlAppendUnicodeToString(&KeyName, L"\\Preload"); + + if(!NT_SUCCESS(Status)) + { + DPRINT1("RtlAppend failed! (%lx)\n", Status); + DPRINT1("String is %wZ\n", &KeyName); + return FALSE; + } + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtCreateKey(&KeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); + return FALSE; + } + + /* Set def keyboard layout */ + RtlInitUnicodeString(&ValueName, + L"1"); + + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)DefKbLayout, + (8 + 1) * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } + + if (SecKbLayout != NULL) + { + /* Set second keyboard layout */ + RtlInitUnicodeString(&ValueName, + L"2"); + + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)SecKbLayout, + (8 + 1) * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } + } + + NtClose(KeyHandle); + return TRUE; +} + +BOOLEAN +AddKeyboardLayouts(VOID) +{ + ULONG lngIndex = 0; + do + { + if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + { + return AddKbLayoutsToRegistry(LanguageList[lngIndex].LanguageKeyboardLayoutID, + LanguageList[lngIndex].SecondLangKbLayoutID); + } + + lngIndex++; + } + while (LanguageList[lngIndex].MuiPages != NULL); + + return FALSE; } static BOOLEAN Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] Mon Apr 28 09:04:22 2008 @@ -31,6 +31,7 @@ { PWCHAR LanguageID; PWCHAR LanguageKeyboardLayoutID; + PWCHAR SecondLangKbLayoutID; PWCHAR ACPage; PWCHAR OEMCPage; PWCHAR MACCPage; @@ -52,65 +53,69 @@ BOOLEAN AddCodePage(VOID); +BOOLEAN +AddKeyboardLayouts(VOID); + VOID SetConsoleCodePage(VOID); LPSTR MUIGetString(ULONG Number); -#define STRING_PLEASEWAIT 1 -#define STRING_INSTALLCREATEPARTITION 2 -#define STRING_INSTALLDELETEPARTITION 3 -#define STRING_PARTITIONSIZE 4 -#define STRING_CHOOSENEWPARTITION 5 -#define STRING_HDDSIZE 6 -#define STRING_CREATEPARTITION 7 -#define STRING_PARTFORMAT 8 -#define STRING_NONFORMATTEDPART 9 -#define STRING_INSTALLONPART 10 -#define STRING_CHECKINGPART 11 -#define STRING_QUITCONTINUE 12 -#define STRING_REBOOTCOMPUTER 13 -#define STRING_TXTSETUPFAILED 14 -#define STRING_COPYING 15 -#define STRING_SETUPCOPYINGFILES 16 -#define STRING_PAGEDMEM 17 -#define STRING_NONPAGEDMEM 18 -#define STRING_FREEMEM 19 -#define STRING_REGHIVEUPDATE 20 -#define STRING_IMPORTFILE 21 -#define STRING_DISPLAYETTINGSUPDATE 22 -#define STRING_LOCALESETTINGSUPDATE 23 -#define STRING_KEYBOARDSETTINGSUPDATE 24 -#define STRING_CODEPAGEINFOUPDATE 25 -#define STRING_DONE 26 -#define STRING_REBOOTCOMPUTER2 27 -#define STRING_CONSOLEFAIL1 28 -#define STRING_CONSOLEFAIL2 29 -#define STRING_CONSOLEFAIL3 30 -#define STRING_FORMATTINGDISK 31 -#define STRING_CHECKINGDISK 32 -#define STRING_FORMATDISK1 33 -#define STRING_FORMATDISK2 34 -#define STRING_KEEPFORMAT 35 -#define STRING_HDINFOPARTCREATE 36 -#define STRING_HDDINFOUNK1 37 -#define STRING_HDDINFOUNK2 38 -#define STRING_HDINFOPARTDELETE 39 -#define STRING_HDDINFOUNK3 40 -#define STRING_HDINFOPARTZEROED 41 -#define STRING_HDDINFOUNK4 42 -#define STRING_HDINFOPARTEXISTS 43 -#define STRING_HDDINFOUNK5 44 -#define STRING_HDINFOPARTSELECT 45 -#define STRING_HDDINFOUNK6 46 -#define STRING_NEWPARTITION 47 -#define STRING_UNPSPACE 48 -#define STRING_MAXSIZE 49 -#define STRING_UNFORMATTED 50 -#define STRING_FORMATUNUSED 51 -#define STRING_FORMATUNKNOWN 52 -#define STRING_KB 53 -#define STRING_MB 54 -#define STRING_GB 55 +#define STRING_PLEASEWAIT 1 +#define STRING_INSTALLCREATEPARTITION 2 +#define STRING_INSTALLDELETEPARTITION 3 +#define STRING_PARTITIONSIZE 4 +#define STRING_CHOOSENEWPARTITION 5 +#define STRING_HDDSIZE 6 +#define STRING_CREATEPARTITION 7 +#define STRING_PARTFORMAT 8 +#define STRING_NONFORMATTEDPART 9 +#define STRING_INSTALLONPART 10 +#define STRING_CHECKINGPART 11 +#define STRING_QUITCONTINUE 12 +#define STRING_REBOOTCOMPUTER 13 +#define STRING_TXTSETUPFAILED 14 +#define STRING_COPYING 15 +#define STRING_SETUPCOPYINGFILES 16 +#define STRING_PAGEDMEM 17 +#define STRING_NONPAGEDMEM 18 +#define STRING_FREEMEM 19 +#define STRING_REGHIVEUPDATE 20 +#define STRING_IMPORTFILE 21 +#define STRING_DISPLAYETTINGSUPDATE 22 +#define STRING_LOCALESETTINGSUPDATE 23 +#define STRING_KEYBOARDSETTINGSUPDATE 24 +#define STRING_CODEPAGEINFOUPDATE 25 +#define STRING_DONE 26 +#define STRING_REBOOTCOMPUTER2 27 +#define STRING_CONSOLEFAIL1 28 +#define STRING_CONSOLEFAIL2 29 +#define STRING_CONSOLEFAIL3 30 +#define STRING_FORMATTINGDISK 31 +#define STRING_CHECKINGDISK 32 +#define STRING_FORMATDISK1 33 +#define STRING_FORMATDISK2 34 +#define STRING_KEEPFORMAT 35 +#define STRING_HDINFOPARTCREATE 36 +#define STRING_HDDINFOUNK1 37 +#define STRING_HDDINFOUNK2 38 +#define STRING_HDINFOPARTDELETE 39 +#define STRING_HDDINFOUNK3 40 +#define STRING_HDINFOPARTZEROED 41 +#define STRING_HDDINFOUNK4 42 +#define STRING_HDINFOPARTEXISTS 43 +#define STRING_HDDINFOUNK5 44 +#define STRING_HDINFOPARTSELECT 45 +#define STRING_HDDINFOUNK6 46 +#define STRING_NEWPARTITION 47 +#define STRING_UNPSPACE 48 +#define STRING_MAXSIZE 49 +#define STRING_UNFORMATTED 50 +#define STRING_FORMATUNUSED 51 +#define STRING_FORMATUNKNOWN 52 +#define STRING_KB 53 +#define STRING_MB 54 +#define STRING_GB 55 +#define STRING_ADDKBLAYOUTS 56 #endif Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] Mon Apr 28 09:04:22 2008 @@ -868,13 +868,14 @@ { PGENERIC_LIST_ENTRY Entry; PWCHAR LanguageId; + WCHAR CurrentLangId[8 + 1]; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; UNICODE_STRING ValueName; - ULONG Disposition; + ULONG ResLength, Length; HANDLE KeyHandle; NTSTATUS Status; - WCHAR szKeyName[48] = L"\\Registry\\User\\.DEFAULT\\Keyboard Layout"; // 48 = "\Registry\User\.DEFAULT\Keyboard Layout\Preload" + NULL char + PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; Entry = GetGenericListEntry(List); if (Entry == NULL) @@ -884,8 +885,7 @@ if (LanguageId == NULL) return FALSE; - // First create the "Keyboard Layout" key - RtlInitUnicodeString(&KeyName, szKeyName); + RtlInitUnicodeString(&KeyName, L"\\Registry\\User\\.DEFAULT\\Keyboard Layout\\Preload"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, @@ -893,68 +893,92 @@ NULL, NULL); - Status = NtCreateKey(&KeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - 0, - &Disposition); - - if(NT_SUCCESS(Status)) + Status = NtOpenKey(&KeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + + if(!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); NtClose(KeyHandle); - else - { - DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); - return FALSE; - } - - // Then create the "Preload" key - KeyName.MaximumLength = sizeof(szKeyName); - Status = RtlAppendUnicodeToString(&KeyName, L"\\Preload"); - - if(!NT_SUCCESS(Status)) - { - DPRINT1("RtlAppend failed! (%lx)\n", Status); - DPRINT1("String is %wZ\n", &KeyName); - return FALSE; - } - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = NtCreateKey(&KeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - 0, - &Disposition); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); - return FALSE; - } - - /* Set default keyboard layout */ + return FALSE; + } + + /* Get current keyboard layout */ RtlInitUnicodeString(&ValueName, L"1"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)LanguageId, - (8 + 1) * sizeof(WCHAR)); + Length = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + (8 + 1) * sizeof(WCHAR); + + ValueInfo = (KEY_VALUE_PARTIAL_INFORMATION*) RtlAllocateHeap(RtlGetProcessHeap(), + 0, + Length); + + if (ValueInfo == NULL) + { + DPRINT("RtlAllocateHeap() failed\n"); + NtClose(KeyHandle); + return FALSE; + } + + Status = NtQueryValueKey(KeyHandle, + &ValueName, + KeyValuePartialInformation, + ValueInfo, + Length, + &ResLength); if (!NT_SUCCESS(Status)) { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + DPRINT1("NtQueryValueKey() failed (Status %lx)\n", Status); NtClose(KeyHandle); return FALSE; + } + + RtlCopyMemory(CurrentLangId, + ValueInfo->Data, + (8 + 1) * sizeof(WCHAR)); + + CurrentLangId[8 + 1] = 0; + + RtlFreeHeap(RtlGetProcessHeap(), + 0, + ValueInfo); + + if (wcscmp(CurrentLangId, LanguageId) != 0) + { + RtlInitUnicodeString(&ValueName, + L"1"); + + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)LanguageId, + (8 + 1) * sizeof(WCHAR)); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } + + RtlInitUnicodeString(&ValueName, + L"2"); + + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)CurrentLangId, + (8 + 1) * sizeof(WCHAR)); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } } NtClose(KeyHandle);

1 0

[mpiulachs] 33174: make rbuild files XML compliant by adding the XInclude namespace , no code change
by mpiulachs＠svn.reactos.org 28 Apr '08

28 Apr '08

Author: mpiulachs Date: Mon Apr 28 08:44:11 2008 New Revision: 33174 URL: http://svn.reactos.org/svn/reactos?rev=33174&view=rev Log: make rbuild files XML compliant by adding the XInclude namespace , no code change Modified: trunk/reactos/ntoskrnl/ntkrnlmp.rbuild trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/ntkrnlmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntkrnlmp.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntkrnlmp.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntkrnlmp.rbuild [iso-8859-1] Mon Apr 28 08:44:11 2008 @@ -1,7 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> -<module name="ntkrnlmp" type="kernel" installbase="system32" installname="ntkrnlmp.exe"> - <define name="CONFIG_SMP" /> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="ntkrnlmp" type="kernel" installbase="system32" installname="ntkrnlmp.exe"> + <define name="CONFIG_SMP" /> - <xi:include href="ntoskrnl-generic.rbuild" /> -</module> + <xi:include href="ntoskrnl-generic.rbuild" /> + </module> +</group> Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild [iso-8859-1] Mon Apr 28 08:44:11 2008 @@ -1,5 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> -<module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe"> - <xi:include href="ntoskrnl-generic.rbuild" /> -</module> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe"> + <xi:include href="ntoskrnl-generic.rbuild" /> + </module> +</group>

1 0

[greatlrd] 33173: update intEnableReactXDriver with more code
by greatlrd＠svn.reactos.org 28 Apr '08

28 Apr '08

Author: greatlrd Date: Mon Apr 28 01:03:29 2008 New Revision: 33173 URL: http://svn.reactos.org/svn/reactos?rev=33173&view=rev Log: update intEnableReactXDriver with more code Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Mon Apr 28 01:03:29 2008 @@ -35,9 +35,21 @@ PGDIDEVICE pDev = (PGDIDEVICE)pDC->pPDev; BOOLEAN success = FALSE; DD_GETDRIVERINFODATA GetInfo; + PGD_DXDDENABLEDIRECTDRAW pfnDdEnableDirectDraw = (PGD_DXDDENABLEDIRECTDRAW)gpDxFuncs[DXG_INDEX_DxDdEnableDirectDraw].pfn; /*clean up some of the cache entry */ RtlZeroMemory(pEddgbl,sizeof(EDD_DIRECTDRAW_GLOBAL)); + + if (pfnDdEnableDirectDraw == NULL) + { + DPRINT1("Warning: no pfnDdEnableDirectDraw\n"); + } + else + { + DPRINT1(" call to pfnDdEnableDirectDraw \n "); + success = pfnDdEnableDirectDraw(pDC->PDev, TRUE); + DPRINT1(" end call to pfnDdEnableDirectDraw \n "); + } /* setup hdev for edd_DdirectDraw_Global xp */ edd_DdirectDraw_Global.hDev = pDC->pPDev; @@ -253,8 +265,12 @@ /* setup missing data in ddHalInfo */ //pEddgbl->ddHalInfo.GetDriverInfo = (PVOID)pDev->DriverFunctions.GetDirectDrawInfo; + /* FIXME : hack ? it will let us DxDdQueryDirectDrawObject if the llAssertModeTimeout contain negtive value -1*/ pEddgbl->llAssertModeTimeout.QuadPart = -1; + + + /* FIXME : remove this when we are done with debuging of dxg */ dump_edd_directdraw_global(pEddgbl); @@ -389,24 +405,7 @@ } /* FIXME this code should be add where the driver being load */ - pDC = DC_LockDc(hdc); - if (pDC == NULL) - { - DPRINT1("Warning : Failed to lock hdc\n"); - return 0; - } - - /* FIXME This should be alloc for each drv and use it from each drv, not global for whole win32k */ - if (intEnableReactXDriver(&edd_DdirectDraw_Global, pDC) == FALSE) - { - DC_UnlockDc(pDC); - DPRINT1("Warning : Failed to start the directx interface from the graphic driver\n"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DC_UnlockDc(pDC); - - /* FIXME get the process data */ + /* FIXME get the process data */ /* FIXME this code should be add where the driver being load */ Status = DxDdStartupDxGraphics(0,NULL,0,NULL,NULL, Proc); if (!NT_SUCCESS(Status)) @@ -414,6 +413,25 @@ DPRINT1("Warning : Failed to create the directx interface\n"); return 0; } + + pDC = DC_LockDc(hdc); + if (pDC == NULL) + { + DPRINT1("Warning : Failed to lock hdc\n"); + return 0; + } + + /* FIXME This should be alloc for each drv and use it from each drv, not global for whole win32k */ + if (intEnableReactXDriver(&edd_DdirectDraw_Global, pDC) == FALSE) + { + DC_UnlockDc(pDC); + DPRINT1("Warning : Failed to start the directx interface from the graphic driver\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DC_UnlockDc(pDC); + + /* get the pfnDdCreateDirectDrawObject after we load the drv */ pfnDdCreateDirectDrawObject = (PGD_DDCREATEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdCreateDirectDrawObject].pfn;

1 0

[dchapyshev] 33172: - Add kbswitch to autorun
by dchapyshev＠svn.reactos.org 27 Apr '08

27 Apr '08

Author: dchapyshev Date: Sun Apr 27 15:42:01 2008 New Revision: 33172 URL: http://svn.reactos.org/svn/reactos?rev=33172&view=rev Log: - Add kbswitch to autorun Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sun Apr 27 15:42:01 2008 @@ -804,4 +804,7 @@ ; Where to download the Mozilla ActiveX control HKLM,"SOFTWARE\ReactOS\shdocvw","MozillaUrl",0x00000000,"http://links.reactos.org/mozactivex" +; Keyboard layout switcher +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run","kbswitch",0x00000000,"kbswitch.exe" + ; EOF

1 0

[dchapyshev] 33171: - Don't be loaded more than one copy of the application (based on mutex)
by dchapyshev＠svn.reactos.org 27 Apr '08

27 Apr '08

Author: dchapyshev Date: Sun Apr 27 12:14:58 2008 New Revision: 33171 URL: http://svn.reactos.org/svn/reactos?rev=33171&view=rev Log: - Don't be loaded more than one copy of the application (based on mutex) Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Sun Apr 27 12:14:58 2008 @@ -9,6 +9,9 @@ #include "kbswitch.h" #define WM_NOTIFYICONMSG (WM_USER + 248) + +TCHAR szKbSwitcherName[] = _T("kbswitcher"); + static BOOL GetLayoutID(LPTSTR szLayoutNum, LPTSTR szLCID); @@ -370,6 +373,11 @@ { WNDCLASS WndClass = {0}; MSG msg; + HANDLE hMutex; + + hMutex = CreateMutex(NULL, FALSE, szKbSwitcherName); + if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS)) + return 1; hInst = hInstance; hProcessHeap = GetProcessHeap(); @@ -383,12 +391,12 @@ WndClass.hCursor = NULL; WndClass.hbrBackground = NULL; WndClass.lpszMenuName = NULL; - WndClass.lpszClassName = _T("kbswitch"); + WndClass.lpszClassName = szKbSwitcherName; if (!RegisterClass(&WndClass)) return 1; - CreateWindow(_T("kbswitch"), NULL, 0, 0, 0, 1, 1, HWND_DESKTOP, NULL, hInstance, NULL); + CreateWindow(szKbSwitcherName, NULL, 0, 0, 0, 1, 1, HWND_DESKTOP, NULL, hInstance, NULL); while(GetMessage(&msg,NULL,0,0)) { @@ -396,5 +404,7 @@ DispatchMessage(&msg); } + CloseHandle(hMutex); + return 0; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2008