Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[dchapyshev] 33276: - Update header file

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun May 4 14:40:09 2008 New Revision: 33276 URL: http://svn.reactos.org/svn/reactos?rev=33276&view=rev Log: - Update header file Modified: trunk/reactos/include/psdk/gdiplusflat.h Modified: trunk/reactos/include/psdk/gdiplusflat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusflat.h… ============================================================================== --- trunk/reactos/include/psdk/gdiplusflat.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusflat.h [iso-8859-1] Sun May 4 14:40:09 2008 @@ -74,12 +74,13 @@ GpStatus WINGDIPAPI GdipDrawCurveI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,REAL); GpStatus WINGDIPAPI GdipDrawCurve2I(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT,REAL); +GpStatus WINGDIPAPI GdipDrawImage(GpGraphics*,GpImage*,REAL,REAL); GpStatus WINGDIPAPI GdipDrawImageI(GpGraphics*,GpImage*,INT,INT); GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics*,GpImage*, GDIPCONST GpPointF*,INT,REAL,REAL,REAL,REAL,GpUnit, GDIPCONST GpImageAttributes*,DrawImageAbort,VOID*); GpStatus WINGDIPAPI GdipDrawImagePointsRectI(GpGraphics*,GpImage*, - GDIPCONST GpPointF*,INT,INT,INT,INT,INT,GpUnit, + GDIPCONST GpPoint*,INT,INT,INT,INT,INT,GpUnit, GDIPCONST GpImageAttributes*,DrawImageAbort,VOID*); GpStatus WINGDIPAPI GdipDrawImageRectRect(GpGraphics*,GpImage*,REAL,REAL,REAL, REAL,REAL,REAL,REAL,REAL,GpUnit,GDIPCONST GpImageAttributes*,DrawImageAbort, @@ -87,6 +88,8 @@ GpStatus WINGDIPAPI GdipDrawImageRectRectI(GpGraphics*,GpImage*,INT,INT,INT, INT,INT,INT,INT,INT,GpUnit,GDIPCONST GpImageAttributes*,DrawImageAbort, VOID*); +GpStatus WINGDIPAPI GdipDrawImageRect(GpGraphics*,GpImage*,REAL,REAL,REAL,REAL); +GpStatus WINGDIPAPI GdipDrawImageRectI(GpGraphics*,GpImage*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipDrawLine(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipDrawLines(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT); @@ -94,6 +97,8 @@ GpStatus WINGDIPAPI GdipDrawPath(GpGraphics*,GpPen*,GpPath*); GpStatus WINGDIPAPI GdipDrawPie(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawPieI(GpGraphics*,GpPen*,INT,INT,INT,INT,REAL,REAL); +GpStatus WINGDIPAPI GdipDrawPolygon(GpGraphics*,GpPen*,GDIPCONST GpPointF*, INT); +GpStatus WINGDIPAPI GdipDrawPolygonI(GpGraphics*,GpPen*,GDIPCONST GpPoint*, INT); GpStatus WINGDIPAPI GdipDrawRectangle(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics*,GpPen*,GDIPCONST GpRectF*,INT); @@ -101,6 +106,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics*,GDIPCONST WCHAR*,INT, GDIPCONST GpFont*,GDIPCONST RectF*, GDIPCONST GpStringFormat*, GDIPCONST GpBrush*); +GpStatus WINGDIPAPI GdipFillEllipse(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL); +GpStatus WINGDIPAPI GdipFillEllipseI(GpGraphics*,GpBrush*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipFillPath(GpGraphics*,GpBrush*,GpPath*); GpStatus WINGDIPAPI GdipFillPie(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipFillPieI(GpGraphics*,GpBrush*,INT,INT,INT,INT,REAL,REAL); @@ -112,6 +119,8 @@ GpStatus WINGDIPAPI GdipFillPolygon2I(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipFillRectangle(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipFillRectangleI(GpGraphics*,GpBrush*,INT,INT,INT,INT); +GpStatus WINGDIPAPI GdipFillRectangles(GpGraphics*,GpBrush*,GDIPCONST GpRectF*,INT); +GpStatus WINGDIPAPI GdipFillRectanglesI(GpGraphics*,GpBrush*,GDIPCONST GpRect*,INT); GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics*,CompositingMode*); GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*); GpStatus WINGDIPAPI GdipGetImageDimension(GpImage*,REAL*,REAL*); @@ -155,8 +164,12 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*); GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); GpStatus WINGDIPAPI GdipGetLineGammaCorrection(GpLineGradient*,BOOL*); +GpStatus WINGDIPAPI GdipGetLineRect(GpLineGradient*,GpRectF*); +GpStatus WINGDIPAPI GdipGetLineRectI(GpLineGradient*,GpRect*); +GpStatus WINGDIPAPI GdipGetLineColors(GpLineGradient*,ARGB*); GpStatus WINGDIPAPI GdipGetPathGradientCenterColor(GpPathGradient*,ARGB*); GpStatus WINGDIPAPI GdipGetPathGradientCenterPoint(GpPathGradient*,GpPointF*); +GpStatus WINGDIPAPI GdipGetPathGradientCenterPointI(GpPathGradient*,GpPoint*); GpStatus WINGDIPAPI GdipGetPathGradientFocusScales(GpPathGradient*,REAL*,REAL*); GpStatus WINGDIPAPI GdipGetPathGradientGammaCorrection(GpPathGradient*,BOOL*); GpStatus WINGDIPAPI GdipGetPathGradientPointCount(GpPathGradient*,INT*); @@ -170,8 +183,10 @@ GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient*,BOOL); GpStatus WINGDIPAPI GdipSetLineSigmaBlend(GpLineGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetLineWrapMode(GpLineGradient*,GpWrapMode); +GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient*,ARGB,ARGB); GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient*,ARGB); GpStatus WINGDIPAPI GdipSetPathGradientCenterPoint(GpPathGradient*,GpPointF*); +GpStatus WINGDIPAPI GdipSetPathGradientCenterPointI(GpPathGradient*,GpPoint*); GpStatus WINGDIPAPI GdipSetPathGradientFocusScales(GpPathGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetPathGradientGammaCorrection(GpPathGradient*,BOOL); GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient*,REAL,REAL); @@ -182,12 +197,16 @@ GpStatus WINGDIPAPI GdipSetTextureTransform(GpTexture *,GDIPCONST GpMatrix*); GpStatus WINGDIPAPI GdipAddPathArc(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL); +GpStatus WINGDIPAPI GdipAddPathArcI(GpPath*,INT,INT,INT,INT,REAL,REAL); +GpStatus WINGDIPAPI GdipAddPathBezier(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathBezierI(GpPath*,INT,INT,INT,INT,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath*,GDIPCONST GpPointF*,INT); +GpStatus WINGDIPAPI GdipAddPathBeziersI(GpPath*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathEllipseI(GpPath*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathLine(GpPath*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathLine2(GpPath*,GDIPCONST GpPointF*,INT); +GpStatus WINGDIPAPI GdipAddPathLine2I(GpPath*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipAddPathLineI(GpPath*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathPath(GpPath*,GDIPCONST GpPath*,BOOL); GpStatus WINGDIPAPI GdipClonePath(GpPath*,GpPath**); @@ -196,9 +215,11 @@ GpStatus WINGDIPAPI GdipCreatePath(GpFillMode,GpPath**); GpStatus WINGDIPAPI GdipCreatePath2(GDIPCONST GpPointF*,GDIPCONST BYTE*,INT, GpFillMode,GpPath**); +GpStatus WINGDIPAPI GdipCreatePath2I(GDIPCONST GpPoint*,GDIPCONST BYTE*,INT,GpFillMode,GpPath**); GpStatus WINGDIPAPI GdipDeletePath(GpPath*); GpStatus WINGDIPAPI GdipGetPathFillMode(GpPath*,GpFillMode*); GpStatus WINGDIPAPI GdipGetPathPoints(GpPath*,GpPointF*,INT); +GpStatus WINGDIPAPI GdipGetPathPointsI(GpPath*,GpPoint*,INT); GpStatus WINGDIPAPI GdipGetPathTypes(GpPath*,BYTE*,INT); GpStatus WINGDIPAPI GdipGetPathWorldBounds(GpPath*,GpRectF*,GDIPCONST GpMatrix*,GDIPCONST GpPen*); GpStatus WINGDIPAPI GdipGetPathWorldBoundsI(GpPath*,GpRect*,GDIPCONST GpMatrix*,GDIPCONST GpPen*); @@ -215,15 +236,22 @@ GpStatus WINGDIPAPI GdipCloneMatrix(GpMatrix*,GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix(GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**); -GpStatus WINGDIPAPI GdipCreateMatrix3(GDIPCONST GpRectF *,GDIPCONST GpPointF*, - GpMatrix**); +GpStatus WINGDIPAPI GdipCreateMatrix3(GDIPCONST GpRectF *,GDIPCONST GpPointF*,GpMatrix**); +GpStatus WINGDIPAPI GdipCreateMatrix3I(GDIPCONST GpRect*,GDIPCONST GpPoint*,GpMatrix**); +GpStatus WINGDIPAPI GdipIsMatrixEqual(GDIPCONST GpMatrix*, GDIPCONST GpMatrix*, BOOL*); +GpStatus WINGDIPAPI GdipIsMatrixIdentity(GDIPCONST GpMatrix*, BOOL*); + GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix*); GpStatus WINGDIPAPI GdipGetMatrixElements(GDIPCONST GpMatrix*,REAL*); GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix*,GpMatrix*,GpMatrixOrder); +GpStatus WINGDIPAPI GdipMultiplyWorldTransform(GpGraphics*,GDIPCONST GpMatrix*,GpMatrixOrder); GpStatus WINGDIPAPI GdipRotateMatrix(GpMatrix*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSetMatrixElements(GpMatrix*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix*,GpPointF*,INT); +GpStatus WINGDIPAPI GdipTransformMatrixPointsI(GpMatrix*,GpPoint*,INT); +GpStatus WINGDIPAPI GdipVectorTransformMatrixPoints(GpMatrix*,GpPointF*,INT); +GpStatus WINGDIPAPI GdipVectorTransformMatrixPointsI(GpMatrix*,GpPoint*,INT); GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator**,GpPath*); @@ -239,6 +267,7 @@ GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap*); GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap*,GpLineCap, GpLineCap); +GpStatus WINGDIPAPI GdipGetCustomLineCapBaseCap(GpCustomLineCap*,GpLineCap*); GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap*,INT,INT,ARGB*); GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap*,INT,INT,ARGB); @@ -301,10 +330,12 @@ GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes*,WrapMode, ARGB,BOOL); +GpStatus WINGDIPAPI GdipCreateFontFromDC(HDC,GpFont**); GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC,GDIPCONST LOGFONTA*,GpFont**); GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC,GDIPCONST LOGFONTW*,GpFont**); GpStatus WINGDIPAPI GdipDeleteFont(GpFont*); GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*); +GpStatus WINGDIPAPI GdipCloneFont(GpFont*,GpFont**); GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat*); @@ -316,6 +347,10 @@ GpStatus WINGDIPAPI GdipSetStringFormatHotkeyPrefix(GpStringFormat*,INT); GpStatus WINGDIPAPI GdipSetStringFormatLineAlign(GpStringFormat*,StringAlignment); GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat*,StringTrimming); +GpStatus WINGDIPAPI GdipCloneStringFormat(GDIPCONST GpStringFormat*,GpStringFormat**); + +GpStatus WINGDIPAPI GdipGetDpiX(GpGraphics*,REAL*); +GpStatus WINGDIPAPI GdipGetDpiY(GpGraphics*,REAL*); #ifdef __cplusplus }

