Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/02: [BOOTDATA] Register the CriticalDeviceCoInstaller for the keyboard device class
by Eric Kohl 12 May '18

12 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abf9bd2d68131a94a57f2… commit abf9bd2d68131a94a57f2a31ee82dbc97c705181 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 12 12:38:27 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 12 12:38:27 2018 +0200 [BOOTDATA] Register the CriticalDeviceCoInstaller for the keyboard device class --- boot/bootdata/hivesys.inf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 5fe7b84ce3..038beb96a4 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -384,6 +384,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Class\{9D6D66A6-0B0C-4563-9077-A0E9A7955A HKLM,"SYSTEM\CurrentControlSet\Control\Class\{9D6D66A6-0B0C-4563-9077-A0E9A7955AE4}","Class",0x00000000,"Ramdisk" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{9D6D66A6-0B0C-4563-9077-A0E9A7955AE4}","Icon",0x00000000,"-5" +; Class Co-Installers +HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers",,0x00000012 +HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E96B-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,CriticalDeviceCoInstaller" + + ; Default computer name settings HKLM,"SYSTEM\CurrentControlSet\Control\ComputerName",,0x00000012 HKLM,"SYSTEM\CurrentControlSet\Control\ComputerName\ComputerName","ComputerName",0x00000002,"COMPUTERNAME"

1 0

01/01: [FASTFAT] Implement support for stack overflow in read operations.
by Pierre Schweitzer 12 May '18

12 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=38078335b9ab4c5f8e8f6… commit 38078335b9ab4c5f8e8f6f37dba5c251de5fa02a Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat May 12 12:00:09 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat May 12 12:03:18 2018 +0200 [FASTFAT] Implement support for stack overflow in read operations. Before performing a read operation, FastFAT driver will attempt to compute whether it would run out of stack during the operation. If so, instead of attempting the operation in the current thread, it will post the read request to the overflow thread. This should help with the regressions brought in by 94ead99e0c503faa40b33b813cce296ea5c0bc0c. CORE-14601 --- drivers/filesystems/fastfat/rw.c | 279 ++++++++++++++++++++++++++------------- 1 file changed, 187 insertions(+), 92 deletions(-) diff --git a/drivers/filesystems/fastfat/rw.c b/drivers/filesystems/fastfat/rw.c index 4dd59933c4..76ffff933c 100644 --- a/drivers/filesystems/fastfat/rw.c +++ b/drivers/filesystems/fastfat/rw.c @@ -1,9 +1,10 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/rw.c + * FILE: drivers/filesystems/fastfat/rw.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) + * Pierre Schweitzer (pierre(a)reactos.org) * */ @@ -23,6 +24,12 @@ */ /* #define DEBUG_VERIFY_OFFSET_CACHING */ +/* Arbitrary, taken from MS FastFAT, should be + * refined given what we experience in common + * out of stack operations + */ +#define OVERFLOW_READ_THRESHHOLD 0xE00 + /* FUNCTIONS *****************************************************************/ /* @@ -535,6 +542,169 @@ VfatWriteFileData( return Status; } +NTSTATUS +VfatCommonRead( + PVFAT_IRP_CONTEXT IrpContext) +{ + PVFATFCB Fcb; + PVOID Buffer; + NTSTATUS Status; + ULONG Length = 0; + ULONG BytesPerSector; + LARGE_INTEGER ByteOffset; + ULONG ReturnedLength = 0; + BOOLEAN PagingIo, CanWait, IsVolume, NoCache; + + PagingIo = BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO); + CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT); + NoCache = BooleanFlagOn(IrpContext->Irp->Flags, IRP_NOCACHE); + Fcb = IrpContext->FileObject->FsContext; + IsVolume = BooleanFlagOn(Fcb->Flags, FCB_IS_VOLUME); + + ByteOffset = IrpContext->Stack->Parameters.Read.ByteOffset; + Length = IrpContext->Stack->Parameters.Read.Length; + BytesPerSector = IrpContext->DeviceExt->FatInfo.BytesPerSector; + + if (!PagingIo && + FsRtlAreThereCurrentFileLocks(&Fcb->FileLock)) + { + if (!FsRtlCheckLockForReadAccess(&Fcb->FileLock, IrpContext->Irp)) + { + return STATUS_FILE_LOCK_CONFLICT; + } + } + + Buffer = VfatGetUserBuffer(IrpContext->Irp, PagingIo); + + if (!PagingIo && !NoCache && !IsVolume) + { + // cached read + Status = STATUS_SUCCESS; + if (ByteOffset.u.LowPart + Length > Fcb->RFCB.FileSize.u.LowPart) + { + Length = Fcb->RFCB.FileSize.u.LowPart - ByteOffset.u.LowPart; + Status = /*STATUS_END_OF_FILE*/STATUS_SUCCESS; + } + + vfatAddToStat(IrpContext->DeviceExt, Base.UserFileReads, 1); + vfatAddToStat(IrpContext->DeviceExt, Base.UserFileReadBytes, Length); + + _SEH2_TRY + { + if (IrpContext->FileObject->PrivateCacheMap == NULL) + { + CcInitializeCacheMap(IrpContext->FileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + &(VfatGlobalData->CacheMgrCallbacks), + Fcb); + } + + if (!CcCopyRead(IrpContext->FileObject, + &ByteOffset, + Length, + CanWait, + Buffer, + &IrpContext->Irp->IoStatus)) + { + ASSERT(!CanWait); + Status = STATUS_PENDING; + goto ByeBye; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + goto ByeBye; + } + _SEH2_END; + + if (!NT_SUCCESS(IrpContext->Irp->IoStatus.Status)) + { + Status = IrpContext->Irp->IoStatus.Status; + } + } + else + { + // non cached read + Status = VfatLockUserBuffer(IrpContext->Irp, Length, IoWriteAccess); + if (!NT_SUCCESS(Status)) + { + goto ByeBye; + } + + if (ByteOffset.QuadPart + Length > ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector)) + { + Length = (ULONG)(ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector) - ByteOffset.QuadPart); + } + + if (!IsVolume) + { + vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedReads, 1); + vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedReadBytes, Length); + } + else + { + vfatAddToStat(IrpContext->DeviceExt, Base.MetaDataReads, 1); + vfatAddToStat(IrpContext->DeviceExt, Base.MetaDataReadBytes, Length); + } + + Status = VfatReadFileData(IrpContext, Length, ByteOffset, &ReturnedLength); + if (NT_SUCCESS(Status)) + { + IrpContext->Irp->IoStatus.Information = ReturnedLength; + } + } + +ByeBye: + return Status; +} + +VOID +NTAPI +VfatStackOverflowRead( + PVOID Context, + IN PKEVENT Event) +{ + PVFAT_IRP_CONTEXT IrpContext; + + IrpContext = Context; + /* In a separate thread, we can wait and resources got locked */ + SetFlag(IrpContext->Flags, IRPCONTEXT_CANWAIT); + + /* Perform the read operation */ + DPRINT1("Performing posted read\n"); + VfatCommonRead(IrpContext); + + KeSetEvent(Event, 0, FALSE); +} + +VOID +VfatPostRead( + PVFAT_IRP_CONTEXT IrpContext, + PERESOURCE Lock, + BOOLEAN PagingIo) +{ + KEVENT Event; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + ExAcquireResourceSharedLite(Lock, TRUE); + + /* If paging IO, call the non failing but blocking routine */ + if (PagingIo) + { + FsRtlPostPagingFileStackOverflow(IrpContext, &Event, VfatStackOverflowRead); + } + else + { + FsRtlPostStackOverflow(IrpContext, &Event, VfatStackOverflowRead); + } + + /* Wait till it's done */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); +} + NTSTATUS VfatRead( PVFAT_IRP_CONTEXT IrpContext) @@ -542,10 +712,8 @@ VfatRead( NTSTATUS Status; PVFATFCB Fcb; ULONG Length = 0; - ULONG ReturnedLength = 0; PERESOURCE Resource = NULL; LARGE_INTEGER ByteOffset; - PVOID Buffer; ULONG BytesPerSector; BOOLEAN PagingIo, CanWait, IsVolume, NoCache; @@ -644,105 +812,32 @@ VfatRead( Resource = &Fcb->MainResource; } - if (!ExAcquireResourceSharedLite(Resource, CanWait)) - { - Resource = NULL; - Status = STATUS_PENDING; - goto ByeBye; - } - - if (!PagingIo && - FsRtlAreThereCurrentFileLocks(&Fcb->FileLock)) - { - if (!FsRtlCheckLockForReadAccess(&Fcb->FileLock, IrpContext->Irp)) - { - Status = STATUS_FILE_LOCK_CONFLICT; - goto ByeBye; - } - } - - Buffer = VfatGetUserBuffer(IrpContext->Irp, PagingIo); - - if (!PagingIo && !NoCache && !IsVolume) - { - // cached read - Status = STATUS_SUCCESS; - if (ByteOffset.u.LowPart + Length > Fcb->RFCB.FileSize.u.LowPart) - { - Length = Fcb->RFCB.FileSize.u.LowPart - ByteOffset.u.LowPart; - Status = /*STATUS_END_OF_FILE*/STATUS_SUCCESS; - } - - vfatAddToStat(IrpContext->DeviceExt, Base.UserFileReads, 1); - vfatAddToStat(IrpContext->DeviceExt, Base.UserFileReadBytes, Length); - - _SEH2_TRY - { - if (IrpContext->FileObject->PrivateCacheMap == NULL) - { - CcInitializeCacheMap(IrpContext->FileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - FALSE, - &(VfatGlobalData->CacheMgrCallbacks), - Fcb); - } - - if (!CcCopyRead(IrpContext->FileObject, - &ByteOffset, - Length, - CanWait, - Buffer, - &IrpContext->Irp->IoStatus)) - { - ASSERT(!CanWait); - Status = STATUS_PENDING; - goto ByeBye; - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - goto ByeBye; - } - _SEH2_END; - - if (!NT_SUCCESS(IrpContext->Irp->IoStatus.Status)) - { - Status = IrpContext->Irp->IoStatus.Status; - } - } - else + /* Are we out of stack for the rest of the operation? */ + if (IoGetRemainingStackSize() < OVERFLOW_READ_THRESHHOLD) { - // non cached read + /* Lock the buffer */ Status = VfatLockUserBuffer(IrpContext->Irp, Length, IoWriteAccess); if (!NT_SUCCESS(Status)) { - goto ByeBye; + return Status; } - if (ByteOffset.QuadPart + Length > ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector)) - { - Length = (ULONG)(ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector) - ByteOffset.QuadPart); - } + /* And post the read to the overflow thread */ + VfatPostRead(IrpContext, Resource, PagingIo); - if (!IsVolume) - { - vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedReads, 1); - vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedReadBytes, Length); - } - else - { - vfatAddToStat(IrpContext->DeviceExt, Base.MetaDataReads, 1); - vfatAddToStat(IrpContext->DeviceExt, Base.MetaDataReadBytes, Length); - } + /* Return the appropriate status */ + return IrpContext->Irp->IoStatus.Status; + } - Status = VfatReadFileData(IrpContext, Length, ByteOffset, &ReturnedLength); - if (NT_SUCCESS(Status)) - { - IrpContext->Irp->IoStatus.Information = ReturnedLength; - } + if (!ExAcquireResourceSharedLite(Resource, CanWait)) + { + Resource = NULL; + Status = STATUS_PENDING; + goto ByeBye; } + Status = VfatCommonRead(IrpContext); + ByeBye: if (Resource) {

