Ros-diffs

ros-diffs@reactos.org

81390 discussions

02/02: [BOOTDATA] Register the CriticalDeviceCoInstaller as a class co-installer for critical device classes
by Eric Kohl 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d3921bdd5c0cb5e63e87… commit 6d3921bdd5c0cb5e63e8779e4e6edda243a92c8f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Sep 30 17:22:29 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Sep 30 17:23:40 2018 +0200 [BOOTDATA] Register the CriticalDeviceCoInstaller as a class co-installer for critical device classes --- boot/bootdata/hivesys.inf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 1f58e5c939..6eedacffcf 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -386,7 +386,13 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Class\{9D6D66A6-0B0C-4563-9077-A0E9A7955A ; Class Co-Installers HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers",,0x00000012 +HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E965-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,CriticalDeviceCoInstaller" +HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E967-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,CriticalDeviceCoInstaller" +HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E96A-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,CriticalDeviceCoInstaller" HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E96B-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,CriticalDeviceCoInstaller" +HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E96F-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,CriticalDeviceCoInstaller" +HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E97B-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,CriticalDeviceCoInstaller" +HKLM,"SYSTEM\CurrentControlSet\Control\CoDeviceInstallers","{4D36E97D-E325-11CE-BFC1-08002BE10318}",0x00010000,"syssetup.dll,CriticalDeviceCoInstaller" ; Default computer name settings

1 0

01/02: [SYSETUP] Implement the CriticalDeviceCoInstaller
by Eric Kohl 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4aa1bee7572664224a7f3… commit 4aa1bee7572664224a7f368dff0d56dfea922b1f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Sep 30 17:18:28 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Sep 30 17:23:38 2018 +0200 [SYSETUP] Implement the CriticalDeviceCoInstaller The CriticalDeviceCoInstaller adds devices of registered classes to the critical device database. --- dll/win32/syssetup/classinst.c | 206 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 201 insertions(+), 5 deletions(-) diff --git a/dll/win32/syssetup/classinst.c b/dll/win32/syssetup/classinst.c index 6eb949e568..d7ea97e1d0 100644 --- a/dll/win32/syssetup/classinst.c +++ b/dll/win32/syssetup/classinst.c @@ -31,7 +31,7 @@ ComputerClassInstaller( /* - * @unimplemented + * @implemented */ DWORD WINAPI @@ -41,12 +41,208 @@ CriticalDeviceCoInstaller( IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, IN OUT PCOINSTALLER_CONTEXT_DATA Context) { - switch (InstallFunction) + WCHAR szDeviceId[256]; + WCHAR szServiceName[256]; + WCHAR szClassGUID[64]; + DWORD dwRequiredSize; + HKEY hDriverKey = NULL; + HKEY hDatabaseKey = NULL, hDeviceKey = NULL; + DWORD dwDisposition; + PWSTR Ptr; + DWORD dwError = ERROR_SUCCESS; + + DPRINT("CriticalDeviceCoInstaller(%lu %p %p %p)\n", + InstallFunction, DeviceInfoSet, DeviceInfoData, Context); + + if (InstallFunction != DIF_INSTALLDEVICE) + return ERROR_SUCCESS; + + /* Get the MatchingDeviceId property */ + hDriverKey = SetupDiOpenDevRegKey(DeviceInfoSet, + DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DRV, + KEY_READ); + if (hDriverKey == INVALID_HANDLE_VALUE) { - default: - DPRINT1("Install function %u ignored\n", InstallFunction); - return ERROR_SUCCESS; + if (Context->PostProcessing) + { + dwError = GetLastError(); + DPRINT1("Failed to open the driver key! (Error %lu)\n", dwError); + goto done; + } + else + { + DPRINT("Failed to open the driver key! Postprocessing required!\n"); + return ERROR_DI_POSTPROCESSING_REQUIRED; + } + } + + dwRequiredSize = sizeof(szDeviceId); + dwError = RegQueryValueExW(hDriverKey, + L"MatchingDeviceId", + NULL, + NULL, + (PBYTE)szDeviceId, + &dwRequiredSize); + RegCloseKey(hDriverKey); + if (dwError != ERROR_SUCCESS) + { + if (Context->PostProcessing) + { + dwError = GetLastError(); + DPRINT1("Failed to read the MatchingDeviceId value! (Error %lu)\n", dwError); + goto done; + } + else + { + DPRINT("Failed to read the MatchingDeviceId value! Postprocessing required!\n"); + return ERROR_DI_POSTPROCESSING_REQUIRED; + } + } + + DPRINT("MatchingDeviceId: %S\n", szDeviceId); + + /* Get the ClassGUID property */ + dwRequiredSize = 0; + if (!SetupDiGetDeviceRegistryPropertyW(DeviceInfoSet, + DeviceInfoData, + SPDRP_CLASSGUID, + NULL, + (PBYTE)szClassGUID, + sizeof(szClassGUID), + &dwRequiredSize)) + { + if (Context->PostProcessing) + { + dwError = GetLastError(); + DPRINT1("Failed to read the ClassGUID! (Error %lu)\n", dwError); + goto done; + } + else + { + DPRINT("Failed to read the ClassGUID! Postprocessing required!\n"); + return ERROR_DI_POSTPROCESSING_REQUIRED; + } + } + + DPRINT("ClassGUID %S\n", szClassGUID); + + /* Get the Service property (optional) */ + dwRequiredSize = 0; + if (!SetupDiGetDeviceRegistryPropertyW(DeviceInfoSet, + DeviceInfoData, + SPDRP_SERVICE, + NULL, + (PBYTE)szServiceName, + sizeof(szServiceName), + &dwRequiredSize)) + { + if (Context->PostProcessing) + { + dwError = GetLastError(); + if (dwError != ERROR_FILE_NOT_FOUND) + { + DPRINT1("Failed to read the Service name! (Error %lu)\n", dwError); + goto done; + } + else + { + szServiceName[0] = UNICODE_NULL; + dwError = ERROR_SUCCESS; + } + } + else + { + DPRINT("Failed to read the Service name! Postprocessing required!\n"); + return ERROR_DI_POSTPROCESSING_REQUIRED; + } + } + + DPRINT("Service %S\n", szServiceName); + + /* Replace the first backslash by a number sign */ + Ptr = wcschr(szDeviceId, L'\\'); + if (Ptr != NULL) + { + *Ptr = L'#'; + + /* Terminate the device id at the second backslash */ + Ptr = wcschr(Ptr, L'\\'); + if (Ptr != NULL) + *Ptr = UNICODE_NULL; + } + + DPRINT("DeviceId: %S\n", szDeviceId); + + /* Open the critical device database key */ + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\CriticalDeviceDatabase", + 0, + KEY_WRITE, + &hDatabaseKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("RegOpenKeyExW failed (Error %lu)\n", dwError); + goto done; + } + + /* Create a new key for the device */ + dwError = RegCreateKeyExW(hDatabaseKey, + szDeviceId, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hDeviceKey, + &dwDisposition); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("RegCreateKeyExW failed (Error %lu)\n", dwError); + goto done; } + + /* Set the ClassGUID value */ + dwError = RegSetValueExW(hDeviceKey, + L"ClassGUID", + 0, + REG_SZ, + (PBYTE)szClassGUID, + (wcslen(szClassGUID) + 1) * sizeof(WCHAR)); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("RegSetValueExW failed (Error %lu)\n", dwError); + goto done; + } + + /* If available, set the Service value */ + if (szServiceName[0] != UNICODE_NULL) + { + dwError = RegSetValueExW(hDeviceKey, + L"Service", + 0, + REG_SZ, + (PBYTE)szServiceName, + (wcslen(szServiceName) + 1) * sizeof(WCHAR)); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("RegSetValueExW failed (Error %lu)\n", dwError); + goto done; + } + } + +done: + if (hDeviceKey != NULL) + RegCloseKey(hDeviceKey); + + if (hDatabaseKey != NULL) + RegCloseKey(hDatabaseKey); + + DPRINT("CriticalDeviceCoInstaller() done (Error %lu)\n", dwError); + + return dwError; }

1 0

01/01: [BTRFS] Fix IRP leak.
by Thomas Faber 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c7af85b64bbe62035370d… commit c7af85b64bbe62035370de2937b777406ac59b87 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Sep 16 15:25:27 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Sep 30 16:11:42 2018 +0200 [BTRFS] Fix IRP leak. This leaked at least one IRP for every write, making it the largest leak when running with BTRFS as the system volume. Thanks to Victor Perevertkin. Submitted upstream thanks to Pierre: https://github.com/maharmstone/btrfs/pull/106 --- drivers/filesystems/btrfs/write.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/filesystems/btrfs/write.c b/drivers/filesystems/btrfs/write.c index 7ede09ee6a..6292d7efb0 100644 --- a/drivers/filesystems/btrfs/write.c +++ b/drivers/filesystems/btrfs/write.c @@ -2333,6 +2333,10 @@ void free_write_data_stripes(write_data_context* wtc) { last_mdl = stripe->mdl; +#ifdef __REACTOS__ + if (stripe->Irp) + IoFreeIrp(stripe->Irp); +#endif le = le->Flink; }

1 0

03/03: [NPFS] Magic--;
by Pierre Schweitzer 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=257923cad10b1afbb12ca… commit 257923cad10b1afbb12cad1d9bec47daf3cefa3c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Sep 30 10:55:07 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Sep 30 10:55:44 2018 +0200 [NPFS] Magic--; --- drivers/filesystems/npfs/create.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filesystems/npfs/create.c b/drivers/filesystems/npfs/create.c index da2f967faf..8efcd77870 100644 --- a/drivers/filesystems/npfs/create.c +++ b/drivers/filesystems/npfs/create.c @@ -562,7 +562,7 @@ NpCreateExistingNamedPipe(IN PNP_FCB Fcb, if (AccessGranted) { AccessState->PreviouslyGrantedAccess |= GrantedAccess; - AccessState->RemainingDesiredAccess &= ~(GrantedAccess | 0x2000000); + AccessState->RemainingDesiredAccess &= ~(GrantedAccess | MAXIMUM_ALLOWED); } ObjectTypeName.Buffer = L"NamedPipe";

1 0

02/03: [NTOSKRNL] Fix remaining access computation on open
by Pierre Schweitzer 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=890a2936838b3aa4d0bba… commit 890a2936838b3aa4d0bba6ab4fac960f572fa0b4 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Sep 30 10:53:12 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Sep 30 10:55:44 2018 +0200 [NTOSKRNL] Fix remaining access computation on open --- ntoskrnl/io/iomgr/file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index cdc4aaaa3e..1768bc29ca 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -7,6 +7,7 @@ * Gunnar Dalsnes * Eric Kohl * Filip Navara (navaraf(a)reactos.org) + * Pierre Schweitzer */ /* INCLUDES *****************************************************************/ @@ -431,7 +432,7 @@ IopParseDevice(IN PVOID ParseObject, { /* Update access state */ AccessState->PreviouslyGrantedAccess |= GrantedAccess; - AccessState->RemainingDesiredAccess &= ~(GrantedAccess & + AccessState->RemainingDesiredAccess &= ~(GrantedAccess | MAXIMUM_ALLOWED); OpenPacket->Override= TRUE; }

1 0

01/03: [NTOSKRNL] Implement access check for secure open
by Pierre Schweitzer 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d0c07c44fae0a93c57f8… commit 6d0c07c44fae0a93c57f8d3410545e0f3c201287 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Sep 30 10:49:13 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Sep 30 10:55:43 2018 +0200 [NTOSKRNL] Implement access check for secure open --- ntoskrnl/io/iomgr/file.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index c10729080d..cdc4aaaa3e 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -641,7 +641,70 @@ IopParseDevice(IN PVOID ParseObject, ((OpenPacket->RelatedFileObject) || (RemainingName->Length)) && (!VolumeOpen)) { - DPRINT("Fix Secure FSD support!!!\n"); + Privileges = NULL; + GrantedAccess = 0; + + KeEnterCriticalRegion(); + ExAcquireResourceSharedLite(&IopSecurityResource, TRUE); + + /* Lock the subject context */ + SeLockSubjectContext(&AccessState->SubjectSecurityContext); + + /* Do access check */ + AccessGranted = SeAccessCheck(OriginalDeviceObject->SecurityDescriptor, + &AccessState->SubjectSecurityContext, + TRUE, + DesiredAccess, + 0, + &Privileges, + &IoFileObjectType->TypeInfo.GenericMapping, + UserMode, + &GrantedAccess, + &Status); + if (Privileges != NULL) + { + /* Append and free the privileges */ + SeAppendPrivileges(AccessState, Privileges); + SeFreePrivileges(Privileges); + } + + /* Check if we got access */ + if (GrantedAccess) + { + AccessState->PreviouslyGrantedAccess |= GrantedAccess; + AccessState->RemainingDesiredAccess &= ~(GrantedAccess | MAXIMUM_ALLOWED); + } + + FileString.Length = 8; + FileString.MaximumLength = 8; + FileString.Buffer = L"File"; + + /* Do Audit/Alarm for open operation + * NOTA: we audit target device object + */ + SeOpenObjectAuditAlarm(&FileString, + DeviceObject, + CompleteName, + OriginalDeviceObject->SecurityDescriptor, + AccessState, + FALSE, + AccessGranted, + UserMode, + &AccessState->GenerateOnClose); + + SeUnlockSubjectContext(&AccessState->SubjectSecurityContext); + + ExReleaseResourceLite(&IopSecurityResource); + KeLeaveCriticalRegion(); + + /* Check if access failed */ + if (!AccessGranted) + { + /* Dereference the device and fail */ + IopDereferenceDeviceObject(OriginalDeviceObject, FALSE); + if (Vpb) IopDereferenceVpbAndFree(Vpb); + return STATUS_ACCESS_DENIED; + } } /* Allocate the IRP */

1 0

02/02: [BLUE] Perform size/rectangle boundary checks on read/write operations. CORE-15108
by Hermès Bélusca-Maïto 29 Sep '18

29 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c122589d29c8afa05c4c… commit 0c122589d29c8afa05c4ce2cf47378b2d9a91c6f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 29 21:50:50 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 29 21:55:00 2018 +0200 [BLUE] Perform size/rectangle boundary checks on read/write operations. CORE-15108 --- drivers/setup/blue/blue.c | 139 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 115 insertions(+), 24 deletions(-) diff --git a/drivers/setup/blue/blue.c b/drivers/setup/blue/blue.c index ac898197ef..7367cead5f 100644 --- a/drivers/setup/blue/blue.c +++ b/drivers/setup/blue/blue.c @@ -307,13 +307,15 @@ ScrWrite(PDEVICE_OBJECT DeviceObject, if( processed == 0 ) { /* raw output mode */ + // FIXME: Does the buffer only contains chars? or chars + attributes? + // FIXME2: Fix buffer overflow. memcpy( &vidmem[(cursorx * 2) + (cursory * columns * 2)], pch, stk->Parameters.Write.Length ); offset += (stk->Parameters.Write.Length / 2); } else { - for (i = 0; i < stk->Parameters.Write.Length; i++, pch++) + for (i = 0; i < stk->Parameters.Write.Length; i++, pch++) { - switch (*pch) + switch (*pch) { case '\b': if (cursorx > 0) @@ -364,7 +366,9 @@ ScrWrite(PDEVICE_OBJECT DeviceObject, } break; } - if (cursory >= rows) + + /* Scroll up the contents of the screen if we are at the end */ + if (cursory >= rows) { unsigned short *LinePtr; @@ -403,7 +407,7 @@ ScrWrite(PDEVICE_OBJECT DeviceObject, Irp->IoStatus.Status = Status; IoCompleteRequest (Irp, IO_NO_INCREMENT); - return (Status); + return Status; } static DRIVER_DISPATCH ScrIoControl; @@ -466,6 +470,14 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject, PCONSOLE_SCREEN_BUFFER_INFO pcsbi = (PCONSOLE_SCREEN_BUFFER_INFO)Irp->AssociatedIrp.SystemBuffer; unsigned int offset; + if ( pcsbi->dwCursorPosition.X < 0 || pcsbi->dwCursorPosition.X >= DeviceExtension->Columns || + pcsbi->dwCursorPosition.Y < 0 || pcsbi->dwCursorPosition.Y >= DeviceExtension->Rows ) + { + Irp->IoStatus.Information = 0; + Status = STATUS_INVALID_PARAMETER; + break; + } + DeviceExtension->CharAttribute = pcsbi->wAttributes; offset = (pcsbi->dwCursorPosition.Y * DeviceExtension->Columns) + pcsbi->dwCursorPosition.X; @@ -562,20 +574,34 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject, PUCHAR vidmem; int offset; ULONG dwCount; + ULONG nMaxLength = Buf->nLength; + + if ( Buf->dwCoord.X < 0 || Buf->dwCoord.X >= DeviceExtension->Columns || + Buf->dwCoord.Y < 0 || Buf->dwCoord.Y >= DeviceExtension->Rows ) + { + Buf->dwTransfered = 0; + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; + } if (!InbvCheckDisplayOwnership()) { vidmem = DeviceExtension->VideoMemory; offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + - (Buf->dwCoord.X * 2) + 1; + (Buf->dwCoord.X * 2) + 1; + + nMaxLength = min(nMaxLength, + (DeviceExtension->Rows - Buf->dwCoord.Y) + * DeviceExtension->Columns - Buf->dwCoord.X); - for (dwCount = 0; dwCount < Buf->nLength; dwCount++) + for (dwCount = 0; dwCount < nMaxLength; dwCount++) { vidmem[offset + (dwCount * 2)] = (char) Buf->wAttribute; } } - Buf->dwTransfered = Buf->nLength; + Buf->dwTransfered = nMaxLength; Irp->IoStatus.Information = 0; Status = STATUS_SUCCESS; @@ -589,6 +615,16 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject, PUCHAR vidmem; int offset; ULONG dwCount; + ULONG nMaxLength; + + if ( Buf->dwCoord.X < 0 || Buf->dwCoord.X >= DeviceExtension->Columns || + Buf->dwCoord.Y < 0 || Buf->dwCoord.Y >= DeviceExtension->Rows ) + { + Buf->dwTransfered = 0; + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; + } if (!InbvCheckDisplayOwnership()) { @@ -596,9 +632,13 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject, offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + (Buf->dwCoord.X * 2) + 1; - for (dwCount = 0; dwCount < stk->Parameters.DeviceIoControl.OutputBufferLength; dwCount++, pAttr++) + nMaxLength = min(stk->Parameters.DeviceIoControl.OutputBufferLength, + (DeviceExtension->Rows - Buf->dwCoord.Y) + * DeviceExtension->Columns - Buf->dwCoord.X); + + for (dwCount = 0; dwCount < nMaxLength; dwCount++, pAttr++) { - *((char *) pAttr) = vidmem[offset + (dwCount * 2)]; + *((char *)pAttr) = vidmem[offset + (dwCount * 2)]; } Buf->dwTransfered = dwCount; @@ -620,14 +660,27 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject, PUCHAR vidmem; int offset; ULONG dwCount; + ULONG nMaxLength; + + if ( pCoord->X < 0 || pCoord->X >= DeviceExtension->Columns || + pCoord->Y < 0 || pCoord->Y >= DeviceExtension->Rows ) + { + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; + } if (!InbvCheckDisplayOwnership()) { vidmem = DeviceExtension->VideoMemory; offset = (pCoord->Y * DeviceExtension->Columns * 2) + - (pCoord->X * 2) + 1; + (pCoord->X * 2) + 1; + + nMaxLength = min(stk->Parameters.DeviceIoControl.OutputBufferLength - sizeof(COORD), + (DeviceExtension->Rows - pCoord->Y) + * DeviceExtension->Columns - pCoord->X); - for (dwCount = 0; dwCount < (stk->Parameters.DeviceIoControl.OutputBufferLength - sizeof( COORD )); dwCount++, pAttr++) + for (dwCount = 0; dwCount < nMaxLength; dwCount++, pAttr++) { vidmem[offset + (dwCount * 2)] = *pAttr; } @@ -650,21 +703,34 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject, PUCHAR vidmem; int offset; ULONG dwCount; + ULONG nMaxLength = Buf->nLength; + + if ( Buf->dwCoord.X < 0 || Buf->dwCoord.X >= DeviceExtension->Columns || + Buf->dwCoord.Y < 0 || Buf->dwCoord.Y >= DeviceExtension->Rows ) + { + Buf->dwTransfered = 0; + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; + } if (!InbvCheckDisplayOwnership()) { vidmem = DeviceExtension->VideoMemory; offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + - (Buf->dwCoord.X * 2); + (Buf->dwCoord.X * 2); + nMaxLength = min(nMaxLength, + (DeviceExtension->Rows - Buf->dwCoord.Y) + * DeviceExtension->Columns - Buf->dwCoord.X); - for (dwCount = 0; dwCount < Buf->nLength; dwCount++) + for (dwCount = 0; dwCount < nMaxLength; dwCount++) { vidmem[offset + (dwCount * 2)] = (char) Buf->cCharacter; } } - Buf->dwTransfered = Buf->nLength; + Buf->dwTransfered = nMaxLength; Irp->IoStatus.Information = 0; Status = STATUS_SUCCESS; @@ -678,14 +744,28 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject, PUCHAR vidmem; int offset; ULONG dwCount; + ULONG nMaxLength; + + if ( Buf->dwCoord.X < 0 || Buf->dwCoord.X >= DeviceExtension->Columns || + Buf->dwCoord.Y < 0 || Buf->dwCoord.Y >= DeviceExtension->Rows ) + { + Buf->dwTransfered = 0; + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; + } if (!InbvCheckDisplayOwnership()) { vidmem = DeviceExtension->VideoMemory; offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + - (Buf->dwCoord.X * 2); + (Buf->dwCoord.X * 2); + + nMaxLength = min(stk->Parameters.DeviceIoControl.OutputBufferLength, + (DeviceExtension->Rows - Buf->dwCoord.Y) + * DeviceExtension->Columns - Buf->dwCoord.X); - for (dwCount = 0; dwCount < stk->Parameters.DeviceIoControl.OutputBufferLength; dwCount++, pChar++) + for (dwCount = 0; dwCount < nMaxLength; dwCount++, pChar++) { *pChar = vidmem[offset + (dwCount * 2)]; } @@ -704,21 +784,32 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject, case IOCTL_CONSOLE_WRITE_OUTPUT_CHARACTER: { - COORD *pCoord; - LPSTR pChar; + COORD *pCoord = (COORD *)MmGetSystemAddressForMdl(Irp->MdlAddress); + LPSTR pChar = (CHAR *)(pCoord + 1); PUCHAR vidmem; int offset; ULONG dwCount; + ULONG nMaxLength; + + if ( pCoord->X < 0 || pCoord->X >= DeviceExtension->Columns || + pCoord->Y < 0 || pCoord->Y >= DeviceExtension->Rows ) + { + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; + } if (!InbvCheckDisplayOwnership()) { - pCoord = (COORD *)MmGetSystemAddressForMdl(Irp->MdlAddress); - pChar = (CHAR *)(pCoord + 1); vidmem = DeviceExtension->VideoMemory; offset = (pCoord->Y * DeviceExtension->Columns * 2) + - (pCoord->X * 2); + (pCoord->X * 2); + + nMaxLength = min(stk->Parameters.DeviceIoControl.OutputBufferLength - sizeof(COORD), + (DeviceExtension->Rows - pCoord->Y) + * DeviceExtension->Columns - pCoord->X); - for (dwCount = 0; dwCount < (stk->Parameters.DeviceIoControl.OutputBufferLength - sizeof( COORD )); dwCount++, pChar++) + for (dwCount = 0; dwCount < nMaxLength; dwCount++, pChar++) { vidmem[offset + (dwCount * 2)] = *pChar; } @@ -752,7 +843,7 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject, } Offset = (ConsoleDraw->CursorY * DeviceExtension->Columns) + - ConsoleDraw->CursorX; + ConsoleDraw->CursorX; _disable(); WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSLO); @@ -815,7 +906,7 @@ ScrDispatch(PDEVICE_OBJECT DeviceObject, Irp->IoStatus.Status = Status; IoCompleteRequest (Irp, IO_NO_INCREMENT); - return (Status); + return Status; }

1 0

01/02: [USETUP] Remove a hardcoded value.
by Hermès Bélusca-Maïto 29 Sep '18

29 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e29457aaddcaec35706fa… commit e29457aaddcaec35706fabe1012696f74a885774 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 29 21:48:27 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 29 21:54:48 2018 +0200 [USETUP] Remove a hardcoded value. --- base/setup/usetup/consup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/setup/usetup/consup.c b/base/setup/usetup/consup.c index f559d04edb..4103c0a0f9 100644 --- a/base/setup/usetup/consup.c +++ b/base/setup/usetup/consup.c @@ -54,7 +54,7 @@ CONSOLE_Init( if (!GetConsoleScreenBufferInfo(StdOutput, &csbi)) return FALSE; xScreen = csbi.dwSize.X; - yScreen = 50;//csbi.dwSize.Y; + yScreen = csbi.dwSize.Y; return TRUE; }

1 0

01/01: [MSPORTS] Implement the 'Enable legacy Plug and Play detection' setting
by Eric Kohl 29 Sep '18

29 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54eb5635d82506212d0d3… commit 54eb5635d82506212d0d3c2c98b6d9ae1c17b821 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Sep 29 18:05:22 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Sep 29 18:05:22 2018 +0200 [MSPORTS] Implement the 'Enable legacy Plug and Play detection' setting --- dll/win32/msports/parallel.c | 143 ++++++++++++++++++++++++++++++------------- 1 file changed, 99 insertions(+), 44 deletions(-) diff --git a/dll/win32/msports/parallel.c b/dll/win32/msports/parallel.c index e50d358ac7..ddb72c5a6b 100644 --- a/dll/win32/msports/parallel.c +++ b/dll/win32/msports/parallel.c @@ -15,6 +15,8 @@ typedef struct _PORT_DATA WCHAR szPortName[16]; DWORD dwFilterResourceMethod; + DWORD dwLegacy; + } PORT_DATA, *PPORT_DATA; @@ -25,11 +27,12 @@ ReadPortSettings( { DWORD dwSize; HKEY hKey; - LONG lError; + DWORD dwError; TRACE("ReadPortSettings(%p)\n", pPortData); pPortData->dwFilterResourceMethod = 1; /* Never use an interrupt */ + pPortData->dwLegacy = 0; /* Disabled */ hKey = SetupDiOpenDevRegKey(pPortData->DeviceInfoSet, pPortData->DeviceInfoData, @@ -37,37 +40,56 @@ ReadPortSettings( 0, DIREG_DEV, KEY_READ); - if (hKey == INVALID_HANDLE_VALUE) + if (hKey != INVALID_HANDLE_VALUE) { - ERR("SetupDiOpenDevRegKey() failed\n"); - return; - } + dwSize = sizeof(pPortData->szPortName); + dwError = RegQueryValueExW(hKey, + L"PortName", + NULL, + NULL, + (PBYTE)pPortData->szPortName, + &dwSize); + if (dwError != ERROR_SUCCESS) + { + ERR("RegQueryValueExW failed (Error %lu)\n", dwError); + } - dwSize = sizeof(pPortData->szPortName); - lError = RegQueryValueExW(hKey, - L"PortName", - NULL, - NULL, - (PBYTE)pPortData->szPortName, - &dwSize); - if (lError != ERROR_SUCCESS) - { - ERR("RegQueryValueExW failed (Error %lu)\n", lError); + dwSize = sizeof(pPortData->dwFilterResourceMethod); + dwError = RegQueryValueExW(hKey, + L"FilterResourceMethod", + NULL, + NULL, + (PBYTE)&pPortData->dwFilterResourceMethod, + &dwSize); + if (dwError != ERROR_SUCCESS) + { + ERR("RegQueryValueExW failed (Error %lu)\n", dwError); + } + + RegCloseKey(hKey); } - dwSize = sizeof(pPortData->dwFilterResourceMethod); - lError = RegQueryValueExW(hKey, - L"FilterResourceMethod", - NULL, - NULL, - (PBYTE)&pPortData->dwFilterResourceMethod, - &dwSize); - if (lError != ERROR_SUCCESS) + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Services\\Parport\\Parameters", + 0, + KEY_READ, + &hKey); + if (dwError == ERROR_SUCCESS) { - ERR("RegQueryValueExW failed (Error %lu)\n", lError); - } + dwSize = sizeof(pPortData->dwLegacy); + dwError = RegQueryValueExW(hKey, + L"ParEnableLegacyZip", + NULL, + NULL, + (PBYTE)&pPortData->dwLegacy, + &dwSize); + if (dwError != ERROR_SUCCESS) + { + ERR("RegQueryValueExW failed (Error %lu)\n", dwError); + } - RegCloseKey(hKey); + RegCloseKey(hKey); + } } @@ -77,9 +99,11 @@ WritePortSettings( HWND hwnd, PPORT_DATA pPortData) { + DWORD dwDisposition; DWORD dwFilterResourceMethod; + DWORD dwLegacy; HKEY hKey; - LONG lError; + DWORD dwError; TRACE("WritePortSettings(%p)\n", pPortData); @@ -99,28 +123,55 @@ WritePortSettings( 0, DIREG_DEV, KEY_WRITE); - if (hKey == INVALID_HANDLE_VALUE) + if (hKey != INVALID_HANDLE_VALUE) { - ERR("SetupDiOpenDevRegKey() failed\n"); - return; + dwError = RegSetValueExW(hKey, + L"FilterResourceMethod", + 0, + REG_DWORD, + (PBYTE)&dwFilterResourceMethod, + sizeof(dwFilterResourceMethod)); + if (dwError != ERROR_SUCCESS) + { + ERR("RegSetValueExW failed (Error %lu)\n", dwError); + } + + RegCloseKey(hKey); + pPortData->dwFilterResourceMethod = dwFilterResourceMethod; } + } - lError = RegSetValueExW(hKey, - L"FilterResourceMethod", - 0, - REG_DWORD, - (PBYTE)&dwFilterResourceMethod, - sizeof(dwFilterResourceMethod)); - if (lError != ERROR_SUCCESS) + dwLegacy = 0; + if (Button_GetCheck(GetDlgItem(hwnd, IDC_PARALLEL_LEGACY)) == BST_CHECKED) + dwLegacy = 1; + + if (dwLegacy != pPortData->dwLegacy) + { + dwError = RegCreateKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Services\\Parport\\Parameters", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hKey, + &dwDisposition); + if (dwError == ERROR_SUCCESS) { - ERR("RegSetValueExW failed (Error %lu)\n", lError); + dwError = RegSetValueExW(hKey, + L"ParEnableLegacyZip", + 0, + REG_DWORD, + (LPBYTE)&dwLegacy, + sizeof(dwLegacy)); + RegCloseKey(hKey); + + if (dwError == ERROR_SUCCESS) + { + FIXME("Notify the driver!\n"); + } } - - RegCloseKey(hKey); - - pPortData->dwFilterResourceMethod = dwFilterResourceMethod; } - } @@ -157,7 +208,11 @@ OnInitDialog(HWND hwnd, /* Disable the 'Enable legacy PNP detection' checkbox */ hwndControl = GetDlgItem(hwnd, IDC_PARALLEL_LEGACY); - EnableWindow(hwndControl, FALSE); + if (hwndControl) + { + Button_SetCheck(GetDlgItem(hwnd, IDC_PARALLEL_LEGACY), + pPortData->dwLegacy ? BST_CHECKED : BST_UNCHECKED); + } /* Fill the 'LPT Port Number' combobox */ hwndControl = GetDlgItem(hwnd, IDC_PARALLEL_NAME);

1 0

01/01: [README] Add a link to the nightly builds page for convenience (#881)
by Alexander Rechitskiy 29 Sep '18

29 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea0fd8a3956d003ee8166… commit ea0fd8a3956d003ee81662d7f4dfb2e66d25a3a0 Author: Alexander Rechitskiy <art1st.tm(a)gmail.com> AuthorDate: Sat Sep 29 17:43:32 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 29 16:43:32 2018 +0200 [README] Add a link to the nightly builds page for convenience (#881) --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a011b4fa52..3762523468 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,8 @@ build directory. This will create a CD image with a filename `bootcd.iso`. See ["Building ReactOS"](http://www.reactos.org/wiki/Building_ReactOS) for more details. +You can always download fresh binary builds of bootable images from the ["Daily builds"](https://www.reactos.org/getbuilds/) page. + ## Installing By default, ReactOS currently can only be installed on a machine that has a FAT16 or FAT32 partition as the active (bootable) partition.

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