16 years, 4 months

[greatlrd] 33275: fixed some typo and stefan100 suggest to remove a #ifdef statement

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun May 4 13:05:32 2008 New Revision: 33275 URL: http://svn.reactos.org/svn/reactos?rev=33275&view=rev Log: fixed some typo and stefan100 suggest to remove a #ifdef statement 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] Sun May 4 13:05:32 2008 @@ -124,7 +124,7 @@ */ /* 0x024 */ ULONG unk_024; -#ifdef _WIN32 + /* 0x028 */ LARGE_INTEGER llAssertModeTimeout; /* 0x028 <-- verified to match Windows XP, llAssertModeTimeout, it using regkey HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\GraphicsDrivers\DCI @@ -132,19 +132,16 @@ in second, if this value are set to 0 it disable directdraw acclatrions. it is normal set to 7 (7 sec in windwos xp/2003) */ -#else -/* 0x028 */ DWORD llAssertModeTimeoutLowPart; -/* 0x02C */ DWORD llAssertModeTimeoutHighPart; -#endif + /* 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; +/* 0x038 */ DWORD dwNumFourCC; // 0x038 <-- verified to match Windows XP, dwNumFourCC +/* 0x03C */ PDWORD pdwFourCC; // 0x03C <-- verified to match Windows XP, pdwFourCC /* 0x040 */ DD_HALINFO ddHalInfo; // 0x040 <-- verified to match Windows XP, ddHalInfo /* 0x1E0 */ ULONG unk_1e0[46]; /* 0x298 */ DD_CALLBACKS ddCallbacks; // 0x298 <-- verified to match Windows XP, ddCallbacks /* 0x2C4 */ DD_SURFACECALLBACKS ddSurfaceCallbacks; // 0x2C4 <-- verified to match Windows XP, ddSurfaceCallbacks -/* 0x300 */ DD_PALETTECALLBACKS ddPaletteCallbacks; // 0x300 <-- verified to match Windows XP, ddPaletteCallbacks +/* 0x304 */ DD_PALETTECALLBACKS ddPaletteCallbacks; // 0x304 <-- verified to match Windows XP, ddPaletteCallbacks /* 0x314 */ ULONG unk_314[46]; /* 0x3D4 */ D3DNTHAL_CALLBACKS d3dNtHalCallbacks; /* 0x460 */ ULONG unk_460[9];

16 years, 4 months

