Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 18538: Forgot to change comment. Thanks to Royce3 for pointing it out.
by gvg＠svn.reactos.com 17 Oct '05

17 Oct '05

Forgot to change comment. Thanks to Royce3 for pointing it out. Modified: trunk/reactos/subsys/win32k/ntuser/window.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-10-17 22:09:18 UTC (rev 18537) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-10-17 22:13:44 UTC (rev 18538) @@ -2034,7 +2034,7 @@ ASSERT_REFS_CO(Window); //fixme: temp hack? - /* Check for owner thread and desktop window */ + /* Check for owner thread */ if ((Window->OwnerThread != PsGetCurrentThread())) { SetLastWin32Error(ERROR_ACCESS_DENIED);

1 0

[gvg] 18537: Merge from trunk.
by gvg＠svn.reactos.com 17 Oct '05

17 Oct '05

Merge from trunk. Patch by hardon. Properly handle 0 timeouts. Fixes bug 857. Modified: branches/ros-branch-0_2_8/reactos/drivers/net/afd/afd/select.c _____ Modified: branches/ros-branch-0_2_8/reactos/drivers/net/afd/afd/select.c --- branches/ros-branch-0_2_8/reactos/drivers/net/afd/afd/select.c 2005-10-17 22:08:07 UTC (rev 18536) +++ branches/ros-branch-0_2_8/reactos/drivers/net/afd/afd/select.c 2005-10-17 22:09:18 UTC (rev 18537) @@ -51,25 +51,28 @@ HandleArray[i].Status = 0; } -static VOID RemoveSelect( PAFD_ACTIVE_POLL Poll ) { - AFD_DbgPrint(MID_TRACE,("Called\n")); - RemoveEntryList( &Poll->ListEntry ); - KeCancelTimer( &Poll->Timer ); - - ExFreePool( Poll ); - - AFD_DbgPrint(MID_TRACE,("Done\n")); -} - -static VOID SignalSocket( PAFD_ACTIVE_POLL Poll, PAFD_POLL_INFO PollReq, - NTSTATUS Status ) { +/* you must pass either Poll OR Irp */ +static VOID SignalSocket( + PAFD_ACTIVE_POLL Poll OPTIONAL, + PIRP _Irp OPTIONAL, + PAFD_POLL_INFO PollReq, + NTSTATUS Status + ) +{ UINT i; - PIRP Irp = Poll->Irp; + PIRP Irp = _Irp ? _Irp : Poll->Irp; AFD_DbgPrint(MID_TRACE,("Called (Status %x)\n", Status)); - KeCancelTimer( &Poll->Timer ); - Poll->Irp->IoStatus.Status = Status; - Poll->Irp->IoStatus.Information = + + if (Poll) + { + KeCancelTimer( &Poll->Timer ); + RemoveEntryList( &Poll->ListEntry ); + ExFreePool( Poll ); + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = FIELD_OFFSET(AFD_POLL_INFO, Handles) + sizeof(AFD_HANDLE) * PollReq->HandleCount; CopyBackStatus( PollReq->Handles, PollReq->HandleCount ); @@ -84,8 +87,6 @@ UnlockHandles( AFD_HANDLES(PollReq), PollReq->HandleCount ); AFD_DbgPrint(MID_TRACE,("Completing\n")); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); - RemoveEntryList( &Poll->ListEntry ); - RemoveSelect( Poll ); AFD_DbgPrint(MID_TRACE,("Done\n")); } @@ -108,7 +109,7 @@ ZeroEvents( PollReq->Handles, PollReq->HandleCount ); KeAcquireSpinLock( &DeviceExt->Lock, &OldIrql ); - SignalSocket( Poll, PollReq, STATUS_TIMEOUT ); + SignalSocket( Poll, NULL, PollReq, STATUS_TIMEOUT ); KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); AFD_DbgPrint(MID_TRACE,("Timeout\n")); @@ -143,7 +144,7 @@ if( (PVOID)HandleArray[i].Handle == FileObject && (!OnlyExclusive || (OnlyExclusive && Poll->Exclusive)) ) { ZeroEvents( PollReq->Handles, PollReq->HandleCount ); - SignalSocket( Poll, PollReq, STATUS_SUCCESS ); + SignalSocket( Poll, NULL, PollReq, STATUS_SUCCESS ); } } } @@ -161,7 +162,6 @@ PFILE_OBJECT FileObject; PAFD_POLL_INFO PollReq = Irp->AssociatedIrp.SystemBuffer; PAFD_DEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension; - PAFD_ACTIVE_POLL Poll = NULL; UINT CopySize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; UINT AllocSize = CopySize + sizeof(AFD_ACTIVE_POLL) - sizeof(AFD_POLL_INFO); @@ -196,22 +196,7 @@ ZeroEvents( PollReq->Handles, PollReq->HandleCount ); - Poll = ExAllocatePool( NonPagedPool, AllocSize ); - - if( Poll ) { - Poll->Irp = Irp; - Poll->DeviceExt = DeviceExt; - Poll->Exclusive = Exclusive; - - KeInitializeTimerEx( &Poll->Timer, NotificationTimer ); - KeSetTimer( &Poll->Timer, PollReq->Timeout, &Poll->TimeoutDpc ); - - KeInitializeDpc( (PRKDPC)&Poll->TimeoutDpc, - (PKDEFERRED_ROUTINE)SelectTimeout, - Poll ); - KeAcquireSpinLock( &DeviceExt->Lock, &OldIrql ); - InsertTailList( &DeviceExt->Polls, &Poll->ListEntry ); for( i = 0; i < PollReq->HandleCount; i++ ) { if( !AFD_HANDLES(PollReq)[i].Handle ) continue; @@ -243,14 +228,37 @@ if( Signalled ) { Status = STATUS_SUCCESS; Irp->IoStatus.Status = Status; - SignalSocket( Poll, PollReq, Status ); + SignalSocket( NULL, Irp, PollReq, Status ); } else { - Status = STATUS_PENDING; - IoMarkIrpPending( Irp ); + + PAFD_ACTIVE_POLL Poll = NULL; + + Poll = ExAllocatePool( NonPagedPool, AllocSize ); + + if (Poll){ + Poll->Irp = Irp; + Poll->DeviceExt = DeviceExt; + Poll->Exclusive = Exclusive; + + KeInitializeTimerEx( &Poll->Timer, NotificationTimer ); + + KeInitializeDpc( (PRKDPC)&Poll->TimeoutDpc, + (PKDEFERRED_ROUTINE)SelectTimeout, + Poll ); + + InsertTailList( &DeviceExt->Polls, &Poll->ListEntry ); + + KeSetTimer( &Poll->Timer, PollReq->Timeout, &Poll->TimeoutDpc ); + + Status = STATUS_PENDING; + IoMarkIrpPending( Irp ); + } else { + AFD_DbgPrint(MAX_TRACE, ("FIXME: do something with the IRP!\n")); + Status = STATUS_NO_MEMORY; + } } KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); - } else Status = STATUS_NO_MEMORY; AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); @@ -400,7 +408,7 @@ if( UpdatePollWithFCB( Poll, FileObject ) ) { ThePollEnt = ThePollEnt->Flink; AFD_DbgPrint(MID_TRACE,("Signalling socket\n")); - SignalSocket( Poll, PollReq, STATUS_SUCCESS ); + SignalSocket( Poll, NULL, PollReq, STATUS_SUCCESS ); } else ThePollEnt = ThePollEnt->Flink; }

