Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

Start a nNew thread

[ea] 14948: Move VMS subtree in the proper place.

by ea＠svn.reactos.com

Move VMS subtree in the proper place. Added: trunk/vms/ Deleted: vms/ _____ Copied: trunk/vms (from rev 14947, vms)

19 years, 7 months

[navaraf] 14947: Fix Alex's completely wrong fix for NtUserScrollWindowEx (aka bug #606).

by navaraf＠svn.reactos.com

Fix Alex's completely wrong fix for NtUserScrollWindowEx (aka bug #606). Modified: trunk/reactos/subsys/win32k/ntuser/painting.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/painting.c --- trunk/reactos/subsys/win32k/ntuser/painting.c 2005-05-02 11:42:41 UTC (rev 14946) +++ trunk/reactos/subsys/win32k/ntuser/painting.c 2005-05-02 14:05:38 UTC (rev 14947) @@ -1211,17 +1211,19 @@ { int i; RECT r, dummy; + POINT ClientOrigin; PWINDOW_OBJECT WindowObject; + IntGetClientOrigin(hWnd, &ClientOrigin); for (i = 0; List[i]; i++) { - NtUserGetWindowRect(List[i], &r); - WindowObject = IntGetWindowObject((hWnd ? hWnd : IntGetDesktopWindow())); + WindowObject = IntGetWindowObject(List[i]); if (!WindowObject) continue; - r.left -= WindowObject->ClientRect.top; - r.top -= WindowObject->ClientRect.top; - r.right -= WindowObject->ClientRect.left; - r.bottom -= WindowObject->ClientRect.top; + r = WindowObject->WindowRect; + r.left -= ClientOrigin.x; + r.top -= ClientOrigin.y; + r.right -= ClientOrigin.x; + r.bottom -= ClientOrigin.y; IntReleaseWindowObject(WindowObject); if (! UnsafeRect || IntGdiIntersectRect(&dummy, &r, &rc)) WinPosSetWindowPos(List[i], 0, r.left + dx, r.top + dy, 0, 0,

19 years, 7 months

[ion] 14946: Fix many of the scrollbar issues. However, MDI Scrollbars are still not working perfectly. Patch by tinus <o112w8r02@sneakemail.com>. Fixes bug 606

by ion＠svn.reactos.com