[greatlrd] 33274: fixed NtUserEnumDisplaySettings bug inside IntEnumDisplaySettings DWORD DisplayNumber was not init before it was use. GetDisplayNumberFromDeviceName did not allown pdevice with NULL value or string lenght is 0 thuse have been fixed.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun May 4 12:58:43 2008 New Revision: 33274 URL: http://svn.reactos.org/svn/reactos?rev=33274&view=rev Log: fixed NtUserEnumDisplaySettings bug inside IntEnumDisplaySettings DWORD DisplayNumber was not init before it was use. GetDisplayNumberFromDeviceName did not allown pdevice with NULL value or string lenght is 0 thuse have been fixed. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Sun May 4 12:58:43 2008 @@ -2717,8 +2717,17 @@ if (DisplayNumber == NULL) return STATUS_INVALID_PARAMETER_2; - if (pDeviceName && pDeviceName->Length <= DisplayString.Length) - return STATUS_OBJECT_NAME_INVALID; + DPRINT1("GetDisplayNumberFromDeviceName Pass 1 seh \n"); + + if ((pDeviceName != NULL) && (pDeviceName->Length != 0)) + { + if (pDeviceName->Length <= DisplayString.Length) + { + DPRINT1("GetDisplayNumberFromDeviceName FAIL pDeviceName : %wZ \n",pDeviceName); + DPRINT1("GetDisplayNumberFromDeviceName FAIL pDeviceName->Length : %d \n",pDeviceName->Length); + return STATUS_OBJECT_NAME_INVALID; + } + } if (pDeviceName == NULL || pDeviceName->Length == 0) { @@ -2757,7 +2766,7 @@ Number = Number * 10 + Char - L'0'; else if (Char != L'\0') return STATUS_OBJECT_NAME_INVALID; - } + } *DisplayNumber = Number - 1; } @@ -2783,13 +2792,15 @@ static UNICODE_STRING CachedDeviceName; PDEVMODEW CachedMode = NULL; DEVMODEW DevMode; - ULONG DisplayNumber; + ULONG DisplayNumber = 0; if (!NT_SUCCESS(GetDisplayNumberFromDeviceName(pDeviceName, &DisplayNumber))) { SetLastWin32Error(STATUS_NO_SUCH_DEVICE); return FALSE; } + + DPRINT1("IntEnumDisplaySettings Pass 1 seh \n"); DPRINT("DevMode->dmSize = %d\n", pDevMode->dmSize); DPRINT("DevMode->dmExtraSize = %d\n", pDevMode->dmDriverExtra); @@ -2801,13 +2812,17 @@ return FALSE; } + DPRINT1("IntEnumDisplaySettings Pass 2 seh \n"); + if (iModeNum == ENUM_CURRENT_SETTINGS) { + DPRINT1("IntEnumDisplaySettings ENUM_CURRENT_SETTINGS \n"); CachedMode = &PrimarySurface.DMW; ASSERT(CachedMode->dmSize > 0); } else if (iModeNum == ENUM_REGISTRY_SETTINGS) { + DPRINT1("IntEnumDisplaySettings ENUM_REGISTRY_SETTINGS \n"); RtlZeroMemory(&DevMode, sizeof (DevMode)); DevMode.dmSize = sizeof (DevMode); DevMode.dmDriverExtra = 0; @@ -2821,9 +2836,13 @@ /* FIXME: Maybe look for the matching devmode supplied by the * driver so we can provide driver private/extra data? */ + + DPRINT1("IntEnumDisplaySettings Pass 3 seh \n"); } else { + DPRINT1("IntEnumDisplaySettings NO FLAGs \n"); + BOOL IsCachedDevice = (CachedDevModes != NULL); if (CachedDevModes && @@ -2840,6 +2859,8 @@ LPWSTR CurrentName; DRVENABLEDATA DrvEnableData; + DPRINT1("IntEnumDisplaySettings iModeNum \n"); + /* Free resources from last driver cache */ if (IsCachedDevice == FALSE && CachedDeviceName.Buffer != NULL) { @@ -2854,11 +2875,15 @@ return FALSE; } + DPRINT1("IntEnumDisplaySettings Pass 4 seh \n"); + if (!IntPrepareDriverIfNeeded()) { DPRINT1("IntPrepareDriverIfNeeded failed\n"); return FALSE; } + + DPRINT1("IntEnumDisplaySettings Pass 5 seh \n"); /* * DriverFileNames may be a list of drivers in REG_SZ_MULTI format, @@ -2940,6 +2965,9 @@ SetLastWin32Error(STATUS_NO_MEMORY); return FALSE; } + + DPRINT1("IntEnumDisplaySettings Pass 6 seh \n"); + if (CachedDevModes != NULL) { RtlCopyMemory(NewBuffer, CachedDevModes, SizeUsed); @@ -2978,12 +3006,19 @@ } /* return cached info */ + + + DPRINT1("IntEnumDisplaySettings return cached info \n"); + CachedMode = CachedDevModes; if (CachedMode >= CachedDevModesEnd) { SetLastWin32Error(STATUS_NO_MORE_ENTRIES); return FALSE; } + + DPRINT1("IntEnumDisplaySettings Pass 7 seh \n"); + while (iModeNum-- > 0 && CachedMode < CachedDevModesEnd) { assert(CachedMode->dmSize > 0); @@ -2994,9 +3029,13 @@ SetLastWin32Error(STATUS_NO_MORE_ENTRIES); return FALSE; } + + DPRINT1("IntEnumDisplaySettings Pass 8 seh \n"); } ASSERT(CachedMode != NULL); + + DPRINT1("IntEnumDisplaySettings Pass 9 seh \n"); RtlCopyMemory(pDevMode, CachedMode, min(pDevMode->dmSize, CachedMode->dmSize)); RtlZeroMemory(pDevMode + pDevMode->dmSize, pDevMode->dmDriverExtra);

16 years, 4 months

[dchapyshev] 33273: - Change icon

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun May 4 11:03:40 2008 New Revision: 33273 URL: http://svn.reactos.org/svn/reactos?rev=33273&view=rev Log: - Change icon Modified: trunk/reactos/base/applications/dxdiag/res/dxdiag.ico Modified: trunk/reactos/base/applications/dxdiag/res/dxdiag.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/r… ============================================================================== Binary files - no diff available.

16 years, 4 months