1 0

[gvg] 18536: Patch by hardon. Properly handle 0 timeouts. Fixes bug 857.
by gvg＠svn.reactos.com 17 Oct '05

17 Oct '05

Patch by hardon. Properly handle 0 timeouts. Fixes bug 857. Modified: trunk/reactos/drivers/net/afd/afd/select.c _____ Modified: trunk/reactos/drivers/net/afd/afd/select.c --- trunk/reactos/drivers/net/afd/afd/select.c 2005-10-17 22:00:42 UTC (rev 18535) +++ trunk/reactos/drivers/net/afd/afd/select.c 2005-10-17 22:08:07 UTC (rev 18536) @@ -51,25 +51,28 @@ HandleArray[i].Status = 0; } -static VOID RemoveSelect( PAFD_ACTIVE_POLL Poll ) { - AFD_DbgPrint(MID_TRACE,("Called\n")); - RemoveEntryList( &Poll->ListEntry ); - KeCancelTimer( &Poll->Timer ); - - ExFreePool( Poll ); - - AFD_DbgPrint(MID_TRACE,("Done\n")); -} - -static VOID SignalSocket( PAFD_ACTIVE_POLL Poll, PAFD_POLL_INFO PollReq, - NTSTATUS Status ) { +/* you must pass either Poll OR Irp */ +static VOID SignalSocket( + PAFD_ACTIVE_POLL Poll OPTIONAL, + PIRP _Irp OPTIONAL, + PAFD_POLL_INFO PollReq, + NTSTATUS Status + ) +{ UINT i; - PIRP Irp = Poll->Irp; + PIRP Irp = _Irp ? _Irp : Poll->Irp; AFD_DbgPrint(MID_TRACE,("Called (Status %x)\n", Status)); - KeCancelTimer( &Poll->Timer ); - Poll->Irp->IoStatus.Status = Status; - Poll->Irp->IoStatus.Information = + + if (Poll) + { + KeCancelTimer( &Poll->Timer ); + RemoveEntryList( &Poll->ListEntry ); + ExFreePool( Poll ); + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = FIELD_OFFSET(AFD_POLL_INFO, Handles) + sizeof(AFD_HANDLE) * PollReq->HandleCount; CopyBackStatus( PollReq->Handles, PollReq->HandleCount ); @@ -84,8 +87,6 @@ UnlockHandles( AFD_HANDLES(PollReq), PollReq->HandleCount ); AFD_DbgPrint(MID_TRACE,("Completing\n")); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); - RemoveEntryList( &Poll->ListEntry ); - RemoveSelect( Poll ); AFD_DbgPrint(MID_TRACE,("Done\n")); } @@ -108,7 +109,7 @@ ZeroEvents( PollReq->Handles, PollReq->HandleCount ); KeAcquireSpinLock( &DeviceExt->Lock, &OldIrql ); - SignalSocket( Poll, PollReq, STATUS_TIMEOUT ); + SignalSocket( Poll, NULL, PollReq, STATUS_TIMEOUT ); KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); AFD_DbgPrint(MID_TRACE,("Timeout\n")); @@ -143,7 +144,7 @@ if( (PVOID)HandleArray[i].Handle == FileObject && (!OnlyExclusive || (OnlyExclusive && Poll->Exclusive)) ) { ZeroEvents( PollReq->Handles, PollReq->HandleCount ); - SignalSocket( Poll, PollReq, STATUS_SUCCESS ); + SignalSocket( Poll, NULL, PollReq, STATUS_SUCCESS ); } } } @@ -161,7 +162,6 @@ PFILE_OBJECT FileObject; PAFD_POLL_INFO PollReq = Irp->AssociatedIrp.SystemBuffer; PAFD_DEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension; - PAFD_ACTIVE_POLL Poll = NULL; UINT CopySize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; UINT AllocSize = CopySize + sizeof(AFD_ACTIVE_POLL) - sizeof(AFD_POLL_INFO); @@ -196,22 +196,7 @@ ZeroEvents( PollReq->Handles, PollReq->HandleCount ); - Poll = ExAllocatePool( NonPagedPool, AllocSize ); - - if( Poll ) { - Poll->Irp = Irp; - Poll->DeviceExt = DeviceExt; - Poll->Exclusive = Exclusive; - - KeInitializeTimerEx( &Poll->Timer, NotificationTimer ); - KeSetTimer( &Poll->Timer, PollReq->Timeout, &Poll->TimeoutDpc ); - - KeInitializeDpc( (PRKDPC)&Poll->TimeoutDpc, - (PKDEFERRED_ROUTINE)SelectTimeout, - Poll ); - KeAcquireSpinLock( &DeviceExt->Lock, &OldIrql ); - InsertTailList( &DeviceExt->Polls, &Poll->ListEntry ); for( i = 0; i < PollReq->HandleCount; i++ ) { if( !AFD_HANDLES(PollReq)[i].Handle ) continue; @@ -243,14 +228,37 @@ if( Signalled ) { Status = STATUS_SUCCESS; Irp->IoStatus.Status = Status; - SignalSocket( Poll, PollReq, Status ); + SignalSocket( NULL, Irp, PollReq, Status ); } else { - Status = STATUS_PENDING; - IoMarkIrpPending( Irp ); + + PAFD_ACTIVE_POLL Poll = NULL; + + Poll = ExAllocatePool( NonPagedPool, AllocSize ); + + if (Poll){ + Poll->Irp = Irp; + Poll->DeviceExt = DeviceExt; + Poll->Exclusive = Exclusive; + + KeInitializeTimerEx( &Poll->Timer, NotificationTimer ); + + KeInitializeDpc( (PRKDPC)&Poll->TimeoutDpc, + (PKDEFERRED_ROUTINE)SelectTimeout, + Poll ); + + InsertTailList( &DeviceExt->Polls, &Poll->ListEntry ); + + KeSetTimer( &Poll->Timer, PollReq->Timeout, &Poll->TimeoutDpc ); + + Status = STATUS_PENDING; + IoMarkIrpPending( Irp ); + } else { + AFD_DbgPrint(MAX_TRACE, ("FIXME: do something with the IRP!\n")); + Status = STATUS_NO_MEMORY; + } } KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); - } else Status = STATUS_NO_MEMORY; AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); @@ -400,7 +408,7 @@ if( UpdatePollWithFCB( Poll, FileObject ) ) { ThePollEnt = ThePollEnt->Flink; AFD_DbgPrint(MID_TRACE,("Signalling socket\n")); - SignalSocket( Poll, PollReq, STATUS_SUCCESS ); + SignalSocket( Poll, NULL, PollReq, STATUS_SUCCESS ); } else ThePollEnt = ThePollEnt->Flink; }

