Ros-diffs March 2009

ros-diffs@reactos.org

28 participants
483 discussions

[dchapyshev] 39882: - Add more check of parametres in GetDIBits
by dchapyshev＠svn.reactos.org 05 Mar '09

05 Mar '09

Author: dchapyshev Date: Thu Mar 5 15:22:35 2009 New Revision: 39882 URL: http://svn.reactos.org/svn/reactos?rev=39882&view=rev Log: - Add more check of parametres in GetDIBits Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Thu Mar 5 15:22:35 2009 @@ -418,7 +418,13 @@ } } } - pvSafeBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize); + + if ((ULONG)lpvBits & (sizeof(DWORD) - 1)) + { + pvSafeBits = RtlAllocateHeap(RtlGetProcessHeap(), 0, cjBmpScanSize); + if (!pvSafeBits) + return Ret; + } } Ret = NtGdiGetDIBitsInternal(hDC, @@ -430,9 +436,12 @@ uUsage, cjBmpScanSize, 0); - if ( lpvBits != pvSafeBits) - { - RtlCopyMemory( lpvBits, pvSafeBits, cjBmpScanSize); + if (lpvBits != pvSafeBits) + { + if (Ret) + { + RtlCopyMemory(lpvBits, pvSafeBits, cjBmpScanSize); + } RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); } return Ret;

1 0

[mkupfer] 39881: - Change menu symbols drawing to marlett font.
by mkupfer＠svn.reactos.org 05 Mar '09

05 Mar '09

Author: mkupfer Date: Thu Mar 5 14:48:20 2009 New Revision: 39881 URL: http://svn.reactos.org/svn/reactos?rev=39881&view=rev Log: - Change menu symbols drawing to marlett font. Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Thu Mar 5 14:48:20 2009 @@ -1237,63 +1237,43 @@ /* Draw a menu control coming from DrawFrameControl() */ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) { - POINT Points[6]; RECT myr; int SmallDiam = UITOOLS_MakeSquareRect(r, &myr); - int i; - HBRUSH hbsave; - HPEN hpsave; - int xc, yc; BOOL retval = TRUE; - - /* Using black and white seems to be utterly wrong, but win95 doesn't */ - /* use anything else. I think I tried all sys-colors to change things */ - /* without luck. It seems as if this behavior is inherited from the */ - /* win31 DFC() implementation... (you remember, B/W menus). */ + /* Start using Marlett-font instead of basic drawing */ + LOGFONT lf; + HFONT hFont, hOldFont; + COLORREF clrsave; + + ZeroMemory(&lf, sizeof(LOGFONT)); + lf.lfHeight = SmallDiam; + lf.lfWidth = 0; + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = DEFAULT_CHARSET; + lstrcpy(lf.lfFaceName, TEXT("Marlett")); + hFont = CreateFontIndirect(&lf); + hOldFont = SelectObject(dc, hFont); + SetBkMode(dc, TRANSPARENT); + clrsave = GetTextColor(dc); + SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); FillRect(dc, r, (HBRUSH)GetStockObject(WHITE_BRUSH)); - hbsave = (HBRUSH)SelectObject(dc, GetStockObject(BLACK_BRUSH)); - hpsave = (HPEN)SelectObject(dc, GetStockObject(BLACK_PEN)); - switch(uFlags & 0xff) { case DFCS_MENUARROW: - i = 187*SmallDiam/750; - Points[2].x = myr.left + 468*SmallDiam/750; - Points[2].y = myr.top + 352*SmallDiam/750+1; - Points[0].y = Points[2].y - i; - Points[1].y = Points[2].y + i; - Points[0].x = Points[1].x = Points[2].x - i; - Polygon(dc, Points, 3); + // FIXME: is "8" the correct symbol? + TextOut(dc, myr.left, myr.top, TEXT("8"), 1); break; case DFCS_MENUBULLET: - xc = myr.left + SmallDiam - SmallDiam/2; - yc = myr.top + SmallDiam - SmallDiam/2; - i = 234*SmallDiam/750; - i = i < 1 ? 1 : i; - myr.left = xc - i/2; - myr.right = xc + i/2; - myr.top = yc - i/2; - myr.bottom = yc + i/2; - Ellipse(dc, myr.left, myr.top, myr.right, myr.bottom); + // FIXME: is "h" the correct symbol? + TextOut(dc, myr.left, myr.top, TEXT("h"), 1); break; case DFCS_MENUCHECK: - Points[0].x = myr.left + 253*SmallDiam/1000; - Points[0].y = myr.top + 445*SmallDiam/1000; - Points[1].x = myr.left + 409*SmallDiam/1000; - Points[1].y = Points[0].y + (Points[1].x-Points[0].x); - Points[2].x = myr.left + 690*SmallDiam/1000; - Points[2].y = Points[1].y - (Points[2].x-Points[1].x); - Points[3].x = Points[2].x; - Points[3].y = Points[2].y + 3*SmallDiam/16; - Points[4].x = Points[1].x; - Points[4].y = Points[1].y + 3*SmallDiam/16; - Points[5].x = Points[0].x; - Points[5].y = Points[0].y + 3*SmallDiam/16; - Polygon(dc, Points, 6); + // FIXME: is "a" the correct symbol? + TextOut(dc, myr.left, myr.top, TEXT("a"), 1); break; default: @@ -1304,8 +1284,9 @@ break; } - SelectObject(dc, hpsave); - SelectObject(dc, hbsave); + SetTextColor(dc, clrsave); + SelectObject(dc, hOldFont); + return retval; }

1 0

[hyperion] 39880: Daring attempt at a file name with non-ASCII characters
by hyperion＠svn.reactos.org 05 Mar '09

05 Mar '09

Author: hyperion Date: Thu Mar 5 14:30:43 2009 New Revision: 39880 URL: http://svn.reactos.org/svn/reactos?rev=39880&view=rev Log: Daring attempt at a file name with non-ASCII characters Added: trunk/press-media/presentations/Imaginática 2009/