[dchapyshev] 33272: - Update and fix all translations

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun May 4 10:24:43 2008 New Revision: 33272 URL: http://svn.reactos.org/svn/reactos?rev=33272&view=rev Log: - Update and fix all translations Modified: 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 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] Sun May 4 10:24:43 2008 @@ -9,9 +9,9 @@ BEGIN 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 + DEFPUSHBUTTON "&Nächste Seite", IDC_BUTTON_NEXT, 254, 261, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Alle &Informationen speichern...", IDC_BUTTON_SAVE_INFO, 312, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Beenden", IDC_BUTTON_EXIT, 426, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 @@ -88,14 +88,14 @@ 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 + PUSHBUTTON "Aktivieren", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED + PUSHBUTTON "Aktivieren", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED + PUSHBUTTON "Aktivieren", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED + PUSHBUTTON "DirectDraw &testen", IDC_BUTTON_TESTDD, 250, 124, 80, 14 + PUSHBUTTON "Direct3D t&esten", IDC_BUTTON_TEST3D, 250, 140, 80, 14, WS_DISABLED GROUPBOX "Hinweise", -1, 10, 180, 450, 40 - EDITTEXT IDC_TEXT_INFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP + EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP END @@ -132,9 +132,9 @@ GROUPBOX "ReactX-Funktionen", -1, 10, 115, 450, 60 CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17 RTEXT "Einstellung der Sound-\nhardwarebeschleunigung:", -1, 20, 135, 90, 20 - PUSHBUTTON "DirectSound testen", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 13 + PUSHBUTTON "DirectSound testen", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14 GROUPBOX "Hinweise", -1, 10, 180, 450, 40 - EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP + EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP END IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 220 @@ -149,11 +149,11 @@ 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 + CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 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 + CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200 GROUPBOX "Hinweis", -1, 10, 170, 452, 50 - EDITTEXT IDC_RICH_INFO, 20, 180, 432, 30, WS_DISABLED | WS_TABSTOP + EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP END IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 @@ -161,7 +161,7 @@ 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 + CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60 END IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 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] Sun May 4 10:24:43 2008 @@ -9,9 +9,9 @@ BEGIN 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 + DEFPUSHBUTTON "&Next Page", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Save All Information...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Exit", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 @@ -88,14 +88,14 @@ 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 "Enable", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED + PUSHBUTTON "Enable", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED + PUSHBUTTON "Enable", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED + PUSHBUTTON "Test DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14 + PUSHBUTTON "Test Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14, WS_DISABLED GROUPBOX "Notes", -1, 10, 180, 450, 40 - EDITTEXT IDC_TEXT_INFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP + EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP END @@ -132,9 +132,9 @@ GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60 CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17 RTEXT "Hardware Sound\nAcceleration Level:", -1, 20, 135, 90, 20 - PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 13 + PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14 GROUPBOX "Notes", -1, 10, 180, 450, 40 - EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP + EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP END IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 @@ -149,11 +149,11 @@ 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 + CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 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 + CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200 GROUPBOX "Information", -1, 10, 170, 352, 50 - EDITTEXT IDC_RICH_INFO, 20, 180, 432, 30, WS_DISABLED | WS_TABSTOP + EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP END IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 @@ -161,7 +161,7 @@ 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 + CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60 END IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 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] Sun May 4 10:24:43 2008 @@ -9,12 +9,12 @@ BEGIN 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 - PUSHBUTTON "Quitt&er", IDC_BUTTON_EXIT, 323, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END - -IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 + DEFPUSHBUTTON "Page suiva&nte", IDC_BUTTON_NEXT, 223, 261, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Enregi&strer toutes les informations...", IDC_BUTTON_SAVE_INFO, 287, 261, 136, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Quitt&er", IDC_BUTTON_EXIT, 426, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN @@ -65,7 +65,7 @@ LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 130, 10 LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 130, 10 - GROUPBOX "Driver", -1, 240, 10, 190, 100 + 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 @@ -88,14 +88,14 @@ 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 "Enable", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED + PUSHBUTTON "Enable", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED + PUSHBUTTON "Enable", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED + PUSHBUTTON "Test DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14 + PUSHBUTTON "Test Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14, WS_DISABLED GROUPBOX "Notes", -1, 10, 180, 450, 40 - EDITTEXT IDC_TEXT_INFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP + EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP END @@ -132,9 +132,9 @@ GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60 CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17 RTEXT "Hardware Sound\nAcceleration Level:", -1, 20, 135, 90, 20 - PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 13 + PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14 GROUPBOX "Notes", -1, 10, 180, 450, 40 - EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP + EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP END IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 @@ -149,19 +149,19 @@ 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 + CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 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 + CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 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, 362, 220 + EDITTEXT IDC_RICH_INFO, 20, 182, 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 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 + CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60 END IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 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] Sun May 4 10:24:43 2008 @@ -16,9 +16,9 @@ BEGIN 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", 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 + DEFPUSHBUTTON "&Nastêpna", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Zapisz wszystkie informacje...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Wyjcie", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 190 @@ -95,14 +95,14 @@ 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 "W³¹cz", IDC_BUTTON_DDRAW, 170, 130, 60, 12, WS_DISABLED - PUSHBUTTON "W³¹cz", IDC_BUTTON_D3D, 170, 145, 60, 12, WS_DISABLED - PUSHBUTTON "W³¹cz", IDC_BUTTON_AGP, 170, 160, 60, 12, WS_DISABLED - PUSHBUTTON "Testuj DirectDraw", IDC_BUTTON_TESTDD, 250, 130, 80, 12 - PUSHBUTTON "Testuj Direct3D", IDC_BUTTON_TEST3D, 250, 145, 80, 12, WS_DISABLED + PUSHBUTTON "W³¹cz", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED + PUSHBUTTON "W³¹cz", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED + PUSHBUTTON "W³¹cz", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED + PUSHBUTTON "Testuj DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14 + PUSHBUTTON "Testuj Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14, WS_DISABLED GROUPBOX "Uwagi", -1, 10, 180, 450, 40 - EDITTEXT IDC_TEXT_INFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP + EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP END @@ -139,9 +139,9 @@ GROUPBOX "ReactX-", -1, 10, 115, 450, 60 CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17 RTEXT "Przyspiesznie sprzêtowe\nPoziom:", -1, 20, 135, 90, 20 - PUSHBUTTON "Testuj DirectSound", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 13 + PUSHBUTTON "Testuj DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14 GROUPBOX "Uwagi", -1, 10, 180, 450, 40 - EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP + EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP END IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 @@ -156,25 +156,25 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Urz¹dzenia DirectInput", -1, 10, 10, 452, 80 - CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 432, 60 + CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60 GROUPBOX "Urz¹denia wejcia", -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 + CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200 GROUPBOX "Informacje", -1, 10, 170, 452, 50 - EDITTEXT IDC_RICH_INFO, 20, 180, 432, 30, WS_DISABLED | WS_TABSTOP + EDITTEXT IDC_RICH_INFO, 20, 182, 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 + GROUPBOX "Registered DirectPlay Service Provider", -1, 10, 10, 452, 80 + CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60 END IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Zarejestrowani dostawcy us³ug DirectPlay", -1, 10, 10, 452, 80 - CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 332, 60 END STRINGTABLE DISCARDABLE 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] Sun May 4 10:24:43 2008 @@ -65,7 +65,7 @@ LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 130, 10 LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 130, 10 - GROUPBOX "Äðàéâåðû", -1, 240, 10, 190, 100 + GROUPBOX "Äðàéâåðû", -1, 240, 10, 220, 100 RTEXT "Ãëàâíûé:", -1, 245, 30, 55, 10 RTEXT "Âåðñèÿ:", -1, 245, 40, 55, 10 RTEXT "Äàòà:", -1, 245, 50, 55, 10 @@ -103,37 +103,37 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Device", -1, 10, 10, 250, 100 - RTEXT "Name:", -1, 20, 25, 70, 10 - RTEXT "Device ID:", -1, 20, 35, 70, 10 - RTEXT "Manufacturer ID:", -1, 20, 45, 70, 10 - RTEXT "Product ID:", -1, 20, 55, 70, 10 - RTEXT "Type:", -1, 20, 65, 70, 10 - RTEXT "Default Device:", -1, 20, 75, 70, 10 + GROUPBOX "Óñòðîéñòâî", -1, 10, 10, 250, 100 + RTEXT "Èìÿ:", -1, 20, 25, 70, 10 + RTEXT "Êîä óñòðîéñòâà:", -1, 20, 35, 70, 10 + RTEXT "Êîä èçãîòîâèòåëÿ:", -1, 20, 45, 70, 10 + RTEXT "Êîä ïðîäóêòà:", -1, 20, 55, 70, 10 + RTEXT "Òèï:", -1, 20, 65, 70, 10 + RTEXT "Ïî óìîë÷àíèþ:", -1, 20, 75, 70, 10 LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10 LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10 LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10 LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10 LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10 LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10 - GROUPBOX "Driver", -1, 270, 10, 190, 100 - RTEXT "Name:", -1, 275, 25, 55, 10 - RTEXT "Version:", -1, 275, 35, 55, 10 - RTEXT "Datw:", -1, 275, 45, 55, 10 - RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10 - RTEXT "Other Files:", -1, 275, 65, 55, 10 - RTEXT "Provider:", -1, 275, 75, 55, 10 + GROUPBOX "Äðàéâåðû", -1, 270, 10, 190, 100 + RTEXT "Èìÿ:", -1, 275, 25, 55, 10 + RTEXT "Âåðñèÿ:", -1, 275, 35, 55, 10 + RTEXT "Äàòà:", -1, 275, 45, 55, 10 + RTEXT "Ïîäïèñü:", -1, 275, 55, 55, 10 + RTEXT "Äðóãèå ôàéëû:", -1, 275, 65, 55, 10 + RTEXT "Ïîñòàâùèê:", -1, 275, 75, 55, 10 LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10 LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10 LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10 LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10 LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10 LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 - GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60 + GROUPBOX "Âîçìîæíîñòè ReactX", -1, 10, 115, 450, 60 CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17 - RTEXT "Hardware Sound\nAcceleration Level:", -1, 20, 135, 90, 20 - PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 13 - GROUPBOX "Notes", -1, 10, 180, 450, 40 + RTEXT "Óðîâåíü àïïàðàòíîãî\nóñêîðåíèÿ:", -1, 20, 135, 90, 20 + PUSHBUTTON "Ïðîâåðêà DirectSound", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 14 + GROUPBOX "Ïðèìå÷àíèÿ", -1, 10, 180, 450, 40 EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP END @@ -160,14 +160,14 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Çàðåãèñòðèðîâàííûå ïîñòàâùèêè DirectPlay", -1, 10, 10, 452, 80 + CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60 END IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - 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 STRINGTABLE DISCARDABLE @@ -218,7 +218,7 @@ 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)" + IDS_FORMAT_ADAPTER_MEM "%u Ìá" + IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uÃö)" IDS_OPTION_NO "No" END

16 years, 4 months

