Ros-diffs December 2020

ros-diffs@reactos.org

17 participants
131 discussions

[reactos] 01/01: [INF] Include volume.inf in the build

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b71df062110887a7ca423… commit b71df062110887a7ca423db317079f46c9184026 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 13 01:22:52 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 13 01:22:52 2020 +0100 [INF] Include volume.inf in the build --- media/inf/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/media/inf/CMakeLists.txt b/media/inf/CMakeLists.txt index ba9f1fcdc0c..92be65db3f6 100644 --- a/media/inf/CMakeLists.txt +++ b/media/inf/CMakeLists.txt @@ -26,6 +26,7 @@ list(APPEND INF_FILES unknown.inf usb.inf usbport.inf + volume.inf wdmaudio.inf wmiacpi.inf)

4 years

[reactos] 01/01: [INF] Add an inf file for the volume device class

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb500b884a083ca5a30c1… commit fb500b884a083ca5a30c19c2673f74df5e7f7f2d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 13 01:21:22 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 13 01:21:22 2020 +0100 [INF] Add an inf file for the volume device class --- media/inf/syssetup.inf | 1 + media/inf/volume.inf | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/media/inf/syssetup.inf b/media/inf/syssetup.inf index 0de1dc980ca..d80ab26d629 100644 --- a/media/inf/syssetup.inf +++ b/media/inf/syssetup.inf @@ -24,6 +24,7 @@ ports.inf scsi.inf unknown.inf usbport.inf +volume.inf audio.inf ks.inf c_image.inf diff --git a/media/inf/volume.inf b/media/inf/volume.inf new file mode 100644 index 00000000000..69a0b59aee4 --- /dev/null +++ b/media/inf/volume.inf @@ -0,0 +1,45 @@ +; Volume.INF + +; Installation file for storage volumes + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = Volume +ClassGUID = {71A27CDD-812A-11D0-BEC7-08002BE2092F} +Provider = %ReactOS% +DriverVer = 09/10/2008,1.0.0.0 + +[DestinationDirs] +DefaultDestDir = 12 + +[ClassInstall32.NT] +AddReg = Volume.NT.AddReg + +[Volume.NT.AddReg] +HKR, , , 0, %VolumeClassName% +HKR, , EnumPropPages32, 0, "storprop.dll,VolumePropPageProvider" +HKR, , Icon, 0, "-53" +HKR, , Installer32, 0, "syssetup.dll,VolumeClassInstaller" +HKR, , NoInstallClass, 0, "1" +HKR, , SilentInstall, 0, "1" + +[Manufacturer] +%GenericMfg% = GenericMfg + +[GenericMfg] +%STORAGE\Volume.DeviceDesc% = VolumeInstall,STORAGE\Volume + +[VolumeInstall] + +[VolumeInstall.Interfaces] +AddInterface = {53F5630D-B6BF-11D0-94F2-00A0C91EFb8B} + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" +VolumeClassName = "Storage volumes" +GenericMfg = "(Generic storage volumes)" +STORAGE\Volume.DeviceDesc = "Storage volume" \ No newline at end of file

4 years