1 0

[gvg] 18535: Merge from trunk.
by gvg＠svn.reactos.com 17 Oct '05

17 Oct '05

Merge from trunk. Everything must come to an end, even the desktop window. Fixes bug 805. Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/window.c _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/window.c --- branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/window.c 2005-10-17 21:57:02 UTC (rev 18534) +++ branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/window.c 2005-10-17 22:00:42 UTC (rev 18535) @@ -2035,7 +2035,7 @@ ASSERT_REFS_CO(Window); //fixme: temp hack? /* Check for owner thread and desktop window */ - if ((Window->OwnerThread != PsGetCurrentThread()) || IntIsDesktopWindow(Window)) + if ((Window->OwnerThread != PsGetCurrentThread())) { SetLastWin32Error(ERROR_ACCESS_DENIED); return FALSE; @@ -2103,7 +2103,8 @@ HWND *ChildHandle; PWINDOW_OBJECT Child, Desktop; - Desktop = UserGetWindowObject(IntGetDesktopWindow()); + Desktop = IntIsDesktopWindow(Window) ? Window : + UserGetWindowObject(IntGetDesktopWindow()); Children = IntWinListChildren(Desktop); if (Children)

1 0

[gvg] 18534: Everything must come to an end, even the desktop window. Fixes bug 805.
by gvg＠svn.reactos.com 17 Oct '05