1 0

[jmorlan] 39879: Make CALL command do another round of %-variable substitutions.
by jmorlan＠svn.reactos.org 05 Mar '09

05 Mar '09

Author: jmorlan Date: Thu Mar 5 08:10:10 2009 New Revision: 39879 URL: http://svn.reactos.org/svn/reactos?rev=39879&view=rev Log: Make CALL command do another round of %-variable substitutions. Modified: trunk/reactos/base/shell/cmd/call.c trunk/reactos/base/shell/cmd/cmd.h Modified: trunk/reactos/base/shell/cmd/call.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/call.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/call.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/call.c [iso-8859-1] Thu Mar 5 08:10:10 2009 @@ -33,15 +33,12 @@ /* * Perform CALL command. - * - * Allocate a new batch context and add it to the current chain. - * Call parsecommandline passing in our param string - * If No batch file was opened then remove our newly allocted - * context block. */ INT cmd_call (LPTSTR param) { + TCHAR line[CMDLINE_LENGTH]; + TRACE ("cmd_call: (\'%s\')\n", debugstr_aw(param)); if (!_tcsncmp (param, _T("/?"), 2)) { @@ -49,13 +46,22 @@ return 0; } + /* Do a second round of %-variable substitutions */ + if (!SubstituteVars(param, line, _T('%'))) + return nErrorLevel = 1; + + param = line; + while (_istspace(*param)) + param++; if (*param == _T(':') && (bc)) { + /* CALL :label - call a subroutine of the current batch file */ TCHAR *first = param; while (*param && !_istspace(*param)) param++; if (*param) { + /* Separate label and arguments */ *param++ = _T('\0'); while (_istspace(*param)) param++; Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Thu Mar 5 08:10:10 2009 @@ -102,6 +102,7 @@ LPCTSTR GetEnvVarOrSpecial ( LPCTSTR varName ); VOID AddBreakHandler (VOID); VOID RemoveBreakHandler (VOID); +BOOL SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim); BOOL SubstituteForVars(TCHAR *Src, TCHAR *Dest); LPTSTR DoDelayedExpansion(LPTSTR Line); BOOL DoCommand (LPTSTR line, struct _PARSED_COMMAND *Cmd);

1 0

[mkupfer] 39878: - Draw bullet for menu radio group with ellipse instead of pie. - This is a better solution for issue #4193. - The pie problem remains.
by mkupfer＠svn.reactos.org 04 Mar '09

04 Mar '09

Author: mkupfer Date: Thu Mar 5 01:16:25 2009 New Revision: 39878 URL: http://svn.reactos.org/svn/reactos?rev=39878&view=rev Log: - Draw bullet for menu radio group with ellipse instead of pie. - This is a better solution for issue #4193. - The pie problem remains. Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Thu Mar 5 01:16:25 2009 @@ -1243,7 +1243,6 @@ int i; HBRUSH hbsave; HPEN hpsave; - int xe, ye; int xc, yc; BOOL retval = TRUE; @@ -1270,8 +1269,6 @@ break; case DFCS_MENUBULLET: - xe = myr.left; - ye = myr.top + SmallDiam - SmallDiam/2; xc = myr.left + SmallDiam - SmallDiam/2; yc = myr.top + SmallDiam - SmallDiam/2; i = 234*SmallDiam/750; @@ -1280,8 +1277,7 @@ myr.right = xc + i/2; myr.top = yc - i/2; myr.bottom = yc + i/2; - // if the start and the end point are equal, Pie() only draws a single line, so start one pixel lower - Pie(dc, myr.left, myr.top, myr.right, myr.bottom, xe, ye+1, xe, ye); + Ellipse(dc, myr.left, myr.top, myr.right, myr.bottom); break; case DFCS_MENUCHECK:

1 0

[janderwald] 39877: - Start implementing kmixer
by janderwald＠svn.reactos.org 04 Mar '09

04 Mar '09