[gbrunmar] 33271: * Implemented IDirect3D9::GetNumberOfSwapChains()

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Sun May 4 10:02:01 2008 New Revision: 33271 URL: http://svn.reactos.org/svn/reactos?rev=33271&view=rev Log: * Implemented IDirect3D9::GetNumberOfSwapChains() Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c trunk/reactos/dll/directx/d3d9/d3d9_device.h Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Sun May 4 10:02:01 2008 @@ -9,8 +9,8 @@ #include "d3d9_helpers.h" #include "debug.h" -#define LOCK_D3DDEVICE9() EnterCriticalSection(&This->CriticalSection); -#define UNLOCK_D3DDEVICE9() LeaveCriticalSection(&This->CriticalSection); +#define LOCK_D3DDEVICE9() if (This->bLockDevice) EnterCriticalSection(&This->CriticalSection); +#define UNLOCK_D3DDEVICE9() if (This->bLockDevice) LeaveCriticalSection(&This->CriticalSection); /* Convert a IDirect3D9 pointer safely to the internal implementation struct */ LPDIRECT3DDEVICE9_INT impl_from_IDirect3DDevice9(LPDIRECT3DDEVICE9 iface) @@ -144,10 +144,10 @@ * The function IDirect3DDevice9Impl_GetSwapChain returns a pointer to a swap chain object. * * @param LPDIRECT3D iface -* Pointer to the IDirect3DDevice9 object returned from IDirect3D9->CreateDevice() +* Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice() * * @param UINT iSwapChain -* Swap chain index to get. +* Swap chain index to get object for. * The maximum value for this is the value returned by IDirect3DDevice9::GetNumberOfSwapChains() - 1. * * @param IDirect3DSwapChain9** ppSwapChain @@ -180,7 +180,7 @@ if (This->pSwapChains[iSwapChain] != NULL) { - IDirect3DSwapChain9* pSwapChain = (IDirect3DSwapChain9*)This->pSwapChains[iSwapChain]->lpVtbl; + IDirect3DSwapChain9* pSwapChain = (IDirect3DSwapChain9*)&This->pSwapChains[iSwapChain]->lpVtbl; IDirect3DSwapChain9_AddRef(pSwapChain); *ppSwapChain = pSwapChain; } @@ -193,11 +193,34 @@ return D3D_OK; } +/*++ +* @name IDirect3DDevice9::GetNumberOfSwapChains +* @implemented +* +* The function IDirect3DDevice9Impl_GetNumberOfSwapChains returns the number of swap chains +* created by IDirect3D9::CreateDevice(). +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice(). +* +* @return UINT +* Returns the number of swap chains created by IDirect3D9::CreateDevice(). +* +* NOTE: An application can create additional swap chains using the +* IDirect3DDevice9::CreateAdditionalSwapChain() method. +* +*/ static UINT WINAPI IDirect3DDevice9Impl_GetNumberOfSwapChains(LPDIRECT3DDEVICE9 iface) { - UNIMPLEMENTED - - return D3D_OK; + UINT NumSwapChains; + + LPDIRECT3DDEVICE9_INT This = impl_from_IDirect3DDevice9(iface); + LOCK_D3DDEVICE9(); + + NumSwapChains = This->NumAdaptersInDevice; + + UNLOCK_D3DDEVICE9(); + return NumSwapChains; } static HRESULT WINAPI IDirect3DDevice9Impl_Reset(LPDIRECT3DDEVICE9 iface, D3DPRESENT_PARAMETERS* pPresentationParameters) Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.h [iso-8859-1] Sun May 4 10:02:01 2008 @@ -12,6 +12,8 @@ #include <d3d9.h> #include "d3d9_private.h" +extern struct IDirect3DDevice9Vtbl Direct3DDevice9_Vtbl; + enum REF_TYPE { RT_EXTERNAL, @@ -24,7 +26,7 @@ /* 0x0000 */ LPDWORD lpVtbl; /* 0x0004 */ DWORD dwUnknown0004; /* 0x0008 */ DWORD dwUnknown0008; -/* 0x000c */ struct _tagD3D9BaseDevice_* pBaseDevice; +/* 0x000c */ struct _tagDirect3DDevice9_INT_* pBaseDevice; /* 0x0010 */ DWORD dwUnknown0010; // Index? Unique id? /* 0x0014 */ HANDLE hKernelHandle; /* 0x0018 */ LPDWORD dwUnknown0018; @@ -77,7 +79,7 @@ #ifdef D3D_DEBUG_INFO /* N/A - 0x0000 */ DDSURFACEDESC SurfaceDesc[8]; #endif -/* 0x0000 - 0x0160 */ struct _tagD3D9BaseDevice_* pBaseDevice; +/* 0x0000 - 0x0160 */ struct _tagDirect3DDevice9_INT_* pBaseDevice; /* 0x0004 - 0x0164 */ DWORD dwUnknown0004; /* 0x0008 - 0x0168 */ DWORD dwUnknown0008; /* 0x000c - 0x016c */ DWORD MaxSimultaneousTextures; @@ -144,7 +146,7 @@ /* 0x00ec */ DWORD dwUnknown00ec; /* 0x00f0 */ DWORD dwUnknown00f0[27]; -/* 0x015c */ LPDWORD pUnknown0174; // points to 0x0174 +/* 0x015c */ LPDWORD pUnknown015c; /* 0x0160 */ DWORD dwUnknown0160[4]; /* 0x0170 */ HRESULT hResult; @@ -162,7 +164,7 @@ typedef struct _tagDirect3DDevice9_INT_ { -/* 0x0000 */ struct IDirect3D9DeviceVtbl* lpVtbl; +/* 0x0000 */ struct IDirect3DDevice9Vtbl* lpVtbl; /* 0x0004 */ CRITICAL_SECTION CriticalSection; #ifdef D3D_DEBUG_INFO /* N/A - 0x001c */ DWORD dbg0004; @@ -180,7 +182,7 @@ /* N/A - 0x004c */ DWORD dbg0034; /* N/A - 0x0050 */ DWORD dbg0038; #endif -/* 0x001c - 0x0054 */ DWORD unknown000007; +/* 0x001c - 0x0054 */ BOOL bLockDevice; /* 0x0020 - 0x0058 */ DWORD dwProcessId; /* 0x0024 - 0x005c */ struct _tagD3D9PUREDEVICE_* lpThis; /* 0x0028 - 0x0060 */ DWORD dwDXVersion;

16 years, 4 months

[greatlrd] 33270: Speed optimize NtUserEnumDisplaySettings bit by remove COPY_DEVMODE_VALUE_TO_CALLER macro and using SEH directly

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun May 4 09:31:20 2008 New Revision: 33270 URL: http://svn.reactos.org/svn/reactos?rev=33270&view=rev Log: Speed optimize NtUserEnumDisplaySettings bit by remove COPY_DEVMODE_VALUE_TO_CALLER macro and using SEH directly Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Sun May 4 09:31:20 2008 @@ -890,15 +890,6 @@ return NtUserGetDCEx(hWnd, NULL, NULL == hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE); } -#define COPY_DEVMODE_VALUE_TO_CALLER(dst, src, member) \ - Status = MmCopyToCaller(&(dst)->member, &(src)->member, sizeof ((src)->member)); \ - if (!NT_SUCCESS(Status)) \ - { \ - SetLastNtError(Status); \ - ExFreePool(src); \ - return FALSE; \ - } - BOOL STDCALL NtUserEnumDisplaySettings( @@ -916,7 +907,7 @@ /* Copy the devmode */ _SEH_TRY { - ProbeForRead(&lpDevMode->dmSize, sizeof(DEVMODEW), 1); + ProbeForRead(lpDevMode, sizeof(DEVMODEW), 1); Size = lpDevMode->dmSize; ExtraSize = lpDevMode->dmDriverExtra; } @@ -963,11 +954,23 @@ RtlFreeUnicodeString(pSafeDeviceName); /* Copy some information back */ - COPY_DEVMODE_VALUE_TO_CALLER(lpDevMode, pSafeDevMode, dmPelsWidth); - COPY_DEVMODE_VALUE_TO_CALLER(lpDevMode, pSafeDevMode, dmPelsHeight); - COPY_DEVMODE_VALUE_TO_CALLER(lpDevMode, pSafeDevMode, dmBitsPerPel); - COPY_DEVMODE_VALUE_TO_CALLER(lpDevMode, pSafeDevMode, dmDisplayFrequency); - COPY_DEVMODE_VALUE_TO_CALLER(lpDevMode, pSafeDevMode, dmDisplayFlags); + _SEH_TRY + { + ProbeForWrite(lpDevMode,Size, 1); + lpDevMode->dmPelsWidth = pSafeDevMode->dmPelsWidth; + lpDevMode->dmPelsHeight = pSafeDevMode->dmPelsHeight; + lpDevMode->dmBitsPerPel = pSafeDevMode->dmBitsPerPel; + lpDevMode->dmDisplayFrequency = pSafeDevMode->dmDisplayFrequency; + lpDevMode->dmDisplayFlags = pSafeDevMode->dmDisplayFlags; + } + _SEH_HANDLE + { + DPRINT1("Warning crash here \n"); + SetLastNtError(_SEH_GetExceptionCode()); + _SEH_YIELD(return FALSE); + } + _SEH_END; + /* output private/extra driver data */ if (ExtraSize > 0) @@ -984,8 +987,6 @@ ExFreePool(pSafeDevMode); return TRUE; } - -#undef COPY_DEVMODE_VALUE_TO_CALLER LONG STDCALL

16 years, 4 months

[janderwald] 33269: - retrieve more information for DirectSound adapters - use dxdiag parent window for dialogs which have pushbuttons - restore window size after finishing DirectDraw tests - use wsprintfW over swprintf- cut off build info from version string

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun May 4 08:58:45 2008 New Revision: 33269 URL: http://svn.reactos.org/svn/reactos?rev=33269&view=rev Log: - retrieve more information for DirectSound adapters - use dxdiag parent window for dialogs which have pushbuttons - restore window size after finishing DirectDraw tests - use wsprintfW over swprintf- cut off build info from version string Modified: trunk/reactos/base/applications/dxdiag/display.c trunk/reactos/base/applications/dxdiag/dxdiag.rbuild trunk/reactos/base/applications/dxdiag/input.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/network.c trunk/reactos/base/applications/dxdiag/precomp.h trunk/reactos/base/applications/dxdiag/sound.c 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] Sun May 4 08:58:45 2008 @@ -56,7 +56,7 @@ LPCWSTR pFile; LPWSTR pBuffer; LPCWSTR pFullPath = (LPCWSTR)Param1; - WCHAR szVer[30]; + WCHAR szVer[60]; LRESULT Length, fLength; HWND * hDlgCtrls = (HWND *)Context; @@ -158,38 +158,65 @@ SetupCloseFileQueue(hQueue); } +static +void +SetDeviceDetails(HWND * hDlgCtrls, LPCGUID classGUID, LPGUID * deviceGUID) +{ + HDEVINFO hInfo; + DWORD dwIndex = 0; + SP_DEVINFO_DATA InfoData; + WCHAR szText[100]; + + /* create the setup list */ + hInfo = SetupDiGetClassDevsW(classGUID, NULL, NULL, DIGCF_PRESENT|DIGCF_PROFILE); + if (hInfo == INVALID_HANDLE_VALUE) + return; + + do + { + ZeroMemory(&InfoData, sizeof(InfoData)); + InfoData.cbSize = sizeof(InfoData); + + if (SetupDiEnumDeviceInfo(hInfo, dwIndex, &InfoData)) + { + /* set device name */ + if (SetupDiGetDeviceRegistryPropertyW(hInfo, &InfoData, SPDRP_DEVICEDESC, NULL, (PBYTE)szText, sizeof(szText), NULL)) + SendMessageW(hDlgCtrls[0], WM_SETTEXT, 0, (LPARAM)szText); + + /* set the manufacturer name */ + if (SetupDiGetDeviceRegistryPropertyW(hInfo, &InfoData, SPDRP_MFG, NULL, (PBYTE)szText, sizeof(szText), NULL)) + SendMessageW(hDlgCtrls[1], WM_SETTEXT, 0, (LPARAM)szText); + + /* FIXME + * we currently enumerate only the first adapter + */ + EnumerateDrivers(&hDlgCtrls[2], hInfo, &InfoData); + break; + } + + if (GetLastError() == ERROR_NO_MORE_ITEMS) + break; + + dwIndex++; + }while(TRUE); + + /* destroy the setup list */ + SetupDiDestroyDeviceInfoList(hInfo); +} + static BOOL -InitializeDialog(HWND hwndDlg) -{ - HDEVINFO hInfo; - SP_DEVICE_INTERFACE_DATA InterfaceData; - SP_DEVINFO_DATA InfoData; - DWORD dwIndex = 0; +InitializeDialog(HWND hwndDlg, PDISPLAY_DEVICEW pDispDevice) +{ WCHAR szText[100]; WCHAR szFormat[30]; HKEY hKey; - HWND hDlgCtrls[3]; + HWND hDlgCtrls[5]; 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)); - 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) + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, &pDispDevice->DeviceKey[18], 0, KEY_READ, &hKey) != ERROR_SUCCESS) return FALSE; if (GetRegValue(hKey, NULL, L"HardwareInformation.ChipType", REG_BINARY, szText, sizeof(szText))) @@ -215,70 +242,38 @@ 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); + wsprintfW(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)) + if (EnumDisplaySettingsW(pDispDevice->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); + wsprintfW(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)) + wcscpy(szText, pDispDevice->DeviceName); + ZeroMemory(pDispDevice, sizeof(DISPLAY_DEVICEW)); + pDispDevice->cb = sizeof(DISPLAY_DEVICEW); + if (EnumDisplayDevicesW(szText, 0, pDispDevice, 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) - 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); - - /* 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 - */ - 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; - } - - if (GetLastError() == ERROR_NO_MORE_ITEMS) - break; - - dwIndex++; - }while(TRUE); - - - SetupDiDestroyDeviceInfoList(hInfo); + SendDlgItemMessageW(hwndDlg, IDC_STATIC_ADAPTER_MONITOR, WM_SETTEXT, 0, (LPARAM)pDispDevice->DeviceString); + } + + hDlgCtrls[0] = GetDlgItem(hwndDlg, IDC_STATIC_ADAPTER_ID); + hDlgCtrls[1] = GetDlgItem(hwndDlg, IDC_STATIC_ADAPTER_VENDOR); + hDlgCtrls[2] = GetDlgItem(hwndDlg, IDC_STATIC_ADAPTER_DRIVER); + hDlgCtrls[3] = GetDlgItem(hwndDlg, IDC_STATIC_ADAPTER_VERSION); + hDlgCtrls[4] = GetDlgItem(hwndDlg, IDC_STATIC_ADAPTER_DATE); + + SetDeviceDetails(hDlgCtrls, &GUID_DEVCLASS_DISPLAY, NULL); return TRUE; } @@ -313,15 +308,18 @@ break; pContext->hDisplayWnd = hDlgs; - hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY_DIALOG), pContext->hTabCtrl, DisplayPageWndProc, (LPARAM)pContext); + hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY_DIALOG), pContext->hMainDialog, DisplayPageWndProc, (LPARAM)pContext); if (!hwndDlg) break; + + /* initialize the dialog */ + InitializeDialog(hwndDlg, &DispDevice); 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); + wsprintfW (szText, L"%s %u", szDisplay, pContext->NumDisplayAdapter + 1); InsertTabCtrlItem(GetDlgItem(pContext->hMainDialog, IDC_TAB_CONTROL), pContext->NumDisplayAdapter + 1, szText); hDlgs[pContext->NumDisplayAdapter] = hwndDlg; @@ -335,6 +333,7 @@ INT_PTR CALLBACK DisplayPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { + RECT rect; PDXDIAG_CONTEXT pContext = (PDXDIAG_CONTEXT)GetWindowLongPtr(hDlg, DWLP_USER); switch (message) { @@ -343,7 +342,6 @@ 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: @@ -351,9 +349,10 @@ switch(LOWORD(wParam)) { case IDC_BUTTON_TESTDD: + GetWindowRect(pContext->hMainDialog, &rect); /* FIXME log result errors */ DDTests(); - /* FIXME resize window */ + SetWindowPos(pContext->hMainDialog, NULL, rect.left, rect.top, rect.right, rect.bottom, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); break; } break; 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] Sun May 4 08:58:45 2008 @@ -19,6 +19,7 @@ <library>ddraw</library> <library>version</library> <library>gdi32</library> + <library>winmm</library> <file>system.c</file> <file>display.c</file> <file>sound.c</file> Modified: trunk/reactos/base/applications/dxdiag/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/i… ============================================================================== --- trunk/reactos/base/applications/dxdiag/input.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/input.c [iso-8859-1] Sun May 4 08:58:45 2008 @@ -82,12 +82,12 @@ { /* set manufacturer id */ dwManufacturerID = LOWORD(VendorID.dwData); - swprintf(szText, L"0x%04X", dwManufacturerID); + wsprintfW(szText, L"0x%04X", dwManufacturerID); Item.iSubItem = 3; SendMessageW(pContext->hDevList, LVM_SETITEM, lResult, (LPARAM)&Item); /* set product id */ dwProductID = HIWORD(VendorID.dwData); - swprintf(szText, L"0x%04X", dwProductID); + wsprintfW(szText, L"0x%04X", dwProductID); Item.iSubItem = 4; SendMessageW(pContext->hDevList, LVM_SETITEM, lResult, (LPARAM)&Item); } 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] Sun May 4 08:58:45 2008 @@ -130,7 +130,7 @@ LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10 LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 GROUPBOX "ReactX-Funktionen", -1, 10, 115, 450, 60 - CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | WS_TABSTOP, 120, 135, 80, 17 + CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17 RTEXT "Einstellung der Sound-\nhardwarebeschleunigung:", -1, 20, 135, 90, 20 PUSHBUTTON "DirectSound testen", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 13 GROUPBOX "Hinweise", -1, 10, 180, 450, 40 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] Sun May 4 08:58:45 2008 @@ -130,7 +130,7 @@ LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10 LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60 - CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | WS_TABSTOP, 120, 135, 80, 17 + CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17 RTEXT "Hardware Sound\nAcceleration Level:", -1, 20, 135, 90, 20 PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 13 GROUPBOX "Notes", -1, 10, 180, 450, 40 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] Sun May 4 08:58:45 2008 @@ -130,7 +130,7 @@ LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10 LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60 - CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | WS_TABSTOP, 120, 135, 80, 17 + CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17 RTEXT "Hardware Sound\nAcceleration Level:", -1, 20, 135, 90, 20 PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 13 GROUPBOX "Notes", -1, 10, 180, 450, 40 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] Sun May 4 08:58:45 2008 @@ -137,7 +137,7 @@ LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10 LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 GROUPBOX "ReactX-", -1, 10, 115, 450, 60 - CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | WS_TABSTOP, 120, 135, 80, 17 + CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17 RTEXT "Przyspiesznie sprzêtowe\nPoziom:", -1, 20, 135, 90, 20 PUSHBUTTON "Testuj DirectSound", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 13 GROUPBOX "Uwagi", -1, 10, 180, 450, 40 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] Sun May 4 08:58:45 2008 @@ -130,7 +130,7 @@ LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10 LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60 - CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | WS_TABSTOP, 120, 135, 80, 17 + CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17 RTEXT "Hardware Sound\nAcceleration Level:", -1, 20, 135, 90, 20 PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 13 GROUPBOX "Notes", -1, 10, 180, 450, 40 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] Sun May 4 08:58:45 2008 @@ -111,6 +111,7 @@ WCHAR szBuffer[100]; WCHAR * pResult; BOOL bResult = FALSE; + BOOL bVer; static const WCHAR wFormat[] = L"\\StringFileInfo\\%04x%04x\\FileVersion"; static const WCHAR wTranslation[] = L"VarFileInfo\\Translation"; @@ -145,14 +146,20 @@ code = lplangcode->code; } /* set up format */ - swprintf(szBuffer, wFormat, lang, code); + wsprintfW(szBuffer, wFormat, lang, code); /* query manufacturer */ pResult = NULL; - bResult = VerQueryValueW(pBuf, szBuffer, (LPVOID *)&pResult, &VerSize); - - if (VerSize < szVerSize && bResult && pResult) + bVer = VerQueryValueW(pBuf, szBuffer, (LPVOID *)&pResult, &VerSize); + + if (VerSize < szVerSize && bVer && pResult) { wcscpy(szVer, pResult); + pResult = wcschr(szVer, L' '); + if (pResult) + { + /* cut off build info */ + VerSize = (pResult - szVer); + } if (GetLocaleInfoW(MAKELCID(lang, SORT_DEFAULT), LOCALE_SLANGUAGE, &szVer[VerSize], szVerSize-VerSize)) { szVer[VerSize-1] = L' '; 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] Sun May 4 08:58:45 2008 @@ -9,12 +9,14 @@ #include <stdio.h> #include <windows.h> #include <limits.h> +#include <mmsystem.h> #include <setupapi.h> #include <commctrl.h> #include <dinput.h> #include <ddraw.h> #include <dsound.h> +#include <mmreg.h> #include "resource.h" typedef struct @@ -45,7 +47,7 @@ BOOL GetRegValue(HKEY hBaseKey, LPWSTR SubKey, LPWSTR ValueName, DWORD Type, LPWSTR Result, DWORD Size); VOID InsertTabCtrlItem(HWND hDlgCtrl, INT Position, LPWSTR uId); - +VOID EnumerateDrivers(PVOID Context, HDEVINFO hList, PSP_DEVINFO_DATA pInfoData); /* DirectDraw tests */ VOID DDTests(); 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] Sun May 4 08:58:45 2008 @@ -8,6 +8,97 @@ */ #include "precomp.h" +//#include <initguid.h> +#include <devguid.h> + +static +void +SetDeviceDetails(HWND hwndDlg, LPCGUID classGUID, LPCWSTR lpcstrDescription) +{ + HDEVINFO hInfo; + DWORD dwIndex = 0; + SP_DEVINFO_DATA InfoData; + WCHAR szText[100]; + HWND hDlgCtrls[3]; + WAVEOUTCAPSW waveOut; + UINT numDev; + MMRESULT errCode; + + /* enumerate waveout devices */ + numDev = waveOutGetNumDevs(); + if (numDev) + { + do + { + ZeroMemory(&waveOut, sizeof(waveOut)); + errCode = waveOutGetDevCapsW(dwIndex++, &waveOut, sizeof(waveOut)); + if (!wcsncmp(lpcstrDescription, waveOut.szPname, min(MAXPNAMELEN, wcslen(waveOut.szPname)))) + { + /* set the product id */ + SetDlgItemInt(hwndDlg, IDC_STATIC_DSOUND_PRODUCTID, waveOut.wPid, FALSE); + /* set the vendor id */ + SetDlgItemInt(hwndDlg, IDC_STATIC_DSOUND_VENDORID, waveOut.wMid, FALSE); + /* check if its a wdm audio driver */ + if (waveOut.wPid == MM_MSFT_WDMAUDIO_WAVEOUT) + SendDlgItemMessageW(hwndDlg, IDC_STATIC_DSOUND_TYPE, WM_SETTEXT, 0, (LPARAM)L"WDM"); + + /* check if device is default device */ + szText[0] = L'\0'; + if (dwIndex - 1 == 0) /* FIXME assume default playback device is device 0 */ + LoadStringW(hInst, IDS_OPTION_YES, szText, sizeof(szText)/sizeof(WCHAR)); + else + LoadStringW(hInst, IDS_OPTION_NO, szText, sizeof(szText)/sizeof(WCHAR)); + + szText[(sizeof(szText)/sizeof(WCHAR))-1] = L'\0'; + /* set default device info */ + SendDlgItemMessageW(hwndDlg, IDC_STATIC_DSOUND_STANDARD, WM_SETTEXT, 0, (LPARAM)szText); + break; + } + }while(errCode == MMSYSERR_NOERROR && dwIndex < numDev); + } + + dwIndex = 0; + /* create the setup list */ + hInfo = SetupDiGetClassDevsW(classGUID, NULL, NULL, DIGCF_PRESENT|DIGCF_PROFILE); + if (hInfo == INVALID_HANDLE_VALUE) + return; + + do + { + ZeroMemory(&InfoData, sizeof(InfoData)); + InfoData.cbSize = sizeof(InfoData); + + if (SetupDiEnumDeviceInfo(hInfo, dwIndex, &InfoData)) + { + /* set device name */ + if (SetupDiGetDeviceInstanceId(hInfo, &InfoData, szText, sizeof(szText)/sizeof(WCHAR), NULL)) + SendDlgItemMessageW(hwndDlg, IDC_STATIC_DSOUND_DEVICEID, 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_PROVIDER, WM_SETTEXT, 0, (LPARAM)szText); + + /* FIXME + * we currently enumerate only the first adapter + */ + hDlgCtrls[0] = GetDlgItem(hwndDlg, IDC_STATIC_DSOUND_DRIVER); + hDlgCtrls[1] = GetDlgItem(hwndDlg, IDC_STATIC_DSOUND_VERSION); + hDlgCtrls[2] = GetDlgItem(hwndDlg, IDC_STATIC_DSOUND_DATE); + EnumerateDrivers(hDlgCtrls, hInfo, &InfoData); + break; + } + + if (GetLastError() == ERROR_NO_MORE_ITEMS) + break; + + dwIndex++; + }while(TRUE); + + /* destroy the setup list */ + SetupDiDestroyDeviceInfoList(hInfo); +} + + BOOL CALLBACK DSEnumCallback(LPGUID lpGuid, LPCWSTR lpcstrDescription, LPCWSTR lpcstrModule, LPVOID lpContext) { @@ -29,22 +120,35 @@ return FALSE; pContext->hSoundWnd = hDlgs; - hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SOUND_DIALOG), pContext->hTabCtrl, SoundPageWndProc, (LPARAM)pContext); + hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SOUND_DIALOG), pContext->hMainDialog, SoundPageWndProc, (LPARAM)pContext); if (!hwndDlg) return FALSE; + /* set device name */ + SendDlgItemMessageW(hwndDlg, IDC_STATIC_DSOUND_NAME, WM_SETTEXT, 0, (LPARAM)lpcstrDescription); + + /* set range for slider */ + SendDlgItemMessageW(hwndDlg, IDC_SLIDER_DSOUND, TBM_SETRANGE, TRUE, MAKELONG(0, 3)); + + /* FIXME set correct position */ + SendDlgItemMessageW(hwndDlg, IDC_SLIDER_DSOUND, TBM_SETSEL, FALSE, 0); + + /* set further device details */ + SetDeviceDetails(hwndDlg, &GUID_DEVCLASS_MEDIA, lpcstrDescription); + + + + /* load sound resource string */ 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); - - + /* output the device id */ + wsprintfW (szText, L"%s %u", szSound, pContext->NumSoundAdapter + 1); + /* insert it into general tab */ InsertTabCtrlItem(pContext->hTabCtrl, pContext->NumDisplayAdapter + pContext->NumSoundAdapter + 1, szText); - + /* store dialog window */ hDlgs[pContext->NumSoundAdapter] = hwndDlg; pContext->NumSoundAdapter++; - return TRUE; } @@ -68,14 +172,20 @@ INT_PTR CALLBACK SoundPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - switch (message) { + switch (message) + { case WM_INITDIALOG: { SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); - //InitializeDirectSoundPage(hDlg); return TRUE; + } + case WM_COMMAND: + { + if (LOWORD(wParam) == IDC_BUTTON_TESTDSOUND) + { + return FALSE; + } + break; } } 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] Sun May 4 08:58:45 2008 @@ -108,28 +108,28 @@ switch(Length) { case PRODUCT_ULTIMATE: - swprintf(szBuffer, L"Windows Vista Ultimate (6.0, Build %04u)", info.dwBuildNumber); + wsprintfW(szBuffer, L"Windows Vista Ultimate (6.0, Build %04u)", info.dwBuildNumber); return TRUE; case PRODUCT_HOME_BASIC: - swprintf(szBuffer, L"Windows Vista Home Basic (6.0, Build %04u)", info.dwBuildNumber); + wsprintfW(szBuffer, L"Windows Vista Home Basic (6.0, Build %04u)", info.dwBuildNumber); return TRUE; case PRODUCT_HOME_PREMIUM: - swprintf(szBuffer, L"Windows Vista Home Premimum (6.0, Build %04u)", info.dwBuildNumber); + wsprintfW(szBuffer, L"Windows Vista Home Premimum (6.0, Build %04u)", info.dwBuildNumber); return TRUE; case PRODUCT_ENTERPRISE: - swprintf(szBuffer, L"Windows Vista Enterprise (6.0, Build %04u)", info.dwBuildNumber); + wsprintfW(szBuffer, L"Windows Vista Enterprise (6.0, Build %04u)", info.dwBuildNumber); return TRUE; case PRODUCT_HOME_BASIC_N: - swprintf(szBuffer, L"Windows Vista Home Basic N(6.0, Build %04u)", info.dwBuildNumber); + wsprintfW(szBuffer, L"Windows Vista Home Basic N(6.0, Build %04u)", info.dwBuildNumber); return TRUE; case PRODUCT_BUSINESS: - swprintf(szBuffer, L"Windows Vista Business(6.0, Build %04u)", info.dwBuildNumber); + wsprintfW(szBuffer, L"Windows Vista Business(6.0, Build %04u)", info.dwBuildNumber); return TRUE; case PRODUCT_STARTER: - swprintf(szBuffer, L"Windows Vista Starter(6.0, Build %04u)", info.dwBuildNumber); + wsprintfW(szBuffer, L"Windows Vista Starter(6.0, Build %04u)", info.dwBuildNumber); return TRUE; case PRODUCT_BUSINESS_N: - swprintf(szBuffer, L"Windows Vista Business N(6.0, Build %04u)", info.dwBuildNumber); + wsprintfW(szBuffer, L"Windows Vista Business N(6.0, Build %04u)", info.dwBuildNumber); return TRUE; default: return FALSE; @@ -189,7 +189,7 @@ // if (GetVistaVersion(szBuffer)) // return TRUE; - swprintf(szBuffer, L"Windows Vista (6.0, Build %04u)", info.dwBuildNumber); + wsprintfW(szBuffer, L"Windows Vista (6.0, Build %04u)", info.dwBuildNumber); return TRUE; } } @@ -295,7 +295,7 @@ LoadStringW(hInst, IDS_FORMAT_UNIPROC, szFormat, sizeof(szFormat) / sizeof(WCHAR)); szFormat[(sizeof(szFormat)/sizeof(WCHAR))-1] = L'\0'; - swprintf(szTime, szFormat, szDesc, SysInfo.dwNumberOfProcessors); + wsprintfW(szTime, szFormat, szDesc, SysInfo.dwNumberOfProcessors); SendDlgItemMessageW(hwndDlg, IDC_STATIC_PROC, WM_SETTEXT, 0, (LPARAM)szTime); } @@ -308,7 +308,7 @@ { /* set total mem string */ szFormat[(sizeof(szFormat) / sizeof(WCHAR))-1] = L'\0'; - swprintf(szTime, szFormat, (mem.ullTotalPhys/1048576)); + wsprintfW(szTime, szFormat, (mem.ullTotalPhys/1048576)); SendDlgItemMessageW(hwndDlg, IDC_STATIC_MEM, WM_SETTEXT, 0, (LPARAM)szTime); } @@ -319,7 +319,7 @@ UsedBytes = (mem.ullTotalPageFile-mem.ullAvailPageFile)/1048576; szFormat[(sizeof(szFormat) / sizeof(WCHAR))-1] = L'\0'; - swprintf(szTime, szFormat, (UsedBytes), (AvailableBytes)); + wsprintfW(szTime, szFormat, (UsedBytes), (AvailableBytes)); SendDlgItemMessageW(hwndDlg, IDC_STATIC_SWAP, WM_SETTEXT, 0, (LPARAM)szTime); } }