[reactos] 01/01: [STORPROP] Add missing property provider stubs

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=afbff37d9860461fea772… commit afbff37d9860461fea7721a7244376e65972e790 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Dec 12 16:42:15 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Dec 12 16:42:15 2020 +0100 [STORPROP] Add missing property provider stubs --- dll/win32/storprop/storprop.c | 56 ++++++++++++++++++++++++++++++++++++++++ dll/win32/storprop/storprop.spec | 6 ++--- 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/dll/win32/storprop/storprop.c b/dll/win32/storprop/storprop.c index ba37599da96..7a07a3bff82 100644 --- a/dll/win32/storprop/storprop.c +++ b/dll/win32/storprop/storprop.c @@ -19,6 +19,9 @@ HINSTANCE hInstance = NULL; +/* + * @unimplemented + */ DWORD WINAPI DiskClassInstaller( @@ -29,9 +32,17 @@ DiskClassInstaller( DPRINT("DiskClassInstaller(%u %p %p)\n", InstallFunction, DeviceInfoSet, DeviceInfoData); + if (InstallFunction == DIF_ADDPROPERTYPAGE_ADVANCED) + { + return ERROR_SUCCESS; + } + return ERROR_DI_DO_DEFAULT; } +/* + * @unimplemented + */ DWORD WINAPI DvdClassInstaller( @@ -45,6 +56,51 @@ DvdClassInstaller( return ERROR_DI_DO_DEFAULT; } +/* + * @unimplemented + */ +BOOL +WINAPI +DvdPropPageProvider( + _In_ PSP_PROPSHEETPAGE_REQUEST lpPropSheetPageRequest, + _In_ LPFNADDPROPSHEETPAGE lpfnAddPropSheetPageProc, + _In_ LPARAM lParam) +{ + DPRINT("DvdPropPageProvider(%p %p %lx)\n", + lpPropSheetPageRequest, lpfnAddPropSheetPageProc, lParam); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +IdePropPageProvider( + _In_ PSP_PROPSHEETPAGE_REQUEST lpPropSheetPageRequest, + _In_ LPFNADDPROPSHEETPAGE lpfnAddPropSheetPageProc, + _In_ LPARAM lParam) +{ + DPRINT("IdePropPageProvider(%p %p %lx)\n", + lpPropSheetPageRequest, lpfnAddPropSheetPageProc, lParam); + return FALSE; +} + +/* + * @implemented + */ +BOOL +WINAPI +VolumePropPageProvider( + _In_ PSP_PROPSHEETPAGE_REQUEST lpPropSheetPageRequest, + _In_ LPFNADDPROPSHEETPAGE lpfnAddPropSheetPageProc, + _In_ LPARAM lParam) +{ + DPRINT("VolumePropPageProvider(%p %p %lx)\n", + lpPropSheetPageRequest, lpfnAddPropSheetPageProc, lParam); + return FALSE; +} + BOOL WINAPI DllMain( diff --git a/dll/win32/storprop/storprop.spec b/dll/win32/storprop/storprop.spec index d096e6b78e8..f0d37a3bb16 100644 --- a/dll/win32/storprop/storprop.spec +++ b/dll/win32/storprop/storprop.spec @@ -5,6 +5,6 @@ @ stdcall DllMain(ptr long ptr) @ stdcall DvdClassInstaller(long ptr ptr) @ stub DvdLauncher -@ stub DvdPropPageProvider -@ stub IdePropPageProvider -@ stub VolumePropPageProvider +@ stdcall DvdPropPageProvider(ptr ptr long) +@ stdcall IdePropPageProvider(ptr ptr long) +@ stdcall VolumePropPageProvider(ptr ptr long)

4 years

[reactos] 01/01: [SCSIPORT] Trim the Device ID and the Device Description

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e64984cabb0ca51f13673… commit e64984cabb0ca51f13673c2bac59589c6c64bf63 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Dec 12 12:46:11 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Dec 12 12:46:11 2020 +0100 [SCSIPORT] Trim the Device ID and the Device Description - Extend CopyField to support a default character and trimming. - Use CopyField instead of CopyFieldTruncate. CORE-17396 --- drivers/storage/port/scsiport/pdo.c | 89 +++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 48 deletions(-) diff --git a/drivers/storage/port/scsiport/pdo.c b/drivers/storage/port/scsiport/pdo.c index 793a84593bd..09c4249d37c 100644 --- a/drivers/storage/port/scsiport/pdo.c +++ b/drivers/storage/port/scsiport/pdo.c @@ -124,7 +124,9 @@ ULONG CopyField( IN PUCHAR Name, IN PCHAR Buffer, - IN ULONG MaxLength) + IN ULONG MaxLength, + IN CHAR DefaultCharacter, + IN BOOLEAN Trim) { ULONG Index; @@ -133,7 +135,7 @@ CopyField( if (Name[Index] <= ' ' || Name[Index] >= 0x7F /* last printable ascii character */ || Name[Index] == ',') { // convert to underscore - Buffer[Index] = '_'; + Buffer[Index] = DefaultCharacter; } else { @@ -142,33 +144,19 @@ CopyField( } } - return MaxLength; -} - -static -ULONG -CopyFieldTruncate( - IN PUCHAR Name, - IN PCHAR Buffer, - IN ULONG MaxLength) -{ - ULONG Index; - - for (Index = 0; Index < MaxLength; Index++) + /* Trim trailing default characters */ + if (Trim) { - if (Name[Index] == '\0') + Index = MaxLength - 1; + for (;;) { - break; - } - else if (Name[Index] <= ' ' || Name[Index] >= 0x7F /* last printable ascii character */ || Name[Index] == ',') - { - // convert to space - Buffer[Index] = ' '; - } - else - { - // just copy character - Buffer[Index] = Name[Index]; + if (Buffer[Index] != DefaultCharacter) + { + Index++; + break; + } + + Index--; } } @@ -201,13 +189,17 @@ PdoHandleQueryDeviceText( { DPRINT("DeviceTextDescription\n"); - Offset += CopyFieldTruncate(InquiryData->VendorId, - &LocalBuffer[Offset], - sizeof(InquiryData->VendorId)); + Offset += CopyField(InquiryData->VendorId, + &LocalBuffer[Offset], + sizeof(InquiryData->VendorId), + ' ', + TRUE); LocalBuffer[Offset++] = ' '; - Offset += CopyFieldTruncate(InquiryData->ProductId, - &LocalBuffer[Offset], - sizeof(InquiryData->ProductId)); + Offset += CopyField(InquiryData->ProductId, + &LocalBuffer[Offset], + sizeof(InquiryData->ProductId), + ' ', + TRUE); LocalBuffer[Offset++] = '\0'; RtlInitAnsiString(&AnsiString, (PCSZ)&LocalBuffer); @@ -287,11 +279,12 @@ PdoHandleQueryDeviceId( Offset = sprintf(&Buffer[Offset], "SCSI\\"); Offset += sprintf(&Buffer[Offset], DeviceType); Offset += sprintf(&Buffer[Offset], "&Ven_"); - Offset += CopyField(InquiryData->VendorId, &Buffer[Offset], 8); + Offset += CopyField(InquiryData->VendorId, &Buffer[Offset], 8, '_', TRUE); Offset += sprintf(&Buffer[Offset], "&Prod_"); - Offset += CopyField(InquiryData->ProductId, &Buffer[Offset], 16); + Offset += CopyField(InquiryData->ProductId, &Buffer[Offset], 16, '_', TRUE); Offset += sprintf(&Buffer[Offset], "&Rev_"); - Offset += CopyField(InquiryData->ProductRevisionLevel, &Buffer[Offset], 4); + Offset += CopyField(InquiryData->ProductRevisionLevel, &Buffer[Offset], 4, '_', TRUE); + Buffer[Offset] = '\0'; RtlInitAnsiString(&AnsiString, (PCSZ)Buffer); @@ -372,9 +365,9 @@ PdoHandleQueryHardwareId( Offset = 0; Offset = sprintf(&Id1[Offset], "SCSI\\"); Offset += sprintf(&Id1[Offset], DeviceType); - Offset += CopyField(InquiryData->VendorId, &Id1[Offset], 8); - Offset += CopyField(InquiryData->ProductId, &Id1[Offset], 16); - Offset += CopyField(InquiryData->ProductRevisionLevel, &Id1[Offset], 4); + Offset += CopyField(InquiryData->VendorId, &Id1[Offset], 8, '_', FALSE); + Offset += CopyField(InquiryData->ProductId, &Id1[Offset], 16, '_', FALSE); + Offset += CopyField(InquiryData->ProductRevisionLevel, &Id1[Offset], 4, '_', FALSE); Id1Length = strlen(Id1) + 1; DPRINT("PdoHandleQueryHardwareId HardwareId1 %s\n", Id1); @@ -384,8 +377,8 @@ PdoHandleQueryHardwareId( Offset = 0; Offset = sprintf(&Id2[Offset], "SCSI\\"); Offset += sprintf(&Id2[Offset], DeviceType); - Offset += CopyField(InquiryData->VendorId, &Id2[Offset], 8); - Offset += CopyField(InquiryData->ProductId, &Id2[Offset], 16); + Offset += CopyField(InquiryData->VendorId, &Id2[Offset], 8, '_', FALSE); + Offset += CopyField(InquiryData->ProductId, &Id2[Offset], 16, '_', FALSE); Id2Length = strlen(Id2) + 1; DPRINT("PdoHandleQueryHardwareId HardwareId2 %s\n", Id2); @@ -395,7 +388,7 @@ PdoHandleQueryHardwareId( Offset = 0; Offset = sprintf(&Id3[Offset], "SCSI\\"); Offset += sprintf(&Id3[Offset], DeviceType); - Offset += CopyField(InquiryData->VendorId, &Id3[Offset], 8); + Offset += CopyField(InquiryData->VendorId, &Id3[Offset], 8, '_', FALSE); Id3Length = strlen(Id3) + 1; DPRINT("PdoHandleQueryHardwareId HardwareId3 %s\n", Id3); @@ -404,9 +397,9 @@ PdoHandleQueryHardwareId( RtlZeroMemory(Id4, sizeof(Id4)); Offset = 0; Offset = sprintf(&Id4[Offset], "SCSI\\"); - Offset += CopyField(InquiryData->VendorId, &Id4[Offset], 8); - Offset += CopyField(InquiryData->ProductId, &Id4[Offset], 16); - Offset += CopyField(InquiryData->ProductRevisionLevel, &Id4[Offset], 1); + Offset += CopyField(InquiryData->VendorId, &Id4[Offset], 8, '_', FALSE); + Offset += CopyField(InquiryData->ProductId, &Id4[Offset], 16, '_', FALSE); + Offset += CopyField(InquiryData->ProductRevisionLevel, &Id4[Offset], 1, '_', FALSE); Id4Length = strlen(Id4) + 1; DPRINT("PdoHandleQueryHardwareId HardwareId4 %s\n", Id4); @@ -414,9 +407,9 @@ PdoHandleQueryHardwareId( // VendorId(8)_ProductId(16)_Revision(1) RtlZeroMemory(Id5, sizeof(Id5)); Offset = 0; - Offset = CopyField(InquiryData->VendorId, &Id5[Offset], 8); - Offset += CopyField(InquiryData->ProductId, &Id5[Offset], 16); - Offset += CopyField(InquiryData->ProductRevisionLevel, &Id5[Offset], 1); + Offset = CopyField(InquiryData->VendorId, &Id5[Offset], 8, '_', FALSE); + Offset += CopyField(InquiryData->ProductId, &Id5[Offset], 16, '_', FALSE); + Offset += CopyField(InquiryData->ProductRevisionLevel, &Id5[Offset], 1, '_', FALSE); Id5Length = strlen(Id5) + 1; DPRINT("PdoHandleQueryHardwareId HardwareId5 %s\n", Id5);

4 years

[reactos] 01/01: [SCSIPORT] Fix the hardware IDs and remove the superfluous one

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ba87f972dcb3e4380776… commit 8ba87f972dcb3e43807761a90fde646950ef7659 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Dec 10 23:25:06 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Dec 10 23:25:06 2020 +0100 [SCSIPORT] Fix the hardware IDs and remove the superfluous one --- drivers/storage/port/scsiport/pdo.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/drivers/storage/port/scsiport/pdo.c b/drivers/storage/port/scsiport/pdo.c index dcbe000b168..793a84593bd 100644 --- a/drivers/storage/port/scsiport/pdo.c +++ b/drivers/storage/port/scsiport/pdo.c @@ -354,8 +354,8 @@ PdoHandleQueryHardwareId( PSCSI_PORT_LUN_EXTENSION PDODeviceExtension = DeviceObject->DeviceExtension; LPCSTR GenericType, DeviceType; LPWSTR Buffer; - CHAR Id1[50], Id2[50], Id3[50], Id4[50], Id5[50], Id6[50], Id7[50]; - ULONG Id1Length, Id2Length, Id3Length, Id4Length, Id5Length, Id6Length, Id7Length; + CHAR Id1[50], Id2[50], Id3[50], Id4[50], Id5[50], Id6[50]; + ULONG Id1Length, Id2Length, Id3Length, Id4Length, Id5Length, Id6Length; ULONG Offset, TotalLength, Length; PINQUIRYDATA InquiryData; @@ -400,11 +400,10 @@ PdoHandleQueryHardwareId( DPRINT("PdoHandleQueryHardwareId HardwareId3 %s\n", Id3); // generate id 4 - // SCSI\SCSIType_VendorId(8)_ProductId(16)_Revision(1) + // SCSI\VendorId(8)_ProductId(16)_Revision(1) RtlZeroMemory(Id4, sizeof(Id4)); Offset = 0; Offset = sprintf(&Id4[Offset], "SCSI\\"); - Offset += sprintf(&Id4[Offset], DeviceType); Offset += CopyField(InquiryData->VendorId, &Id4[Offset], 8); Offset += CopyField(InquiryData->ProductId, &Id4[Offset], 16); Offset += CopyField(InquiryData->ProductRevisionLevel, &Id4[Offset], 1); @@ -412,34 +411,24 @@ PdoHandleQueryHardwareId( DPRINT("PdoHandleQueryHardwareId HardwareId4 %s\n", Id4); // generate id 5 - // SCSIType_VendorId(8)_ProductId(16)_Revision(1) + // VendorId(8)_ProductId(16)_Revision(1) RtlZeroMemory(Id5, sizeof(Id5)); Offset = 0; - Offset = sprintf(&Id5[Offset], DeviceType); - Offset += CopyField(InquiryData->VendorId, &Id5[Offset], 8); + Offset = CopyField(InquiryData->VendorId, &Id5[Offset], 8); Offset += CopyField(InquiryData->ProductId, &Id5[Offset], 16); Offset += CopyField(InquiryData->ProductRevisionLevel, &Id5[Offset], 1); Id5Length = strlen(Id5) + 1; DPRINT("PdoHandleQueryHardwareId HardwareId5 %s\n", Id5); // generate id 6 - // SCSI\SCSIType + // SCSIType RtlZeroMemory(Id6, sizeof(Id6)); Offset = 0; - Offset = sprintf(&Id6[Offset], "SCSI\\"); - Offset += sprintf(&Id6[Offset], GenericType); + Offset = sprintf(&Id6[Offset], GenericType); Id6Length = strlen(Id6) + 1; DPRINT("PdoHandleQueryHardwareId HardwareId6 %s\n", Id6); - // generate id 7 - // SCSIType - RtlZeroMemory(Id7, sizeof(Id7)); - Offset = 0; - Offset = sprintf(&Id7[Offset], GenericType); - Id7Length = strlen(Id7) + 1; - DPRINT("PdoHandleQueryHardwareId HardwareId7 %s\n", Id7); - - TotalLength = Id1Length + Id2Length + Id3Length + Id4Length + Id5Length + Id6Length + Id7Length + 1; + TotalLength = Id1Length + Id2Length + Id3Length + Id4Length + Id5Length + Id6Length + 1; Buffer = ExAllocatePoolWithTag(PagedPool, TotalLength * sizeof(WCHAR), TAG_SCSIPORT); if (!Buffer) @@ -458,7 +447,6 @@ PdoHandleQueryHardwareId( ConvertToUnicodeString(Id4, Length, Offset, Buffer, &Offset); ConvertToUnicodeString(Id5, Length, Offset, Buffer, &Offset); ConvertToUnicodeString(Id6, Length, Offset, Buffer, &Offset); - ConvertToUnicodeString(Id7, Length, Offset, Buffer, &Offset); Buffer[Offset] = UNICODE_NULL;

4 years

[reactos] 01/01: [SCSIPORT] Add the enumerator (SCSI) to the Compatible IDs

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5099f24373d6f68f4b982… commit 5099f24373d6f68f4b98241a3ea488595a109dc1 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Dec 9 23:58:12 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Dec 9 23:58:12 2020 +0100 [SCSIPORT] Add the enumerator (SCSI) to the Compatible IDs --- drivers/storage/port/scsiport/pdo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/storage/port/scsiport/pdo.c b/drivers/storage/port/scsiport/pdo.c index 5ddbd7e2b34..dcbe000b168 100644 --- a/drivers/storage/port/scsiport/pdo.c +++ b/drivers/storage/port/scsiport/pdo.c @@ -483,8 +483,8 @@ PdoHandleQueryCompatibleId( DeviceType = GetDeviceType(&PDODeviceExtension->InquiryData); // format instance id - Length = sprintf(Buffer, "%s", DeviceType) + 1; - Length += sprintf(&Buffer[Length], "%s", "RAW") + 2; + Length = sprintf(Buffer, "SCSI\\%s", DeviceType) + 1; + Length += sprintf(&Buffer[Length], "SCSI\\%s", "RAW") + 2; InstanceId = ExAllocatePoolWithTag(PagedPool, Length * sizeof(WCHAR), TAG_SCSIPORT); if (!InstanceId)

4 years

[reactos] 01/01: [NTOS:CC] Acquire the master lock after freeing the VACB in CcRosFlushDirtyPages

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8631e75837a5616c8c521… commit 8631e75837a5616c8c521125e9005d44b8c75a7f Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Dec 9 18:05:07 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Dec 9 18:06:42 2020 +0100 [NTOS:CC] Acquire the master lock after freeing the VACB in CcRosFlushDirtyPages Fixes a random ASSERT --- ntoskrnl/cc/view.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 42e9d244edd..adb28bb84ab 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -244,8 +244,12 @@ CcRosFlushDirtyPages ( current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite( current->SharedCacheMap->LazyWriteContext); - OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); + /* We release the VACB before acquiring the lock again, because + * CcRosVacbDecRefCount might free the VACB, as CcRosFlushVacb dropped a + * Refcount. Freeing must be done outside of the lock. + * The refcount is decremented atomically. So this is OK. */ CcRosVacbDecRefCount(current); + OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE) && (Status != STATUS_MEDIA_WRITE_PROTECTED))

4 years

[reactos] 01/01: [SCSIPORT] Addendum to 58ad5d9e02bbb08c3229ee06ed25f64e13c2a2f0

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b08990352040447fc4cb9… commit b08990352040447fc4cb9b6a6e1978a8a24c08d6 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Dec 9 12:40:51 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Dec 9 12:40:51 2020 +0100 [SCSIPORT] Addendum to 58ad5d9e02bbb08c3229ee06ed25f64e13c2a2f0 --- drivers/storage/port/scsiport/scsi.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/storage/port/scsiport/scsi.c b/drivers/storage/port/scsiport/scsi.c index 0aa7d36a3d5..056e2bb8328 100644 --- a/drivers/storage/port/scsiport/scsi.c +++ b/drivers/storage/port/scsiport/scsi.c @@ -400,7 +400,10 @@ SpiGetNextRequestFromLun( else { /* Release the spinlock, without clearing any flags and exit */ - KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); + if (OldIrql != NULL) + KeReleaseSpinLock(&DeviceExtension->SpinLock, *OldIrql); + else + KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); return; } @@ -429,7 +432,10 @@ SpiGetNextRequestFromLun( LunExtension->SortKey++; /* Release the spinlock */ - KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); + if (OldIrql != NULL) + KeReleaseSpinLock(&DeviceExtension->SpinLock, *OldIrql); + else + KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); /* Start the next pending request */ IoStartPacket(DeviceExtension->Common.DeviceObject, NextIrp, (PULONG)NULL, NULL); @@ -437,7 +443,10 @@ SpiGetNextRequestFromLun( else { /* Release the spinlock */ - KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); + if (OldIrql != NULL) + KeReleaseSpinLock(&DeviceExtension->SpinLock, *OldIrql); + else + KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); } }

4 years

[reactos] 01/01: [SCSIPORT] Fix locking the device extension.

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58ad5d9e02bbb08c3229e… commit 58ad5d9e02bbb08c3229ee06ed25f64e13c2a2f0 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Dec 9 12:24:23 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Dec 9 12:24:23 2020 +0100 [SCSIPORT] Fix locking the device extension. From MSDN: It is an error to call KeReleaseSpinLockFromDpcLevel if the specified spin lock was acquired by calling KeAcquireSpinLock because the caller's original IRQL is not restored, which can cause deadlocks or fatal page faults. --- drivers/storage/port/scsiport/fdo.c | 8 ++------ drivers/storage/port/scsiport/scsi.c | 32 ++++++++++++++++++-------------- drivers/storage/port/scsiport/scsiport.h | 3 ++- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/drivers/storage/port/scsiport/fdo.c b/drivers/storage/port/scsiport/fdo.c index 2cc89ea7353..052d5f62fa5 100644 --- a/drivers/storage/port/scsiport/fdo.c +++ b/drivers/storage/port/scsiport/fdo.c @@ -150,12 +150,8 @@ FdoSendInquiry( /* Acquire the spinlock */ KeAcquireSpinLock(&DeviceExtension->SpinLock, &Irql); - /* Process the request */ - SpiGetNextRequestFromLun(DeviceExtension, LunExtension); - - /* SpiGetNextRequestFromLun() releases the spinlock, - so we just lower irql back to what it was before */ - KeLowerIrql(Irql); + /* Process the request. SpiGetNextRequestFromLun will unlock for us */ + SpiGetNextRequestFromLun(DeviceExtension, LunExtension, &Irql); } /* Check if data overrun happened */ diff --git a/drivers/storage/port/scsiport/scsi.c b/drivers/storage/port/scsiport/scsi.c index 6cfd1ba29f3..0aa7d36a3d5 100644 --- a/drivers/storage/port/scsiport/scsi.c +++ b/drivers/storage/port/scsiport/scsi.c @@ -258,11 +258,8 @@ ScsiPortDispatchScsi( if (lunExt->SrbInfo.Srb == NULL) { - /* Get next logical unit request */ - SpiGetNextRequestFromLun(portExt, lunExt); - - /* SpiGetNextRequestFromLun() releases the spinlock */ - KeLowerIrql(Irql); + /* Get next logical unit request. SpiGetNextRequestFromLun releases the lock. */ + SpiGetNextRequestFromLun(portExt, lunExt, &Irql); } else { @@ -344,7 +341,9 @@ ScsiPortDispatchScsi( VOID SpiGetNextRequestFromLun( _In_ PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, - _Inout_ PSCSI_PORT_LUN_EXTENSION LunExtension) + _Inout_ PSCSI_PORT_LUN_EXTENSION LunExtension, + _Inout_opt_ PKIRQL OldIrql +) { PIO_STACK_LOCATION IrpStack; PIRP NextIrp; @@ -357,7 +356,10 @@ SpiGetNextRequestFromLun( !(LunExtension->Flags & SCSI_PORT_LU_ACTIVE)) { /* Release the spinlock and exit */ - KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); + if (OldIrql != NULL) + KeReleaseSpinLock(&DeviceExtension->SpinLock, *OldIrql); + else + KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); return; } @@ -385,7 +387,10 @@ SpiGetNextRequestFromLun( LunExtension->AttemptCount = 0; /* Release the spinlock */ - KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); + if (OldIrql != NULL) + KeReleaseSpinLock(&DeviceExtension->SpinLock, *OldIrql); + else + KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); /* Start the next pending request */ IoStartPacket(DeviceExtension->Common.DeviceObject, NextIrp, (PULONG)NULL, NULL); @@ -495,8 +500,7 @@ SpiSenseCompletionRoutine( lunExt->Flags &= ~LUNEX_NEED_REQUEST_SENSE; // SpiGetNextRequestFromLun releases the lock - SpiGetNextRequestFromLun(portExt, lunExt); - KeLowerIrql(irql); + SpiGetNextRequestFromLun(portExt, lunExt, &irql); InitialSrb->SrbStatus &= ~SRB_STATUS_QUEUE_FROZEN; } @@ -774,8 +778,8 @@ SpiProcessCompletedRequest( if (!(Srb->SrbFlags & SRB_FLAGS_BYPASS_FROZEN_QUEUE) && LunExtension->RequestTimeout == -1) { - /* Start the next packet */ - SpiGetNextRequestFromLun(DeviceExtension, LunExtension); + /* Start the next packet. SpiGetNextRequestFromLun will release the lock for us */ + SpiGetNextRequestFromLun(DeviceExtension, LunExtension, NULL); } else { @@ -891,7 +895,7 @@ Error: && (Srb->SrbFlags & SRB_FLAGS_NO_QUEUE_FREEZE)) { if (LunExtension->RequestTimeout == -1) - SpiGetNextRequestFromLun(DeviceExtension, LunExtension); + SpiGetNextRequestFromLun(DeviceExtension, LunExtension, NULL); else KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); } @@ -1342,7 +1346,7 @@ TryAgain: LunExtension->ReadyLun = NULL; /* Get next request for this LUN */ - SpiGetNextRequestFromLun(DeviceExtension, LunExtension); + SpiGetNextRequestFromLun(DeviceExtension, LunExtension, NULL); /* Still ready requests exist? If yes - get spinlock, if no - stop here */ diff --git a/drivers/storage/port/scsiport/scsiport.h b/drivers/storage/port/scsiport/scsiport.h index a81ef4cbb41..d3ee010cab1 100644 --- a/drivers/storage/port/scsiport/scsiport.h +++ b/drivers/storage/port/scsiport/scsiport.h @@ -437,7 +437,8 @@ RegistryInitLunKey( VOID SpiGetNextRequestFromLun( _In_ PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, - _Inout_ PSCSI_PORT_LUN_EXTENSION LunExtension); + _Inout_ PSCSI_PORT_LUN_EXTENSION LunExtension, + _Inout_opt_ PKIRQL OldIrql); IO_DPC_ROUTINE ScsiPortDpcForIsr; DRIVER_DISPATCH ScsiPortDispatchScsi;

4 years

[reactos] 01/01: [USER32] Properly save EBX in the wndproc wrapper

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=484e959c29409742bbdbd… commit 484e959c29409742bbdbd115f76cfb590bf68e43 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Dec 9 10:00:35 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Dec 9 10:00:35 2020 +0100 [USER32] Properly save EBX in the wndproc wrapper --- win32ss/user/user32/windows/wndproc_fixup.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/user/user32/windows/wndproc_fixup.S b/win32ss/user/user32/windows/wndproc_fixup.S index d2c1d91bf7c..f010227dfb4 100644 --- a/win32ss/user/user32/windows/wndproc_fixup.S +++ b/win32ss/user/user32/windows/wndproc_fixup.S @@ -14,9 +14,9 @@ .code -/* +/* * LRESULT - * __cdecl + * __cdecl * CALL_EXTERN_WNDPROC( * WNDPROC WndProc, * HWND hWnd, @@ -33,7 +33,7 @@ FUNC _CALL_EXTERN_WNDPROC push edi push esi - push ebp + push ebx sub esp, 12

4 years

← Newer
1
...
6
7
8
9
10
11
12
13
14
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 December 2020