Author: janderwald Date: Thu Mar 5 00:13:10 2009 New Revision: 39877 URL: http://svn.reactos.org/svn/reactos?rev=39877&view=rev Log: - Start implementing kmixer Added: trunk/reactos/drivers/wdm/audio/filters/directory.rbuild (with props) trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c (with props) trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.c (with props) trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h (with props) trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.rbuild (with props) trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c (with props) Modified: trunk/reactos/drivers/wdm/audio/directory.rbuild Modified: trunk/reactos/drivers/wdm/audio/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/director… ============================================================================== --- trunk/reactos/drivers/wdm/audio/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/directory.rbuild [iso-8859-1] Thu Mar 5 00:13:10 2009 @@ -10,6 +10,9 @@ <directory name="drm"> <xi:include href="drm/directory.rbuild" /> </directory> + <directory name="filters"> + <xi:include href="filters/directory.rbuild" /> + </directory> <directory name="legacy"> <xi:include href="legacy/directory.rbuild" /> </directory> Added: trunk/reactos/drivers/wdm/audio/filters/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/directory.rbuild (added) +++ trunk/reactos/drivers/wdm/audio/filters/directory.rbuild [iso-8859-1] Thu Mar 5 00:13:10 2009 @@ -1,0 +1,7 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="kmixer"> + <xi:include href="kmixer/kmixer.rbuild" /> + </directory> +</group> Propchange: trunk/reactos/drivers/wdm/audio/filters/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c (added) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c [iso-8859-1] Thu Mar 5 00:13:10 2009 @@ -1,0 +1,254 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/wdm/audio/filters/kmixer/filter.c + * PURPOSE: Filter File Context Header header + * PROGRAMMER: Johannes Anderwald + */ + +#include "kmixer.h" + +NTSTATUS +NTAPI +Dispatch_fnDeviceIoControl( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + DPRINT1("Dispatch_fnDeviceIoControl Unhandeled %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); + DbgBreakPoint(); + + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +Dispatch_fnRead( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Dispatch_fnRead called DeviceObject %p Irp %p\n", DeviceObject); + + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +Dispatch_fnWrite( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Dispatch_fnWrite called DeviceObject %p Irp %p\n", DeviceObject); + + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +Dispatch_fnFlush( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Dispatch_fnFlush called DeviceObject %p Irp %p\n", DeviceObject); + //FIXME + // cleanup resources + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +Dispatch_fnClose( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Dispatch_fnClose called DeviceObject %p Irp %p\n", DeviceObject); + + //FIXME + // cleanup resources + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +Dispatch_fnQuerySecurity( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Dispatch_fnQuerySecurity called DeviceObject %p Irp %p\n", DeviceObject); + + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +Dispatch_fnSetSecurity( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + + DPRINT1("Dispatch_fnSetSecurity called DeviceObject %p Irp %p\n", DeviceObject); + + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +} + +BOOLEAN +NTAPI +Dispatch_fnFastDeviceIoControl( + PFILE_OBJECT FileObject, + BOOLEAN Wait, + PVOID InputBuffer, + ULONG InputBufferLength, + PVOID OutputBuffer, + ULONG OutputBufferLength, + ULONG IoControlCode, + PIO_STATUS_BLOCK IoStatus, + PDEVICE_OBJECT DeviceObject) +{ + DPRINT1("Dispatch_fnFastDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); + + + return FALSE; +} + + +BOOLEAN +NTAPI +Dispatch_fnFastRead( + PFILE_OBJECT FileObject, + PLARGE_INTEGER FileOffset, + ULONG Length, + BOOLEAN Wait, + ULONG LockKey, + PVOID Buffer, + PIO_STATUS_BLOCK IoStatus, + PDEVICE_OBJECT DeviceObject) +{ + DPRINT1("Dispatch_fnFastRead called DeviceObject %p Irp %p\n", DeviceObject); + + return FALSE; + +} + +BOOLEAN +NTAPI +Dispatch_fnFastWrite( + PFILE_OBJECT FileObject, + PLARGE_INTEGER FileOffset, + ULONG Length, + BOOLEAN Wait, + ULONG LockKey, + PVOID Buffer, + PIO_STATUS_BLOCK IoStatus, + PDEVICE_OBJECT DeviceObject) +{ + DPRINT1("Dispatch_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); + + return FALSE; +} + +static KSDISPATCH_TABLE DispatchTable = +{ + Dispatch_fnDeviceIoControl, + Dispatch_fnRead, + Dispatch_fnWrite, + Dispatch_fnFlush, + Dispatch_fnClose, + Dispatch_fnQuerySecurity, + Dispatch_fnSetSecurity, + Dispatch_fnFastDeviceIoControl, + Dispatch_fnFastRead, + Dispatch_fnFastWrite, +}; + +NTSTATUS +NTAPI +DispatchCreateKMix( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + KSOBJECT_HEADER ObjectHeader; + PIO_STACK_LOCATION IoStatus; + LPWSTR Buffer; + + static LPWSTR KS_NAME_PIN = L"{146F1A80-4791-11D0-A5D6-28DB04C10000}"; + + IoStatus = IoGetCurrentIrpStackLocation(Irp); + Buffer = IoStatus->FileObject->FileName.Buffer; + + DPRINT1("DispatchCreateKMix entered\n"); + + if (Buffer) + { + /* is the request for a new pin */ + if (!wcsncmp(KS_NAME_PIN, Buffer, wcslen(KS_NAME_PIN))) + { + UNIMPLEMENTED + Status = STATUS_UNSUCCESSFUL; + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + } + + /* allocate object header */ + Status = KsAllocateObjectHeader(&ObjectHeader, 0, NULL, Irp, &DispatchTable); + + DPRINT1("KsAllocateObjectHeader result %x\n", Status); + /* complete the irp */ + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + +NTSTATUS +NTAPI +KMixAllocateDeviceHeader( + IN PKMIXER_DEVICE_EXT DeviceExtension) +{ + NTSTATUS Status; + PKSOBJECT_CREATE_ITEM CreateItem; + + /* allocate create item */ + CreateItem = ExAllocatePool(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM)); + if (!CreateItem) + return STATUS_INSUFFICIENT_RESOURCES; + + /* initialize create item struct */ + RtlZeroMemory(CreateItem, sizeof(KSOBJECT_CREATE_ITEM)); + CreateItem->Create = DispatchCreateKMix; + RtlInitUnicodeString(&CreateItem->ObjectClass, L"KMixer"); + + Status = KsAllocateDeviceHeader(&DeviceExtension->KsDeviceHeader, + 1, + CreateItem); + return Status; +} + Propchange: trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.c (added) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.c [iso-8859-1] Thu Mar 5 00:13:10 2009 @@ -1,0 +1,112 @@ +/* + * PROJECT: ReactOS Kernel Streaming Mixer + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/wdm/audio/filters/kmixer/kmixer.c + * PURPOSE: main entry point + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + +#include "kmixer.h" + +NTSTATUS +NTAPI +KMix_Pnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IrpStack; + + IrpStack = IoGetCurrentIrpStackLocation(Irp); + + DPRINT("KMix_Pnp called for func %x\n", IrpStack->MinorFunction); + + if (IrpStack->MinorFunction == IRP_MN_QUERY_PNP_DEVICE_STATE) + { + Irp->IoStatus.Information |= PNP_DEVICE_NOT_DISABLEABLE; + } + + return KsDefaultDispatchPnp(DeviceObject, Irp); +} + +VOID +NTAPI +KMix_Unload(IN PDRIVER_OBJECT DriverObject) +{ + DPRINT1("SysAudio_Unload called\n"); +} + +NTSTATUS +NTAPI +KMix_InstallDevice( + IN PDRIVER_OBJECT DriverObject) +{ + NTSTATUS Status; + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\kmixer"); + PDEVICE_OBJECT DeviceObject; + PKMIXER_DEVICE_EXT DeviceExtension; + + DPRINT1("KMix_InstallDevice called\n"); + + /* create the device */ + Status = IoCreateDevice(DriverObject, + sizeof(KMIXER_DEVICE_EXT), + &DeviceName, + FILE_DEVICE_KS, + 0, + FALSE, + &DeviceObject); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed to create \\Device\\kmixer !\n"); + return Status; + } + + DeviceExtension = (PKMIXER_DEVICE_EXT)DeviceObject->DeviceExtension; + /* initialize device extension */ + RtlZeroMemory(DeviceExtension, sizeof(KMIXER_DEVICE_EXT)); + + + Status = KMixAllocateDeviceHeader(DeviceExtension); + if (!NT_SUCCESS(Status)) + { + DPRINT1("KMixAllocateDeviceHeader failed with %x\n", Status); + goto cleanup; + } + + /* set io flags */ + DeviceObject->Flags |= DO_DIRECT_IO | DO_POWER_PAGABLE; + /* clear initializing flag */ + DeviceObject->Flags &= ~ DO_DEVICE_INITIALIZING; + + DPRINT("KMix_InstallDevice result %x\n", Status); + return STATUS_SUCCESS; + +cleanup: + + IoDeleteDevice(DeviceObject); + return Status; +} + + +NTSTATUS +NTAPI +DriverEntry( + PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPathName) +{ + DPRINT1("KMixer.sys loaded\n"); + + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_CREATE); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_CLOSE); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_WRITE); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_DEVICE_CONTROL); + + DriverObject->MajorFunction[IRP_MJ_POWER] = KsDefaultDispatchPower; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = KsDefaultForwardIrp; + DriverObject->MajorFunction[IRP_MJ_PNP] = KMix_Pnp; + DriverObject->DriverUnload = KMix_Unload; + + return KMix_InstallDevice(DriverObject); +} Propchange: trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h (added) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h [iso-8859-1] Thu Mar 5 00:13:10 2009 @@ -1,0 +1,27 @@ +#ifndef KMIXER_H__ +#define KMIXER_H__ + +#include <ntddk.h> +#include <portcls.h> +#include <ks.h> +#include <ksmedia.h> +#define YDEBUG +#include <debug.h> + +#include <samplerate.h> +#include <float_cast.h> + +typedef struct +{ + KSDEVICE_HEADER KsDeviceHeader; + + +}KMIXER_DEVICE_EXT, *PKMIXER_DEVICE_EXT; + +NTSTATUS +NTAPI +KMixAllocateDeviceHeader( + IN PKMIXER_DEVICE_EXT DeviceExtension); + + +#endif Propchange: trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.rbuild (added) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.rbuild [iso-8859-1] Thu Mar 5 00:13:10 2009 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../../tools/rbuild/project.dtd"> +<module name="kmixer" type="kernelmodedriver" installbase="system32/drivers" installname="kmixer.sys"> + <include base="kmixer">.</include> + <include base="libsamplerate">.</include> + <library>ntoskrnl</library> + <library>ks</library> + <library>rtl</library> + <library>hal</library> + <library>libcntpr</library> + <library>libsamplerate</library> + <file>kmixer.c</file> + <file>filter.c</file> + <file>pin.c</file> +</module> Propchange: trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c (added) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] Thu Mar 5 00:13:10 2009 @@ -1,0 +1,185 @@ +/* + * PROJECT: ReactOS Kernel Streaming Mixer + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/wdm/audio/filters/kmixer/kmixer.c + * PURPOSE: Pin functions + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + +#include "kmixer.h" + + + +NTSTATUS +PerformSampleRateConversion( + PUCHAR Buffer, + ULONG BufferLength, + ULONG OldRate, + ULONG NewRate, + ULONG BytesPerSample, + ULONG NumChannels, + PVOID * Result, + PULONG ResultLength) +{ + KFLOATING_SAVE FloatSave; + NTSTATUS Status; + ULONG Index; + SRC_STATE * State; + SRC_DATA Data; + PUCHAR ResultOut; + int error; + PFLOAT FloatIn, FloatOut; + ULONG NumSamples; + ULONG NewSamples; + + /* first acquire float save context */ + Status = KeSaveFloatingPointState(&FloatSave); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("KeSaveFloatingPointState failed with %x\n", Status); + return Status; + } + + NumSamples = BufferLength / BytesPerSample; + + FloatIn = ExAllocatePool(NonPagedPool, NumSamples * sizeof(FLOAT)); + if (!FloatIn) + { + KeRestoreFloatingPointState(&FloatSave); + return STATUS_INSUFFICIENT_RESOURCES; + } + + NewSamples = lrintf(((FLOAT)NumSamples * ((FLOAT)OldRate / (FLOAT)NewRate))) + 1; + + FloatOut = ExAllocatePool(NonPagedPool, NewSamples * sizeof(FLOAT)); + if (!FloatOut) + { + ExFreePool(FloatIn); + KeRestoreFloatingPointState(&FloatSave); + return STATUS_INSUFFICIENT_RESOURCES; + } + + ResultOut = ExAllocatePool(NonPagedPool, NewRate * BytesPerSample * NumChannels); + if (!FloatOut) + { + ExFreePool(FloatIn); + ExFreePool(FloatOut); + KeRestoreFloatingPointState(&FloatSave); + return STATUS_INSUFFICIENT_RESOURCES; + } + + State = src_new(SRC_LINEAR, NumChannels, &error); + if (!State) + { + DPRINT1("KeSaveFloatingPointState failed with %x\n", Status); + KeRestoreFloatingPointState(&FloatSave); + ExFreePool(FloatIn); + ExFreePool(FloatOut); + ExFreePool(ResultOut); + return STATUS_UNSUCCESSFUL; + } + + /* fixme use asm */ + if (BytesPerSample == 1) + { + for(Index = 0; Index < NumSamples; Index++) + FloatIn[Index] = (float)Buffer[Index]; + } + else if (BytesPerSample == 2) + { + PUSHORT Res = (PUSHORT)ResultOut; + for(Index = 0; Index < NumSamples; Index++) + FloatIn[Index] = (float)Res[Index]; + } + else + { + UNIMPLEMENTED + KeRestoreFloatingPointState(&FloatSave); + ExFreePool(FloatIn); + ExFreePool(FloatOut); + ExFreePool(ResultOut); + return STATUS_UNSUCCESSFUL; + } + + Data.data_in = FloatIn; + Data.data_out = FloatOut; + Data.input_frames = NumSamples; + Data.output_frames = NewSamples; + Data.src_ratio = (double)NewRate / (double)OldRate; + + error = src_process(State, &Data); + if (error) + { + DPRINT1("src_process failed with %x\n", error); + KeRestoreFloatingPointState(&FloatSave); + ExFreePool(FloatIn); + ExFreePool(FloatOut); + ExFreePool(ResultOut); + return STATUS_UNSUCCESSFUL; + } + + if (BytesPerSample == 1) + { + for(Index = 0; Index < Data.output_frames_gen; Index++) + ResultOut[Index] = lrintf(FloatOut[Index]); + } + else if (BytesPerSample == 2) + { + PUSHORT Res = (PUSHORT)ResultOut; + for(Index = 0; Index < Data.output_frames_gen; Index++) + Res[Index] = lrintf(FloatOut[Index]); + } + + *Result = ResultOut; + *ResultLength = NewRate * BytesPerSample * NumChannels; + ExFreePool(FloatIn); + ExFreePool(FloatOut); + KeRestoreFloatingPointState(&FloatSave); + return STATUS_SUCCESS; +} + + +void * calloc(size_t Elements, size_t ElementSize) +{ + PVOID Block = ExAllocatePool(NonPagedPool, Elements * ElementSize); + if (Block) + RtlZeroMemory(Block, Elements * ElementSize); + + return Block; +} + +void free(PVOID Block) +{ + ExFreePool(Block); +} + +void *memset( + void* dest, + int c, + size_t count) +{ + RtlFillMemory(dest, count, c); + return dest; +} + +void * memcpy( + void* dest, + const void* src, + size_t count) +{ + RtlCopyMemory(dest, src, count); + return dest; +} + +void *memmove( + void* dest, + const void* src, + size_t count) +{ + RtlMoveMemory(dest, src, count); + return dest; +} + + + Propchange: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 39876: - Make TOKEN pointer in OBJECT_HEADER a fast reference, just like on Windows. - Update SD cache code to treat it as such. - Improves performance by 500% during security checks - noticeable impact during large file or registry transfer operations.
by fireball＠svn.reactos.org 04 Mar '09