16 years, 4 months

[janderwald] 33268: - add mmreg.h

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun May 4 08:51:59 2008 New Revision: 33268 URL: http://svn.reactos.org/svn/reactos?rev=33268&view=rev Log: - add mmreg.h Added: trunk/reactos/include/psdk/mmreg.h (with props) Added: trunk/reactos/include/psdk/mmreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmreg.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/mmreg.h (added) +++ trunk/reactos/include/psdk/mmreg.h [iso-8859-1] Sun May 4 08:51:59 2008 @@ -1,0 +1,24 @@ +#ifndef _INC_MMREG +#define _INC_MMREG 158 + + +#ifndef NOMMIDS + +/* define manufacturer ids */ +#ifndef MM_MICROSOFT +#define MM_MICROSOFT 1 +#endif + + +/* define WDM types */ +#define MM_MSFT_WDMAUDIO_WAVEOUT 0x64 +#define MM_MSFT_WDMAUDIO_WAVEIN 0x65 +#define MM_MSFT_WDMAUDIO_MIDIOUT 0x66 +#define MM_MSFT_WDMAUDIO_MIDIIN 0x67 +#define MM_MSFT_WDMAUDIO_MIXER 0x68 +#define MM_MSFT_WDMAUDIO_AUX 0x69 + + +#endif + +#endif /* _INC_MMREG */ Propchange: trunk/reactos/include/psdk/mmreg.h ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 4 months