Fix many of the scrollbar issues. However, MDI Scrollbars are still not working perfectly. Patch by tinus <o112w8r02(a)sneakemail.com>. Fixes bug 606 Modified: trunk/reactos/lib/user32/windows/mdi.c Modified: trunk/reactos/subsys/win32k/ntuser/scrollbar.c _____ Modified: trunk/reactos/lib/user32/windows/mdi.c --- trunk/reactos/lib/user32/windows/mdi.c 2005-05-02 11:38:48 UTC (rev 14945) +++ trunk/reactos/lib/user32/windows/mdi.c 2005-05-02 11:42:41 UTC (rev 14946) @@ -2034,8 +2034,16 @@ #ifndef __REACTOS__ HWND *list; #else + WINDOWINFO WindowInfo; HWND hWndCurrent; #endif + /* The rectangle returned by GetClientRect always has 0,0 as top left + * because it is in client coordinates. The rectangles returned by + * GetWindowRect are in screen coordinates to make this complicated. + * + * Apparently (in ReactOS at least) the rcClient returned by GetWindowInfo + * is in screen coordinates too. + */ GetClientRect( hwnd, &clientRect ); SetRectEmpty( &childRect ); @@ -2063,6 +2071,13 @@ HeapFree( GetProcessHeap(), 0, list ); } #else + WindowInfo.cbSize = sizeof(WindowInfo); + if (!GetWindowInfo(hwnd, &WindowInfo)) + { + ERR("Can't get window info\n"); + return; + } + hWndCurrent = GetWindow(hwnd, GW_CHILD); while (hWndCurrent != NULL) { @@ -2077,6 +2092,9 @@ RECT WindowRect; GetWindowRect( hWndCurrent, &WindowRect ); + OffsetRect(&WindowRect, + -WindowInfo.rcClient.left, + -WindowInfo.rcClient.top); UnionRect( &childRect, &WindowRect, &childRect ); } hWndCurrent = GetWindow(hWndCurrent, GW_HWNDNEXT); @@ -2086,23 +2104,30 @@ /* set common info values */ info.cbSize = sizeof(info); - info.fMask = SIF_POS | SIF_RANGE; + info.fMask = SIF_POS | SIF_RANGE | SIF_PAGE; - /* set the specific */ + /* set the specific scrollbars*/ + /* Note how we set nPos to 0 because we scroll the clients instead of + * the window, and we set nPage to 1 bigger than the clientRect because + * otherwise the scrollbar never disables. This causes a somewhat ugly + * effect though while scrolling. + */ switch( scroll ) { case SB_BOTH: case SB_HORZ: info.nMin = childRect.left; - info.nMax = childRect.right - clientRect.right; - info.nPos = clientRect.left - childRect.left; + info.nMax = childRect.right; + info.nPos = 0; + info.nPage = 1 + clientRect.right - clientRect.left; SetScrollInfo(hwnd, SB_HORZ, &info, TRUE); if (scroll == SB_HORZ) break; /* fall through */ case SB_VERT: info.nMin = childRect.top; - info.nMax = childRect.bottom - clientRect.bottom; - info.nPos = clientRect.top - childRect.top; + info.nMax = childRect.bottom; + info.nPos = 0; + info.nPage = 1 + clientRect.bottom - clientRect.top; SetScrollInfo(hwnd, SB_VERT, &info, TRUE); break; } _____ Modified: trunk/reactos/subsys/win32k/ntuser/scrollbar.c --- trunk/reactos/subsys/win32k/ntuser/scrollbar.c 2005-05-02 11:38:48 UTC (rev 14945) +++ trunk/reactos/subsys/win32k/ntuser/scrollbar.c 2005-05-02 11:42:41 UTC (rev 14946) @@ -360,7 +360,7 @@ /* Check if the scrollbar should be hidden or disabled */ if (0 != (lpsi->fMask & (SIF_RANGE | SIF_PAGE | SIF_DISABLENOSCROLL))) { - if (Info->nMin >= Info->nMax - max(Info->nPage - 1, 0)) + if (Info->nMin >= (int)(Info->nMax - max(Info->nPage - 1, 0))) { /* Hide or disable scroll-bar */ if (0 != (lpsi->fMask & SIF_DISABLENOSCROLL))

19 years, 7 months

[ion] 14945: Don't call internal function which checks parameters since our parameter is kernel mode.

by ion＠svn.reactos.com

Don't call internal function which checks parameters since our parameter is kernel mode. Modified: trunk/reactos/subsys/win32k/ntuser/painting.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/painting.c --- trunk/reactos/subsys/win32k/ntuser/painting.c 2005-05-02 11:03:54 UTC (rev 14944) +++ trunk/reactos/subsys/win32k/ntuser/painting.c 2005-05-02 11:38:48 UTC (rev 14945) @@ -1211,16 +1211,18 @@ { int i; RECT r, dummy; - POINT ClientOrigin; + PWINDOW_OBJECT WindowObject; for (i = 0; List[i]; i++) { NtUserGetWindowRect(List[i], &r); - IntGetClientOrigin(hWnd, &ClientOrigin); - r.left -= ClientOrigin.x; - r.top -= ClientOrigin.y; - r.right -= ClientOrigin.x; - r.bottom -= ClientOrigin.y; + WindowObject = IntGetWindowObject((hWnd ? hWnd : IntGetDesktopWindow())); + if (!WindowObject) continue; + r.left -= WindowObject->ClientRect.top; + r.top -= WindowObject->ClientRect.top; + r.right -= WindowObject->ClientRect.left; + r.bottom -= WindowObject->ClientRect.top; + IntReleaseWindowObject(WindowObject); if (! UnsafeRect || IntGdiIntersectRect(&dummy, &r, &rc)) WinPosSetWindowPos(List[i], 0, r.left + dx, r.top + dy, 0, 0, SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE |

19 years, 7 months

[hpoussin] 14944: Don't free unicode strings in case of error

by hpoussin＠svn.reactos.com

Don't free unicode strings in case of error Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c --- trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-05-02 07:04:36 UTC (rev 14943) +++ trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-05-02 11:03:54 UTC (rev 14944) @@ -533,9 +533,8 @@ RtlInitUnicodeString(&FullLayoutPath,SYSTEMROOT_DIR); if( !NT_SUCCESS(Status) ) { - DPRINT1("Got default locale but not layout file. (%08x)\n", + DPRINT1("Got default locale but not layout file. (%08lx)\n", Status); - RtlFreeUnicodeString(&LayoutFile); } else { DPRINT("Read registry and got %wZ\n", &LayoutFile); @@ -566,9 +565,9 @@ if( !kbModule ) DPRINT1( "Load Keyboard Layout: No %wZ\n", &FullLayoutPath ); + + RtlFreeUnicodeString(&FullLayoutPath); } - - RtlFreeUnicodeString(&FullLayoutPath); } if( !kbModule )

19 years, 7 months

[arty] 14943: Fix KDSERIAL.

by arty＠svn.reactos.com

Fix KDSERIAL. Modified: trunk/reactos/ntoskrnl/include/internal/kdb.h _____ Modified: trunk/reactos/ntoskrnl/include/internal/kdb.h --- trunk/reactos/ntoskrnl/include/internal/kdb.h 2005-05-02 05:27:32 UTC (rev 14942) +++ trunk/reactos/ntoskrnl/include/internal/kdb.h 2005-05-02 07:04:36 UTC (rev 14943) @@ -74,10 +74,11 @@ KdbEnterFromUmode } KDB_ENTER_CONDITION; +/* These values MUST be nonzero. They're used as bit masks. */ typedef enum _KDB_OUTPUT_SETTINGS { - KD_DEBUG_KDSERIAL, - KD_DEBUG_KDNOECHO + KD_DEBUG_KDSERIAL = 1, + KD_DEBUG_KDNOECHO = 2 } KDB_OUTPUT_SETTINGS; /* FUNCTIONS *****************************************************************/

19 years, 7 months

[ion] 14942: Same kind of fixes for NtFlushBuffersFile

by ion＠svn.reactos.com