04 Mar '09

Author: fireball Date: Wed Mar 4 23:58:32 2009 New Revision: 39876 URL: http://svn.reactos.org/svn/reactos?rev=39876&view=rev Log: - Make TOKEN pointer in OBJECT_HEADER a fast reference, just like on Windows. - Update SD cache code to treat it as such. - Improves performance by 500% during security checks - noticeable impact during large file or registry transfer operations. Modified: trunk/reactos/ntoskrnl/ob/obsdcach.c trunk/reactos/ntoskrnl/ob/obsecure.c Modified: trunk/reactos/ntoskrnl/ob/obsdcach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsdcach.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obsdcach.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obsdcach.c [iso-8859-1] Wed Mar 4 23:58:32 2009 @@ -181,24 +181,51 @@ { PSECURITY_DESCRIPTOR SecurityDescriptor; PSECURITY_DESCRIPTOR_HEADER SdHeader; - - /* Get the SD */ - SecurityDescriptor = ObjectHeader->SecurityDescriptor; - if (!SecurityDescriptor) - { - /* No SD, nothing to do */ - return NULL; - } - + PEX_FAST_REF FastRef; + EX_FAST_REF OldValue; + ULONG_PTR Count; + + /* Acquire a reference to the security descriptor */ + FastRef = (PEX_FAST_REF)&ObjectHeader->SecurityDescriptor; + OldValue = ExAcquireFastReference(FastRef); + + /* Get the descriptor and reference count */ + SecurityDescriptor = ExGetObjectFastReference(OldValue); + Count = ExGetCountFastReference(OldValue); + + /* Check if there's no descriptor or if there's still cached references */ + if ((Count >= 1) || !(SecurityDescriptor)) + { + /* Check if this is the last reference */ + if (Count == 1) + { + /* Add the extra references that we'll take */ + SdHeader = ObpGetHeaderForSd(SecurityDescriptor); + InterlockedExchangeAdd((PLONG)&SdHeader->RefCount, MAX_FAST_REFS); + + /* Now insert them */ + if (!ExInsertFastReference(FastRef, SecurityDescriptor)) + { + /* Undo the references since we failed */ + InterlockedExchangeAdd((PLONG)&SdHeader->RefCount, + -MAX_FAST_REFS); + } + } + + /* Return the SD */ + return SecurityDescriptor; + } + /* Lock the object */ ObpAcquireObjectLockShared(ObjectHeader); - + /* Get the object header */ + SecurityDescriptor = ExGetObjectFastReference(*FastRef); SdHeader = ObpGetHeaderForSd(SecurityDescriptor); - + /* Do the reference */ InterlockedIncrement((PLONG)&SdHeader->RefCount); - + /* Release the lock and return */ ObpReleaseObjectLock(ObjectHeader); return SecurityDescriptor; Modified: trunk/reactos/ntoskrnl/ob/obsecure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsecure.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obsecure.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obsecure.c [iso-8859-1] Wed Mar 4 23:58:32 2009 @@ -24,19 +24,23 @@ POBJECT_HEADER ObjectHeader; NTSTATUS Status; PSECURITY_DESCRIPTOR NewSd; + PEX_FAST_REF FastRef; PAGED_CODE(); /* Get the object header */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + FastRef = (PEX_FAST_REF)&ObjectHeader->SecurityDescriptor; if (!SecurityDescriptor) { /* Nothing to assign */ - ObjectHeader->SecurityDescriptor = NULL; + ExInitializeFastReference(FastRef, NULL); return STATUS_SUCCESS; } /* Add it to our internal cache */ - Status = ObLogSecurityDescriptor(SecurityDescriptor, &NewSd, 1); + Status = ObLogSecurityDescriptor(SecurityDescriptor, + &NewSd, + MAX_FAST_REFS + 1); if (NT_SUCCESS(Status)) { /* Free the old copy */ @@ -44,7 +48,7 @@ /* Set the new pointer */ ASSERT(NewSd); - ObjectHeader->SecurityDescriptor = NewSd; + ExInitializeFastReference(FastRef, NewSd); } /* Return status */ @@ -55,11 +59,22 @@ NTAPI ObDeassignSecurity(IN OUT PSECURITY_DESCRIPTOR *SecurityDescriptor) { - /* Dereference it */ - ObDereferenceSecurityDescriptor(*SecurityDescriptor, 1); - + EX_FAST_REF FastRef; + ULONG_PTR Count; + PSECURITY_DESCRIPTOR OldSecurityDescriptor; + + /* Get the fast reference and capture it */ + FastRef = *(PEX_FAST_REF)SecurityDescriptor; + /* Don't free again later */ *SecurityDescriptor = NULL; + + /* Get the descriptor and reference count */ + OldSecurityDescriptor = ExGetObjectFastReference(FastRef); + Count = ExGetCountFastReference(FastRef); + + /* Dereference the descriptor */ + ObDereferenceSecurityDescriptor(OldSecurityDescriptor, Count + 1); /* All done */ return STATUS_SUCCESS; @@ -109,6 +124,9 @@ NTSTATUS Status; POBJECT_HEADER ObjectHeader; PSECURITY_DESCRIPTOR OldDescriptor, NewDescriptor, CachedDescriptor; + PEX_FAST_REF FastRef; + EX_FAST_REF OldValue; + ULONG_PTR Count; PAGED_CODE(); /* Get the object header */ @@ -129,7 +147,9 @@ if (NT_SUCCESS(Status)) { /* Now add this to the cache */ - Status = ObLogSecurityDescriptor(NewDescriptor, &CachedDescriptor, 1); + Status = ObLogSecurityDescriptor(NewDescriptor, + &CachedDescriptor, + MAX_FAST_REFS + 1); /* Let go of our uncached copy */ ExFreePool(NewDescriptor); @@ -137,15 +157,34 @@ /* Check for success */ if (NT_SUCCESS(Status)) { - /* Dereference the old one */ - ASSERT(OldDescriptor == ObjectHeader->SecurityDescriptor); - - /* Now set this as the new descriptor */ - ObjectHeader->SecurityDescriptor = CachedDescriptor; - - /* And dereference the old one */ - ObDereferenceSecurityDescriptor(OldDescriptor, 1); - break; + /* Do the swap */ + FastRef = (PEX_FAST_REF)OutputSecurityDescriptor; + OldValue = ExCompareSwapFastReference(FastRef, + CachedDescriptor, + OldDescriptor); + + /* Get the security descriptor */ + SecurityDescriptor = ExGetObjectFastReference(OldValue); + Count = ExGetCountFastReference(OldValue); + + /* Make sure the swap worked */ + if (SecurityDescriptor == OldDescriptor) + { + /* Flush waiters */ + ObpAcquireObjectLock(ObjectHeader); + ObpReleaseObjectLock(ObjectHeader); + + /* And dereference the old one */ + ObDereferenceSecurityDescriptor(OldDescriptor, Count + 2); + break; + } + else + { + /* Someone changed it behind our back -- try again */ + ObDereferenceSecurityDescriptor(OldDescriptor, 1); + ObDereferenceSecurityDescriptor(CachedDescriptor, + MAX_FAST_REFS + 1); + } } else {