17 Oct '05

Everything must come to an end, even the desktop window. Fixes bug 805. Modified: trunk/reactos/subsys/win32k/ntuser/window.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-10-17 21:48:12 UTC (rev 18533) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-10-17 21:57:02 UTC (rev 18534) @@ -2035,7 +2035,7 @@ ASSERT_REFS_CO(Window); //fixme: temp hack? /* Check for owner thread and desktop window */ - if ((Window->OwnerThread != PsGetCurrentThread()) || IntIsDesktopWindow(Window)) + if ((Window->OwnerThread != PsGetCurrentThread())) { SetLastWin32Error(ERROR_ACCESS_DENIED); return FALSE; @@ -2103,7 +2103,8 @@ HWND *ChildHandle; PWINDOW_OBJECT Child, Desktop; - Desktop = UserGetWindowObject(IntGetDesktopWindow()); + Desktop = IntIsDesktopWindow(Window) ? Window : + UserGetWindowObject(IntGetDesktopWindow()); Children = IntWinListChildren(Desktop); if (Children)

1 0

[gvg] 18533: Merge from trunk.
by gvg＠svn.reactos.com 17 Oct '05

17 Oct '05

Merge from trunk. Inform HAL about the switch to graphics modeas late as possible. Fixes bug 880. Modified: branches/ros-branch-0_2_8/reactos/drivers/video/videoprt/dispatch.c Modified: branches/ros-branch-0_2_8/reactos/drivers/video/videoprt/videoprt.c Modified: branches/ros-branch-0_2_8/reactos/drivers/video/videoprt/videoprt.h Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/objects/dc.c _____ Modified: branches/ros-branch-0_2_8/reactos/drivers/video/videoprt/dispatch.c --- branches/ros-branch-0_2_8/reactos/drivers/video/videoprt/dispatch.c 2005-10-17 21:47:17 UTC (rev 18532) +++ branches/ros-branch-0_2_8/reactos/drivers/video/videoprt/dispatch.c 2005-10-17 21:48:12 UTC (rev 18533) @@ -18,7 +18,6 @@ * If not, write to the Free Software Foundation, * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id$ */ #include "videoprt.h" @@ -133,18 +132,6 @@ Irp->IoStatus.Status = STATUS_SUCCESS; InterlockedIncrement((PLONG)&DeviceExtension->DeviceOpened); - - /* - * Storing the device extension pointer in a static variable is an - * ugly hack. Unfortunately, we need it in VideoPortResetDisplayParameters - * and HalAcquireDisplayOwnership doesn't allow us to pass a userdata - * parameter. On the bright side, the DISPLAY device is opened - * exclusively, so there can be only one device extension active at - * any point in time. - */ - - ResetDisplayParametersDeviceExtension = DeviceExtension; - HalAcquireDisplayOwnership(IntVideoPortResetDisplayParameters); } else { @@ -264,7 +251,57 @@ return Status; } +/* + * IntVideoPortWrite + * + * This is a bit of a hack. We want to take ownership of the display as late + * as possible, just before the switch to graphics mode. Win32k knows when + * this happens, we don't. So we need Win32k to inform us. This could be done + * using an IOCTL, but there's no way of knowing which IOCTL codes are unused + * in the communication between GDI driver and miniport driver. So we use + * IRP_MJ_WRITE as the signal that win32k is ready to switch to graphics mode, + * since we know for certain that there is no read/write activity going on + * between GDI and miniport drivers. + * We don't actually need the data that is passed, we just trigger on the fact + * that an IRP_MJ_WRITE was sent. + * + * Run Level + * PASSIVE_LEVEL + */ + NTSTATUS NTAPI +IntVideoPortDispatchWrite( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION piosStack = IoGetCurrentIrpStackLocation(Irp); + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; + NTSTATUS nErrCode; + + DeviceExtension = (PVIDEO_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* + * Storing the device extension pointer in a static variable is an + * ugly hack. Unfortunately, we need it in VideoPortResetDisplayParameters + * and HalAcquireDisplayOwnership doesn't allow us to pass a userdata + * parameter. On the bright side, the DISPLAY device is opened + * exclusively, so there can be only one device extension active at + * any point in time. + */ + + ResetDisplayParametersDeviceExtension = DeviceExtension; + HalAcquireDisplayOwnership(IntVideoPortResetDisplayParameters); + + nErrCode = STATUS_SUCCESS; + Irp->IoStatus.Information = piosStack->Parameters.Write.Length; + Irp->IoStatus.Status = nErrCode; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return nErrCode; +} + + +NTSTATUS NTAPI IntVideoPortPnPStartDevice( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) _____ Modified: branches/ros-branch-0_2_8/reactos/drivers/video/videoprt/videoprt.c --- branches/ros-branch-0_2_8/reactos/drivers/video/videoprt/videoprt.c 2005-10-17 21:47:17 UTC (rev 18532) +++ branches/ros-branch-0_2_8/reactos/drivers/video/videoprt/videoprt.c 2005-10-17 21:48:12 UTC (rev 18533) @@ -646,6 +646,7 @@ DriverObject->MajorFunction[IRP_MJ_CREATE] = IntVideoPortDispatchOpen; DriverObject->MajorFunction[IRP_MJ_CLOSE] = IntVideoPortDispatchClose; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = IntVideoPortDispatchDeviceControl; + DriverObject->MajorFunction[IRP_MJ_WRITE] = IntVideoPortDispatchWrite; DriverObject->DriverUnload = IntVideoPortUnload; /* _____ Modified: branches/ros-branch-0_2_8/reactos/drivers/video/videoprt/videoprt.h --- branches/ros-branch-0_2_8/reactos/drivers/video/videoprt/videoprt.h 2005-10-17 21:47:17 UTC (rev 18532) +++ branches/ros-branch-0_2_8/reactos/drivers/video/videoprt/videoprt.h 2005-10-17 21:48:12 UTC (rev 18533) @@ -148,6 +148,11 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI +IntVideoPortDispatchWrite( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + VOID NTAPI IntVideoPortUnload(PDRIVER_OBJECT DriverObject); _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/objects/dc.c --- branches/ros-branch-0_2_8/reactos/subsys/win32k/objects/dc.c 2005-10-17 21:47:17 UTC (rev 18532) +++ branches/ros-branch-0_2_8/reactos/subsys/win32k/objects/dc.c 2005-10-17 21:48:12 UTC (rev 18533) @@ -661,6 +661,61 @@ return (PrimarySurface.PreparedDriver ? TRUE : IntPrepareDriver()); } +static BOOL FASTCALL +PrepareVideoPrt() +{ + PIRP Irp; + NTSTATUS Status; + IO_STATUS_BLOCK Iosb; + BOOL Prepare = TRUE; + ULONG Length = sizeof(BOOL); + PIO_STACK_LOCATION StackPtr; + LARGE_INTEGER StartOffset; + PFILE_OBJECT FileObject = PrimarySurface.VideoFileObject; + PDEVICE_OBJECT DeviceObject = FileObject->DeviceObject; + + DPRINT("PrepareVideoPrt() called\n"); + + KeClearEvent(&PrimarySurface.VideoFileObject->Event); + + ObReferenceObjectByPointer(FileObject, 0, IoFileObjectType, KernelMode); + + StartOffset.QuadPart = 0; + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_WRITE, + DeviceObject, + (PVOID) &Prepare, + Length, + &StartOffset, + NULL, + &Iosb); + if (NULL == Irp) + { + return FALSE; + } + + /* Set up IRP Data */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = KernelMode; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; + Irp->Overlay.AsynchronousParameters.UserApcContext = NULL; + Irp->Flags |= IRP_WRITE_OPERATION; + + /* Setup Stack Data */ + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->FileObject = PrimarySurface.VideoFileObject; + StackPtr->Parameters.Write.Key = 0; + + Status = IoCallDriver(DeviceObject, Irp); + + if (STATUS_PENDING == Status) + { + KeWaitForSingleObject(&FileObject->Event, Executive, KernelMode, TRUE, 0); + Status = Iosb.Status; + } + + return NT_SUCCESS(Status); +} + BOOL FASTCALL IntCreatePrimarySurface() { @@ -674,6 +729,11 @@ return FALSE; } + if (! PrepareVideoPrt()) + { + return FALSE; + } + DPRINT("calling EnableSurface\n"); /* Enable the drawing surface */ PrimarySurface.Handle =

1 0

[greatlrd] 18532: New icons from our UI:mf
by greatlrd＠svn.reactos.com 17 Oct '05

17 Oct '05

New icons from our UI:mf Modified: trunk/reactos/lib/user32/resources/oic_bang.ico Modified: trunk/reactos/lib/user32/resources/oic_hand.ico Modified: trunk/reactos/lib/user32/resources/oic_note.ico Modified: trunk/reactos/lib/user32/resources/oic_ques.ico _____ Modified: trunk/reactos/lib/user32/resources/oic_bang.ico (Binary files differ) _____ Modified: trunk/reactos/lib/user32/resources/oic_hand.ico (Binary files differ) _____ Modified: trunk/reactos/lib/user32/resources/oic_note.ico (Binary files differ) _____ Modified: trunk/reactos/lib/user32/resources/oic_ques.ico (Binary files differ)

1 0

[gvg] 18531: Should have committed this along with r18529
by gvg＠svn.reactos.com 17 Oct '05

17 Oct '05

Should have committed this along with r18529 Modified: trunk/reactos/subsys/win32k/objects/dc.c _____ Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2005-10-17 21:40:38 UTC (rev 18530) +++ trunk/reactos/subsys/win32k/objects/dc.c 2005-10-17 21:40:37 UTC (rev 18531) @@ -661,6 +661,61 @@ return (PrimarySurface.PreparedDriver ? TRUE : IntPrepareDriver()); } +static BOOL FASTCALL +PrepareVideoPrt() +{ + PIRP Irp; + NTSTATUS Status; + IO_STATUS_BLOCK Iosb; + BOOL Prepare = TRUE; + ULONG Length = sizeof(BOOL); + PIO_STACK_LOCATION StackPtr; + LARGE_INTEGER StartOffset; + PFILE_OBJECT FileObject = PrimarySurface.VideoFileObject; + PDEVICE_OBJECT DeviceObject = FileObject->DeviceObject; + + DPRINT("PrepareVideoPrt() called\n"); + + KeClearEvent(&PrimarySurface.VideoFileObject->Event); + + ObReferenceObjectByPointer(FileObject, 0, IoFileObjectType, KernelMode); + + StartOffset.QuadPart = 0; + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_WRITE, + DeviceObject, + (PVOID) &Prepare, + Length, + &StartOffset, + NULL, + &Iosb); + if (NULL == Irp) + { + return FALSE; + } + + /* Set up IRP Data */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = KernelMode; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; + Irp->Overlay.AsynchronousParameters.UserApcContext = NULL; + Irp->Flags |= IRP_WRITE_OPERATION; + + /* Setup Stack Data */ + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->FileObject = PrimarySurface.VideoFileObject; + StackPtr->Parameters.Write.Key = 0; + + Status = IoCallDriver(DeviceObject, Irp); + + if (STATUS_PENDING == Status) + { + KeWaitForSingleObject(&FileObject->Event, Executive, KernelMode, TRUE, 0); + Status = Iosb.Status; + } + + return NT_SUCCESS(Status); +} + BOOL FASTCALL IntCreatePrimarySurface() { @@ -674,6 +729,11 @@ return FALSE; } + if (! PrepareVideoPrt()) + { + return FALSE; + } + DPRINT("calling EnableSurface\n"); /* Enable the drawing surface */ PrimarySurface.Handle =