Same kind of fixes for NtFlushBuffersFile Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-02 05:15:20 UTC (rev 14941) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-02 05:27:32 UTC (rev 14942) @@ -1532,10 +1532,6 @@ return STATUS_SUCCESS; } -NTSTATUS -STDCALL -NtFlushBuffersFile (IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock) /* * FUNCTION: Flushes cached file data to disk * ARGUMENTS: @@ -1546,54 +1542,98 @@ * RETURNS: Status * REMARKS: This function maps to the win32 FlushFileBuffers */ +NTSTATUS +STDCALL +NtFlushBuffersFile(IN HANDLE FileHandle, + OUT PIO_STATUS_BLOCK IoStatusBlock) { - PFILE_OBJECT FileObject = NULL; - PIRP Irp; - PIO_STACK_LOCATION StackPtr; - NTSTATUS Status; - KPROCESSOR_MODE PreviousMode; + PFILE_OBJECT FileObject = NULL; + PIRP Irp; + PIO_STACK_LOCATION StackPtr; + NTSTATUS Status; + PDEVICE_OBJECT DeviceObject; + KEVENT Event; + BOOLEAN LocalEvent = FALSE; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PreviousMode = ExGetPreviousMode(); + /* Get the File Object */ + Status = ObReferenceObjectByHandle(FileHandle, + FILE_WRITE_DATA, + NULL, + PreviousMode, + (PVOID*)&FileObject, + NULL); + if (Status != STATUS_SUCCESS) return(Status); - Status = ObReferenceObjectByHandle(FileHandle, - FILE_WRITE_DATA, - NULL, - PreviousMode, - (PVOID*)&FileObject, - NULL); - if (Status != STATUS_SUCCESS) - { - return(Status); - } - KeResetEvent( &FileObject->Event ); - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, - FileObject->DeviceObject, - NULL, - 0, - NULL, - &FileObject->Event, - IoStatusBlock); + /* Check if this is a direct open or not */ + if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) + { + DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); + } + else + { + DeviceObject = IoGetRelatedDeviceObject(FileObject); + } + + /* Check if we should use Sync IO or not */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Use File Object event */ + KeClearEvent(&FileObject->Event); + } + else + { + /* Use local event */ + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + LocalEvent = TRUE; + } - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; + /* Allocate the IRP */ + if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE))) + { + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Set up the IRP */ + Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; + Irp->RequestorMode = PreviousMode; + Irp->UserIosb = IoStatusBlock; + Irp->UserEvent = (LocalEvent) ? &Event : NULL; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = PreviousMode; + /* Set up Stack Data */ + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_FLUSH_BUFFERS; + StackPtr->FileObject = FileObject; + + /* Call the Driver */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + if (LocalEvent) + { + KeWaitForSingleObject(&Event, + Executive, + PreviousMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + Status = IoStatusBlock->Status; + } + else + { + KeWaitForSingleObject(&FileObject->Event, + Executive, + PreviousMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + Status = FileObject->FinalStatus; + } + } - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->FileObject = FileObject; - - Status = IoCallDriver(FileObject->DeviceObject,Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - Status = IoStatusBlock->Status; - } - - return(Status); + /* Return the Status */ + return Status; } /* @@ -1650,19 +1690,18 @@ } } - Status = ObReferenceObjectByHandle(FileHandle, - FILE_LIST_DIRECTORY, - IoFileObjectType, - PreviousMode, - (PVOID *)&FileObject, - NULL); + Status = ObReferenceObjectByHandle(FileHandle, + FILE_LIST_DIRECTORY, + IoFileObjectType, + PreviousMode, + (PVOID *)&FileObject, + NULL); + if (Status != STATUS_SUCCESS) return(Status); - if (Status != STATUS_SUCCESS) - { - return(Status); - } + DeviceObject = FileObject->DeviceObject; + Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); if (Irp==NULL) {

19 years, 7 months

[ion] 14941: Fix NtQueryInformationFile. Use right device object in case of FO_DIRECT_DEVICE_OPEN, use local event, set proper flags so that the I/O manager does the copying and freeing of the buffers, respect syyncronous I/O. Same kind of fixes for IoQueryFileInformation

by ion＠svn.reactos.com

Fix NtQueryInformationFile. Use right device object in case of FO_DIRECT_DEVICE_OPEN, use local event, set proper flags so that the I/O manager does the copying and freeing of the buffers, respect syyncronous I/O. Same kind of fixes for IoQueryFileInformation Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-01 23:19:48 UTC (rev 14940) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-02 05:15:20 UTC (rev 14941) @@ -1131,75 +1131,90 @@ OUT PVOID FileInformation, OUT PULONG ReturnedLength) { - IO_STATUS_BLOCK IoStatusBlock; - PIRP Irp; - PDEVICE_OBJECT DeviceObject; - PIO_STACK_LOCATION StackPtr; - NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + PIRP Irp; + PDEVICE_OBJECT DeviceObject; + PIO_STACK_LOCATION StackPtr; + BOOLEAN LocalEvent = FALSE; + KEVENT Event; + NTSTATUS Status; - ASSERT(FileInformation != NULL); + ASSERT(FileInformation != NULL); - Status = ObReferenceObjectByPointer(FileObject, - FILE_READ_ATTRIBUTES, - IoFileObjectType, - KernelMode); - if (!NT_SUCCESS(Status)) - { - return(Status); - } + Status = ObReferenceObjectByPointer(FileObject, + FILE_READ_ATTRIBUTES, + IoFileObjectType, + KernelMode); + if (!NT_SUCCESS(Status)) return(Status); - DPRINT("FileObject %x\n", FileObject); + DPRINT("FileObject %x\n", FileObject); - DeviceObject = FileObject->DeviceObject; + /* Get the Device Object */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + + /* Check if we should use Sync IO or not */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Use File Object event */ + KeClearEvent(&FileObject->Event); + } + else + { + /* Use local event */ + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + LocalEvent = TRUE; + } - Irp = IoAllocateIrp(DeviceObject->StackSize, - TRUE); - if (Irp == NULL) - { - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = KernelMode; - Irp->AssociatedIrp.SystemBuffer = FileInformation; - Irp->UserIosb = &IoStatusBlock; - Irp->UserEvent = &FileObject->Event; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - KeResetEvent( &FileObject->Event ); + /* Allocate the IRP */ + Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); + + /* Set the IRP */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = KernelMode; + Irp->AssociatedIrp.SystemBuffer = FileInformation; + Irp->UserIosb = &IoStatusBlock; + Irp->UserEvent = (LocalEvent) ? &Event : NULL; + Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_QUERY_INFORMATION; - StackPtr->MinorFunction = 0; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = FileObject; + /* Set the Stack Data */ + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_QUERY_INFORMATION; + StackPtr->FileObject = FileObject; - StackPtr->Parameters.QueryFile.FileInformationClass = - FileInformationClass; - StackPtr->Parameters.QueryFile.Length = Length; + /* Set Parameters */ + StackPtr->Parameters.QueryFile.FileInformationClass = FileInformationClass; + StackPtr->Parameters.QueryFile.Length = Length; - Status = IoCallDriver(FileObject->DeviceObject, - Irp); - if (Status==STATUS_PENDING && (FileObject->Flags & FO_SYNCHRONOUS_IO)) - { - KeWaitForSingleObject(&FileObject->Event, - Executive, - KernelMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - Status = IoStatusBlock.Status; - } + /* Call the Driver */ + Status = IoCallDriver(FileObject->DeviceObject, Irp); + + if (Status == STATUS_PENDING) + { + if (LocalEvent) + { + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + Status = IoStatusBlock.Status; + } + else + { + KeWaitForSingleObject(&FileObject->Event, + Executive, + KernelMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + Status = FileObject->FinalStatus; + } + } + - if (ReturnedLength != NULL) - { - *ReturnedLength = IoStatusBlock.Information; - } - - - return Status; + /* Return the Length and Status. ReturnedLength is NOT optional */ + *ReturnedLength = IoStatusBlock.Information; + return Status; } /* @@ -2170,132 +2185,150 @@ ULONG Length, FILE_INFORMATION_CLASS FileInformationClass) { - OBJECT_HANDLE_INFORMATION HandleInformation; - PFILE_OBJECT FileObject; - NTSTATUS Status; - PIRP Irp; - PDEVICE_OBJECT DeviceObject; - PIO_STACK_LOCATION StackPtr; - PVOID SystemBuffer; - KPROCESSOR_MODE PreviousMode; - BOOLEAN Failed = FALSE; + OBJECT_HANDLE_INFORMATION HandleInformation; + PFILE_OBJECT FileObject; + NTSTATUS Status; + PIRP Irp; + PDEVICE_OBJECT DeviceObject; + PIO_STACK_LOCATION StackPtr; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + KEVENT Event; + BOOLEAN LocalEvent = FALSE; + BOOLEAN Failed = FALSE; - ASSERT(IoStatusBlock != NULL); - ASSERT(FileInformation != NULL); + ASSERT(IoStatusBlock != NULL); + ASSERT(FileInformation != NULL); - DPRINT("NtQueryInformationFile(Handle %x StatBlk %x FileInfo %x Length %d " - "Class %d)\n", FileHandle, IoStatusBlock, FileInformation, - Length, FileInformationClass); + DPRINT("NtQueryInformationFile(Handle %x StatBlk %x FileInfo %x Length %d " + "Class %d)\n", FileHandle, IoStatusBlock, FileInformation, + Length, FileInformationClass); - PreviousMode = ExGetPreviousMode(); + /* Reference the Handle */ + Status = ObReferenceObjectByHandle(FileHandle, + 0, + IoFileObjectType, + PreviousMode, + (PVOID *)&FileObject, + &HandleInformation); + if (!NT_SUCCESS(Status)) return Status; - Status = ObReferenceObjectByHandle(FileHandle, - 0, - IoFileObjectType, - PreviousMode, - (PVOID *)&FileObject, - &HandleInformation); - if (!NT_SUCCESS(Status)) - { - return Status; - } + /* Check information class specific access rights */ + switch (FileInformationClass) + { + case FileBasicInformation: + if (!(HandleInformation.GrantedAccess & FILE_READ_ATTRIBUTES)) + Failed = TRUE; + break; - /* Check information class specific access rights */ - switch (FileInformationClass) - { - case FileBasicInformation: - if (!(HandleInformation.GrantedAccess & FILE_READ_ATTRIBUTES)) - Failed = TRUE; - break; + case FilePositionInformation: + if (!(HandleInformation.GrantedAccess & (FILE_READ_DATA | FILE_WRITE_DATA)) || + !(FileObject->Flags & FO_SYNCHRONOUS_IO)) + Failed = TRUE; + break; - case FilePositionInformation: - if (!(HandleInformation.GrantedAccess & (FILE_READ_DATA | FILE_WRITE_DATA)) || - !(FileObject->Flags & FO_SYNCHRONOUS_IO)) - Failed = TRUE; - break; + case FileAlignmentInformation: + if (!(FileObject->Flags & FO_NO_INTERMEDIATE_BUFFERING)) + Failed = TRUE; + break; - case FileAlignmentInformation: - if (!(FileObject->Flags & FO_NO_INTERMEDIATE_BUFFERING)) - Failed = TRUE; - break; + default: + break; + } - default: - break; - } + if (Failed) + { + DPRINT1("NtQueryInformationFile() returns STATUS_ACCESS_DENIED!\n"); + ObDereferenceObject(FileObject); + return STATUS_ACCESS_DENIED; + } - if (Failed) - { - DPRINT1("NtQueryInformationFile() returns STATUS_ACCESS_DENIED!\n"); - ObDereferenceObject(FileObject); - return STATUS_ACCESS_DENIED; - } + DPRINT("FileObject %x\n", FileObject); + + /* Check if this is a direct open or not */ + if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) + { + DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); + } + else + { + DeviceObject = IoGetRelatedDeviceObject(FileObject); + } + + /* Check if we should use Sync IO or not */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Use File Object event */ + KeClearEvent(&FileObject->Event); + } + else + { + /* Use local event */ + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + LocalEvent = TRUE; + } - DPRINT("FileObject %x\n", FileObject); + /* Allocate the IRP */ + if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE))) + { + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Allocate the System Buffer */ + if (!(Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, + Length, + TAG_SYSB))) + { + IoFreeIrp(Irp); + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } - DeviceObject = FileObject->DeviceObject; + /* Set up the IRP */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = PreviousMode; + Irp->UserIosb = IoStatusBlock; + Irp->UserEvent = (LocalEvent) ? &Event : NULL; + Irp->UserBuffer = FileInformation; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->Flags = IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER | IRP_INPUT_OPERATION; + Irp->Flags |= (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; + + /* Set up Stack Data */ + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_QUERY_INFORMATION; + StackPtr->FileObject = FileObject; - Irp = IoAllocateIrp(DeviceObject->StackSize, - TRUE); - if (Irp == NULL) - { - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } + /* Set the Parameters */ + StackPtr->Parameters.QueryFile.FileInformationClass = FileInformationClass; + StackPtr->Parameters.QueryFile.Length = Length; + + /* Call the Driver */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + if (LocalEvent) + { + KeWaitForSingleObject(&Event, + Executive, + PreviousMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + Status = IoStatusBlock->Status; + } + else + { + KeWaitForSingleObject(&FileObject->Event, + Executive, + PreviousMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + Status = FileObject->FinalStatus; + } + } - SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, - Length, - TAG_SYSB); - if (SystemBuffer == NULL) - { - IoFreeIrp(Irp); - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = PreviousMode; - Irp->AssociatedIrp.SystemBuffer = SystemBuffer; - Irp->UserIosb = IoStatusBlock; - Irp->UserEvent = &FileObject->Event; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - KeResetEvent(&FileObject->Event); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_QUERY_INFORMATION; - StackPtr->MinorFunction = 0; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = FileObject; - - StackPtr->Parameters.QueryFile.FileInformationClass = - FileInformationClass; - StackPtr->Parameters.QueryFile.Length = Length; - - Status = IoCallDriver(FileObject->DeviceObject, - Irp); - if (Status == STATUS_PENDING && (FileObject->Flags & FO_SYNCHRONOUS_IO)) - { - KeWaitForSingleObject(&FileObject->Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - Status = IoStatusBlock->Status; - } - - if (NT_SUCCESS(Status)) - { - DPRINT("Information %lu\n", IoStatusBlock->Information); - MmSafeCopyToUser(FileInformation, - SystemBuffer, - IoStatusBlock->Information); - } - - ExFreePool(SystemBuffer); - - return Status; + /* Return the Status */ + return Status; } /*

19 years, 7 months

[mf] 14940: implement owner drawn context menus for winefile

by mf＠svn.reactos.com

implement owner drawn context menus for winefile Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-01 22:30:13 UTC (rev 14939) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-01 23:19:48 UTC (rev 14940) @@ -3411,6 +3411,59 @@ } +static IContextMenu2* s_pctxmenu2 = NULL; + +#ifndef __MINGW32__ // IContextMenu3 missing in MinGW (as of 6.2.2005) +static IContextMenu3* s_pctxmenu3 = NULL; +#endif + +static void CtxMenu_reset() +{ + s_pctxmenu2 = NULL; + +#ifndef __MINGW32__ // IContextMenu3 missing in MinGW (as of 6.2.2005) + s_pctxmenu3 = NULL; +#endif +} + +IContextMenu* CtxMenu_query_interfaces(IContextMenu* pcm1) +{ + IContextMenu* pcm = NULL; + + CtxMenu_reset(); + +#ifndef __MINGW32__ // IContextMenu3 missing in MinGW (as of 6.2.2005) + if ((*pcm1->lpVtbl->QueryInterface)(pcm1, &IID_IContextMenu3, (void**)&pcm) == NOERROR) + s_pctxmenu3 = (LPCONTEXTMENU3)pcm; + else +#endif + if ((*pcm1->lpVtbl->QueryInterface)(pcm1, &IID_IContextMenu2, (void**)&pcm) == NOERROR) + s_pctxmenu2 = (LPCONTEXTMENU2)pcm; + + if (pcm) { + (*pcm1->lpVtbl->Release)(pcm1); + return pcm; + } else + return pcm1; +} + +static BOOL CtxMenu_HandleMenuMsg(UINT nmsg, WPARAM wparam, LPARAM lparam) +{ +#ifndef __MINGW32__ // IContextMenu3 missing in MinGW (as of 6.2.2005) + if (s_pctxmenu3) { + if (SUCCEEDED((*s_pctxmenu3->lpVtbl->HandleMenuMsg)(s_pctxmenu3, nmsg, wparam, lparam))) + return TRUE; + } +#endif + + if (s_pctxmenu2) + if (SUCCEEDED((*s_pctxmenu2->lpVtbl->HandleMenuMsg)(s_pctxmenu2, nmsg, wparam, lparam))) + return TRUE; + + return FALSE; +} + + static HRESULT ShellFolderContextMenu(IShellFolder* shell_folder, HWND hwndParent, int cidl, LPCITEMIDLIST* apidl, int x, int y) { IContextMenu* pcm; @@ -3421,12 +3474,16 @@ if (SUCCEEDED(hr)) { HMENU hmenu = CreatePopupMenu(); + pcm = CtxMenu_query_interfaces(pcm); + if (hmenu) { hr = (*pcm->lpVtbl->QueryContextMenu)(pcm, hmenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); if (SUCCEEDED(hr)) { UINT idCmd = TrackPopupMenu(hmenu, TPM_LEFTALIGN|TPM_RETURNCMD|TPM_RIGHTBUTTON, x, y, 0, hwndParent, NULL); + CtxMenu_reset(); + if (idCmd) { CMINVOKECOMMANDINFO cmi; @@ -3466,8 +3523,10 @@ if (dis->CtlID == IDW_TREE_LEFT) draw_item(&child->left, dis, entry, -1); + else if (dis->CtlID == IDW_TREE_RIGHT) + draw_item(&child->right, dis, entry, -1); else - draw_item(&child->right, dis, entry, -1); + goto draw_menu_item; return TRUE;} @@ -3746,6 +3805,33 @@ break;} #endif + case WM_MEASUREITEM: + draw_menu_item: + if (!wparam) // Is the message menu-related? + if (CtxMenu_HandleMenuMsg(nmsg, wparam, lparam)) + return TRUE; + + break; + + case WM_INITMENUPOPUP: + if (CtxMenu_HandleMenuMsg(nmsg, wparam, lparam)) + return 0; + + break; + +#ifndef __MINGW32__ // IContextMenu3 missing in MinGW (as of 6.2.2005) + case WM_MENUCHAR: // only supported by IContextMenu3 + if (s_pctxmenu3) { + LRESULT lResult = 0; + + (*s_pctxmenu3->lpVtbl->HandleMenuMsg2)(s_pctxmenu3, nmsg, wparam, lparam, &lResult); + + return lResult; + } + + break; +#endif + case WM_SIZE: if (wparam != SIZE_MINIMIZED) resize_tree(child, LOWORD(lparam), HIWORD(lparam));

19 years, 7 months

[hpoussin] 14939: Fix garbage text output with cmd.exe in GUI mode.

by hpoussin＠svn.reactos.com

Fix garbage text output with cmd.exe in GUI mode. Thanks to Hartmut for pointing me the problem Modified: trunk/reactos/drivers/video/videoprt/videoprt.c Modified: trunk/reactos/ntoskrnl/ob/namespc.c _____ Modified: trunk/reactos/drivers/video/videoprt/videoprt.c --- trunk/reactos/drivers/video/videoprt/videoprt.c 2005-05-01 22:29:18 UTC (rev 14938) +++ trunk/reactos/drivers/video/videoprt/videoprt.c 2005-05-01 22:30:13 UTC (rev 14939) @@ -152,7 +152,7 @@ DeviceNumber++; continue; } - else if (Status == STATUS_OBJECT_NAME_INVALID) + else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) break; else { _____ Modified: trunk/reactos/ntoskrnl/ob/namespc.c --- trunk/reactos/ntoskrnl/ob/namespc.c 2005-05-01 22:29:18 UTC (rev 14938) +++ trunk/reactos/ntoskrnl/ob/namespc.c 2005-05-01 22:30:13 UTC (rev 14939) @@ -143,12 +143,15 @@ return Status; } - if (RemainingPath.Buffer != NULL || - Object == NULL) - { - RtlFreeUnicodeString(&RemainingPath); - return STATUS_OBJECT_NAME_INVALID; - } + if (RemainingPath.Buffer != NULL) + { + if (wcschr(RemainingPath.Buffer + 1, L'\\') == NULL) + return STATUS_OBJECT_NAME_NOT_FOUND; + else + return STATUS_OBJECT_PATH_NOT_FOUND; + } + if (Object == NULL) + return STATUS_UNSUCCESSFUL; Status = ObCreateHandle(PsGetCurrentProcess(), Object,

19 years, 7 months

← Newer
1
...
74
75
76
77
78
79
80
81
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005