[greatlrd] 33267: NtUserEnumDisplaySettings remove two MmCopyFromCaller, never use MmCopyFromCaller for it make debuging pain in the ass

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun May 4 08:23:19 2008 New Revision: 33267 URL: http://svn.reactos.org/svn/reactos?rev=33267&view=rev Log: NtUserEnumDisplaySettings remove two MmCopyFromCaller, never use MmCopyFromCaller for it make debuging pain in the ass Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Sun May 4 08:23:19 2008 @@ -914,18 +914,21 @@ USHORT Size = 0, ExtraSize = 0; /* Copy the devmode */ - Status = MmCopyFromCaller(&Size, &lpDevMode->dmSize, sizeof (Size)); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - Status = MmCopyFromCaller(&ExtraSize, &lpDevMode->dmDriverExtra, sizeof (ExtraSize)); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } + _SEH_TRY + { + ProbeForRead(&lpDevMode->dmSize, sizeof(DEVMODEW), 1); + Size = lpDevMode->dmSize; + ExtraSize = lpDevMode->dmDriverExtra; + } + _SEH_HANDLE + { + DPRINT1("FIXME ? : Out of range of DEVMODEW size \n"); + SetLastNtError(_SEH_GetExceptionCode()); + _SEH_YIELD(return FALSE); + } + _SEH_END; + + pSafeDevMode = ExAllocatePool(PagedPool, Size + ExtraSize); if (pSafeDevMode == NULL) {

16 years, 4 months

← Newer
1
...
49
50
51
52
53
54
55
...
59
Older →

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 May 2008