Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [USER32] Mute 'Imm Api Table Init 2' spam
by Katayama Hirofumi MZ 26 Sep '20

26 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f341e60fbe5a6377c292f… commit f341e60fbe5a6377c292f82022e1433cb0b9f66d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 26 11:13:43 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 26 11:13:43 2020 +0900 [USER32] Mute 'Imm Api Table Init 2' spam CORE-11700 --- win32ss/user/user32/misc/imm.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index 03e040230a9..ef821aea8fa 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -55,9 +55,6 @@ BOOL WINAPI IntInitializeImmEntryTable(VOID) WCHAR ImmFile[MAX_PATH]; HMODULE imm32 = ghImm32; - if (IMM_FN(ImmWINNLSEnableIME) != IMMSTUB_ImmWINNLSEnableIME) - return TRUE; - GetImmFileName(ImmFile, sizeof(ImmFile)); TRACE("File %ws\n",ImmFile); @@ -104,11 +101,8 @@ BOOL WINAPI User32InitializeImmEntryTable(DWORD magic) if (magic != IMM_INIT_MAGIC) return FALSE; - if (gImmApiEntries.pImmIsIME != 0) - { - ERR("Imm Api Table Init 2\n"); - return TRUE; - } + if (IMM_FN(ImmIsIME) != IMMSTUB_ImmIsIME) + return TRUE; IntInitializeImmEntryTable();

1 0

[reactos] 01/01: [SCSIPORT][FORMATTING] Fix formatting and PCH generation
by Victor Perevertkin 26 Sep '20