1 0

[gbrunmar] 39875: Added stubs for Direct3D 7, 8 and 9 tests in dxdiag.
by gbrunmar＠svn.reactos.org 04 Mar '09

04 Mar '09

Author: gbrunmar Date: Wed Mar 4 23:34:17 2009 New Revision: 39875 URL: http://svn.reactos.org/svn/reactos?rev=39875&view=rev Log: Added stubs for Direct3D 7, 8 and 9 tests in dxdiag. Added: trunk/reactos/base/applications/dxdiag/d3dtest.c (with props) trunk/reactos/base/applications/dxdiag/d3dtest7.c (with props) trunk/reactos/base/applications/dxdiag/d3dtest8.c (with props) trunk/reactos/base/applications/dxdiag/d3dtest9.c (with props) Modified: trunk/reactos/base/applications/dxdiag/ddtest.c 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/en-US.rc trunk/reactos/base/applications/dxdiag/precomp.h trunk/reactos/base/applications/dxdiag/resource.h trunk/reactos/base/applications/dxdiag/sound.c Added: trunk/reactos/base/applications/dxdiag/d3dtest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/d3dtest.c (added) +++ trunk/reactos/base/applications/dxdiag/d3dtest.c [iso-8859-1] Wed Mar 4 23:34:17 2009 @@ -1,0 +1,124 @@ +/* + * PROJECT: ReactX Diagnosis Application + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/dxdiag/d3dtest.c + * PURPOSE: ReactX Direct3D 7, 8 and 9 tests + * PROGRAMMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> + */ + +#include "precomp.h" + +#define WIDTH 800 +#define HEIGHT 600 + +BOOL D3D7Test(HWND hWnd); +BOOL D3D8Test(HWND hWnd); +BOOL D3D9Test(HWND hWnd); + +BOOL StartD3DTest(HWND hWnd, HINSTANCE hInstance, WCHAR* pszCaption, INT TestNr) +{ + WCHAR szTestDescriptionRaw[256]; + WCHAR szTestDescription[256]; + WCHAR szCaption[256]; + WCHAR szResult[256]; + WCHAR szError[256]; + BOOL Result; + + LoadStringW(hInstance, IDS_MAIN_DIALOG, szCaption, sizeof(szCaption) / sizeof(WCHAR)); + LoadStringW(hInstance, IDS_DDTEST_ERROR, szError, sizeof(szError) / sizeof(WCHAR)); + LoadStringW(hInstance, IDS_D3DTEST_D3Dx, szTestDescriptionRaw, sizeof(szTestDescriptionRaw) / sizeof(WCHAR)); + //LoadStringW(hInstance, resResult, szResult, sizeof(szResult) / sizeof(WCHAR)); + + swprintf(szTestDescription, szTestDescriptionRaw, TestNr); + if (MessageBox(NULL, szTestDescription, szCaption, MB_YESNO | MB_ICONQUESTION) == IDNO) + return FALSE; + + ShowWindow(hWnd, SW_SHOW); + + switch(TestNr){ + case 7: + Result = D3D7Test(hWnd); + break; + case 8: + Result = D3D8Test(hWnd); + break; + case 9: + Result = D3D9Test(hWnd); + break; + default: + Result = FALSE; + } + + ShowWindow(hWnd, SW_HIDE); + + if(!Result) + { + MessageBox(NULL, szError, szCaption, MB_OK | MB_ICONERROR); + return FALSE; + } + + if(MessageBox(NULL, szResult, szCaption, MB_YESNO | MB_ICONQUESTION) == IDYES) + return TRUE; + + return FALSE; +} + +static LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + return DefWindowProc(hWnd, msg, wParam, lParam); +} + +VOID D3DTests() +{ + WNDCLASSEX winClass; + HWND hWnd; + HINSTANCE hInstance = GetModuleHandle(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"d3dtest"; + 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) + goto cleanup; + + LoadStringW(hInstance, IDS_D3DTEST_DESCRIPTION, szDescription, sizeof(szDescription) / sizeof(WCHAR)); + LoadStringW(hInstance, IDS_MAIN_DIALOG, szCaption, sizeof(szCaption) / sizeof(WCHAR)); + if(MessageBox(NULL, szDescription, szCaption, MB_YESNO | MB_ICONQUESTION) == IDNO) + goto cleanup; + + StartD3DTest(hWnd, hInstance, szCaption, 7); + StartD3DTest(hWnd, hInstance, szCaption, 8); + StartD3DTest(hWnd, hInstance, szCaption, 9); + +cleanup: + DestroyWindow(hWnd); + UnregisterClass(winClass.lpszClassName, hInstance); +} Propchange: trunk/reactos/base/applications/dxdiag/d3dtest.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/dxdiag/d3dtest7.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/d3dtest7.c (added) +++ trunk/reactos/base/applications/dxdiag/d3dtest7.c [iso-8859-1] Wed Mar 4 23:34:17 2009 @@ -1,0 +1,15 @@ +/* + * PROJECT: ReactX Diagnosis Application + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/dxdiag/d3dtest7.c + * PURPOSE: ReactX Direct3D 7 tests + * PROGRAMMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> + */ + +#include "precomp.h" +#include <d3d.h> + +BOOL D3D7Test(HWND hWnd) +{ + return FALSE; +} Propchange: trunk/reactos/base/applications/dxdiag/d3dtest7.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/dxdiag/d3dtest8.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/d3dtest8.c (added) +++ trunk/reactos/base/applications/dxdiag/d3dtest8.c [iso-8859-1] Wed Mar 4 23:34:17 2009 @@ -1,0 +1,15 @@ +/* + * PROJECT: ReactX Diagnosis Application + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/dxdiag/d3dtest8.c + * PURPOSE: ReactX Direct3D 8 tests + * PROGRAMMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> + */ + +#include "precomp.h" +#include <d3d8.h> + +BOOL D3D8Test(HWND hWnd) +{ + return FALSE; +} Propchange: trunk/reactos/base/applications/dxdiag/d3dtest8.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/dxdiag/d3dtest9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/d3dtest9.c (added) +++ trunk/reactos/base/applications/dxdiag/d3dtest9.c [iso-8859-1] Wed Mar 4 23:34:17 2009 @@ -1,0 +1,15 @@ +/* + * PROJECT: ReactX Diagnosis Application + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/dxdiag/d3dtest9.c + * PURPOSE: ReactX Direct3D 9 tests + * PROGRAMMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> + */ + +#include "precomp.h" +#include <d3d9.h> + +BOOL D3D9Test(HWND hWnd) +{ + return FALSE; +} Propchange: trunk/reactos/base/applications/dxdiag/d3dtest9.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Wed Mar 4 23:34:17 2009 @@ -13,7 +13,7 @@ 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); -LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); +static LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); #define TEST_DURATION 10000 #define WIDTH 640 @@ -365,7 +365,7 @@ } } -LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static 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] Wed Mar 4 23:34:17 2009 @@ -8,6 +8,7 @@ */ #include "precomp.h" +#include <d3d9.h> #include <initguid.h> #include <devguid.h> @@ -379,9 +380,13 @@ switch(LOWORD(wParam)) { case IDC_BUTTON_TESTDD: + case IDC_BUTTON_TEST3D: GetWindowRect(pContext->hMainDialog, &rect); /* FIXME log result errors */ - DDTests(); + if (IDC_BUTTON_TESTDD == LOWORD(wParam)) + DDTests(); + else if (IDC_BUTTON_TEST3D == LOWORD(wParam)) + D3DTests(); SetWindowPos(pContext->hMainDialog, NULL, rect.left, rect.top, rect.right, rect.bottom, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); 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] Wed Mar 4 23:34:17 2009 @@ -28,5 +28,9 @@ <file>dxdiag.c</file> <file>dxdiag.rc</file> <file>ddtest.c</file> + <file>d3dtest.c</file> + <file>d3dtest7.c</file> + <file>d3dtest8.c</file> + <file>d3dtest9.c</file> <pch>precomp.h</pch> </module> 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] Wed Mar 4 23:34:17 2009 @@ -8,6 +8,7 @@ */ #include "precomp.h" +#include <dinput.h> typedef struct { 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] Wed Mar 4 23:34:17 2009 @@ -92,7 +92,7 @@ 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 + PUSHBUTTON "Test Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14 GROUPBOX "Notes", -1, 10, 180, 450, 40 EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP @@ -221,4 +221,6 @@ IDS_FORMAT_ADAPTER_MEM "%u MB" IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" IDS_OPTION_NO "No" -END + IDS_D3DTEST_DESCRIPTION "This will start Direct3D interface test. Continue?" + IDS_D3DTEST_D3Dx "This test will use hardware-accelerated Direct3D %u interface." +END 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] Wed Mar 4 23:34:17 2009 @@ -11,12 +11,8 @@ #include <mmsystem.h> #include <setupapi.h> #include <commctrl.h> -#include <dinput.h> -#include <d3d9.h> #include <ddraw.h> - -#include <dsound.h> #include <mmreg.h> #include <wintrust.h> #include <softpub.h> @@ -49,6 +45,9 @@ /* DirectDraw tests */ VOID DDTests(); +/* Direct3D tests */ +VOID D3DTests(); + /* DirectSound initialization */ void InitializeDirectSoundPage(PDXDIAG_CONTEXT pContext); 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] Wed Mar 4 23:34:17 2009 @@ -130,13 +130,15 @@ #define IDS_DDPRIMARY_DESCRIPTION 10118 #define IDS_DDPRIMARY_RESULT 10119 #define IDS_DDOFFSCREEN_DESCRIPTION 10120 -#define IDS_DDOFFSCREEN_RESULT 10121 +#define IDS_DDOFFSCREEN_RESULT 10121 #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 #define IDS_OPTION_NO 10127 +#define IDS_D3DTEST_DESCRIPTION 10128 +#define IDS_D3DTEST_D3Dx 10129 /* icon resource constants */ #define IDI_APPICON 20000 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] Wed Mar 4 23:34:17 2009 @@ -8,8 +8,8 @@ */ #include "precomp.h" -//#include <initguid.h> #include <devguid.h> +#include <dsound.h> #if 0 BOOL

1 0

[mkupfer] 39874: - modify hackfix DrawMenuBar function use user32 function instead of sending messages - DefWndNCPaint needs to split up and some parts have to move to subsystems to provide the menu functions independent of window non-client drawing
by mkupfer＠svn.reactos.org 04 Mar '09

04 Mar '09

Author: mkupfer Date: Wed Mar 4 22:35:58 2009 New Revision: 39874 URL: http://svn.reactos.org/svn/reactos?rev=39874&view=rev Log: - modify hackfix DrawMenuBar function use user32 function instead of sending messages - DefWndNCPaint needs to split up and some parts have to move to subsystems to provide the menu functions independent of window non-client drawing Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Wed Mar 4 22:35:58 2009 @@ -15,6 +15,8 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); + +LRESULT DefWndNCPaint(HWND hWnd, HRGN hRgn, BOOL Active); /* internal popup menu window messages */ #define MM_SETMENUHANDLE (WM_USER + 0) @@ -4048,7 +4050,8 @@ SWP_NOZORDER | SWP_FRAMECHANGED ); return TRUE;*/ // FIXME: hackfix - return SendMessage(hWnd,WM_NCPAINT,(WPARAM)1,(LPARAM)0L); + DefWndNCPaint(hWnd,(HRGN)-1,-1); + return TRUE; }

1 0

[arty] 39873: Using a lock inside a slab of memory to lock against moving the same memory is definitely a bug. This fixes it, but the intention of the previous code might not be what I thought it was. I won't be sad if this fix is reverted and something else takes its place.
by arty＠svn.reactos.org 04 Mar '09

04 Mar '09

Author: arty Date: Wed Mar 4 20:03:06 2009 New Revision: 39873 URL: http://svn.reactos.org/svn/reactos?rev=39873&view=rev Log: Using a lock inside a slab of memory to lock against moving the same memory is definitely a bug. This fixes it, but the intention of the previous code might not be what I thought it was. I won't be sad if this fix is reverted and something else takes its place. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Wed Mar 4 20:03:06 2009 @@ -29,6 +29,7 @@ /* DATA **********************************************************************/ PDRIVER_OBJECT IopRootDriverObject; +FAST_MUTEX IopBusTypeGuidListLock; PIO_BUS_TYPE_GUID_LIST IopBusTypeGuidList = NULL; #if defined (ALLOC_PRAGMA) @@ -279,7 +280,7 @@ PVOID NewList; /* Acquire the lock */ - ExAcquireFastMutex(&IopBusTypeGuidList->Lock); + ExAcquireFastMutex(&IopBusTypeGuidListLock); /* Loop all entries */ while (i < IopBusTypeGuidList->GuidCount) @@ -333,7 +334,7 @@ IopBusTypeGuidList->GuidCount++; Quickie: - ExReleaseFastMutex(&IopBusTypeGuidList->Lock); + ExReleaseFastMutex(&IopBusTypeGuidListLock); return FoundIndex; } @@ -2843,7 +2844,8 @@ DPRINT("PnpInit()\n"); KeInitializeSpinLock(&IopDeviceTreeLock); - + ExInitializeFastMutex(&IopBusTypeGuidListLock); + /* Initialize the Bus Type GUID List */ IopBusTypeGuidList = ExAllocatePool(PagedPool, sizeof(IO_BUS_TYPE_GUID_LIST)); if (!IopBusTypeGuidList) {

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
49
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2009