Ros-diffs April 2008

ros-diffs@reactos.org

21 participants
395 discussions

[fireball] 33190: - Fix typos in source code comments.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Apr 29 10:36:11 2008 New Revision: 33190 URL: http://svn.reactos.org/svn/reactos?rev=33190&view=rev Log: - Fix typos in source code comments. Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] Tue Apr 29 10:36:11 2008 @@ -5,22 +5,23 @@ #define PDD_BASEOBJECT POBJ #define DD_BASEOBJECT BASEOBJECT -/* _EDD_DIRECTDRAW_LOCAL is 0x54 byte big on windows xp */ +/* _EDD_DIRECTDRAW_LOCAL is 0x54 bytes long on Windows XP */ typedef struct _EDD_DIRECTDRAW_LOCAL { // // GDI Object Header // -/* 0x00 */ DD_BASEOBJECT pobj; // verify it match windows xp -/* 0x10 */ struct _EDD_DIRECTDRAW_GLOBAL * peDirectDrawGlobal; // verify it match windows xp +/* 0x00 */ DD_BASEOBJECT pobj; // verified to match Windows XP +/* 0x10 */ struct _EDD_DIRECTDRAW_GLOBAL * peDirectDrawGlobal; // verified to match Windows XP /* 0x14 */ struct _EDD_SURFACE * peSurface_DdList; /* 0x18 */ ULONG unk_018; /* 0x1C */ ULONG unk_01c; /* 0x20 */ ULONG unk_020; -/* 0x24 */ struct _EDD_DIRECTDRAW_GLOBAL * peDirectDrawGlobal2; // verify it match windows xp +/* 0x24 */ struct _EDD_DIRECTDRAW_GLOBAL * peDirectDrawGlobal2; // verified to match Windows XP /* 0x28 */ FLATPTR fpProcess; /* 0x2C */ FLONG fl; -/* 0x30 */ struct _EDD_DIRECTDRAW_LOCAL *peDirectDrawLocal_prev; // verify it match windows xp, to old lcl store here when new handle are create. +/* 0x30 */ struct _EDD_DIRECTDRAW_LOCAL *peDirectDrawLocal_prev; // verified to match Windows XP, + // points to the old DDLocal when new handle is created. /* 0x34 */ PEPROCESS Process; /* 0x38 */ ULONG unk_038; /* 0x3C */ HANDLE UniqueProcess; @@ -96,8 +97,8 @@ /* NOTE : - * if these been set in struct EDD_DIRECTDRAW_GLOBAL member dwCallbackFlags, - * it mean that the callback member for it have been fill in from the graphic drv + * if any of these flags are set in dwCallbackFlags (struct EDD_DIRECTDRAW_GLOBAL), + * it means that the respective callback member for it has been filled in by a graphic driver */ #define EDDDGBL_MISCCALLBACKS 0x01 // ddMiscellanousCallbacks #define EDDDGBL_VIDEOPORTCALLBACKS 0x02 // ddVideoPortCallback @@ -111,8 +112,8 @@ /* 0x00C */ ULONG unk_000c[3]; /* 0x018 */ LONG cDriverReferences; /* 0x01C */ ULONG unk_01c; -/* 0x020 */ DWORD dwCallbackFlags; /* <-- verify it match windows xp, dwCallbackFlags - Flags value +/* 0x020 */ DWORD dwCallbackFlags; /* <-- verified to match Windows XP, dwCallbackFlags + Flags value 0x0002 = ddVideoPortCallback and GUID_VideoPortCaps 0x0004 = GUID_ColorControlCallbacks 0x0040 = GUID_MotionCompCallbacks @@ -124,44 +125,44 @@ /* 0x024 */ ULONG unk_024; #ifdef _WIN32 -/* 0x028 */ LARGE_INTEGER llAssertModeTimeout; // 0x028 <-- verify it match windows xp, llAssertModeTimeout +/* 0x028 */ LARGE_INTEGER llAssertModeTimeout; // 0x028 <-- verified to match Windows XP, llAssertModeTimeout #else /* 0x028 */ DWORD llAssertModeTimeoutLowPart; /* 0x02C */ DWORD llAssertModeTimeoutHighPart; #endif -/* 0x030 */ DWORD dwNumHeaps; // 0x030 <-- verify it match windows xp, dwNumHeaps -/* 0x034 */ VIDEOMEMORY *pvmList; // 0x034 <-- verify it match windows xp, pvmList +/* 0x030 */ DWORD dwNumHeaps; // 0x030 <-- verified to match Windows XP, dwNumHeaps +/* 0x034 */ VIDEOMEMORY *pvmList; // 0x034 <-- verified to match Windows XP, pvmList /* 0x038 */ DWORD dwNumFourCC; /* 0x03C */ PDWORD pdwFourCC; /* 0x040 */ DD_HALINFO ddHalInfo; /* 0x1E0 */ ULONG unk_1e0[46]; -/* 0x298 */ DD_CALLBACKS ddCallbacks; // 0x298 <-- verify it match windows xp, ddCallbacks -/* 0x2C0 */ DD_SURFACECALLBACKS ddSurfaceCallbacks; // 0x2C4 <-- verify it match windows xp, ddSurfaceCallbacks -/* 0x300 */ DD_PALETTECALLBACKS ddPaletteCallbacks; // 0x300 <-- verify it match windows xp, ddPaletteCallbacks +/* 0x298 */ DD_CALLBACKS ddCallbacks; // 0x298 <-- verified to match Windows XP, ddCallbacks +/* 0x2C0 */ DD_SURFACECALLBACKS ddSurfaceCallbacks; // 0x2C4 <-- verified to match Windows XP, ddSurfaceCallbacks +/* 0x300 */ DD_PALETTECALLBACKS ddPaletteCallbacks; // 0x300 <-- verified to match Windows XP, ddPaletteCallbacks /* 0x314 */ ULONG unk_314[46]; /* 0x3D4 */ D3DNTHAL_CALLBACKS d3dNtHalCallbacks; /* 0x460 */ ULONG unk_460[7]; /* 0x47C */ D3DNTHAL_CALLBACKS2 d3dNtHalCallbacks2; -/* 0x498 */ DD_VIDEOPORTCALLBACKS ddVideoPortCallback; // 0x498 <-- verify it match windows xp, ddVideoPortCallback -/* 0x4E0 */ DD_MISCELLANEOUSCALLBACKS ddMiscellanousCallbacks; // 0x4E0 <-- verify it match windows xp, ddMiscellanousCallbacks -/* 0x4EC */ DD_MISCELLANEOUS2CALLBACKS ddMiscellanous2Callbacks; // 0x4EC <-- verify it match windows xp, ddMiscellanous2Callbacks +/* 0x498 */ DD_VIDEOPORTCALLBACKS ddVideoPortCallback; // 0x498 <-- verified to match Windows XP, ddVideoPortCallback +/* 0x4E0 */ DD_MISCELLANEOUSCALLBACKS ddMiscellanousCallbacks; // 0x4E0 <-- verified to match Windows XP, ddMiscellanousCallbacks +/* 0x4EC */ DD_MISCELLANEOUS2CALLBACKS ddMiscellanous2Callbacks; // 0x4EC <-- verified to match Windows XP, ddMiscellanous2Callbacks /* 0x504 */ ULONG unk_504[12]; /* 0x534 */ D3DNTHAL_CALLBACKS3 d3dNtHalCallbacks3; /* 0x5A4 */ ULONG unk_544; /* 0x5A8 */ ULONG unk_548; /* 0x54C */ ULONG unk_54c[23]; -/* 0x5A8 */ EDD_DIRECTDRAW_LOCAL* peDirectDrawLocalList; // 0x5A8 <-- verify it match windows xp, comment it is current local struct not a list, peDirectDrawLocalList Current +/* 0x5A8 */ EDD_DIRECTDRAW_LOCAL* peDirectDrawLocalList; // 0x5A8 <-- verified to match Windows XP, it is a current local struct, not a list, peDirectDrawLocalList Current /* 0x5ac */ EDD_SURFACE* peSurface_LockList; /* 0x5B0 */ FLONG fl; /* 0x5B4 */ ULONG cSurfaceLocks; /* 0x5B8 */ PKEVENT pAssertModeEvent; /* 0x5Bc */ EDD_SURFACE *peSurfaceCurrent; /* 0x5C0 */ EDD_SURFACE *peSurfacePrimary; -/* 0x5C4 */ BOOL bSuspended; // 0x5C4 <-- verify it match windows xp, tells to dxg to use the drv own api or return error code instead +/* 0x5C4 */ BOOL bSuspended; // 0x5C4 <-- verified to match Windows XP, tells dxg to use driver's own api or return error code instead /* 0x5C8 */ ULONG unk_5c8[12]; /* 0x5F8 */ RECTL rcbounds; /* 0x608 */ ULONG unk_608; -/* 0x60c */ HDEV hDev; // 0x60c <-- verify it match windows xp, The real Pdev, hDev +/* 0x60c */ HDEV hDev; // 0x60c <-- verified to match Windows XP, The real Pdev, hDev /* Windows XP and higher */ /* 0x610 */ ULONG unk_610[63];