26 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fdc47e7ea7fe0564f37f9… commit fdc47e7ea7fe0564f37f975a5c2d74adfaa41acd Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Sep 26 03:47:52 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Sep 26 03:47:52 2020 +0300 [SCSIPORT][FORMATTING] Fix formatting and PCH generation --- drivers/storage/port/scsiport/CMakeLists.txt | 5 +- drivers/storage/port/scsiport/precomp.h | 6 - drivers/storage/port/scsiport/scsiport.c | 1454 ++++++++++---------- .../port/scsiport/{scsiport_int.h => scsiport.h} | 8 + 4 files changed, 702 insertions(+), 771 deletions(-) diff --git a/drivers/storage/port/scsiport/CMakeLists.txt b/drivers/storage/port/scsiport/CMakeLists.txt index 0fa44c3f0b1..74304049d99 100644 --- a/drivers/storage/port/scsiport/CMakeLists.txt +++ b/drivers/storage/port/scsiport/CMakeLists.txt @@ -3,15 +3,14 @@ spec2def(scsiport.sys scsiport.spec ADD_IMPORTLIB) list(APPEND SOURCE scsiport.c - stubs.c - precomp.h) + stubs.c) add_library(scsiport MODULE ${SOURCE} scsiport.rc ${CMAKE_CURRENT_BINARY_DIR}/scsiport.def) -add_pch(scsiport precomp.h SOURCE) +add_pch(scsiport scsiport.h "") set_module_type(scsiport kernelmodedriver) add_importlibs(scsiport ntoskrnl hal) add_cd_file(TARGET scsiport DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/storage/port/scsiport/precomp.h b/drivers/storage/port/scsiport/precomp.h deleted file mode 100644 index 69afc4093c3..00000000000 --- a/drivers/storage/port/scsiport/precomp.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _SCSIPORT_PCH_ -#define _SCSIPORT_PCH_ - -#include <wdm.h> - -#endif /* _SCSIPORT_PCH_ */ diff --git a/drivers/storage/port/scsiport/scsiport.c b/drivers/storage/port/scsiport/scsiport.c index f0adf12384e..2155a2c069d 100644 --- a/drivers/storage/port/scsiport/scsiport.c +++ b/drivers/storage/port/scsiport/scsiport.c @@ -1,46 +1,18 @@ /* - * ReactOS kernel - * Copyright (C) 2001, 2002 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Storage Stack - * FILE: drivers/storage/scsiport/scsiport.c - * PURPOSE: SCSI port driver - * PROGRAMMER: Eric Kohl - * Aleksey Bragin (aleksey reactos org) + * PROJECT: ReactOS Storage Stack + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: SCSI Port driver SCSI requests handling + * COPYRIGHT: Eric Kohl (eric.kohl(a)reactos.org) + * Aleksey Bragin (aleksey(a)reactos.org) */ /* INCLUDES *****************************************************************/ -#include "precomp.h" - -#include <ntddk.h> -#include <stdio.h> -#include <scsi.h> -#include <ntddscsi.h> -#include <ntdddisk.h> -#include <mountdev.h> +#include "scsiport.h" #define NDEBUG #include <debug.h> -#include "scsiport_int.h" - ULONG InternalDebugLevel = 0x00; #undef ScsiPortMoveMemory @@ -58,21 +30,21 @@ SpiGetPciConfigData(IN PDRIVER_OBJECT DriverObject, static NTSTATUS NTAPI ScsiPortCreateClose(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); + IN PIRP Irp); static DRIVER_DISPATCH ScsiPortDispatchScsi; static NTSTATUS NTAPI ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); + IN PIRP Irp); static NTSTATUS NTAPI ScsiPortDeviceControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); + IN PIRP Irp); static DRIVER_STARTIO ScsiPortStartIo; static VOID NTAPI ScsiPortStartIo(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); + IN PIRP Irp); static BOOLEAN NTAPI ScsiPortStartPacket(IN OUT PVOID Context); @@ -87,9 +59,9 @@ SpiAllocateLunExtension(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension); static PSCSI_PORT_LUN_EXTENSION SpiGetLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun); + IN UCHAR PathId, + IN UCHAR TargetId, + IN UCHAR Lun); static PSCSI_REQUEST_BLOCK_INFO SpiAllocateSrbStructures(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, @@ -105,7 +77,7 @@ SpiScanAdapter(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension); static NTSTATUS SpiGetInquiryData (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, - IN PIRP Irp); + IN PIRP Irp); static PSCSI_REQUEST_BLOCK_INFO SpiGetSrbData(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, @@ -116,17 +88,17 @@ SpiGetSrbData(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, static BOOLEAN NTAPI ScsiPortIsr(IN PKINTERRUPT Interrupt, - IN PVOID ServiceContext); + IN PVOID ServiceContext); static VOID NTAPI ScsiPortDpcForIsr(IN PKDPC Dpc, - IN PDEVICE_OBJECT DpcDeviceObject, - IN PIRP DpcIrp, - IN PVOID DpcContext); + IN PDEVICE_OBJECT DpcDeviceObject, + IN PIRP DpcIrp, + IN PVOID DpcContext); static VOID NTAPI ScsiPortIoTimer(PDEVICE_OBJECT DeviceObject, - PVOID Context); + PVOID Context); IO_ALLOCATION_ACTION NTAPI @@ -221,29 +193,29 @@ NTHALAPI NTSTATUS NTAPI HalAssignSlotResources(PUNICODE_STRING, PUNICODE_STRING, /* FUNCTIONS *****************************************************************/ /********************************************************************** - * NAME EXPORTED - * DriverEntry + * NAME EXPORTED + * DriverEntry * * DESCRIPTION - * This function initializes the driver. + * This function initializes the driver. * * RUN LEVEL - * PASSIVE_LEVEL + * PASSIVE_LEVEL * * ARGUMENTS - * DriverObject - * System allocated Driver Object for this driver. + * DriverObject + * System allocated Driver Object for this driver. * - * RegistryPath - * Name of registry driver service key. + * RegistryPath + * Name of registry driver service key. * * RETURN VALUE - * Status. + * Status. */ NTSTATUS NTAPI DriverEntry(IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath) + IN PUNICODE_STRING RegistryPath) { DPRINT("ScsiPort Driver %s\n", VERSION); return(STATUS_SUCCESS); @@ -251,35 +223,35 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, /********************************************************************** - * NAME EXPORTED - * ScsiDebugPrint + * NAME EXPORTED + * ScsiDebugPrint * * DESCRIPTION - * Prints debugging messages. + * Prints debugging messages. * * RUN LEVEL - * PASSIVE_LEVEL + * PASSIVE_LEVEL * * ARGUMENTS - * DebugPrintLevel - * Debug level of the given message. + * DebugPrintLevel + * Debug level of the given message. * - * DebugMessage - * Pointer to printf()-compatible format string. + * DebugMessage + * Pointer to printf()-compatible format string. * - * ... - Additional output data (see printf()). + * ... + Additional output data (see printf()). * * RETURN VALUE - * None. + * None. * * @implemented */ VOID ScsiDebugPrint(IN ULONG DebugPrintLevel, - IN PCHAR DebugMessage, - ...) + IN PCHAR DebugMessage, + ...) { char Buffer[256]; va_list ap; @@ -420,7 +392,7 @@ ScsiPortFlushDma(IN PVOID HwDeviceExtension) */ VOID NTAPI ScsiPortFreeDeviceBase(IN PVOID HwDeviceExtension, - IN PVOID MappedAddress) + IN PVOID MappedAddress) { PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; PMAPPED_ADDRESS NextMa, LastMa; @@ -472,11 +444,11 @@ ScsiPortFreeDeviceBase(IN PVOID HwDeviceExtension, */ ULONG NTAPI ScsiPortGetBusData(IN PVOID DeviceExtension, - IN ULONG BusDataType, - IN ULONG SystemIoBusNumber, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Length) + IN ULONG BusDataType, + IN ULONG SystemIoBusNumber, + IN ULONG SlotNumber, + IN PVOID Buffer, + IN ULONG Length) { DPRINT("ScsiPortGetBusData()\n"); @@ -522,11 +494,11 @@ ScsiPortSetBusDataByOffset(IN PVOID DeviceExtension, */ PVOID NTAPI ScsiPortGetDeviceBase(IN PVOID HwDeviceExtension, - IN INTERFACE_TYPE BusType, - IN ULONG SystemIoBusNumber, - IN SCSI_PHYSICAL_ADDRESS IoAddress, - IN ULONG NumberOfBytes, - IN BOOLEAN InIoSpace) + IN INTERFACE_TYPE BusType, + IN ULONG SystemIoBusNumber, + IN SCSI_PHYSICAL_ADDRESS IoAddress, + IN ULONG NumberOfBytes, + IN BOOLEAN InIoSpace) { PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; PHYSICAL_ADDRESS TranslatedAddress; @@ -581,9 +553,9 @@ ScsiPortGetDeviceBase(IN PVOID HwDeviceExtension, */ PVOID NTAPI ScsiPortGetLogicalUnit(IN PVOID HwDeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun) + IN UCHAR PathId, + IN UCHAR TargetId, + IN UCHAR Lun) { PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; PSCSI_PORT_LUN_EXTENSION LunExtension; @@ -687,10 +659,10 @@ ScsiPortGetPhysicalAddress(IN PVOID HwDeviceExtension, */ PSCSI_REQUEST_BLOCK NTAPI ScsiPortGetSrb(IN PVOID DeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun, - IN LONG QueueTag) + IN UCHAR PathId, + IN UCHAR TargetId, + IN UCHAR Lun, + IN LONG QueueTag) { DPRINT1("ScsiPortGetSrb() unimplemented\n"); UNIMPLEMENTED; @@ -703,8 +675,8 @@ ScsiPortGetSrb(IN PVOID DeviceExtension, */ PVOID NTAPI ScsiPortGetUncachedExtension(IN PVOID HwDeviceExtension, - IN PPORT_CONFIGURATION_INFORMATION ConfigInfo, - IN ULONG NumberOfBytes) + IN PPORT_CONFIGURATION_INFORMATION ConfigInfo, + IN ULONG NumberOfBytes) { PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; DEVICE_DESCRIPTION DeviceDescription; @@ -976,39 +948,40 @@ SpiInitOpenKeys(PCONFIGURATION_INFO ConfigInfo, PUNICODE_STRING RegistryPath) /********************************************************************** - * NAME EXPORTED - * ScsiPortInitialize + * NAME EXPORTED + * ScsiPortInitialize * * DESCRIPTION - * Initializes SCSI port driver specific data. + * Initializes SCSI port driver specific data. * * RUN LEVEL - * PASSIVE_LEVEL + * PASSIVE_LEVEL * * ARGUMENTS - * Argument1 - * Pointer to the miniport driver's driver object. + * Argument1 + * Pointer to the miniport driver's driver object. * - * Argument2 - * Pointer to the miniport driver's registry path. + * Argument2 + * Pointer to the miniport driver's registry path. * - * HwInitializationData - * Pointer to port driver specific configuration data. + * HwInitializationData + * Pointer to port driver specific configuration data. * - * HwContext - Miniport driver specific context. + * HwContext + Miniport driver specific context. * * RETURN VALUE - * Status. + * Status. * * @implemented */ ULONG NTAPI -ScsiPortInitialize(IN PVOID Argument1, - IN PVOID Argument2, - IN struct _HW_INITIALIZATION_DATA *HwInitializationData, - IN PVOID HwContext) +ScsiPortInitialize( + IN PVOID Argument1, + IN PVOID Argument2, + IN struct _HW_INITIALIZATION_DATA *HwInitializationData, + IN PVOID HwContext) { PDRIVER_OBJECT DriverObject = (PDRIVER_OBJECT)Argument1; PUNICODE_STRING RegistryPath = (PUNICODE_STRING)Argument2; @@ -1227,463 +1200,435 @@ CreatePortConfig: HwInitializationData->NumberOfAccessRanges * sizeof(ACCESS_RANGE)); } - /* Search for matching PCI device */ - if ((HwInitializationData->AdapterInterfaceType == PCIBus) && - (HwInitializationData->VendorIdLength > 0) && - (HwInitializationData->VendorId != NULL) && - (HwInitializationData->DeviceIdLength > 0) && - (HwInitializationData->DeviceId != NULL)) - { - PortConfig->BusInterruptLevel = 0; - - /* Get PCI device data */ - DPRINT("VendorId '%.*s' DeviceId '%.*s'\n", - HwInitializationData->VendorIdLength, - HwInitializationData->VendorId, - HwInitializationData->DeviceIdLength, - HwInitializationData->DeviceId); - - if (!SpiGetPciConfigData(DriverObject, - PortDeviceObject, - HwInitializationData, - PortConfig, - RegistryPath, - ConfigInfo.BusNumber, - &SlotNumber)) - { - /* Continue to the next bus, nothing here */ - ConfigInfo.BusNumber++; - DeviceExtension->PortConfig = NULL; - ExFreePool(PortConfig); - Again = FALSE; - goto CreatePortConfig; - } + /* Search for matching PCI device */ + if ((HwInitializationData->AdapterInterfaceType == PCIBus) && + (HwInitializationData->VendorIdLength > 0) && + (HwInitializationData->VendorId != NULL) && + (HwInitializationData->DeviceIdLength > 0) && (HwInitializationData->DeviceId != NULL)) + { + PortConfig->BusInterruptLevel = 0; - if (!PortConfig->BusInterruptLevel) - { - /* Bypass this slot, because no interrupt was assigned */ - DeviceExtension->PortConfig = NULL; - ExFreePool(PortConfig); - goto CreatePortConfig; - } - } - else - { - DPRINT("Non-pci bus\n"); - } - - /* Note: HwFindAdapter is called once for each bus */ - Again = FALSE; - DPRINT("Calling HwFindAdapter() for Bus %lu\n", PortConfig->SystemIoBusNumber); - Result = (HwInitializationData->HwFindAdapter)(&DeviceExtension->MiniPortDeviceExtension, - HwContext, - 0, /* BusInformation */ - ConfigInfo.Parameter, /* ArgumentString */ - PortConfig, - &Again); - - DPRINT("HwFindAdapter() Result: %lu Again: %s\n", - Result, (Again) ? "True" : "False"); - - /* Free MapRegisterBase, it's not needed anymore */ - if (DeviceExtension->MapRegisterBase != NULL) - { - ExFreePool(DeviceExtension->MapRegisterBase); - DeviceExtension->MapRegisterBase = NULL; - } - - /* If result is nothing good... */ - if (Result != SP_RETURN_FOUND) - { - DPRINT("HwFindAdapter() Result: %lu\n", Result); - - if (Result == SP_RETURN_NOT_FOUND) - { - /* We can continue on the next bus */ - ConfigInfo.BusNumber++; - Again = FALSE; + /* Get PCI device data */ + DPRINT( + "VendorId '%.*s' DeviceId '%.*s'\n", HwInitializationData->VendorIdLength, + HwInitializationData->VendorId, HwInitializationData->DeviceIdLength, + HwInitializationData->DeviceId); - DeviceExtension->PortConfig = NULL; - ExFreePool(PortConfig); - goto CreatePortConfig; - } + if (!SpiGetPciConfigData( + DriverObject, PortDeviceObject, HwInitializationData, PortConfig, RegistryPath, + ConfigInfo.BusNumber, &SlotNumber)) + { + /* Continue to the next bus, nothing here */ + ConfigInfo.BusNumber++; + DeviceExtension->PortConfig = NULL; + ExFreePool(PortConfig); + Again = FALSE; + goto CreatePortConfig; + } - /* Otherwise, break */ - Status = STATUS_INTERNAL_ERROR; - break; - } - - DPRINT("ScsiPortInitialize(): Found HBA! (%x), adapter Id %d\n", - PortConfig->BusInterruptVector, PortConfig->InitiatorBusId[0]); - - /* If the SRB extension size was updated */ - if (!DeviceExtension->NonCachedExtension && - (PortConfig->SrbExtensionSize != DeviceExtension->SrbExtensionSize)) - { - /* Set it (rounding to LONGLONG again) */ - DeviceExtension->SrbExtensionSize = - (PortConfig->SrbExtensionSize + - sizeof(LONGLONG)) & ~(sizeof(LONGLONG) - 1); - } - - /* The same with LUN extension size */ - if (PortConfig->SpecificLuExtensionSize != DeviceExtension->LunExtensionSize) - DeviceExtension->LunExtensionSize = PortConfig->SpecificLuExtensionSize; - - - if (!((HwInitializationData->AdapterInterfaceType == PCIBus) && - (HwInitializationData->VendorIdLength > 0) && - (HwInitializationData->VendorId != NULL) && - (HwInitializationData->DeviceIdLength > 0) && - (HwInitializationData->DeviceId != NULL))) - { - /* Construct a resource list */ - ResourceList = SpiConfigToResource(DeviceExtension, - PortConfig); - - if (ResourceList) - { - UNICODE_STRING UnicodeString; - RtlInitUnicodeString(&UnicodeString, L"ScsiAdapter"); - DPRINT("Reporting resources\n"); - Status = IoReportResourceUsage(&UnicodeString, - DriverObject, - NULL, - 0, - PortDeviceObject, - ResourceList, - FIELD_OFFSET(CM_RESOURCE_LIST, - List[0].PartialResourceList.PartialDescriptors) + - ResourceList->List[0].PartialResourceList.Count - * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR), - FALSE, - &Conflict); - ExFreePool(ResourceList); - - /* In case of a failure or a conflict, break */ - if (Conflict || (!NT_SUCCESS(Status))) - { - if (Conflict) - Status = STATUS_CONFLICTING_ADDRESSES; - break; - } + if (!PortConfig->BusInterruptLevel) + { + /* Bypass this slot, because no interrupt was assigned */ + DeviceExtension->PortConfig = NULL; + ExFreePool(PortConfig); + goto CreatePortConfig; } - } - - /* Reset the Conflict var */ - Conflict = FALSE; - - /* Copy all stuff which we ever need from PortConfig to the DeviceExtension */ - if (PortConfig->MaximumNumberOfTargets > SCSI_MAXIMUM_TARGETS_PER_BUS) - DeviceExtension->MaxTargedIds = SCSI_MAXIMUM_TARGETS_PER_BUS; - else - DeviceExtension->MaxTargedIds = PortConfig->MaximumNumberOfTargets; - - DeviceExtension->BusNum = PortConfig->NumberOfBuses; - DeviceExtension->CachesData = PortConfig->CachesData; - DeviceExtension->ReceiveEvent = PortConfig->ReceiveEvent; - DeviceExtension->SupportsTaggedQueuing = PortConfig->TaggedQueuing; - DeviceExtension->MultipleReqsPerLun = PortConfig->MultipleRequestPerLu; - - /* If something was disabled via registry - apply it */ - if (ConfigInfo.DisableMultipleLun) - DeviceExtension->MultipleReqsPerLun = PortConfig->MultipleRequestPerLu = FALSE; - - if (ConfigInfo.DisableTaggedQueueing) - DeviceExtension->SupportsTaggedQueuing = PortConfig->MultipleRequestPerLu = FALSE; - - /* Check if we need to alloc SRB data */ - if (DeviceExtension->SupportsTaggedQueuing || - DeviceExtension->MultipleReqsPerLun) - { - DeviceExtension->NeedSrbDataAlloc = TRUE; - } - else - { - DeviceExtension->NeedSrbDataAlloc = FALSE; - } - - /* Get a pointer to the port capabilities */ - PortCapabilities = &DeviceExtension->PortCapabilities; - - /* Copy one field there */ - DeviceExtension->MapBuffers = PortConfig->MapBuffers; - PortCapabilities->AdapterUsesPio = PortConfig->MapBuffers; - - if (DeviceExtension->AdapterObject == NULL && - (PortConfig->DmaChannel != SP_UNINITIALIZED_VALUE || PortConfig->Master)) - { - DPRINT1("DMA is not supported yet\n"); - ASSERT(FALSE); - } - - if (DeviceExtension->SrbExtensionBuffer == NULL && - (DeviceExtension->SrbExtensionSize != 0 || - PortConfig->AutoRequestSense)) - { - DeviceExtension->SupportsAutoSense = PortConfig->AutoRequestSense; - DeviceExtension->NeedSrbExtensionAlloc = TRUE; - - /* Allocate common buffer */ - Status = SpiAllocateCommonBuffer(DeviceExtension, 0); - - /* Check for failure */ - if (!NT_SUCCESS(Status)) - break; - } - - /* Allocate SrbData, if needed */ - if (DeviceExtension->NeedSrbDataAlloc) - { - ULONG Count; - PSCSI_REQUEST_BLOCK_INFO SrbData; - - if (DeviceExtension->SrbDataCount != 0) - Count = DeviceExtension->SrbDataCount; - else - Count = DeviceExtension->RequestsNumber * 2; - - /* Allocate the data */ - SrbData = ExAllocatePoolWithTag(NonPagedPool, Count * sizeof(SCSI_REQUEST_BLOCK_INFO), TAG_SCSIPORT); - if (SrbData == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - RtlZeroMemory(SrbData, Count * sizeof(SCSI_REQUEST_BLOCK_INFO)); - - DeviceExtension->SrbInfo = SrbData; - DeviceExtension->FreeSrbInfo = SrbData; - DeviceExtension->SrbDataCount = Count; - - /* Link it to the list */ - while (Count > 0) - { - SrbData->Requests.Flink = (PLIST_ENTRY)(SrbData + 1); - SrbData++; - Count--; - } + } + else + { + DPRINT("Non-pci bus\n"); + } - /* Mark the last entry of the list */ - SrbData--; - SrbData->Requests.Flink = NULL; - } + /* Note: HwFindAdapter is called once for each bus */ + Again = FALSE; + DPRINT("Calling HwFindAdapter() for Bus %lu\n", PortConfig->SystemIoBusNumber); + Result = (HwInitializationData->HwFindAdapter)( + &DeviceExtension->MiniPortDeviceExtension, HwContext, 0, /* BusInformation */ + ConfigInfo.Parameter, /* ArgumentString */ + PortConfig, &Again); - /* Initialize port capabilities */ - PortCapabilities = &DeviceExtension->PortCapabilities; - PortCapabilities->Length = sizeof(IO_SCSI_CAPABILITIES); - PortCapabilities->MaximumTransferLength = PortConfig->MaximumTransferLength; + DPRINT("HwFindAdapter() Result: %lu Again: %s\n", Result, (Again) ? "True" : "False"); - if (PortConfig->ReceiveEvent) - PortCapabilities->SupportedAsynchronousEvents |= SRBEV_SCSI_ASYNC_NOTIFICATION; + /* Free MapRegisterBase, it's not needed anymore */ + if (DeviceExtension->MapRegisterBase != NULL) + { + ExFreePool(DeviceExtension->MapRegisterBase); + DeviceExtension->MapRegisterBase = NULL; + } - PortCapabilities->TaggedQueuing = DeviceExtension->SupportsTaggedQueuing; - PortCapabilities->AdapterScansDown = PortConfig->AdapterScansDown; + /* If result is nothing good... */ + if (Result != SP_RETURN_FOUND) + { + DPRINT("HwFindAdapter() Result: %lu\n", Result); - if (PortConfig->AlignmentMask > PortDeviceObject->AlignmentRequirement) - PortDeviceObject->AlignmentRequirement = PortConfig->AlignmentMask; + if (Result == SP_RETURN_NOT_FOUND) + { + /* We can continue on the next bus */ + ConfigInfo.BusNumber++; + Again = FALSE; - PortCapabilities->AlignmentMask = PortDeviceObject->AlignmentRequirement; + DeviceExtension->PortConfig = NULL; + ExFreePool(PortConfig); + goto CreatePortConfig; + } - if (PortCapabilities->MaximumPhysicalPages == 0) - { - PortCapabilities->MaximumPhysicalPages = - BYTES_TO_PAGES(PortCapabilities->MaximumTransferLength); + /* Otherwise, break */ + Status = STATUS_INTERNAL_ERROR; + break; + } - /* Apply miniport's limits */ - if (PortConfig->NumberOfPhysicalBreaks < PortCapabilities->MaximumPhysicalPages) - { - PortCapabilities->MaximumPhysicalPages = PortConfig->NumberOfPhysicalBreaks; - } - } + DPRINT( + "ScsiPortInitialize(): Found HBA! (%x), adapter Id %d\n", + PortConfig->BusInterruptVector, PortConfig->InitiatorBusId[0]); - /* Deal with interrupts */ - if (DeviceExtension->HwInterrupt == NULL || - (PortConfig->BusInterruptLevel == 0 && PortConfig->BusInterruptVector == 0)) - { - /* No interrupts */ - DeviceExtension->InterruptCount = 0; + /* If the SRB extension size was updated */ + if (!DeviceExtension->NonCachedExtension && + (PortConfig->SrbExtensionSize != DeviceExtension->SrbExtensionSize)) + { + /* Set it (rounding to LONGLONG again) */ + DeviceExtension->SrbExtensionSize = + (PortConfig->SrbExtensionSize + sizeof(LONGLONG)) & ~(sizeof(LONGLONG) - 1); + } - DPRINT1("Interrupt Count: 0\n"); + /* The same with LUN extension size */ + if (PortConfig->SpecificLuExtensionSize != DeviceExtension->LunExtensionSize) + DeviceExtension->LunExtensionSize = PortConfig->SpecificLuExtensionSize; - UNIMPLEMENTED; + if (!((HwInitializationData->AdapterInterfaceType == PCIBus) && + (HwInitializationData->VendorIdLength > 0) && + (HwInitializationData->VendorId != NULL) && + (HwInitializationData->DeviceIdLength > 0) && + (HwInitializationData->DeviceId != NULL))) + { + /* Construct a resource list */ + ResourceList = SpiConfigToResource(DeviceExtension, PortConfig); - /* This code path will ALWAYS crash so stop it now */ - while(TRUE); - } - else - { - BOOLEAN InterruptShareable; - KINTERRUPT_MODE InterruptMode[2]; - ULONG InterruptVector[2], i, MappedIrq[2]; - KIRQL Dirql[2], MaxDirql; - KAFFINITY Affinity[2]; + if (ResourceList) + { + UNICODE_STRING UnicodeString; + RtlInitUnicodeString(&UnicodeString, L"ScsiAdapter"); + DPRINT("Reporting resources\n"); + Status = IoReportResourceUsage(&UnicodeString, + DriverObject, + NULL, + 0, + PortDeviceObject, + ResourceList, + FIELD_OFFSET(CM_RESOURCE_LIST, + List[0].PartialResourceList.PartialDescriptors) + + ResourceList->List[0].PartialResourceList.Count * + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR), + FALSE, + &Conflict); + ExFreePool(ResourceList); + + /* In case of a failure or a conflict, break */ + if (Conflict || (!NT_SUCCESS(Status))) + { + if (Conflict) + Status = STATUS_CONFLICTING_ADDRESSES; + break; + } + } + } - DeviceExtension->InterruptLevel[0] = PortConfig->BusInterruptLevel; - DeviceExtension->InterruptLevel[1] = PortConfig->BusInterruptLevel2; + /* Reset the Conflict var */ + Conflict = FALSE; - InterruptVector[0] = PortConfig->BusInterruptVector; - InterruptVector[1] = PortConfig->BusInterruptVector2; + /* Copy all stuff which we ever need from PortConfig to the DeviceExtension */ + if (PortConfig->MaximumNumberOfTargets > SCSI_MAXIMUM_TARGETS_PER_BUS) + DeviceExtension->MaxTargedIds = SCSI_MAXIMUM_TARGETS_PER_BUS; + else + DeviceExtension->MaxTargedIds = PortConfig->MaximumNumberOfTargets; - InterruptMode[0] = PortConfig->InterruptMode; - InterruptMode[1] = PortConfig->InterruptMode2; + DeviceExtension->BusNum = PortConfig->NumberOfBuses; + DeviceExtension->CachesData = PortConfig->CachesData; + DeviceExtension->ReceiveEvent = PortConfig->ReceiveEvent; + DeviceExtension->SupportsTaggedQueuing = PortConfig->TaggedQueuing; + DeviceExtension->MultipleReqsPerLun = PortConfig->MultipleRequestPerLu; - DeviceExtension->InterruptCount = (PortConfig->BusInterruptLevel2 != 0 || PortConfig->BusInterruptVector2 != 0) ? 2 : 1; + /* If something was disabled via registry - apply it */ + if (ConfigInfo.DisableMultipleLun) + DeviceExtension->MultipleReqsPerLun = PortConfig->MultipleRequestPerLu = FALSE; - for (i = 0; i < DeviceExtension->InterruptCount; i++) - { - /* Register an interrupt handler for this device */ - MappedIrq[i] = HalGetInterruptVector(PortConfig->AdapterInterfaceType, - PortConfig->SystemIoBusNumber, - DeviceExtension->InterruptLevel[i], - InterruptVector[i], - &Dirql[i], - &Affinity[i]); - } + if (ConfigInfo.DisableTaggedQueueing) + DeviceExtension->SupportsTaggedQueuing = PortConfig->MultipleRequestPerLu = FALSE; - if (DeviceExtension->InterruptCount == 1 || Dirql[0] > Dirql[1]) - MaxDirql = Dirql[0]; - else - MaxDirql = Dirql[1]; + /* Check if we need to alloc SRB data */ + if (DeviceExtension->SupportsTaggedQueuing || DeviceExtension->MultipleReqsPerLun) + { + DeviceExtension->NeedSrbDataAlloc = TRUE; + } + else + { + DeviceExtension->NeedSrbDataAlloc = FALSE; + } - for (i = 0; i < DeviceExtension->InterruptCount; i++) - { - /* Determine IRQ sharability as usual */ - if (PortConfig->AdapterInterfaceType == MicroChannel || - InterruptMode[i] == LevelSensitive) - { - InterruptShareable = TRUE; - } - else - { - InterruptShareable = FALSE; - } - - Status = IoConnectInterrupt(&DeviceExtension->Interrupt[i], - (PKSERVICE_ROUTINE)ScsiPortIsr, - DeviceExtension, - &DeviceExtension->IrqLock, - MappedIrq[i], - Dirql[i], - MaxDirql, - InterruptMode[i], - InterruptShareable, - Affinity[i], - FALSE); - - if (!(NT_SUCCESS(Status))) - { - DPRINT1("Could not connect interrupt %d\n", - InterruptVector[i]); - DeviceExtension->Interrupt[i] = NULL; - break; - } - } + /* Get a pointer to the port capabilities */ + PortCapabilities = &DeviceExtension->PortCapabilities; - if (!NT_SUCCESS(Status)) - break; - } - - /* Save IoAddress (from access ranges) */ - if (HwInitializationData->NumberOfAccessRanges != 0) - { - DeviceExtension->IoAddress = - ((*(PortConfig->AccessRanges))[0]).RangeStart.LowPart; - - DPRINT("Io Address %x\n", DeviceExtension->IoAddress); - } - - /* Set flag that it's allowed to disconnect during this command */ - DeviceExtension->Flags |= SCSI_PORT_DISCONNECT_ALLOWED; - - /* Initialize counter of active requests (-1 means there are none) */ - DeviceExtension->ActiveRequestCounter = -1; - - /* Analyze what we have about DMA */ - if (DeviceExtension->AdapterObject != NULL && - PortConfig->Master && - PortConfig->NeedPhysicalAddresses) - { - DeviceExtension->MapRegisters = TRUE; - } - else - { - DeviceExtension->MapRegisters = FALSE; - } - - /* Call HwInitialize at DISPATCH_LEVEL */ - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - - if (!KeSynchronizeExecution(DeviceExtension->Interrupt[0], - DeviceExtension->HwInitialize, - DeviceExtension->MiniPortDeviceExtension)) - { - DPRINT1("HwInitialize() failed!\n"); - KeLowerIrql(OldIrql); - Status = STATUS_ADAPTER_HARDWARE_ERROR; - break; - } - - /* Check if a notification is needed */ - if (DeviceExtension->InterruptData.Flags & SCSI_PORT_NOTIFICATION_NEEDED) - { - /* Call DPC right away, because we're already at DISPATCH_LEVEL */ - ScsiPortDpcForIsr(NULL, - DeviceExtension->DeviceObject, - NULL, - NULL); - } - - /* Lower irql back to what it was */ - KeLowerIrql(OldIrql); - - /* Start our timer */ - IoStartTimer(PortDeviceObject); - - /* Initialize bus scanning information */ - BusConfigSize = FIELD_OFFSET(BUSES_CONFIGURATION_INFORMATION, - BusScanInfo[DeviceExtension->PortConfig->NumberOfBuses]); - DeviceExtension->BusesConfig = ExAllocatePoolWithTag(PagedPool, - BusConfigSize, - TAG_SCSIPORT); - if (!DeviceExtension->BusesConfig) - { - DPRINT1("Out of resources!\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } + /* Copy one field there */ + DeviceExtension->MapBuffers = PortConfig->MapBuffers; + PortCapabilities->AdapterUsesPio = PortConfig->MapBuffers; + + if (DeviceExtension->AdapterObject == NULL && + (PortConfig->DmaChannel != SP_UNINITIALIZED_VALUE || PortConfig->Master)) + { + DPRINT1("DMA is not supported yet\n"); + ASSERT(FALSE); + } + + if (DeviceExtension->SrbExtensionBuffer == NULL && + (DeviceExtension->SrbExtensionSize != 0 || PortConfig->AutoRequestSense)) + { + DeviceExtension->SupportsAutoSense = PortConfig->AutoRequestSense; + DeviceExtension->NeedSrbExtensionAlloc = TRUE; + + /* Allocate common buffer */ + Status = SpiAllocateCommonBuffer(DeviceExtension, 0); + + /* Check for failure */ + if (!NT_SUCCESS(Status)) + break; + } + + /* Allocate SrbData, if needed */ + if (DeviceExtension->NeedSrbDataAlloc) + { + ULONG Count; + PSCSI_REQUEST_BLOCK_INFO SrbData; + + if (DeviceExtension->SrbDataCount != 0) + Count = DeviceExtension->SrbDataCount; + else + Count = DeviceExtension->RequestsNumber * 2; + + /* Allocate the data */ + SrbData = ExAllocatePoolWithTag( + NonPagedPool, Count * sizeof(SCSI_REQUEST_BLOCK_INFO), TAG_SCSIPORT); + if (SrbData == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlZeroMemory(SrbData, Count * sizeof(SCSI_REQUEST_BLOCK_INFO)); + + DeviceExtension->SrbInfo = SrbData; + DeviceExtension->FreeSrbInfo = SrbData; + DeviceExtension->SrbDataCount = Count; + + /* Link it to the list */ + while (Count > 0) + { + SrbData->Requests.Flink = (PLIST_ENTRY)(SrbData + 1); + SrbData++; + Count--; + } + + /* Mark the last entry of the list */ + SrbData--; + SrbData->Requests.Flink = NULL; + } + + /* Initialize port capabilities */ + PortCapabilities = &DeviceExtension->PortCapabilities; + PortCapabilities->Length = sizeof(IO_SCSI_CAPABILITIES); + PortCapabilities->MaximumTransferLength = PortConfig->MaximumTransferLength; + + if (PortConfig->ReceiveEvent) + PortCapabilities->SupportedAsynchronousEvents |= SRBEV_SCSI_ASYNC_NOTIFICATION; + + PortCapabilities->TaggedQueuing = DeviceExtension->SupportsTaggedQueuing; + PortCapabilities->AdapterScansDown = PortConfig->AdapterScansDown; + + if (PortConfig->AlignmentMask > PortDeviceObject->AlignmentRequirement) + PortDeviceObject->AlignmentRequirement = PortConfig->AlignmentMask; + + PortCapabilities->AlignmentMask = PortDeviceObject->AlignmentRequirement; + + if (PortCapabilities->MaximumPhysicalPages == 0) + { + PortCapabilities->MaximumPhysicalPages = + BYTES_TO_PAGES(PortCapabilities->MaximumTransferLength); + + /* Apply miniport's limits */ + if (PortConfig->NumberOfPhysicalBreaks < PortCapabilities->MaximumPhysicalPages) + { + PortCapabilities->MaximumPhysicalPages = PortConfig->NumberOfPhysicalBreaks; + } + } + + /* Deal with interrupts */ + if (DeviceExtension->HwInterrupt == NULL || + (PortConfig->BusInterruptLevel == 0 && PortConfig->BusInterruptVector == 0)) + { + /* No interrupts */ + DeviceExtension->InterruptCount = 0; + + DPRINT1("Interrupt Count: 0\n"); + + UNIMPLEMENTED; + + /* This code path will ALWAYS crash so stop it now */ + while (TRUE); + } + else + { + BOOLEAN InterruptShareable; + KINTERRUPT_MODE InterruptMode[2]; + ULONG InterruptVector[2], i, MappedIrq[2]; + KIRQL Dirql[2], MaxDirql; + KAFFINITY Affinity[2]; + + DeviceExtension->InterruptLevel[0] = PortConfig->BusInterruptLevel; + DeviceExtension->InterruptLevel[1] = PortConfig->BusInterruptLevel2; + + InterruptVector[0] = PortConfig->BusInterruptVector; + InterruptVector[1] = PortConfig->BusInterruptVector2; + + InterruptMode[0] = PortConfig->InterruptMode; + InterruptMode[1] = PortConfig->InterruptMode2; + + DeviceExtension->InterruptCount = + (PortConfig->BusInterruptLevel2 != 0 || + PortConfig->BusInterruptVector2 != 0) ? 2 : 1; + + for (i = 0; i < DeviceExtension->InterruptCount; i++) + { + /* Register an interrupt handler for this device */ + MappedIrq[i] = HalGetInterruptVector( + PortConfig->AdapterInterfaceType, PortConfig->SystemIoBusNumber, + DeviceExtension->InterruptLevel[i], InterruptVector[i], &Dirql[i], + &Affinity[i]); + } + + if (DeviceExtension->InterruptCount == 1 || Dirql[0] > Dirql[1]) + MaxDirql = Dirql[0]; + else + MaxDirql = Dirql[1]; + + for (i = 0; i < DeviceExtension->InterruptCount; i++) + { + /* Determine IRQ sharability as usual */ + if (PortConfig->AdapterInterfaceType == MicroChannel || + InterruptMode[i] == LevelSensitive) + { + InterruptShareable = TRUE; + } + else + { + InterruptShareable = FALSE; + } + + Status = IoConnectInterrupt( + &DeviceExtension->Interrupt[i], (PKSERVICE_ROUTINE)ScsiPortIsr, DeviceExtension, + &DeviceExtension->IrqLock, MappedIrq[i], Dirql[i], MaxDirql, InterruptMode[i], + InterruptShareable, Affinity[i], FALSE); + + if (!(NT_SUCCESS(Status))) + { + DPRINT1("Could not connect interrupt %d\n", InterruptVector[i]); + DeviceExtension->Interrupt[i] = NULL; + break; + } + } + + if (!NT_SUCCESS(Status)) + break; + } + + /* Save IoAddress (from access ranges) */ + if (HwInitializationData->NumberOfAccessRanges != 0) + { + DeviceExtension->IoAddress = ((*(PortConfig->AccessRanges))[0]).RangeStart.LowPart; + + DPRINT("Io Address %x\n", DeviceExtension->IoAddress); + } + + /* Set flag that it's allowed to disconnect during this command */ + DeviceExtension->Flags |= SCSI_PORT_DISCONNECT_ALLOWED; + + /* Initialize counter of active requests (-1 means there are none) */ + DeviceExtension->ActiveRequestCounter = -1; + + /* Analyze what we have about DMA */ + if (DeviceExtension->AdapterObject != NULL && PortConfig->Master && + PortConfig->NeedPhysicalAddresses) + { + DeviceExtension->MapRegisters = TRUE; + } + else + { + DeviceExtension->MapRegisters = FALSE; + } + + /* Call HwInitialize at DISPATCH_LEVEL */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + if (!KeSynchronizeExecution( + DeviceExtension->Interrupt[0], DeviceExtension->HwInitialize, + DeviceExtension->MiniPortDeviceExtension)) + { + DPRINT1("HwInitialize() failed!\n"); + KeLowerIrql(OldIrql); + Status = STATUS_ADAPTER_HARDWARE_ERROR; + break; + } + + /* Check if a notification is needed */ + if (DeviceExtension->InterruptData.Flags & SCSI_PORT_NOTIFICATION_NEEDED) + { + /* Call DPC right away, because we're already at DISPATCH_LEVEL */ + ScsiPortDpcForIsr(NULL, DeviceExtension->DeviceObject, NULL, NULL); + } + + /* Lower irql back to what it was */ + KeLowerIrql(OldIrql); + + /* Start our timer */ + IoStartTimer(PortDeviceObject); + + /* Initialize bus scanning information */ + BusConfigSize = FIELD_OFFSET( + BUSES_CONFIGURATION_INFORMATION, + BusScanInfo[DeviceExtension->PortConfig->NumberOfBuses]); + DeviceExtension->BusesConfig = + ExAllocatePoolWithTag(PagedPool, BusConfigSize, TAG_SCSIPORT); + if (!DeviceExtension->BusesConfig) + { + DPRINT1("Out of resources!\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } - /* Zero it */ - RtlZeroMemory(DeviceExtension->BusesConfig, BusConfigSize); + /* Zero it */ + RtlZeroMemory(DeviceExtension->BusesConfig, BusConfigSize); - /* Store number of buses there */ - DeviceExtension->BusesConfig->NumberOfBuses = (UCHAR)DeviceExtension->BusNum; + /* Store number of buses there */ + DeviceExtension->BusesConfig->NumberOfBuses = (UCHAR)DeviceExtension->BusNum; - /* Scan the adapter for devices */ - SpiScanAdapter(DeviceExtension); + /* Scan the adapter for devices */ + SpiScanAdapter(DeviceExtension); - /* Build the registry device map */ - SpiBuildDeviceMap(DeviceExtension, - (PUNICODE_STRING)Argument2); + /* Build the registry device map */ + SpiBuildDeviceMap(DeviceExtension, (PUNICODE_STRING)Argument2); - /* Create the dos device link */ - swprintf(DosNameBuffer, - L"\\??\\Scsi%lu:", - SystemConfig->ScsiPortCount); - RtlInitUnicodeString(&DosDeviceName, DosNameBuffer); - IoCreateSymbolicLink(&DosDeviceName, &DeviceName); + /* Create the dos device link */ + swprintf(DosNameBuffer, L"\\??\\Scsi%lu:", SystemConfig->ScsiPortCount); + RtlInitUnicodeString(&DosDeviceName, DosNameBuffer); + IoCreateSymbolicLink(&DosDeviceName, &DeviceName); - /* Increase the port count */ - SystemConfig->ScsiPortCount++; - FirstConfigCall = FALSE; + /* Increase the port count */ + SystemConfig->ScsiPortCount++; + FirstConfigCall = FALSE; - /* Increase adapter number and bus number respectively */ - ConfigInfo.AdapterNumber++; + /* Increase adapter number and bus number respectively */ + ConfigInfo.AdapterNumber++; - if (!Again) - ConfigInfo.BusNumber++; + if (!Again) + ConfigInfo.BusNumber++; - DPRINT("Bus: %lu MaxBus: %lu\n", ConfigInfo.BusNumber, MaxBus); + DPRINT("Bus: %lu MaxBus: %lu\n", ConfigInfo.BusNumber, MaxBus); - DeviceFound = TRUE; + DeviceFound = TRUE; } /* Clean up the mess */ @@ -1816,9 +1761,9 @@ SpiCleanupAfterInit(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension) */ VOID NTAPI ScsiPortIoMapTransfer(IN PVOID HwDeviceExtension, - IN PSCSI_REQUEST_BLOCK Srb, - IN PVOID LogicalAddress, - IN ULONG Length) + IN PSCSI_REQUEST_BLOCK Srb, + IN PVOID LogicalAddress, + IN ULONG Length) { DPRINT1("ScsiPortIoMapTransfer()\n"); UNIMPLEMENTED; @@ -1829,12 +1774,12 @@ ScsiPortIoMapTransfer(IN PVOID HwDeviceExtension, */ VOID NTAPI ScsiPortLogError(IN PVOID HwDeviceExtension, - IN PSCSI_REQUEST_BLOCK Srb OPTIONAL, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun, - IN ULONG ErrorCode, - IN ULONG UniqueId) + IN PSCSI_REQUEST_BLOCK Srb OPTIONAL, + IN UCHAR PathId, + IN UCHAR TargetId, + IN UCHAR Lun, + IN ULONG ErrorCode, + IN ULONG UniqueId) { //PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; @@ -1853,12 +1798,12 @@ ScsiPortLogError(IN PVOID HwDeviceExtension, */ VOID NTAPI ScsiPortMoveMemory(OUT PVOID Destination, - IN PVOID Source, - IN ULONG Length) + IN PVOID Source, + IN ULONG Length) { RtlMoveMemory(Destination, - Source, - Length); + Source, + Length); } @@ -1866,18 +1811,15 @@ ScsiPortMoveMemory(OUT PVOID Destination, * @implemented */ VOID -ScsiPortNotification(IN SCSI_NOTIFICATION_TYPE NotificationType, - IN PVOID HwDeviceExtension, - ...) +ScsiPortNotification(IN SCSI_NOTIFICATION_TYPE NotificationType, IN PVOID HwDeviceExtension, ...) { PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; va_list ap; DPRINT("ScsiPortNotification() called\n"); - DeviceExtension = CONTAINING_RECORD(HwDeviceExtension, - SCSI_PORT_DEVICE_EXTENSION, - MiniPortDeviceExtension); + DeviceExtension = + CONTAINING_RECORD(HwDeviceExtension, SCSI_PORT_DEVICE_EXTENSION, MiniPortDeviceExtension); DPRINT("DeviceExtension %p\n", DeviceExtension); @@ -1885,18 +1827,20 @@ ScsiPortNotification(IN SCSI_NOTIFICATION_TYPE NotificationType, switch (NotificationType) { - case RequestComplete: + case RequestComplete: { PSCSI_REQUEST_BLOCK Srb; PSCSI_REQUEST_BLOCK_INFO SrbData; - Srb = (PSCSI_REQUEST_BLOCK) va_arg (ap, PSCSI_REQUEST_BLOCK); + Srb = (PSCSI_REQUEST_BLOCK)va_arg(ap, PSCSI_REQUEST_BLOCK); DPRINT("Notify: RequestComplete (Srb %p)\n", Srb); /* Make sure Srb is alright */ ASSERT(Srb->SrbStatus != SRB_STATUS_PENDING); - ASSERT(Srb->Function != SRB_FUNCTION_EXECUTE_SCSI || Srb->SrbStatus != SRB_STATUS_SUCCESS || Srb->ScsiStatus == SCSISTAT_GOOD); + ASSERT( + Srb->Function != SRB_FUNCTION_EXECUTE_SCSI || + Srb->SrbStatus != SRB_STATUS_SUCCESS || Srb->ScsiStatus == SCSISTAT_GOOD); if (!(Srb->SrbFlags & SRB_FLAGS_IS_ACTIVE)) { @@ -1916,11 +1860,8 @@ ScsiPortNotification(IN SCSI_NOTIFICATION_TYPE NotificationType, else { /* Get the SRB data */ - SrbData = SpiGetSrbData(DeviceExtension, - Srb->PathId, - Srb->TargetId, - Srb->Lun, - Srb->QueueTag); + SrbData = SpiGetSrbData( + DeviceExtension, Srb->PathId, Srb->TargetId, Srb->Lun, Srb->QueueTag); /* Make sure there are no CompletedRequests and there is a Srb */ ASSERT(SrbData->CompletedRequests == NULL && SrbData->Srb != NULL); @@ -1929,7 +1870,7 @@ ScsiPortNotification(IN SCSI_NOTIFICATION_TYPE NotificationType, if ((Srb->SrbStatus == SRB_STATUS_SUCCESS) && ((Srb->Cdb[0] == SCSIOP_READ) || (Srb->Cdb[0] == SCSIOP_WRITE))) { - ASSERT(Srb->DataTransferLength); + ASSERT(Srb->DataTransferLength); } SrbData->CompletedRequests = DeviceExtension->InterruptData.CompletedRequests; @@ -1938,40 +1879,37 @@ ScsiPortNotification(IN SCSI_NOTIFICATION_TYPE NotificationType, } break; - case NextRequest: - DPRINT("Notify: NextRequest\n"); - DeviceExtension->InterruptData.Flags |= SCSI_PORT_NEXT_REQUEST_READY; - break; + case NextRequest: + DPRINT("Notify: NextRequest\n"); + DeviceExtension->InterruptData.Flags |= SCSI_PORT_NEXT_REQUEST_READY; + break; - case NextLuRequest: + case NextLuRequest: { UCHAR PathId; UCHAR TargetId; UCHAR Lun; PSCSI_PORT_LUN_EXTENSION LunExtension; - PathId = (UCHAR) va_arg (ap, int); - TargetId = (UCHAR) va_arg (ap, int); - Lun = (UCHAR) va_arg (ap, int); + PathId = (UCHAR)va_arg(ap, int); + TargetId = (UCHAR)va_arg(ap, int); + Lun = (UCHAR)va_arg(ap, int); - DPRINT("Notify: NextLuRequest(PathId %u TargetId %u Lun %u)\n", - PathId, TargetId, Lun); + DPRINT( + "Notify: NextLuRequest(PathId %u TargetId %u Lun %u)\n", PathId, TargetId, Lun); /* Mark it in the flags field */ DeviceExtension->InterruptData.Flags |= SCSI_PORT_NEXT_REQUEST_READY; /* Get the LUN extension */ - LunExtension = SpiGetLunExtension(DeviceExtension, - PathId, - TargetId, - Lun); + LunExtension = SpiGetLunExtension(DeviceExtension, PathId, TargetId, Lun); /* If returned LunExtension is NULL, break out */ - if (!LunExtension) break; + if (!LunExtension) + break; /* This request should not be processed if */ - if ((LunExtension->ReadyLun) || - (LunExtension->SrbInfo.Srb)) + if ((LunExtension->ReadyLun) || (LunExtension->SrbInfo.Srb)) { /* Nothing to do here */ break; @@ -1980,38 +1918,37 @@ ScsiPortNotification(IN SCSI_NOTIFICATION_TYPE NotificationType, /* Add this LUN to the list */ LunExtension->ReadyLun = DeviceExtension->InterruptData.ReadyLun; DeviceExtension->InterruptData.ReadyLun = LunExtension; - } - break; + } + break; - case ResetDetected: - DPRINT("Notify: ResetDetected\n"); - /* Add RESET flags */ - DeviceExtension->InterruptData.Flags |= - SCSI_PORT_RESET | SCSI_PORT_RESET_REPORTED; - break; + case ResetDetected: + DPRINT("Notify: ResetDetected\n"); + /* Add RESET flags */ + DeviceExtension->InterruptData.Flags |= SCSI_PORT_RESET | SCSI_PORT_RESET_REPORTED; + break; - case CallDisableInterrupts: - DPRINT1("UNIMPLEMENTED SCSI Notification called: CallDisableInterrupts!\n"); - break; + case CallDisableInterrupts: + DPRINT1("UNIMPLEMENTED SCSI Notification called: CallDisableInterrupts!\n"); + break; - case CallEnableInterrupts: - DPRINT1("UNIMPLEMENTED SCSI Notification called: CallEnableInterrupts!\n"); - break; + case CallEnableInterrupts: + DPRINT1("UNIMPLEMENTED SCSI Notification called: CallEnableInterrupts!\n"); + break; - case RequestTimerCall: - DPRINT("Notify: RequestTimerCall\n"); - DeviceExtension->InterruptData.Flags |= SCSI_PORT_TIMER_NEEDED; - DeviceExtension->InterruptData.HwScsiTimer = (PHW_TIMER)va_arg(ap, PHW_TIMER); - DeviceExtension->InterruptData.MiniportTimerValue = (ULONG)va_arg(ap, ULONG); - break; + case RequestTimerCall: + DPRINT("Notify: RequestTimerCall\n"); + DeviceExtension->InterruptData.Flags |= SCSI_PORT_TIMER_NEEDED; + DeviceExtension->InterruptData.HwScsiTimer = (PHW_TIMER)va_arg(ap, PHW_TIMER); + DeviceExtension->InterruptData.MiniportTimerValue = (ULONG)va_arg(ap, ULONG); + break; - case BusChangeDetected: - DPRINT1("UNIMPLEMENTED SCSI Notification called: BusChangeDetected!\n"); - break; + case BusChangeDetected: + DPRINT1("UNIMPLEMENTED SCSI Notification called: BusChangeDetected!\n"); + break; - default: - DPRINT1 ("Unsupported notification from WMI: %lu\n", NotificationType); - break; + default: + DPRINT1("Unsupported notification from WMI: %lu\n", NotificationType); + break; } va_end(ap); @@ -2025,11 +1962,11 @@ ScsiPortNotification(IN SCSI_NOTIFICATION_TYPE NotificationType, */ BOOLEAN NTAPI ScsiPortValidateRange(IN PVOID HwDeviceExtension, - IN INTERFACE_TYPE BusType, - IN ULONG SystemIoBusNumber, - IN SCSI_PHYSICAL_ADDRESS IoAddress, - IN ULONG NumberOfBytes, - IN BOOLEAN InIoSpace) + IN INTERFACE_TYPE BusType, + IN ULONG SystemIoBusNumber, + IN SCSI_PHYSICAL_ADDRESS IoAddress, + IN ULONG NumberOfBytes, + IN BOOLEAN InIoSpace) { DPRINT("ScsiPortValidateRange()\n"); return(TRUE); @@ -2423,24 +2360,24 @@ SpiGetPciConfigData(IN PDRIVER_OBJECT DriverObject, /********************************************************************** - * NAME INTERNAL - * ScsiPortCreateClose + * NAME INTERNAL + * ScsiPortCreateClose * * DESCRIPTION - * Answer requests for Create/Close calls: a null operation. + * Answer requests for Create/Close calls: a null operation. * * RUN LEVEL - * PASSIVE_LEVEL + * PASSIVE_LEVEL * * ARGUMENTS - * DeviceObject - * Pointer to a device object. + * DeviceObject + * Pointer to a device object. * - * Irp - * Pointer to an IRP. + * Irp + * Pointer to an IRP. * * RETURN VALUE - * Status. + * Status. */ static NTSTATUS NTAPI @@ -2539,25 +2476,24 @@ SpiHandleAttachRelease(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, /********************************************************************** - * NAME INTERNAL - * ScsiPortDispatchScsi + * NAME INTERNAL + * ScsiPortDispatchScsi * * DESCRIPTION - * Answer requests for SCSI calls + * Answer requests for SCSI calls * * RUN LEVEL - * PASSIVE_LEVEL + * PASSIVE_LEVEL * * ARGUMENTS - * Standard dispatch arguments + * Standard dispatch arguments * * RETURNS - * NTSTATUS + * NTSTATUS */ static NTSTATUS NTAPI -ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) +ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; PSCSI_PORT_LUN_EXTENSION LunExtension; @@ -2568,8 +2504,7 @@ ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject, PIRP NextIrp, IrpList; PKDEVICE_QUEUE_ENTRY Entry; - DPRINT("ScsiPortDispatchScsi(DeviceObject %p Irp %p)\n", - DeviceObject, Irp); + DPRINT("ScsiPortDispatchScsi(DeviceObject %p Irp %p)\n", DeviceObject, Irp); DeviceExtension = DeviceObject->DeviceExtension; Stack = IoGetCurrentIrpStackLocation(Irp); @@ -2585,17 +2520,14 @@ ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject, IoCompleteRequest(Irp, IO_NO_INCREMENT); - return(Status); + return (Status); } DPRINT("Srb: %p\n", Srb); DPRINT("Srb->Function: %lu\n", Srb->Function); DPRINT("PathId: %lu TargetId: %lu Lun: %lu\n", Srb->PathId, Srb->TargetId, Srb->Lun); - LunExtension = SpiGetLunExtension(DeviceExtension, - Srb->PathId, - Srb->TargetId, - Srb->Lun); + LunExtension = SpiGetLunExtension(DeviceExtension, Srb->PathId, Srb->TargetId, Srb->Lun); if (LunExtension == NULL) { DPRINT("ScsiPortDispatchScsi() called with an invalid LUN\n"); @@ -2607,132 +2539,131 @@ ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject, IoCompleteRequest(Irp, IO_NO_INCREMENT); - return(Status); + return (Status); } switch (Srb->Function) { - case SRB_FUNCTION_SHUTDOWN: - case SRB_FUNCTION_FLUSH: - DPRINT (" SRB_FUNCTION_SHUTDOWN or FLUSH\n"); - if (DeviceExtension->CachesData == FALSE) - { - /* All success here */ - Srb->SrbStatus = SRB_STATUS_SUCCESS; - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - } - /* Fall through to a usual execute operation */ - - case SRB_FUNCTION_EXECUTE_SCSI: - case SRB_FUNCTION_IO_CONTROL: - DPRINT(" SRB_FUNCTION_EXECUTE_SCSI or SRB_FUNCTION_IO_CONTROL\n"); - /* Mark IRP as pending in all cases */ - IoMarkIrpPending(Irp); - - if (Srb->SrbFlags & SRB_FLAGS_BYPASS_FROZEN_QUEUE) - { - /* Start IO directly */ - IoStartPacket(DeviceObject, Irp, NULL, NULL); - } - else - { - KIRQL oldIrql; + case SRB_FUNCTION_SHUTDOWN: + case SRB_FUNCTION_FLUSH: + DPRINT(" SRB_FUNCTION_SHUTDOWN or FLUSH\n"); + if (DeviceExtension->CachesData == FALSE) + { + /* All success here */ + Srb->SrbStatus = SRB_STATUS_SUCCESS; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + /* Fall through to a usual execute operation */ - /* We need to be at DISPATCH_LEVEL */ - KeRaiseIrql (DISPATCH_LEVEL, &oldIrql); + case SRB_FUNCTION_EXECUTE_SCSI: + case SRB_FUNCTION_IO_CONTROL: + DPRINT(" SRB_FUNCTION_EXECUTE_SCSI or SRB_FUNCTION_IO_CONTROL\n"); + /* Mark IRP as pending in all cases */ + IoMarkIrpPending(Irp); - /* Insert IRP into the queue */ - if (!KeInsertByKeyDeviceQueue(&LunExtension->DeviceQueue, - &Irp->Tail.Overlay.DeviceQueueEntry, - Srb->QueueSortKey)) + if (Srb->SrbFlags & SRB_FLAGS_BYPASS_FROZEN_QUEUE) { - /* It means the queue is empty, and we just start this request */ + /* Start IO directly */ IoStartPacket(DeviceObject, Irp, NULL, NULL); } + else + { + KIRQL oldIrql; - /* Back to the old IRQL */ - KeLowerIrql (oldIrql); - } - return STATUS_PENDING; + /* We need to be at DISPATCH_LEVEL */ + KeRaiseIrql(DISPATCH_LEVEL, &oldIrql); - case SRB_FUNCTION_CLAIM_DEVICE: - case SRB_FUNCTION_ATTACH_DEVICE: - DPRINT (" SRB_FUNCTION_CLAIM_DEVICE or ATTACH\n"); + /* Insert IRP into the queue */ + if (!KeInsertByKeyDeviceQueue( + &LunExtension->DeviceQueue, + &Irp->Tail.Overlay.DeviceQueueEntry, + Srb->QueueSortKey)) + { + /* It means the queue is empty, and we just start this request */ + IoStartPacket(DeviceObject, Irp, NULL, NULL); + } - /* Reference device object and keep the device object */ - Status = SpiHandleAttachRelease(DeviceExtension, Irp); - break; + /* Back to the old IRQL */ + KeLowerIrql(oldIrql); + } + return STATUS_PENDING; - case SRB_FUNCTION_RELEASE_DEVICE: - DPRINT (" SRB_FUNCTION_RELEASE_DEVICE\n"); + case SRB_FUNCTION_CLAIM_DEVICE: + case SRB_FUNCTION_ATTACH_DEVICE: + DPRINT(" SRB_FUNCTION_CLAIM_DEVICE or ATTACH\n"); - /* Dereference device object and clear the device object */ - Status = SpiHandleAttachRelease(DeviceExtension, Irp); - break; + /* Reference device object and keep the device object */ + Status = SpiHandleAttachRelease(DeviceExtension, Irp); + break; - case SRB_FUNCTION_RELEASE_QUEUE: - DPRINT(" SRB_FUNCTION_RELEASE_QUEUE\n"); + case SRB_FUNCTION_RELEASE_DEVICE: + DPRINT(" SRB_FUNCTION_RELEASE_DEVICE\n"); - /* Guard with the spinlock */ - KeAcquireSpinLock(&DeviceExtension->SpinLock, &Irql); + /* Dereference device object and clear the device object */ + Status = SpiHandleAttachRelease(DeviceExtension, Irp); + break; - if (!(LunExtension->Flags & LUNEX_FROZEN_QUEUE)) - { - DPRINT("Queue is not frozen really\n"); + case SRB_FUNCTION_RELEASE_QUEUE: + DPRINT(" SRB_FUNCTION_RELEASE_QUEUE\n"); - KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); - Srb->SrbStatus = SRB_STATUS_SUCCESS; - Status = STATUS_SUCCESS; - break; + /* Guard with the spinlock */ + KeAcquireSpinLock(&DeviceExtension->SpinLock, &Irql); - } + if (!(LunExtension->Flags & LUNEX_FROZEN_QUEUE)) + { + DPRINT("Queue is not frozen really\n"); - /* Unfreeze the queue */ - LunExtension->Flags &= ~LUNEX_FROZEN_QUEUE; + KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); + Srb->SrbStatus = SRB_STATUS_SUCCESS; + Status = STATUS_SUCCESS; + break; + } - if (LunExtension->SrbInfo.Srb == NULL) - { - /* Get next logical unit request */ - SpiGetNextRequestFromLun(DeviceExtension, LunExtension); + /* Unfreeze the queue */ + LunExtension->Flags &= ~LUNEX_FROZEN_QUEUE; - /* SpiGetNextRequestFromLun() releases the spinlock */ - KeLowerIrql(Irql); - } - else - { - DPRINT("The queue has active request\n"); - KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); - } + if (LunExtension->SrbInfo.Srb == NULL) + { + /* Get next logical unit request */ + SpiGetNextRequestFromLun(DeviceExtension, LunExtension); + /* SpiGetNextRequestFromLun() releases the spinlock */ + KeLowerIrql(Irql); + } + else + { + DPRINT("The queue has active request\n"); + KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); + } - Srb->SrbStatus = SRB_STATUS_SUCCESS; - Status = STATUS_SUCCESS; - break; + Srb->SrbStatus = SRB_STATUS_SUCCESS; + Status = STATUS_SUCCESS; + break; - case SRB_FUNCTION_FLUSH_QUEUE: - DPRINT(" SRB_FUNCTION_FLUSH_QUEUE\n"); + case SRB_FUNCTION_FLUSH_QUEUE: + DPRINT(" SRB_FUNCTION_FLUSH_QUEUE\n"); - /* Guard with the spinlock */ - KeAcquireSpinLock(&DeviceExtension->SpinLock, &Irql); + /* Guard with the spinlock */ + KeAcquireSpinLock(&DeviceExtension->SpinLock, &Irql); - if (!(LunExtension->Flags & LUNEX_FROZEN_QUEUE)) - { - DPRINT("Queue is not frozen really\n"); + if (!(LunExtension->Flags & LUNEX_FROZEN_QUEUE)) + { + DPRINT("Queue is not frozen really\n"); - KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - } + KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + } - /* Make sure there is no active request */ - ASSERT(LunExtension->SrbInfo.Srb == NULL); + /* Make sure there is no active request */ + ASSERT(LunExtension->SrbInfo.Srb == NULL); - /* Compile a list from the device queue */ - IrpList = NULL; - while ((Entry = KeRemoveDeviceQueue(&LunExtension->DeviceQueue)) != NULL) - { + /* Compile a list from the device queue */ + IrpList = NULL; + while ((Entry = KeRemoveDeviceQueue(&LunExtension->DeviceQueue)) != NULL) + { NextIrp = CONTAINING_RECORD(Entry, IRP, Tail.Overlay.DeviceQueueEntry); /* Get the Srb */ @@ -2746,60 +2677,59 @@ ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject, /* Add then to the list */ NextIrp->Tail.Overlay.ListEntry.Flink = (PLIST_ENTRY)IrpList; IrpList = NextIrp; - } + } - /* Unfreeze the queue */ - LunExtension->Flags &= ~LUNEX_FROZEN_QUEUE; + /* Unfreeze the queue */ + LunExtension->Flags &= ~LUNEX_FROZEN_QUEUE; - /* Release the spinlock */ - KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); + /* Release the spinlock */ + KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); - /* Complete those requests */ - while (IrpList) - { - NextIrp = IrpList; - IrpList = (PIRP)NextIrp->Tail.Overlay.ListEntry.Flink; + /* Complete those requests */ + while (IrpList) + { + NextIrp = IrpList; + IrpList = (PIRP)NextIrp->Tail.Overlay.ListEntry.Flink; - IoCompleteRequest(NextIrp, 0); - } + IoCompleteRequest(NextIrp, 0); + } - Status = STATUS_SUCCESS; - break; + Status = STATUS_SUCCESS; + break; - default: - DPRINT1("SRB function not implemented (Function %lu)\n", Srb->Function); - Status = STATUS_NOT_IMPLEMENTED; - break; + default: + DPRINT1("SRB function not implemented (Function %lu)\n", Srb->Function); + Status = STATUS_NOT_IMPLEMENTED; + break; } Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return(Status); + return Status; } /********************************************************************** - * NAME INTERNAL - * ScsiPortDeviceControl + * NAME INTERNAL + * ScsiPortDeviceControl * * DESCRIPTION - * Answer requests for device control calls + * Answer requests for device control calls * * RUN LEVEL - * PASSIVE_LEVEL + * PASSIVE_LEVEL * * ARGUMENTS - * Standard dispatch arguments + * Standard dispatch arguments * * RETURNS - * NTSTATUS + * NTSTATUS */ static NTSTATUS NTAPI ScsiPortDeviceControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + IN PIRP Irp) { PIO_STACK_LOCATION Stack; PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; @@ -2907,7 +2837,7 @@ ScsiPortDeviceControl(IN PDEVICE_OBJECT DeviceObject, static VOID NTAPI ScsiPortStartIo(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + IN PIRP Irp) { PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; PSCSI_PORT_LUN_EXTENSION LunExtension; @@ -3363,9 +3293,9 @@ SpiAllocateLunExtension(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension) static PSCSI_PORT_LUN_EXTENSION SpiGetLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun) + IN UCHAR PathId, + IN UCHAR TargetId, + IN UCHAR Lun) { PSCSI_PORT_LUN_EXTENSION LunExtension; @@ -4594,7 +4524,7 @@ SpiCompletionRoutine(PDEVICE_OBJECT DeviceObject, if (Irp->MdlAddress != NULL) { - MmUnlockPages(Irp->MdlAddress); + MmUnlockPages(Irp->MdlAddress); IoFreeMdl(Irp->MdlAddress); Irp->MdlAddress = NULL; } @@ -4863,9 +4793,9 @@ SpiGetNextRequestFromLun(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, // static VOID NTAPI ScsiPortDpcForIsr(IN PKDPC Dpc, - IN PDEVICE_OBJECT DpcDeviceObject, - IN PIRP DpcIrp, - IN PVOID DpcContext) + IN PDEVICE_OBJECT DpcDeviceObject, + IN PIRP DpcIrp, + IN PVOID DpcContext) { PSCSI_PORT_DEVICE_EXTENSION DeviceExtension = DpcDeviceObject->DeviceExtension; SCSI_PORT_INTERRUPT_DATA InterruptData; @@ -4881,7 +4811,7 @@ ScsiPortDpcForIsr(IN PKDPC Dpc, /* We need to acquire spinlock */ KeAcquireSpinLockAtDpcLevel(&DeviceExtension->SpinLock); - RtlZeroMemory(&InterruptData, sizeof(SCSI_PORT_INTERRUPT_DATA)); + RtlZeroMemory(&InterruptData, sizeof(SCSI_PORT_INTERRUPT_DATA)); TryAgain: diff --git a/drivers/storage/port/scsiport/scsiport_int.h b/drivers/storage/port/scsiport/scsiport.h similarity index 98% rename from drivers/storage/port/scsiport/scsiport_int.h rename to drivers/storage/port/scsiport/scsiport.h index e05f163631a..b0076e543a9 100644 --- a/drivers/storage/port/scsiport/scsiport_int.h +++ b/drivers/storage/port/scsiport/scsiport.h @@ -7,6 +7,14 @@ #pragma once +#include <wdm.h> +#include <ntddk.h> +#include <stdio.h> +#include <scsi.h> +#include <ntddscsi.h> +#include <ntdddisk.h> +#include <mountdev.h> + #define VERSION "0.0.3" #ifndef PAGE_ROUND_UP

1 0

[reactos] 01/01: [RAPPS] Remove string casts after the conutils fix
by Mark Jansen 25 Sep '20

25 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3da04a9b683c3d3a13201… commit 3da04a9b683c3d3a13201c74f4c430370473c12a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 20 22:15:47 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Sep 25 22:03:28 2020 +0200 [RAPPS] Remove string casts after the conutils fix --- base/applications/rapps/unattended.cpp | 37 ++++++++++++++++------------------ 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/base/applications/rapps/unattended.cpp b/base/applications/rapps/unattended.cpp index d20ef8aa3f2..f1589a3b544 100644 --- a/base/applications/rapps/unattended.cpp +++ b/base/applications/rapps/unattended.cpp @@ -5,14 +5,11 @@ * COPYRIGHT: Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) * Copyright 2020 He Yang (1160386205(a)qq.com) */ -#include "rapps.h" +#include "rapps.h" #include "unattended.h" - #include "winmain.h" - #include <setupapi.h> - #include <conutils.h> BOOL MatchCmdOption(LPWSTR argvOption, LPCWSTR szOptToMacth) @@ -119,13 +116,13 @@ BOOL HandleSetupCommand(LPWSTR szCommand, int argcLeft, LPWSTR * argvLeft) BOOL CALLBACK CmdFindAppEnum(CAvailableApplicationInfo *Info, BOOL bInitialCheckState, PVOID param) { LPCWSTR lpszSearch = (LPCWSTR)param; - if (!SearchPatternMatch(Info->m_szName.GetString(), lpszSearch) && - !SearchPatternMatch(Info->m_szDesc.GetString(), lpszSearch)) + if (!SearchPatternMatch(Info->m_szName, lpszSearch) && + !SearchPatternMatch(Info->m_szDesc, lpszSearch)) { return TRUE; } - ConPrintf(StdOut, (LPWSTR)L"%s (%s)\n", (LPCWSTR)(Info->m_szName), (LPCWSTR)(Info->m_szPkgName)); + ConPrintf(StdOut, L"%s (%s)\n", Info->m_szName.GetString(), Info->m_szPkgName.GetString()); return TRUE; } @@ -144,7 +141,7 @@ BOOL HandleFindCommand(LPWSTR szCommand, int argcLeft, LPWSTR *argvLeft) { ConResMsgPrintf(StdOut, NULL, IDS_CMD_FIND_RESULT_FOR, argvLeft[i]); apps.Enum(ENUM_ALL_AVAILABLE, CmdFindAppEnum, argvLeft[i]); - ConPrintf(StdOut, (LPWSTR)L"\n"); + ConPrintf(StdOut, L"\n"); } return TRUE; @@ -176,47 +173,47 @@ BOOL HandleInfoCommand(LPWSTR szCommand, int argcLeft, LPWSTR *argvLeft) // is in a mess. It should be refactored, and should not placed in class CAppRichEdit. // and the code here should reused that code after refactor. - ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szName); + ConPuts(StdOut, AppInfo->m_szName); if (AppInfo->m_szVersion) { ConResPrintf(StdOut, IDS_AINFO_VERSION); - ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szVersion); + ConPuts(StdOut, AppInfo->m_szVersion); } if (AppInfo->m_szLicense) { ConResPrintf(StdOut, IDS_AINFO_LICENSE); - ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szLicense); + ConPuts(StdOut, AppInfo->m_szLicense); } if (AppInfo->m_szSize) { ConResPrintf(StdOut, IDS_AINFO_SIZE); - ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szSize); + ConPuts(StdOut, AppInfo->m_szSize); } if (AppInfo->m_szUrlSite) { ConResPrintf(StdOut, IDS_AINFO_URLSITE); - ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szUrlSite); + ConPuts(StdOut, AppInfo->m_szUrlSite); } if (AppInfo->m_szDesc) { ConResPrintf(StdOut, IDS_AINFO_DESCRIPTION); - ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szDesc); + ConPuts(StdOut, AppInfo->m_szDesc); } if (AppInfo->m_szUrlDownload) { ConResPrintf(StdOut, IDS_AINFO_URLDOWNLOAD); - ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szUrlDownload); + ConPuts(StdOut, AppInfo->m_szUrlDownload); } - ConPrintf(StdOut, (LPWSTR)L"\n"); + ConPrintf(StdOut, L"\n"); } - ConPrintf(StdOut, (LPWSTR)L"\n"); + ConPrintf(StdOut, L"\n"); } return TRUE; } @@ -228,12 +225,12 @@ BOOL HandleHelpCommand(LPWSTR szCommand, int argcLeft, LPWSTR * argvLeft) return FALSE; } - ConPrintf(StdOut, (LPWSTR)L"\n"); + ConPrintf(StdOut, L"\n"); ConResPuts(StdOut, IDS_APPTITLE); - ConPrintf(StdOut, (LPWSTR)L"\n\n"); + ConPrintf(StdOut, L"\n\n"); ConResPuts(StdOut, IDS_CMD_USAGE); - ConPrintf(StdOut, (LPWSTR)L"%ls\n", UsageString); + ConPrintf(StdOut, L"%ls\n", UsageString); return TRUE; }

