Ros-diffs August 2021

ros-diffs@reactos.org

16 participants
93 discussions

[reactos] 03/03: [SFLOPPY] Move storage/floppy_new -> storage/class/sfloppy
by Victor Perevertkin 07 Aug '21

07 Aug '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3927ad9d4779a30535110… commit 3927ad9d4779a3053511004b8595e68898aeeefa Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sun Aug 8 01:35:59 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sun Aug 8 02:42:34 2021 +0300 [SFLOPPY] Move storage/floppy_new -> storage/class/sfloppy This is a SCSI Floppy driver, which depends on classpnp. Don't mix that with the other floppy (FDC) stack. --- drivers/storage/class/CMakeLists.txt | 1 + drivers/storage/class/sfloppy/CMakeLists.txt | 11 +++ .../storage/{floppy_new => class/sfloppy}/floppy.c | 0 .../storage/{floppy_new => class/sfloppy}/guid.c | 0 drivers/storage/class/sfloppy/license.txt | 23 ++++++ drivers/storage/class/sfloppy/sfloppy.inf | 87 ++++++++++++++++++++++ drivers/storage/class/sfloppy/sfloppy.rc | 22 ++++++ .../sfloppy/sfloppy_reg.inf} | 4 +- drivers/storage/floppy_new/CMakeLists.txt | 9 --- drivers/storage/floppy_new/floppy.rc | 13 ---- media/doc/3rd Party Files.txt | 4 +- 11 files changed, 148 insertions(+), 26 deletions(-) diff --git a/drivers/storage/class/CMakeLists.txt b/drivers/storage/class/CMakeLists.txt index f84026a6fa5..334af836a86 100644 --- a/drivers/storage/class/CMakeLists.txt +++ b/drivers/storage/class/CMakeLists.txt @@ -2,3 +2,4 @@ add_subdirectory(cdrom) add_subdirectory(classpnp) add_subdirectory(disk) add_subdirectory(ramdisk) +#add_subdirectory(sfloppy) diff --git a/drivers/storage/class/sfloppy/CMakeLists.txt b/drivers/storage/class/sfloppy/CMakeLists.txt new file mode 100644 index 00000000000..41397d565c9 --- /dev/null +++ b/drivers/storage/class/sfloppy/CMakeLists.txt @@ -0,0 +1,11 @@ + +list(APPEND SOURCE + guid.c + floppy.c) + +add_library(sfloppy MODULE ${SOURCE} floppy.rc) +set_module_type(sfloppy kernelmodedriver) +add_importlibs(sfloppy classpnp hal ntoskrnl) +add_cd_file(TARGET sfloppy DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_driver_inf(sfloppy sfloppy.inf) +add_registry_inf(sfloppy_reg.inf) diff --git a/drivers/storage/floppy_new/floppy.c b/drivers/storage/class/sfloppy/floppy.c similarity index 100% rename from drivers/storage/floppy_new/floppy.c rename to drivers/storage/class/sfloppy/floppy.c diff --git a/drivers/storage/floppy_new/guid.c b/drivers/storage/class/sfloppy/guid.c similarity index 100% rename from drivers/storage/floppy_new/guid.c rename to drivers/storage/class/sfloppy/guid.c diff --git a/drivers/storage/class/sfloppy/license.txt b/drivers/storage/class/sfloppy/license.txt new file mode 100644 index 00000000000..6ef3ee38d1c --- /dev/null +++ b/drivers/storage/class/sfloppy/license.txt @@ -0,0 +1,23 @@ +The Microsoft Public License (MS-PL) +Copyright (c) 2015 Microsoft + +This license governs use of the accompanying software. If you use the software, you + accept this license. If you do not accept the license, do not use the software. + +1. Definitions + The terms "reproduce," "reproduction," "derivative works," and "distribution" have the + same meaning here as under U.S. copyright law. + A "contribution" is the original software, or any additions or changes to the software. + A "contributor" is any person that distributes its contribution under this license. + "Licensed patents" are a contributor's patent claims that read directly on its contribution. + +2. Grant of Rights + (A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create. + (B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software. + +3. Conditions and Limitations + (A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks. + (B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically. + (C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software. + (D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license. + (E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement. diff --git a/drivers/storage/class/sfloppy/sfloppy.inf b/drivers/storage/class/sfloppy/sfloppy.inf new file mode 100644 index 00000000000..5eb2f79aec8 --- /dev/null +++ b/drivers/storage/class/sfloppy/sfloppy.inf @@ -0,0 +1,87 @@ +; sfloppy.inf +; +; Installation inf for the Floppy Disk Driver (DDK Sample). +; +; (c) Copyright 2002 Microsoft +; +[Version] +Signature="$WINDOWS NT$" +Class=FloppyDisk +ClassGuid={4D36E980-E325-11CE-BFC1-08002BE10318} +Provider=%ProviderString% +CatalogFile=ddk_sample.cat +DriverVer=05/17/2002,5.2.3635.0 + +;You must specify which platform is supported by each SourceDisksNames section +;Valid platform identifiers include .x86, .ia64, .alpha, .axp64 +[SourceDisksNames] +12=%floppyClassName%,,, + +;You must also specify which platform is supported by each SourceDisksFiles section +;Valid platform identifiers include .x86, .ia64, .alpha, .axp64 +[SourceDisksFiles] +sfloppy.sys=12 + +[ControlFlags] +ExcludeFromSelect=* + +[DestinationDirs] +sfloppy_copyfiles=12 +DefaultDestDir=12 + +[Manufacturer] +%ManufacturerName%=floppy_device,NTx86,NTia64,NTamd64 + +[floppy_device.NTx86] +%sfloppy_devdesc%=sfloppy_install,GenSFloppy +%sfloppy_devdesc%=sfloppy_install,SCSI\DiskMATSHITALS-120_COSM___04 +%sfloppy_devdesc%=sfloppy_install,SCSI\DiskCOMPAQ__LS-120_VER5___AB +%sfloppy_devdesc%=sfloppy_install,SCSI\DiskCOMPAQ__LS-120_HIMA___01 +%sfloppy_devdesc%=sfloppy_install,SCSI\DiskMATSHITALS-120_VER5___00 + +[floppy_device.NTia64] +%sfloppy_devdesc%=sfloppy_install,GenSFloppy +%sfloppy_devdesc%=sfloppy_install,SCSI\DiskMATSHITALS-120_COSM___04 +%sfloppy_devdesc%=sfloppy_install,SCSI\DiskCOMPAQ__LS-120_VER5___AB +%sfloppy_devdesc%=sfloppy_install,SCSI\DiskCOMPAQ__LS-120_HIMA___01 +%sfloppy_devdesc%=sfloppy_install,SCSI\DiskMATSHITALS-120_VER5___00 + +[floppy_device.NTamd64] +%sfloppy_devdesc%=sfloppy_install,GenSFloppy +%sfloppy_devdesc%=sfloppy_install,SCSI\DiskMATSHITALS-120_COSM___04 +%sfloppy_devdesc%=sfloppy_install,SCSI\DiskCOMPAQ__LS-120_VER5___AB +%sfloppy_devdesc%=sfloppy_install,SCSI\DiskCOMPAQ__LS-120_HIMA___01 +%sfloppy_devdesc%=sfloppy_install,SCSI\DiskMATSHITALS-120_VER5___00 + +;; +;; super floppy +;; +[sfloppy_install.NT] +CopyFiles=sfloppy_copyfiles + +[sfloppy_copyfiles] +sfloppy.sys + +[sfloppy_install.NT.Services] +AddService=sfloppy,2,sfloppy_ServiceInstallSection + +[sfloppy_ServiceInstallSection] +DisplayName=%sfloppy_devdesc% +ServiceType=1 +StartType=3 +ErrorControl=1 +ServiceBinary = %12%\sfloppy.sys + +[sfloppy_install.NT.HW] +AddReg=sfloppyEnable.RegHW + +[sfloppyEnable.RegHW] +HKR,,SuperFloppy,%REG_DWORD%,0x00000001 + +[Strings] +ProviderString="TODO-Set-Provider" +ManufacturerName="TODO-Set-Manufacturer" +floppyClassName="Floppy disk drives" +sfloppy_devdesc="High-Capacity Floppy Disk Drive" + +REG_DWORD=0x00010001 diff --git a/drivers/storage/class/sfloppy/sfloppy.rc b/drivers/storage/class/sfloppy/sfloppy.rc new file mode 100644 index 00000000000..f08b614ef81 --- /dev/null +++ b/drivers/storage/class/sfloppy/sfloppy.rc @@ -0,0 +1,22 @@ +//+------------------------------------------------------------------------- +// +// Microsoft Windows +// +// Copyright (C) Microsoft Corporation, 1997 - 1999 +// +// File: sfloppy.rc +// +//-------------------------------------------------------------------------- + +#include <windows.h> + +#include <ntverp.h> + +#define VER_FILETYPE VFT_DRV +#define VER_FILESUBTYPE VFT2_DRV_SYSTEM +#define VER_FILEDESCRIPTION_STR "SCSI Floppy Driver" +#define VER_INTERNALNAME_STR "sfloppy.sys" +#define VER_ORIGINALFILENAME_STR "sfloppy.sys" +#define VER_LANGNEUTRAL + +#include "common.ver" diff --git a/drivers/storage/floppy_new/floppy_reg.inf b/drivers/storage/class/sfloppy/sfloppy_reg.inf similarity index 87% rename from drivers/storage/floppy_new/floppy_reg.inf rename to drivers/storage/class/sfloppy/sfloppy_reg.inf index ad620f4b3ee..32f92141240 100644 --- a/drivers/storage/floppy_new/floppy_reg.inf +++ b/drivers/storage/class/sfloppy/sfloppy_reg.inf @@ -1,7 +1,7 @@ -; Floppy driver +; SCSI Floppy driver [AddReg] HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Group",0x00000000,"Primary Disk" -HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ImagePath",0x00020000,"system32\drivers\floppy.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ImagePath",0x00020000,"system32\drivers\sfloppy.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Type",0x00010001,0x00000001 diff --git a/drivers/storage/floppy_new/CMakeLists.txt b/drivers/storage/floppy_new/CMakeLists.txt deleted file mode 100644 index f52dba85b1a..00000000000 --- a/drivers/storage/floppy_new/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -list(APPEND SOURCE - guid.c - floppy.c) - -add_library(floppy MODULE ${SOURCE} floppy.rc) -set_module_type(floppy kernelmodedriver) -add_importlibs(floppy classpnp hal ntoskrnl) -add_cd_file(TARGET floppy DESTINATION reactos/system32/drivers NO_CAB FOR all) -add_registry_inf(floppy_reg.inf) diff --git a/drivers/storage/floppy_new/floppy.rc b/drivers/storage/floppy_new/floppy.rc deleted file mode 100644 index d23ec119d46..00000000000 --- a/drivers/storage/floppy_new/floppy.rc +++ /dev/null @@ -1,13 +0,0 @@ -/* - * PROJECT: ReactOS Floppy Driver - * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/storage/floppy/floppy.rc - * PURPOSE: Resource definition file - * PROGRAMMERS: Vizzini (vizzini(a)plasmic.com) - */ - -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "Floppy Disk Controller Driver" -#define REACTOS_STR_INTERNAL_NAME "floppy" -#define REACTOS_STR_ORIGINAL_FILENAME "floppy.sys" -#include <reactos/version.rc> diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index bc533b0d833..745f329f1bd 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -133,8 +133,8 @@ Used Version: git commit 3428c5f License: MS-PL (https://spdx.org/licenses/MS-PL.html) URL: https://github.com/microsoft/Windows-driver-samples/tree/master/storage/cla… -Title: Microsoft Super Floppy (sfloppy) Storage Class Driver -Path: drivers/storage/floppy_new +Title: Microsoft SCSI Floppy (sfloppy) Storage Class Driver +Path: drivers/storage/class/sfloppy Used Version: git commit 8fb512a License: MS-PL (https://spdx.org/licenses/MS-PL.html) URL: https://github.com/microsoft/Windows-driver-samples/tree/master/storage/sfl…

1 0

[reactos] 02/03: [CDROM][DISK] Remove "_new" suffix from cdrom and disk drivers
by Victor Perevertkin 07 Aug '21

07 Aug '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3088717b3f8ce7fa86081… commit 3088717b3f8ce7fa86081d6481463fbd3c9e8274 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sun Aug 8 01:25:05 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sun Aug 8 02:42:34 2021 +0300 [CDROM][DISK] Remove "_new" suffix from cdrom and disk drivers --- drivers/storage/class/CMakeLists.txt | 4 ++-- drivers/storage/class/{cdrom_new => cdrom}/CMakeLists.txt | 0 drivers/storage/class/{cdrom_new => cdrom}/aacs.c | 0 drivers/storage/class/{cdrom_new => cdrom}/autorun.c | 0 drivers/storage/class/{cdrom_new => cdrom}/cdrom.c | 0 drivers/storage/class/{cdrom_new => cdrom}/cdrom.h | 0 drivers/storage/class/{cdrom_new => cdrom}/cdrom.inf | 0 drivers/storage/class/{cdrom_new => cdrom}/cdrom.rc | 0 drivers/storage/class/{cdrom_new => cdrom}/cdrom_reg.inf | 0 drivers/storage/class/{cdrom_new => cdrom}/cdromp.h | 0 drivers/storage/class/{cdrom_new => cdrom}/common.c | 0 drivers/storage/class/{cdrom_new => cdrom}/data.c | 0 drivers/storage/class/{cdrom_new => cdrom}/guid.c | 0 drivers/storage/class/{cdrom_new => cdrom}/init.c | 0 drivers/storage/class/{cdrom_new => cdrom}/ioctl.c | 0 drivers/storage/class/{cdrom_new => cdrom}/ioctl.h | 0 drivers/storage/class/{cdrom_new => cdrom}/license.txt | 0 drivers/storage/class/{cdrom_new => cdrom}/localwpp.ini | 0 drivers/storage/class/{cdrom_new => cdrom}/mmc.c | 0 drivers/storage/class/{cdrom_new => cdrom}/mmc.h | 0 drivers/storage/class/{cdrom_new => cdrom}/pnppower.c | 0 drivers/storage/class/{cdrom_new => cdrom}/scratch.c | 0 drivers/storage/class/{cdrom_new => cdrom}/scratch.h | 0 drivers/storage/class/{cdrom_new => cdrom}/sense.c | 0 drivers/storage/class/{cdrom_new => cdrom}/zpodd.c | 0 drivers/storage/class/{disk_new => disk}/CMakeLists.txt | 0 drivers/storage/class/{disk_new => disk}/data.c | 0 drivers/storage/class/{disk_new => disk}/disk.c | 0 drivers/storage/class/{disk_new => disk}/disk.h | 0 drivers/storage/class/{disk_new => disk}/disk.inf | 0 drivers/storage/class/{disk_new => disk}/disk.rc | 0 drivers/storage/class/{disk_new => disk}/disk_reg.inf | 0 drivers/storage/class/{disk_new => disk}/diskwmi.c | 0 drivers/storage/class/{disk_new => disk}/geometry.c | 0 drivers/storage/class/{disk_new => disk}/license.txt | 0 drivers/storage/class/{disk_new => disk}/pnp.c | 0 media/doc/3rd Party Files.txt | 4 ++-- 37 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/storage/class/CMakeLists.txt b/drivers/storage/class/CMakeLists.txt index 1c275b94d48..f84026a6fa5 100644 --- a/drivers/storage/class/CMakeLists.txt +++ b/drivers/storage/class/CMakeLists.txt @@ -1,4 +1,4 @@ -add_subdirectory(cdrom_new) +add_subdirectory(cdrom) add_subdirectory(classpnp) -add_subdirectory(disk_new) +add_subdirectory(disk) add_subdirectory(ramdisk) diff --git a/drivers/storage/class/cdrom_new/CMakeLists.txt b/drivers/storage/class/cdrom/CMakeLists.txt similarity index 100% rename from drivers/storage/class/cdrom_new/CMakeLists.txt rename to drivers/storage/class/cdrom/CMakeLists.txt diff --git a/drivers/storage/class/cdrom_new/aacs.c b/drivers/storage/class/cdrom/aacs.c similarity index 100% rename from drivers/storage/class/cdrom_new/aacs.c rename to drivers/storage/class/cdrom/aacs.c diff --git a/drivers/storage/class/cdrom_new/autorun.c b/drivers/storage/class/cdrom/autorun.c similarity index 100% rename from drivers/storage/class/cdrom_new/autorun.c rename to drivers/storage/class/cdrom/autorun.c diff --git a/drivers/storage/class/cdrom_new/cdrom.c b/drivers/storage/class/cdrom/cdrom.c similarity index 100% rename from drivers/storage/class/cdrom_new/cdrom.c rename to drivers/storage/class/cdrom/cdrom.c diff --git a/drivers/storage/class/cdrom_new/cdrom.h b/drivers/storage/class/cdrom/cdrom.h similarity index 100% rename from drivers/storage/class/cdrom_new/cdrom.h rename to drivers/storage/class/cdrom/cdrom.h diff --git a/drivers/storage/class/cdrom_new/cdrom.inf b/drivers/storage/class/cdrom/cdrom.inf similarity index 100% rename from drivers/storage/class/cdrom_new/cdrom.inf rename to drivers/storage/class/cdrom/cdrom.inf diff --git a/drivers/storage/class/cdrom_new/cdrom.rc b/drivers/storage/class/cdrom/cdrom.rc similarity index 100% rename from drivers/storage/class/cdrom_new/cdrom.rc rename to drivers/storage/class/cdrom/cdrom.rc diff --git a/drivers/storage/class/cdrom_new/cdrom_reg.inf b/drivers/storage/class/cdrom/cdrom_reg.inf similarity index 100% rename from drivers/storage/class/cdrom_new/cdrom_reg.inf rename to drivers/storage/class/cdrom/cdrom_reg.inf diff --git a/drivers/storage/class/cdrom_new/cdromp.h b/drivers/storage/class/cdrom/cdromp.h similarity index 100% rename from drivers/storage/class/cdrom_new/cdromp.h rename to drivers/storage/class/cdrom/cdromp.h diff --git a/drivers/storage/class/cdrom_new/common.c b/drivers/storage/class/cdrom/common.c similarity index 100% rename from drivers/storage/class/cdrom_new/common.c rename to drivers/storage/class/cdrom/common.c diff --git a/drivers/storage/class/cdrom_new/data.c b/drivers/storage/class/cdrom/data.c similarity index 100% rename from drivers/storage/class/cdrom_new/data.c rename to drivers/storage/class/cdrom/data.c diff --git a/drivers/storage/class/cdrom_new/guid.c b/drivers/storage/class/cdrom/guid.c similarity index 100% rename from drivers/storage/class/cdrom_new/guid.c rename to drivers/storage/class/cdrom/guid.c diff --git a/drivers/storage/class/cdrom_new/init.c b/drivers/storage/class/cdrom/init.c similarity index 100% rename from drivers/storage/class/cdrom_new/init.c rename to drivers/storage/class/cdrom/init.c diff --git a/drivers/storage/class/cdrom_new/ioctl.c b/drivers/storage/class/cdrom/ioctl.c similarity index 100% rename from drivers/storage/class/cdrom_new/ioctl.c rename to drivers/storage/class/cdrom/ioctl.c diff --git a/drivers/storage/class/cdrom_new/ioctl.h b/drivers/storage/class/cdrom/ioctl.h similarity index 100% rename from drivers/storage/class/cdrom_new/ioctl.h rename to drivers/storage/class/cdrom/ioctl.h diff --git a/drivers/storage/class/cdrom_new/license.txt b/drivers/storage/class/cdrom/license.txt similarity index 100% rename from drivers/storage/class/cdrom_new/license.txt rename to drivers/storage/class/cdrom/license.txt diff --git a/drivers/storage/class/cdrom_new/localwpp.ini b/drivers/storage/class/cdrom/localwpp.ini similarity index 100% rename from drivers/storage/class/cdrom_new/localwpp.ini rename to drivers/storage/class/cdrom/localwpp.ini diff --git a/drivers/storage/class/cdrom_new/mmc.c b/drivers/storage/class/cdrom/mmc.c similarity index 100% rename from drivers/storage/class/cdrom_new/mmc.c rename to drivers/storage/class/cdrom/mmc.c diff --git a/drivers/storage/class/cdrom_new/mmc.h b/drivers/storage/class/cdrom/mmc.h similarity index 100% rename from drivers/storage/class/cdrom_new/mmc.h rename to drivers/storage/class/cdrom/mmc.h diff --git a/drivers/storage/class/cdrom_new/pnppower.c b/drivers/storage/class/cdrom/pnppower.c similarity index 100% rename from drivers/storage/class/cdrom_new/pnppower.c rename to drivers/storage/class/cdrom/pnppower.c diff --git a/drivers/storage/class/cdrom_new/scratch.c b/drivers/storage/class/cdrom/scratch.c similarity index 100% rename from drivers/storage/class/cdrom_new/scratch.c rename to drivers/storage/class/cdrom/scratch.c diff --git a/drivers/storage/class/cdrom_new/scratch.h b/drivers/storage/class/cdrom/scratch.h similarity index 100% rename from drivers/storage/class/cdrom_new/scratch.h rename to drivers/storage/class/cdrom/scratch.h diff --git a/drivers/storage/class/cdrom_new/sense.c b/drivers/storage/class/cdrom/sense.c similarity index 100% rename from drivers/storage/class/cdrom_new/sense.c rename to drivers/storage/class/cdrom/sense.c diff --git a/drivers/storage/class/cdrom_new/zpodd.c b/drivers/storage/class/cdrom/zpodd.c similarity index 100% rename from drivers/storage/class/cdrom_new/zpodd.c rename to drivers/storage/class/cdrom/zpodd.c diff --git a/drivers/storage/class/disk_new/CMakeLists.txt b/drivers/storage/class/disk/CMakeLists.txt similarity index 100% rename from drivers/storage/class/disk_new/CMakeLists.txt rename to drivers/storage/class/disk/CMakeLists.txt diff --git a/drivers/storage/class/disk_new/data.c b/drivers/storage/class/disk/data.c similarity index 100% rename from drivers/storage/class/disk_new/data.c rename to drivers/storage/class/disk/data.c diff --git a/drivers/storage/class/disk_new/disk.c b/drivers/storage/class/disk/disk.c similarity index 100% rename from drivers/storage/class/disk_new/disk.c rename to drivers/storage/class/disk/disk.c diff --git a/drivers/storage/class/disk_new/disk.h b/drivers/storage/class/disk/disk.h similarity index 100% rename from drivers/storage/class/disk_new/disk.h rename to drivers/storage/class/disk/disk.h diff --git a/drivers/storage/class/disk_new/disk.inf b/drivers/storage/class/disk/disk.inf similarity index 100% rename from drivers/storage/class/disk_new/disk.inf rename to drivers/storage/class/disk/disk.inf diff --git a/drivers/storage/class/disk_new/disk.rc b/drivers/storage/class/disk/disk.rc similarity index 100% rename from drivers/storage/class/disk_new/disk.rc rename to drivers/storage/class/disk/disk.rc diff --git a/drivers/storage/class/disk_new/disk_reg.inf b/drivers/storage/class/disk/disk_reg.inf similarity index 100% rename from drivers/storage/class/disk_new/disk_reg.inf rename to drivers/storage/class/disk/disk_reg.inf diff --git a/drivers/storage/class/disk_new/diskwmi.c b/drivers/storage/class/disk/diskwmi.c similarity index 100% rename from drivers/storage/class/disk_new/diskwmi.c rename to drivers/storage/class/disk/diskwmi.c diff --git a/drivers/storage/class/disk_new/geometry.c b/drivers/storage/class/disk/geometry.c similarity index 100% rename from drivers/storage/class/disk_new/geometry.c rename to drivers/storage/class/disk/geometry.c diff --git a/drivers/storage/class/disk_new/license.txt b/drivers/storage/class/disk/license.txt similarity index 100% rename from drivers/storage/class/disk_new/license.txt rename to drivers/storage/class/disk/license.txt diff --git a/drivers/storage/class/disk_new/pnp.c b/drivers/storage/class/disk/pnp.c similarity index 100% rename from drivers/storage/class/disk_new/pnp.c rename to drivers/storage/class/disk/pnp.c diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 816500a77a4..bc533b0d833 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -116,7 +116,7 @@ License: BSD-3-Clause (https://spdx.org/licenses/BSD-3-Clause.html) URL: https://github.com/virtio-win/kvm-guest-drivers-windows/tree/master/NetKVM/… Title: Microsoft CDROM Storage Class Driver -Path: drivers/storage/class/cdrom_new +Path: drivers/storage/class/cdrom Used Version: git commit 96eb96d License: MS-PL (https://spdx.org/licenses/MS-PL.html) URL: https://github.com/microsoft/Windows-driver-samples/tree/master/storage/cla… @@ -128,7 +128,7 @@ License: MS-PL (https://spdx.org/licenses/MS-PL.html) URL: https://github.com/microsoft/Windows-driver-samples/tree/master/storage/cla… Title: Microsoft Disk Class Driver -Path: drivers/storage/class/disk_new +Path: drivers/storage/class/disk Used Version: git commit 3428c5f License: MS-PL (https://spdx.org/licenses/MS-PL.html) URL: https://github.com/microsoft/Windows-driver-samples/tree/master/storage/cla…

1 0

[reactos] 01/03: [CDROM][CLASS2][DISK] Remove the old class drivers stack
by Victor Perevertkin 07 Aug '21

07 Aug '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49444127fd4ca7f488c42… commit 49444127fd4ca7f488c429e3b8a3253865243e39 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sun Aug 8 01:15:10 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sun Aug 8 02:42:30 2021 +0300 [CDROM][CLASS2][DISK] Remove the old class drivers stack These drivers are based on NT4 DDK sample code, were originally started by Alexey Bragin and then constantly patched by Pierre Schweitzer to fix compatibility with NT5+ storage stack. Replaced with Microsoft drivers published on GitHub by an open license. These drivers were originally added as part of 4e7b22b216725e1e7c0dff19ab0312039ff5005c --- drivers/storage/class/cdrom/CMakeLists.txt | 15 - drivers/storage/class/cdrom/cdrom.c | 7359 --------------------------- drivers/storage/class/cdrom/cdrom.inf | 122 - drivers/storage/class/cdrom/cdrom.rc | 5 - drivers/storage/class/cdrom/cdrom_reg.inf | 7 - drivers/storage/class/cdrom/findscsi.c | 308 -- drivers/storage/class/cdrom/license.txt | 53 - drivers/storage/class/cdrom/precomp.h | 9 - drivers/storage/class/class2/CMakeLists.txt | 13 - drivers/storage/class/class2/class2.c | 5007 ------------------ drivers/storage/class/class2/class2.rc | 5 - drivers/storage/class/class2/class2.spec | 22 - drivers/storage/class/class2/license.txt | 53 - drivers/storage/class/disk/CMakeLists.txt | 8 - drivers/storage/class/disk/disk.c | 5440 -------------------- drivers/storage/class/disk/disk.inf | 136 - drivers/storage/class/disk/disk.rc | 5 - drivers/storage/class/disk/disk_reg.inf | 7 - drivers/storage/class/disk/license.txt | 53 - drivers/storage/class/include/class2.h | 267 - drivers/storage/inc/class.h | 374 -- drivers/storage/inc/ide.h | 495 -- drivers/storage/inc/ideuser.h | 132 - drivers/storage/inc/physlogi.h | 115 - drivers/storage/inc/rbc.h | 180 - drivers/storage/inc/tape.h | 312 -- 26 files changed, 20502 deletions(-) diff --git a/drivers/storage/class/cdrom/CMakeLists.txt b/drivers/storage/class/cdrom/CMakeLists.txt deleted file mode 100644 index 97b7a2431df..00000000000 --- a/drivers/storage/class/cdrom/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/drivers/storage/class) - -list(APPEND SOURCE - cdrom.c - findscsi.c - precomp.h) - -add_library(cdrom MODULE ${SOURCE} cdrom.rc) -set_module_type(cdrom kernelmodedriver) -add_importlibs(cdrom class2 scsiport ntoskrnl hal) -add_pch(cdrom precomp.h SOURCE) -add_cd_file(TARGET cdrom DESTINATION reactos/system32/drivers NO_CAB FOR all) -add_registry_inf(cdrom_reg.inf) -add_driver_inf(cdrom cdrom.inf) diff --git a/drivers/storage/class/cdrom/cdrom.c b/drivers/storage/class/cdrom/cdrom.c deleted file mode 100644 index 2794e62f2ea..00000000000 --- a/drivers/storage/class/cdrom/cdrom.c +++ /dev/null @@ -1,7359 +0,0 @@ -/* - * PROJECT: ReactOS Storage Stack - * LICENSE: DDK - see license.txt in the root dir - * FILE: drivers/storage/cdrom/cdrom.c - * PURPOSE: CDROM driver - * PROGRAMMERS: Based on a source code sample from Microsoft NT4 DDK - */ - -#include "precomp.h" - -#include <ntddk.h> -#include <scsi.h> -#include <ntdddisk.h> -#include <ntddcdrm.h> -#include <include/class2.h> -#include <stdio.h> - -//#define NDEBUG -#include <debug.h> - -#define CDB12GENERIC_LENGTH 12 - -typedef struct _XA_CONTEXT { - - // - // Pointer to the device object. - // - - PDEVICE_OBJECT DeviceObject; - - // - // Pointer to the original request when - // a mode select must be sent. - // - - PIRP OriginalRequest; - - // - // Pointer to the mode select srb. - // - - PSCSI_REQUEST_BLOCK Srb; -} XA_CONTEXT, *PXA_CONTEXT; - -typedef struct _ERROR_RECOVERY_DATA { - MODE_PARAMETER_HEADER Header; - MODE_PARAMETER_BLOCK BlockDescriptor; - MODE_READ_RECOVERY_PAGE ReadRecoveryPage; -} ERROR_RECOVERY_DATA, *PERROR_RECOVERY_DATA; - -typedef struct _ERROR_RECOVERY_DATA10 { - MODE_PARAMETER_HEADER10 Header10; - MODE_PARAMETER_BLOCK BlockDescriptor10; - MODE_READ_RECOVERY_PAGE ReadRecoveryPage10; -} ERROR_RECOVERY_DATA10, *PERROR_RECOVERY_DATA10; - -// -// CdRom specific addition to device extension. -// - -typedef struct _CDROM_DATA { - - // - // Indicates whether an audio play operation - // is currently being performed. - // - - BOOLEAN PlayActive; - - // - // Indicates whether the blocksize used for user data - // is 2048 or 2352. - // - - BOOLEAN RawAccess; - - // - // Indicates whether 6 or 10 byte mode sense/select - // should be used. - // - - USHORT XAFlags; - - // - // Storage for the error recovery page. This is used - // as an easy method to switch block sizes. - // - - union { - ERROR_RECOVERY_DATA u1; - ERROR_RECOVERY_DATA10 u2; - }; - - - // - // Pointer to the original irp for the raw read. - // - - PIRP SavedReadIrp; - - // - // Used to protect accesses to the RawAccess flag. - // - - KSPIN_LOCK FormSpinLock; - - // - // Even if media change support is requested, there are some devices - // that are not supported. This flag will indicate that such a device - // is present when it is FALSE. - // - - BOOLEAN MediaChangeSupported; - - // - // The media change event is being supported. The media change timer - // should be running whenever this is true. - // - - BOOLEAN MediaChange; - - // - // The timer value to support media change events. This is a countdown - // value used to determine when to poll the device for a media change. - // The max value for the timer is 255 seconds. - // - - UCHAR MediaChangeCountDown; - -#if DBG - // - // Second timer to keep track of how long the media change IRP has been - // in use. If this value exceeds the timeout (#defined) then we should - // print out a message to the user and set the MediaChangeIrpLost flag - // - - SHORT MediaChangeIrpTimeInUse; - - // - // Set by CdRomTickHandler when we determine that the media change irp has - // been lost - // - - BOOLEAN MediaChangeIrpLost; -#endif - - UCHAR PadReserve; // use this for new flags. - - // - // An IRP is allocated and kept for the duration that media change - // detection is in effect. If this is NULL and MediaChange is TRUE, - // the detection is in progress. This should always be NULL when - // MediaChange is FALSE. - // - - PIRP MediaChangeIrp; - - // - // The timer work list is a collection of IRPS that are prepared for - // submission, but need to allow some time to pass before they are - // run. - // - - LIST_ENTRY TimerIrpList; - KSPIN_LOCK TimerIrpSpinLock; - -} CDROM_DATA, *PCDROM_DATA; - -#define DEVICE_EXTENSION_SIZE sizeof(DEVICE_EXTENSION) + sizeof(CDROM_DATA) -#define SCSI_CDROM_TIMEOUT 10 -#define SCSI_CHANGER_BONUS_TIMEOUT 10 -#define HITACHI_MODE_DATA_SIZE 12 -#define MODE_DATA_SIZE 64 -#define RAW_SECTOR_SIZE 2352 -#define COOKED_SECTOR_SIZE 2048 -#define MEDIA_CHANGE_DEFAULT_TIME 4 -#define CDROM_SRB_LIST_SIZE 4 - - -#if DBG - -// -// Used to detect the loss of the autorun irp. The driver prints out a message -// (debug level 0) if this timeout ever occurs -// -#define MEDIA_CHANGE_TIMEOUT_TIME 300 - -#endif - -#define PLAY_ACTIVE(DeviceExtension) (((PCDROM_DATA)(DeviceExtension + 1))->PlayActive) - -#define MSF_TO_LBA(Minutes,Seconds,Frames) \ - (ULONG)((60 * 75 * (Minutes)) + (75 * (Seconds)) + ((Frames) - 150)) - -#define LBA_TO_MSF(Lba,Minutes,Seconds,Frames) \ -{ \ - (Minutes) = (UCHAR)(Lba / (60 * 75)); \ - (Seconds) = (UCHAR)((Lba % (60 * 75)) / 75); \ - (Frames) = (UCHAR)((Lba % (60 * 75)) % 75); \ -} - -#define DEC_TO_BCD(x) (((x / 10) << 4) + (x % 10)) - -// -// Define flags for XA, CDDA, and Mode Select/Sense -// - -#define XA_USE_6_BYTE 0x01 -#define XA_USE_10_BYTE 0x02 -#define XA_USE_READ_CD 0x04 -#define XA_NOT_SUPPORTED 0x08 - -#define PLEXTOR_CDDA 0x10 -#define NEC_CDDA 0x20 - -// -// Sector types for READ_CD -// - -#define ANY_SECTOR 0 -#define CD_DA_SECTOR 1 -#define YELLOW_MODE1_SECTOR 2 -#define YELLOW_MODE2_SECTOR 3 -#define FORM2_MODE1_SECTOR 4 -#define FORM2_MODE2_SECTOR 5 - - -#ifdef POOL_TAGGING -#ifdef ExAllocatePool -#undef ExAllocatePool -#endif -#define ExAllocatePool(a,b) ExAllocatePoolWithTag(a,b,'CscS') -#endif - -NTSTATUS -NTAPI -DriverEntry( - IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath - ); - -BOOLEAN -NTAPI -ScsiCdRomFindDevices( - IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath, - IN PCLASS_INIT_DATA InitializationData, - IN PDEVICE_OBJECT PortDeviceObject, - IN ULONG PortNumber - ); - -NTSTATUS -NTAPI -ScsiCdRomOpenClose( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp - ); - -NTSTATUS -NTAPI -ScsiCdRomReadVerification( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp - ); - -NTSTATUS -NTAPI -ScsiCdRomSwitchMode( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN PIRP OriginalRequest - ); - -NTSTATUS -NTAPI -CdRomDeviceControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp - ); - -IO_COMPLETION_ROUTINE CdRomDeviceControlCompletion; -NTSTATUS -NTAPI -CdRomDeviceControlCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context - ); - -IO_COMPLETION_ROUTINE CdRomSetVolumeIntermediateCompletion; -NTSTATUS -NTAPI -CdRomSetVolumeIntermediateCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context - ); - -IO_COMPLETION_ROUTINE CdRomSwitchModeCompletion; -NTSTATUS -NTAPI -CdRomSwitchModeCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context - ); - -IO_COMPLETION_ROUTINE CdRomXACompletion; -NTSTATUS -NTAPI -CdRomXACompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context - ); - -IO_COMPLETION_ROUTINE CdRomClassIoctlCompletion; -NTSTATUS -NTAPI -CdRomClassIoctlCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context - ); - -VOID -NTAPI -ScsiCdRomStartIo( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp - ); - -VOID -NTAPI -CdRomTickHandler( - IN PDEVICE_OBJECT DeviceObject, - IN PVOID Context - ); - -BOOLEAN -NTAPI -CdRomCheckRegistryForMediaChangeValue( - IN PUNICODE_STRING RegistryPath, - IN ULONG DeviceNumber - ); - -NTSTATUS -NTAPI -CdRomUpdateCapacity( - IN PDEVICE_EXTENSION DeviceExtension, - IN PIRP IrpToComplete, - IN OPTIONAL PKEVENT IoctlEvent - ); - -NTSTATUS -NTAPI -CreateCdRomDeviceObject( - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT PortDeviceObject, - IN ULONG PortNumber, - IN PULONG DeviceCount, - PIO_SCSI_CAPABILITIES PortCapabilities, - IN PSCSI_INQUIRY_DATA LunInfo, - IN PCLASS_INIT_DATA InitializationData, - IN PUNICODE_STRING RegistryPath - ); - -VOID -NTAPI -ScanForSpecial( - PDEVICE_OBJECT DeviceObject, - PINQUIRYDATA InquiryData, - PIO_SCSI_CAPABILITIES PortCapabilities - ); - -BOOLEAN -NTAPI -CdRomIsPlayActive( - IN PDEVICE_OBJECT DeviceObject - ); - -VOID -NTAPI -HitachProcessError( - PDEVICE_OBJECT DeviceObject, - PSCSI_REQUEST_BLOCK Srb, - NTSTATUS *Status, - BOOLEAN *Retry - ); - -IO_COMPLETION_ROUTINE ToshibaProcessErrorCompletion; -VOID -NTAPI -ToshibaProcessError( - PDEVICE_OBJECT DeviceObject, - PSCSI_REQUEST_BLOCK Srb, - NTSTATUS *Status, - BOOLEAN *Retry - ); - -BOOLEAN -NTAPI -IsThisAnAtapiChanger( - IN PDEVICE_OBJECT DeviceObject, - OUT PULONG DiscsPresent - ); - -BOOLEAN -NTAPI -IsThisASanyo( - IN PDEVICE_OBJECT DeviceObject, - IN UCHAR PathId, - IN UCHAR TargetId - ); - -BOOLEAN -NTAPI -IsThisAMultiLunDevice( - IN PDEVICE_OBJECT DeviceObject, - IN PDEVICE_OBJECT PortDeviceObject - ); - -VOID -NTAPI -CdRomCreateNamedEvent( - IN PDEVICE_EXTENSION DeviceExtension, - IN ULONG DeviceNumber - ); - -#ifdef _PPC_ -NTSTATUS -FindScsiAdapter ( - IN HANDLE KeyHandle, - IN UNICODE_STRING ScsiUnicodeString[], - OUT PUCHAR IntermediateController - ); -#endif - -#ifdef ALLOC_PRAGMA -#pragma alloc_text(PAGE, DriverEntry) -#pragma alloc_text(PAGE, ScsiCdRomFindDevices) -#pragma alloc_text(PAGE, CreateCdRomDeviceObject) -#pragma alloc_text(PAGE, ScanForSpecial) -//#pragma alloc_text(PAGE, CdRomDeviceControl) -#pragma alloc_text(PAGE, HitachProcessError) -#pragma alloc_text(PAGE, CdRomIsPlayActive) -#pragma alloc_text(PAGE, ScsiCdRomReadVerification) -#pragma alloc_text(INIT, CdRomCheckRegistryForMediaChangeValue) -#pragma alloc_text(INIT, IsThisAnAtapiChanger) -#pragma alloc_text(INIT, IsThisASanyo) -#pragma alloc_text(INIT, IsThisAMultiLunDevice) -#pragma alloc_text(INIT, CdRomCreateNamedEvent) -#ifdef _PPC_ -#pragma alloc_text(PAGE, FindScsiAdapter) -#endif -#endif - -ULONG NoLoad = 0; - -NTSTATUS -NTAPI -DriverEntry( - IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath - ) - -/*++ - -Routine Description: - - This routine initializes the cdrom class driver. - -Arguments: - - DriverObject - Pointer to driver object created by system. - - RegistryPath - Pointer to the name of the services node for this driver. - -Return Value: - - The function value is the final status from the initialization operation. - ---*/ - -{ - CLASS_INIT_DATA InitializationData; - - if(NoLoad) { - return STATUS_NO_SUCH_DEVICE; - } - - // - // Zero InitData - // - - RtlZeroMemory (&InitializationData, sizeof(CLASS_INIT_DATA)); - - // - // Set sizes - // - - InitializationData.InitializationDataSize = sizeof(CLASS_INIT_DATA); - InitializationData.DeviceExtensionSize = DEVICE_EXTENSION_SIZE; - - InitializationData.DeviceType = FILE_DEVICE_CD_ROM; - InitializationData.DeviceCharacteristics = FILE_REMOVABLE_MEDIA | FILE_READ_ONLY_DEVICE; - - // - // Set entry points - // - - InitializationData.ClassReadWriteVerification = ScsiCdRomReadVerification; - InitializationData.ClassDeviceControl = CdRomDeviceControl; - InitializationData.ClassFindDevices = ScsiCdRomFindDevices; - InitializationData.ClassShutdownFlush = NULL; - InitializationData.ClassCreateClose = NULL; - InitializationData.ClassStartIo = ScsiCdRomStartIo; - - // - // Call the class init routine - // - - return ScsiClassInitialize( DriverObject, RegistryPath, &InitializationData); - -} // end DriverEntry() - -BOOLEAN -NTAPI -ScsiCdRomFindDevices( - IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath, - IN PCLASS_INIT_DATA InitializationData, - IN PDEVICE_OBJECT PortDeviceObject, - IN ULONG PortNumber - ) - -/*++ - -Routine Description: - - Connect to SCSI port driver. Get adapter capabilities and - SCSI bus configuration information. Search inquiry data - for CDROM devices to process. - -Arguments: - - DriverObject - CDROM class driver object. - PortDeviceObject - SCSI port driver device object. - PortNumber - The system ordinal for this scsi adapter. - -Return Value: - - TRUE if CDROM device present on this SCSI adapter. - ---*/ - -{ - PIO_SCSI_CAPABILITIES portCapabilities; - PULONG cdRomCount; - PCHAR buffer; - PSCSI_INQUIRY_DATA lunInfo; - PSCSI_ADAPTER_BUS_INFO adapterInfo; - PINQUIRYDATA inquiryData; - ULONG scsiBus; - NTSTATUS status; - BOOLEAN foundDevice = FALSE; - - // - // Call port driver to get adapter capabilities. - // - - status = ScsiClassGetCapabilities(PortDeviceObject, &portCapabilities); - - if (!NT_SUCCESS(status)) { - DebugPrint((1,"FindScsiDevices: ScsiClassGetCapabilities failed\n")); - return foundDevice; - } - - // - // Call port driver to get inquiry information to find cdroms. - // - - status = ScsiClassGetInquiryData(PortDeviceObject, (PSCSI_ADAPTER_BUS_INFO *) &buffer); - - if (!NT_SUCCESS(status)) { - DebugPrint((1,"FindScsiDevices: ScsiClassGetInquiryData failed\n")); - return foundDevice; - } - - // - // Get the address of the count of the number of cdroms already initialized. - // - - cdRomCount = &IoGetConfigurationInformation()->CdRomCount; - adapterInfo = (PVOID) buffer; - - // - // For each SCSI bus this adapter supports ... - // - - for (scsiBus=0; scsiBus < adapterInfo->NumberOfBuses; scsiBus++) { - - // - // Get the SCSI bus scan data for this bus. - // - - lunInfo = (PVOID) (buffer + adapterInfo->BusData[scsiBus].InquiryDataOffset); - - // - // Search list for unclaimed disk devices. - // - - while (adapterInfo->BusData[scsiBus].InquiryDataOffset) { - - inquiryData = (PVOID)lunInfo->InquiryData; - - if ((inquiryData->DeviceType == READ_ONLY_DIRECT_ACCESS_DEVICE) && - (inquiryData->DeviceTypeQualifier == 0) && - (!lunInfo->DeviceClaimed)) { - - DebugPrint((1,"FindScsiDevices: Vendor string is %.24s\n", - inquiryData->VendorId)); - - // - // Create device objects for cdrom - // - - status = CreateCdRomDeviceObject(DriverObject, - PortDeviceObject, - PortNumber, - cdRomCount, - portCapabilities, - lunInfo, - InitializationData, - RegistryPath); - - if (NT_SUCCESS(status)) { - - // - // Increment system cdrom device count. - // - - (*cdRomCount)++; - - // - // Indicate that a cdrom device was found. - // - - foundDevice = TRUE; - } - } - - // - // Get next LunInfo. - // - - if (lunInfo->NextInquiryDataOffset == 0) { - break; - } - - lunInfo = (PVOID) (buffer + lunInfo->NextInquiryDataOffset); - } - } - - ExFreePool(buffer); - - - return foundDevice; - -} // end FindScsiCdRoms() - -VOID -NTAPI -CdRomCreateNamedEvent( - IN PDEVICE_EXTENSION DeviceExtension, - IN ULONG DeviceNumber - ) - -/*++ - -Routine Description: - - Create the named synchronization event for notification of media change - events to the system. The event is reset before this function returns. - -Arguments: - - DeviceExtension - the device extension pointer for storage of the event pointer. - -Return Value: - - None. - ---*/ - -{ - UNICODE_STRING unicodeString; - OBJECT_ATTRIBUTES objectAttributes; - CCHAR eventNameBuffer[MAXIMUM_FILENAME_LENGTH]; - STRING eventNameString; - HANDLE handle; - NTSTATUS status; - - - sprintf(eventNameBuffer,"\\Device\\MediaChangeEvent%ld", - DeviceNumber); - - RtlInitString(&eventNameString, - eventNameBuffer); - - status = RtlAnsiStringToUnicodeString(&unicodeString, - &eventNameString, - TRUE); - - if (!NT_SUCCESS(status)) { - return; - } - - InitializeObjectAttributes(&objectAttributes, - &unicodeString, - OBJ_PERMANENT | OBJ_CASE_INSENSITIVE | OBJ_OPENIF, - NULL, - NULL); - - DeviceExtension->MediaChangeEvent = IoCreateSynchronizationEvent(&unicodeString, - &handle); - DeviceExtension->MediaChangeEventHandle = handle; - - KeClearEvent(DeviceExtension->MediaChangeEvent); - - RtlFreeUnicodeString(&unicodeString); -} - - -VOID -NTAPI -ReportToMountMgr( - IN PDEVICE_OBJECT CdDeviceObject - ) - -/*++ - -Routine Description: - - This routine reports the creation of a cdrom device object to the - MountMgr to fake PnP. - -Arguments: - - CdDeviceObject - Pointer to the created cdrom device. - -Return Value: - - VOID - ---*/ -{ - NTSTATUS status; - UNICODE_STRING mountMgrDevice; - PDEVICE_OBJECT deviceObject; - PFILE_OBJECT fileObject; - PMOUNTMGR_TARGET_NAME mountTarget; - ULONG cdLen; - PDEVICE_EXTENSION deviceExtension; - PIRP irp; - KEVENT event; - IO_STATUS_BLOCK ioStatus; - - // - // First, get MountMgr DeviceObject. - // - - RtlInitUnicodeString(&mountMgrDevice, MOUNTMGR_DEVICE_NAME); - status = IoGetDeviceObjectPointer(&mountMgrDevice, FILE_READ_ATTRIBUTES, - &fileObject, &deviceObject); - - if (!NT_SUCCESS(status)) { - - DebugPrint((1, - "ReportToMountMgr: Can't get MountMgr pointers %lx\n", - status)); - - return; - } - - deviceExtension = CdDeviceObject->DeviceExtension; - cdLen = deviceExtension->DeviceName.Length; - - // - // Allocate input buffer to report our partition device. - // - - mountTarget = ExAllocatePool(NonPagedPool, - sizeof(MOUNTMGR_TARGET_NAME) + cdLen); - - if (!mountTarget) { - - DebugPrint((1, - "ReportToMountMgr: Allocation of mountTarget failed\n")); - - ObDereferenceObject(fileObject); - return; - } - - mountTarget->DeviceNameLength = cdLen; - RtlCopyMemory(mountTarget->DeviceName, deviceExtension->DeviceName.Buffer, cdLen); - - KeInitializeEvent(&event, NotificationEvent, FALSE); - - // - // Build the IRP used to communicate with the MountMgr. - // - - irp = IoBuildDeviceIoControlRequest(IOCTL_MOUNTMGR_VOLUME_ARRIVAL_NOTIFICATION, - deviceObject, - mountTarget, - sizeof(MOUNTMGR_TARGET_NAME) + cdLen, - NULL, - 0, - FALSE, - &event, - &ioStatus); - - if (!irp) { - - DebugPrint((1, - "ReportToMountMgr: Allocation of irp failed\n")); - - ExFreePool(mountTarget); - ObDereferenceObject(fileObject); - return; - } - - // - // Call the MountMgr. - // - - status = IoCallDriver(deviceObject, irp); - - if (status == STATUS_PENDING) { - KeWaitForSingleObject(&event, Suspended, KernelMode, FALSE, NULL); - status = ioStatus.Status; - } - - // - // We're done. - // - - DPRINT1("Reported to the MountMgr: %lx\n", status); - - ExFreePool(mountTarget); - ObDereferenceObject(fileObject); - - return; -} - - -NTSTATUS -NTAPI -CreateCdRomDeviceObject( - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT PortDeviceObject, - IN ULONG PortNumber, - IN PULONG DeviceCount, - IN PIO_SCSI_CAPABILITIES PortCapabilities, - IN PSCSI_INQUIRY_DATA LunInfo, - IN PCLASS_INIT_DATA InitializationData, - IN PUNICODE_STRING RegistryPath - ) - -/*++ - -Routine Description: - - This routine creates an object for the device and then calls the - SCSI port driver for media capacity and sector size. - -Arguments: - - DriverObject - Pointer to driver object created by system. - PortDeviceObject - to connect to SCSI port driver. - DeviceCount - Number of previously installed CDROMs. - PortCapabilities - Pointer to structure returned by SCSI port - driver describing adapter capabilities (and limitations). - LunInfo - Pointer to configuration information for this device. - -Return Value: - - NTSTATUS - ---*/ -{ - CHAR ntNameBuffer[64]; - NTSTATUS status; - BOOLEAN changerDevice; - SCSI_REQUEST_BLOCK srb; - ULONG length; - PCDROM_DATA cddata; - PCDB cdb; - PVOID senseData = NULL; - PDEVICE_OBJECT deviceObject = NULL; - PDEVICE_EXTENSION deviceExtension = NULL; - PUCHAR buffer; - ULONG bps; - ULONG lastBit; - ULONG timeOut; - BOOLEAN srbListInitialized = FALSE; - - // - // Claim the device. Note that any errors after this - // will goto the generic handler, where the device will - // be released. - // - - status = ScsiClassClaimDevice(PortDeviceObject, - LunInfo, - FALSE, - &PortDeviceObject); - - if (!NT_SUCCESS(status)) { - return(status); - } - - // - // Create device object for this device. - // - - sprintf(ntNameBuffer, - "\\Device\\CdRom%lu", - *DeviceCount); - - status = ScsiClassCreateDeviceObject(DriverObject, - ntNameBuffer, - NULL, - &deviceObject, - InitializationData); - - if (!NT_SUCCESS(status)) { - DebugPrint((1,"CreateCdRomDeviceObjects: Can not create device %s\n", - ntNameBuffer)); - - goto CreateCdRomDeviceObjectExit; - } - - // - // Indicate that IRPs should include MDLs. - // - - deviceObject->Flags |= DO_DIRECT_IO; - - // - // Set up required stack size in device object. - // - - deviceObject->StackSize = PortDeviceObject->StackSize + 2; - - deviceExtension = deviceObject->DeviceExtension; - - // - // Allocate spinlock for split request completion. - // - - KeInitializeSpinLock(&deviceExtension->SplitRequestSpinLock); - - // - // This is the physical device. - // - - deviceExtension->PhysicalDevice = deviceObject; - - // - // Initialize lock count to zero. The lock count is used to - // disable the ejection mechanism when media is mounted. - // - - deviceExtension->LockCount = 0; - - // - // Save system cdrom number - // - - deviceExtension->DeviceNumber = *DeviceCount; - - // - // Copy port device object to device extension. - // - - deviceExtension->PortDeviceObject = PortDeviceObject; - - // - // Set the alignment requirements for the device based on the - // host adapter requirements - // - - if (PortDeviceObject->AlignmentRequirement > deviceObject->AlignmentRequirement) { - deviceObject->AlignmentRequirement = PortDeviceObject->AlignmentRequirement; - } - - // - // Save address of port driver capabilities. - // - - deviceExtension->PortCapabilities = PortCapabilities; - - // - // Clear SRB flags. - // - - deviceExtension->SrbFlags = 0; - deviceExtension->SrbFlags |= SRB_FLAGS_DISABLE_SYNCH_TRANSFER; - - // - // Allocate request sense buffer. - // - - senseData = ExAllocatePool(NonPagedPoolCacheAligned, SENSE_BUFFER_SIZE); - - if (senseData == NULL) { - - // - // The buffer cannot be allocated. - // - - status = STATUS_INSUFFICIENT_RESOURCES; - goto CreateCdRomDeviceObjectExit; - } - - // - // Set the sense data pointer in the device extension. - // - - deviceExtension->SenseData = senseData; - - // - // CDROMs are not partitionable so starting offset is 0. - // - - deviceExtension->StartingOffset.LowPart = 0; - deviceExtension->StartingOffset.HighPart = 0; - - // - // Path/TargetId/LUN describes a device location on the SCSI bus. - // This information comes from the LunInfo buffer. - // - - deviceExtension->PortNumber = (UCHAR)PortNumber; - deviceExtension->PathId = LunInfo->PathId; - deviceExtension->TargetId = LunInfo->TargetId; - deviceExtension->Lun = LunInfo->Lun; - - // - // Set timeout value in seconds. - // - - timeOut = ScsiClassQueryTimeOutRegistryValue(RegistryPath); - if (timeOut) { - deviceExtension->TimeOutValue = timeOut; - } else { - deviceExtension->TimeOutValue = SCSI_CDROM_TIMEOUT; - } - - // - // Build the lookaside list for srb's for the physical disk. Should only - // need a couple. - // - - ScsiClassInitializeSrbLookasideList(deviceExtension, - CDROM_SRB_LIST_SIZE); - - srbListInitialized = TRUE; - - // - // Back pointer to device object. - // - - deviceExtension->DeviceObject = deviceObject; - - // - // Allocate buffer for drive geometry. - // - - deviceExtension->DiskGeometry = - ExAllocatePool(NonPagedPool, sizeof(DISK_GEOMETRY_EX)); - - if (deviceExtension->DiskGeometry == NULL) { - - status = STATUS_INSUFFICIENT_RESOURCES; - goto CreateCdRomDeviceObjectExit; - } - - // - // Set up media change support defaults. - // - - cddata = (PCDROM_DATA)(deviceExtension + 1); - - KeInitializeSpinLock(&cddata->FormSpinLock); - KeInitializeSpinLock(&cddata->TimerIrpSpinLock); - InitializeListHead(&cddata->TimerIrpList); - - cddata->MediaChangeCountDown = MEDIA_CHANGE_DEFAULT_TIME; - cddata->MediaChangeSupported = FALSE; - cddata->MediaChange = FALSE; - - // - // Assume that there is initially no media in the device - // only notify upper layers if there is something there - // - - deviceExtension->MediaChangeNoMedia = TRUE; - cddata->MediaChangeIrp = NULL; -#if DBG - cddata->MediaChangeIrpTimeInUse = 0; - cddata->MediaChangeIrpLost = FALSE; -#endif - - // - // Scan for Scsi controllers that require special processing. - // - - ScanForSpecial(deviceObject, - (PINQUIRYDATA) LunInfo->InquiryData, - PortCapabilities); - - // - // Do READ CAPACITY. This SCSI command - // returns the last sector address on the device - // and the bytes per sector. - // These are used to calculate the drive capacity - // in bytes. - // - - status = ScsiClassReadDriveCapacity(deviceObject); - bps = deviceExtension->DiskGeometry->Geometry.BytesPerSector; - - if (!NT_SUCCESS(status) || !bps) { - - DebugPrint((1, - "CreateCdRomDeviceObjects: Can't read capacity for device %s\n", - ntNameBuffer)); - - // - // Set disk geometry to default values (per ISO 9660). - // - - bps = 2048; - deviceExtension->SectorShift = 11; - deviceExtension->PartitionLength.QuadPart = (LONGLONG)(0x7fffffff); - } else { - - // - // Insure that bytes per sector is a power of 2 - // This corrects a problem with the HP 4020i CDR where it - // returns an incorrect number for bytes per sector. - // - - lastBit = (ULONG) -1; - while (bps) { - lastBit++; - bps = bps >> 1; - } - - bps = 1 << lastBit; - } - deviceExtension->DiskGeometry->Geometry.BytesPerSector = bps; - DebugPrint((2, "CreateCdRomDeviceObject: Calc'd bps = %x\n", bps)); - - // - // Check to see if this is some sort of changer device - // - - changerDevice = FALSE; - - // - // Search for devices that have special requirements for media - // change support. - // - - if (deviceExtension->Lun > 0) { - changerDevice = TRUE; - } - - if (!changerDevice) { - changerDevice = IsThisASanyo(deviceObject, deviceExtension->PathId, - deviceExtension->TargetId); - } - - if (!changerDevice) { - ULONG tmp; - changerDevice = IsThisAnAtapiChanger(deviceObject, &tmp); - } - - if (!changerDevice) { - changerDevice = IsThisAMultiLunDevice(deviceObject, PortDeviceObject); - } - - // - // If it is a changer device, increment the timeout to take platter-swapping - // time into account - // - - if(changerDevice) { - deviceExtension->TimeOutValue += SCSI_CHANGER_BONUS_TIMEOUT; - } - - // - // Create the media change named event. If this succeeds then continue - // initializing the media change support data items. - // - - CdRomCreateNamedEvent(deviceExtension,*DeviceCount); - if (deviceExtension->MediaChangeEvent) { - - // - // If this is not a changer, get an IRP for the timer request - // and initialize the timer. - // - - if (!changerDevice) { - - // - // Not a changer device - continue with media change initialization. - // Determine if the user actually wants media change events. - // - - if (CdRomCheckRegistryForMediaChangeValue(RegistryPath, *DeviceCount)) { - PIO_STACK_LOCATION irpStack; - PSCSI_REQUEST_BLOCK srb; - PIRP irp; - - // - // User wants it - preallocate IRP and SRB. - // - - irp = IoAllocateIrp((CCHAR)(deviceObject->StackSize+1), - FALSE); - if (irp) { - PVOID buffer; - - srb = ExAllocatePool(NonPagedPool, sizeof(SCSI_REQUEST_BLOCK)); - buffer = ExAllocatePool(NonPagedPoolCacheAligned, SENSE_BUFFER_SIZE); - - if (srb && buffer) { - PCDB cdb; - - // - // All resources have been allocated set up the IRP. - // - - IoSetNextIrpStackLocation(irp); - irpStack = IoGetCurrentIrpStackLocation(irp); - irpStack->DeviceObject = deviceObject; - irpStack = IoGetNextIrpStackLocation(irp); - cddata->MediaChangeIrp = irp; - irpStack->Parameters.Scsi.Srb = srb; - - // - // Initialize the SRB - // - - RtlZeroMemory(srb, sizeof(SCSI_REQUEST_BLOCK)); - - srb->CdbLength = 6; - srb->TimeOutValue = deviceExtension->TimeOutValue * 2; - srb->QueueTag = SP_UNTAGGED; - srb->QueueAction = SRB_SIMPLE_TAG_REQUEST; - srb->Length = SCSI_REQUEST_BLOCK_SIZE; - srb->PathId = deviceExtension->PathId; - srb->TargetId = deviceExtension->TargetId; - srb->Lun = deviceExtension->Lun; - srb->Function = SRB_FUNCTION_EXECUTE_SCSI; - - // - // Initialize and set up the sense information buffer - // - - RtlZeroMemory(buffer, SENSE_BUFFER_SIZE); - srb->SenseInfoBuffer = buffer; - srb->SenseInfoBufferLength = SENSE_BUFFER_SIZE; - - // - // Initialize the CDB - // - - cdb = (PCDB)&srb->Cdb[0]; - cdb->CDB6GENERIC.OperationCode = SCSIOP_TEST_UNIT_READY; - cdb->CDB6GENERIC.LogicalUnitNumber = deviceExtension->Lun; - - // - // It is ok to support media change events on this device. - // - - cddata->MediaChangeSupported = TRUE; - cddata->MediaChange = TRUE; - - } else { - - if (srb) { - ExFreePool(srb); - } - if (buffer) { - ExFreePool(buffer); - } - IoFreeIrp(irp); - } - } - } else { - deviceExtension->MediaChangeEvent = NULL; - } - } else { - deviceExtension->MediaChangeEvent = NULL; - } - } - - // - // Assume use of 6-byte mode sense/select for now. - // - - cddata->XAFlags |= XA_USE_6_BYTE; - - // - // Build and issue mode sense with Read error recovery page. This will be used to change - // block size in case of any raw reads (Mode 2, Form 2). - // - - length = (sizeof(MODE_READ_RECOVERY_PAGE) + MODE_BLOCK_DESC_LENGTH + MODE_HEADER_LENGTH); - - RtlZeroMemory(&srb, sizeof(SCSI_REQUEST_BLOCK)); - - srb.CdbLength = 6; - cdb = (PCDB)srb.Cdb; - - // - // Set timeout value from device extension. - // - - srb.TimeOutValue = deviceExtension->TimeOutValue; - - // - // Build the MODE SENSE CDB. The data returned will be kept in the device extension - // and used to set block size. - // - - cdb->MODE_SENSE.OperationCode = SCSIOP_MODE_SENSE; - cdb->MODE_SENSE.PageCode = 0x1; - cdb->MODE_SENSE.AllocationLength = (UCHAR)length; - - buffer = ExAllocatePool(NonPagedPoolCacheAligned, (sizeof(MODE_READ_RECOVERY_PAGE) + MODE_BLOCK_DESC_LENGTH + MODE_HEADER_LENGTH10)); - if (!buffer) { - status = STATUS_INSUFFICIENT_RESOURCES; - goto CreateCdRomDeviceObjectExit; - } - - status = ScsiClassSendSrbSynchronous(deviceObject, - &srb, - buffer, - length, - FALSE); - if (!NT_SUCCESS(status)) { - - // - // May be Atapi, try 10-byte. - // - - length = (sizeof(MODE_READ_RECOVERY_PAGE) + MODE_BLOCK_DESC_LENGTH + MODE_HEADER_LENGTH10); - - RtlZeroMemory(&srb, sizeof(SCSI_REQUEST_BLOCK)); - - // - // Build the MODE SENSE CDB. - // - - srb.CdbLength = 10; - cdb = (PCDB)srb.Cdb; - - // - // Set timeout value from device extension. - // - - srb.TimeOutValue = deviceExtension->TimeOutValue; - - cdb->MODE_SENSE10.OperationCode = SCSIOP_MODE_SENSE10; - cdb->MODE_SENSE10.PageCode = 0x1; - - cdb->MODE_SENSE10.AllocationLength[0] = (UCHAR)(length >> 8); - cdb->MODE_SENSE10.AllocationLength[1] = (UCHAR)(length & 0xFF); - - status = ScsiClassSendSrbSynchronous(deviceObject, - &srb, - buffer, - length, - FALSE); - if (status == STATUS_DATA_OVERRUN) { - - // - // Build and issue the ReadCd command to ensure that this device supports it. - // - - RtlZeroMemory(cdb, 12); - - cdb->READ_CD.OperationCode = SCSIOP_READ_CD; - - status = ScsiClassSendSrbSynchronous(deviceObject, - &srb, - NULL, - 0, - FALSE); - - // - // If the command wasn't rejected then support the READ_CD. - // - - if (NT_SUCCESS(status) || (status == STATUS_NO_MEDIA_IN_DEVICE)) { - - // - // Using Read CD precludes issuing a mode select to - // set the user data size. So, no buffer copy is - // necessary. - // - - cddata->XAFlags &= ~XA_USE_6_BYTE; - cddata->XAFlags |= XA_USE_READ_CD | XA_USE_10_BYTE; - } else { - - RtlCopyMemory(&cddata->u1.Header, buffer, sizeof(ERROR_RECOVERY_DATA10)); - cddata->u1.Header.ModeDataLength = 0; - - cddata->XAFlags &= ~XA_USE_6_BYTE; - cddata->XAFlags |= XA_USE_10_BYTE; - } - - } else if (NT_SUCCESS(status)) { - - RtlCopyMemory(&cddata->u1.Header, buffer, sizeof(ERROR_RECOVERY_DATA10)); - cddata->u1.Header.ModeDataLength = 0; - - cddata->XAFlags &= ~XA_USE_6_BYTE; - cddata->XAFlags |= XA_USE_10_BYTE; - - } else { - cddata->XAFlags |= XA_NOT_SUPPORTED; - } - } else { - RtlCopyMemory(&cddata->u1.Header, buffer, sizeof(ERROR_RECOVERY_DATA)); - cddata->u1.Header.ModeDataLength = 0; - } - - ExFreePool(buffer); - - ReportToMountMgr(deviceObject); - - // - // Start the timer now regardless of if Autorun is enabled. - // The timer must run forever since IoStopTimer faults. - // - - IoInitializeTimer(deviceObject, CdRomTickHandler, NULL); - IoStartTimer(deviceObject); - - return(STATUS_SUCCESS); - -CreateCdRomDeviceObjectExit: - - // - // Release the device since an error occured. - // - - ScsiClassClaimDevice(PortDeviceObject, - LunInfo, - TRUE, - NULL); - - if (senseData != NULL) { - ExFreePool(senseData); - } - - if (deviceExtension->DiskGeometry != NULL) { - ExFreePool(deviceExtension->DiskGeometry); - } - - if (deviceObject != NULL) { - if (srbListInitialized) { - ExDeleteNPagedLookasideList(&deviceExtension->SrbLookasideListHead); - } - IoDeleteDevice(deviceObject); - } - - - return status; - -} // end CreateCdRomDeviceObject() - -VOID -NTAPI -ScsiCdRomStartIo( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp - ) -{ - - PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; - PIO_STACK_LOCATION currentIrpStack = IoGetCurrentIrpStackLocation(Irp); - PIO_STACK_LOCATION nextIrpStack = IoGetNextIrpStackLocation(Irp); - PIO_STACK_LOCATION irpStack; - PIRP irp2 = NULL; - ULONG transferPages; - ULONG transferByteCount = currentIrpStack->Parameters.Read.Length; - ULONG maximumTransferLength = deviceExtension->PortCapabilities->MaximumTransferLength; - PCDROM_DATA cdData; - PSCSI_REQUEST_BLOCK srb = NULL; - PCDB cdb; - PUCHAR senseBuffer = NULL; - PVOID dataBuffer; - NTSTATUS status; - BOOLEAN use6Byte; - - // - // Mark IRP with status pending. - // - - IoMarkIrpPending(Irp); - - // - // If the flag is set in the device object, force a verify. - // - - if (DeviceObject->Flags & DO_VERIFY_VOLUME) { - DebugPrint((2, "ScsiCdRomStartIo: [%lx] Volume needs verified\n", Irp)); - if (!(currentIrpStack->Flags & SL_OVERRIDE_VERIFY_VOLUME)) { - - if (Irp->Tail.Overlay.Thread) { - IoSetHardErrorOrVerifyDevice(Irp, DeviceObject); - } - - Irp->IoStatus.Status = STATUS_VERIFY_REQUIRED; - - DebugPrint((2, "ScsiCdRomStartIo: [%lx] Calling UpdateCapacity - " - "ioctl event = %lx\n", - Irp, - nextIrpStack->Parameters.Others.Argument1 - )); - - // - // our device control dispatch routine stores an event in the next - // stack location to signal when startio has completed. We need to - // pass this in so that the update capacity completion routine can - // set it rather than completing the Irp. - // - - status = CdRomUpdateCapacity(deviceExtension, - Irp, - nextIrpStack->Parameters.Others.Argument1 - ); - - DebugPrint((2, "ScsiCdRomStartIo: [%lx] UpdateCapacity returned %lx\n", Irp, status)); - ASSERT(status == STATUS_PENDING); - return; - } - } - - cdData = (PCDROM_DATA)(deviceExtension + 1); - use6Byte = cdData->XAFlags & XA_USE_6_BYTE; - - if (currentIrpStack->MajorFunction == IRP_MJ_READ) { - - // - // Add partition byte offset to make starting byte relative to - // beginning of disk. In addition, add in skew for DM Driver, if any. - // - - currentIrpStack->Parameters.Read.ByteOffset.QuadPart += (deviceExtension->StartingOffset.QuadPart); - - // - // Calculate number of pages in this transfer. - // - - transferPages = ADDRESS_AND_SIZE_TO_SPAN_PAGES(MmGetMdlVirtualAddress(Irp->MdlAddress), - currentIrpStack->Parameters.Read.Length); - - // - // Check if request length is greater than the maximum number of - // bytes that the hardware can transfer. - // - - if (cdData->RawAccess) { - - ASSERT(!(cdData->XAFlags & XA_USE_READ_CD)); - - // - // Fire off a mode select to switch back to cooked sectors. - // - - irp2 = IoAllocateIrp((CCHAR)(deviceExtension->DeviceObject->StackSize+1), - FALSE); - - if (!irp2) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - IoStartNextPacket(DeviceObject, FALSE); - return; - } - - srb = ExAllocatePool(NonPagedPool, sizeof(SCSI_REQUEST_BLOCK)); - if (!srb) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - IoFreeIrp(irp2); - IoStartNextPacket(DeviceObject, FALSE); - return; - } - - RtlZeroMemory(srb, sizeof(SCSI_REQUEST_BLOCK)); - - cdb = (PCDB)srb->Cdb; - - // - // Allocate sense buffer. - // - - senseBuffer = ExAllocatePool(NonPagedPoolCacheAligned, SENSE_BUFFER_SIZE); - - if (!senseBuffer) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - ExFreePool(srb); - IoFreeIrp(irp2); - IoStartNextPacket(DeviceObject, FALSE); - return; - } - - // - // Set up the irp. - // - - IoSetNextIrpStackLocation(irp2); - irp2->IoStatus.Status = STATUS_SUCCESS; - irp2->IoStatus.Information = 0; - irp2->Flags = 0; - irp2->UserBuffer = NULL; - - // - // Save the device object and irp in a private stack location. - // - - irpStack = IoGetCurrentIrpStackLocation(irp2); - irpStack->DeviceObject = deviceExtension->DeviceObject; - irpStack->Parameters.Others.Argument2 = (PVOID) Irp; - - // - // The retry count will be in the real Irp, as the retry logic will - // recreate our private irp. - // - - if (!(nextIrpStack->Parameters.Others.Argument1)) { - - // - // Only jam this in if it doesn't exist. The completion routines can - // call StartIo directly in the case of retries and resetting it will - // cause infinite loops. - // - - nextIrpStack->Parameters.Others.Argument1 = (PVOID) MAXIMUM_RETRIES; - } - - // - // Construct the IRP stack for the lower level driver. - // - - irpStack = IoGetNextIrpStackLocation(irp2); - irpStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; - irpStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_SCSI_EXECUTE_IN; - irpStack->Parameters.Scsi.Srb = srb; - - srb->Length = SCSI_REQUEST_BLOCK_SIZE; - srb->PathId = deviceExtension->PathId; - srb->TargetId = deviceExtension->TargetId; - srb->Lun = deviceExtension->Lun; - srb->Function = SRB_FUNCTION_EXECUTE_SCSI; - srb->Cdb[1] |= deviceExtension->Lun << 5; - srb->SrbStatus = srb->ScsiStatus = 0; - srb->NextSrb = 0; - srb->OriginalRequest = irp2; - srb->SenseInfoBufferLength = SENSE_BUFFER_SIZE; - srb->SenseInfoBuffer = senseBuffer; - - transferByteCount = (use6Byte) ? sizeof(ERROR_RECOVERY_DATA) : sizeof(ERROR_RECOVERY_DATA10); - dataBuffer = ExAllocatePool(NonPagedPoolCacheAligned, transferByteCount ); - if (!dataBuffer) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - ExFreePool(senseBuffer); - ExFreePool(srb); - IoFreeIrp(irp2); - IoStartNextPacket(DeviceObject, FALSE); - return; - - } - - irp2->MdlAddress = IoAllocateMdl(dataBuffer, - transferByteCount, - FALSE, - FALSE, - (PIRP) NULL); - - if (!irp2->MdlAddress) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - ExFreePool(senseBuffer); - ExFreePool(srb); - ExFreePool(dataBuffer); - IoFreeIrp(irp2); - IoStartNextPacket(DeviceObject, FALSE); - return; - } - - // - // Prepare the MDL - // - - MmBuildMdlForNonPagedPool(irp2->MdlAddress); - - srb->DataBuffer = dataBuffer; - - // - // Set the new block size in the descriptor. - // - - cdData->u1.BlockDescriptor.BlockLength[0] = (UCHAR)(COOKED_SECTOR_SIZE >> 16) & 0xFF; - cdData->u1.BlockDescriptor.BlockLength[1] = (UCHAR)(COOKED_SECTOR_SIZE >> 8) & 0xFF; - cdData->u1.BlockDescriptor.BlockLength[2] = (UCHAR)(COOKED_SECTOR_SIZE & 0xFF); - - // - // Move error page into dataBuffer. - // - - RtlCopyMemory(srb->DataBuffer, &cdData->u1.Header, transferByteCount); - - // - // Build and send a mode select to switch into raw mode. - // - - srb->SrbFlags = deviceExtension->SrbFlags; - srb->SrbFlags |= (SRB_FLAGS_DISABLE_SYNCH_TRANSFER | SRB_FLAGS_DATA_OUT); - srb->DataTransferLength = transferByteCount; - srb->TimeOutValue = deviceExtension->TimeOutValue * 2; - - if (use6Byte) { - srb->CdbLength = 6; - cdb->MODE_SELECT.OperationCode = SCSIOP_MODE_SELECT; - cdb->MODE_SELECT.PFBit = 1; - cdb->MODE_SELECT.ParameterListLength = (UCHAR)transferByteCount; - } else { - - srb->CdbLength = 10; - cdb->MODE_SELECT10.OperationCode = SCSIOP_MODE_SELECT10; - cdb->MODE_SELECT10.PFBit = 1; - cdb->MODE_SELECT10.ParameterListLength[0] = (UCHAR)(transferByteCount >> 8); - cdb->MODE_SELECT10.ParameterListLength[1] = (UCHAR)(transferByteCount & 0xFF); - } - - // - // Update completion routine. - // - - IoSetCompletionRoutine(irp2, - CdRomSwitchModeCompletion, - srb, - TRUE, - TRUE, - TRUE); - - IoCallDriver(deviceExtension->PortDeviceObject, irp2); - return; - } - - if ((currentIrpStack->Parameters.Read.Length > maximumTransferLength) || - (transferPages > - deviceExtension->PortCapabilities->MaximumPhysicalPages)) { - - // - // Request needs to be split. Completion of each portion of the - // request will fire off the next portion. The final request will - // signal Io to send a new request. - // - - transferPages = - deviceExtension->PortCapabilities->MaximumPhysicalPages - 1; - - if(maximumTransferLength > transferPages << PAGE_SHIFT) { - maximumTransferLength = transferPages << PAGE_SHIFT; - } - - // - // Check that the maximum transfer size is not zero - // - - if(maximumTransferLength == 0) { - maximumTransferLength = PAGE_SIZE; - } - - ScsiClassSplitRequest(DeviceObject, Irp, maximumTransferLength); - return; - - } else { - - // - // Build SRB and CDB for this IRP. - // - - ScsiClassBuildRequest(DeviceObject, Irp); - - } - - - } else if (currentIrpStack->MajorFunction == IRP_MJ_DEVICE_CONTROL) { - - // - // Allocate an irp, srb and associated structures. - // - - irp2 = IoAllocateIrp((CCHAR)(deviceExtension->DeviceObject->StackSize+1), - FALSE); - - if (!irp2) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - IoStartNextPacket(DeviceObject, FALSE); - DebugPrint((2, "ScsiCdRomStartIo: [%lx] bailing with status %lx at line %s\n", Irp, Irp->IoStatus.Status, __LINE__)); - return; - } - - srb = ExAllocatePool(NonPagedPool, sizeof(SCSI_REQUEST_BLOCK)); - if (!srb) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - IoFreeIrp(irp2); - IoStartNextPacket(DeviceObject, FALSE); - DebugPrint((2, "ScsiCdRomStartIo: [%lx] bailing with status %lx at line %s\n", Irp, Irp->IoStatus.Status, __LINE__)); - return; - } - - RtlZeroMemory(srb, sizeof(SCSI_REQUEST_BLOCK)); - - cdb = (PCDB)srb->Cdb; - - // - // Allocate sense buffer. - // - - senseBuffer = ExAllocatePool(NonPagedPoolCacheAligned, SENSE_BUFFER_SIZE); - - if (!senseBuffer) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - ExFreePool(srb); - IoFreeIrp(irp2); - IoStartNextPacket(DeviceObject, FALSE); - DebugPrint((2, "ScsiCdRomStartIo: [%lx] bailing with status %lx at line %s\n", Irp, Irp->IoStatus.Status, __LINE__)); - return; - } - - // - // Set up the irp. - // - - IoSetNextIrpStackLocation(irp2); - irp2->IoStatus.Status = STATUS_SUCCESS; - irp2->IoStatus.Information = 0; - irp2->Flags = 0; - irp2->UserBuffer = NULL; - - // - // Save the device object and irp in a private stack location. - // - - irpStack = IoGetCurrentIrpStackLocation(irp2); - irpStack->DeviceObject = deviceExtension->DeviceObject; - irpStack->Parameters.Others.Argument2 = (PVOID) Irp; - - // - // The retry count will be in the real Irp, as the retry logic will - // recreate our private irp. - // - - if (!(nextIrpStack->Parameters.Others.Argument1)) { - - // - // Only jam this in if it doesn't exist. The completion routines can - // call StartIo directly in the case of retries and resetting it will - // cause infinite loops. - // - - nextIrpStack->Parameters.Others.Argument1 = (PVOID) MAXIMUM_RETRIES; - } - - // - // Construct the IRP stack for the lower level driver. - // - - irpStack = IoGetNextIrpStackLocation(irp2); - irpStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; - irpStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_SCSI_EXECUTE_IN; - irpStack->Parameters.Scsi.Srb = srb; - - IoSetCompletionRoutine(irp2, - CdRomDeviceControlCompletion, - srb, - TRUE, - TRUE, - TRUE); - // - // Setup those fields that are generic to all requests. - // - - srb->Length = SCSI_REQUEST_BLOCK_SIZE; - srb->PathId = deviceExtension->PathId; - srb->TargetId = deviceExtension->TargetId; - srb->Lun = deviceExtension->Lun; - srb->Function = SRB_FUNCTION_EXECUTE_SCSI; - srb->Cdb[1] |= deviceExtension->Lun << 5; - srb->SrbStatus = srb->ScsiStatus = 0; - srb->NextSrb = 0; - srb->OriginalRequest = irp2; - srb->SenseInfoBufferLength = SENSE_BUFFER_SIZE; - srb->SenseInfoBuffer = senseBuffer; - - switch (currentIrpStack->Parameters.DeviceIoControl.IoControlCode) { - - case IOCTL_CDROM_RAW_READ: { - - // - // Determine whether the drive is currently in raw or cooked mode, - // and which command to use to read the data. - // - - if (!(cdData->XAFlags & XA_USE_READ_CD)) { - - PRAW_READ_INFO rawReadInfo = - (PRAW_READ_INFO)currentIrpStack->Parameters.DeviceIoControl.Type3InputBuffer; - ULONG maximumTransferLength; - ULONG transferPages; - - if (cdData->RawAccess) { - - ULONG startingSector; - - // - // Free the recently allocated irp, as we don't need it. - // - - IoFreeIrp(irp2); - - cdb = (PCDB)srb->Cdb; - RtlZeroMemory(cdb, 12); - - // - // Calculate starting offset. - // - - startingSector = (ULONG)(rawReadInfo->DiskOffset.QuadPart >> deviceExtension->SectorShift); - transferByteCount = rawReadInfo->SectorCount * RAW_SECTOR_SIZE; - maximumTransferLength = deviceExtension->PortCapabilities->MaximumTransferLength; - transferPages = ADDRESS_AND_SIZE_TO_SPAN_PAGES(MmGetMdlVirtualAddress(Irp->MdlAddress), - transferByteCount); - - // - // Determine if request is within limits imposed by miniport. - // - - if (transferByteCount > maximumTransferLength || - transferPages > deviceExtension->PortCapabilities->MaximumPhysicalPages) { - - // - // The claim is that this won't happen, and is backed up by - // ActiveMovie usage, which does unbuffered XA reads of 0x18000, yet - // we get only 4 sector requests. - // - - - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - ExFreePool(senseBuffer); - ExFreePool(srb); - IoStartNextPacket(DeviceObject, FALSE); - return; - - } - - srb->OriginalRequest = Irp; - srb->SrbFlags = deviceExtension->SrbFlags; - srb->SrbFlags |= (SRB_FLAGS_DISABLE_SYNCH_TRANSFER | SRB_FLAGS_DATA_IN); - srb->DataTransferLength = transferByteCount; - srb->TimeOutValue = deviceExtension->TimeOutValue; - srb->CdbLength = 10; - srb->DataBuffer = MmGetMdlVirtualAddress(Irp->MdlAddress); - - if (rawReadInfo->TrackMode == CDDA) { - if (cdData->XAFlags & PLEXTOR_CDDA) { - - srb->CdbLength = 12; - - cdb->PLXTR_READ_CDDA.LogicalUnitNumber = deviceExtension->Lun; - cdb->PLXTR_READ_CDDA.LogicalBlockByte3 = (UCHAR) (startingSector & 0xFF); - cdb->PLXTR_READ_CDDA.LogicalBlockByte2 = (UCHAR) ((startingSector >> 8) & 0xFF); - cdb->PLXTR_READ_CDDA.LogicalBlockByte1 = (UCHAR) ((startingSector >> 16) & 0xFF); - cdb->PLXTR_READ_CDDA.LogicalBlockByte0 = (UCHAR) ((startingSector >> 24) & 0xFF); - - cdb->PLXTR_READ_CDDA.TransferBlockByte3 = (UCHAR) (rawReadInfo->SectorCount & 0xFF); - cdb->PLXTR_READ_CDDA.TransferBlockByte2 = (UCHAR) (rawReadInfo->SectorCount >> 8); - cdb->PLXTR_READ_CDDA.TransferBlockByte1 = 0; - cdb->PLXTR_READ_CDDA.TransferBlockByte0 = 0; - - cdb->PLXTR_READ_CDDA.SubCode = 0; - cdb->PLXTR_READ_CDDA.OperationCode = 0xD8; - - } else if (cdData->XAFlags & NEC_CDDA) { - - cdb->NEC_READ_CDDA.LogicalBlockByte3 = (UCHAR) (startingSector & 0xFF); - cdb->NEC_READ_CDDA.LogicalBlockByte2 = (UCHAR) ((startingSector >> 8) & 0xFF); - cdb->NEC_READ_CDDA.LogicalBlockByte1 = (UCHAR) ((startingSector >> 16) & 0xFF); - cdb->NEC_READ_CDDA.LogicalBlockByte0 = (UCHAR) ((startingSector >> 24) & 0xFF); - - cdb->NEC_READ_CDDA.TransferBlockByte1 = (UCHAR) (rawReadInfo->SectorCount & 0xFF); - cdb->NEC_READ_CDDA.TransferBlockByte0 = (UCHAR) (rawReadInfo->SectorCount >> 8); - - cdb->NEC_READ_CDDA.OperationCode = 0xD4; - } - } else { - - cdb->CDB10.LogicalUnitNumber = deviceExtension->Lun; - - cdb->CDB10.TransferBlocksMsb = (UCHAR) (rawReadInfo->SectorCount >> 8); - cdb->CDB10.TransferBlocksLsb = (UCHAR) (rawReadInfo->SectorCount & 0xFF); - - cdb->CDB10.LogicalBlockByte3 = (UCHAR) (startingSector & 0xFF); - cdb->CDB10.LogicalBlockByte2 = (UCHAR) ((startingSector >> 8) & 0xFF); - cdb->CDB10.LogicalBlockByte1 = (UCHAR) ((startingSector >> 16) & 0xFF); - cdb->CDB10.LogicalBlockByte0 = (UCHAR) ((startingSector >> 24) & 0xFF); - - cdb->CDB10.OperationCode = SCSIOP_READ; - } - - srb->SrbStatus = srb->ScsiStatus = 0; - - nextIrpStack->MajorFunction = IRP_MJ_SCSI; - nextIrpStack->Parameters.Scsi.Srb = srb; - - if (!(nextIrpStack->Parameters.Others.Argument1)) { - - // - // Only jam this in if it doesn't exist. The completion routines can - // call StartIo directly in the case of retries and resetting it will - // cause infinite loops. - // - - nextIrpStack->Parameters.Others.Argument1 = (PVOID) MAXIMUM_RETRIES; - } - - // - // Set up IoCompletion routine address. - // - - IoSetCompletionRoutine(Irp, - CdRomXACompletion, - srb, - TRUE, - TRUE, - TRUE); - - IoCallDriver(deviceExtension->PortDeviceObject, Irp); - return; - - } else { - - transferByteCount = (use6Byte) ? sizeof(ERROR_RECOVERY_DATA) : sizeof(ERROR_RECOVERY_DATA10); - dataBuffer = ExAllocatePool(NonPagedPoolCacheAligned, transferByteCount ); - if (!dataBuffer) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - ExFreePool(senseBuffer); - ExFreePool(srb); - IoFreeIrp(irp2); - IoStartNextPacket(DeviceObject, FALSE); - return; - - } - - irp2->MdlAddress = IoAllocateMdl(dataBuffer, - transferByteCount, - FALSE, - FALSE, - (PIRP) NULL); - - if (!irp2->MdlAddress) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - ExFreePool(senseBuffer); - ExFreePool(srb); - ExFreePool(dataBuffer); - IoFreeIrp(irp2); - IoStartNextPacket(DeviceObject, FALSE); - return; - } - - // - // Prepare the MDL - // - - MmBuildMdlForNonPagedPool(irp2->MdlAddress); - - srb->DataBuffer = dataBuffer; - - // - // Set the new block size in the descriptor. - // - - cdData->u1.BlockDescriptor.BlockLength[0] = (UCHAR)(RAW_SECTOR_SIZE >> 16) & 0xFF; - cdData->u1.BlockDescriptor.BlockLength[1] = (UCHAR)(RAW_SECTOR_SIZE >> 8) & 0xFF; - cdData->u1.BlockDescriptor.BlockLength[2] = (UCHAR)(RAW_SECTOR_SIZE & 0xFF); - - - // - // TODO: Set density code, based on operation - // - - cdData->u1.BlockDescriptor.DensityCode = 0; - - - // - // Move error page into dataBuffer. - // - - RtlCopyMemory(srb->DataBuffer, &cdData->u1.Header, transferByteCount); - - - // - // Build and send a mode select to switch into raw mode. - // - - srb->SrbFlags = deviceExtension->SrbFlags; - srb->SrbFlags |= (SRB_FLAGS_DISABLE_SYNCH_TRANSFER | SRB_FLAGS_DATA_OUT); - srb->DataTransferLength = transferByteCount; - srb->TimeOutValue = deviceExtension->TimeOutValue * 2; - - if (use6Byte) { - srb->CdbLength = 6; - cdb->MODE_SELECT.OperationCode = SCSIOP_MODE_SELECT; - cdb->MODE_SELECT.PFBit = 1; - cdb->MODE_SELECT.ParameterListLength = (UCHAR)transferByteCount; - } else { - - srb->CdbLength = 10; - cdb->MODE_SELECT10.OperationCode = SCSIOP_MODE_SELECT10; - cdb->MODE_SELECT10.PFBit = 1; - cdb->MODE_SELECT10.ParameterListLength[0] = (UCHAR)(transferByteCount >> 8); - cdb->MODE_SELECT10.ParameterListLength[1] = (UCHAR)(transferByteCount & 0xFF); - } - - // - // Update completion routine. - // - - IoSetCompletionRoutine(irp2, - CdRomSwitchModeCompletion, - srb, - TRUE, - TRUE, - TRUE); - - } - - } else { - - PRAW_READ_INFO rawReadInfo = - (PRAW_READ_INFO)currentIrpStack->Parameters.DeviceIoControl.Type3InputBuffer; - ULONG startingSector; - - // - // Free the recently allocated irp, as we don't need it. - // - - IoFreeIrp(irp2); - - cdb = (PCDB)srb->Cdb; - RtlZeroMemory(cdb, 12); - - - // - // Calculate starting offset. - // - - startingSector = (ULONG)(rawReadInfo->DiskOffset.QuadPart >> deviceExtension->SectorShift); - transferByteCount = rawReadInfo->SectorCount * RAW_SECTOR_SIZE; - - - srb->OriginalRequest = Irp; - srb->SrbFlags = deviceExtension->SrbFlags; - srb->SrbFlags |= (SRB_FLAGS_DISABLE_SYNCH_TRANSFER | SRB_FLAGS_DATA_IN); - srb->DataTransferLength = transferByteCount; - srb->TimeOutValue = deviceExtension->TimeOutValue; - srb->DataBuffer = MmGetMdlVirtualAddress(Irp->MdlAddress); - srb->CdbLength = 12; - srb->SrbStatus = srb->ScsiStatus = 0; - - // - // Fill in CDB fields. - // - - cdb = (PCDB)srb->Cdb; - - - cdb->READ_CD.TransferBlocks[2] = (UCHAR) (rawReadInfo->SectorCount & 0xFF); - cdb->READ_CD.TransferBlocks[1] = (UCHAR) (rawReadInfo->SectorCount >> 8 ); - cdb->READ_CD.TransferBlocks[0] = (UCHAR) (rawReadInfo->SectorCount >> 16); - - - cdb->READ_CD.StartingLBA[3] = (UCHAR) (startingSector & 0xFF); - cdb->READ_CD.StartingLBA[2] = (UCHAR) ((startingSector >> 8)); - cdb->READ_CD.StartingLBA[1] = (UCHAR) ((startingSector >> 16)); - cdb->READ_CD.StartingLBA[0] = (UCHAR) ((startingSector >> 24)); - - // - // Setup cdb depending upon the sector type we want. - // - - switch (rawReadInfo->TrackMode) { - case CDDA: - - cdb->READ_CD.ExpectedSectorType = CD_DA_SECTOR; - cdb->READ_CD.IncludeUserData = 1; - cdb->READ_CD.HeaderCode = 3; - cdb->READ_CD.IncludeSyncData = 1; - break; - - case YellowMode2: - - cdb->READ_CD.ExpectedSectorType = YELLOW_MODE2_SECTOR; - cdb->READ_CD.IncludeUserData = 1; - cdb->READ_CD.HeaderCode = 1; - cdb->READ_CD.IncludeSyncData = 1; - break; - - case XAForm2: - - cdb->READ_CD.ExpectedSectorType = FORM2_MODE2_SECTOR; - cdb->READ_CD.IncludeUserData = 1; - cdb->READ_CD.HeaderCode = 3; - cdb->READ_CD.IncludeSyncData = 1; - break; - - default: - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - ExFreePool(senseBuffer); - ExFreePool(srb); - IoStartNextPacket(DeviceObject, FALSE); - DebugPrint((2, "ScsiCdRomStartIo: [%lx] bailing with status %lx at line %s\n", Irp, Irp->IoStatus.Status, __LINE__)); - return; - } - - cdb->READ_CD.OperationCode = SCSIOP_READ_CD; - - nextIrpStack->MajorFunction = IRP_MJ_SCSI; - nextIrpStack->Parameters.Scsi.Srb = srb; - - if (!(nextIrpStack->Parameters.Others.Argument1)) { - - // - // Only jam this in if it doesn't exist. The completion routines can - // call StartIo directly in the case of retries and resetting it will - // cause infinite loops. - // - - nextIrpStack->Parameters.Others.Argument1 = (PVOID) MAXIMUM_RETRIES; - } - - // - // Set up IoCompletion routine address. - // - - IoSetCompletionRoutine(Irp, - CdRomXACompletion, - srb, - TRUE, - TRUE, - TRUE); - - IoCallDriver(deviceExtension->PortDeviceObject, Irp); - return; - - } - - IoCallDriver(deviceExtension->PortDeviceObject, irp2); - return; - } - - case IOCTL_DISK_GET_LENGTH_INFO: - case IOCTL_DISK_GET_DRIVE_GEOMETRY_EX: - case IOCTL_DISK_GET_DRIVE_GEOMETRY: - case IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX: - case IOCTL_CDROM_GET_DRIVE_GEOMETRY: { - - // - // Issue ReadCapacity to update device extension - // with information for current media. - // - - DebugPrint((3, - "CdRomStartIo: Get drive capacity\n")); - - // - // setup remaining srb and cdb parameters. - // - - srb->SrbFlags = deviceExtension->SrbFlags; - srb->SrbFlags |= (SRB_FLAGS_DISABLE_SYNCH_TRANSFER | SRB_FLAGS_DATA_IN); - srb->DataTransferLength = sizeof(READ_CAPACITY_DATA); - srb->CdbLength = 10; - srb->TimeOutValue = deviceExtension->TimeOutValue; - - dataBuffer = ExAllocatePool(NonPagedPoolCacheAligned, sizeof(READ_CAPACITY_DATA)); - if (!dataBuffer) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - ExFreePool(senseBuffer); - ExFreePool(srb); - IoFreeIrp(irp2); - IoStartNextPacket(DeviceObject, FALSE); - DebugPrint((2, "ScsiCdRomStartIo: [%lx] bailing with status %lx at line %s\n", Irp, Irp->IoStatus.Status, __LINE__)); - return; - - } - - irp2->MdlAddress = IoAllocateMdl(dataBuffer, - sizeof(READ_CAPACITY_DATA), - FALSE, - FALSE, - (PIRP) NULL); - - if (!irp2->MdlAddress) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - ExFreePool(senseBuffer); - ExFreePool(srb); - ExFreePool(dataBuffer); - IoFreeIrp(irp2); - IoStartNextPacket(DeviceObject, FALSE); - DebugPrint((2, "ScsiCdRomStartIo: [%lx] bailing with status %lx at line %s\n", Irp, Irp->IoStatus.Status, __LINE__)); - return; - } - - // - // Prepare the MDL - // - - MmBuildMdlForNonPagedPool(irp2->MdlAddress); - - srb->DataBuffer = dataBuffer; - cdb->CDB10.OperationCode = SCSIOP_READ_CAPACITY; - - IoCallDriver(deviceExtension->PortDeviceObject, irp2); - return; - } - - case IOCTL_CDROM_CHECK_VERIFY: { - - // - // Since a test unit ready is about to be performed, reset the timer - // value to decrease the opportunities for it to race with this code. - // - - cdData->MediaChangeCountDown = MEDIA_CHANGE_DEFAULT_TIME; - - // - // Set up the SRB/CDB - // - - srb->CdbLength = 6; - cdb->CDB6GENERIC.OperationCode = SCSIOP_TEST_UNIT_READY; - srb->TimeOutValue = deviceExtension->TimeOutValue * 2; - srb->SrbFlags = deviceExtension->SrbFlags; - srb->SrbFlags |= (SRB_FLAGS_DISABLE_SYNCH_TRANSFER | SRB_FLAGS_NO_DATA_TRANSFER); - - DebugPrint((2, "ScsiCdRomStartIo: [%lx] Sending CHECK_VERIFY irp %lx\n", Irp, irp2)); - IoCallDriver(deviceExtension->PortDeviceObject, irp2); - return; - } - - case IOCTL_CDROM_GET_LAST_SESSION: - - // - // Set format to return first and last session numbers. - // - - cdb->READ_TOC.Format = GET_LAST_SESSION; - - // - // Fall through to READ TOC code. - // - - case IOCTL_CDROM_READ_TOC: { - - - if (currentIrpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_CDROM_READ_TOC) { - - // - // Use MSF addressing if not request for session information. - // - - cdb->READ_TOC.Msf = CDB_USE_MSF; - } - - // - // Set size of TOC structure. - // - - transferByteCount = - currentIrpStack->Parameters.Read.Length > - sizeof(CDROM_TOC) ? sizeof(CDROM_TOC): - currentIrpStack->Parameters.Read.Length; - - cdb->READ_TOC.AllocationLength[0] = (UCHAR) (transferByteCount >> 8); - cdb->READ_TOC.AllocationLength[1] = (UCHAR) (transferByteCount & 0xFF); - - cdb->READ_TOC.Control = 0; - - // - // Start at beginning of disc. - // - - cdb->READ_TOC.StartingTrack = 0; - - // - // setup remaining srb and cdb parameters. - // - - srb->SrbFlags = deviceExtension->SrbFlags; - srb->SrbFlags |= (SRB_FLAGS_DISABLE_SYNCH_TRANSFER | SRB_FLAGS_DATA_IN); - srb->DataTransferLength = transferByteCount; - srb->CdbLength = 10; - srb->TimeOutValue = deviceExtension->TimeOutValue; - - dataBuffer = ExAllocatePool(NonPagedPoolCacheAligned, transferByteCount); - if (!dataBuffer) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - ExFreePool(senseBuffer); - ExFreePool(srb); - IoFreeIrp(irp2); - IoStartNextPacket(DeviceObject, FALSE); - return; - - } - - irp2->MdlAddress = IoAllocateMdl(dataBuffer, - transferByteCount, - FALSE, - FALSE, - (PIRP) NULL); - - if (!irp2->MdlAddress) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - ExFreePool(senseBuffer); - ExFreePool(srb); - ExFreePool(dataBuffer); - IoFreeIrp(irp2); - IoStartNextPacket(DeviceObject, FALSE); - return; - } - - // - // Prepare the MDL - // - - MmBuildMdlForNonPagedPool(irp2->MdlAddress); - - srb->DataBuffer = dataBuffer; - cdb->READ_TOC.OperationCode = SCSIOP_READ_TOC; - - IoCallDriver(deviceExtension->PortDeviceObject, irp2); - return; - - } - - case IOCTL_CDROM_PLAY_AUDIO_MSF: { - - PCDROM_PLAY_AUDIO_MSF inputBuffer = Irp->AssociatedIrp.SystemBuffer; - - // - // Set up the SRB/CDB - // - - srb->CdbLength = 10; - cdb->PLAY_AUDIO_MSF.OperationCode = SCSIOP_PLAY_AUDIO_MSF; - - cdb->PLAY_AUDIO_MSF.StartingM = inputBuffer->StartingM; - cdb->PLAY_AUDIO_MSF.StartingS = inputBuffer->StartingS; - cdb->PLAY_AUDIO_MSF.StartingF = inputBuffer->StartingF; - - cdb->PLAY_AUDIO_MSF.EndingM = inputBuffer->EndingM; - cdb->PLAY_AUDIO_MSF.EndingS = inputBuffer->EndingS; - cdb->PLAY_AUDIO_MSF.EndingF = inputBuffer->EndingF; - - srb->TimeOutValue = deviceExtension->TimeOutValue; - srb->SrbFlags = deviceExtension->SrbFlags; - srb->SrbFlags |= (SRB_FLAGS_DISABLE_SYNCH_TRANSFER | SRB_FLAGS_NO_DATA_TRANSFER); - - IoCallDriver(deviceExtension->PortDeviceObject, irp2); - return; - - } - - case IOCTL_CDROM_READ_Q_CHANNEL: { - - PCDROM_SUB_Q_DATA_FORMAT inputBuffer = - Irp->AssociatedIrp.SystemBuffer; - - // - // Allocate buffer for subq channel information. - // - - dataBuffer = ExAllocatePool(NonPagedPoolCacheAligned, - sizeof(SUB_Q_CHANNEL_DATA)); - - if (!dataBuffer) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - ExFreePool(senseBuffer); - ExFreePool(srb); - IoFreeIrp(irp2); - IoStartNextPacket(DeviceObject, FALSE); - return; - - } - - irp2->MdlAddress = IoAllocateMdl(dataBuffer, - transferByteCount, - FALSE, - FALSE, - (PIRP) NULL); - - if (!irp2->MdlAddress) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - ExFreePool(senseBuffer); - ExFreePool(srb); - ExFreePool(dataBuffer); - IoFreeIrp(irp2); - IoStartNextPacket(DeviceObject, FALSE); - return; - } - - // - // Prepare the MDL - // - - MmBuildMdlForNonPagedPool(irp2->MdlAddress); - - srb->DataBuffer = dataBuffer; - - // - // Always logical unit 0, but only use MSF addressing - // for IOCTL_CDROM_CURRENT_POSITION - // - - if (inputBuffer->Format==IOCTL_CDROM_CURRENT_POSITION) - cdb->SUBCHANNEL.Msf = CDB_USE_MSF; - - // - // Return subchannel data - // - - cdb->SUBCHANNEL.SubQ = CDB_SUBCHANNEL_BLOCK; - - // - // Specify format of information to return - // - - cdb->SUBCHANNEL.Format = inputBuffer->Format; - - // - // Specify which track to access (only used by Track ISRC reads) - // - - if (inputBuffer->Format==IOCTL_CDROM_TRACK_ISRC) { - cdb->SUBCHANNEL.TrackNumber = inputBuffer->Track; - } - - // - // Set size of channel data -- however, this is dependent on - // what information we are requesting (which Format) - // - - switch( inputBuffer->Format ) { - - case IOCTL_CDROM_CURRENT_POSITION: - transferByteCount = sizeof(SUB_Q_CURRENT_POSITION); - break; - - case IOCTL_CDROM_MEDIA_CATALOG: - transferByteCount = sizeof(SUB_Q_MEDIA_CATALOG_NUMBER); - break; - - case IOCTL_CDROM_TRACK_ISRC: - transferByteCount = sizeof(SUB_Q_TRACK_ISRC); - break; - } - - cdb->SUBCHANNEL.AllocationLength[0] = (UCHAR) (transferByteCount >> 8); - cdb->SUBCHANNEL.AllocationLength[1] = (UCHAR) (transferByteCount & 0xFF); - cdb->SUBCHANNEL.OperationCode = SCSIOP_READ_SUB_CHANNEL; - srb->SrbFlags = deviceExtension->SrbFlags; - srb->SrbFlags |= (SRB_FLAGS_DISABLE_SYNCH_TRANSFER | SRB_FLAGS_DATA_IN); - srb->DataTransferLength = transferByteCount; - srb->CdbLength = 10; - srb->TimeOutValue = deviceExtension->TimeOutValue; - - IoCallDriver(deviceExtension->PortDeviceObject, irp2); - return; - - } - - case IOCTL_CDROM_PAUSE_AUDIO: { - - cdb->PAUSE_RESUME.OperationCode = SCSIOP_PAUSE_RESUME; - cdb->PAUSE_RESUME.Action = CDB_AUDIO_PAUSE; - - srb->CdbLength = 10; - srb->TimeOutValue = deviceExtension->TimeOutValue; - srb->SrbFlags = deviceExtension->SrbFlags; - srb->SrbFlags |= (SRB_FLAGS_DISABLE_SYNCH_TRANSFER | SRB_FLAGS_NO_DATA_TRANSFER); - - IoCallDriver(deviceExtension->PortDeviceObject, irp2); - return; - } - - case IOCTL_CDROM_RESUME_AUDIO: { - - cdb->PAUSE_RESUME.OperationCode = SCSIOP_PAUSE_RESUME; - cdb->PAUSE_RESUME.Action = CDB_AUDIO_RESUME; - - srb->CdbLength = 10; - srb->TimeOutValue = deviceExtension->TimeOutValue; - srb->SrbFlags = deviceExtension->SrbFlags; - srb->SrbFlags |= (SRB_FLAGS_DISABLE_SYNCH_TRANSFER | SRB_FLAGS_NO_DATA_TRANSFER); - - IoCallDriver(deviceExtension->PortDeviceObject, irp2); - return; - } - - case IOCTL_CDROM_SEEK_AUDIO_MSF: { - - PCDROM_SEEK_AUDIO_MSF inputBuffer = Irp->AssociatedIrp.SystemBuffer; - ULONG logicalBlockAddress; - - logicalBlockAddress = MSF_TO_LBA(inputBuffer->M, inputBuffer->S, inputBuffer->F); - - cdb->SEEK.OperationCode = SCSIOP_SEEK; - cdb->SEEK.LogicalBlockAddress[0] = ((PFOUR_BYTE)&logicalBlockAddress)->Byte3; - cdb->SEEK.LogicalBlockAddress[1] = ((PFOUR_BYTE)&logicalBlockAddress)->Byte2; - cdb->SEEK.LogicalBlockAddress[2] = ((PFOUR_BYTE)&logicalBlockAddress)->Byte1; - cdb->SEEK.LogicalBlockAddress[3] = ((PFOUR_BYTE)&logicalBlockAddress)->Byte0; - - srb->CdbLength = 10; - srb->TimeOutValue = deviceExtension->TimeOutValue; - srb->SrbFlags = deviceExtension->SrbFlags; - srb->SrbFlags |= (SRB_FLAGS_DISABLE_SYNCH_TRANSFER | SRB_FLAGS_NO_DATA_TRANSFER); - - IoCallDriver(deviceExtension->PortDeviceObject, irp2); - return; - - } - - case IOCTL_CDROM_STOP_AUDIO: { - - cdb->START_STOP.OperationCode = SCSIOP_START_STOP_UNIT; - cdb->START_STOP.Immediate = 1; - cdb->START_STOP.Start = 0; - cdb->START_STOP.LoadEject = 0; - - srb->CdbLength = 6; - srb->TimeOutValue = deviceExtension->TimeOutValue; - - srb->SrbFlags = deviceExtension->SrbFlags; - srb->SrbFlags |= (SRB_FLAGS_DISABLE_SYNCH_TRANSFER | SRB_FLAGS_NO_DATA_TRANSFER); - - IoCallDriver(deviceExtension->PortDeviceObject, irp2); - return; - } - - case IOCTL_CDROM_GET_CONTROL: { - // - // Allocate buffer for volume control information. - // - - dataBuffer = ExAllocatePool(NonPagedPoolCacheAligned, - MODE_DATA_SIZE); - - if (!dataBuffer) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - ExFreePool(senseBuffer); - ExFreePool(srb); - IoFreeIrp(irp2); - IoStartNextPacket(DeviceObject, FALSE); - return; - - } - - irp2->MdlAddress = IoAllocateMdl(dataBuffer, - MODE_DATA_SIZE, - FALSE, - FALSE, - (PIRP) NULL); - - if (!irp2->MdlAddress) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - ExFreePool(senseBuffer); - ExFreePool(srb); - ExFreePool(dataBuffer); - IoFreeIrp(irp2); - IoStartNextPacket(DeviceObject, FALSE); - return; - } - - // - // Prepare the MDL - // - - MmBuildMdlForNonPagedPool(irp2->MdlAddress); - srb->DataBuffer = dataBuffer; - - RtlZeroMemory(dataBuffer, MODE_DATA_SIZE); - - // - // Setup for either 6 or 10 byte CDBs. - // - - if (use6Byte) { - - cdb->MODE_SENSE.OperationCode = SCSIOP_MODE_SENSE; - cdb->MODE_SENSE.PageCode = CDROM_AUDIO_CONTROL_PAGE; - cdb->MODE_SENSE.AllocationLength = MODE_DATA_SIZE; - - // - // Disable block descriptors. - // - - cdb->MODE_SENSE.Dbd = TRUE; - - srb->CdbLength = 6; - } else { - - cdb->MODE_SENSE10.OperationCode = SCSIOP_MODE_SENSE10; - cdb->MODE_SENSE10.PageCode = CDROM_AUDIO_CONTROL_PAGE; - cdb->MODE_SENSE10.AllocationLength[0] = (UCHAR)(MODE_DATA_SIZE >> 8); - cdb->MODE_SENSE10.AllocationLength[1] = (UCHAR)(MODE_DATA_SIZE & 0xFF); - - // - // Disable block descriptors. - // - - cdb->MODE_SENSE10.Dbd = TRUE; - - srb->CdbLength = 10; - } - - srb->TimeOutValue = deviceExtension->TimeOutValue; - srb->DataTransferLength = MODE_DATA_SIZE; - srb->SrbFlags = deviceExtension->SrbFlags; - srb->SrbFlags |= (SRB_FLAGS_DISABLE_SYNCH_TRANSFER | SRB_FLAGS_DATA_IN); - - IoCallDriver(deviceExtension->PortDeviceObject, irp2); - return; - - } - - case IOCTL_CDROM_GET_VOLUME: - case IOCTL_CDROM_SET_VOLUME: { - - dataBuffer = ExAllocatePool(NonPagedPoolCacheAligned, - MODE_DATA_SIZE); - - if (!dataBuffer) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - ExFreePool(senseBuffer); - ExFreePool(srb); - IoFreeIrp(irp2); - IoStartNextPacket(DeviceObject, FALSE); - return; - } - - irp2->MdlAddress = IoAllocateMdl(dataBuffer, - MODE_DATA_SIZE, - FALSE, - FALSE, - (PIRP) NULL); - - if (!irp2->MdlAddress) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); - ExFreePool(senseBuffer); - ExFreePool(srb); - ExFreePool(dataBuffer); - IoFreeIrp(irp2); - IoStartNextPacket(DeviceObject, FALSE); - return; - } - - // - // Prepare the MDL - // - - MmBuildMdlForNonPagedPool(irp2->MdlAddress); - srb->DataBuffer = dataBuffer; - - RtlZeroMemory(dataBuffer, MODE_DATA_SIZE); - - - if (use6Byte) { - cdb->MODE_SENSE.OperationCode = SCSIOP_MODE_SENSE; - cdb->MODE_SENSE.PageCode = CDROM_AUDIO_CONTROL_PAGE; - cdb->MODE_SENSE.AllocationLength = MODE_DATA_SIZE; - - srb->CdbLength = 6; - - } else { - - cdb->MODE_SENSE10.OperationCode = SCSIOP_MODE_SENSE10; - cdb->MODE_SENSE10.PageCode = CDROM_AUDIO_CONTROL_PAGE; - cdb->MODE_SENSE10.AllocationLength[0] = (UCHAR)(MODE_DATA_SIZE >> 8); - cdb->MODE_SENSE10.AllocationLength[1] = (UCHAR)(MODE_DATA_SIZE & 0xFF); - - srb->CdbLength = 10; - } - - srb->TimeOutValue = deviceExtension->TimeOutValue; - srb->DataTransferLength = MODE_DATA_SIZE; - srb->SrbFlags = deviceExtension->SrbFlags; - srb->SrbFlags |= (SRB_FLAGS_DISABLE_SYNCH_TRANSFER | SRB_FLAGS_DATA_IN); - - if (currentIrpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_CDROM_SET_VOLUME) { - - // - // Setup a different completion routine as the mode sense data is needed in order - // to send the mode select. - // - - IoSetCompletionRoutine(irp2, - CdRomSetVolumeIntermediateCompletion, - srb, - TRUE, - TRUE, - TRUE); - - } - - IoCallDriver(deviceExtension->PortDeviceObject, irp2); - return; - - } - - default: - - // - // Just complete the request - CdRomClassIoctlCompletion will take - // care of it for us - // - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - ExFreePool(senseBuffer); - ExFreePool(srb); - IoFreeIrp(irp2); - return; - - } // end switch() - } - - // - // If a read or an unhandled IRP_MJ_XX, end up here. The unhandled IRP_MJ's - // are expected and composed of AutoRun Irps, at present. - // - - IoCallDriver(deviceExtension->PortDeviceObject, Irp); - return; -} - - -NTSTATUS -NTAPI -ScsiCdRomReadVerification( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp - ) - -/*++ - -Routine Description: - - This is the entry called by the I/O system for read requests. - It builds the SRB and sends it to the port driver. - -Arguments: - - DeviceObject - the system object for the device. - Irp - IRP involved. - -Return Value: - - NT Status - ---*/ - -{ - PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; - PIO_STACK_LOCATION currentIrpStack = IoGetCurrentIrpStackLocation(Irp); - ULONG transferByteCount = currentIrpStack->Parameters.Read.Length; - LARGE_INTEGER startingOffset = currentIrpStack->Parameters.Read.ByteOffset; - - // - // If the cd is playing music then reject this request. - // - - if (PLAY_ACTIVE(deviceExtension)) { - Irp->IoStatus.Status = STATUS_DEVICE_BUSY; - return STATUS_DEVICE_BUSY; - } - - // - // Verify parameters of this request. - // Check that ending sector is on disc and - // that number of bytes to transfer is a multiple of - // the sector size. - // - - startingOffset.QuadPart = currentIrpStack->Parameters.Read.ByteOffset.QuadPart + - transferByteCount; - - if (!deviceExtension->DiskGeometry->Geometry.BytesPerSector) { - deviceExtension->DiskGeometry->Geometry.BytesPerSector = 2048; - } - - if ((startingOffset.QuadPart > deviceExtension->PartitionLength.QuadPart) || - (transferByteCount & (deviceExtension->DiskGeometry->Geometry.BytesPerSector - 1))) { - - DebugPrint((1,"ScsiCdRomRead: Invalid I/O parameters\n")); - DebugPrint((1, "\toffset %x:%x, Length %x:%x\n", - startingOffset.u.HighPart, - startingOffset.u.LowPart, - deviceExtension->PartitionLength.u.HighPart, - deviceExtension->PartitionLength.u.LowPart)); - DebugPrint((1, "\tbps %x\n", deviceExtension->DiskGeometry->Geometry.BytesPerSector)); - - // - // Fail request with status of invalid parameters. - // - - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - - return STATUS_INVALID_PARAMETER; - } - - - return STATUS_SUCCESS; - -} // end ScsiCdRomReadVerification() - - -NTSTATUS -NTAPI -CdRomDeviceControlCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context - ) -{ - PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; - PDEVICE_EXTENSION physicalExtension = deviceExtension->PhysicalDevice->DeviceExtension; - PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); - PCDROM_DATA cdData = (PCDROM_DATA)(deviceExtension + 1); - BOOLEAN use6Byte = cdData->XAFlags & XA_USE_6_BYTE; - PIO_STACK_LOCATION realIrpStack; - PIO_STACK_LOCATION realIrpNextStack; - PSCSI_REQUEST_BLOCK srb = Context; - PIRP realIrp = NULL; - NTSTATUS status; - BOOLEAN retry; - - // - // Extract the 'real' irp from the irpstack. - // - - realIrp = (PIRP) irpStack->Parameters.Others.Argument2; - realIrpStack = IoGetCurrentIrpStackLocation(realIrp); - realIrpNextStack = IoGetNextIrpStackLocation(realIrp); - - // - // Check SRB status for success of completing request. - // - - if (SRB_STATUS(srb->SrbStatus) != SRB_STATUS_SUCCESS) { - - DebugPrint((2, - "CdRomDeviceControlCompletion: Irp %lx, Srb %lx Real Irp %lx Status %lx\n", - Irp, - srb, - realIrp, - srb->SrbStatus)); - - // - // Release the queue if it is frozen. - // - - if (srb->SrbStatus & SRB_STATUS_QUEUE_FROZEN) { - DebugPrint((2, "CdRomDeviceControlCompletion: Releasing Queue\n")); - ScsiClassReleaseQueue(DeviceObject); - } - - - retry = ScsiClassInterpretSenseInfo(DeviceObject, - srb, - irpStack->MajorFunction, - irpStack->Parameters.DeviceIoControl.IoControlCode, - MAXIMUM_RETRIES - ((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1), - &status); - - DebugPrint((2, "CdRomDeviceControlCompletion: IRP will %sbe retried\n", - (retry ? "" : "not "))); - - // - // Some of the Device Controls need special cases on non-Success status's. - // - - if (realIrpStack->MajorFunction == IRP_MJ_DEVICE_CONTROL) { - if ((realIrpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_CDROM_GET_LAST_SESSION) || - (realIrpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_CDROM_READ_TOC) || - (realIrpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_CDROM_GET_CONTROL) || - (realIrpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_CDROM_GET_VOLUME)) { - - if (status == STATUS_DATA_OVERRUN) { - status = STATUS_SUCCESS; - retry = FALSE; - } - } - - if (realIrpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_CDROM_READ_Q_CHANNEL) { - PLAY_ACTIVE(deviceExtension) = FALSE; - } - } - - // - // If the status is verified required and the this request - // should bypass verify required then retry the request. - // - - if (realIrpStack->Flags & SL_OVERRIDE_VERIFY_VOLUME && - status == STATUS_VERIFY_REQUIRED) { - - if (((realIrpStack->MajorFunction == IRP_MJ_DEVICE_CONTROL) || - (realIrpStack->MajorFunction == IRP_MJ_INTERNAL_DEVICE_CONTROL)) && - (realIrpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_CDROM_CHECK_VERIFY)) { - - ExFreePool(srb->SenseInfoBuffer); - if (srb->DataBuffer) { - ExFreePool(srb->DataBuffer); - } - ExFreePool(srb); - if (Irp->MdlAddress) { - IoFreeMdl(Irp->MdlAddress); - } - - IoFreeIrp(Irp); - - // - // Update the geometry information, as the media could have changed. - // The completion routine for this will complete the real irp and start - // the next packet. - // - - status = CdRomUpdateCapacity(deviceExtension,realIrp, NULL); - DebugPrint((2, "CdRomDeviceControlCompletion: [%lx] CdRomUpdateCapacity completed with status %lx\n", realIrp, status)); - ASSERT(status == STATUS_PENDING); - - return STATUS_MORE_PROCESSING_REQUIRED; - - } else { - - status = STATUS_IO_DEVICE_ERROR; - retry = TRUE; - } - - } - - if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1-1))) { - - - if (((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1)) { - - // - // Retry request. - // - - DebugPrint((1, "Retry request %lx - Calling StartIo\n", Irp)); - - - ExFreePool(srb->SenseInfoBuffer); - if (srb->DataBuffer) { - ExFreePool(srb->DataBuffer); - } - ExFreePool(srb); - if (Irp->MdlAddress) { - IoFreeMdl(Irp->MdlAddress); - } - - IoFreeIrp(Irp); - - // - // Call StartIo directly since IoStartNextPacket hasn't been called, - // the serialisation is still intact. - // - - ScsiCdRomStartIo(DeviceObject, realIrp); - return STATUS_MORE_PROCESSING_REQUIRED; - - } - - // - // Exhausted retries. Fall through and complete the request with the appropriate status. - // - - } - } else { - - // - // Set status for successful request. - // - - status = STATUS_SUCCESS; - } - - if (NT_SUCCESS(status)) { - - switch (realIrpStack->Parameters.DeviceIoControl.IoControlCode) { - - case IOCTL_DISK_GET_LENGTH_INFO: { - - PREAD_CAPACITY_DATA readCapacityBuffer = srb->DataBuffer; - ULONG lastSector; - ULONG bps; - ULONG lastBit; - ULONG tmp; - - // - // Swizzle bytes from Read Capacity and translate into - // the necessary geometry information in the device extension. - // - - tmp = readCapacityBuffer->BytesPerBlock; - ((PFOUR_BYTE)&bps)->Byte0 = ((PFOUR_BYTE)&tmp)->Byte3; - ((PFOUR_BYTE)&bps)->Byte1 = ((PFOUR_BYTE)&tmp)->Byte2; - ((PFOUR_BYTE)&bps)->Byte2 = ((PFOUR_BYTE)&tmp)->Byte1; - ((PFOUR_BYTE)&bps)->Byte3 = ((PFOUR_BYTE)&tmp)->Byte0; - - // - // Insure that bps is a power of 2. - // This corrects a problem with the HP 4020i CDR where it - // returns an incorrect number for bytes per sector. - // - - if (!bps) { - bps = 2048; - } else { - lastBit = (ULONG) -1; - while (bps) { - lastBit++; - bps = bps >> 1; - } - - bps = 1 << lastBit; - } - deviceExtension->DiskGeometry->Geometry.BytesPerSector = bps; - - DebugPrint((2, - "CdRomDeviceControlCompletion: Calculated bps %#x\n", - deviceExtension->DiskGeometry->Geometry.BytesPerSector)); - - // - // Copy last sector in reverse byte order. - // - - tmp = readCapacityBuffer->LogicalBlockAddress; - ((PFOUR_BYTE)&lastSector)->Byte0 = ((PFOUR_BYTE)&tmp)->Byte3; - ((PFOUR_BYTE)&lastSector)->Byte1 = ((PFOUR_BYTE)&tmp)->Byte2; - ((PFOUR_BYTE)&lastSector)->Byte2 = ((PFOUR_BYTE)&tmp)->Byte1; - ((PFOUR_BYTE)&lastSector)->Byte3 = ((PFOUR_BYTE)&tmp)->Byte0; - - // - // Calculate sector to byte shift. - // - - WHICH_BIT(bps, deviceExtension->SectorShift); - - DebugPrint((2,"SCSI ScsiClassReadDriveCapacity: Sector size is %d\n", - deviceExtension->DiskGeometry->Geometry.BytesPerSector)); - - DebugPrint((2,"SCSI ScsiClassReadDriveCapacity: Number of Sectors is %d\n", - lastSector + 1)); - - // - // Calculate media capacity in bytes. - // - - deviceExtension->PartitionLength.QuadPart = (LONGLONG)(lastSector + 1); - - // - // Calculate number of cylinders. - // - - deviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = (LONGLONG)((lastSector + 1)/(32 * 64)); - - deviceExtension->PartitionLength.QuadPart = - (deviceExtension->PartitionLength.QuadPart << deviceExtension->SectorShift); - - if (DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) { - - // - // This device supports removable media. - // - - deviceExtension->DiskGeometry->Geometry.MediaType = RemovableMedia; - - } else { - - // - // Assume media type is fixed disk. - // - - deviceExtension->DiskGeometry->Geometry.MediaType = FixedMedia; - } - - // - // Assume sectors per track are 32; - // - - deviceExtension->DiskGeometry->Geometry.SectorsPerTrack = 32; - - // - // Assume tracks per cylinder (number of heads) is 64. - // - - deviceExtension->DiskGeometry->Geometry.TracksPerCylinder = 64; - - // - // Copy the device extension's geometry info into the user buffer. - // - - RtlMoveMemory(realIrp->AssociatedIrp.SystemBuffer, - &deviceExtension->PartitionLength, - sizeof(GET_LENGTH_INFORMATION)); - - // - // update information field. - // - - realIrp->IoStatus.Information = sizeof(GET_LENGTH_INFORMATION); - break; - } - - case IOCTL_DISK_GET_DRIVE_GEOMETRY_EX: - case IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX: { - - PREAD_CAPACITY_DATA readCapacityBuffer = srb->DataBuffer; - ULONG lastSector; - ULONG bps; - ULONG lastBit; - ULONG tmp; - PDISK_GEOMETRY_EX geometryEx; - - // - // Swizzle bytes from Read Capacity and translate into - // the necessary geometry information in the device extension. - // - - tmp = readCapacityBuffer->BytesPerBlock; - ((PFOUR_BYTE)&bps)->Byte0 = ((PFOUR_BYTE)&tmp)->Byte3; - ((PFOUR_BYTE)&bps)->Byte1 = ((PFOUR_BYTE)&tmp)->Byte2; - ((PFOUR_BYTE)&bps)->Byte2 = ((PFOUR_BYTE)&tmp)->Byte1; - ((PFOUR_BYTE)&bps)->Byte3 = ((PFOUR_BYTE)&tmp)->Byte0; - - // - // Insure that bps is a power of 2. - // This corrects a problem with the HP 4020i CDR where it - // returns an incorrect number for bytes per sector. - // - - if (!bps) { - bps = 2048; - } else { - lastBit = (ULONG) -1; - while (bps) { - lastBit++; - bps = bps >> 1; - } - - bps = 1 << lastBit; - } - deviceExtension->DiskGeometry->Geometry.BytesPerSector = bps; - - DebugPrint((2, - "CdRomDeviceControlCompletion: Calculated bps %#x\n", - deviceExtension->DiskGeometry->Geometry.BytesPerSector)); - - // - // Copy last sector in reverse byte order. - // - - tmp = readCapacityBuffer->LogicalBlockAddress; - ((PFOUR_BYTE)&lastSector)->Byte0 = ((PFOUR_BYTE)&tmp)->Byte3; - ((PFOUR_BYTE)&lastSector)->Byte1 = ((PFOUR_BYTE)&tmp)->Byte2; - ((PFOUR_BYTE)&lastSector)->Byte2 = ((PFOUR_BYTE)&tmp)->Byte1; - ((PFOUR_BYTE)&lastSector)->Byte3 = ((PFOUR_BYTE)&tmp)->Byte0; - - // - // Calculate sector to byte shift. - // - - WHICH_BIT(bps, deviceExtension->SectorShift); - - DebugPrint((2,"SCSI ScsiClassReadDriveCapacity: Sector size is %d\n", - deviceExtension->DiskGeometry->Geometry.BytesPerSector)); - - DebugPrint((2,"SCSI ScsiClassReadDriveCapacity: Number of Sectors is %d\n", - lastSector + 1)); - - // - // Calculate media capacity in bytes. - // - - deviceExtension->PartitionLength.QuadPart = (LONGLONG)(lastSector + 1); - - // - // Calculate number of cylinders. - // - - deviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = (LONGLONG)((lastSector + 1)/(32 * 64)); - - deviceExtension->PartitionLength.QuadPart = - (deviceExtension->PartitionLength.QuadPart << deviceExtension->SectorShift); - - if (DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) { - - // - // This device supports removable media. - // - - deviceExtension->DiskGeometry->Geometry.MediaType = RemovableMedia; - - } else { - - // - // Assume media type is fixed disk. - // - - deviceExtension->DiskGeometry->Geometry.MediaType = FixedMedia; - } - - // - // Assume sectors per track are 32; - // - - deviceExtension->DiskGeometry->Geometry.SectorsPerTrack = 32; - - // - // Assume tracks per cylinder (number of heads) is 64. - // - - deviceExtension->DiskGeometry->Geometry.TracksPerCylinder = 64; - - // - // Copy the device extension's geometry info into the user buffer. - // - - geometryEx = realIrp->AssociatedIrp.SystemBuffer; - RtlMoveMemory(&geometryEx->Geometry, - &deviceExtension->DiskGeometry->Geometry, - sizeof(DISK_GEOMETRY)); - - // - // Copy the extended information - // - - geometryEx->DiskSize = deviceExtension->PartitionLength; - - // - // update information field. - // - - realIrp->IoStatus.Information = FIELD_OFFSET(DISK_GEOMETRY_EX, Data); - break; - } - - case IOCTL_DISK_GET_DRIVE_GEOMETRY: - case IOCTL_CDROM_GET_DRIVE_GEOMETRY: { - - PREAD_CAPACITY_DATA readCapacityBuffer = srb->DataBuffer; - ULONG lastSector; - ULONG bps; - ULONG lastBit; - ULONG tmp; - - // - // Swizzle bytes from Read Capacity and translate into - // the necessary geometry information in the device extension. - // - - tmp = readCapacityBuffer->BytesPerBlock; - ((PFOUR_BYTE)&bps)->Byte0 = ((PFOUR_BYTE)&tmp)->Byte3; - ((PFOUR_BYTE)&bps)->Byte1 = ((PFOUR_BYTE)&tmp)->Byte2; - ((PFOUR_BYTE)&bps)->Byte2 = ((PFOUR_BYTE)&tmp)->Byte1; - ((PFOUR_BYTE)&bps)->Byte3 = ((PFOUR_BYTE)&tmp)->Byte0; - - // - // Insure that bps is a power of 2. - // This corrects a problem with the HP 4020i CDR where it - // returns an incorrect number for bytes per sector. - // - - if (!bps) { - bps = 2048; - } else { - lastBit = (ULONG) -1; - while (bps) { - lastBit++; - bps = bps >> 1; - } - - bps = 1 << lastBit; - } - deviceExtension->DiskGeometry->Geometry.BytesPerSector = bps; - - DebugPrint((2, - "CdRomDeviceControlCompletion: Calculated bps %#x\n", - deviceExtension->DiskGeometry->Geometry.BytesPerSector)); - - // - // Copy last sector in reverse byte order. - // - - tmp = readCapacityBuffer->LogicalBlockAddress; - ((PFOUR_BYTE)&lastSector)->Byte0 = ((PFOUR_BYTE)&tmp)->Byte3; - ((PFOUR_BYTE)&lastSector)->Byte1 = ((PFOUR_BYTE)&tmp)->Byte2; - ((PFOUR_BYTE)&lastSector)->Byte2 = ((PFOUR_BYTE)&tmp)->Byte1; - ((PFOUR_BYTE)&lastSector)->Byte3 = ((PFOUR_BYTE)&tmp)->Byte0; - - // - // Calculate sector to byte shift. - // - - WHICH_BIT(bps, deviceExtension->SectorShift); - - DebugPrint((2,"SCSI ScsiClassReadDriveCapacity: Sector size is %d\n", - deviceExtension->DiskGeometry->Geometry.BytesPerSector)); - - DebugPrint((2,"SCSI ScsiClassReadDriveCapacity: Number of Sectors is %d\n", - lastSector + 1)); - - // - // Calculate media capacity in bytes. - // - - deviceExtension->PartitionLength.QuadPart = (LONGLONG)(lastSector + 1); - - // - // Calculate number of cylinders. - // - - deviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = (LONGLONG)((lastSector + 1)/(32 * 64)); - - deviceExtension->PartitionLength.QuadPart = - (deviceExtension->PartitionLength.QuadPart << deviceExtension->SectorShift); - - if (DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) { - - // - // This device supports removable media. - // - - deviceExtension->DiskGeometry->Geometry.MediaType = RemovableMedia; - - } else { - - // - // Assume media type is fixed disk. - // - - deviceExtension->DiskGeometry->Geometry.MediaType = FixedMedia; - } - - // - // Assume sectors per track are 32; - // - - deviceExtension->DiskGeometry->Geometry.SectorsPerTrack = 32; - - // - // Assume tracks per cylinder (number of heads) is 64. - // - - deviceExtension->DiskGeometry->Geometry.TracksPerCylinder = 64; - - // - // Copy the device extension's geometry info into the user buffer. - // - - RtlMoveMemory(realIrp->AssociatedIrp.SystemBuffer, - deviceExtension->DiskGeometry, - sizeof(DISK_GEOMETRY)); - - // - // update information field. - // - - realIrp->IoStatus.Information = sizeof(DISK_GEOMETRY); - break; - } - - case IOCTL_CDROM_CHECK_VERIFY: - - if((realIrpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_CDROM_CHECK_VERIFY) && - (realIrpStack->Parameters.DeviceIoControl.OutputBufferLength)) { - - *((PULONG)realIrp->AssociatedIrp.SystemBuffer) = - physicalExtension->MediaChangeCount; - realIrp->IoStatus.Information = sizeof(ULONG); - } else { - realIrp->IoStatus.Information = 0; - } - - DebugPrint((2, "CdRomDeviceControlCompletion: [%lx] completing CHECK_VERIFY buddy irp %lx\n", realIrp, Irp)); - break; - - case IOCTL_CDROM_GET_LAST_SESSION: - case IOCTL_CDROM_READ_TOC: { - - PCDROM_TOC toc = srb->DataBuffer; - - // - // Copy the device extension's geometry info into the user buffer. - // - - RtlMoveMemory(realIrp->AssociatedIrp.SystemBuffer, - toc, - srb->DataTransferLength); - - // - // update information field. - // - - realIrp->IoStatus.Information = srb->DataTransferLength; - break; - } - - case IOCTL_CDROM_PLAY_AUDIO_MSF: - - PLAY_ACTIVE(deviceExtension) = TRUE; - - break; - - case IOCTL_CDROM_READ_Q_CHANNEL: { - - PSUB_Q_CHANNEL_DATA userChannelData = realIrp->AssociatedIrp.SystemBuffer; -#if DBG - PCDROM_SUB_Q_DATA_FORMAT inputBuffer = realIrp->AssociatedIrp.SystemBuffer; -#endif - PSUB_Q_CHANNEL_DATA subQPtr = srb->DataBuffer; - -#if DBG - switch( inputBuffer->Format ) { - - case IOCTL_CDROM_CURRENT_POSITION: - DebugPrint((2,"CdRomDeviceControlCompletion: Audio Status is %u\n", subQPtr->CurrentPosition.Header.AudioStatus )); - DebugPrint((2,"CdRomDeviceControlCompletion: ADR = 0x%x\n", subQPtr->CurrentPosition.ADR )); - DebugPrint((2,"CdRomDeviceControlCompletion: Control = 0x%x\n", subQPtr->CurrentPosition.Control )); - DebugPrint((2,"CdRomDeviceControlCompletion: Track = %u\n", subQPtr->CurrentPosition.TrackNumber )); - DebugPrint((2,"CdRomDeviceControlCompletion: Index = %u\n", subQPtr->CurrentPosition.IndexNumber )); - DebugPrint((2,"CdRomDeviceControlCompletion: Absolute Address = %x\n", *((PULONG)subQPtr->CurrentPosition.AbsoluteAddress) )); - DebugPrint((2,"CdRomDeviceControlCompletion: Relative Address = %x\n", *((PULONG)subQPtr->CurrentPosition.TrackRelativeAddress) )); - break; - - case IOCTL_CDROM_MEDIA_CATALOG: - DebugPrint((2,"CdRomDeviceControlCompletion: Audio Status is %u\n", subQPtr->MediaCatalog.Header.AudioStatus )); - DebugPrint((2,"CdRomDeviceControlCompletion: Mcval is %u\n", subQPtr->MediaCatalog.Mcval )); - break; - - case IOCTL_CDROM_TRACK_ISRC: - DebugPrint((2,"CdRomDeviceControlCompletion: Audio Status is %u\n", subQPtr->TrackIsrc.Header.AudioStatus )); - DebugPrint((2,"CdRomDeviceControlCompletion: Tcval is %u\n", subQPtr->TrackIsrc.Tcval )); - break; - - } -#endif - - // - // Update the play active status. - // - - if (subQPtr->CurrentPosition.Header.AudioStatus == AUDIO_STATUS_IN_PROGRESS) { - - PLAY_ACTIVE(deviceExtension) = TRUE; - - } else { - - PLAY_ACTIVE(deviceExtension) = FALSE; - - } - - // - // Check if output buffer is large enough to contain - // the data. - // - - if (realIrpStack->Parameters.DeviceIoControl.OutputBufferLength < - srb->DataTransferLength) { - - srb->DataTransferLength = - realIrpStack->Parameters.DeviceIoControl.OutputBufferLength; - } - - // - // Copy our buffer into users. - // - - RtlMoveMemory(userChannelData, - subQPtr, - srb->DataTransferLength); - - realIrp->IoStatus.Information = srb->DataTransferLength; - break; - } - - case IOCTL_CDROM_PAUSE_AUDIO: - - PLAY_ACTIVE(deviceExtension) = FALSE; - realIrp->IoStatus.Information = 0; - break; - - case IOCTL_CDROM_RESUME_AUDIO: - - realIrp->IoStatus.Information = 0; - break; - - case IOCTL_CDROM_SEEK_AUDIO_MSF: - - realIrp->IoStatus.Information = 0; - break; - - case IOCTL_CDROM_STOP_AUDIO: - - PLAY_ACTIVE(deviceExtension) = FALSE; - - realIrp->IoStatus.Information = 0; - break; - - case IOCTL_CDROM_GET_CONTROL: { - - PCDROM_AUDIO_CONTROL audioControl = srb->DataBuffer; - PAUDIO_OUTPUT audioOutput; - ULONG bytesTransferred; - - audioOutput = ScsiClassFindModePage((PCHAR)audioControl, - srb->DataTransferLength, - CDROM_AUDIO_CONTROL_PAGE, - use6Byte); - // - // Verify the page is as big as expected. - // - - bytesTransferred = (PCHAR) audioOutput - (PCHAR) audioControl + - sizeof(AUDIO_OUTPUT); - - if (audioOutput != NULL && - srb->DataTransferLength >= bytesTransferred) { - - audioControl->LbaFormat = audioOutput->LbaFormat; - - audioControl->LogicalBlocksPerSecond = - (audioOutput->LogicalBlocksPerSecond[0] << (UCHAR)8) | - audioOutput->LogicalBlocksPerSecond[1]; - - realIrp->IoStatus.Information = sizeof(CDROM_AUDIO_CONTROL); - - } else { - realIrp->IoStatus.Information = 0; - status = STATUS_INVALID_DEVICE_REQUEST; - } - break; - } - - case IOCTL_CDROM_GET_VOLUME: { - - PAUDIO_OUTPUT audioOutput; - PVOLUME_CONTROL volumeControl = srb->DataBuffer; - ULONG i,bytesTransferred; - - audioOutput = ScsiClassFindModePage((PCHAR)volumeControl, - srb->DataTransferLength, - CDROM_AUDIO_CONTROL_PAGE, - use6Byte); - - // - // Verify the page is as big as expected. - // - - bytesTransferred = (PCHAR) audioOutput - (PCHAR) volumeControl + - sizeof(AUDIO_OUTPUT); - - if (audioOutput != NULL && - srb->DataTransferLength >= bytesTransferred) { - - for (i=0; i<4; i++) { - volumeControl->PortVolume[i] = - audioOutput->PortOutput[i].Volume; - } - - // - // Set bytes transferred in IRP. - // - - realIrp->IoStatus.Information = sizeof(VOLUME_CONTROL); - - } else { - realIrp->IoStatus.Information = 0; - status = STATUS_INVALID_DEVICE_REQUEST; - } - - break; - } - - case IOCTL_CDROM_SET_VOLUME: - - realIrp->IoStatus.Information = sizeof(VOLUME_CONTROL); - break; - - default: - - ASSERT(FALSE); - realIrp->IoStatus.Information = 0; - status = STATUS_INVALID_DEVICE_REQUEST; - - } // end switch() - } - - // - // Deallocate srb and sense buffer. - // - - if (srb) { - if (srb->DataBuffer) { - ExFreePool(srb->DataBuffer); - } - if (srb->SenseInfoBuffer) { - ExFreePool(srb->SenseInfoBuffer); - } - ExFreePool(srb); - } - - if (realIrp->PendingReturned) { - IoMarkIrpPending(realIrp); - } - - if (Irp->MdlAddress) { - IoFreeMdl(Irp->MdlAddress); - } - - IoFreeIrp(Irp); - - // - // Set status in completing IRP. - // - - realIrp->IoStatus.Status = status; - - // - // Set the hard error if necessary. - // - - if (!NT_SUCCESS(status) && IoIsErrorUserInduced(status)) { - - // - // Store DeviceObject for filesystem, and clear - // in IoStatus.Information field. - // - - DebugPrint((1, "CdRomDeviceCompletion - Setting Hard Error on realIrp %lx\n", - realIrp)); - IoSetHardErrorOrVerifyDevice(realIrp, DeviceObject); - realIrp->IoStatus.Information = 0; - } - - IoCompleteRequest(realIrp, IO_DISK_INCREMENT); - - IoStartNextPacket(DeviceObject, FALSE); - - return STATUS_MORE_PROCESSING_REQUIRED; -} - -NTSTATUS -NTAPI -CdRomSetVolumeIntermediateCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context - ) -{ - PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; - PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); - PCDROM_DATA cdData = (PCDROM_DATA)(deviceExtension + 1); - BOOLEAN use6Byte = cdData->XAFlags & XA_USE_6_BYTE; - PIO_STACK_LOCATION realIrpStack; - PIO_STACK_LOCATION realIrpNextStack; - PSCSI_REQUEST_BLOCK srb = Context; - PIRP realIrp = NULL; - NTSTATUS status; - BOOLEAN retry; - - // - // Extract the 'real' irp from the irpstack. - // - - realIrp = (PIRP) irpStack->Parameters.Others.Argument2; - realIrpStack = IoGetCurrentIrpStackLocation(realIrp); - realIrpNextStack = IoGetNextIrpStackLocation(realIrp); - - // - // Check SRB status for success of completing request. - // - - if (SRB_STATUS(srb->SrbStatus) != SRB_STATUS_SUCCESS) { - - DebugPrint((2, - "CdRomSetVolumeIntermediateCompletion: Irp %lx, Srb %lx Real Irp\n", - Irp, - srb, - realIrp)); - - // - // Release the queue if it is frozen. - // - - if (srb->SrbStatus & SRB_STATUS_QUEUE_FROZEN) { - ScsiClassReleaseQueue(DeviceObject); - } - - - retry = ScsiClassInterpretSenseInfo(DeviceObject, - srb, - irpStack->MajorFunction, - irpStack->Parameters.DeviceIoControl.IoControlCode, - MAXIMUM_RETRIES - ((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1), - &status); - - if (status == STATUS_DATA_OVERRUN) { - status = STATUS_SUCCESS; - retry = FALSE; - } - - // - // If the status is verified required and the this request - // should bypass verify required then retry the request. - // - - if (realIrpStack->Flags & SL_OVERRIDE_VERIFY_VOLUME && - status == STATUS_VERIFY_REQUIRED) { - - status = STATUS_IO_DEVICE_ERROR; - retry = TRUE; - } - - if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1-1))) { - - if (((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1)) { - - // - // Retry request. - // - - DebugPrint((1, "Retry request %lx - Calling StartIo\n", Irp)); - - - ExFreePool(srb->SenseInfoBuffer); - ExFreePool(srb->DataBuffer); - ExFreePool(srb); - if (Irp->MdlAddress) { - IoFreeMdl(Irp->MdlAddress); - } - - IoFreeIrp(Irp); - - // - // Call StartIo directly since IoStartNextPacket hasn't been called, - // the serialisation is still intact. - // - ScsiCdRomStartIo(DeviceObject, realIrp); - return STATUS_MORE_PROCESSING_REQUIRED; - - } - - // - // Exhausted retries. Fall through and complete the request with the appropriate status. - // - - } - } else { - - // - // Set status for successful request. - // - - status = STATUS_SUCCESS; - } - - if (NT_SUCCESS(status)) { - - PAUDIO_OUTPUT audioInput = NULL; - PAUDIO_OUTPUT audioOutput; - PVOLUME_CONTROL volumeControl = realIrp->AssociatedIrp.SystemBuffer; - ULONG i,bytesTransferred,headerLength; - PVOID dataBuffer; - PCDB cdb; - - audioInput = ScsiClassFindModePage((PCHAR)srb->DataBuffer, - srb->DataTransferLength, - CDROM_AUDIO_CONTROL_PAGE, - use6Byte); - - // - // Check to make sure the mode sense data is valid before we go on - // - - if(audioInput == NULL) { - - DebugPrint((1, "Mode Sense Page %d not found\n", - CDROM_AUDIO_CONTROL_PAGE)); - - realIrp->IoStatus.Information = 0; - realIrp->IoStatus.Status = STATUS_IO_DEVICE_ERROR; - IoCompleteRequest(realIrp, IO_DISK_INCREMENT); - ExFreePool(srb->SenseInfoBuffer); - ExFreePool(srb); - IoFreeMdl(Irp->MdlAddress); - IoFreeIrp(Irp); - return STATUS_MORE_PROCESSING_REQUIRED; - } - - if (use6Byte) { - headerLength = sizeof(MODE_PARAMETER_HEADER); - } else { - headerLength = sizeof(MODE_PARAMETER_HEADER10); - } - - bytesTransferred = sizeof(AUDIO_OUTPUT) + headerLength; - - // - // Allocate a new buffer for the mode select. - // - - dataBuffer = ExAllocatePool(NonPagedPoolCacheAligned, bytesTransferred); - - if (!dataBuffer) { - realIrp->IoStatus.Information = 0; - realIrp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(realIrp, IO_DISK_INCREMENT); - ExFreePool(srb->SenseInfoBuffer); - ExFreePool(srb); - IoFreeMdl(Irp->MdlAddress); - IoFreeIrp(Irp); - return STATUS_MORE_PROCESSING_REQUIRED; - } - - RtlZeroMemory(dataBuffer, bytesTransferred); - - // - // Rebuild the data buffer to include the user requested values. - // - - audioOutput = (PAUDIO_OUTPUT) ((PCHAR) dataBuffer + headerLength); - - for (i=0; i<4; i++) { - audioOutput->PortOutput[i].Volume = - volumeControl->PortVolume[i]; - audioOutput->PortOutput[i].ChannelSelection = - audioInput->PortOutput[i].ChannelSelection; - } - - audioOutput->CodePage = CDROM_AUDIO_CONTROL_PAGE; - audioOutput->ParameterLength = sizeof(AUDIO_OUTPUT) - 2; - audioOutput->Immediate = MODE_SELECT_IMMEDIATE; - - // - // Free the old data buffer, mdl. - // - - ExFreePool(srb->DataBuffer); - IoFreeMdl(Irp->MdlAddress); - - // - // rebuild the srb. - // - - cdb = (PCDB)srb->Cdb; - RtlZeroMemory(cdb, CDB12GENERIC_LENGTH); - - srb->SrbStatus = srb->ScsiStatus = 0; - srb->SrbFlags = deviceExtension->SrbFlags; - srb->SrbFlags |= (SRB_FLAGS_DISABLE_SYNCH_TRANSFER | SRB_FLAGS_DATA_OUT); - srb->DataTransferLength = bytesTransferred; - - if (use6Byte) { - - cdb->MODE_SELECT.OperationCode = SCSIOP_MODE_SELECT; - cdb->MODE_SELECT.ParameterListLength = (UCHAR) bytesTransferred; - cdb->MODE_SELECT.PFBit = 1; - srb->CdbLength = 6; - } else { - - cdb->MODE_SELECT10.OperationCode = SCSIOP_MODE_SELECT10; - cdb->MODE_SELECT10.ParameterListLength[0] = (UCHAR) (bytesTransferred >> 8); - cdb->MODE_SELECT10.ParameterListLength[1] = (UCHAR) (bytesTransferred & 0xFF); - cdb->MODE_SELECT10.PFBit = 1; - srb->CdbLength = 10; - } - - // - // Prepare the MDL - // - - Irp->MdlAddress = IoAllocateMdl(dataBuffer, - bytesTransferred, - FALSE, - FALSE, - (PIRP) NULL); - - if (!Irp->MdlAddress) { - realIrp->IoStatus.Information = 0; - realIrp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(realIrp, IO_DISK_INCREMENT); - ExFreePool(srb->SenseInfoBuffer); - ExFreePool(srb); - ExFreePool(dataBuffer); - IoFreeIrp(Irp); - return STATUS_MORE_PROCESSING_REQUIRED; - - } - - MmBuildMdlForNonPagedPool(Irp->MdlAddress); - srb->DataBuffer = dataBuffer; - - irpStack = IoGetNextIrpStackLocation(Irp); - irpStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; - irpStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_SCSI_EXECUTE_IN; - irpStack->Parameters.Scsi.Srb = srb; - - // - // reset the irp completion. - // - - IoSetCompletionRoutine(Irp, - CdRomDeviceControlCompletion, - srb, - TRUE, - TRUE, - TRUE); - // - // Call the port driver. - // - - IoCallDriver(deviceExtension->PortDeviceObject, Irp); - - return STATUS_MORE_PROCESSING_REQUIRED; - } - - // - // Deallocate srb and sense buffer. - // - - if (srb) { - if (srb->DataBuffer) { - ExFreePool(srb->DataBuffer); - } - if (srb->SenseInfoBuffer) { - ExFreePool(srb->SenseInfoBuffer); - } - ExFreePool(srb); - } - - if (Irp->PendingReturned) { - IoMarkIrpPending(Irp); - } - - if (realIrp->PendingReturned) { - IoMarkIrpPending(realIrp); - } - - if (Irp->MdlAddress) { - IoFreeMdl(Irp->MdlAddress); - } - - IoFreeIrp(Irp); - - // - // Set status in completing IRP. - // - - realIrp->IoStatus.Status = status; - - // - // Set the hard error if necessary. - // - - if (!NT_SUCCESS(status) && IoIsErrorUserInduced(status)) { - - // - // Store DeviceObject for filesystem, and clear - // in IoStatus.Information field. - // - - IoSetHardErrorOrVerifyDevice(realIrp, DeviceObject); - realIrp->IoStatus.Information = 0; - } - - IoCompleteRequest(realIrp, IO_DISK_INCREMENT); - - IoStartNextPacket(DeviceObject, FALSE); - - return STATUS_MORE_PROCESSING_REQUIRED; -} - - -NTSTATUS -NTAPI -CdRomSwitchModeCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context - ) -{ - PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; - PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); - PCDROM_DATA cdData = (PCDROM_DATA)(deviceExtension + 1); - PIO_STACK_LOCATION realIrpStack; - PIO_STACK_LOCATION realIrpNextStack; - PSCSI_REQUEST_BLOCK srb = Context; - PIRP realIrp = NULL; - NTSTATUS status; - BOOLEAN retry; - - // - // Extract the 'real' irp from the irpstack. - // - - realIrp = (PIRP) irpStack->Parameters.Others.Argument2; - realIrpStack = IoGetCurrentIrpStackLocation(realIrp); - realIrpNextStack = IoGetNextIrpStackLocation(realIrp); - - // - // Check SRB status for success of completing request. - // - - if (SRB_STATUS(srb->SrbStatus) != SRB_STATUS_SUCCESS) { - - DebugPrint((2, - "CdRomSetVolumeIntermediateCompletion: Irp %lx, Srb %lx Real Irp\n", - Irp, - srb, - realIrp)); - - // - // Release the queue if it is frozen. - // - - if (srb->SrbStatus & SRB_STATUS_QUEUE_FROZEN) { - ScsiClassReleaseQueue(DeviceObject); - } - - - retry = ScsiClassInterpretSenseInfo(DeviceObject, - srb, - irpStack->MajorFunction, - irpStack->Parameters.DeviceIoControl.IoControlCode, - MAXIMUM_RETRIES - ((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1), - &status); - - // - // If the status is verified required and the this request - // should bypass verify required then retry the request. - // - - if (realIrpStack->Flags & SL_OVERRIDE_VERIFY_VOLUME && - status == STATUS_VERIFY_REQUIRED) { - - status = STATUS_IO_DEVICE_ERROR; - retry = TRUE; - } - - if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1-1))) { - - if (((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1)) { - - // - // Retry request. - // - - DebugPrint((1, "Retry request %lx - Calling StartIo\n", Irp)); - - - ExFreePool(srb->SenseInfoBuffer); - ExFreePool(srb->DataBuffer); - ExFreePool(srb); - if (Irp->MdlAddress) { - IoFreeMdl(Irp->MdlAddress); - } - - IoFreeIrp(Irp); - - // - // Call StartIo directly since IoStartNextPacket hasn't been called, - // the serialisation is still intact. - // - - ScsiCdRomStartIo(DeviceObject, realIrp); - return STATUS_MORE_PROCESSING_REQUIRED; - - } - - // - // Exhausted retries. Fall through and complete the request with the appropriate status. - // - } - } else { - - // - // Set status for successful request. - // - - status = STATUS_SUCCESS; - } - - if (NT_SUCCESS(status)) { - - ULONG sectorSize, startingSector, transferByteCount; - PCDB cdb; - - // - // Update device ext. to show which mode we are currently using. - // - - sectorSize = cdData->u1.BlockDescriptor.BlockLength[0] << 16; - sectorSize |= (cdData->u1.BlockDescriptor.BlockLength[1] << 8); - sectorSize |= (cdData->u1.BlockDescriptor.BlockLength[2]); - - cdData->RawAccess = (sectorSize == RAW_SECTOR_SIZE) ? TRUE : FALSE; - - // - // Free the old data buffer, mdl. - // - - ExFreePool(srb->DataBuffer); - IoFreeMdl(Irp->MdlAddress); - IoFreeIrp(Irp); - - // - // rebuild the srb. - // - - cdb = (PCDB)srb->Cdb; - RtlZeroMemory(cdb, CDB12GENERIC_LENGTH); - - - if (cdData->RawAccess) { - - PRAW_READ_INFO rawReadInfo = - (PRAW_READ_INFO)realIrpStack->Parameters.DeviceIoControl.Type3InputBuffer; - - ULONG maximumTransferLength; - ULONG transferPages; - - // - // Calculate starting offset. - // - - startingSector = (ULONG)(rawReadInfo->DiskOffset.QuadPart >> deviceExtension->SectorShift); - transferByteCount = rawReadInfo->SectorCount * RAW_SECTOR_SIZE; - maximumTransferLength = deviceExtension->PortCapabilities->MaximumTransferLength; - transferPages = ADDRESS_AND_SIZE_TO_SPAN_PAGES(MmGetMdlVirtualAddress(realIrp->MdlAddress), - transferByteCount); - - // - // Determine if request is within limits imposed by miniport. - // If the request is larger than the miniport's capabilities, split it. - // - - if (transferByteCount > maximumTransferLength || - transferPages > deviceExtension->PortCapabilities->MaximumPhysicalPages) { - - realIrp->IoStatus.Information = 0; - realIrp->IoStatus.Status = STATUS_INVALID_PARAMETER; - IoCompleteRequest(realIrp, IO_DISK_INCREMENT); - - ExFreePool(srb->SenseInfoBuffer); - ExFreePool(srb); - - IoStartNextPacket(DeviceObject, FALSE); - - return STATUS_MORE_PROCESSING_REQUIRED; - } - - srb->OriginalRequest = realIrp; - srb->SrbFlags = deviceExtension->SrbFlags; - srb->SrbFlags |= (SRB_FLAGS_DISABLE_SYNCH_TRANSFER | SRB_FLAGS_DATA_IN); - srb->DataTransferLength = transferByteCount; - srb->TimeOutValue = deviceExtension->TimeOutValue; - srb->CdbLength = 10; - srb->DataBuffer = MmGetMdlVirtualAddress(realIrp->MdlAddress); - - if (rawReadInfo->TrackMode == CDDA) { - if (cdData->XAFlags & PLEXTOR_CDDA) { - - srb->CdbLength = 12; - - cdb->PLXTR_READ_CDDA.LogicalUnitNumber = deviceExtension->Lun; - cdb->PLXTR_READ_CDDA.LogicalBlockByte3 = (UCHAR) (startingSector & 0xFF); - cdb->PLXTR_READ_CDDA.LogicalBlockByte2 = (UCHAR) ((startingSector >> 8) & 0xFF); - cdb->PLXTR_READ_CDDA.LogicalBlockByte1 = (UCHAR) ((startingSector >> 16) & 0xFF); - cdb->PLXTR_READ_CDDA.LogicalBlockByte0 = (UCHAR) ((startingSector >> 24) & 0xFF); - - cdb->PLXTR_READ_CDDA.TransferBlockByte3 = (UCHAR) (rawReadInfo->SectorCount & 0xFF); - cdb->PLXTR_READ_CDDA.TransferBlockByte2 = (UCHAR) (rawReadInfo->SectorCount >> 8); - cdb->PLXTR_READ_CDDA.TransferBlockByte1 = 0; - cdb->PLXTR_READ_CDDA.TransferBlockByte0 = 0; - - cdb->PLXTR_READ_CDDA.SubCode = 0; - cdb->PLXTR_READ_CDDA.OperationCode = 0xD8; - - } else if (cdData->XAFlags & NEC_CDDA) { - - cdb->NEC_READ_CDDA.LogicalBlockByte3 = (UCHAR) (startingSector & 0xFF); - cdb->NEC_READ_CDDA.LogicalBlockByte2 = (UCHAR) ((startingSector >> 8) & 0xFF); - cdb->NEC_READ_CDDA.LogicalBlockByte1 = (UCHAR) ((startingSector >> 16) & 0xFF); - cdb->NEC_READ_CDDA.LogicalBlockByte0 = (UCHAR) ((startingSector >> 24) & 0xFF); - - cdb->NEC_READ_CDDA.TransferBlockByte1 = (UCHAR) (rawReadInfo->SectorCount & 0xFF); - cdb->NEC_READ_CDDA.TransferBlockByte0 = (UCHAR) (rawReadInfo->SectorCount >> 8); - - cdb->NEC_READ_CDDA.OperationCode = 0xD4; - } - } else { - cdb->CDB10.LogicalUnitNumber = deviceExtension->Lun; - - cdb->CDB10.TransferBlocksMsb = (UCHAR) (rawReadInfo->SectorCount >> 8); - cdb->CDB10.TransferBlocksLsb = (UCHAR) (rawReadInfo->SectorCount & 0xFF); - - cdb->CDB10.LogicalBlockByte3 = (UCHAR) (startingSector & 0xFF); - cdb->CDB10.LogicalBlockByte2 = (UCHAR) ((startingSector >> 8) & 0xFF); - cdb->CDB10.LogicalBlockByte1 = (UCHAR) ((startingSector >> 16) & 0xFF); - cdb->CDB10.LogicalBlockByte0 = (UCHAR) ((startingSector >> 24) & 0xFF); - - cdb->CDB10.OperationCode = SCSIOP_READ; - } - - srb->SrbStatus = srb->ScsiStatus = 0; - - - irpStack = IoGetNextIrpStackLocation(realIrp); - irpStack->MajorFunction = IRP_MJ_SCSI; - irpStack->Parameters.Scsi.Srb = srb; - - if (!(irpStack->Parameters.Others.Argument1)) { - - // - // Only jam this in if it doesn't exist. The completion routines can - // call StartIo directly in the case of retries and resetting it will - // cause infinite loops. - // - - irpStack->Parameters.Others.Argument1 = (PVOID) MAXIMUM_RETRIES; - } - - // - // Set up IoCompletion routine address. - // - - IoSetCompletionRoutine(realIrp, - CdRomXACompletion, - srb, - TRUE, - TRUE, - TRUE); - } else { - - ULONG maximumTransferLength = deviceExtension->PortCapabilities->MaximumTransferLength; - ULONG transferPages = ADDRESS_AND_SIZE_TO_SPAN_PAGES(MmGetMdlVirtualAddress(realIrp->MdlAddress), - realIrpStack->Parameters.Read.Length); - // - // Back to cooked sectors. Build and send a normal read. - // The real work for setting offsets and checking for splitrequests was - // done in startio - // - - if ((realIrpStack->Parameters.Read.Length > maximumTransferLength) || - (transferPages > deviceExtension->PortCapabilities->MaximumPhysicalPages)) { - - // - // Request needs to be split. Completion of each portion of the request will - // fire off the next portion. The final request will signal Io to send a new request. - // - - ScsiClassSplitRequest(DeviceObject, realIrp, maximumTransferLength); - return STATUS_MORE_PROCESSING_REQUIRED; - - } else { - - // - // Build SRB and CDB for this IRP. - // - - ScsiClassBuildRequest(DeviceObject, realIrp); - - } - } - - // - // Call the port driver. - // - - IoCallDriver(deviceExtension->PortDeviceObject, realIrp); - - return STATUS_MORE_PROCESSING_REQUIRED; - } - - // - // Update device Extension flags to indicate that XA isn't supported. - // - - cdData->XAFlags |= XA_NOT_SUPPORTED; - - // - // Deallocate srb and sense buffer. - // - - if (srb) { - if (srb->DataBuffer) { - ExFreePool(srb->DataBuffer); - } - if (srb->SenseInfoBuffer) { - ExFreePool(srb->SenseInfoBuffer); - } - ExFreePool(srb); - } - - if (Irp->PendingReturned) { - IoMarkIrpPending(Irp); - } - - if (realIrp->PendingReturned) { - IoMarkIrpPending(realIrp); - } - - if (Irp->MdlAddress) { - IoFreeMdl(Irp->MdlAddress); - } - - IoFreeIrp(Irp); - - // - // Set status in completing IRP. - // - - realIrp->IoStatus.Status = status; - - // - // Set the hard error if necessary. - // - - if (!NT_SUCCESS(status) && IoIsErrorUserInduced(status)) { - - // - // Store DeviceObject for filesystem, and clear - // in IoStatus.Information field. - // - - IoSetHardErrorOrVerifyDevice(realIrp, DeviceObject); - realIrp->IoStatus.Information = 0; - } - - IoCompleteRequest(realIrp, IO_DISK_INCREMENT); - - IoStartNextPacket(DeviceObject, FALSE); - - return STATUS_MORE_PROCESSING_REQUIRED; -} - -NTSTATUS -NTAPI -CdRomXACompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context - ) - -/*++ - -Routine Description: - - This routine executes when the port driver has completed a request. - It looks at the SRB status in the completing SRB and if not success - it checks for valid request sense buffer information. If valid, the - info is used to update status with more precise message of type of - error. This routine deallocates the SRB. - -Arguments: - - DeviceObject - Supplies the device object which represents the logical - unit. - - Irp - Supplies the Irp which has completed. - - Context - Supplies a pointer to the SRB. - -Return Value: - - NT status - ---*/ - -{ - PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); - PIO_STACK_LOCATION irpNextStack = IoGetNextIrpStackLocation(Irp); - PSCSI_REQUEST_BLOCK srb = Context; - NTSTATUS status; - BOOLEAN retry; - - // - // Check SRB status for success of completing request. - // - - if (SRB_STATUS(srb->SrbStatus) != SRB_STATUS_SUCCESS) { - - DebugPrint((2,"ScsiClassIoComplete: IRP %lx, SRB %lx\n", Irp, srb)); - - // - // Release the queue if it is frozen. - // - - if (srb->SrbStatus & SRB_STATUS_QUEUE_FROZEN) { - ScsiClassReleaseQueue(DeviceObject); - } - - retry = ScsiClassInterpretSenseInfo( - DeviceObject, - srb, - irpStack->MajorFunction, - irpStack->MajorFunction == IRP_MJ_DEVICE_CONTROL ? irpStack->Parameters.DeviceIoControl.IoControlCode : 0, - MAXIMUM_RETRIES - ((ULONG_PTR)irpNextStack->Parameters.Others.Argument1), - &status); - - // - // If the status is verified required and the this request - // should bypass verify required then retry the request. - // - - if (irpStack->Flags & SL_OVERRIDE_VERIFY_VOLUME && - status == STATUS_VERIFY_REQUIRED) { - - status = STATUS_IO_DEVICE_ERROR; - retry = TRUE; - } - - if (retry && (irpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG_PTR)irpNextStack->Parameters.Others.Argument1-1))) { - - if (((ULONG_PTR)irpNextStack->Parameters.Others.Argument1)) { - - // - // Retry request. - // - - DebugPrint((1, "CdRomXACompletion: Retry request %lx - Calling StartIo\n", Irp)); - - - ExFreePool(srb->SenseInfoBuffer); - ExFreePool(srb->DataBuffer); - ExFreePool(srb); - - // - // Call StartIo directly since IoStartNextPacket hasn't been called, - // the serialisation is still intact. - // - - ScsiCdRomStartIo(DeviceObject, Irp); - return STATUS_MORE_PROCESSING_REQUIRED; - - } - - // - // Exhausted retries. Fall through and complete the request with the appropriate status. - // - } - } else { - - // - // Set status for successful request. - // - - status = STATUS_SUCCESS; - - } // end if (SRB_STATUS(srb->SrbStatus) ... - - // - // Return SRB to nonpaged pool. - // - - ExFreePool(srb); - - // - // Set status in completing IRP. - // - - Irp->IoStatus.Status = status; - - // - // Set the hard error if necessary. - // - - if (!NT_SUCCESS(status) && IoIsErrorUserInduced(status)) { - - // - // Store DeviceObject for filesystem, and clear - // in IoStatus.Information field. - // - - IoSetHardErrorOrVerifyDevice(Irp, DeviceObject); - Irp->IoStatus.Information = 0; - } - - // - // If pending has be returned for this irp then mark the current stack as - // pending. - // - - if (Irp->PendingReturned) { - IoMarkIrpPending(Irp); - } - - //IoCompleteRequest(Irp, IO_DISK_INCREMENT); - IoStartNextPacket(DeviceObject, FALSE); - - return status; -} - -NTSTATUS -NTAPI -CdRomDeviceControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp - ) - -/*++ - -Routine Description: - - This is the NT device control handler for CDROMs. - -Arguments: - - DeviceObject - for this CDROM - - Irp - IO Request packet - -Return Value: - - NTSTATUS - ---*/ - -{ - PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); - PIO_STACK_LOCATION nextStack; - PKEVENT deviceControlEvent; - PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; - PCDROM_DATA cdData = (PCDROM_DATA)(deviceExtension+1); - SCSI_REQUEST_BLOCK srb; - NTSTATUS status; - KIRQL irql; - - ULONG ioctlCode; - ULONG baseCode; - ULONG functionCode; - -RetryControl: - - // - // Zero the SRB on stack. - // - - RtlZeroMemory(&srb, sizeof(SCSI_REQUEST_BLOCK)); - - Irp->IoStatus.Information = 0; - - // - // if this is a class driver ioctl then we need to change the base code - // to IOCTL_CDROM_BASE so that the switch statement can handle it. - // - // WARNING - currently the scsi class ioctl function codes are between - // 0x200 & 0x300. this routine depends on that fact - // - - ioctlCode = irpStack->Parameters.DeviceIoControl.IoControlCode; - baseCode = ioctlCode >> 16; - functionCode = (ioctlCode & (~0xffffc003)) >> 2; - - DebugPrint((1, "CdRomDeviceControl: Ioctl Code = %#08lx, Base Code = %#lx," - " Function Code = %#lx\n", - ioctlCode, - baseCode, - functionCode - )); - - if((functionCode >= 0x200) && (functionCode <= 0x300)) { - - ioctlCode = (ioctlCode & 0x0000ffff) | CTL_CODE(IOCTL_CDROM_BASE, 0, 0, 0); - - DebugPrint((1, "CdRomDeviceControl: Class Code - new ioctl code is %#08lx\n", - ioctlCode)); - - irpStack->Parameters.DeviceIoControl.IoControlCode = ioctlCode; - - } - - switch (ioctlCode) { - - case IOCTL_CDROM_RAW_READ: { - - LARGE_INTEGER startingOffset; - ULONG transferBytes; - PRAW_READ_INFO rawReadInfo = (PRAW_READ_INFO)irpStack->Parameters.DeviceIoControl.Type3InputBuffer; - PUCHAR userData = (PUCHAR)Irp->AssociatedIrp.SystemBuffer; - - // - // Ensure that XA reads are supported. - // - - if (cdData->XAFlags & XA_NOT_SUPPORTED) { - - DebugPrint((1, - "CdRomDeviceControl: XA Reads not supported. Flags (%x)\n", - cdData->XAFlags)); - - status = STATUS_INVALID_DEVICE_REQUEST; - break; - } - - // - // Check that ending sector is on disc and buffers are there and of - // correct size. - // - - if (rawReadInfo == NULL) { - - // - // Called from user space. Validate the buffers. - // - - rawReadInfo = (PRAW_READ_INFO)userData; - irpStack->Parameters.DeviceIoControl.Type3InputBuffer = (PVOID)userData; - - if (rawReadInfo == NULL) { - - DebugPrint((1,"CdRomDeviceControl: Invalid I/O parameters for XA Read (No extent info\n")); - - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INVALID_PARAMETER; - } - - if (irpStack->Parameters.DeviceIoControl.InputBufferLength != sizeof(RAW_READ_INFO)) { - - DebugPrint((1,"CdRomDeviceControl: Invalid I/O parameters for XA Read (Invalid info buffer\n")); - - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INVALID_PARAMETER; - } - } - - startingOffset.QuadPart = rawReadInfo->DiskOffset.QuadPart; - transferBytes = rawReadInfo->SectorCount * RAW_SECTOR_SIZE; - - if (irpStack->Parameters.DeviceIoControl.OutputBufferLength < transferBytes) { - - DebugPrint((1,"CdRomDeviceControl: Invalid I/O parameters for XA Read (Bad buffer size)\n")); - - // - // Fail request with status of invalid parameters. - // - - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INVALID_PARAMETER; - } - - if ((startingOffset.QuadPart + transferBytes) > deviceExtension->PartitionLength.QuadPart) { - - DebugPrint((1,"CdRomDeviceControl: Invalid I/O parameters for XA Read (Request Out of Bounds)\n")); - - // - // Fail request with status of invalid parameters. - // - - status = STATUS_INVALID_PARAMETER; - break; - } - - IoMarkIrpPending(Irp); - IoStartPacket(DeviceObject, Irp, NULL, NULL); - - return STATUS_PENDING; - } - - case IOCTL_DISK_GET_DRIVE_GEOMETRY: - case IOCTL_CDROM_GET_DRIVE_GEOMETRY: { - - DebugPrint((2,"CdRomDeviceControl: Get drive geometry\n")); - - if ( irpStack->Parameters.DeviceIoControl.OutputBufferLength < - sizeof( DISK_GEOMETRY ) ) { - - status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - IoMarkIrpPending(Irp); - IoStartPacket(DeviceObject,Irp, NULL,NULL); - - return STATUS_PENDING; - } - - case IOCTL_DISK_GET_DRIVE_GEOMETRY_EX: - case IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX: { - - DebugPrint((2,"CdRomDeviceControl: Get drive geometry ex\n")); - - if ( irpStack->Parameters.DeviceIoControl.OutputBufferLength < - sizeof( DISK_GEOMETRY_EX ) ) { - - status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - IoMarkIrpPending(Irp); - IoStartPacket(DeviceObject,Irp, NULL,NULL); - - return STATUS_PENDING; - } - - case IOCTL_DISK_GET_LENGTH_INFO: { - - DebugPrint((2,"CdRomDeviceControl: Get length info\n")); - - if ( irpStack->Parameters.DeviceIoControl.OutputBufferLength < - sizeof( GET_LENGTH_INFORMATION ) ) { - - status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - IoMarkIrpPending(Irp); - IoStartPacket(DeviceObject,Irp, NULL,NULL); - - return STATUS_PENDING; - } - - case IOCTL_CDROM_GET_LAST_SESSION: - case IOCTL_CDROM_READ_TOC: { - - // - // If the cd is playing music then reject this request. - // - - if (CdRomIsPlayActive(DeviceObject)) { - Irp->IoStatus.Status = STATUS_DEVICE_BUSY; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_DEVICE_BUSY; - } - - IoMarkIrpPending(Irp); - IoStartPacket(DeviceObject, Irp, NULL, NULL); - - return STATUS_PENDING; - } - - case IOCTL_CDROM_PLAY_AUDIO_MSF: { - - // ... 15701 lines suppressed ...

1 0

[reactos] 01/01: [IMM32] Rewrite ImmSetCandidateWindow (#3884)
by Katayama Hirofumi MZ 07 Aug '21

07 Aug '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0af58654a37f2bd9123cc… commit 0af58654a37f2bd9123cca6f9ee4845e2aae7a1d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 8 08:34:47 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 8 08:34:47 2021 +0900 [IMM32] Rewrite ImmSetCandidateWindow (#3884) Implementing Japanese input... CORE-11700 --- dll/win32/imm32/imm.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index c1f5db8b1c1..f33211203e4 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -3452,29 +3452,34 @@ LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam) BOOL WINAPI ImmSetCandidateWindow( HIMC hIMC, LPCANDIDATEFORM lpCandidate) { - InputContextData *data = get_imc_data(hIMC); +#define MAX_CANDIDATEFORM 4 + DWORD dwImeThreadId, dwThreadId; + HWND hWnd; + LPINPUTCONTEXT pIC; TRACE("(%p, %p)\n", hIMC, lpCandidate); - if (!data || !lpCandidate) + if (lpCandidate->dwIndex >= MAX_CANDIDATEFORM) return FALSE; - if (IMM_IsCrossThreadAccess(NULL, hIMC)) + dwImeThreadId = Imm32QueryInputContext(hIMC, 1); + dwThreadId = GetCurrentThreadId(); + if (dwImeThreadId != dwThreadId) return FALSE; - TRACE("\t%x, %x, %s, %s\n", - lpCandidate->dwIndex, lpCandidate->dwStyle, - wine_dbgstr_point(&lpCandidate->ptCurrentPos), - wine_dbgstr_rect(&lpCandidate->rcArea)); - - if (lpCandidate->dwIndex >= ARRAY_SIZE(data->IMC.cfCandForm)) + pIC = ImmLockIMC(hIMC); + if (pIC == NULL) return FALSE; - data->IMC.cfCandForm[lpCandidate->dwIndex] = *lpCandidate; - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCANDIDATEPOS); - ImmInternalSendIMENotify(data, IMN_SETCANDIDATEPOS, 1 << lpCandidate->dwIndex); + hWnd = pIC->hWnd; + pIC->cfCandForm[lpCandidate->dwIndex] = *lpCandidate; + + ImmUnlockIMC(hIMC); + Imm32NotifyAction(hIMC, hWnd, NI_CONTEXTUPDATED, 0, IMC_SETCANDIDATEPOS, + IMN_SETCANDIDATEPOS, (1 << lpCandidate->dwIndex)); return TRUE; +#undef MAX_CANDIDATEFORM } /***********************************************************************

1 0

[reactos] 01/01: [TRANSLATION] Add/update Hungarian translation of deskmon, notepad, winlogon, mycomput
by Tibor Lajos Füzi 07 Aug '21

07 Aug '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f26614afffd0f79f3d69d… commit f26614afffd0f79f3d69d7b6052b8931c04bab59 Author: Tibor Lajos Füzi <tibor.fuzi(a)gmail.com> AuthorDate: Wed Aug 4 17:55:41 2021 +0200 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Sat Aug 7 22:57:35 2021 +0200 [TRANSLATION] Add/update Hungarian translation of deskmon, notepad, winlogon, mycomput --- base/applications/notepad/lang/hu-HU.rc | 2 +- base/system/winlogon/lang/hu-HU.rc | 30 +++++++++++++++--------------- dll/shellext/deskmon/deskmon.rc | 3 +++ dll/shellext/deskmon/lang/hu-HU.rc | 25 +++++++++++++++++++++++++ dll/win32/mycomput/lang/hu-HU.rc | 8 ++++++++ dll/win32/mycomput/mycomput.rc | 3 +++ 6 files changed, 55 insertions(+), 16 deletions(-) diff --git a/base/applications/notepad/lang/hu-HU.rc b/base/applications/notepad/lang/hu-HU.rc index 7f3852255a4..21d995b56e7 100644 --- a/base/applications/notepad/lang/hu-HU.rc +++ b/base/applications/notepad/lang/hu-HU.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Fájl" BEGIN MENUITEM "Ú&j\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "Új &ablak\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "Meg&nyitás\tCtrl+O", CMD_OPEN MENUITEM "&Mentés\tCtrl+S", CMD_SAVE MENUITEM "Mentés má&sként...", CMD_SAVE_AS diff --git a/base/system/winlogon/lang/hu-HU.rc b/base/system/winlogon/lang/hu-HU.rc index 21238085ce7..caaeb15f3a0 100644 --- a/base/system/winlogon/lang/hu-HU.rc +++ b/base/system/winlogon/lang/hu-HU.rc @@ -7,37 +7,37 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Számítógép kikapcsolása" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Mostmár biztonságos a gép kikapcsolása.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Most már biztonságos a gép kikapcsolása.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 DEFPUSHBUTTON "&Újraindítás", IDC_BTNSHTDOWNCOMPUTER, 60, 32, 44, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Felhasználói felületet érintõ hiba" +CAPTION "Felhasználói felületet érintő hiba" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "A Felhasználó beléptetését kezelõ DLL (%s) nem tudott betöltõdni.", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "Értesítsd a rendszergazdát, hogy javítsa ki a DLL állományt.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + LTEXT "A Felhasználó beléptetését kezelő DLL (%s) nem tudott betöltődni.", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "Értesítse a rendszergazdát, hogy javítsa ki a DLL állományt.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 DEFPUSHBUTTON "&Újraindítás", 1, 80, 91, 68, 14 END IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP -CAPTION "System Shutdown" +CAPTION "A rendszer leállítása" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 - LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "A rendszer leállítását kezdeményezték. Kérjük mentse el az összes folyamatban lévő munkáját és jelentkezzen ki a munkamenetből. Minden nem mentett módosítás elvész.", -1, 38, 7, 135, 40 + LTEXT "A rendszer ennyi idő múlva leáll:", -1, 38, 50, 90, 8 LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 - LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "Üzenet:", -1, 38, 65, 135, 8 EDITTEXT IDC_SYSSHUTDOWNMESSAGE, 34, 75, 139, 58, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, WS_EX_STATICEDGE END STRINGTABLE BEGIN - IDS_PREPARENETWORKCONNECTIONS "Hálózati kapcsolatok elõkészítése..." + IDS_PREPARENETWORKCONNECTIONS "Hálózati kapcsolatok előkészítése..." IDS_APPLYINGCOMPUTERSETTINGS "Beállítások érvényesítése..." IDS_RUNNINGSTARTUPSCRIPTS "Indító szkriptek futtatása..." IDS_RUNNINGSHUTDOWNSCRIPTS "Leállító szkriptek futtatása..." @@ -46,17 +46,17 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Bejelentkezési szkriptek futtatása..." IDS_LOADINGYOURPERSONALSETTINGS "Személyes beállítások betöltése..." IDS_CLOSINGNETWORKCONNECTIONS "Hálózati kapcsolatok lezárása..." - IDS_REACTOSISRESTARTING "Restarting..." - IDS_REACTOSISSHUTTINGDOWN "Shutting down..." - IDS_PREPARETOSTANDBY "Készenléti üzemmód elõkészítése..." - IDS_PREPARETOHIBERNATE "Hibernálás elõkészítése..." + IDS_REACTOSISRESTARTING "Újraindítás..." + IDS_REACTOSISSHUTTINGDOWN "Leállítás..." + IDS_PREPARETOSTANDBY "Készenléti üzemmód előkészítése..." + IDS_PREPARETOHIBERNATE "Hibernálás előkészítése..." IDS_SAVEYOURSETTINGS "Beállítások mentése..." IDS_REACTOSISSTARTINGUP "A ReactOS indul..." IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" - IDS_TIMEOUTLONGFORMAT "%d days" + IDS_TIMEOUTLONGFORMAT "%d nap" END STRINGTABLE BEGIN - IDS_FAILEDACTIVATEUSERSHELL "A Winlogon nemtudta elindítani a felhasználói felületet!" + IDS_FAILEDACTIVATEUSERSHELL "A Winlogon nem tudta elindítani a felhasználói felületet!" END diff --git a/dll/shellext/deskmon/deskmon.rc b/dll/shellext/deskmon/deskmon.rc index 8d39e819f97..580cf49ce9e 100644 --- a/dll/shellext/deskmon/deskmon.rc +++ b/dll/shellext/deskmon/deskmon.rc @@ -46,6 +46,9 @@ IDC_MONITORICO ICON "resources/monitor.ico" #ifdef LANGUAGE_HI_IN #include "lang/hi-IN.rc" #endif +#ifdef LANGUAGE_HU_HU + #include "lang/hu-HU.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/dll/shellext/deskmon/lang/hu-HU.rc b/dll/shellext/deskmon/lang/hu-HU.rc new file mode 100644 index 00000000000..6239e59044e --- /dev/null +++ b/dll/shellext/deskmon/lang/hu-HU.rc @@ -0,0 +1,25 @@ +/* Hungarian translation by Tibor Lajos Füzi (tibor.fuzi(a)gmail.com) 2021 */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +IDD_MONITOR DIALOGEX 0, 0, 252, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Monitor" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Monitor típus", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON + LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL + PUSHBUTTON "&Tulajdonságok", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED + GROUPBOX "Monitor beállítások", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 + LTEXT "&Képfrissítési frekvencia:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 + COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT + AUTOCHECKBOX "A &monitor által nem támogatott módok elrejtése", IDC_PRUNINGCHECK, 13, 106, 225, 10 +END + +STRINGTABLE +BEGIN + IDS_USEDEFFRQUENCY "A hardver alapértelmezett beállításainak használata" + IDS_FREQFMT "%u Hertz" +END diff --git a/dll/win32/mycomput/lang/hu-HU.rc b/dll/win32/mycomput/lang/hu-HU.rc new file mode 100644 index 00000000000..07124b8de29 --- /dev/null +++ b/dll/win32/mycomput/lang/hu-HU.rc @@ -0,0 +1,8 @@ +/* Hungarian translation by Tibor Lajos Füzi (tibor.fuzi(a)gmail.com) 2021 */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_MANAGE "Kezelés" +END diff --git a/dll/win32/mycomput/mycomput.rc b/dll/win32/mycomput/mycomput.rc index 7bf9c6af80b..c6803d41e82 100644 --- a/dll/win32/mycomput/mycomput.rc +++ b/dll/win32/mycomput/mycomput.rc @@ -24,6 +24,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HU_HU + #include "lang/hu-HU.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif

1 0

[reactos] 01/01: [NTOS:MM] Implement MmFlushImageSection(MmFlushForWrite)
by Jérôme Gardou 07 Aug '21

07 Aug '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=589016ddb9b818345f8a1… commit 589016ddb9b818345f8a1e730685957f2d137a98 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Aug 6 18:14:10 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Sat Aug 7 09:34:58 2021 +0200 [NTOS:MM] Implement MmFlushImageSection(MmFlushForWrite) --- ntoskrnl/mm/section.c | 155 +++++++++++++++++++++++++++++++------------------- 1 file changed, 95 insertions(+), 60 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index c4b89125f06..e106e0a66d1 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1011,11 +1011,11 @@ MmDereferenceSegmentWithLock(PMM_SECTION_SEGMENT Segment, KIRQL OldIrql) } *Segment->Flags |= MM_SEGMENT_INDELETE; - MiReleasePfnLock(OldIrql); /* Flush the segment */ if (*Segment->Flags & MM_DATAFILE_SEGMENT) { + MiReleasePfnLock(OldIrql); /* Free the page table. This will flush any remaining dirty data */ MmFreePageTablesSectionSegment(Segment, FreeSegmentPage); @@ -1036,7 +1036,6 @@ MmDereferenceSegmentWithLock(PMM_SECTION_SEGMENT Segment, KIRQL OldIrql) ULONG NrSegments; ULONG i; - OldIrql = MiAcquirePfnLock(); /* Delete the pointer on the file */ ASSERT(ImageSectionObject->FileObject->SectionObjectPointer->ImageSectionObject == ImageSectionObject); ImageSectionObject->FileObject->SectionObjectPointer->ImageSectionObject = NULL; @@ -1098,6 +1097,7 @@ MmUnsharePageEntrySectionSegment(PMEMORY_AREA MemoryArea, ULONG_PTR Entry = InEntry ? *InEntry : MmGetPageEntrySectionSegment(Segment, Offset); PFN_NUMBER Page = PFN_FROM_SSE(Entry); BOOLEAN IsDataMap = BooleanFlagOn(*Segment->Flags, MM_DATAFILE_SEGMENT); + SWAPENTRY SwapEntry; if (Entry == 0) { @@ -1134,12 +1134,12 @@ MmUnsharePageEntrySectionSegment(PMEMORY_AREA MemoryArea, return FALSE; } - if (!BooleanFlagOn(Segment->Image.Characteristics, IMAGE_SCN_MEM_SHARED)) + if (!FlagOn(Segment->Image.Characteristics, IMAGE_SCN_MEM_SHARED)) { - /* So this must have been a read-only page. Keep it ! */ ASSERT(Segment->WriteCopy); ASSERT(!IS_DIRTY_SSE(Entry)); ASSERT(MmGetSavedSwapEntryPage(Page) == 0); + /* So this must have been a read-only page. Keep it ! */ MmSetPageEntrySectionSegment(Segment, Offset, Entry); return FALSE; } @@ -1148,7 +1148,7 @@ MmUnsharePageEntrySectionSegment(PMEMORY_AREA MemoryArea, * So this is a page for a shared section of a DLL. * We can keep it if it is not dirty. */ - SWAPENTRY SwapEntry = MmGetSavedSwapEntryPage(Page); + SwapEntry = MmGetSavedSwapEntryPage(Page); if ((SwapEntry == 0) && !IS_DIRTY_SSE(Entry)) { MmSetPageEntrySectionSegment(Segment, Offset, Entry); @@ -1194,7 +1194,8 @@ MmMakeSegmentResident( _In_ PMM_SECTION_SEGMENT Segment, _In_ LONGLONG Offset, _In_ ULONG Length, - _In_opt_ PLARGE_INTEGER ValidDataLength) + _In_opt_ PLARGE_INTEGER ValidDataLength, + _In_ BOOLEAN SetDirty) { /* Let's use a 64K granularity. */ LONGLONG RangeStart, RangeEnd; @@ -1261,7 +1262,9 @@ MmMakeSegmentResident( if (Entry != 0) { - /* There is a page here. Or a swap entry. Or whatever... */ + /* Dirtify it if it's a resident page and we're asked to */ + if (SetDirty && !IS_SWAP_FROM_SSE(Entry)) + MmSetPageEntrySectionSegment(Segment, &CurrentOffset, DIRTY_SSE(Entry)); continue; } @@ -1409,12 +1412,16 @@ AssignPagesToSegment: for (UINT i = 0; i < BYTES_TO_PAGES(ReadLength); i++) { + ULONG_PTR Entry = MAKE_SSE(Pages[i] << PAGE_SHIFT, 0); LARGE_INTEGER CurrentOffset; CurrentOffset.QuadPart = ChunkOffset + (i * PAGE_SIZE); ASSERT(MM_IS_WAIT_PTE(MmGetPageEntrySectionSegment(Segment, &CurrentOffset))); - MmSetPageEntrySectionSegment(Segment, &CurrentOffset, MAKE_SSE(Pages[i] << PAGE_SHIFT, 0)); + if (SetDirty) + Entry = DIRTY_SSE(Entry); + + MmSetPageEntrySectionSegment(Segment, &CurrentOffset, Entry); } MmUnlockSectionSegment(Segment); @@ -1755,7 +1762,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, PFSRTL_COMMON_FCB_HEADER FcbHeader = Segment->FileObject->FsContext; - Status = MmMakeSegmentResident(Segment, Offset.QuadPart, PAGE_SIZE, &FcbHeader->ValidDataLength); + Status = MmMakeSegmentResident(Segment, Offset.QuadPart, PAGE_SIZE, &FcbHeader->ValidDataLength, FALSE); FsRtlReleaseFile(Segment->FileObject); @@ -3621,6 +3628,7 @@ MiRosUnmapViewOfSection(IN PEPROCESS Process, ASSERT(NT_SUCCESS(Status)); } } + DPRINT("One mapping less for %p\n", ImageSectionObject->FileObject->SectionObjectPointer); InterlockedDecrement(&ImageSectionObject->MapCount); } else @@ -4046,6 +4054,8 @@ MmMapViewOfSection(IN PVOID SectionObject, *BaseAddress = (PVOID)ImageBase; *ViewSize = ImageSize; + DPRINT("Mapped %p for section pointer %p\n", ImageSectionObject, ImageSectionObject->FileObject->SectionObjectPointer); + /* One more map */ InterlockedIncrement(&ImageSectionObject->MapCount); } @@ -4184,6 +4194,50 @@ MmCanFileBeTruncated (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, return Ret; } +static +BOOLEAN +MiPurgeImageSegment(PMM_SECTION_SEGMENT Segment) +{ + PCACHE_SECTION_PAGE_TABLE PageTable; + + MmLockSectionSegment(Segment); + + /* Loop over all entries */ + for (PageTable = RtlEnumerateGenericTable(&Segment->PageTable, TRUE); + PageTable != NULL; + PageTable = RtlEnumerateGenericTable(&Segment->PageTable, FALSE)) + { + for (ULONG i = 0; i < _countof(PageTable->PageEntries); i++) + { + ULONG_PTR Entry = PageTable->PageEntries[i]; + LARGE_INTEGER Offset; + + if (!Entry) + continue; + + if (IS_SWAP_FROM_SSE(Entry) || (SHARE_COUNT_FROM_SSE(Entry) > 0)) + { + /* I/O ongoing or swap entry. Someone mapped this file as we were not looking */ + MmUnlockSectionSegment(Segment); + return FALSE; + } + + /* Regular entry */ + ASSERT(!IS_WRITE_SSE(Entry)); + ASSERT(MmGetSavedSwapEntryPage(PFN_FROM_SSE(Entry)) == 0); + + /* Properly remove using the used API */ + Offset.QuadPart = PageTable->FileOffset.QuadPart + (i << PAGE_SHIFT); + MmSetPageEntrySectionSegment(Segment, &Offset, 0); + MmReleasePageMemoryConsumer(MC_USER, PFN_FROM_SSE(Entry)); + } + } + + MmUnlockSectionSegment(Segment); + + return TRUE; +} + /* * @implemented */ @@ -4194,12 +4248,34 @@ MmFlushImageSection (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, switch(FlushType) { case MmFlushForDelete: + { + /* + * FIXME: Check for outstanding write probes on Data section. + * How do we do that ? + */ + } + /* Fall-through */ + case MmFlushForWrite: { KIRQL OldIrql = MiAcquirePfnLock(); PMM_IMAGE_SECTION_OBJECT ImageSectionObject = SectionObjectPointer->ImageSectionObject; - if (!ImageSectionObject || (ImageSectionObject->SegFlags & MM_SEGMENT_INDELETE)) + DPRINT("Deleting or modifying %p\n", SectionObjectPointer); + + /* Wait for concurrent creation or deletion of image to be done */ + ImageSectionObject = SectionObjectPointer->ImageSectionObject; + while (ImageSectionObject && (ImageSectionObject->SegFlags & (MM_SEGMENT_INCREATE | MM_SEGMENT_INDELETE))) { + MiReleasePfnLock(OldIrql); + KeDelayExecutionThread(KernelMode, FALSE, &TinyTime); + OldIrql = MiAcquirePfnLock(); + ImageSectionObject = SectionObjectPointer->ImageSectionObject; + } + + if (!ImageSectionObject) + { + DPRINT("No image section object. Accepting\n"); + /* Nothing to do */ MiReleasePfnLock(OldIrql); return TRUE; } @@ -4209,6 +4285,7 @@ MmFlushImageSection (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, { /* We do. No way to delete it */ MiReleasePfnLock(OldIrql); + DPRINT("Denying. There are mappings open\n"); return FALSE; } @@ -4217,39 +4294,12 @@ MmFlushImageSection (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, InterlockedIncrement64(&ImageSectionObject->RefCount); MiReleasePfnLock(OldIrql); + DPRINT("Purging\n"); + for (ULONG i = 0; i < ImageSectionObject->NrSegments; i++) { - PMM_SECTION_SEGMENT Segment = &ImageSectionObject->Segments[i]; - LONGLONG Length; - - MmLockSectionSegment(Segment); - /* Loop over all entries */ - LARGE_INTEGER Offset; - Offset.QuadPart = 0; - - Length = Segment->Length.QuadPart; - if (Length < Segment->RawLength.QuadPart) - Length = Segment->RawLength.QuadPart; - - while (Offset.QuadPart < Length) - { - ULONG_PTR Entry = MmGetPageEntrySectionSegment(Segment, &Offset); - - /* Shared data must already be discarded, and nobody should be reading it. */ - ASSERT(!IS_SWAP_FROM_SSE(Entry)); - if (Entry != 0) - { - DPRINT1("Freeing page %lx for image section %p\n", PFN_FROM_SSE(Entry), ImageSectionObject); - /* Release the page */ - ASSERT(SHARE_COUNT_FROM_SSE(Entry) == 0); - ASSERT(!IS_WRITE_SSE(Entry)); - ASSERT(MmGetSavedSwapEntryPage(PFN_FROM_SSE(Entry)) == 0); - MmSetPageEntrySectionSegment(Segment, &Offset, 0); - MmReleasePageMemoryConsumer(MC_USER, PFN_FROM_SSE(Entry)); - } - Offset.QuadPart += PAGE_SIZE; - } - MmUnlockSectionSegment(Segment); + if (!MiPurgeImageSegment(&ImageSectionObject->Segments[i])) + break; } /* Grab lock again */ @@ -4274,21 +4324,6 @@ MmFlushImageSection (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, MmDereferenceSegmentWithLock(&ImageSectionObject->Segments[0], OldIrql); return TRUE; } - case MmFlushForWrite: - { - BOOLEAN Ret = TRUE; - KIRQL OldIrql = MiAcquirePfnLock(); - - if (SectionObjectPointer->ImageSectionObject) - { - PMM_IMAGE_SECTION_OBJECT ImageSectionObject = SectionObjectPointer->ImageSectionObject; - if (!(ImageSectionObject->SegFlags & MM_SEGMENT_INDELETE)) - Ret = FALSE; - } - - MiReleasePfnLock(OldIrql); - return Ret; - } } return FALSE; } @@ -4782,7 +4817,7 @@ MmMakeDataSectionResident( /* There must be a segment for this call */ ASSERT(Segment); - NTSTATUS Status = MmMakeSegmentResident(Segment, Offset, Length, ValidDataLength); + NTSTATUS Status = MmMakeSegmentResident(Segment, Offset, Length, ValidDataLength, FALSE); MmDereferenceSegment(Segment); @@ -4906,8 +4941,8 @@ MmCheckDirtySegment( * We got a dirty entry. This path is for the shared data, * be-it regular file maps or shared sections of DLLs */ - ASSERT(!Segment->WriteCopy); - ASSERT(FlagOn(*Segment->Flags, MM_DATAFILE_SEGMENT) || FlagOn(Segment->Image.Characteristics, IMAGE_SCN_MEM_SHARED)); + ASSERT(FlagOn(*Segment->Flags, MM_DATAFILE_SEGMENT) || + FlagOn(Segment->Image.Characteristics, IMAGE_SCN_MEM_SHARED)); /* Insert the cleaned entry back. Mark it as write in progress, and clear the dirty bit. */ Entry = MAKE_SSE(PAGE_FROM_SSE(Entry), SHARE_COUNT_FROM_SSE(Entry) + 1); @@ -4936,7 +4971,7 @@ MmCheckDirtySegment( ASSERT(PageOut); /* And this must be for a shared section in a DLL */ - ASSERT(Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED); + ASSERT(FlagOn(Segment->Image.Characteristics, IMAGE_SCN_MEM_SHARED)); SWAPENTRY SwapEntry = MmGetSavedSwapEntryPage(Page); if (!SwapEntry)

1 0

[reactos] 01/01: [LDR] Disable Logging when images overlap CORE-17635
by Joachim Henze 06 Aug '21

06 Aug '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4cc2c350ef208d417a7e0… commit 4cc2c350ef208d417a7e0124c44b6c521bd3a917 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Aug 6 19:25:14 2021 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Aug 6 19:25:14 2021 +0200 [LDR] Disable Logging when images overlap CORE-17635 We found out what we wanted to find out: the remaining TODOs for the Python script. So we can silence the DPRINTs again for the time being to reduce spam from 3rd party dlls. Paying tribute to Mark Jansen ;) --- dll/ntdll/ldr/ldrutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index 27fa42b929f..5b1ec30e525 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -1335,7 +1335,7 @@ SkipCheck: ImageBase = (ULONG_PTR)NtHeaders->OptionalHeader.ImageBase; ImageEnd = ImageBase + ViewSize; - DPRINT1("LDR: LdrpMapDll Relocating Image Name %ws (%p-%p -> %p)\n", DllName, (PVOID)ImageBase, (PVOID)ImageEnd, ViewBase); + DPRINT("LDR: LdrpMapDll Relocating Image Name %ws (%p-%p -> %p)\n", DllName, (PVOID)ImageBase, (PVOID)ImageEnd, ViewBase); /* Scan all the modules */ ListHead = &Peb->Ldr->InLoadOrderModuleList; @@ -1374,7 +1374,7 @@ SkipCheck: RtlInitUnicodeString(&OverlapDll, L"Dynamically Allocated Memory"); } - DPRINT1("Overlapping DLL: %wZ\n", &OverlapDll); + DPRINT("Overlapping DLL: %wZ\n", &OverlapDll); /* Are we dealing with a DLL? */ if (LdrEntry->Flags & LDRP_IMAGE_DLL)

1 0

[reactos] 02/02: [WIN32K] Do not release twice the lock on error path
by Jérôme Gardou 06 Aug '21

06 Aug '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c4801ab696d9fb2dfdd38… commit c4801ab696d9fb2dfdd383741af3b34a73aa9a17 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Aug 6 15:18:21 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Aug 6 15:18:21 2021 +0200 [WIN32K] Do not release twice the lock on error path --- win32ss/user/ntuser/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index 8f593d02fff..00a683af61c 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -995,7 +995,6 @@ DriverEntry( if (!gpsi) { DPRINT1("Failed allocate server info structure!\n"); - UserLeave(); return STATUS_UNSUCCESSFUL; }

1 0

[reactos] 01/02: [CMAKE] Do not disable optimisations on ntoskrnl build
by Jérôme Gardou 06 Aug '21

06 Aug '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6618d978cd23d30bda559… commit 6618d978cd23d30bda5594f6ce79d68daac0c435 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Aug 6 09:51:57 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Aug 6 15:17:49 2021 +0200 [CMAKE] Do not disable optimisations on ntoskrnl build --- ntoskrnl/CMakeLists.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt index a359482aad8..b0cf73eec86 100644 --- a/ntoskrnl/CMakeLists.txt +++ b/ntoskrnl/CMakeLists.txt @@ -46,13 +46,6 @@ set_module_type(ntoskrnl kernel) source_group(TREE ${REACTOS_SOURCE_DIR}/ntoskrnl PREFIX "Source Files" FILES ${NTOSKRNL_SOURCE}) -if(GDB AND NOT CLANG) - # Completely disable optimizations when debugging the kernel - # Not for CLang, which fails as following in _SEH2_EXCEPT macro: - # error: inline assembly requires more registers than available - target_compile_options(ntoskrnl PRIVATE -O0) -endif() - target_link_libraries(ntoskrnl cportlib csq ${PSEH_LIB} arbiter cmlib ntlsalib rtl ${ROSSYM_LIB} libcntpr wdmguid ioevent) if(STACK_PROTECTOR)

1 0

[reactos] 01/01: [WIN32K] Init User part after GDI one.
by Jérôme Gardou 06 Aug '21

06 Aug '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0bc00267df2f644d329a5… commit 0bc00267df2f644d329a5b0823052293c0108384 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Aug 4 09:49:18 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Fri Aug 6 10:15:02 2021 +0200 [WIN32K] Init User part after GDI one. But Initialize user lock first thing to avoid hitting newly introduced ASSERTS This partly reverts commit 515d83a883ae01c8ccaca6d56e47d0ae4bdb0305. --- win32ss/user/ntuser/main.c | 35 ++++++++++++++++++++++++++++++++++- win32ss/user/ntuser/ntuser.c | 18 ------------------ win32ss/user/ntuser/ntuser.h | 1 + 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index 1c8e0c53337..8f593d02fff 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -896,6 +896,21 @@ DriverUnload(IN PDRIVER_OBJECT DriverObject) } \ } +// Lock & return on failure +#define USERLOCK_AND_ROF(x) \ +{ \ + UserEnterExclusive(); \ + Status = (x); \ + UserLeave(); \ + if (!NT_SUCCESS(Status)) \ + { \ + DPRINT1("Failed '%s' (0x%lx)\n", #x, Status); \ + return Status; \ + } \ +} + + + /* * This definition doesn't work */ @@ -968,7 +983,24 @@ DriverEntry( return STATUS_UNSUCCESSFUL; } - NT_ROF(InitUserImpl()); + /* Init the global user lock */ + ExInitializeResourceLite(&UserLock); + + /* Lock while we use the heap (UserHeapAlloc asserts on this) */ + UserEnterExclusive(); + + /* Allocate global server info structure */ + gpsi = UserHeapAlloc(sizeof(*gpsi)); + UserLeave(); + if (!gpsi) + { + DPRINT1("Failed allocate server info structure!\n"); + UserLeave(); + return STATUS_UNSUCCESSFUL; + } + + RtlZeroMemory(gpsi, sizeof(*gpsi)); + DPRINT("Global Server Data -> %p\n", gpsi); NT_ROF(InitGdiHandleTable()); NT_ROF(InitPaletteImpl()); @@ -983,6 +1015,7 @@ DriverEntry( NT_ROF(InitLDEVImpl()); NT_ROF(InitDeviceImpl()); NT_ROF(InitDcImpl()); + USERLOCK_AND_ROF(InitUserImpl()); NT_ROF(InitWindowStationImpl()); NT_ROF(InitDesktopImpl()); NT_ROF(InitInputImpl()); diff --git a/win32ss/user/ntuser/ntuser.c b/win32ss/user/ntuser/ntuser.c index 9ada594c363..32805901b33 100644 --- a/win32ss/user/ntuser/ntuser.c +++ b/win32ss/user/ntuser/ntuser.c @@ -79,22 +79,6 @@ InitUserImpl(VOID) NTSTATUS Status; HKEY hKey; - ExInitializeResourceLite(&UserLock); - - /* Hold global resource to make sanity checks happy. */ - UserEnterExclusive(); - - /* Allocate global server info structure */ - gpsi = UserHeapAlloc(sizeof(*gpsi)); - if (!gpsi) - { - ERR("Failed allocate server info structure!\n"); - return STATUS_UNSUCCESSFUL; - } - - RtlZeroMemory(gpsi, sizeof(*gpsi)); - TRACE("Global Server Data -> %p\n", gpsi); - if (!UserCreateHandleTable()) { ERR("Failed creating handle table\n"); @@ -122,8 +106,6 @@ InitUserImpl(VOID) InitSysParams(); - UserLeave(); - return STATUS_SUCCESS; } diff --git a/win32ss/user/ntuser/ntuser.h b/win32ss/user/ntuser/ntuser.h index 78b6bacd965..d456564b159 100644 --- a/win32ss/user/ntuser/ntuser.h +++ b/win32ss/user/ntuser/ntuser.h @@ -18,6 +18,7 @@ extern BOOL g_AlwaysDisplayVersion; extern ATOM gaGuiConsoleWndClass; extern ATOM AtomDDETrack; extern ATOM AtomQOS; +extern ERESOURCE UserLock; CODE_SEG("INIT") NTSTATUS NTAPI InitUserImpl(VOID); VOID FASTCALL CleanupUserImpl(VOID);

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

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 August 2021