16 years, 8 months

[janderwald] 33189: RRF_RT_REG_SZ is already defined in winreg.h

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Apr 29 10:24:54 2008 New Revision: 33189 URL: http://svn.reactos.org/svn/reactos?rev=33189&view=rev Log: RRF_RT_REG_SZ is already defined in winreg.h Modified: trunk/reactos/base/services/dhcp/include/rosdhcp.h Modified: trunk/reactos/base/services/dhcp/include/rosdhcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/include… ============================================================================== --- trunk/reactos/base/services/dhcp/include/rosdhcp.h [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/include/rosdhcp.h [iso-8859-1] Tue Apr 29 10:24:54 2008 @@ -26,7 +26,6 @@ #define DHCP_PANIC_TIMEOUT DHCP_REBOOT_TIMEOUT * 3 #define DHCP_BACKOFF_MAX 300 #define _PATH_DHCLIENT_PID "\\systemroot\\system32\\drivers\\etc\\dhclient.pid" -#define RRF_RT_REG_SZ 2 typedef void *VOIDPTR; typedef u_int32_t uintTIME;

16 years, 8 months

[janderwald] 33188: - fix flickering of DirectDraw tests by Pigglesworth (Kamil Hornicek) - enumerate all available display / sound adapters dynamically at start (does not work yet) - rewrite TabCtrl_OnSelChange to reflect changes

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Apr 29 07:19:55 2008 New Revision: 33188 URL: http://svn.reactos.org/svn/reactos?rev=33188&view=rev Log: - fix flickering of DirectDraw tests by Pigglesworth (Kamil Hornicek) - enumerate all available display / sound adapters dynamically at start (does not work yet) - rewrite TabCtrl_OnSelChange to reflect changes Modified: trunk/reactos/base/applications/dxdiag/ddtest.c trunk/reactos/base/applications/dxdiag/display.c trunk/reactos/base/applications/dxdiag/dxdiag.c trunk/reactos/base/applications/dxdiag/precomp.h trunk/reactos/base/applications/dxdiag/sound.c Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/ddtest.c [iso-8859-1] Tue Apr 29 07:19:55 2008 @@ -7,21 +7,20 @@ * */ - #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 +LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); + +#define TEST_DURATION 10000 +#define WIDTH 640 +#define HEIGHT 480 #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) @@ -70,19 +69,50 @@ return FALSE; } -VOID DDTests(HWND hWnd, HINSTANCE hInstance) -{ +VOID DDTests() +{ + WNDCLASSEX winClass; + HWND hWnd; + HINSTANCE hInstance = NULL; WCHAR szDescription[256]; WCHAR szCaption[256]; + + winClass.cbSize = sizeof(WNDCLASSEX); + winClass.style = CS_DBLCLKS | CS_OWNDC | CS_HREDRAW | CS_VREDRAW; + winClass.lpfnWndProc = WindowProc; + winClass.cbClsExtra = 0; + winClass.cbWndExtra = 0; + winClass.hInstance = hInstance; + winClass.hIcon = 0; + winClass.hCursor = 0; + winClass.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); + winClass.lpszMenuName = NULL; + winClass.lpszClassName = L"ddtest"; + winClass.hIconSm = LoadIcon(NULL, IDI_APPLICATION); + + if (!RegisterClassEx(&winClass)) + return; + + hWnd = CreateWindowEx(0, winClass.lpszClassName, NULL,WS_POPUP, + (GetSystemMetrics(SM_CXSCREEN) - WIDTH)/2, + (GetSystemMetrics(SM_CYSCREEN) - HEIGHT)/2, + WIDTH, HEIGHT, NULL, NULL, hInstance, NULL); + + if (!hWnd){ + return; + } 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); + return; 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); + + DestroyWindow(hWnd); + UnregisterClass(winClass.lpszClassName, hInstance); } BOOL DDPrimarySurfaceTest(HWND hWnd){ @@ -334,3 +364,8 @@ } } } + +LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + return DefWindowProc(hWnd, msg, wParam, lParam); +} 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] Tue Apr 29 07:19:55 2008 @@ -173,8 +173,15 @@ HWND hDlgCtrls[3]; DWORD dwMemory; DEVMODE DevMode; - DISPLAY_DEVICEW DispDevice; + + /// FIXME + /// use initialization context + /// + ZeroMemory(&DispDevice, sizeof(DISPLAY_DEVICEW)); + DispDevice.cb = sizeof(DISPLAY_DEVICEW); + if (!EnumDisplayDevicesW(NULL, 0, &DispDevice, 0)) + return FALSE; /* query display device adapter */ ZeroMemory(&DispDevice, sizeof(DISPLAY_DEVICEW)); @@ -275,6 +282,56 @@ return TRUE; } +void InitializeDisplayAdapters(PDXDIAG_CONTEXT pContext) +{ + DISPLAY_DEVICEW DispDevice; + HWND * hDlgs; + HWND hwndDlg; + WCHAR szDisplay[20]; + WCHAR szText[30]; + DWORD dwOffset = 0; + + while(TRUE) + { + ZeroMemory(&DispDevice, sizeof(DISPLAY_DEVICEW)); + DispDevice.cb = sizeof(DISPLAY_DEVICEW); + if (!EnumDisplayDevicesW(NULL, pContext->NumDisplayAdapter + dwOffset, &DispDevice, 0)) + return; + + /* skip devices not attached to the desktop and mirror drivers */ + if (!(DispDevice.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) || (DispDevice.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER)) + { + dwOffset++; + continue; + } + if (pContext->NumDisplayAdapter) + hDlgs = HeapReAlloc(GetProcessHeap(), 0, pContext->hDisplayWnd, (pContext->NumDisplayAdapter + 1) * sizeof(HWND)); + else + hDlgs = HeapAlloc(GetProcessHeap(), 0, (pContext->NumDisplayAdapter + 1) * sizeof(HWND)); + + if (!hDlgs) + break; + + pContext->hDisplayWnd = hDlgs; + hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY_DIALOG), pContext->hMainDialog, DisplayPageWndProc, (LPARAM)pContext); + if (!hwndDlg) + break; + + szDisplay[0] = L'\0'; + LoadStringW(hInst, IDS_DISPLAY_DIALOG, szDisplay, sizeof(szDisplay)/sizeof(WCHAR)); + szDisplay[(sizeof(szDisplay)/sizeof(WCHAR))-1] = L'\0'; + + swprintf (szText, L"%s %u", szDisplay, pContext->NumDisplayAdapter + 1); + InsertTabCtrlItem(GetDlgItem(pContext->hMainDialog, IDC_TAB_CONTROL), pContext->NumDisplayAdapter + 1, szText); + + hDlgs[pContext->NumDisplayAdapter] = hwndDlg; + pContext->NumDisplayAdapter++; + } + + +} + + INT_PTR CALLBACK DisplayPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { @@ -295,11 +352,7 @@ { 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); + DDTests(); /* FIXME resize window */ 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] Tue Apr 29 07:19:55 2008 @@ -28,21 +28,29 @@ //--------------------------------------------------------------- VOID -InsertTabCtrlItem(HWND hDlgCtrl, INT Position, UINT uId) +InsertTabCtrlItem(HWND hDlgCtrl, INT Position, LPWSTR uId) { WCHAR szName[100]; TCITEMW item; - - /* load item name */ - szName[0] = L'\0'; - if (!LoadStringW(hInst, uId, szName, 100)) - return; - szName[99] = L'\0'; /* setup item info */ memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; - item.pszText = szName; + + /* load item name */ + if (!HIWORD(uId)) + { + szName[0] = L'\0'; + if (!LoadStringW(hInst, LOWORD(uId), szName, 100)) + return; + szName[99] = L'\0'; + item.pszText = szName; + } + else + { + item.pszText = uId; + } + SendMessageW(hDlgCtrl, TCM_INSERTITEM, Position, (LPARAM)&item); } @@ -55,42 +63,55 @@ /* retrieve new page */ CurSel = TabCtrl_GetCurSel(hTabCtrlWnd); - if (CurSel < 0 || CurSel > 7) - return; - - /* show active page */ - for(Index = 0; Index < 7; Index++) - { - if (Index == CurSel) - ShowWindow(pContext->hDialogs[Index], SW_SHOW); - else - ShowWindow(pContext->hDialogs[Index], SW_HIDE); - } -} - + if (CurSel < 0 || CurSel > pContext->NumDisplayAdapter + pContext->NumSoundAdapter + 5) + return; + + /* hide all windows */ + for(Index = 0; Index < 5; Index++) + ShowWindow(pContext->hDialogs[Index], SW_HIDE); + + for(Index = 0; Index < pContext->NumDisplayAdapter; Index++) + ShowWindow(pContext->hDisplayWnd[Index], SW_HIDE); + + for(Index = 0; Index < pContext->NumSoundAdapter; Index++) + ShowWindow(pContext->hSoundWnd[Index], SW_HIDE); + + + if (CurSel == 0 || CurSel > pContext->NumDisplayAdapter + pContext->NumSoundAdapter) + { + ShowWindow(pContext->hDialogs[min(0, CurSel-pContext->NumDisplayAdapter-pContext->NumSoundAdapter)], SW_SHOW); + return; + } + + if (CurSel -1 < pContext->NumDisplayAdapter) + { + ShowWindow(pContext->hDisplayWnd[CurSel-1], SW_SHOW); + return; + } + + CurSel -= pContext->NumDisplayAdapter + 1; + ShowWindow(pContext->hSoundWnd[CurSel], SW_SHOW); +} VOID InitializeTabCtrl(HWND hwndDlg, PDXDIAG_CONTEXT pContext) { /* create the dialogs */ pContext->hDialogs[0] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SYSTEM_DIALOG), hwndDlg, SystemPageWndProc, (LPARAM)pContext); - pContext->hDialogs[1] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY_DIALOG), hwndDlg, DisplayPageWndProc, (LPARAM)pContext); - pContext->hDialogs[2] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SOUND_DIALOG), hwndDlg, SoundPageWndProc, (LPARAM)pContext); - pContext->hDialogs[3] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_MUSIC_DIALOG), hwndDlg, MusicPageWndProc, (LPARAM)pContext); - pContext->hDialogs[4] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_INPUT_DIALOG), hwndDlg, InputPageWndProc, (LPARAM)pContext); - pContext->hDialogs[5] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_NETWORK_DIALOG), hwndDlg, NetworkPageWndProc, (LPARAM)pContext); - pContext->hDialogs[6] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_HELP_DIALOG), hwndDlg, HelpPageWndProc, (LPARAM)pContext); + pContext->hDialogs[1] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_MUSIC_DIALOG), hwndDlg, MusicPageWndProc, (LPARAM)pContext); + pContext->hDialogs[2] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_INPUT_DIALOG), hwndDlg, InputPageWndProc, (LPARAM)pContext); + pContext->hDialogs[3] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_NETWORK_DIALOG), hwndDlg, NetworkPageWndProc, (LPARAM)pContext); + pContext->hDialogs[4] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_HELP_DIALOG), hwndDlg, HelpPageWndProc, (LPARAM)pContext); /* insert tab ctrl items */ hTabCtrlWnd = GetDlgItem(hwndDlg, IDC_TAB_CONTROL); - InsertTabCtrlItem(hTabCtrlWnd, 0, IDS_SYSTEM_DIALOG); - InsertTabCtrlItem(hTabCtrlWnd, 1, IDS_DISPLAY_DIALOG); - InsertTabCtrlItem(hTabCtrlWnd, 2, IDS_SOUND_DIALOG); - InsertTabCtrlItem(hTabCtrlWnd, 3, IDS_MUSIC_DIALOG); - InsertTabCtrlItem(hTabCtrlWnd, 4, IDS_INPUT_DIALOG); - InsertTabCtrlItem(hTabCtrlWnd, 5, IDS_NETWORK_DIALOG); - InsertTabCtrlItem(hTabCtrlWnd, 6, IDS_HELP_DIALOG); - + InsertTabCtrlItem(hTabCtrlWnd, 0, MAKEINTRESOURCEW(IDS_SYSTEM_DIALOG)); + InitializeDisplayAdapters(pContext); + InitializeDirectSoundPage(pContext); + InsertTabCtrlItem(hTabCtrlWnd, pContext->NumDisplayAdapter + pContext->NumSoundAdapter + 1, MAKEINTRESOURCEW(IDS_MUSIC_DIALOG)); + InsertTabCtrlItem(hTabCtrlWnd, pContext->NumDisplayAdapter + pContext->NumSoundAdapter + 2, MAKEINTRESOURCEW(IDS_INPUT_DIALOG)); + InsertTabCtrlItem(hTabCtrlWnd, pContext->NumDisplayAdapter + pContext->NumSoundAdapter + 3, MAKEINTRESOURCEW(IDS_NETWORK_DIALOG)); + InsertTabCtrlItem(hTabCtrlWnd, pContext->NumDisplayAdapter + pContext->NumSoundAdapter + 4, MAKEINTRESOURCEW(IDS_HELP_DIALOG)); TabCtrl_OnSelChange(pContext); } 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] Tue Apr 29 07:19:55 2008 @@ -20,7 +20,11 @@ typedef struct { HWND hMainDialog; - HWND hDialogs[7]; + ULONG NumDisplayAdapter; + HWND * hDisplayWnd; + ULONG NumSoundAdapter; + HWND * hSoundWnd; + HWND hDialogs[5]; }DXDIAG_CONTEXT, *PDXDIAG_CONTEXT; @@ -39,9 +43,16 @@ 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); +VOID InsertTabCtrlItem(HWND hDlgCtrl, INT Position, LPWSTR uId); + /* DirectDraw tests */ -BOOL StartDDTest(HWND hWnd, HINSTANCE hInstance, INT resTestDescription, INT resResult, INT TestNr); +VOID DDTests(); +/* DirectSound initialization */ +void InitializeDirectSoundPage(PDXDIAG_CONTEXT pContext); + +/* display adapter initialization */ +void InitializeDisplayAdapters(PDXDIAG_CONTEXT pContext); BOOL GetFileVersion(LPCWSTR szAppName, WCHAR * szVer, DWORD szVerSize); BOOL GetFileModifyTime(LPCWSTR pFullPath, WCHAR * szTime, int szTimeSize); Modified: trunk/reactos/base/applications/dxdiag/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/s… ============================================================================== --- trunk/reactos/base/applications/dxdiag/sound.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/sound.c [iso-8859-1] Tue Apr 29 07:19:55 2008 @@ -9,6 +9,62 @@ #include "precomp.h" +BOOL CALLBACK DSEnumCallback(LPGUID lpGuid, LPCWSTR lpcstrDescription, LPCWSTR lpcstrModule, LPVOID lpContext) +{ + PDXDIAG_CONTEXT pContext = (PDXDIAG_CONTEXT)lpContext; + HWND * hDlgs; + HWND hwndDlg; + WCHAR szSound[20]; + WCHAR szText[30]; + + if (!lpGuid) + return TRUE; + + if (pContext->NumSoundAdapter) + hDlgs = HeapReAlloc(GetProcessHeap(), 0, pContext->hSoundWnd, (pContext->NumSoundAdapter + 1) * sizeof(HWND)); + else + hDlgs = HeapAlloc(GetProcessHeap(), 0, (pContext->NumSoundAdapter + 1) * sizeof(HWND)); + + if (!hDlgs) + return FALSE; + + pContext->hSoundWnd = hDlgs; + hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SOUND_DIALOG), pContext->hMainDialog, SoundPageWndProc, (LPARAM)pContext); + if (!hwndDlg) + return FALSE; + + szSound[0] = L'\0'; + LoadStringW(hInst, IDS_SOUND_DIALOG, szSound, sizeof(szSound)/sizeof(WCHAR)); + szSound[(sizeof(szSound)/sizeof(WCHAR))-1] = L'\0'; + + swprintf (szText, L"%s %u", szSound, pContext->NumSoundAdapter + 1); + + + InsertTabCtrlItem(GetDlgItem(pContext->hMainDialog, IDC_TAB_CONTROL), pContext->NumDisplayAdapter + pContext->NumSoundAdapter + 1, szText); + + hDlgs[pContext->NumSoundAdapter] = hwndDlg; + pContext->NumSoundAdapter++; + + return TRUE; +} + + +void InitializeDirectSoundPage(PDXDIAG_CONTEXT pContext) +{ + HRESULT hResult; + //IDirectSound8 *pObj; + + /* create DSound object */ +// hResult = DirectSoundCreate8(NULL, (LPDIRECTSOUND8*)&pObj, NULL); +// if (hResult != DS_OK) +// return; + hResult = DirectSoundEnumerateW(DSEnumCallback, pContext); + + /* release the DSound object */ +// pObj->lpVtbl->Release(pObj); +} + + INT_PTR CALLBACK SoundPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { @@ -18,6 +74,7 @@ case WM_INITDIALOG: { SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); + //InitializeDirectSoundPage(hDlg); return TRUE; } }