1 0

[reactos] 03/03: [KERNEL32_VISTA] Move vista.c from kernel32 to kernel32_vista
by Timo Kreuzer 25 Sep '20

25 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8b5c00c338e3cb508a6a… commit d8b5c00c338e3cb508a6aabf00cdbfd32906c542 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Sep 13 18:55:17 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Sep 25 09:45:54 2020 +0200 [KERNEL32_VISTA] Move vista.c from kernel32 to kernel32_vista - Remove duplicated functions - Use AreFileApisANSI() instead of global variable bIsFileApiAnsi in shared kernel32_shared --- dll/win32/kernel32/CMakeLists.txt | 1 - dll/win32/kernel32/client/file/fileutils.c | 10 +- dll/win32/kernel32/kernel32_vista/CMakeLists.txt | 3 + dll/win32/kernel32/kernel32_vista/k32_vista.h | 11 ++ .../kernel32/kernel32_vista/kernel32_vista.spec | 24 ++++ .../kernel32/{client => kernel32_vista}/vista.c | 155 ++------------------- 6 files changed, 57 insertions(+), 147 deletions(-) diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt index 616e0f453b5..7d31686837d 100644 --- a/dll/win32/kernel32/CMakeLists.txt +++ b/dll/win32/kernel32/CMakeLists.txt @@ -44,7 +44,6 @@ list(APPEND SOURCE client/vdm.c client/version.c client/virtmem.c - client/vista.c client/console/alias.c client/console/console.c client/console/history.c diff --git a/dll/win32/kernel32/client/file/fileutils.c b/dll/win32/kernel32/client/file/fileutils.c index 078f83006e2..2257608588a 100644 --- a/dll/win32/kernel32/client/file/fileutils.c +++ b/dll/win32/kernel32/client/file/fileutils.c @@ -28,7 +28,7 @@ FilenameA2W(LPCSTR NameA, BOOL alloc) RtlInitAnsiString(&str, NameA); pstrW = alloc ? &strW : &NtCurrentTeb()->StaticUnicodeString; - if (bIsFileApiAnsi) + if (AreFileApisANSI()) Status= RtlAnsiStringToUnicodeString( pstrW, &str, (BOOLEAN)alloc ); else Status= RtlOemStringToUnicodeString( pstrW, &str, (BOOLEAN)alloc ); @@ -64,7 +64,7 @@ FilenameU2A_FitOrFail( /* destLen should never exceed MAX_PATH */ if (destLen > MAX_PATH) destLen = MAX_PATH; - ret = bIsFileApiAnsi? RtlUnicodeStringToAnsiSize(SourceU) : RtlUnicodeStringToOemSize(SourceU); + ret = AreFileApisANSI() ? RtlUnicodeStringToAnsiSize(SourceU) : RtlUnicodeStringToOemSize(SourceU); /* ret incl. nullchar */ if (DestA && (INT)ret <= destLen) @@ -75,7 +75,7 @@ FilenameU2A_FitOrFail( str.MaximumLength = (USHORT)destLen; - if (bIsFileApiAnsi) + if (AreFileApisANSI()) RtlUnicodeStringToAnsiString(&str, SourceU, FALSE ); else RtlUnicodeStringToOemString(&str, SourceU, FALSE ); @@ -129,7 +129,7 @@ FilenameA2W_N( if (srclen < 0) srclen = strlen( src ) + 1; - if (bIsFileApiAnsi) + if (AreFileApisANSI()) RtlMultiByteToUnicodeN( dest, destlen* sizeof(WCHAR), &ret, (LPSTR)src, srclen ); else RtlOemToUnicodeN( dest, destlen* sizeof(WCHAR), &ret, (LPSTR)src, srclen ); @@ -154,7 +154,7 @@ FilenameW2A_N( if (srclen < 0) srclen = wcslen( src ) + 1; - if (bIsFileApiAnsi) + if (AreFileApisANSI()) RtlUnicodeToMultiByteN( dest, destlen, &ret, (LPWSTR) src, srclen * sizeof(WCHAR)); else RtlUnicodeToOemN( dest, destlen, &ret, (LPWSTR) src, srclen * sizeof(WCHAR) ); diff --git a/dll/win32/kernel32/kernel32_vista/CMakeLists.txt b/dll/win32/kernel32/kernel32_vista/CMakeLists.txt index 915346689a1..51efae70f8b 100644 --- a/dll/win32/kernel32/kernel32_vista/CMakeLists.txt +++ b/dll/win32/kernel32/kernel32_vista/CMakeLists.txt @@ -3,6 +3,7 @@ remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502) add_definitions(-D_WIN32_WINNT=0x600 -DWINVER=0x600) add_definitions(-D_KERNEL32_) +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys) spec2def(kernel32_vista.dll kernel32_vista.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -11,10 +12,12 @@ list(APPEND SOURCE GetTickCount64.c InitOnceExecuteOnce.c sync.c + vista.c ${CMAKE_CURRENT_BINARY_DIR}/kernel32_vista.def) add_library(kernel32_vista MODULE ${SOURCE}) set_module_type(kernel32_vista win32dll ENTRYPOINT DllMain 12) +target_link_libraries(kernel32_vista kernel32_shared) add_importlibs(kernel32_vista kernel32 ntdll_vista ntdll) add_delay_importlibs(kernel32_vista ntdll_vista) add_dependencies(kernel32_vista psdk) diff --git a/dll/win32/kernel32/kernel32_vista/k32_vista.h b/dll/win32/kernel32/kernel32_vista/k32_vista.h index fff9ba8d0b4..7f78e53e68a 100644 --- a/dll/win32/kernel32/kernel32_vista/k32_vista.h +++ b/dll/win32/kernel32/kernel32_vista/k32_vista.h @@ -6,7 +6,18 @@ #include <windef.h> #include <winbase.h> +/* Redefine NTDDI_VERSION to 2K3 SP1 to get correct NDK definitions */ +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_WS03SP1 + +#include <ndk/iofuncs.h> #include <ndk/kefuncs.h> +#include <ndk/obfuncs.h> #include <ndk/psfuncs.h> #include <ndk/rtlfuncs.h> +/* CSRSS Headers */ +#include <win/base.h> + +/* Internal Kernel32 Header */ +#include "../include/kernel32.h" diff --git a/dll/win32/kernel32/kernel32_vista/kernel32_vista.spec b/dll/win32/kernel32/kernel32_vista/kernel32_vista.spec index f61e6e6dc36..02c1cb05739 100644 --- a/dll/win32/kernel32/kernel32_vista/kernel32_vista.spec +++ b/dll/win32/kernel32/kernel32_vista/kernel32_vista.spec @@ -16,3 +16,27 @@ @ stdcall WakeConditionVariable(ptr) @ stdcall InitializeCriticalSectionEx(ptr long long) + +@ stdcall ApplicationRecoveryFinished(long) +@ stdcall ApplicationRecoveryInProgress(ptr) +@ stdcall CreateSymbolicLinkA(str str long) +@ stdcall CreateSymbolicLinkW(wstr wstr long) +@ stdcall GetApplicationRecoveryCallback(ptr ptr ptr ptr ptr) +@ stdcall GetApplicationRestart(ptr wstr ptr ptr) +@ stdcall GetFileBandwidthReservation(ptr ptr ptr ptr ptr ptr) +@ stdcall GetFileMUIInfo(long wstr ptr ptr) +@ stdcall GetFileMUIPath(long wstr wstr ptr wstr ptr ptr) +@ stdcall GetFinalPathNameByHandleA(ptr str long long) +@ stdcall GetFinalPathNameByHandleW(ptr wstr long long) +@ stdcall GetSystemPreferredUILanguages(long ptr wstr ptr) +@ stdcall GetThreadPreferredUILanguages(long ptr wstr ptr) +@ stdcall GetThreadUILanguage() +@ stdcall GetUILanguageInfo(long wstr wstr ptr ptr) +@ stdcall GetUserPreferredUILanguages(long ptr wstr ptr) +@ stdcall OpenFileById(ptr ptr long long ptr long) +@ stdcall QueryFullProcessImageNameA(ptr long str ptr) +@ stdcall QueryFullProcessImageNameW(ptr long wstr ptr) +@ stdcall RegisterApplicationRecoveryCallback(ptr ptr long long) +@ stdcall RegisterApplicationRestart(wstr long) +@ stdcall SetFileBandwidthReservation(ptr long long long ptr ptr) +@ stdcall SetThreadPreferredUILanguages(long wstr ptr) diff --git a/dll/win32/kernel32/client/vista.c b/dll/win32/kernel32/kernel32_vista/vista.c similarity index 83% rename from dll/win32/kernel32/client/vista.c rename to dll/win32/kernel32/kernel32_vista/vista.c index 8fa60a995cd..743cb430721 100644 --- a/dll/win32/kernel32/client/vista.c +++ b/dll/win32/kernel32/kernel32_vista/vista.c @@ -7,125 +7,19 @@ /* INCLUDES *******************************************************************/ -#include <k32.h> +#include <k32_vista.h> -#define NDEBUG -#include <debug.h> - -#if _WIN32_WINNT >= 0x600 - -/* FIXME: Move these RTL declarations to the NDK */ -NTSTATUS -NTAPI -RtlSleepConditionVariableCS(IN OUT PRTL_CONDITION_VARIABLE ConditionVariable, - IN OUT PRTL_CRITICAL_SECTION CriticalSection, - IN PLARGE_INTEGER TimeOut OPTIONAL); - -NTSTATUS -NTAPI -RtlSleepConditionVariableSRW(IN OUT PRTL_CONDITION_VARIABLE ConditionVariable, - IN OUT PRTL_SRWLOCK SRWLock, - IN PLARGE_INTEGER TimeOut OPTIONAL, - IN ULONG Flags); - -/* PUBLIC FUNCTIONS ***********************************************************/ - -/* - * @implemented - */ -BOOL -WINAPI -SleepConditionVariableCS(IN OUT PCONDITION_VARIABLE ConditionVariable, - IN OUT PCRITICAL_SECTION CriticalSection, - IN DWORD dwMilliseconds) -{ - NTSTATUS Status = STATUS_SUCCESS; -#if 0 - LARGE_INTEGER TimeOut; - PLARGE_INTEGER TimeOutPtr = NULL; - - if (dwMilliseconds != INFINITE) - { - TimeOut.QuadPart = dwMilliseconds * -10000LL; - TimeOutPtr = &TimeOut; - } - - Status = RtlSleepConditionVariableCS((PRTL_CONDITION_VARIABLE)ConditionVariable, - (PRTL_CRITICAL_SECTION)CriticalSection, - TimeOutPtr); +#if _WIN32_WINNT != _WIN32_WINNT_VISTA +#error "This file must be compiled with _WIN32_WINNT == _WIN32_WINNT_VISTA" #endif - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL -WINAPI -SleepConditionVariableSRW(IN OUT PCONDITION_VARIABLE ConditionVariable, - IN OUT PSRWLOCK SRWLock, - IN DWORD dwMilliseconds, - IN ULONG Flags) -{ - NTSTATUS Status = STATUS_SUCCESS; -#if 0 - LARGE_INTEGER TimeOut; - PLARGE_INTEGER TimeOutPtr = NULL; - if (dwMilliseconds != INFINITE) - { - TimeOut.QuadPart = dwMilliseconds * -10000LL; - TimeOutPtr = &TimeOut; - } +// This is defined only in ntifs.h +#define REPARSE_DATA_BUFFER_HEADER_SIZE FIELD_OFFSET(REPARSE_DATA_BUFFER, GenericReparseBuffer) - Status = RtlSleepConditionVariableSRW((PRTL_CONDITION_VARIABLE)ConditionVariable, - (PRTL_SRWLOCK)SRWLock, - TimeOutPtr, - Flags); -#endif - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL WINAPI InitializeCriticalSectionEx(OUT LPCRITICAL_SECTION lpCriticalSection, - IN DWORD dwSpinCount, - IN DWORD flags) -{ - NTSTATUS Status; - - /* FIXME: Flags ignored */ - - /* Initialize the critical section */ - Status = RtlInitializeCriticalSectionAndSpinCount( - (PRTL_CRITICAL_SECTION)lpCriticalSection, - dwSpinCount); - if (!NT_SUCCESS(Status)) - { - /* Set failure code */ - BaseSetLastNTError(Status); - return FALSE; - } - - /* Success */ - return TRUE; -} +#define NDEBUG +#include <debug.h> +/* PUBLIC FUNCTIONS ***********************************************************/ /* * @implemented @@ -267,7 +161,7 @@ GetApplicationRestart(IN HANDLE hProcess, */ VOID WINAPI -RecoveryFinished(IN BOOL bSuccess) +ApplicationRecoveryFinished(IN BOOL bSuccess) { UNIMPLEMENTED; } @@ -278,7 +172,7 @@ RecoveryFinished(IN BOOL bSuccess) */ HRESULT WINAPI -RecoveryInProgress(OUT PBOOL pbCancelled) +ApplicationRecoveryInProgress(OUT PBOOL pbCancelled) { UNIMPLEMENTED; return E_FAIL; @@ -692,30 +586,6 @@ OpenFileById(IN HANDLE hFile, } -/* - * @implemented - */ -ULONGLONG -WINAPI -GetTickCount64(VOID) -{ - ULARGE_INTEGER TickCount; - - while (TRUE) - { - TickCount.HighPart = (ULONG)SharedUserData->TickCount.High1Time; - TickCount.LowPart = SharedUserData->TickCount.LowPart; - - if (TickCount.HighPart == (ULONG)SharedUserData->TickCount.High2Time) break; - - YieldProcessor(); - } - - return (UInt32x32To64(TickCount.LowPart, SharedUserData->TickCountMultiplier) >> 24) + - (UInt32x32To64(TickCount.HighPart, SharedUserData->TickCountMultiplier) << 8); -} - -#endif /* Vista+ MUI support functions @@ -766,6 +636,7 @@ GetFileMUIPath( /* * @unimplemented */ +#if 0 // This is Windows 7+ BOOL WINAPI GetProcessPreferredUILanguages( @@ -778,6 +649,7 @@ GetProcessPreferredUILanguages( SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } +#endif /* * @unimplemented @@ -860,6 +732,7 @@ GetUserPreferredUILanguages( /* * @unimplemented */ +#if 0 // Tis is Windows 7+ BOOL WINAPI SetProcessPreferredUILanguages( @@ -871,7 +744,7 @@ SetProcessPreferredUILanguages( SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } - +#endif /* * @unimplemented

1 0

[reactos] 02/03: [KERNEL32] Move some functions into a static library to be shared between kernel32 and kernel32_vista
by Timo Kreuzer 25 Sep '20

25 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fcd83242d4e20e86b54de… commit fcd83242d4e20e86b54dec7f7c7091f997a537fe Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Sep 13 10:03:58 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Sep 25 09:45:54 2020 +0200 [KERNEL32] Move some functions into a static library to be shared between kernel32 and kernel32_vista --- dll/win32/kernel32/CMakeLists.txt | 10 +- dll/win32/kernel32/client/except.c | 15 --- dll/win32/kernel32/client/file/fileinfo.c | 150 -------------------------- dll/win32/kernel32/client/file/fileutils.c | 167 +++++++++++++++++++++++++++++ dll/win32/kernel32/client/shared_utils.c | 30 ++++++ 5 files changed, 206 insertions(+), 166 deletions(-) diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt index 984cb8eaa0d..616e0f453b5 100644 --- a/dll/win32/kernel32/CMakeLists.txt +++ b/dll/win32/kernel32/CMakeLists.txt @@ -5,6 +5,14 @@ add_definitions(-D_KERNEL32_) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys) spec2def(kernel32.dll kernel32.spec ADD_IMPORTLIB) +# Shared between kernel32 and kernel32_vista +add_library(kernel32_shared + client/shared_utils.c + client/file/fileutils.c +) + +add_dependencies(kernel32_shared psdk) + list(APPEND SOURCE client/actctx.c client/appcache.c @@ -114,7 +122,7 @@ set_module_type(kernel32 win32dll ENTRYPOINT DllMain 12) set_subsystem(kernel32 console) ################# END HACK ################# -target_link_libraries(kernel32 wine chkstk ${PSEH_LIB}) +target_link_libraries(kernel32 kernel32_shared wine chkstk ${PSEH_LIB}) add_importlibs(kernel32 ntdll) add_pch(kernel32 k32.h SOURCE) add_dependencies(kernel32 psdk errcodes asm) diff --git a/dll/win32/kernel32/client/except.c b/dll/win32/kernel32/client/except.c index dbb76b7be49..36fab314f49 100644 --- a/dll/win32/kernel32/client/except.c +++ b/dll/win32/kernel32/client/except.c @@ -1036,21 +1036,6 @@ SetLastError(IN DWORD dwErrCode) if (NtCurrentTeb()->LastErrorValue != dwErrCode) NtCurrentTeb()->LastErrorValue = dwErrCode; } -/* - * @implemented - */ -DWORD -WINAPI -BaseSetLastNTError(IN NTSTATUS Status) -{ - DWORD dwErrCode; - - /* Convert from NT to Win32, then set */ - dwErrCode = RtlNtStatusToDosError(Status); - SetLastError(dwErrCode); - return dwErrCode; -} - /* * @implemented */ diff --git a/dll/win32/kernel32/client/file/fileinfo.c b/dll/win32/kernel32/client/file/fileinfo.c index 2721c826315..b70a99a137c 100644 --- a/dll/win32/kernel32/client/file/fileinfo.c +++ b/dll/win32/kernel32/client/file/fileinfo.c @@ -18,156 +18,6 @@ DEBUG_CHANNEL(kernel32file); /* FUNCTIONS ****************************************************************/ -PWCHAR -FilenameA2W(LPCSTR NameA, BOOL alloc) -{ - ANSI_STRING str; - UNICODE_STRING strW; - PUNICODE_STRING pstrW; - NTSTATUS Status; - - //ASSERT(NtCurrentTeb()->StaticUnicodeString.Buffer == NtCurrentTeb()->StaticUnicodeBuffer); - ASSERT(NtCurrentTeb()->StaticUnicodeString.MaximumLength == sizeof(NtCurrentTeb()->StaticUnicodeBuffer)); - - RtlInitAnsiString(&str, NameA); - pstrW = alloc ? &strW : &NtCurrentTeb()->StaticUnicodeString; - - if (bIsFileApiAnsi) - Status= RtlAnsiStringToUnicodeString( pstrW, &str, (BOOLEAN)alloc ); - else - Status= RtlOemStringToUnicodeString( pstrW, &str, (BOOLEAN)alloc ); - - if (NT_SUCCESS(Status)) - return pstrW->Buffer; - - if (Status== STATUS_BUFFER_OVERFLOW) - SetLastError( ERROR_FILENAME_EXCED_RANGE ); - else - BaseSetLastNTError(Status); - - return NULL; -} - - -/* -No copy/conversion is done if the dest. buffer is too small. - -Returns: - Success: number of TCHARS copied into dest. buffer NOT including nullterm - Fail: size of buffer in TCHARS required to hold the converted filename, including nullterm -*/ -DWORD -FilenameU2A_FitOrFail( - LPSTR DestA, - INT destLen, /* buffer size in TCHARS incl. nullchar */ - PUNICODE_STRING SourceU - ) -{ - DWORD ret; - - /* destLen should never exceed MAX_PATH */ - if (destLen > MAX_PATH) destLen = MAX_PATH; - - ret = bIsFileApiAnsi? RtlUnicodeStringToAnsiSize(SourceU) : RtlUnicodeStringToOemSize(SourceU); - /* ret incl. nullchar */ - - if (DestA && (INT)ret <= destLen) - { - ANSI_STRING str; - - str.Buffer = DestA; - str.MaximumLength = (USHORT)destLen; - - - if (bIsFileApiAnsi) - RtlUnicodeStringToAnsiString(&str, SourceU, FALSE ); - else - RtlUnicodeStringToOemString(&str, SourceU, FALSE ); - - ret = str.Length; /* SUCCESS: length without terminating 0 */ - } - - return ret; -} - - -/* -No copy/conversion is done if the dest. buffer is too small. - -Returns: - Success: number of TCHARS copied into dest. buffer NOT including nullterm - Fail: size of buffer in TCHARS required to hold the converted filename, including nullterm -*/ -DWORD -FilenameW2A_FitOrFail( - LPSTR DestA, - INT destLen, /* buffer size in TCHARS incl. nullchar */ - LPCWSTR SourceW, - INT sourceLen /* buffer size in TCHARS incl. nullchar */ - ) -{ - UNICODE_STRING strW; - - if (sourceLen < 0) sourceLen = wcslen(SourceW) + 1; - - strW.Buffer = (PWCHAR)SourceW; - strW.MaximumLength = sourceLen * sizeof(WCHAR); - strW.Length = strW.MaximumLength - sizeof(WCHAR); - - return FilenameU2A_FitOrFail(DestA, destLen, &strW); -} - - -/* -Return: num. TCHARS copied into dest including nullterm -*/ -DWORD -FilenameA2W_N( - LPWSTR dest, - INT destlen, /* buffer size in TCHARS incl. nullchar */ - LPCSTR src, - INT srclen /* buffer size in TCHARS incl. nullchar */ - ) -{ - DWORD ret; - - if (srclen < 0) srclen = strlen( src ) + 1; - - if (bIsFileApiAnsi) - RtlMultiByteToUnicodeN( dest, destlen* sizeof(WCHAR), &ret, (LPSTR)src, srclen ); - else - RtlOemToUnicodeN( dest, destlen* sizeof(WCHAR), &ret, (LPSTR)src, srclen ); - - if (ret) dest[(ret/sizeof(WCHAR))-1]=0; - - return ret/sizeof(WCHAR); -} - -/* -Return: num. TCHARS copied into dest including nullterm -*/ -DWORD -FilenameW2A_N( - LPSTR dest, - INT destlen, /* buffer size in TCHARS incl. nullchar */ - LPCWSTR src, - INT srclen /* buffer size in TCHARS incl. nullchar */ - ) -{ - DWORD ret; - - if (srclen < 0) srclen = wcslen( src ) + 1; - - if (bIsFileApiAnsi) - RtlUnicodeToMultiByteN( dest, destlen, &ret, (LPWSTR) src, srclen * sizeof(WCHAR)); - else - RtlUnicodeToOemN( dest, destlen, &ret, (LPWSTR) src, srclen * sizeof(WCHAR) ); - - if (ret) dest[ret-1]=0; - - return ret; -} - /* * @implemented */ diff --git a/dll/win32/kernel32/client/file/fileutils.c b/dll/win32/kernel32/client/file/fileutils.c new file mode 100644 index 00000000000..078f83006e2 --- /dev/null +++ b/dll/win32/kernel32/client/file/fileutils.c @@ -0,0 +1,167 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dll/win32/kernel32/client/file/fileutils.c + * PURPOSE: File utility function shared with kernel32_vista + * PROGRAMMER: Taken from wine + */ + +/* INCLUDES *****************************************************************/ + +#include <k32.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ****************************************************************/ + +PWCHAR +FilenameA2W(LPCSTR NameA, BOOL alloc) +{ + ANSI_STRING str; + UNICODE_STRING strW; + PUNICODE_STRING pstrW; + NTSTATUS Status; + + //ASSERT(NtCurrentTeb()->StaticUnicodeString.Buffer == NtCurrentTeb()->StaticUnicodeBuffer); + ASSERT(NtCurrentTeb()->StaticUnicodeString.MaximumLength == sizeof(NtCurrentTeb()->StaticUnicodeBuffer)); + + RtlInitAnsiString(&str, NameA); + pstrW = alloc ? &strW : &NtCurrentTeb()->StaticUnicodeString; + + if (bIsFileApiAnsi) + Status= RtlAnsiStringToUnicodeString( pstrW, &str, (BOOLEAN)alloc ); + else + Status= RtlOemStringToUnicodeString( pstrW, &str, (BOOLEAN)alloc ); + + if (NT_SUCCESS(Status)) + return pstrW->Buffer; + + if (Status== STATUS_BUFFER_OVERFLOW) + SetLastError( ERROR_FILENAME_EXCED_RANGE ); + else + BaseSetLastNTError(Status); + + return NULL; +} + + +/* +No copy/conversion is done if the dest. buffer is too small. + +Returns: + Success: number of TCHARS copied into dest. buffer NOT including nullterm + Fail: size of buffer in TCHARS required to hold the converted filename, including nullterm +*/ +DWORD +FilenameU2A_FitOrFail( + LPSTR DestA, + INT destLen, /* buffer size in TCHARS incl. nullchar */ + PUNICODE_STRING SourceU + ) +{ + DWORD ret; + + /* destLen should never exceed MAX_PATH */ + if (destLen > MAX_PATH) destLen = MAX_PATH; + + ret = bIsFileApiAnsi? RtlUnicodeStringToAnsiSize(SourceU) : RtlUnicodeStringToOemSize(SourceU); + /* ret incl. nullchar */ + + if (DestA && (INT)ret <= destLen) + { + ANSI_STRING str; + + str.Buffer = DestA; + str.MaximumLength = (USHORT)destLen; + + + if (bIsFileApiAnsi) + RtlUnicodeStringToAnsiString(&str, SourceU, FALSE ); + else + RtlUnicodeStringToOemString(&str, SourceU, FALSE ); + + ret = str.Length; /* SUCCESS: length without terminating 0 */ + } + + return ret; +} + + +/* +No copy/conversion is done if the dest. buffer is too small. + +Returns: + Success: number of TCHARS copied into dest. buffer NOT including nullterm + Fail: size of buffer in TCHARS required to hold the converted filename, including nullterm +*/ +DWORD +FilenameW2A_FitOrFail( + LPSTR DestA, + INT destLen, /* buffer size in TCHARS incl. nullchar */ + LPCWSTR SourceW, + INT sourceLen /* buffer size in TCHARS incl. nullchar */ + ) +{ + UNICODE_STRING strW; + + if (sourceLen < 0) sourceLen = wcslen(SourceW) + 1; + + strW.Buffer = (PWCHAR)SourceW; + strW.MaximumLength = sourceLen * sizeof(WCHAR); + strW.Length = strW.MaximumLength - sizeof(WCHAR); + + return FilenameU2A_FitOrFail(DestA, destLen, &strW); +} + + +/* +Return: num. TCHARS copied into dest including nullterm +*/ +DWORD +FilenameA2W_N( + LPWSTR dest, + INT destlen, /* buffer size in TCHARS incl. nullchar */ + LPCSTR src, + INT srclen /* buffer size in TCHARS incl. nullchar */ + ) +{ + DWORD ret; + + if (srclen < 0) srclen = strlen( src ) + 1; + + if (bIsFileApiAnsi) + RtlMultiByteToUnicodeN( dest, destlen* sizeof(WCHAR), &ret, (LPSTR)src, srclen ); + else + RtlOemToUnicodeN( dest, destlen* sizeof(WCHAR), &ret, (LPSTR)src, srclen ); + + if (ret) dest[(ret/sizeof(WCHAR))-1]=0; + + return ret/sizeof(WCHAR); +} + +/* +Return: num. TCHARS copied into dest including nullterm +*/ +DWORD +FilenameW2A_N( + LPSTR dest, + INT destlen, /* buffer size in TCHARS incl. nullchar */ + LPCWSTR src, + INT srclen /* buffer size in TCHARS incl. nullchar */ + ) +{ + DWORD ret; + + if (srclen < 0) srclen = wcslen( src ) + 1; + + if (bIsFileApiAnsi) + RtlUnicodeToMultiByteN( dest, destlen, &ret, (LPWSTR) src, srclen * sizeof(WCHAR)); + else + RtlUnicodeToOemN( dest, destlen, &ret, (LPWSTR) src, srclen * sizeof(WCHAR) ); + + if (ret) dest[ret-1]=0; + + return ret; +} + +/* EOF */ diff --git a/dll/win32/kernel32/client/shared_utils.c b/dll/win32/kernel32/client/shared_utils.c new file mode 100644 index 00000000000..05b10675e72 --- /dev/null +++ b/dll/win32/kernel32/client/shared_utils.c @@ -0,0 +1,30 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dll/win32/kernel32/client/utils_shared.c + * PURPOSE: Utility functions shared with kernel32_vista + * PROGRAMMER: Thomas Faber +*/ + +/* INCLUDES *******************************************************************/ + +#include <k32.h> +#include <strsafe.h> + +#define NDEBUG +#include <debug.h> + +/* +* @implemented +*/ +DWORD +WINAPI +BaseSetLastNTError(IN NTSTATUS Status) +{ + DWORD dwErrCode; + + /* Convert from NT to Win32, then set */ + dwErrCode = RtlNtStatusToDosError(Status); + SetLastError(dwErrCode); + return dwErrCode; +}

1 0

[reactos] 01/03: [KERNEL32_VISTA] Move under kernel32
by Timo Kreuzer 25 Sep '20

25 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e72da08584e4f21c86bb… commit 4e72da08584e4f21c86bbe527536a31c8c566d26 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Sep 13 09:16:17 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Sep 25 09:45:54 2020 +0200 [KERNEL32_VISTA] Move under kernel32 --- dll/win32/CMakeLists.txt | 1 - dll/win32/kernel32/CMakeLists.txt | 2 ++ dll/win32/{ => kernel32}/kernel32_vista/CMakeLists.txt | 0 dll/win32/{ => kernel32}/kernel32_vista/DllMain.c | 0 dll/win32/{ => kernel32}/kernel32_vista/GetFileInformationByHandleEx.c | 0 dll/win32/{ => kernel32}/kernel32_vista/GetTickCount64.c | 0 dll/win32/{ => kernel32}/kernel32_vista/InitOnceExecuteOnce.c | 0 dll/win32/{ => kernel32}/kernel32_vista/k32_vista.h | 0 dll/win32/{ => kernel32}/kernel32_vista/kernel32_vista.spec | 0 dll/win32/{ => kernel32}/kernel32_vista/sync.c | 0 10 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index 01e6dee240e..9e7c13363ab 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -74,7 +74,6 @@ add_subdirectory(itss) add_subdirectory(jscript) add_subdirectory(jsproxy) add_subdirectory(kernel32) -add_subdirectory(kernel32_vista) add_subdirectory(loadperf) add_subdirectory(lpk) add_subdirectory(lsasrv) diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt index f2a4e0f0292..984cb8eaa0d 100644 --- a/dll/win32/kernel32/CMakeLists.txt +++ b/dll/win32/kernel32/CMakeLists.txt @@ -1,4 +1,6 @@ +add_subdirectory(kernel32_vista) + add_definitions(-D_KERNEL32_) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys) spec2def(kernel32.dll kernel32.spec ADD_IMPORTLIB) diff --git a/dll/win32/kernel32_vista/CMakeLists.txt b/dll/win32/kernel32/kernel32_vista/CMakeLists.txt similarity index 100% rename from dll/win32/kernel32_vista/CMakeLists.txt rename to dll/win32/kernel32/kernel32_vista/CMakeLists.txt diff --git a/dll/win32/kernel32_vista/DllMain.c b/dll/win32/kernel32/kernel32_vista/DllMain.c similarity index 100% rename from dll/win32/kernel32_vista/DllMain.c rename to dll/win32/kernel32/kernel32_vista/DllMain.c diff --git a/dll/win32/kernel32_vista/GetFileInformationByHandleEx.c b/dll/win32/kernel32/kernel32_vista/GetFileInformationByHandleEx.c similarity index 100% rename from dll/win32/kernel32_vista/GetFileInformationByHandleEx.c rename to dll/win32/kernel32/kernel32_vista/GetFileInformationByHandleEx.c diff --git a/dll/win32/kernel32_vista/GetTickCount64.c b/dll/win32/kernel32/kernel32_vista/GetTickCount64.c similarity index 100% rename from dll/win32/kernel32_vista/GetTickCount64.c rename to dll/win32/kernel32/kernel32_vista/GetTickCount64.c diff --git a/dll/win32/kernel32_vista/InitOnceExecuteOnce.c b/dll/win32/kernel32/kernel32_vista/InitOnceExecuteOnce.c similarity index 100% rename from dll/win32/kernel32_vista/InitOnceExecuteOnce.c rename to dll/win32/kernel32/kernel32_vista/InitOnceExecuteOnce.c diff --git a/dll/win32/kernel32_vista/k32_vista.h b/dll/win32/kernel32/kernel32_vista/k32_vista.h similarity index 100% rename from dll/win32/kernel32_vista/k32_vista.h rename to dll/win32/kernel32/kernel32_vista/k32_vista.h diff --git a/dll/win32/kernel32_vista/kernel32_vista.spec b/dll/win32/kernel32/kernel32_vista/kernel32_vista.spec similarity index 100% rename from dll/win32/kernel32_vista/kernel32_vista.spec rename to dll/win32/kernel32/kernel32_vista/kernel32_vista.spec diff --git a/dll/win32/kernel32_vista/sync.c b/dll/win32/kernel32/kernel32_vista/sync.c similarity index 100% rename from dll/win32/kernel32_vista/sync.c rename to dll/win32/kernel32/kernel32_vista/sync.c

1 0

[reactos] 01/01: [KSECDD] Fix RtlEncryptMemory and improve test
by Timo Kreuzer 25 Sep '20

25 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab43f8698085764deaca8… commit ab43f8698085764deaca857c831afde40a084d35 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Sep 13 19:58:06 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Sep 25 09:39:51 2020 +0200 [KSECDD] Fix RtlEncryptMemory and improve test --- drivers/crypto/ksecdd/crypt.c | 28 +++++- .../rostests/apitests/advapi32/RtlEncryptMemory.c | 104 +++++++++++++++++++-- 2 files changed, 122 insertions(+), 10 deletions(-) diff --git a/drivers/crypto/ksecdd/crypt.c b/drivers/crypto/ksecdd/crypt.c index ab639346b45..0a2a41e991f 100644 --- a/drivers/crypto/ksecdd/crypt.c +++ b/drivers/crypto/ksecdd/crypt.c @@ -27,6 +27,18 @@ typedef struct _KSEC_LOGON_DATA LUID LogonId; } KSEC_LOGON_DATA, *PKSEC_LOGON_DATA; +#if 0 +void PrintKeyData(PUCHAR KeyData) +{ + ULONG i; + for (i = 0; i < 32; i++) + { + DbgPrint("%02X", KeyData[i]); + } + DbgPrint("\n"); +} +#endif + VOID NTAPI KsecInitializeEncryptionSupport ( @@ -80,6 +92,8 @@ KsecGetKeyData ( if (OptionFlags == RTL_ENCRYPT_OPTION_SAME_PROCESS) { + /* Hash some process specific data to generate the key */ + RtlZeroMemory(&ProcessData, sizeof(ProcessData)); ProcessData.Process = CurrentProcess; ProcessData.ProcessId = CurrentProcess->UniqueProcessId; ProcessData.CreateTime = PsGetProcessCreateTimeQuadPart(CurrentProcess); @@ -87,14 +101,26 @@ KsecGetKeyData ( MD5Update(&Md5Contexts[0], (PVOID)&ProcessData, sizeof(ProcessData)); MD5Update(&Md5Contexts[1], (PVOID)&ProcessData, sizeof(ProcessData)); } - else // if (OptionFlags == RTL_ENCRYPT_OPTION_SAME_LOGON) + else if (OptionFlags == RTL_ENCRYPT_OPTION_SAME_LOGON) { + /* Hash the logon id to generate the key */ + RtlZeroMemory(&LogonData, sizeof(LogonData)); Token = PsReferencePrimaryToken(CurrentProcess); SeQueryAuthenticationIdToken(Token, &LogonData.LogonId); PsDereferencePrimaryToken(Token); MD5Update(&Md5Contexts[0], (PVOID)&LogonData, sizeof(LogonData)); MD5Update(&Md5Contexts[1], (PVOID)&LogonData, sizeof(LogonData)); } + else if (OptionFlags == RTL_ENCRYPT_OPTION_CROSS_PROCESS) + { + /* Use the original MD5s to generate the global key */ + NOTHING; + } + else + { + /* Must not pass anything else */ + ASSERT(FALSE); + } /* Finalize the MD5s */ MD5Final(&Md5Contexts[0]); diff --git a/modules/rostests/apitests/advapi32/RtlEncryptMemory.c b/modules/rostests/apitests/advapi32/RtlEncryptMemory.c index 8cc5036962a..81f27bb5185 100644 --- a/modules/rostests/apitests/advapi32/RtlEncryptMemory.c +++ b/modules/rostests/apitests/advapi32/RtlEncryptMemory.c @@ -9,26 +9,112 @@ #include <ntsecapi.h> -START_TEST(RtlEncryptMemory) +static const CHAR TestData[32] = "This is some test Message!!!"; + +void TestEncrypt(ULONG OptionFlags) { - static const CHAR TestData[32] = "This is some test Message!!!"; - CHAR Buffer[32]; + CHAR DECLSPEC_ALIGN(8) Buffer[32]; NTSTATUS Status; - /* Size must be aligned to 8 bytes */ - Status = RtlEncryptMemory(Buffer, 7, RTL_ENCRYPT_OPTION_SAME_PROCESS); + /* Size must be aligned to 8 bytes (aka RTL_ENCRYPT_MEMORY_SIZE) */ + RtlCopyMemory(Buffer, TestData, sizeof(Buffer)); + Status = RtlEncryptMemory(Buffer, 7, OptionFlags); ok_ntstatus(Status, STATUS_INVALID_PARAMETER); - /* Buffer must not be aligned to 8 bytes */ - Status = RtlEncryptMemory(&Buffer[1], 8, RTL_ENCRYPT_OPTION_SAME_PROCESS); + /* Buffer can be unaligned */ + RtlCopyMemory(Buffer, TestData, sizeof(Buffer)); + Status = RtlEncryptMemory(&Buffer[1], 8, OptionFlags); + ok_ntstatus(Status, STATUS_SUCCESS); + Status = RtlDecryptMemory(&Buffer[1], 8, OptionFlags); ok_ntstatus(Status, STATUS_SUCCESS); + ok(RtlEqualMemory(Buffer, TestData, sizeof(Buffer)) == 1, + "OptionFlags=%lu, Buffer='%s', TestData='%s'\n", + OptionFlags, Buffer, TestData); RtlCopyMemory(Buffer, TestData, sizeof(Buffer)); - Status = RtlEncryptMemory(Buffer, sizeof(Buffer), RTL_ENCRYPT_OPTION_SAME_PROCESS); + Status = RtlEncryptMemory(Buffer, sizeof(Buffer), OptionFlags); ok_ntstatus(Status, STATUS_SUCCESS); ok_int(RtlEqualMemory(Buffer, TestData, sizeof(Buffer)), 0); - Status = RtlDecryptMemory(Buffer, sizeof(Buffer), RTL_ENCRYPT_OPTION_SAME_PROCESS); + Status = RtlDecryptMemory(Buffer, sizeof(Buffer), OptionFlags); ok_ntstatus(Status, STATUS_SUCCESS); ok_int(RtlEqualMemory(Buffer, TestData, sizeof(Buffer)), 1); +} + +void TestCrossProcessDecrypt(PSTR Param) +{ + UCHAR Buffer[32] = { 0 }; + ULONG OptionFlags; + PSTR StrData; + ULONG i; + NTSTATUS Status; + + OptionFlags = Param[3] == '1' ? RTL_ENCRYPT_OPTION_CROSS_PROCESS : RTL_ENCRYPT_OPTION_SAME_LOGON; + + /* Convert the HEX string to binary ('-cp<1|2>:<data>') */ + StrData = Param + 5; + for (i = 0; i < sizeof(Buffer); i++) + { + UINT x; + sscanf(&StrData[2 * i], "%02X", &x); + Buffer[i] = (UCHAR)x; + } + + /* Decrypt the data */ + Status = RtlDecryptMemory(Buffer, sizeof(Buffer), OptionFlags); + ok_ntstatus(Status, STATUS_SUCCESS); + ok_int(RtlEqualMemory(Buffer, TestData, sizeof(Buffer)), 1); +} + +void TestCrossProcessEncrypt(ULONG OptionFlags) +{ + UCHAR Buffer[32]; + CHAR CmdLine[MAX_PATH]; + PSTR StrBuffer; + NTSTATUS Status; + ULONG i; + INT result; + + /* Encrypt the test string */ + RtlCopyMemory(Buffer, TestData, sizeof(Buffer)); + Status = RtlEncryptMemory(Buffer, sizeof(Buffer), OptionFlags); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Start building a command line */ + sprintf(CmdLine, "advapi32_apitest.exe RtlEncryptMemory -cp%lu:", OptionFlags); + StrBuffer = CmdLine + strlen(CmdLine); + + /* Convert encrypted data into a hex string */ + for (i = 0; i < sizeof(Buffer); i++) + { + sprintf(&StrBuffer[2 * i], "%02X", Buffer[i]); + } + + result = system(CmdLine); + ok_int(result, 0); +} + +START_TEST(RtlEncryptMemory) +{ + CHAR Buffer[8] = { 0 }; + PSTR CommandLine, Param; + NTSTATUS Status; + + /* Check recursive call */ + CommandLine = GetCommandLineA(); + Param = strstr(CommandLine, "-cp"); + if (Param != NULL) + { + TestCrossProcessDecrypt(Param); + return; + } + + TestEncrypt(RTL_ENCRYPT_OPTION_SAME_PROCESS); + TestEncrypt(RTL_ENCRYPT_OPTION_CROSS_PROCESS); + TestEncrypt(RTL_ENCRYPT_OPTION_SAME_LOGON); + + Status = RtlEncryptMemory(Buffer, sizeof(Buffer), 4); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + TestCrossProcessEncrypt(RTL_ENCRYPT_OPTION_CROSS_PROCESS); + TestCrossProcessEncrypt(RTL_ENCRYPT_OPTION_SAME_LOGON); }

1 0

[reactos] 01/01: [SHELL32] Call SHAutoComplete on 'Run' dialog
by Katayama Hirofumi MZ 25 Sep '20

25 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed02f41af5a6013916bf3… commit ed02f41af5a6013916bf37d749042bfae6b61bb2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 25 15:59:30 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Sep 25 15:59:30 2020 +0900 [SHELL32] Call SHAutoComplete on 'Run' dialog CORE-9281 --- dll/win32/shell32/dialogs/dialogs.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index 3d584480cf7..aa71de0b1f4 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -500,6 +500,8 @@ static void EnableOkButtonFromEditContents(HWND hwnd) static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { RUNFILEDLGPARAMS *prfdp = (RUNFILEDLGPARAMS *)GetWindowLongPtrW(hwnd, DWLP_USER); + HWND hwndCombo, hwndEdit; + COMBOBOXINFO ComboInfo; switch (message) { @@ -538,9 +540,16 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA // SendMessageW(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)prfdp->hIcon); SendMessageW(GetDlgItem(hwnd, IDC_RUNDLG_ICON), STM_SETICON, (WPARAM)prfdp->hIcon, 0); - FillList(GetDlgItem(hwnd, IDC_RUNDLG_EDITPATH), NULL, 0, (prfdp->uFlags & RFF_NODEFAULT) == 0); + hwndCombo = GetDlgItem(hwnd, IDC_RUNDLG_EDITPATH); + FillList(hwndCombo, NULL, 0, (prfdp->uFlags & RFF_NODEFAULT) == 0); EnableOkButtonFromEditContents(hwnd); - SetFocus(GetDlgItem(hwnd, IDC_RUNDLG_EDITPATH)); + + ComboInfo.cbSize = sizeof(ComboInfo); + GetComboBoxInfo(hwndCombo, &ComboInfo); + hwndEdit = ComboInfo.hwndItem; + SHAutoComplete(hwndEdit, SHACF_FILESYSTEM | SHACF_FILESYS_ONLY | SHACF_URLALL); + + SetFocus(hwndCombo); return TRUE; case WM_COMMAND:

1 0

[reactos] 01/01: [COMCTL32] IP Address controls follow-up of #3212 (3f30b1e)
by Katayama Hirofumi MZ 25 Sep '20

25 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a8fb87d845482db5909f… commit 0a8fb87d845482db5909fe9034e0d5ebac8c5b3c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 25 15:32:58 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Sep 25 15:32:58 2020 +0900 [COMCTL32] IP Address controls follow-up of #3212 (3f30b1e) The rightest field didn't work Left arrow key. CORE-3479 --- dll/win32/comctl32/ipaddress.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dll/win32/comctl32/ipaddress.c b/dll/win32/comctl32/ipaddress.c index 9f1b2c08c38..ece99e9a5d7 100644 --- a/dll/win32/comctl32/ipaddress.c +++ b/dll/win32/comctl32/ipaddress.c @@ -453,9 +453,6 @@ static BOOL IPADDRESS_GotoNextField (const IPADDRESS_INFO *infoPtr, int cur, int end = -1; SendMessageW(next->EditHwnd, EM_SETSEL, start, end); } -#ifdef __REACTOS__ - SetFocus(next->EditHwnd); -#endif return TRUE; } @@ -599,8 +596,9 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) #ifdef __REACTOS__ case WM_GETDLGCODE: { - LRESULT ret = DefWindowProcW(hwnd, uMsg, wParam, lParam); - return ret | DLGC_WANTTAB; + LRESULT result = CallWindowProcW(part->OrigProc, hwnd, uMsg, wParam, lParam); + result |= DLGC_WANTALLKEYS | DLGC_WANTCHARS | DLGC_WANTTAB; + return result; } #endif }

1 0

[reactos] 01/01: [SETUP][MMSYS][SHELL32] Adding missing French translation (and update existing ones) (#3232)
by Kyle Katarn 24 Sep '20

24 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9754fa5d6a1e32aca49a… commit b9754fa5d6a1e32aca49abeaf1576cff57988591 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Fri Sep 25 01:39:31 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 25 01:39:31 2020 +0200 [SETUP][MMSYS][SHELL32] Adding missing French translation (and update existing ones) (#3232) Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- base/setup/reactos/lang/fr-FR.rc | 130 +++++++++++++++++++-------------------- dll/cpl/mmsys/lang/fr-FR.rc | 6 +- dll/win32/shell32/lang/fr-FR.rc | 2 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/base/setup/reactos/lang/fr-FR.rc b/base/setup/reactos/lang/fr-FR.rc index cb6c0bf7365..fe38ddcf1ac 100644 --- a/base/setup/reactos/lang/fr-FR.rc +++ b/base/setup/reactos/lang/fr-FR.rc @@ -15,11 +15,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP - AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "Click Next to setup the devices.", IDC_STATIC, 7, 1280, 297, 8 + AUTORADIOBUTTON "Installer ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Installer une nouvelle copie de ReactOS. Cette option ne conservera pas vos données, paramètres et programmes. Vous pouvez effectuer des modifications sur les disques et les partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP + AUTORADIOBUTTON "Mettre à jour ou réparer ReactOS", IDC_UPDATE, 7, 50, 277, 10 + LTEXT "Mettre à jour ou réparer une copie existante de ReactOS. Cette option conserve vos données, paramètres et programmes. Cette option est seulement disponible si ReactOS est déjà installé sur cet ordinateur.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP + LTEXT "Appuyer sur Suivant pour configurer les périphériques.", IDC_STATIC, 7, 1280, 297, 8 END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -27,10 +27,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 + LTEXT "L'installation de ReactOS peut mettre à niveau les installations disponibles de ReactOS listées ci-dessous, ou, si une installation de ReactOS est endommagée, l'installation peut essayer de la réparer.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 - PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 + PUSHBUTTON "&Ne pas mettre à jour", IDC_SKIPUPGRADE, 230, 128, 80, 14 + LTEXT "Appuyer sur Suivant pour mettre à niveau l'installation sélectionnée, ou sur 'Ne pas mettre à niveau' pour continuer une nouvelle installation.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -38,13 +38,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Computer:", IDC_STATIC, 20, 15, 80, 10 + LTEXT "Ordinateur :", IDC_STATIC, 20, 15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80 - LTEXT "Display:", IDC_STATIC, 20, 35, 80, 10 + LTEXT "Affichage :", IDC_STATIC, 20, 35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 - LTEXT "Keyboard:", IDC_STATIC, 20, 55, 80, 10 + LTEXT "Clavier :", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 - LTEXT "Click Next to continue setup on the installation device.", IDC_STATIC, 7, 128, 297, 8 + LTEXT "Appuyer sur Suivant pour continuer l'installation.", IDC_STATIC, 7, 128, 297, 8 END IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -53,42 +53,42 @@ CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 - PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 15 - PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 15 - PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED - PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 15 + PUSHBUTTON "&Créer", IDC_PARTCREATE, 7, 122, 50, 15 + PUSHBUTTON "&Supprimer", IDC_PARTDELETE, 63, 122, 50, 15 + PUSHBUTTON "&Pilote", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED + PUSHBUTTON "&Options avancées...", IDC_PARTMOREOPTS, 230, 122, 80, 15 // LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Create Partition" +CAPTION "Créer une partition" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13 - CONTROL "Create and format partition", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57 - LTEXT "Size:", IDC_STATIC, 13, 24, 27, 9 + CONTROL "Créer et formatter une partition", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57 + LTEXT "Taille :", IDC_STATIC, 13, 24, 27, 9 EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP - LTEXT "GB", IDC_UNIT, 117, 24, 14, 9 - LTEXT "File System:", IDC_STATIC, 13, 46, 42, 9 + LTEXT "Go", IDC_UNIT, 117, 24, 14, 9 + LTEXT "Système de fichier :", IDC_STATIC, 13, 46, 42, 9 CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50 PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Cancel", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Annuler", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Advanced Partition Settings" +CAPTION "Paramètres de partition avancés" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 + CONTROL "Dossier d'installation", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 + CONTROL "Installation du chargeur de démarrage", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 + CONTROL "Installer le chargeur de démarrage sur le disque dur (MBR et VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 + CONTROL "Installer le chargeur de démarrage sur le disque dur (VBR uniquement)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 + CONTROL "Ne pas installer le chargeur de démarrage", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Annuler", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -96,25 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + LTEXT "Type d'installation :", IDC_STATIC, 18, 5, 74, 11 EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + LTEXT "Source d'installation :", IDC_STATIC, 18, 17, 74, 11 EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + LTEXT "Architecture :", IDC_STATIC, 18, 29, 74, 11 EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + LTEXT "Ordinateur :", IDC_STATIC, 18, 41, 74, 11 EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + LTEXT "Affichage :", IDC_STATIC, 18, 53, 74, 11 EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + LTEXT "Clavier :", IDC_STATIC, 18, 65, 74, 11 EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + LTEXT "Volume de destination :", IDC_STATIC, 18, 77, 74, 11 EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + LTEXT "Dossier de destination :", IDC_STATIC, 18, 89, 74, 11 EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + AUTOCHECKBOX "Je confirme que tous les paramètres sont corrects. Je reconnais également que\nReactOS est un logiciel dans un état de qualité Alpha et peut endommager mon ordinateur ou corrompre mes données.", IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE - LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 + LTEXT "Merci de confirmer que tous les paramètres d'installation sont corrects,\npuis appuyer sur Installer pour démarrer le processus d'installation.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -122,7 +122,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 + LTEXT "Fichiers d'installation...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 END @@ -132,44 +132,44 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 + LTEXT "Finalisation de l'assistant d'installation de ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "Vous avez complété avec succès la première étape d'installation de ReactOS.", IDC_STATIC, 20, 50, 277, 10 + LTEXT "Si vous appuyez sur Terminer, votre ordinateur va redémarrer.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "S'il y a un CD dans le lecteur, retirez le. Appuyez ensuite sur Terminer pour redémarrer votre ordinateur.", IDC_STATIC, 10, 180, 297, 20 END STRINGTABLE BEGIN - IDS_TYPETITLE "Welcome to ReactOS Setup" - IDS_TYPESUBTITLE "Choose setup type." - IDS_DEVICETITLE "Setup the basic devices" - IDS_DEVICESUBTITLE "Set the settings of display and keyboard." - IDS_DRIVETITLE "Setup the installation partition and system folder" - IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot loader." - IDS_PROCESSTITLE "Setup partition, copy files and setup system" - IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" - IDS_RESTARTTITLE "First stage of setup finished" - IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" - IDS_SUMMARYTITLE "Installation Summary" - IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" - IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" - IDS_ABORTSETUP2 "Abort installation?" - IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." + IDS_TYPETITLE "Bienvenue dans l'installation de ReactOS" + IDS_TYPESUBTITLE "Choisissez un type d'installation." + IDS_DEVICETITLE "Configurer les périphériques de base." + IDS_DEVICESUBTITLE "Configurer l'affichage et le clavier." + IDS_DRIVETITLE "Configurer la partition d'installation et le dossier système." + IDS_DRIVESUBTITLE "Préparer la partition d'installation, le dossier système et le chargeur de démarrage." + IDS_PROCESSTITLE "Configurer la partition, copier les fichiers et configurer le système." + IDS_PROCESSSUBTITLE "Créer et formatter la partition, copier les fichiers, installer et configurer le chargeur de démarrage." + IDS_RESTARTTITLE "Première étape de configuration terminée" + IDS_RESTARTSUBTITLE "La première étape de l'installation est terminée. Veuillez redémarrer pour continuer avec la seconde étape." + IDS_SUMMARYTITLE "Résumé de l'installation" + IDS_SUMMARYSUBTITLE "Lister les propriétés d'installation à vérifier avant application sur le périphérique d'installation." + IDS_ABORTSETUP "ReactOS n'est pas complètement installé sur votre ordinateur. Si vous quittez l'installation maintenant, vous devrez lancer l'installation de nouveau pour installer ReactOS. Voulez-vous quitter ?" + IDS_ABORTSETUP2 "Abandonner l'installation ?" + IDS_NO_TXTSETUP_SIF "Impossible de trouver 'txtsetup.sif'.\nL'installation ne peut continuer." IDS_CAPTION "Installation de ReactOS" END STRINGTABLE BEGIN - IDS_INSTALLATION_NAME "Name" - IDS_INSTALLATION_PATH "Installation Path" - IDS_INSTALLATION_VENDOR "Vendor Name" + IDS_INSTALLATION_NAME "Nom" + IDS_INSTALLATION_PATH "Chemin d'installation" + IDS_INSTALLATION_VENDOR "Nom du fabricant" END STRINGTABLE BEGIN - IDS_PARTITION_NAME "Name" + IDS_PARTITION_NAME "Nom" IDS_PARTITION_TYPE "Type" - IDS_PARTITION_SIZE "Size" - IDS_PARTITION_STATUS "Status" + IDS_PARTITION_SIZE "Taille" + IDS_PARTITION_STATUS "Statut" END diff --git a/dll/cpl/mmsys/lang/fr-FR.rc b/dll/cpl/mmsys/lang/fr-FR.rc index 8aadb3e42de..74ea03e1ec7 100644 --- a/dll/cpl/mmsys/lang/fr-FR.rc +++ b/dll/cpl/mmsys/lang/fr-FR.rc @@ -27,13 +27,13 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Sons" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Un schéma sons est un ensemble de sons appliqués aux évènements de ReactOS et aux programmes. Vous pouvez sélectionner un schéma existant ou en enregistrer que vous avez modifié.", -1, 8, 7, 230, 40 + LTEXT "Un schéma sons est un ensemble de sons appliqués aux événements de ReactOS et aux programmes. Vous pouvez sélectionner un schéma existant ou en enregistrer un que vous avez modifié.", -1, 8, 7, 230, 40 LTEXT "S&chéma sons :", -1, 8, 42, 150, 17 COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Enregistrer sous...", IDC_SAVEAS_BTN, 120, 70, 65, 15 PUSHBUTTON "Supprimer", IDC_DELETE_BTN, 188, 70, 50, 15 - LTEXT "Pour changer les sons, cliquez sur un évènement de programme dans la liste suivante, puis sélectionnez un son à appliquer. Vous pouvez enregistrer les changements en tant que nouveau schéma son.", -1, 8, 90, 230, 40 - LTEXT "Évènements des programmes :", -1, 8, 118, 150, 17 + LTEXT "Pour changer les sons, cliquez sur un événement de programme dans la liste suivante, puis sélectionnez un son à appliquer. Vous pouvez enregistrer les changements en tant que nouveau schéma sons.", -1, 8, 90, 230, 40 + LTEXT "Événements des programmes :", -1, 8, 118, 150, 17 CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "&Sons :", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index acf02ca4a6b..f709c10405e 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -740,7 +740,7 @@ BEGIN IDS_SHV_COLUMN_DELFROM "Localisation d'origine" IDS_SHV_COLUMN_DELDATE "Date de suppression" IDS_SHV_COLUMN_FONTTYPE "Type de police" - IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_COLUMN_WORKGROUP "Groupe de travail" IDS_SHV_COLUMN_NETLOCATION "Emplacement réseau" IDS_SHV_COLUMN_DOCUMENTS "Documents" IDS_SHV_COLUMN_STATUS "État"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs