Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 69481: [MSFS] MessageEvent is no longer used, remove it
by pschweitzer＠svn.reactos.org 10 Oct '15

10 Oct '15

Author: pschweitzer Date: Sat Oct 10 12:16:17 2015 New Revision: 69481 URL: http://svn.reactos.org/svn/reactos?rev=69481&view=rev Log: [MSFS] MessageEvent is no longer used, remove it Modified: trunk/reactos/drivers/filesystems/msfs/create.c trunk/reactos/drivers/filesystems/msfs/msfs.h trunk/reactos/drivers/filesystems/msfs/rw.c Modified: trunk/reactos/drivers/filesystems/msfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/create.c [iso-8859-1] Sat Oct 10 12:16:17 2015 @@ -177,9 +177,6 @@ Fcb->MaxMessageSize = Buffer->MaximumMessageSize; Fcb->MessageCount = 0; Fcb->TimeOut = Buffer->ReadTimeout; - KeInitializeEvent(&Fcb->MessageEvent, - NotificationEvent, - FALSE); InitializeListHead(&Fcb->MessageListHead); KeInitializeSpinLock(&Fcb->MessageListLock); Modified: trunk/reactos/drivers/filesystems/msfs/msfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] Sat Oct 10 12:16:17 2015 @@ -31,7 +31,6 @@ struct _MSFS_CCB *ServerCcb; ULONG ReferenceCount; LARGE_INTEGER TimeOut; - KEVENT MessageEvent; ULONG MaxMessageSize; ULONG MessageCount; KSPIN_LOCK MessageListLock; Modified: trunk/reactos/drivers/filesystems/msfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] Sat Oct 10 12:16:17 2015 @@ -75,10 +75,6 @@ ExFreePoolWithTag(Message, 'rFsM'); Fcb->MessageCount--; - if (Fcb->MessageCount == 0) - { - KeClearEvent(&Fcb->MessageEvent); - } Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = LengthRead; @@ -191,12 +187,6 @@ KeReleaseSpinLock(&Fcb->MessageListLock, oldIrql); Fcb->MessageCount++; - if (Fcb->MessageCount == 1) - { - KeSetEvent(&Fcb->MessageEvent, - 0, - FALSE); - } if (Fcb->WaitCount > 0) {

1 0

[pschweitzer] 69480: [MSFS] Prevent a race condition on reading message from list. Spotted by Thomas
by pschweitzer＠svn.reactos.org 10 Oct '15

10 Oct '15

Author: pschweitzer Date: Sat Oct 10 12:08:45 2015 New Revision: 69480 URL: http://svn.reactos.org/svn/reactos?rev=69480&view=rev Log: [MSFS] Prevent a race condition on reading message from list. Spotted by Thomas Modified: trunk/reactos/drivers/filesystems/msfs/rw.c Modified: trunk/reactos/drivers/filesystems/msfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] Sat Oct 10 12:08:45 2015 @@ -33,6 +33,7 @@ PKTIMER Timer; PMSFS_DPC_CTX Context; PKDPC Dpc; + PLIST_ENTRY Entry; DPRINT("MsfsRead(DeviceObject %p Irp %p)\n", DeviceObject, Irp); @@ -63,17 +64,14 @@ if (Fcb->MessageCount > 0) { + KeAcquireSpinLock(&Fcb->MessageListLock, &oldIrql); + Entry = RemoveHeadList(&Fcb->MessageListHead); + KeReleaseSpinLock(&Fcb->MessageListLock, oldIrql); + /* copy current message into buffer */ - Message = CONTAINING_RECORD(Fcb->MessageListHead.Flink, - MSFS_MESSAGE, - MessageListEntry); - + Message = CONTAINING_RECORD(Entry, MSFS_MESSAGE, MessageListEntry); memcpy(Buffer, &Message->Buffer, min(Message->Size,Length)); LengthRead = Message->Size; - - KeAcquireSpinLock(&Fcb->MessageListLock, &oldIrql); - RemoveHeadList(&Fcb->MessageListHead); - KeReleaseSpinLock(&Fcb->MessageListLock, oldIrql); ExFreePoolWithTag(Message, 'rFsM'); Fcb->MessageCount--;

1 0

[ekohl] 69479: [NOTEPAD] Goto menu item should be disabled when wrap is on #CORE-10278 #resolve
by ekohl＠svn.reactos.org 10 Oct '15

10 Oct '15

Author: ekohl Date: Sat Oct 10 10:13:46 2015 New Revision: 69479 URL: http://svn.reactos.org/svn/reactos?rev=69479&view=rev Log: [NOTEPAD] Goto menu item should be disabled when wrap is on #CORE-10278 #resolve Modified: trunk/reactos/base/applications/notepad/dialog.c Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Sat Oct 10 10:13:46 2015 @@ -986,6 +986,16 @@ VOID DIALOG_EditWrap(VOID) { Globals.bWrapLongLines = !Globals.bWrapLongLines; + + if (Globals.bWrapLongLines) + { + EnableMenuItem(Globals.hMenu, CMD_GOTO, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); + } + else + { + EnableMenuItem(Globals.hMenu, CMD_GOTO, MF_BYCOMMAND | MF_ENABLED); + } + DoCreateEditWindow(); }

1 0

[jimtabor] 69478: [Win32k] - Fix repaint from off screen. See CORE-10098.
by jimtabor＠svn.reactos.org 10 Oct '15

10 Oct '15

Author: jimtabor Date: Sat Oct 10 10:10:15 2015 New Revision: 69478 URL: http://svn.reactos.org/svn/reactos?rev=69478&view=rev Log: [Win32k] - Fix repaint from off screen. See CORE-10098. Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] Sat Oct 10 10:10:15 2015 @@ -497,7 +497,7 @@ // Only the windows that overlap will be redrawn. if (RECTL_bIntersectRect( &rect, &pwnd->rcWindow, &pwndTemp->rcWindow )) { - co_UserRedrawWindow( pwndTemp, NULL, NULL, RDW_UPDATENOW | RDW_NOCHILDREN); + co_UserRedrawWindow( pwndTemp, NULL, NULL, RDW_UPDATENOW | RDW_ALLCHILDREN); } } }

1 0

[pschweitzer] 69477: [MSFS] Addendum to r69475 By Thomas Faber
by pschweitzer＠svn.reactos.org 10 Oct '15

10 Oct '15

Author: pschweitzer Date: Sat Oct 10 08:37:36 2015 New Revision: 69477 URL: http://svn.reactos.org/svn/reactos?rev=69477&view=rev Log: [MSFS] Addendum to r69475 By Thomas Faber Modified: trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt trunk/reactos/drivers/filesystems/msfs/msfs.h trunk/reactos/drivers/filesystems/msfs/rw.c Modified: trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/C… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt [iso-8859-1] Sat Oct 10 08:37:36 2015 @@ -4,8 +4,8 @@ finfo.c fsctrl.c msfs.c + msfssup.c rw.c - msfssup.c msfs.h) add_library(msfs SHARED ${SOURCE} msfs.rc) Modified: trunk/reactos/drivers/filesystems/msfs/msfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] Sat Oct 10 08:37:36 2015 @@ -11,7 +11,6 @@ #define __DRIVERS_FS_MS_MSFS_H #include <ntifs.h> -#include <wdm.h> #define DEFAULTAPI NTAPI Modified: trunk/reactos/drivers/filesystems/msfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] Sat Oct 10 08:37:36 2015 @@ -123,8 +123,6 @@ } Fcb->WaitCount++; - Irp->IoStatus.Status = STATUS_PENDING; - Irp->IoStatus.Information = 0; IoMarkIrpPending(Irp); return STATUS_PENDING;

1 0

[pschweitzer] 69476: [MSFS] Addendum to r69475
by pschweitzer＠svn.reactos.org 10 Oct '15

10 Oct '15

Author: pschweitzer Date: Sat Oct 10 08:31:25 2015 New Revision: 69476 URL: http://svn.reactos.org/svn/reactos?rev=69476&view=rev Log: [MSFS] Addendum to r69475 Added: trunk/reactos/drivers/filesystems/msfs/msfssup.c (with props) Added: trunk/reactos/drivers/filesystems/msfs/msfssup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfssup.c (added) +++ trunk/reactos/drivers/filesystems/msfs/msfssup.c [iso-8859-1] Sat Oct 10 08:31:25 2015 @@ -0,0 +1,130 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/filesystems/msfs/msfssup.c + * PURPOSE: Mailslot filesystem + * PROGRAMMER: Nikita Pechenkin (n.pechenkin(a)mail.ru) + */ + +/* INCLUDES ******************************************************************/ +#include "msfs.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +VOID NTAPI +MsfsInsertIrp(PIO_CSQ Csq, PIRP Irp) +{ + PMSFS_FCB Fcb; + + Fcb = CONTAINING_RECORD(Csq, MSFS_FCB, CancelSafeQueue); + InsertTailList(&Fcb->PendingIrpQueue, &Irp->Tail.Overlay.ListEntry); +} + +VOID NTAPI +MsfsRemoveIrp(PIO_CSQ Csq, PIRP Irp) +{ + UNREFERENCED_PARAMETER(Csq); + + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); +} + +PIRP NTAPI +MsfsPeekNextIrp(PIO_CSQ Csq, PIRP Irp, PVOID PeekContext) +{ + PMSFS_FCB Fcb; + PIRP NextIrp = NULL; + PLIST_ENTRY NextEntry, ListHead; + PIO_STACK_LOCATION Stack; + + Fcb = CONTAINING_RECORD(Csq, MSFS_FCB, CancelSafeQueue); + + ListHead = &Fcb->PendingIrpQueue; + + if (Irp == NULL) + { + NextEntry = ListHead->Flink; + } + else + { + NextEntry = Irp->Tail.Overlay.ListEntry.Flink; + } + + for (; NextEntry != ListHead; NextEntry = NextEntry->Flink) + { + NextIrp = CONTAINING_RECORD(NextEntry, IRP, Tail.Overlay.ListEntry); + + Stack = IoGetCurrentIrpStackLocation(NextIrp); + + if (PeekContext) + { + if (Stack->FileObject == (PFILE_OBJECT)PeekContext) + { + break; + } + } + else + { + break; + } + + NextIrp = NULL; + } + + return NextIrp; +} + +VOID NTAPI +MsfsAcquireLock(PIO_CSQ Csq, PKIRQL Irql) +{ + PMSFS_FCB Fcb; + + Fcb = CONTAINING_RECORD(Csq, MSFS_FCB, CancelSafeQueue); + KeAcquireSpinLock(&Fcb->QueueLock, Irql); +} + + +VOID NTAPI +MsfsReleaseLock(PIO_CSQ Csq, KIRQL Irql) +{ + PMSFS_FCB Fcb; + + Fcb = CONTAINING_RECORD(Csq, MSFS_FCB, CancelSafeQueue); + KeReleaseSpinLock(&Fcb->QueueLock, Irql); +} + +VOID NTAPI +MsfsCompleteCanceledIrp(PIO_CSQ Csq, PIRP Irp) +{ + + UNREFERENCED_PARAMETER(Csq); + + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); +} + +VOID NTAPI +MsfsTimeout(PKDPC Dpc, + PVOID DeferredContext, + PVOID SystemArgument1, + PVOID SystemArgument2) +{ + PMSFS_DPC_CTX Context; + PIRP Irp; + + Context = (PMSFS_DPC_CTX)DeferredContext; + + Irp = IoCsqRemoveIrp(Context->Csq, &Context->CsqContext); + if (Irp != NULL) + { + Irp->IoStatus.Status = STATUS_IO_TIMEOUT; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + ExFreePool(Context); +} + +/* EOF */ Propchange: trunk/reactos/drivers/filesystems/msfs/msfssup.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[pschweitzer] 69475: [MSFS] Implement asynchronous reading from mailslot. Patch by Nikita Pechenkin Adjustements, style fixing by myself. CORE-10245 #resolve #comment Modified patch committed with ...
by pschweitzer＠svn.reactos.org 10 Oct '15

10 Oct '15

Author: pschweitzer Date: Sat Oct 10 08:29:05 2015 New Revision: 69475 URL: http://svn.reactos.org/svn/reactos?rev=69475&view=rev Log: [MSFS] Implement asynchronous reading from mailslot. Patch by Nikita Pechenkin Adjustements, style fixing by myself. CORE-10245 #resolve #comment Modified patch committed with r69475. I have tested kernel32:mailslot and your provided test, both are passing 100%. Thanks! Modified: trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt trunk/reactos/drivers/filesystems/msfs/create.c trunk/reactos/drivers/filesystems/msfs/msfs.h trunk/reactos/drivers/filesystems/msfs/rw.c Modified: trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/C… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt [iso-8859-1] Sat Oct 10 08:29:05 2015 @@ -5,6 +5,7 @@ fsctrl.c msfs.c rw.c + msfssup.c msfs.h) add_library(msfs SHARED ${SOURCE} msfs.rc) Modified: trunk/reactos/drivers/filesystems/msfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/create.c [iso-8859-1] Sat Oct 10 08:29:05 2015 @@ -4,6 +4,7 @@ * FILE: drivers/filesystems/msfs/create.c * PURPOSE: Mailslot filesystem * PROGRAMMER: Eric Kohl + * Nikita Pechenkin (n.pechenkin(a)mail.ru) */ /* INCLUDES ******************************************************************/ @@ -183,6 +184,17 @@ InitializeListHead(&Fcb->MessageListHead); KeInitializeSpinLock(&Fcb->MessageListLock); + Fcb->WaitCount = 0; + KeInitializeSpinLock(&Fcb->QueueLock); + InitializeListHead(&Fcb->PendingIrpQueue); + IoCsqInitialize(&Fcb->CancelSafeQueue, + MsfsInsertIrp, + MsfsRemoveIrp, + MsfsPeekNextIrp, + MsfsAcquireLock, + MsfsReleaseLock, + MsfsCompleteCanceledIrp); + KeLockMutex(&DeviceExtension->FcbListLock); current_entry = DeviceExtension->FcbListHead.Flink; while (current_entry != &DeviceExtension->FcbListHead) Modified: trunk/reactos/drivers/filesystems/msfs/msfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] Sat Oct 10 08:29:05 2015 @@ -4,12 +4,14 @@ * FILE: drivers/filesystems/msfs/msfs.h * PURPOSE: Mailslot filesystem * PROGRAMMER: Eric Kohl + * Nikita Pechenkin (n.pechenkin(a)mail.ru) */ #ifndef __DRIVERS_FS_MS_MSFS_H #define __DRIVERS_FS_MS_MSFS_H #include <ntifs.h> +#include <wdm.h> #define DEFAULTAPI NTAPI @@ -35,7 +37,20 @@ ULONG MessageCount; KSPIN_LOCK MessageListLock; LIST_ENTRY MessageListHead; + IO_CSQ CancelSafeQueue; + KSPIN_LOCK QueueLock; + LIST_ENTRY PendingIrpQueue; + ULONG WaitCount; } MSFS_FCB, *PMSFS_FCB; + + +typedef struct _MSFS_DPC_CTX +{ + KTIMER Timer; + KDPC Dpc; + PIO_CSQ Csq; + IO_CSQ_IRP_CONTEXT CsqContext; +} MSFS_DPC_CTX, *PMSFS_DPC_CTX; typedef struct _MSFS_CCB @@ -89,4 +104,35 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); +IO_CSQ_INSERT_IRP MsfsInsertIrp; +VOID NTAPI +MsfsInsertIrp(PIO_CSQ Csq, PIRP Irp); + +IO_CSQ_REMOVE_IRP MsfsRemoveIrp; +VOID NTAPI +MsfsRemoveIrp(PIO_CSQ Csq, PIRP Irp); + +IO_CSQ_PEEK_NEXT_IRP MsfsPeekNextIrp; +PIRP NTAPI +MsfsPeekNextIrp(PIO_CSQ Csq, PIRP Irp, PVOID PeekContext); + +IO_CSQ_ACQUIRE_LOCK MsfsAcquireLock; +VOID NTAPI +MsfsAcquireLock(PIO_CSQ Csq, PKIRQL Irql); + +IO_CSQ_RELEASE_LOCK MsfsReleaseLock; +VOID NTAPI +MsfsReleaseLock(PIO_CSQ Csq, KIRQL Irql); + +IO_CSQ_COMPLETE_CANCELED_IRP MsfsCompleteCanceledIrp; +VOID NTAPI +MsfsCompleteCanceledIrp(PIO_CSQ pCsq, PIRP Irp); + +KDEFERRED_ROUTINE MsfsTimeout; +VOID NTAPI +MsfsTimeout(PKDPC Dpc, + PVOID DeferredContext, + PVOID SystemArgument1, + PVOID SystemArgument2); + #endif /* __DRIVERS_FS_MS_MSFS_H */ Modified: trunk/reactos/drivers/filesystems/msfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] Sat Oct 10 08:29:05 2015 @@ -4,6 +4,7 @@ * FILE: drivers/filesystems/msfs/rw.c * PURPOSE: Mailslot filesystem * PROGRAMMER: Eric Kohl + * Nikita Pechenkin (n.pechenkin(a)mail.ru) */ /* INCLUDES ******************************************************************/ @@ -28,8 +29,10 @@ ULONG Length; ULONG LengthRead = 0; PVOID Buffer; - NTSTATUS Status; - PLARGE_INTEGER Timeout; + LARGE_INTEGER Timeout; + PKTIMER Timer; + PMSFS_DPC_CTX Context; + PKDPC Dpc; DPRINT("MsfsRead(DeviceObject %p Irp %p)\n", DeviceObject, Irp); @@ -57,52 +60,74 @@ else Buffer = Irp->UserBuffer; - if (Fcb->TimeOut.QuadPart == -1LL) - Timeout = NULL; - else - Timeout = &Fcb->TimeOut; - - Status = KeWaitForSingleObject(&Fcb->MessageEvent, - UserRequest, - UserMode, - FALSE, - Timeout); - if (Status != STATUS_USER_APC) - { - if (Fcb->MessageCount > 0) + + if (Fcb->MessageCount > 0) + { + /* copy current message into buffer */ + Message = CONTAINING_RECORD(Fcb->MessageListHead.Flink, + MSFS_MESSAGE, + MessageListEntry); + + memcpy(Buffer, &Message->Buffer, min(Message->Size,Length)); + LengthRead = Message->Size; + + KeAcquireSpinLock(&Fcb->MessageListLock, &oldIrql); + RemoveHeadList(&Fcb->MessageListHead); + KeReleaseSpinLock(&Fcb->MessageListLock, oldIrql); + + ExFreePoolWithTag(Message, 'rFsM'); + Fcb->MessageCount--; + if (Fcb->MessageCount == 0) { - /* copy current message into buffer */ - Message = CONTAINING_RECORD(Fcb->MessageListHead.Flink, - MSFS_MESSAGE, - MessageListEntry); - - memcpy(Buffer, &Message->Buffer, min(Message->Size,Length)); - LengthRead = Message->Size; - - KeAcquireSpinLock(&Fcb->MessageListLock, &oldIrql); - RemoveHeadList(&Fcb->MessageListHead); - KeReleaseSpinLock(&Fcb->MessageListLock, oldIrql); - - ExFreePoolWithTag(Message, 'rFsM'); - Fcb->MessageCount--; - if (Fcb->MessageCount == 0) - { - KeClearEvent(&Fcb->MessageEvent); - } + KeClearEvent(&Fcb->MessageEvent); } - else - { - /* No message found after waiting */ - Status = STATUS_IO_TIMEOUT; - } - } - - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = LengthRead; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return Status; + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = LengthRead; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; + } + + Timeout = Fcb->TimeOut; + if (Timeout.HighPart == 0 && Timeout.LowPart == 0) + { + Irp->IoStatus.Status = STATUS_IO_TIMEOUT; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_IO_TIMEOUT; + } + + Context = ExAllocatePoolWithTag(NonPagedPool, sizeof(MSFS_DPC_CTX), 'NFsM'); + if (Context == NULL) + { + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_INSUFFICIENT_RESOURCES; + } + + IoCsqInsertIrp(&Fcb->CancelSafeQueue, Irp, &Context->CsqContext); + Timer = &Context->Timer; + Dpc = &Context->Dpc; + Context->Csq = &Fcb->CancelSafeQueue; + + /* No timer for INFINITY_WAIT */ + if (Timeout.QuadPart != -1) + { + KeInitializeTimer(Timer); + KeInitializeDpc(Dpc, MsfsTimeout, (PVOID)Context); + KeSetTimer(Timer, Timeout, Dpc); + } + + Fcb->WaitCount++; + Irp->IoStatus.Status = STATUS_PENDING; + Irp->IoStatus.Information = 0; + IoMarkIrpPending(Irp); + + return STATUS_PENDING; } @@ -118,6 +143,7 @@ KIRQL oldIrql; ULONG Length; PVOID Buffer; + PIRP CsqIrp; DPRINT("MsfsWrite(DeviceObject %p Irp %p)\n", DeviceObject, Irp); @@ -176,6 +202,14 @@ FALSE); } + if (Fcb->WaitCount > 0) + { + CsqIrp = IoCsqRemoveNextIrp(&Fcb->CancelSafeQueue, NULL); + /* FIXME: It is necessary to reset the timers. */ + MsfsRead(DeviceObject, CsqIrp); + Fcb->WaitCount--; + } + Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = Length;

1 0

[pschweitzer] 69474: [XDK] Properly define IO_CSQ function types CORE-10245
by pschweitzer＠svn.reactos.org 10 Oct '15

10 Oct '15

Author: pschweitzer Date: Sat Oct 10 07:55:42 2015 New Revision: 69474 URL: http://svn.reactos.org/svn/reactos?rev=69474&view=rev Log: [XDK] Properly define IO_CSQ function types CORE-10245 Modified: trunk/reactos/include/xdk/iotypes.h Modified: trunk/reactos/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/iotypes.h [iso-8859-1] Sat Oct 10 07:55:42 2015 @@ -2577,9 +2577,10 @@ } IO_CSQ_IRP_CONTEXT, *PIO_CSQ_IRP_CONTEXT; typedef VOID -(NTAPI *PIO_CSQ_INSERT_IRP)( +(NTAPI IO_CSQ_INSERT_IRP)( _In_ struct _IO_CSQ *Csq, _In_ PIRP Irp); +typedef IO_CSQ_INSERT_IRP *PIO_CSQ_INSERT_IRP; typedef NTSTATUS (NTAPI IO_CSQ_INSERT_IRP_EX)( @@ -2589,30 +2590,35 @@ typedef IO_CSQ_INSERT_IRP_EX *PIO_CSQ_INSERT_IRP_EX; typedef VOID -(NTAPI *PIO_CSQ_REMOVE_IRP)( +(NTAPI IO_CSQ_REMOVE_IRP)( _In_ struct _IO_CSQ *Csq, _In_ PIRP Irp); +typedef IO_CSQ_REMOVE_IRP *PIO_CSQ_REMOVE_IRP; typedef PIRP -(NTAPI *PIO_CSQ_PEEK_NEXT_IRP)( +(NTAPI IO_CSQ_PEEK_NEXT_IRP)( _In_ struct _IO_CSQ *Csq, _In_ PIRP Irp, _In_ PVOID PeekContext); +typedef IO_CSQ_PEEK_NEXT_IRP *PIO_CSQ_PEEK_NEXT_IRP; typedef VOID -(NTAPI *PIO_CSQ_ACQUIRE_LOCK)( +(NTAPI IO_CSQ_ACQUIRE_LOCK)( _In_ struct _IO_CSQ *Csq, _Out_ PKIRQL Irql); +typedef IO_CSQ_ACQUIRE_LOCK *PIO_CSQ_ACQUIRE_LOCK; typedef VOID -(NTAPI *PIO_CSQ_RELEASE_LOCK)( +(NTAPI IO_CSQ_RELEASE_LOCK)( _In_ struct _IO_CSQ *Csq, _In_ KIRQL Irql); +typedef IO_CSQ_RELEASE_LOCK *PIO_CSQ_RELEASE_LOCK; typedef VOID -(NTAPI *PIO_CSQ_COMPLETE_CANCELED_IRP)( +(NTAPI IO_CSQ_COMPLETE_CANCELED_IRP)( _In_ struct _IO_CSQ *Csq, _In_ PIRP Irp); +typedef IO_CSQ_COMPLETE_CANCELED_IRP *PIO_CSQ_COMPLETE_CANCELED_IRP; typedef struct _IO_CSQ { ULONG Type;

1 0

[gadamopoulos] 69473: [BROWSEUI] - Implement showing and hiding the Go button. Patch by Barrett Karish. CORE-10154
by gadamopoulos＠svn.reactos.org 09 Oct '15

09 Oct '15

Author: gadamopoulos Date: Fri Oct 9 13:20:45 2015 New Revision: 69473 URL: http://svn.reactos.org/svn/reactos?rev=69473&view=rev Log: [BROWSEUI] - Implement showing and hiding the Go button. Patch by Barrett Karish. CORE-10154 Modified: trunk/reactos/base/applications/iexplore/iexplore.inf trunk/reactos/dll/win32/browseui/addressband.cpp trunk/reactos/dll/win32/browseui/addressband.h trunk/reactos/dll/win32/browseui/internettoolbar.cpp Modified: trunk/reactos/base/applications/iexplore/iexplore.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore… ============================================================================== --- trunk/reactos/base/applications/iexplore/iexplore.inf [iso-8859-1] (original) +++ trunk/reactos/base/applications/iexplore/iexplore.inf [iso-8859-1] Fri Oct 9 13:20:45 2015 @@ -23,6 +23,7 @@ HKCR,"CLSID\%CLSID_Internet%\ShellFolder",,2,"0x24" [Settings.Reg] +HKCU,"Software\Microsoft\Internet Explorer\Main","ShowGoButton",2,"yes" #HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.winehq.org" HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.reactos.org" HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",2,"http://www.google.com" Modified: trunk/reactos/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] Fri Oct 9 13:20:45 2015 @@ -34,8 +34,6 @@ ****Add command handler for show/hide Go button to OnWinEvent ****Add tooltip notify handler **Properly implement GetBandInfo - **Add support for showing/hiding Go button - **Fix so Go button will be shown/hidden properly on load **Add correct text to Go button **Implement TranslateAcceleratorIO Implement Exec @@ -112,6 +110,7 @@ HWND parentWindow; HWND combobox; HRESULT hResult; + IImageList *piml; if (pUnkSite == NULL) { @@ -136,10 +135,20 @@ // create combo box ex combobox = CreateWindowEx(WS_EX_TOOLWINDOW, WC_COMBOBOXEXW, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, - 0, 0, 500, 250, parentWindow, (HMENU)0xa205, _AtlBaseModule.GetModuleInstance(), 0); + 0, 0, 500, 250, parentWindow, (HMENU)IDM_TOOLBARS_ADDRESSBAR, _AtlBaseModule.GetModuleInstance(), 0); if (combobox == NULL) return E_FAIL; SubclassWindow(combobox); + + HRESULT hr = SHGetImageList(SHIL_SMALL, IID_PPV_ARG(IImageList, &piml)); + if (FAILED_UNEXPECTEDLY(hr)) + { + SendMessageW(combobox, CBEM_SETIMAGELIST, 0, 0); + } + else + { + SendMessageW(combobox, CBEM_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(piml)); + } SendMessage(CBEM_SETEXTENDEDSTYLE, CBES_EX_CASESENSITIVE | CBES_EX_NOSIZELIMIT, CBES_EX_CASESENSITIVE | CBES_EX_NOSIZELIMIT); @@ -170,47 +179,9 @@ if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - // TODO: properly initialize this from registry - fGoButtonShown = true; - + fGoButtonShown = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"ShowGoButton", FALSE, TRUE); if (fGoButtonShown) - { - const TBBUTTON buttonInfo [] = { { 0, 1, TBSTATE_ENABLED, 0 } }; - HIMAGELIST normalImagelist; - HIMAGELIST hotImageList; - HINSTANCE shellInstance; - - shellInstance = GetModuleHandle(_T("shell32.dll")); - normalImagelist = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), - 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); - hotImageList = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT), - 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); - - fGoButton = CreateWindowEx(WS_EX_TOOLWINDOW, TOOLBARCLASSNAMEW, 0, WS_CHILD | WS_CLIPSIBLINGS | - WS_CLIPCHILDREN | TBSTYLE_LIST | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | - CCS_NOPARENTALIGN | CCS_NORESIZE, - 0, 0, 0, 0, m_hWnd, NULL, _AtlBaseModule.GetModuleInstance(), NULL); - SendMessage(fGoButton, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - SendMessage(fGoButton, TB_SETMAXTEXTROWS, 1, 0); - if (normalImagelist) - SendMessage(fGoButton, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(normalImagelist)); - if (hotImageList) - SendMessage(fGoButton, TB_SETHOTIMAGELIST, 0, reinterpret_cast<LPARAM>(hotImageList)); - SendMessage(fGoButton, TB_ADDSTRINGW, - reinterpret_cast<WPARAM>(_AtlBaseModule.GetResourceInstance()), IDS_GOBUTTONLABEL); - SendMessage(fGoButton, TB_ADDBUTTONSW, 1, (LPARAM) &buttonInfo); - - IImageList * piml; - HRESULT hr = SHGetImageList(SHIL_SMALL, IID_PPV_ARG(IImageList, &piml)); - if (FAILED_UNEXPECTEDLY(hr)) - { - SendMessageW(combobox, CBEM_SETIMAGELIST, 0, 0); - } - else - { - SendMessageW(combobox, CBEM_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(piml)); - } - } + CreateGoButton(); // take advice to watch events hResult = IUnknown_QueryService(pUnkSite, SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); @@ -333,6 +304,7 @@ { CComPtr<IWinEventHandler> winEventHandler; HRESULT hResult; + RECT rect; *theResult = 0; @@ -343,8 +315,13 @@ case WM_COMMAND: if (wParam == IDM_TOOLBARS_GOBUTTON) { - // toggle whether the Go button is displayed - // setting is Yes or No, stored in key "Software\Microsoft\Internet Explorer\Main" in value ShowGoButton + fGoButtonShown = !SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"ShowGoButton", FALSE, TRUE); + SHRegSetUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"ShowGoButton", REG_SZ, fGoButtonShown ? (LPVOID)L"yes" : (LPVOID)L"no", fGoButtonShown ? 8 : 6, SHREGSET_FORCE_HKCU); + if (!fGoButton) + CreateGoButton(); + ::ShowWindow(fGoButton,fGoButtonShown ? SW_HIDE : SW_SHOW); + GetWindowRect(&rect); + SendMessage(m_hWnd,WM_SIZE,0,MAKELPARAM(rect.right-rect.left,rect.bottom-rect.top)); // broadcast change notification to all explorer windows } break; @@ -600,6 +577,9 @@ newHeight = HIWORD(lParam); newWidth = LOWORD(lParam); + if (!fGoButton) + CreateGoButton(); + SendMessage(fGoButton, TB_GETITEMRECT, 0, reinterpret_cast<LPARAM>(&buttonBounds)); buttonWidth = buttonBounds.right - buttonBounds.left; buttonHeight = buttonBounds.bottom - buttonBounds.top; @@ -636,6 +616,9 @@ return 0; } + if (!fGoButton) + CreateGoButton(); + positionInfoCopy = *reinterpret_cast<WINDOWPOS *>(lParam); newHeight = positionInfoCopy.cy; newWidth = positionInfoCopy.cx; @@ -663,3 +646,32 @@ { return ShellObjectCreator<CAddressBand>(riid, ppv); } + +void CAddressBand::CreateGoButton() +{ + const TBBUTTON buttonInfo [] = { { 0, 1, TBSTATE_ENABLED, 0 } }; + HIMAGELIST normalImagelist; + HIMAGELIST hotImageList; + HINSTANCE shellInstance; + + + shellInstance = GetModuleHandle(_T("shell32.dll")); + normalImagelist = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), + 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); + hotImageList = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT), + 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); + + fGoButton = CreateWindowEx(WS_EX_TOOLWINDOW, TOOLBARCLASSNAMEW, 0, WS_CHILD | WS_CLIPSIBLINGS | + WS_CLIPCHILDREN | TBSTYLE_LIST | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | + CCS_NOPARENTALIGN | CCS_NORESIZE, + 0, 0, 0, 0, m_hWnd, NULL, _AtlBaseModule.GetModuleInstance(), NULL); + SendMessage(fGoButton, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); + SendMessage(fGoButton, TB_SETMAXTEXTROWS, 1, 0); + if (normalImagelist) + SendMessage(fGoButton, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(normalImagelist)); + if (hotImageList) + SendMessage(fGoButton, TB_SETHOTIMAGELIST, 0, reinterpret_cast<LPARAM>(hotImageList)); + SendMessage(fGoButton, TB_ADDSTRINGW, + reinterpret_cast<WPARAM>(_AtlBaseModule.GetResourceInstance()), IDS_GOBUTTONLABEL); + SendMessage(fGoButton, TB_ADDBUTTONSW, 1, (LPARAM) &buttonInfo); +} Modified: trunk/reactos/dll/win32/browseui/addressband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.h [iso-8859-1] Fri Oct 9 13:20:45 2015 @@ -48,6 +48,7 @@ virtual ~CAddressBand(); private: void FocusChange(BOOL bFocus); + void CreateGoButton(); public: // *** IDeskBand methods *** virtual HRESULT STDMETHODCALLTYPE GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi); Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Fri Oct 9 13:20:45 2015 @@ -1663,6 +1663,7 @@ RBHITTESTINFO hitTestInfo; REBARBANDINFOW rebarBandInfo; int bandID; + BOOL goButtonChecked; clickLocation.x = LOWORD(lParam); clickLocation.y = HIWORD(lParam); @@ -1712,6 +1713,8 @@ SHCheckMenuItem(contextMenu, IDM_TOOLBARS_LINKSBAR, FALSE); SHCheckMenuItem(contextMenu, IDM_TOOLBARS_CUSTOMIZE, FALSE); SHCheckMenuItem(contextMenu, IDM_TOOLBARS_LOCKTOOLBARS, fLocked); + goButtonChecked = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"ShowGoButton", FALSE, TRUE); + SHCheckMenuItem(contextMenu, IDM_TOOLBARS_GOBUTTON, goButtonChecked); // TODO: use GetSystemMetrics(SM_MENUDROPALIGNMENT) to determine menu alignment command = TrackPopupMenu(contextMenu, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, @@ -1729,6 +1732,9 @@ break; case IDM_TOOLBARS_CUSTOMIZE: // customize SendMessage(fToolbarWindow, TB_CUSTOMIZE, 0, 0); + break; + case IDM_TOOLBARS_GOBUTTON: + SendMessage(fNavigationWindow, WM_COMMAND, IDM_TOOLBARS_GOBUTTON, 0); break; }

1 0

[akhaldi] 69472: [PSDK] Correct addParameter() uri default value too. CORE-10320
by akhaldi＠svn.reactos.org 09 Oct '15

09 Oct '15

Author: akhaldi Date: Fri Oct 9 09:27:39 2015 New Revision: 69472 URL: http://svn.reactos.org/svn/reactos?rev=69472&view=rev Log: [PSDK] Correct addParameter() uri default value too. CORE-10320 Modified: trunk/reactos/include/psdk/msxml2.idl Modified: trunk/reactos/include/psdk/msxml2.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml2.idl?re… ============================================================================== --- trunk/reactos/include/psdk/msxml2.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msxml2.idl [iso-8859-1] Fri Oct 9 09:27:39 2015 @@ -1286,7 +1286,7 @@ HRESULT addParameter( [in] BSTR p, [in] VARIANT var, - [in, defaultvalue("")] BSTR uri); + [in, defaultvalue(L"")] BSTR uri); [id(DISPID_XMLDOM_PROCESSOR_ADDOBJECT)] HRESULT addObject(

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