16 years, 8 months

[janderwald] 33187: - query current time zone - retrieve localized country for a version - pass length parameter to avoid potential buffer overflows

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Apr 29 05:27:03 2008 New Revision: 33187 URL: http://svn.reactos.org/svn/reactos?rev=33187&view=rev Log: - query current time zone - retrieve localized country for a version - pass length parameter to avoid potential buffer overflows Modified: trunk/reactos/base/applications/dxdiag/display.c trunk/reactos/base/applications/dxdiag/network.c trunk/reactos/base/applications/dxdiag/precomp.h 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] Tue Apr 29 05:27:03 2008 @@ -18,6 +18,7 @@ FILETIME AccessTime; SYSTEMTIME SysTime, LocalTime; UINT Length; + TIME_ZONE_INFORMATION TimeInfo; hFile = CreateFileW(pFullPath, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); if (!hFile) @@ -30,10 +31,13 @@ } CloseHandle(hFile); + if(!GetTimeZoneInformation(&TimeInfo)) + return FALSE; + if (!FileTimeToSystemTime(&AccessTime, &SysTime)) return FALSE; - if (!SystemTimeToTzSpecificLocalTime(NULL, &SysTime, &LocalTime)) + if (!SystemTimeToTzSpecificLocalTime(&TimeInfo, &SysTime, &LocalTime)) return FALSE; Length = GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &LocalTime, NULL, szTime, szTimeSize); @@ -82,7 +86,7 @@ else { /* set file version */ - if (GetFileVersion(pFullPath, szVer)) + if (GetFileVersion(pFullPath, szVer, sizeof(szVer)/sizeof(WCHAR))) SendMessageW(hDlgCtrls[1], WM_SETTEXT, 0, (LPARAM)szVer); /* set file time */ if (GetFileModifyTime(pFullPath, szVer, sizeof(szVer)/sizeof(WCHAR))) 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] Tue Apr 29 05:27:03 2008 @@ -100,7 +100,7 @@ } BOOL -GetFileVersion(LPCWSTR szAppName, WCHAR * szVer) +GetFileVersion(LPCWSTR szAppName, WCHAR * szVer, DWORD szVerSize) { UINT VerSize; DWORD DummyHandle; @@ -150,9 +150,14 @@ pResult = NULL; bResult = VerQueryValueW(pBuf, szBuffer, (LPVOID *)&pResult, &VerSize); - if (VerSize && bResult && pResult) + if (VerSize < szVerSize && bResult && pResult) { wcscpy(szVer, pResult); + if (GetLocaleInfoW(MAKELCID(lang, SORT_DEFAULT), LOCALE_SLANGUAGE, &szVer[VerSize], szVerSize-VerSize)) + { + szVer[VerSize-1] = L' '; + szVer[szVerSize-1] = L'\0'; + } bResult = TRUE; } @@ -254,7 +259,7 @@ Item.iItem = ProviderIndex + ItemCount; SendMessageW(hDlgCtrl, LVM_SETITEM, 0, (LPARAM)&Item); /* retrieve file version */ - if (!GetFileVersion(szResult, szTemp)) + if (!GetFileVersion(szResult, szTemp, sizeof(szTemp)/sizeof(WCHAR))) { szTemp[0] = L'\0'; LoadStringW(hInst, IDS_VERSION_UNKNOWN, szTemp, sizeof(szTemp)/sizeof(WCHAR)); 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] Tue Apr 29 05:27:03 2008 @@ -43,6 +43,6 @@ BOOL StartDDTest(HWND hWnd, HINSTANCE hInstance, INT resTestDescription, INT resResult, INT TestNr); -BOOL GetFileVersion(LPCWSTR szAppName, WCHAR * szVer); +BOOL GetFileVersion(LPCWSTR szAppName, WCHAR * szVer, DWORD szVerSize); BOOL GetFileModifyTime(LPCWSTR pFullPath, WCHAR * szTime, int szTimeSize); #endif