1 0

01/01: [USBPORT] Fix x64 build.
by Thomas Faber 12 May '18

12 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ce31759d068b6f8dda7e… commit 0ce31759d068b6f8dda7eb79a9ecdd16c598a25e Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat May 12 09:42:52 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat May 12 10:11:21 2018 +0200 [USBPORT] Fix x64 build. --- drivers/usb/usbport/usbport.h | 4 ++-- sdk/include/reactos/drivers/usbport/usbmport.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/usb/usbport/usbport.h b/drivers/usb/usbport/usbport.h index d09edb1b31..6ec826afed 100644 --- a/drivers/usb/usbport/usbport.h +++ b/drivers/usb/usbport/usbport.h @@ -394,7 +394,7 @@ typedef struct _USBPORT_DEVICE_EXTENSION { #if !defined(_M_X64) ULONG Padded[64]; #else - ULONG Padded[0]; + ULONG Padded[30]; #endif } USBPORT_DEVICE_EXTENSION, *PUSBPORT_DEVICE_EXTENSION; @@ -402,7 +402,7 @@ typedef struct _USBPORT_DEVICE_EXTENSION { #if !defined(_M_X64) C_ASSERT(sizeof(USBPORT_DEVICE_EXTENSION) == 0x500); #else -C_ASSERT(sizeof(USBPORT_DEVICE_EXTENSION) == 0x690); +C_ASSERT(sizeof(USBPORT_DEVICE_EXTENSION) == 0x700); #endif typedef struct _USBPORT_RH_DESCRIPTORS { diff --git a/sdk/include/reactos/drivers/usbport/usbmport.h b/sdk/include/reactos/drivers/usbport/usbmport.h index 0b1387179e..a646eb1ab4 100644 --- a/sdk/include/reactos/drivers/usbport/usbmport.h +++ b/sdk/include/reactos/drivers/usbport/usbmport.h @@ -51,9 +51,9 @@ typedef struct _USBPORT_RESOURCES { BOOLEAN ShareVector; UCHAR Padded2[3]; KINTERRUPT_MODE InterruptMode; - ULONG Reserved; + ULONG_PTR Reserved; PVOID ResourceBase; - SIZE_T IoSpaceLength; + ULONG IoSpaceLength; ULONG_PTR StartVA; ULONG StartPA; UCHAR LegacySupport; @@ -62,7 +62,7 @@ typedef struct _USBPORT_RESOURCES { UCHAR Reserved3; } USBPORT_RESOURCES, *PUSBPORT_RESOURCES; -C_ASSERT(sizeof(USBPORT_RESOURCES) == 24 + 7 * sizeof(PVOID)); +C_ASSERT(sizeof(USBPORT_RESOURCES) == 32 + 5 * sizeof(PVOID)); typedef struct _USBPORT_ENDPOINT_PROPERTIES { USHORT DeviceAddress; @@ -90,7 +90,7 @@ typedef struct _USBPORT_ENDPOINT_PROPERTIES { ULONG Reserved6; } USBPORT_ENDPOINT_PROPERTIES, *PUSBPORT_ENDPOINT_PROPERTIES; -C_ASSERT(sizeof(USBPORT_ENDPOINT_PROPERTIES) == 48 + 4 * sizeof(PVOID)); +C_ASSERT(sizeof(USBPORT_ENDPOINT_PROPERTIES) == 56 + 2 * sizeof(PVOID)); typedef struct _USBPORT_TRANSFER_PARAMETERS { ULONG TransferFlags;

1 0

01/01: [INETCPL] Fix a typo in Romanian resource file
by Bișoc George 11 May '18

11 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=337e7322a659134e84d25… commit 337e7322a659134e84d25295cff90c52f1591dcf Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Fri May 11 20:28:44 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri May 11 23:34:52 2018 +0200 [INETCPL] Fix a typo in Romanian resource file --- dll/cpl/inetcpl/lang/ro-RO.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/inetcpl/lang/ro-RO.rc b/dll/cpl/inetcpl/lang/ro-RO.rc index 37d6127db3..aae5f967cb 100644 --- a/dll/cpl/inetcpl/lang/ro-RO.rc +++ b/dll/cpl/inetcpl/lang/ro-RO.rc @@ -66,7 +66,7 @@ FONT 8, "MS Shell Dlg" CAPTION "Eliminare istoric de navigare" BEGIN - AUTOCHECKBOX "Fișierele de internet t&emporare\nCópii ale paginilor temporar stocate, imagini și certificate.", + AUTOCHECKBOX "Fișierele de internet t&emporare\nCopii ale paginilor temporar stocate, imagini și certificate.", IDC_DELETE_TEMP_FILES, 10, 8, 230, 40, BS_TOP | BS_MULTILINE AUTOCHECKBOX "Informațiile de &conexiune (Cookies)\nFișiere cu date precum informații de autentificare sau preferințe, stocate în calculatorul dumneavoastră din paginile vizitate.", IDC_DELETE_COOKIES, 10, 48, 230, 40, BS_TOP | BS_MULTILINE

1 0

02/02: [USBPORT][USBOHCI_NEW] Avoid using pointers for physical addresses.
by Vadim Galyant 11 May '18

11 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c89a190ea655b030f4cc9… commit c89a190ea655b030f4cc91de8b47ead424e9d339 Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Fri May 11 15:34:49 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri May 11 15:46:25 2018 +0200 [USBPORT][USBOHCI_NEW] Avoid using pointers for physical addresses. --- drivers/usb/usbohci_new/usbohci.c | 12 ++++++------ drivers/usb/usbport/pnp.c | 4 ++-- drivers/usb/usbport/power.c | 2 +- drivers/usb/usbport/usbport.c | 6 +++--- drivers/usb/usbport/usbport.h | 2 +- sdk/include/reactos/drivers/usbport/usbmport.h | 8 ++++---- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/usb/usbohci_new/usbohci.c b/drivers/usb/usbohci_new/usbohci.c index 87c3c13838..ef123288b2 100644 --- a/drivers/usb/usbohci_new/usbohci.c +++ b/drivers/usb/usbohci_new/usbohci.c @@ -672,8 +672,8 @@ OHCI_StartController(IN PVOID ohciExtension, return MPStatus; } - OhciExtension->HcResourcesVA = Resources->StartVA; - OhciExtension->HcResourcesPA = Resources->StartPA; + OhciExtension->HcResourcesVA = (POHCI_HC_RESOURCES)Resources->StartVA; + OhciExtension->HcResourcesPA = (POHCI_HC_RESOURCES)Resources->StartPA; DPRINT_OHCI("OHCI_StartController: HcResourcesVA - %p, HcResourcesPA - %p\n", OhciExtension->HcResourcesVA, @@ -1731,9 +1731,9 @@ OHCI_AbortTransfer(IN PVOID ohciExtension, ED = OhciEndpoint->HcdED; NextTdPA = ED->HwED.HeadPointer & OHCI_ED_HEAD_POINTER_MASK; - NextTD = RegPacket.UsbPortGetMappedVirtualAddress((PVOID)NextTdPA, - OhciExtension, - OhciEndpoint); + NextTD = RegPacket.UsbPortGetMappedVirtualAddress(NextTdPA, + OhciExtension, + OhciEndpoint); if (NextTD->OhciTransfer == (ULONG)OhciTransfer) { @@ -1978,7 +1978,7 @@ OHCI_PollAsyncEndpoint(IN POHCI_EXTENSION OhciExtension, DbgBreakPoint(); } - NextTD = RegPacket.UsbPortGetMappedVirtualAddress((PVOID)NextTdPA, + NextTD = RegPacket.UsbPortGetMappedVirtualAddress(NextTdPA, OhciExtension, OhciEndpoint); DPRINT_OHCI("NextTD - %p\n", NextTD); diff --git a/drivers/usb/usbport/pnp.c b/drivers/usb/usbport/pnp.c index 7b0c5dd20e..52c649e9b5 100644 --- a/drivers/usb/usbport/pnp.c +++ b/drivers/usb/usbport/pnp.c @@ -824,8 +824,8 @@ USBPORT_StartDevice(IN PDEVICE_OBJECT FdoDevice, goto ExitWithError; } - UsbPortResources->StartVA = (PVOID)HeaderBuffer->VirtualAddress; - UsbPortResources->StartPA = (PVOID)HeaderBuffer->PhysicalAddress; + UsbPortResources->StartVA = HeaderBuffer->VirtualAddress; + UsbPortResources->StartPA = HeaderBuffer->PhysicalAddress; FdoExtension->MiniPortCommonBuffer = HeaderBuffer; } diff --git a/drivers/usb/usbport/power.c b/drivers/usb/usbport/power.c index 0dca45334d..9fcb2aa5e6 100644 --- a/drivers/usb/usbport/power.c +++ b/drivers/usb/usbport/power.c @@ -197,7 +197,7 @@ USBPORT_ResumeController(IN PDEVICE_OBJECT FdoDevice) RtlZeroMemory(FdoExtension->MiniPortExt, Packet->MiniPortExtensionSize); - RtlZeroMemory(FdoExtension->UsbPortResources.StartVA, + RtlZeroMemory((PVOID)FdoExtension->UsbPortResources.StartVA, Packet->MiniPortResourcesSize); FdoExtension->UsbPortResources.IsChirpHandled = TRUE; diff --git a/drivers/usb/usbport/usbport.c b/drivers/usb/usbport/usbport.c index cc85e73bca..9961063209 100644 --- a/drivers/usb/usbport/usbport.c +++ b/drivers/usb/usbport/usbport.c @@ -1696,7 +1696,7 @@ USBPORT_AllocateCommonBuffer(IN PDEVICE_OBJECT FdoDevice, PHYSICAL_ADDRESS LogicalAddress; ULONG_PTR BaseVA; ULONG_PTR StartBufferVA; - ULONG_PTR StartBufferPA; + ULONG StartBufferPA; DPRINT("USBPORT_AllocateCommonBuffer: FdoDevice - %p, BufferLength - %p\n", FdoDevice, @@ -2108,7 +2108,7 @@ USBPORT_RequestAsyncCallback(IN PVOID MiniPortExtension, PVOID NTAPI -USBPORT_GetMappedVirtualAddress(IN PVOID PhysicalAddress, +USBPORT_GetMappedVirtualAddress(IN ULONG PhysicalAddress, IN PVOID MiniPortExtension, IN PVOID MiniPortEndpoint) { @@ -2129,7 +2129,7 @@ USBPORT_GetMappedVirtualAddress(IN PVOID PhysicalAddress, HeaderBuffer = Endpoint->HeaderBuffer; - Offset = (ULONG_PTR)PhysicalAddress - HeaderBuffer->PhysicalAddress; + Offset = PhysicalAddress - HeaderBuffer->PhysicalAddress; VirtualAddress = HeaderBuffer->VirtualAddress + Offset; return (PVOID)VirtualAddress; diff --git a/drivers/usb/usbport/usbport.h b/drivers/usb/usbport/usbport.h index 7895b97bde..d09edb1b31 100644 --- a/drivers/usb/usbport/usbport.h +++ b/drivers/usb/usbport/usbport.h @@ -148,7 +148,7 @@ typedef struct _USBPORT_COMMON_BUFFER_HEADER { PHYSICAL_ADDRESS LogicalAddress; SIZE_T BufferLength; ULONG_PTR VirtualAddress; - ULONG_PTR PhysicalAddress; + ULONG PhysicalAddress; } USBPORT_COMMON_BUFFER_HEADER, *PUSBPORT_COMMON_BUFFER_HEADER; typedef struct _USBPORT_ENDPOINT *PUSBPORT_ENDPOINT; diff --git a/sdk/include/reactos/drivers/usbport/usbmport.h b/sdk/include/reactos/drivers/usbport/usbmport.h index 23a7e91e9a..0b1387179e 100644 --- a/sdk/include/reactos/drivers/usbport/usbmport.h +++ b/sdk/include/reactos/drivers/usbport/usbmport.h @@ -54,8 +54,8 @@ typedef struct _USBPORT_RESOURCES { ULONG Reserved; PVOID ResourceBase; SIZE_T IoSpaceLength; - PVOID StartVA; - PVOID StartPA; + ULONG_PTR StartVA; + ULONG StartPA; UCHAR LegacySupport; BOOLEAN IsChirpHandled; UCHAR Reserved2; @@ -76,7 +76,7 @@ typedef struct _USBPORT_ENDPOINT_PROPERTIES { ULONG TransferType; ULONG Direction; ULONG_PTR BufferVA; - ULONG_PTR BufferPA; + ULONG BufferPA; ULONG BufferLength; ULONG Reserved3; ULONG MaxTransferSize; @@ -454,7 +454,7 @@ typedef ULONG typedef PVOID (NTAPI *PUSBPORT_GET_MAPPED_VIRTUAL_ADDRESS)( - PVOID, + ULONG, PVOID, PVOID);

1 0

01/02: [USBOHCI_NEW] Fix build.
by Thomas Faber 11 May '18

11 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=837411e2927770ba60ebc… commit 837411e2927770ba60ebcf12bd5c3496e0dcfe5b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri May 11 15:42:19 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri May 11 15:44:19 2018 +0200 [USBOHCI_NEW] Fix build. --- drivers/usb/usbohci_new/usbohci.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/usb/usbohci_new/usbohci.h b/drivers/usb/usbohci_new/usbohci.h index 4d468b5991..8bf703e6a5 100644 --- a/drivers/usb/usbohci_new/usbohci.h +++ b/drivers/usb/usbohci_new/usbohci.h @@ -50,7 +50,7 @@ typedef union DECLSPEC_ALIGN(32) _OHCI_HW_TRANSFER_DESCRIPTOR { } OHCI_HW_TRANSFER_DESCRIPTOR, *POHCI_HW_TRANSFER_DESCRIPTOR; C_ASSERT(sizeof(OHCI_HW_TRANSFER_DESCRIPTOR) == 32); -C_ASSERT(_alignof(OHCI_HW_TRANSFER_DESCRIPTOR) == 32); +C_ASSERT(__alignof(OHCI_HW_TRANSFER_DESCRIPTOR) == 32); typedef struct _OHCI_HCD_TD { /* Hardware part */ @@ -79,7 +79,7 @@ typedef struct _OHCI_HCD_ED { ULONG Flags; LIST_ENTRY HcdEDLink; #ifdef _WIN64 - ULONG Pad[6]; + ULONG Pad[6]; #else ULONG Pad[8]; #endif @@ -259,7 +259,7 @@ OHCI_RH_EnableIrq( IN PVOID ohciExtension); OHCI_REG_RH_DESCRIPTORA -NTAPI +NTAPI OHCI_ReadRhDescriptorA( IN POHCI_EXTENSION OhciExtension);

1 0

01/01: [BOOTDATA] Add settings for the Latvian (QUERTY) keyboard layout (disabled)
by Eric Kohl 10 May '18

10 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c2089d5319ea1a12d5788… commit c2089d5319ea1a12d5788d2fa798e5d08b1e3ef4 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu May 10 17:13:04 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu May 10 17:13:04 2018 +0200 [BOOTDATA] Add settings for the Latvian (QUERTY) keyboard layout (disabled) --- boot/bootdata/hivesys.inf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 7b790c4de6..5fe7b84ce3 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -690,6 +690,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000426","Layout File", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000426","Layout Text",0x00000000,%LATVIAN% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000426","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5043" +; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010426","Layout File",0x00000000,"kbdlv1.dll" +; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010426","Layout Text",0x00000000,%LATVIAN_QUERTY% +; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010426","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5044" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010427","Layout File",0x00000000,"kbdlt1.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010427","Layout Text",0x00000000,%LITHUANIAN% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010427","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5088" @@ -2230,6 +2234,7 @@ KAZAKH = "Kazakh" KOREAN = "Korean" LATIN_AMERICAN = "Latin American" LATVIAN = "Latvian" +LATVIAN_QUERTY = "Latvian (QUERTY)" LITHUANIAN = "Lithuanian" MACEDONIAN = "Macedonian (FYRO)" MALAYALAM = "Malayalam" @@ -2366,6 +2371,7 @@ KAZAKH = "Kazachski" KOREAN = "Koreański" LATIN_AMERICAN = "Latynoamerykański" LATVIAN = "Łotewski" +LATVIAN_QUERTY = "Łotewski (QUERTY)" LITHUANIAN = "Litewski" MACEDONIAN = "Macedoński (FYRO)" MALAYALAM = "Malajalam" @@ -2502,6 +2508,7 @@ KAZAKH = "Kazahă" KOREAN = "Coreeană" LATIN_AMERICAN = "Iberoamericană" LATVIAN = "Letonă" +LATVIAN_QUERTY = "Letonă (QUERTY)" LITHUANIAN = "Lituaniană" MACEDONIAN = "Macedonă (FYRO)" MALAYALAM = "Malayalam"

1 0

02/02: [USETUP] Use an existing latvian keyboard layout
by Eric Kohl 10 May '18

10 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02fbc6c51b19aeb58bd00… commit 02fbc6c51b19aeb58bd0070b1086cbd425745a25 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu May 10 16:18:04 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu May 10 16:18:04 2018 +0200 [USETUP] Use an existing latvian keyboard layout Use the existing Latvian keyboard layout instead of the Latvian (QUERTY) keyboard layout, which it not implemented yet. CORE-14561 --- base/setup/usetup/lang/lv-LV.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/base/setup/usetup/lang/lv-LV.h b/base/setup/usetup/lang/lv-LV.h index 8371a2369b..7083ddd8c7 100644 --- a/base/setup/usetup/lang/lv-LV.h +++ b/base/setup/usetup/lang/lv-LV.h @@ -2,6 +2,7 @@ MUI_LAYOUTS lvLVLayouts[] = { - { L"0426", L"00010426" }, + { L"0426", L"00000426" }, +// { L"0426", L"00010426" }, { NULL, NULL } };

1 0

01/02: [BOOTDATA] Remove superfluous quotation marks
by Eric Kohl 10 May '18

10 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ca124323edab61c86486… commit 6ca124323edab61c86486bd5938dd609389dd22f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu May 10 16:03:59 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu May 10 16:03:59 2018 +0200 [BOOTDATA] Remove superfluous quotation marks --- boot/bootdata/hivesys.inf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 72585eaa30..7b790c4de6 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -687,7 +687,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000425","Layout Text", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000425","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5042" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000426","Layout File",0x00000000,"kbdlv.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000426","Layout Text",0x00000000,%LATVIAN%" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000426","Layout Text",0x00000000,%LATVIAN% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000426","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5043" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010427","Layout File",0x00000000,"kbdlt1.dll" @@ -711,7 +711,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042c","Layout Text", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042c","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5117" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000082c","Layout File",0x00000000,"kbdaze.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000082c","Layout Text",0x00000000,%AZERI_CYRILLIC%" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000082c","Layout Text",0x00000000,%AZERI_CYRILLIC% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000082c","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5115" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042f","Layout File",0x00000000,"kbdmac.dll"

1 0

03/03: [NTOSKRNL] Fix FsRtlStackOverflow work item free.
by Pierre Schweitzer 10 May '18

10 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7eca874824870e69678b6… commit 7eca874824870e69678b6eb79b761d464bdb1e67 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu May 10 10:33:05 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu May 10 10:49:17 2018 +0200 [NTOSKRNL] Fix FsRtlStackOverflow work item free. Oneliner of the day... This typo just prevented the whole feature to work properly. Because any allocated work item would miserably fail to be freed. This will obviously help real world FSD relying on StackOverflow worker from FsRtl to work better! CORE-14611 --- ntoskrnl/fsrtl/stackovf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/fsrtl/stackovf.c b/ntoskrnl/fsrtl/stackovf.c index 9016fce5da..353e893aa7 100644 --- a/ntoskrnl/fsrtl/stackovf.c +++ b/ntoskrnl/fsrtl/stackovf.c @@ -61,7 +61,7 @@ FsRtlStackOverflowRead(IN PVOID Context) /* Otherwise, free the work item */ else { - ExFreePoolWithTag(WorkItem, 'Fsrs'); + ExFreePoolWithTag(WorkItem, 'FSrs'); } /* Reset top level */

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