1 0

[gvg] 18529: Inform HAL about the switch to graphics mode as late as possible. Fixes bug 880.
by gvg＠svn.reactos.com 17 Oct '05

17 Oct '05

Inform HAL about the switch to graphics mode as late as possible. Fixes bug 880. Modified: trunk/reactos/drivers/video/videoprt/dispatch.c Modified: trunk/reactos/drivers/video/videoprt/videoprt.c Modified: trunk/reactos/drivers/video/videoprt/videoprt.h _____ Modified: trunk/reactos/drivers/video/videoprt/dispatch.c --- trunk/reactos/drivers/video/videoprt/dispatch.c 2005-10-17 20:11:21 UTC (rev 18528) +++ trunk/reactos/drivers/video/videoprt/dispatch.c 2005-10-17 21:36:23 UTC (rev 18529) @@ -18,7 +18,6 @@ * If not, write to the Free Software Foundation, * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id$ */ #include "videoprt.h" @@ -133,18 +132,6 @@ Irp->IoStatus.Status = STATUS_SUCCESS; InterlockedIncrement((PLONG)&DeviceExtension->DeviceOpened); - - /* - * Storing the device extension pointer in a static variable is an - * ugly hack. Unfortunately, we need it in VideoPortResetDisplayParameters - * and HalAcquireDisplayOwnership doesn't allow us to pass a userdata - * parameter. On the bright side, the DISPLAY device is opened - * exclusively, so there can be only one device extension active at - * any point in time. - */ - - ResetDisplayParametersDeviceExtension = DeviceExtension; - HalAcquireDisplayOwnership(IntVideoPortResetDisplayParameters); } else { @@ -264,7 +251,57 @@ return Status; } +/* + * IntVideoPortWrite + * + * This is a bit of a hack. We want to take ownership of the display as late + * as possible, just before the switch to graphics mode. Win32k knows when + * this happens, we don't. So we need Win32k to inform us. This could be done + * using an IOCTL, but there's no way of knowing which IOCTL codes are unused + * in the communication between GDI driver and miniport driver. So we use + * IRP_MJ_WRITE as the signal that win32k is ready to switch to graphics mode, + * since we know for certain that there is no read/write activity going on + * between GDI and miniport drivers. + * We don't actually need the data that is passed, we just trigger on the fact + * that an IRP_MJ_WRITE was sent. + * + * Run Level + * PASSIVE_LEVEL + */ + NTSTATUS NTAPI +IntVideoPortDispatchWrite( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION piosStack = IoGetCurrentIrpStackLocation(Irp); + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; + NTSTATUS nErrCode; + + DeviceExtension = (PVIDEO_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* + * Storing the device extension pointer in a static variable is an + * ugly hack. Unfortunately, we need it in VideoPortResetDisplayParameters + * and HalAcquireDisplayOwnership doesn't allow us to pass a userdata + * parameter. On the bright side, the DISPLAY device is opened + * exclusively, so there can be only one device extension active at + * any point in time. + */ + + ResetDisplayParametersDeviceExtension = DeviceExtension; + HalAcquireDisplayOwnership(IntVideoPortResetDisplayParameters); + + nErrCode = STATUS_SUCCESS; + Irp->IoStatus.Information = piosStack->Parameters.Write.Length; + Irp->IoStatus.Status = nErrCode; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return nErrCode; +} + + +NTSTATUS NTAPI IntVideoPortPnPStartDevice( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) _____ Modified: trunk/reactos/drivers/video/videoprt/videoprt.c --- trunk/reactos/drivers/video/videoprt/videoprt.c 2005-10-17 20:11:21 UTC (rev 18528) +++ trunk/reactos/drivers/video/videoprt/videoprt.c 2005-10-17 21:36:23 UTC (rev 18529) @@ -646,6 +646,7 @@ DriverObject->MajorFunction[IRP_MJ_CREATE] = IntVideoPortDispatchOpen; DriverObject->MajorFunction[IRP_MJ_CLOSE] = IntVideoPortDispatchClose; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = IntVideoPortDispatchDeviceControl; + DriverObject->MajorFunction[IRP_MJ_WRITE] = IntVideoPortDispatchWrite; DriverObject->DriverUnload = IntVideoPortUnload; /* _____ Modified: trunk/reactos/drivers/video/videoprt/videoprt.h --- trunk/reactos/drivers/video/videoprt/videoprt.h 2005-10-17 20:11:21 UTC (rev 18528) +++ trunk/reactos/drivers/video/videoprt/videoprt.h 2005-10-17 21:36:23 UTC (rev 18529) @@ -148,6 +148,11 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI +IntVideoPortDispatchWrite( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + VOID NTAPI IntVideoPortUnload(PDRIVER_OBJECT DriverObject);

1 0

[gdalsnes] 18528: -dont return NULL when realloc to 0 bytes (fixes one kernel32_winetest heap test)
by gdalsnes＠svn.reactos.com 17 Oct '05

17 Oct '05

-dont return NULL when realloc to 0 bytes (fixes one kernel32_winetest heap test) -only allow realloc to new position if GMEM_MOVEABLE is passed (fixed mem) -only allow realloc to new position if GMEM_MOVEABLE is passed OR mem is not locked (moveable mem) Modified: trunk/reactos/lib/kernel32/mem/global.c _____ Modified: trunk/reactos/lib/kernel32/mem/global.c --- trunk/reactos/lib/kernel32/mem/global.c 2005-10-17 19:29:51 UTC (rev 18527) +++ trunk/reactos/lib/kernel32/mem/global.c 2005-10-17 20:11:21 UTC (rev 18528) @@ -536,6 +536,11 @@ { if(ISPOINTER(hMem)) { + if (!(uFlags & GMEM_MOVEABLE)) + { + heap_flags |= HEAP_REALLOC_IN_PLACE_ONLY; + } + /* reallocate fixed memory */ hnew = (HANDLE)RtlReAllocateHeap(GetProcessHeap(), heap_flags, (LPVOID) hMem, dwBytes); } @@ -543,37 +548,47 @@ { /* reallocate a moveable block */ phandle= HANDLE_TO_INTERN(hMem); + hnew = hMem; + if (0 != dwBytes) { - hnew = hMem; - if(phandle->Pointer) - { - palloc = RtlReAllocateHeap(GetProcessHeap(), heap_flags, - (PVOID)((ULONG_PTR)phandle->Pointer - HANDLE_SIZE), - dwBytes + HANDLE_SIZE); - if (0 == palloc) - { - hnew = 0; - } - else - { - *(PHANDLE)palloc = hMem; - phandle->Pointer = (PVOID)((ULONG_PTR)palloc + HANDLE_SIZE); - } - } - else - { - palloc = RtlAllocateHeap(GetProcessHeap(), heap_flags, dwBytes + HANDLE_SIZE); - if (0 == palloc) - { - hnew = 0; - } - else - { - *(PHANDLE)palloc = hMem; - phandle->Pointer = (PVOID)((ULONG_PTR)palloc + HANDLE_SIZE); - } - } + if(phandle->Pointer) + { + + if (phandle->LockCount && !(uFlags & GMEM_MOVEABLE)) + { + /* Locked memory cant normally move but the MEM_MOVEABLE flag + * override this behaviour. But in this case that flag was not passed. + */ + heap_flags |= HEAP_REALLOC_IN_PLACE_ONLY; + } + + palloc = RtlReAllocateHeap(GetProcessHeap(), heap_flags, + (PVOID)((ULONG_PTR)phandle->Pointer - HANDLE_SIZE), + dwBytes + HANDLE_SIZE); + if (0 == palloc) + { + hnew = 0; + } + else + { + *(PHANDLE)palloc = hMem; + phandle->Pointer = (PVOID)((ULONG_PTR)palloc + HANDLE_SIZE); + } + } + else + { + palloc = RtlAllocateHeap(GetProcessHeap(), heap_flags, dwBytes + HANDLE_SIZE); + if (0 == palloc) + { + hnew = 0; + } + else + { + *(PHANDLE)palloc = hMem; + phandle->Pointer = (PVOID)((ULONG_PTR)palloc + HANDLE_SIZE); + } + } } else { @@ -585,6 +600,7 @@ } } } + HeapUnlock(GetProcessHeap()); return hnew;

1 0

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