16 years, 8 months

[jimtabor] 33186: Implement DxEngSetDCOwner, add stub for IntGdiSetDCOwnerEx.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Apr 28 21:00:56 2008 New Revision: 33186 URL: http://svn.reactos.org/svn/reactos?rev=33186&view=rev Log: Implement DxEngSetDCOwner, add stub for IntGdiSetDCOwnerEx. Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] Mon Apr 28 21:00:56 2008 @@ -77,5 +77,6 @@ BOOL FASTCALL NtGdiDeleteObject(HGDIOBJ hObject); BOOL FASTCALL IsObjectDead(HGDIOBJ); +BOOL FASTCALL IntGdiSetDCOwnerEx( HGDIOBJ, DWORD, BOOL); #endif Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Mon Apr 28 21:00:56 2008 @@ -1,4 +1,3 @@ - /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -725,8 +724,7 @@ /************************************************************************/ BOOL STDCALL DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask) { - UNIMPLEMENTED; - return FALSE; + return IntGdiSetDCOwnerEx( hObject, OwnerMask, FALSE); } /************************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Mon Apr 28 21:00:56 2008 @@ -1646,6 +1646,15 @@ return Result; } + +BOOL +FASTCALL +IntGdiSetDCOwnerEx( HGDIOBJ hObject, DWORD OwnerMask, BOOL NoSetBrush) +{ + UNIMPLEMENTED; + return FALSE; +} + W32KAPI INT APIENTRY

16 years, 8 months

[jimtabor] 33185: Update DxEngSetDCOwner and add owner masks.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Apr 28 20:46:58 2008 New Revision: 33185 URL: http://svn.reactos.org/svn/reactos?rev=33185&view=rev Log: Update DxEngSetDCOwner and add owner masks. Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] Mon Apr 28 20:46:58 2008 @@ -84,6 +84,7 @@ BOOLEAN STDCALL DxEngLockShareSem(); BOOLEAN STDCALL DxEngUnlockShareSem(); DWORD STDCALL DxEngScreenAccessCheck(); +BOOL STDCALL DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask); /* prototypes are not done yet, I need gather all my notes * to make them correct @@ -106,7 +107,6 @@ DWORD DxEngSpSpritesVisible(DWORD x1); DWORD DxEngGetDesktopDC(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngDeleteDC(DWORD x1, DWORD x2); -DWORD DxEngSetDCOwner(DWORD x1, DWORD x2); DWORD DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngSelectBitmap(DWORD x1, DWORD x2); DWORD DxEngSetBitmapOwner(DWORD x1, DWORD x2); Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Mon Apr 28 20:46:58 2008 @@ -110,6 +110,14 @@ #define GDI_OBJECT_GET_TYPE_INDEX(t) \ ((t & GDI_HANDLE_BASETYPE_MASK) >> GDI_HANDLE_BASETYPE_SHIFT) + +/* Gdi Object Handle Managment Pid lock masking sets. */ +/* Ref: used with DxEngSetDCOwner */ +#define GDI_OBJ_HMGR_PUBLIC 0 // Public owner, Open access? +#define GDI_OBJ_HMGR_POWNED 0x80000002 // Set to current owner. +#define GDI_OBJ_HMGR_NONE 0x80000012 // No owner, Open access? +#define GDI_OBJ_HMGR_RESTRICTED 0x80000022 // Restricted? + /* DC OBJ Types */ #define DC_TYPE_DIRECT 0 // normal device context Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Mon Apr 28 20:46:58 2008 @@ -1,3 +1,4 @@ + /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -722,7 +723,7 @@ /************************************************************************/ /* DxEngSetDCOwner */ /************************************************************************/ -DWORD DxEngSetDCOwner(DWORD x1, DWORD x2) +BOOL STDCALL DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask) { UNIMPLEMENTED; return FALSE;

16 years, 8 months

[janderwald] 33184: - enumerate driver files, driver version and driver time

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Apr 28 16:47:43 2008 New Revision: 33184 URL: http://svn.reactos.org/svn/reactos?rev=33184&view=rev Log: - enumerate driver files, driver version and driver time Modified: trunk/reactos/base/applications/dxdiag/display.c trunk/reactos/base/applications/dxdiag/network.c trunk/reactos/base/applications/dxdiag/precomp.h 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 16:47:43 2008 @@ -11,6 +11,150 @@ #include <initguid.h> #include <devguid.h> +BOOL +GetFileModifyTime(LPCWSTR pFullPath, WCHAR * szTime, int szTimeSize) +{ + HANDLE hFile; + FILETIME AccessTime; + SYSTEMTIME SysTime, LocalTime; + UINT Length; + + hFile = CreateFileW(pFullPath, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if (!hFile) + return FALSE; + + if (!GetFileTime(hFile, NULL, NULL, &AccessTime)) + { + CloseHandle(hFile); + return FALSE; + } + CloseHandle(hFile); + + if (!FileTimeToSystemTime(&AccessTime, &SysTime)) + return FALSE; + + if (!SystemTimeToTzSpecificLocalTime(NULL, &SysTime, &LocalTime)) + return FALSE; + + Length = GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &LocalTime, NULL, szTime, szTimeSize); + szTime[Length-1] = L' '; + return GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_FORCE24HOURFORMAT, &LocalTime, NULL, &szTime[Length], szTimeSize-Length); +} + + + +static UINT WINAPI +DriverFilesCallback(IN PVOID Context, + IN UINT Notification, + IN UINT_PTR Param1, + IN UINT_PTR Param2) +{ + LPCWSTR pFile; + LPWSTR pBuffer; + LPCWSTR pFullPath = (LPCWSTR)Param1; + WCHAR szVer[30]; + LRESULT Length, fLength; + HWND * hDlgCtrls = (HWND *)Context; + + if (wcsstr(pFullPath, L"\\DRIVERS\\")) + { + /* exclude files from drivers dir to have failsafe file version/date information */ + return NO_ERROR; + } + + pFile = wcsrchr(pFullPath, L'\\'); + if (!pFile) + return NO_ERROR; + + pFile++; + fLength = wcslen(pFile) + 1; + + Length = SendMessageW(hDlgCtrls[0], WM_GETTEXTLENGTH, 0, 0) + 1; + pBuffer = HeapAlloc(GetProcessHeap(), 0, (Length + fLength) * sizeof(WCHAR)); + if (!pBuffer) + return ERROR_OUTOFMEMORY; + + Length = SendMessageW(hDlgCtrls[0], WM_GETTEXT, Length, (LPARAM)pBuffer); + if (Length) + { + pBuffer[Length++] = L','; + } + else + { + /* set file version */ + if (GetFileVersion(pFullPath, szVer)) + SendMessageW(hDlgCtrls[1], WM_SETTEXT, 0, (LPARAM)szVer); + /* set file time */ + if (GetFileModifyTime(pFullPath, szVer, sizeof(szVer)/sizeof(WCHAR))) + SendMessageW(hDlgCtrls[2], WM_SETTEXT, 0, (LPARAM)szVer); + } + + wcscpy(&pBuffer[Length], pFile); + SendMessageW(hDlgCtrls[0], WM_SETTEXT, 0, (LPARAM)pBuffer); + HeapFree(GetProcessHeap(), 0, pBuffer); + return NO_ERROR; +} + +VOID +EnumerateDrivers(PVOID Context, HDEVINFO hList, PSP_DEVINFO_DATA pInfoData) +{ + HSPFILEQ hQueue; + SP_DEVINSTALL_PARAMS DeviceInstallParams = {0}; + SP_DRVINFO_DATA DriverInfoData; + DWORD Result; + + DeviceInstallParams.cbSize = sizeof(DeviceInstallParams); + if (!SetupDiGetDeviceInstallParamsW(hList, pInfoData, &DeviceInstallParams)) + return; + + DeviceInstallParams.FlagsEx |= (DI_FLAGSEX_INSTALLEDDRIVER | DI_FLAGSEX_ALLOWEXCLUDEDDRVS); + if (!SetupDiSetDeviceInstallParams(hList, pInfoData, &DeviceInstallParams)) + return; + + if (!SetupDiBuildDriverInfoList(hList, pInfoData, SPDIT_CLASSDRIVER)) + return; + + DriverInfoData.cbSize = sizeof(DriverInfoData); + if (!SetupDiEnumDriverInfoW(hList, pInfoData, SPDIT_CLASSDRIVER, 0, &DriverInfoData)) + return; + + DriverInfoData.cbSize = sizeof(DriverInfoData); + if (!SetupDiSetSelectedDriverW(hList, pInfoData, &DriverInfoData)) + return; + + hQueue = SetupOpenFileQueue(); + if (hQueue == (HSPFILEQ)INVALID_HANDLE_VALUE) + return; + + DeviceInstallParams.cbSize = sizeof(DeviceInstallParams); + if (!SetupDiGetDeviceInstallParamsW(hList, pInfoData, &DeviceInstallParams)) + { + SetupCloseFileQueue(hQueue); + return; + } + + DeviceInstallParams.FileQueue = hQueue; + DeviceInstallParams.Flags |= DI_NOVCP; + + if (!SetupDiSetDeviceInstallParamsW(hList, pInfoData, &DeviceInstallParams)) + { + SetupCloseFileQueue(hQueue); + return; + } + + if(!SetupDiCallClassInstaller(DIF_INSTALLDEVICEFILES, hList, pInfoData)) + { + SetupCloseFileQueue(hQueue); + return; + } + + + /* enumerate the driver files */ + SetupScanFileQueueW(hQueue, SPQ_SCAN_USE_CALLBACK, NULL, DriverFilesCallback, Context, &Result); + SetupCloseFileQueue(hQueue); +} + + static BOOL InitializeDialog(HWND hwndDlg) @@ -22,6 +166,7 @@ WCHAR szText[100]; WCHAR szFormat[30]; HKEY hKey; + HWND hDlgCtrls[3]; DWORD dwMemory; DEVMODE DevMode; @@ -108,6 +253,10 @@ /* FIXME * we currently enumerate only the first adapter */ + hDlgCtrls[0] = GetDlgItem(hwndDlg, IDC_STATIC_ADAPTER_DRIVER); + hDlgCtrls[1] = GetDlgItem(hwndDlg, IDC_STATIC_ADAPTER_VERSION); + hDlgCtrls[2] = GetDlgItem(hwndDlg, IDC_STATIC_ADAPTER_DATE); + EnumerateDrivers(hDlgCtrls, hInfo, &InfoData); break; } 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 16:47:43 2008 @@ -98,9 +98,9 @@ } return UINT_MAX; } -static + BOOL -GetFileVersion(WCHAR * szAppName, WCHAR * szVer) +GetFileVersion(LPCWSTR szAppName, WCHAR * szVer) { UINT VerSize; DWORD DummyHandle; 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 16:47:43 2008 @@ -4,6 +4,7 @@ #define DIRECTINPUT_VERSION 0x0800 #define DIRECTSOUND_VERSION 0x0800 #define D3D_OVERLOADS +#define _SETUPAPI_VER _WIN32_WINNT #include <stdio.h> #include <windows.h> @@ -41,4 +42,7 @@ /* DirectDraw tests */ BOOL StartDDTest(HWND hWnd, HINSTANCE hInstance, INT resTestDescription, INT resResult, INT TestNr); + +BOOL GetFileVersion(LPCWSTR szAppName, WCHAR * szVer); +BOOL GetFileModifyTime(LPCWSTR pFullPath, WCHAR * szTime, int szTimeSize); #endif

16 years, 8 months

[akorotaev] 33183: Fix build

by akorotaev＠svn.reactos.org

Author: akorotaev Date: Mon Apr 28 15:20:53 2008 New Revision: 33183 URL: http://svn.reactos.org/svn/reactos?rev=33183&view=rev Log: Fix build Modified: trunk/reactos/base/applications/dxdiag/display.c Modified: trunk/reactos/base/applications/dxdiag/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/display.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/display.c [iso-8859-1] Mon Apr 28 15:20:53 2008 @@ -48,7 +48,7 @@ SendDlgItemMessageW(hwndDlg, IDC_STATIC_ADAPTER_DAC, WM_SETTEXT, 0, (LPARAM)szText); } - if (GetRegValue(hKey, NULL, L"HardwareInformation.MemorySize", REG_BINARY, &dwMemory, sizeof(dwMemory))) + if (GetRegValue(hKey, NULL, L"HardwareInformation.MemorySize", REG_BINARY, (LPWSTR)&dwMemory, sizeof(dwMemory))) { /* set chip memory size */ if (dwMemory > (1048576))

16 years, 8 months

[dchapyshev] 33182: - Add some defines

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Mon Apr 28 14:29:08 2008 New Revision: 33182 URL: http://svn.reactos.org/svn/reactos?rev=33182&view=rev Log: - Add some defines Modified: trunk/reactos/ntoskrnl/include/internal/kbd.h Modified: trunk/reactos/ntoskrnl/include/internal/kbd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kbd.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kbd.h [iso-8859-1] Mon Apr 28 14:29:08 2008 @@ -71,6 +71,10 @@ } LIGATURE ## i, *PLIGATURE ## i; TYPEDEF_LIGATURE(1) + TYPEDEF_LIGATURE(2) + TYPEDEF_LIGATURE(3) + TYPEDEF_LIGATURE(4) + TYPEDEF_LIGATURE(5) #define KBD_VERSION 1 #define GET_KBD_VERSION(p) (HIWORD((p)->fLocalFlags))

16 years, 8 months

[janderwald] 33181: - implement more details for display adapter page - enlarge general details groupbox

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Apr 28 12:16:57 2008 New Revision: 33181 URL: http://svn.reactos.org/svn/reactos?rev=33181&view=rev Log: - implement more details for display adapter page - enlarge general details groupbox Modified: trunk/reactos/base/applications/dxdiag/display.c 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/resource.h trunk/reactos/base/applications/dxdiag/system.c Modified: trunk/reactos/base/applications/dxdiag/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/display.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/display.c [iso-8859-1] Mon Apr 28 12:16:57 2008 @@ -20,6 +20,70 @@ SP_DEVINFO_DATA InfoData; DWORD dwIndex = 0; WCHAR szText[100]; + WCHAR szFormat[30]; + HKEY hKey; + DWORD dwMemory; + DEVMODE DevMode; + + DISPLAY_DEVICEW DispDevice; + + /* query display device adapter */ + ZeroMemory(&DispDevice, sizeof(DISPLAY_DEVICEW)); + DispDevice.cb = sizeof(DISPLAY_DEVICEW); + if (!EnumDisplayDevicesW(NULL, 0, &DispDevice, 0)) + return FALSE; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, &DispDevice.DeviceKey[18], 0, KEY_READ, &hKey) != ERROR_SUCCESS) + return FALSE; + + if (GetRegValue(hKey, NULL, L"HardwareInformation.ChipType", REG_BINARY, szText, sizeof(szText))) + { + /* set chip type */ + SendDlgItemMessageW(hwndDlg, IDC_STATIC_ADAPTER_CHIP, WM_SETTEXT, 0, (LPARAM)szText); + } + + if (GetRegValue(hKey, NULL, L"HardwareInformation.DacType", REG_BINARY, szText, sizeof(szText))) + { + /* set DAC type */ + SendDlgItemMessageW(hwndDlg, IDC_STATIC_ADAPTER_DAC, WM_SETTEXT, 0, (LPARAM)szText); + } + + if (GetRegValue(hKey, NULL, L"HardwareInformation.MemorySize", REG_BINARY, &dwMemory, sizeof(dwMemory))) + { + /* set chip memory size */ + if (dwMemory > (1048576)) + { + /* buggy ATI driver requires that */ + dwMemory /= 1048576; + } + szFormat[0] = L'\0'; + if (LoadStringW(hInst, IDS_FORMAT_ADAPTER_MEM, szFormat, sizeof(szFormat)/sizeof(WCHAR))) + szFormat[(sizeof(szFormat)/sizeof(WCHAR))-1] = L'\0'; + swprintf(szText, szFormat, dwMemory); + SendDlgItemMessageW(hwndDlg, IDC_STATIC_ADAPTER_MEM, WM_SETTEXT, 0, (LPARAM)szText); + } + + /* retrieve current display mode */ + DevMode.dmSize = sizeof(DEVMODE); + if (EnumDisplaySettingsW(DispDevice.DeviceName, ENUM_CURRENT_SETTINGS, &DevMode)) + { + szFormat[0] = L'\0'; + if (LoadStringW(hInst, IDS_FORMAT_ADAPTER_MODE, szFormat, sizeof(szFormat)/sizeof(WCHAR))) + szFormat[(sizeof(szFormat)/sizeof(WCHAR))-1] = L'\0'; + swprintf(szText, szFormat, DevMode.dmPelsWidth, DevMode.dmPelsHeight, DevMode.dmBitsPerPel, DevMode.dmDisplayFrequency); + SendDlgItemMessageW(hwndDlg, IDC_STATIC_ADAPTER_MODE, WM_SETTEXT, 0, (LPARAM)szText); + } + + /* query attached monitor */ + wcscpy(szText, DispDevice.DeviceName); + ZeroMemory(&DispDevice, sizeof(DISPLAY_DEVICEW)); + DispDevice.cb = sizeof(DISPLAY_DEVICEW); + if (EnumDisplayDevicesW(szText, 0, &DispDevice, 0)) + { + /* set monitor name */ + SendDlgItemMessageW(hwndDlg, IDC_STATIC_ADAPTER_MONITOR, WM_SETTEXT, 0, (LPARAM)DispDevice.DeviceString); + } + hInfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, hwndDlg, DIGCF_PRESENT|DIGCF_PROFILE); if (hInfo == INVALID_HANDLE_VALUE) @@ -37,11 +101,15 @@ if (SetupDiGetDeviceRegistryPropertyW(hInfo, &InfoData, SPDRP_DEVICEDESC, NULL, (PBYTE)szText, sizeof(szText), NULL)) SendDlgItemMessageW(hwndDlg, IDC_STATIC_ADAPTER_ID, WM_SETTEXT, 0, (LPARAM)szText); + /* set the manufacturer name */ + if (SetupDiGetDeviceRegistryPropertyW(hInfo, &InfoData, SPDRP_MFG, NULL, (PBYTE)szText, sizeof(szText), NULL)) + SendDlgItemMessageW(hwndDlg, IDC_STATIC_ADAPTER_VENDOR, WM_SETTEXT, 0, (LPARAM)szText); + + /* FIXME + * we currently enumerate only the first adapter + */ + break; } - /* FIXME - * only enumerate the first display adapter - */ - break; if (GetLastError() == ERROR_NO_MORE_ITEMS) break; 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 12:16:57 2008 @@ -49,7 +49,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Gerät", -1, 10, 10, 220, 100 + GROUPBOX "Gerät", -1, 10, 10, 250, 100 RTEXT "Name:", -1, 20, 25, 70, 10 RTEXT "Hersteller:", -1, 20, 35, 70, 10 RTEXT "Chiptyp:", -1, 20, 45, 70, 10 @@ -57,29 +57,29 @@ 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 + LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 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 "Treiber", -1, 270, 10, 220, 100 + RTEXT "Hauptreiber:", -1, 275, 25, 55, 10 + RTEXT "Version:", -1, 275, 35, 55, 10 + RTEXT "Datum:", -1, 275, 45, 55, 10 + RTEXT "Mit WHQL-Logo:", -1, 275, 55, 55, 10 + RTEXT "Mini-VDD:", -1, 275, 65, 55, 10 + RTEXT "VDD:", -1, 275, 75, 55, 10 + RTEXT "DDI-Version:", -1, 275, 85, 55, 10 + LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 25, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10 GROUPBOX "ReactX-Funktionen", -1, 10, 115, 450, 60 RTEXT "DirectDraw-Beschleunigung:", -1, 15, 130, 110, 12 @@ -186,4 +186,6 @@ 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_FORMAT_ADAPTER_MEM "%u MB" + IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" 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 12:16:57 2008 @@ -49,7 +49,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Device", -1, 10, 10, 220, 100 + GROUPBOX "Device", -1, 10, 10, 250, 100 RTEXT "Name:", -1, 20, 25, 70, 10 RTEXT "Manufacturer:", -1, 20, 35, 70, 10 RTEXT "Chip Type:", -1, 20, 45, 70, 10 @@ -57,29 +57,29 @@ 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 + LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 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 "Driver", -1, 270, 10, 220, 100 + RTEXT "Main Driver:", -1, 275, 25, 55, 10 + RTEXT "Version:", -1, 275, 35, 55, 10 + RTEXT "Date:", -1, 275, 45, 55, 10 + RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10 + RTEXT "Mini-VDD:", -1, 275, 65, 55, 10 + RTEXT " vvdddVDD:", -1, 275, 75, 55, 10 + RTEXT "DDI Version:", -1, 275, 85, 55, 10 + LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10 GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60 RTEXT "DirectDraw Acceleration:", -1, 15, 130, 110, 12 @@ -186,4 +186,6 @@ 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_FORMAT_ADAPTER_MEM "%u MB" + IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" 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 12:16:57 2008 @@ -186,4 +186,6 @@ 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_FORMAT_ADAPTER_MEM "%u MB" + IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" 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 12:16:57 2008 @@ -193,4 +193,6 @@ 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_FORMAT_ADAPTER_MEM "%u MB" + IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" 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 12:16:57 2008 @@ -177,6 +177,7 @@ IDS_DIRECTPLAY_MODEMCONN "Modem Connection For DirectPlay" IDS_DIRECTPLAY_SERIALCONN "Serial Connection For DirectPlay" IDS_REG_SUCCESS "OK" + IDS_REG_FAIL "Îøèáêà" 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?" @@ -185,5 +186,6 @@ 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 "Îøèáêà" + IDS_FORMAT_ADAPTER_MEM "%u MB" + IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" END 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 12:16:57 2008 @@ -119,6 +119,8 @@ #define IDS_DDFULLSCREEN_DESCRIPTION 10122 #define IDS_DDFULLSCREEN_RESULT 10123 #define IDS_DDTEST_TITLE 10124 +#define IDS_FORMAT_ADAPTER_MEM 10125 +#define IDS_FORMAT_ADAPTER_MODE 10126 /* icon resource constants */ #define IDI_APPICON 20000 Modified: trunk/reactos/base/applications/dxdiag/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/s… ============================================================================== --- trunk/reactos/base/applications/dxdiag/system.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/system.c [iso-8859-1] Mon Apr 28 12:16:57 2008 @@ -30,6 +30,9 @@ if (res != ERROR_SUCCESS) return FALSE; + + if (Size == sizeof(DWORD)) + return TRUE; Result[(Size / sizeof(WCHAR))-1] = L'\0'; return TRUE;

16 years, 8 months

Jump to page:

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