Ros-diffs August 2020

ros-diffs@reactos.org

27 participants
188 discussions

[reactos] 01/02: [NTOSKRNL_VISTA][XDK] Implement IoSetMasterIrpStatus

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d9864ca6c54dc9bb25eb8… commit d9864ca6c54dc9bb25eb89fe447919a421753e28 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Aug 29 05:44:34 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Aug 29 05:44:34 2020 +0300 [NTOSKRNL_VISTA][XDK] Implement IoSetMasterIrpStatus --- sdk/include/xdk/iofuncs.h | 24 +++++++++++++----------- sdk/lib/drivers/ntoskrnl_vista/io.c | 23 ++++++++++++++++++++++- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/sdk/include/xdk/iofuncs.h b/sdk/include/xdk/iofuncs.h index fc1c10cdb03..271455eca81 100644 --- a/sdk/include/xdk/iofuncs.h +++ b/sdk/include/xdk/iofuncs.h @@ -2332,19 +2332,16 @@ IoSetShareAccessEx( _Out_ PSHARE_ACCESS ShareAccess, _In_ PBOOLEAN WritePermission); -NTKERNELAPI ULONG NTAPI IoSizeofWorkItem(VOID); -NTKERNELAPI VOID NTAPI IoInitializeWorkItem( _In_ PVOID IoObject, _Out_ PIO_WORKITEM IoWorkItem); -NTKERNELAPI VOID NTAPI IoUninitializeWorkItem( @@ -2360,20 +2357,18 @@ IoQueueWorkItemEx( _In_ WORK_QUEUE_TYPE QueueType, _In_opt_ __drv_aliasesMem PVOID Context); -NTKERNELAPI +// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT IO_PRIORITY_HINT NTAPI IoGetIoPriorityHint( _In_ PIRP Irp); -// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT NTSTATUS NTAPI IoSetIoPriorityHint( _In_ PIRP Irp, _In_ IO_PRIORITY_HINT PriorityHint); -NTKERNELAPI NTSTATUS NTAPI IoAllocateSfioStreamIdentifier( @@ -2388,7 +2383,6 @@ IoGetSfioStreamIdentifier( _In_ PFILE_OBJECT FileObject, _In_ PVOID Signature); -NTKERNELAPI NTSTATUS NTAPI IoFreeSfioStreamIdentifier( @@ -2445,7 +2439,6 @@ IoUpdateDiskGeometry( _In_ struct _DISK_GEOMETRY_EX* OldDiskGeometry, _In_ struct _DISK_GEOMETRY_EX* NewDiskGeometry); -NTKERNELAPI PTXN_PARAMETER_BLOCK NTAPI IoGetTransactionParameterBlock( @@ -2471,14 +2464,12 @@ IoCreateFileEx( _In_ ULONG Options, _In_opt_ PIO_DRIVER_CREATE_CONTEXT DriverContext); -NTKERNELAPI NTSTATUS NTAPI IoSetIrpExtraCreateParameter( _Inout_ PIRP Irp, _In_ struct _ECP_LIST *ExtraCreateParameter); -NTKERNELAPI VOID NTAPI IoClearIrpExtraCreateParameter( @@ -2491,7 +2482,6 @@ IoGetIrpExtraCreateParameter( _In_ PIRP Irp, _Outptr_result_maybenull_ struct _ECP_LIST **ExtraCreateParameter); -NTKERNELAPI BOOLEAN NTAPI IoIsFileObjectIgnoringSharing( @@ -2608,6 +2598,8 @@ $endif (_NTIFS_) #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ #if (NTDDI_VERSION >= NTDDI_WIN8) + +$if (_WDMDDK_) _IRQL_requires_max_(PASSIVE_LEVEL) _Must_inspect_result_ // NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT @@ -2634,6 +2626,16 @@ IoGetDeviceInterfacePropertyData ( _Out_writes_bytes_to_(Size, *RequiredSize) PVOID Data, _Out_ PULONG RequiredSize, _Out_ PDEVPROPTYPE Type); +$endif (_WDMDDK_) +$if (_NTDDK_) + +// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT +VOID +IoSetMasterIrpStatus( + _Inout_ PIRP MasterIrp, + _In_ NTSTATUS Status); +$endif (_NTDDK_) + #endif /* (NTDDI_VERSION >= NTDDI_WIN8) */ $if (_WDMDDK_) diff --git a/sdk/lib/drivers/ntoskrnl_vista/io.c b/sdk/lib/drivers/ntoskrnl_vista/io.c index 3f58ce9574c..5008f7a981d 100644 --- a/sdk/lib/drivers/ntoskrnl_vista/io.c +++ b/sdk/lib/drivers/ntoskrnl_vista/io.c @@ -107,4 +107,25 @@ IoGetIoPriorityHint( _In_ PIRP Irp) { return IoPriorityNormal; -} \ No newline at end of file +} + +NTKERNELAPI +VOID +IoSetMasterIrpStatus( + _Inout_ PIRP MasterIrp, + _In_ NTSTATUS Status) +{ + NTSTATUS MasterStatus = MasterIrp->IoStatus.Status; + + if (Status == STATUS_FT_READ_FROM_COPY) + { + return; + } + + if ((Status == STATUS_VERIFY_REQUIRED) || + (MasterStatus == STATUS_SUCCESS && !NT_SUCCESS(Status)) || + (!NT_SUCCESS(MasterStatus) && !NT_SUCCESS(Status) && Status > MasterStatus)) + { + MasterIrp->IoStatus.Status = Status; + } +}

4 years, 3 months

[reactos] 01/01: [NTOSKRNL_VISTA] Implement/stubplement more Etw, Io, Ke, Po functions CORE-17129

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5e242c556646f8905485a… commit 5e242c556646f8905485afbb5b9fd9fc8da6af5a Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Aug 28 15:28:45 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Aug 28 15:28:45 2020 +0300 [NTOSKRNL_VISTA] Implement/stubplement more Etw, Io, Ke, Po functions CORE-17129 --- sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt | 2 + sdk/lib/drivers/ntoskrnl_vista/etw.c | 46 +++++++++++++ sdk/lib/drivers/ntoskrnl_vista/io.c | 93 +++++++++++++++++++++++++-- sdk/lib/drivers/ntoskrnl_vista/ke.c | 40 ++++++++++-- sdk/lib/drivers/ntoskrnl_vista/po.c | 43 +++++++++++++ 5 files changed, 214 insertions(+), 10 deletions(-) diff --git a/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt b/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt index 0fd8fd8c7e7..5ce01354762 100644 --- a/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt +++ b/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt @@ -4,8 +4,10 @@ add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-DUNICODE -D_UNICODE -D__NTOSKRNL__ -D_NTOSKRNL_ -D_NTSYSTEM_) list(APPEND SOURCE + etw.c fsrtl.c io.c + po.c ke.c rtl.c) diff --git a/sdk/lib/drivers/ntoskrnl_vista/etw.c b/sdk/lib/drivers/ntoskrnl_vista/etw.c new file mode 100644 index 00000000000..903b0497297 --- /dev/null +++ b/sdk/lib/drivers/ntoskrnl_vista/etw.c @@ -0,0 +1,46 @@ +/* + * PROJECT: ReactOS Kernel - Vista+ APIs + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Etw functions of Vista+ + * COPYRIGHT: 2020 Victor Perevertkin (victor.perevertkin(a)reactos.org) + */ + +#include <ntdef.h> +#include <ntifs.h> + +_IRQL_requires_max_(HIGH_LEVEL) +NTSTATUS +NTKERNELAPI +NTAPI +EtwWrite( + _In_ REGHANDLE RegHandle, + _In_ PCEVENT_DESCRIPTOR EventDescriptor, + _In_opt_ LPCGUID ActivityId, + _In_ ULONG UserDataCount, + _In_reads_opt_(UserDataCount) PEVENT_DATA_DESCRIPTOR UserData) +{ + return STATUS_NOT_IMPLEMENTED; +} + +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSTATUS +NTKERNELAPI +NTAPI +EtwRegister( + _In_ LPCGUID ProviderId, + _In_opt_ PETWENABLECALLBACK EnableCallback, + _In_opt_ PVOID CallbackContext, + _Out_ PREGHANDLE RegHandle) +{ + return STATUS_NOT_IMPLEMENTED; +} + +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSTATUS +NTKERNELAPI +NTAPI +EtwUnregister( + _In_ REGHANDLE RegHandle) +{ + return STATUS_NOT_IMPLEMENTED; +} diff --git a/sdk/lib/drivers/ntoskrnl_vista/io.c b/sdk/lib/drivers/ntoskrnl_vista/io.c index 1d88cbb68f1..3f58ce9574c 100644 --- a/sdk/lib/drivers/ntoskrnl_vista/io.c +++ b/sdk/lib/drivers/ntoskrnl_vista/io.c @@ -1,14 +1,23 @@ /* - * PROJECT: ReactOS Kernel - Vista+ APIs - * LICENSE: GPL v2 - See COPYING in the top level directory - * FILE: lib/drivers/ntoskrnl_vista/io.c - * PURPOSE: Io functions of Vista+ - * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + * PROJECT: ReactOS Kernel - Vista+ APIs + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Io functions of Vista+ + * COPYRIGHT: 2016 Pierre Schweitzer (pierre(a)reactos.org) + * 2020 Victor Perevertkin (victor.perevertkin(a)reactos.org) */ #include <ntdef.h> #include <ntifs.h> +typedef struct _EX_WORKITEM_CONTEXT +{ + PIO_WORKITEM WorkItem; + PIO_WORKITEM_ROUTINE_EX WorkItemRoutineEx; + PVOID Context; +} EX_WORKITEM_CONTEXT, *PEX_WORKITEM_CONTEXT; + +#define TAG_IOWI 'IWOI' + NTKERNELAPI NTSTATUS NTAPI @@ -25,3 +34,77 @@ IoGetIrpExtraCreateParameter(IN PIRP Irp, *ExtraCreateParameter = Irp->UserBuffer; return STATUS_SUCCESS; } + +_Function_class_(IO_WORKITEM_ROUTINE) +static +VOID +NTAPI +IopWorkItemExCallback( + PDEVICE_OBJECT DeviceObject, + PVOID Ctx) +{ + PEX_WORKITEM_CONTEXT context = Ctx; + + context->WorkItemRoutineEx(DeviceObject, context->Context, context->WorkItem); + ExFreePoolWithTag(context, TAG_IOWI); +} + +NTKERNELAPI +VOID +NTAPI +IoQueueWorkItemEx( + _Inout_ PIO_WORKITEM IoWorkItem, + _In_ PIO_WORKITEM_ROUTINE_EX WorkerRoutine, + _In_ WORK_QUEUE_TYPE QueueType, + _In_opt_ __drv_aliasesMem PVOID Context) +{ + PEX_WORKITEM_CONTEXT newContext = ExAllocatePoolWithTag(NonPagedPoolMustSucceed, sizeof(*newContext), TAG_IOWI); + newContext->WorkItem = IoWorkItem; + newContext->WorkItemRoutineEx = WorkerRoutine; + newContext->Context = Context; + + IoQueueWorkItem(IoWorkItem, IopWorkItemExCallback, QueueType, Context); +} + +_IRQL_requires_max_(PASSIVE_LEVEL) +_Must_inspect_result_ +NTKERNELAPI +NTSTATUS +NTAPI +IoGetDevicePropertyData( + _In_ PDEVICE_OBJECT Pdo, + _In_ CONST DEVPROPKEY *PropertyKey, + _In_ LCID Lcid, + _Reserved_ ULONG Flags, + _In_ ULONG Size, + _Out_ PVOID Data, + _Out_ PULONG RequiredSize, + _Out_ PDEVPROPTYPE Type) +{ + return STATUS_NOT_IMPLEMENTED; +} + +_IRQL_requires_max_(PASSIVE_LEVEL) +_Must_inspect_result_ +NTKERNELAPI +NTSTATUS +IoSetDeviceInterfacePropertyData( + _In_ PUNICODE_STRING SymbolicLinkName, + _In_ CONST DEVPROPKEY *PropertyKey, + _In_ LCID Lcid, + _In_ ULONG Flags, + _In_ DEVPROPTYPE Type, + _In_ ULONG Size, + _In_reads_bytes_opt_(Size) PVOID Data) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTKERNELAPI +IO_PRIORITY_HINT +NTAPI +IoGetIoPriorityHint( + _In_ PIRP Irp) +{ + return IoPriorityNormal; +} \ No newline at end of file diff --git a/sdk/lib/drivers/ntoskrnl_vista/ke.c b/sdk/lib/drivers/ntoskrnl_vista/ke.c index e807225d87b..2f982659393 100644 --- a/sdk/lib/drivers/ntoskrnl_vista/ke.c +++ b/sdk/lib/drivers/ntoskrnl_vista/ke.c @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS Kernel - Vista+ APIs - * LICENSE: GPL v2 - See COPYING in the top level directory - * FILE: lib/drivers/ntoskrnl_vista/ke.c - * PURPOSE: Ke functions of Vista+ - * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + * PROJECT: ReactOS Kernel - Vista+ APIs + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Ke functions of Vista+ + * COPYRIGHT: 2016 Pierre Schweitzer (pierre(a)reactos.org) + * 2020 Victor Perevertkin (victor.perevertkin(a)reactos.org) */ #include <ntdef.h> @@ -25,3 +25,33 @@ KeQueryActiveProcessorCount(OUT PKAFFINITY ActiveProcessors OPTIONAL) RtlInitializeBitMap(&Bitmap, (PULONG)&ActiveMap, sizeof(ActiveMap) * 8); return RtlNumberOfSetBits(&Bitmap); } + +NTKERNELAPI +USHORT +NTAPI +KeQueryHighestNodeNumber() +{ + return 0; +} + +NTKERNELAPI +USHORT +NTAPI +KeGetCurrentNodeNumber() +{ + return 0; +} + +_IRQL_requires_max_(DISPATCH_LEVEL) +NTKERNELAPI +BOOLEAN +NTAPI +KeSetCoalescableTimer( + _Inout_ PKTIMER Timer, + _In_ LARGE_INTEGER DueTime, + _In_ ULONG Period, + _In_ ULONG TolerableDelay, + _In_opt_ PKDPC Dpc) +{ + return KeSetTimerEx(Timer, DueTime, Period, Dpc); +} diff --git a/sdk/lib/drivers/ntoskrnl_vista/po.c b/sdk/lib/drivers/ntoskrnl_vista/po.c new file mode 100644 index 00000000000..22d44bdd892 --- /dev/null +++ b/sdk/lib/drivers/ntoskrnl_vista/po.c @@ -0,0 +1,43 @@ +/* + * PROJECT: ReactOS Kernel - Vista+ APIs + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Po functions of Vista+ + * COPYRIGHT: 2020 Victor Perevertkin (victor.perevertkin(a)reactos.org) + */ + +#include <ntdef.h> +#include <ntifs.h> + +NTKERNELAPI +NTSTATUS +NTAPI +PoRegisterPowerSettingCallback( + _In_opt_ PDEVICE_OBJECT DeviceObject, + _In_ LPCGUID SettingGuid, + _In_ PPOWER_SETTING_CALLBACK Callback, + _In_opt_ PVOID Context, + _Outptr_opt_ PVOID *Handle) +{ + return STATUS_NOT_IMPLEMENTED; +} + +_IRQL_requires_max_(APC_LEVEL) +NTKERNELAPI +NTSTATUS +NTAPI +PoUnregisterPowerSettingCallback( + _Inout_ PVOID Handle) +{ + return STATUS_NOT_IMPLEMENTED; +} + +_IRQL_requires_max_(DISPATCH_LEVEL) +NTKERNELAPI +BOOLEAN +NTAPI +PoQueryWatchdogTime( + _In_ PDEVICE_OBJECT Pdo, + _Out_ PULONG SecondsRemaining) +{ + return FALSE; +} \ No newline at end of file

4 years, 3 months

[reactos] 05/05: [PSDK] Restore the order of definitions in ntiologc.h Addendum to 0758710

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17dc5f75845469ad73582… commit 17dc5f75845469ad7358291c16feb0a239a812bb Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Aug 28 05:54:58 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Aug 28 05:54:58 2020 +0300 [PSDK] Restore the order of definitions in ntiologc.h Addendum to 0758710 --- sdk/include/psdk/ntiologc.h | 80 +++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 36 deletions(-) diff --git a/sdk/include/psdk/ntiologc.h b/sdk/include/psdk/ntiologc.h index 2fe89671338..57d02b43c11 100644 --- a/sdk/include/psdk/ntiologc.h +++ b/sdk/include/psdk/ntiologc.h @@ -25,63 +25,40 @@ #define FACILITY_IO_ERROR_CODE 0x4 #define FACILITY_MCA_ERROR_CODE 0x5 +#define IO_ERR_RETRY_SUCCEEDED ((NTSTATUS)0x00040001L) #define IO_ERR_INSUFFICIENT_RESOURCES ((NTSTATUS)0xC0040002L) +#define IO_ERR_CONFIGURATION_ERROR ((NTSTATUS)0xC0040003L) #define IO_ERR_DRIVER_ERROR ((NTSTATUS)0xC0040004L) +#define IO_ERR_PARITY ((NTSTATUS)0xC0040005L) #define IO_ERR_SEEK_ERROR ((NTSTATUS)0xC0040006L) #define IO_ERR_BAD_BLOCK ((NTSTATUS)0xC0040007L) -#define IO_ERR_TIMEOUT ((NTSTATUS)0xC0040009L) -#define IO_ERR_CONTROLLER_ERROR ((NTSTATUS)0xC004000BL) -#define IO_ERR_NOT_READY ((NTSTATUS)0xC004000FL) -#define IO_ERR_INVALID_REQUEST ((NTSTATUS)0xC0040010L) -#define IO_ERR_RESET ((NTSTATUS)0xC0040013L) -#define IO_ERR_BAD_FIRMWARE ((NTSTATUS)0xC0040019L) -#define IO_WRN_BAD_FIRMWARE ((NTSTATUS)0x8004001AL) -#define IO_WRITE_CACHE_ENABLED ((NTSTATUS)0x80040020L) -#define IO_RECOVERED_VIA_ECC ((NTSTATUS)0x80040021L) -#define IO_WRITE_CACHE_DISABLED ((NTSTATUS)0x80040022L) -#define IO_WARNING_PAGING_FAILURE ((NTSTATUS)0x80040033L) -#define IO_WRN_FAILURE_PREDICTED ((NTSTATUS)0x80040034L) -#define IO_WARNING_ALLOCATION_FAILED ((NTSTATUS)0x80040038L) -#define IO_WARNING_DUPLICATE_SIGNATURE ((NTSTATUS)0x8004003AL) -#define IO_WARNING_DUPLICATE_PATH ((NTSTATUS)0x8004003BL) -#define IO_WARNING_WRITE_FUA_PROBLEM ((NTSTATUS)0x80040084L) -#define IO_WARNING_VOLUME_LOST_DISK_EXTENT ((NTSTATUS)0x8004008EL) -#define IO_WARNING_DEVICE_HAS_INTERNAL_DUMP ((NTSTATUS)0x8004008FL) -#define IO_WARNING_SOFT_THRESHOLD_REACHED ((NTSTATUS)0x80040090L) -#define IO_WARNING_SOFT_THRESHOLD_REACHED_EX ((NTSTATUS)0x80040091L) -#define IO_WARNING_SOFT_THRESHOLD_REACHED_EX_LUN_LUN ((NTSTATUS)0x80040092L) -#define IO_WARNING_SOFT_THRESHOLD_REACHED_EX_LUN_POOL ((NTSTATUS)0x80040093L) -#define IO_WARNING_SOFT_THRESHOLD_REACHED_EX_POOL_LUN ((NTSTATUS)0x80040094L) -#define IO_WARNING_SOFT_THRESHOLD_REACHED_EX_POOL_POOL ((NTSTATUS)0x80040095L) -#define IO_ERROR_DISK_RESOURCES_EXHAUSTED ((NTSTATUS)0xC0040096L) -#define IO_WARNING_DISK_CAPACITY_CHANGED ((NTSTATUS)0x80040097L) -#define IO_WARNING_DISK_PROVISIONING_TYPE_CHANGED ((NTSTATUS)0x80040098L) -#define IO_WARNING_IO_OPERATION_RETRIED ((NTSTATUS)0x80040099L) -#define IO_ERROR_IO_HARDWARE_ERROR ((NTSTATUS)0xC004009AL) -#define IO_WARNING_COMPLETION_TIME ((NTSTATUS)0x8004009BL) -#define IO_WARNING_DISK_SURPRISE_REMOVED ((NTSTATUS)0x8004009DL) -#define IO_WARNING_REPEATED_DISK_GUID ((NTSTATUS)0x8004009EL) -#define IO_WARNING_DISK_FIRMWARE_UPDATED ((NTSTATUS)0x4004009FL) -#define IO_ERR_RETRY_SUCCEEDED ((NTSTATUS)0x00040001L) -#define IO_ERR_CONFIGURATION_ERROR ((NTSTATUS)0xC0040003L) -#define IO_ERR_PARITY ((NTSTATUS)0xC0040005L) #define IO_ERR_OVERRUN_ERROR ((NTSTATUS)0xC0040008L) +#define IO_ERR_TIMEOUT ((NTSTATUS)0xC0040009L) #define IO_ERR_SEQUENCE ((NTSTATUS)0xC004000AL) +#define IO_ERR_CONTROLLER_ERROR ((NTSTATUS)0xC004000BL) #define IO_ERR_INTERNAL_ERROR ((NTSTATUS)0xC004000CL) #define IO_ERR_INCORRECT_IRQL ((NTSTATUS)0xC004000DL) #define IO_ERR_INVALID_IOBASE ((NTSTATUS)0xC004000EL) +#define IO_ERR_NOT_READY ((NTSTATUS)0xC004000FL) +#define IO_ERR_INVALID_REQUEST ((NTSTATUS)0xC0040010L) #define IO_ERR_VERSION ((NTSTATUS)0xC0040011L) #define IO_ERR_LAYERED_FAILURE ((NTSTATUS)0xC0040012L) +#define IO_ERR_RESET ((NTSTATUS)0xC0040013L) #define IO_ERR_PROTOCOL ((NTSTATUS)0xC0040014L) #define IO_ERR_MEMORY_CONFLICT_DETECTED ((NTSTATUS)0xC0040015L) #define IO_ERR_PORT_CONFLICT_DETECTED ((NTSTATUS)0xC0040016L) #define IO_ERR_DMA_CONFLICT_DETECTED ((NTSTATUS)0xC0040017L) #define IO_ERR_IRQ_CONFLICT_DETECTED ((NTSTATUS)0xC0040018L) +#define IO_ERR_BAD_FIRMWARE ((NTSTATUS)0xC0040019L) +#define IO_WRN_BAD_FIRMWARE ((NTSTATUS)0x8004001AL) #define IO_ERR_DMA_RESOURCE_CONFLICT ((NTSTATUS)0xC004001BL) #define IO_ERR_INTERRUPT_RESOURCE_CONFLICT ((NTSTATUS)0xC004001CL) #define IO_ERR_MEMORY_RESOURCE_CONFLICT ((NTSTATUS)0xC004001DL) #define IO_ERR_PORT_RESOURCE_CONFLICT ((NTSTATUS)0xC004001EL) #define IO_BAD_BLOCK_WITH_NAME ((NTSTATUS)0xC004001FL) +#define IO_WRITE_CACHE_ENABLED ((NTSTATUS)0x80040020L) +#define IO_RECOVERED_VIA_ECC ((NTSTATUS)0x80040021L) +#define IO_WRITE_CACHE_DISABLED ((NTSTATUS)0x80040022L) #define IO_FILE_QUOTA_THRESHOLD ((NTSTATUS)0x40040024L) #define IO_FILE_QUOTA_LIMIT ((NTSTATUS)0x40040025L) #define IO_FILE_QUOTA_STARTED ((NTSTATUS)0x40040026L) @@ -97,19 +74,50 @@ #define IO_DUMP_DIRECT_CONFIG_FAILED ((NTSTATUS)0xC0040030L) #define IO_DUMP_PAGE_CONFIG_FAILED ((NTSTATUS)0xC0040031L) #define IO_LOST_DELAYED_WRITE ((NTSTATUS)0x80040032L) +#define IO_WARNING_PAGING_FAILURE ((NTSTATUS)0x80040033L) +#define IO_WRN_FAILURE_PREDICTED ((NTSTATUS)0x80040034L) #define IO_WARNING_INTERRUPT_STILL_PENDING ((NTSTATUS)0x80040035L) #define IO_DRIVER_CANCEL_TIMEOUT ((NTSTATUS)0x80040036L) #define IO_FILE_SYSTEM_CORRUPT_WITH_NAME ((NTSTATUS)0xC0040037L) +#define IO_WARNING_ALLOCATION_FAILED ((NTSTATUS)0x80040038L) #define IO_WARNING_LOG_FLUSH_FAILED ((NTSTATUS)0x80040039L) +#define IO_WARNING_DUPLICATE_SIGNATURE ((NTSTATUS)0x8004003AL) +#define IO_WARNING_DUPLICATE_PATH ((NTSTATUS)0x8004003BL) +#define IO_ERR_THREAD_STUCK_IN_DEVICE_DRIVER ((NTSTATUS)0xC004006CL) #define IO_ERR_PORT_TIMEOUT ((NTSTATUS)0xC0040075L) #define IO_WARNING_BUS_RESET ((NTSTATUS)0x80040076L) #define IO_INFO_THROTTLE_COMPLETE ((NTSTATUS)0x40040077L) #define IO_WARNING_RESET ((NTSTATUS)0x80040081L) +#define IO_FILE_SYSTEM_REPAIR_SUCCESS ((NTSTATUS)0x80040082L) +#define IO_FILE_SYSTEM_REPAIR_FAILED ((NTSTATUS)0xC0040083L) +#define IO_WARNING_WRITE_FUA_PROBLEM ((NTSTATUS)0x80040084L) #define IO_CDROM_EXCLUSIVE_LOCK ((NTSTATUS)0x40040085L) +#define IO_FILE_SYSTEM_TXF_RECOVERY_FAILURE ((NTSTATUS)0x80040086L) +#define IO_FILE_SYSTEM_TXF_LOG_FULL_HANDLING_FAILED ((NTSTATUS)0xC0040087L) +#define IO_FILE_SYSTEM_TXF_RESOURCE_MANAGER_RESET ((NTSTATUS)0x80040088L) +#define IO_FILE_SYSTEM_TXF_RESOURCE_MANAGER_START_FAILED ((NTSTATUS)0xC0040089L) +#define IO_FILE_SYSTEM_TXF_RESOURCE_MANAGER_SHUT_DOWN ((NTSTATUS)0xC004008AL) #define IO_LOST_DELAYED_WRITE_NETWORK_DISCONNECTED ((NTSTATUS)0x8004008BL) #define IO_LOST_DELAYED_WRITE_NETWORK_SERVER_ERROR ((NTSTATUS)0x8004008CL) #define IO_LOST_DELAYED_WRITE_NETWORK_LOCAL_DISK_ERROR ((NTSTATUS)0x8004008DL) +#define IO_WARNING_VOLUME_LOST_DISK_EXTENT ((NTSTATUS)0x8004008EL) +#define IO_WARNING_DEVICE_HAS_INTERNAL_DUMP ((NTSTATUS)0x8004008FL) +#define IO_WARNING_SOFT_THRESHOLD_REACHED ((NTSTATUS)0x80040090L) +#define IO_WARNING_SOFT_THRESHOLD_REACHED_EX ((NTSTATUS)0x80040091L) +#define IO_WARNING_SOFT_THRESHOLD_REACHED_EX_LUN_LUN ((NTSTATUS)0x80040092L) +#define IO_WARNING_SOFT_THRESHOLD_REACHED_EX_LUN_POOL ((NTSTATUS)0x80040093L) +#define IO_WARNING_SOFT_THRESHOLD_REACHED_EX_POOL_LUN ((NTSTATUS)0x80040094L) +#define IO_WARNING_SOFT_THRESHOLD_REACHED_EX_POOL_POOL ((NTSTATUS)0x80040095L) +#define IO_ERROR_DISK_RESOURCES_EXHAUSTED ((NTSTATUS)0xC0040096L) +#define IO_WARNING_DISK_CAPACITY_CHANGED ((NTSTATUS)0x80040097L) +#define IO_WARNING_DISK_PROVISIONING_TYPE_CHANGED ((NTSTATUS)0x80040098L) +#define IO_WARNING_IO_OPERATION_RETRIED ((NTSTATUS)0x80040099L) +#define IO_ERROR_IO_HARDWARE_ERROR ((NTSTATUS)0xC004009AL) +#define IO_WARNING_COMPLETION_TIME ((NTSTATUS)0x8004009BL) #define IO_WARNING_DUMP_DISABLED_DEVICE_GONE ((NTSTATUS)0x8004009CL) +#define IO_WARNING_DISK_SURPRISE_REMOVED ((NTSTATUS)0x8004009DL) +#define IO_WARNING_REPEATED_DISK_GUID ((NTSTATUS)0x8004009EL) +#define IO_WARNING_DISK_FIRMWARE_UPDATED ((NTSTATUS)0x4004009FL) #define IO_WARNING_ADAPTER_FIRMWARE_UPDATED ((NTSTATUS)0x400400A0L) #define IO_ERROR_DUMP_CREATION_ERROR ((NTSTATUS)0xC00400A1L)

4 years, 3 months

[reactos] 02/05: [XDK] HACK: remove dllimport from functions which will be implemented in ntoskrnl_vista. Remove when we will be NT6

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=093f377c40800bd7ac2e6… commit 093f377c40800bd7ac2e68e6290a16e5b9867280 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Aug 28 05:11:42 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Aug 28 05:11:42 2020 +0300 [XDK] HACK: remove dllimport from functions which will be implemented in ntoskrnl_vista. Remove when we will be NT6 CORE-17129 --- sdk/include/xdk/iofuncs.h | 10 +++++----- sdk/include/xdk/kefuncs.h | 6 +++--- sdk/include/xdk/pofuncs.h | 6 +++--- sdk/include/xdk/wmifuncs.h | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sdk/include/xdk/iofuncs.h b/sdk/include/xdk/iofuncs.h index 3299e53632a..fc1c10cdb03 100644 --- a/sdk/include/xdk/iofuncs.h +++ b/sdk/include/xdk/iofuncs.h @@ -2351,7 +2351,7 @@ IoUninitializeWorkItem( _Inout_ PIO_WORKITEM IoWorkItem); _IRQL_requires_max_(DISPATCH_LEVEL) -NTKERNELAPI +// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT VOID NTAPI IoQueueWorkItemEx( @@ -2366,7 +2366,7 @@ NTAPI IoGetIoPriorityHint( _In_ PIRP Irp); -NTKERNELAPI +// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT NTSTATUS NTAPI IoSetIoPriorityHint( @@ -2422,7 +2422,7 @@ IoSetDevicePropertyData( _IRQL_requires_max_(PASSIVE_LEVEL) _Must_inspect_result_ -NTKERNELAPI +// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT NTSTATUS NTAPI IoGetDevicePropertyData( @@ -2484,7 +2484,7 @@ NTAPI IoClearIrpExtraCreateParameter( _Inout_ PIRP Irp); -NTKERNELAPI +// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT NTSTATUS NTAPI IoGetIrpExtraCreateParameter( @@ -2610,7 +2610,7 @@ $endif (_NTIFS_) #if (NTDDI_VERSION >= NTDDI_WIN8) _IRQL_requires_max_(PASSIVE_LEVEL) _Must_inspect_result_ -NTKERNELAPI +// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT NTSTATUS IoSetDeviceInterfacePropertyData( _In_ PUNICODE_STRING SymbolicLinkName, diff --git a/sdk/include/xdk/kefuncs.h b/sdk/include/xdk/kefuncs.h index 2cfe56348b0..6d459bbe60a 100644 --- a/sdk/include/xdk/kefuncs.h +++ b/sdk/include/xdk/kefuncs.h @@ -1249,12 +1249,12 @@ NTAPI KeQueryNodeMaximumProcessorCount( _In_ USHORT NodeNumber); -NTKERNELAPI +// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT USHORT NTAPI KeQueryHighestNodeNumber(VOID); -NTKERNELAPI +// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT USHORT NTAPI KeGetCurrentNodeNumber(VOID); @@ -1316,7 +1316,7 @@ KeRevertToUserGroupAffinityThread( _In_ PGROUP_AFFINITY PreviousAffinity); _IRQL_requires_max_(DISPATCH_LEVEL) -NTKERNELAPI +// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT BOOLEAN NTAPI KeSetCoalescableTimer( diff --git a/sdk/include/xdk/pofuncs.h b/sdk/include/xdk/pofuncs.h index 7483576200e..37a0f9e76be 100644 --- a/sdk/include/xdk/pofuncs.h +++ b/sdk/include/xdk/pofuncs.h @@ -112,7 +112,7 @@ PoGetSystemWake( _In_ struct _IRP *Irp); _IRQL_requires_max_(APC_LEVEL) -NTKERNELAPI +// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT NTSTATUS NTAPI PoRegisterPowerSettingCallback( @@ -123,7 +123,7 @@ PoRegisterPowerSettingCallback( _Outptr_opt_ PVOID *Handle); _IRQL_requires_max_(APC_LEVEL) -NTKERNELAPI +// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT NTSTATUS NTAPI PoUnregisterPowerSettingCallback( @@ -154,7 +154,7 @@ PoEndDeviceBusy( _Inout_ PULONG IdlePointer); _IRQL_requires_max_(DISPATCH_LEVEL) -NTKERNELAPI +// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT BOOLEAN NTAPI PoQueryWatchdogTime( diff --git a/sdk/include/xdk/wmifuncs.h b/sdk/include/xdk/wmifuncs.h index 70f82b72946..bad09c35e1d 100644 --- a/sdk/include/xdk/wmifuncs.h +++ b/sdk/include/xdk/wmifuncs.h @@ -69,7 +69,7 @@ WmiQueryTraceInformation( _IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS -NTKERNELAPI +// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT NTAPI EtwRegister( _In_ LPCGUID ProviderId, @@ -79,7 +79,7 @@ EtwRegister( _IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS -NTKERNELAPI +// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT NTAPI EtwUnregister( _In_ REGHANDLE RegHandle); @@ -112,7 +112,7 @@ EtwActivityIdControl( _IRQL_requires_max_(HIGH_LEVEL) NTSTATUS -NTKERNELAPI +// NTKERNELAPI // HACK: ntoskrnl_vista functions are statically linked thus don't need DECLSPEC_IMPORT NTAPI EtwWrite( _In_ REGHANDLE RegHandle,

4 years, 3 months

[reactos] 01/05: [XDK] Add definitions required for newer storage class drivers Remove duplications in kefuncs and add missing NTKERNELAPI in iofuncs

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=01eb9ba8de4bed03cd670… commit 01eb9ba8de4bed03cd67049b158acb3faec5dc8b Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Aug 28 05:04:23 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Aug 28 05:04:23 2020 +0300 [XDK] Add definitions required for newer storage class drivers Remove duplications in kefuncs and add missing NTKERNELAPI in iofuncs CORE-17129 --- sdk/include/xdk/iofuncs.h | 42 ++++++++++ sdk/include/xdk/iotypes.h | 7 +- sdk/include/xdk/kefuncs.h | 191 +++++++++++++++------------------------------ sdk/include/xdk/potypes.h | 1 + sdk/include/xdk/rtltypes.h | 6 +- 5 files changed, 116 insertions(+), 131 deletions(-) diff --git a/sdk/include/xdk/iofuncs.h b/sdk/include/xdk/iofuncs.h index 7fb9a3b4ea9..3299e53632a 100644 --- a/sdk/include/xdk/iofuncs.h +++ b/sdk/include/xdk/iofuncs.h @@ -2332,22 +2332,26 @@ IoSetShareAccessEx( _Out_ PSHARE_ACCESS ShareAccess, _In_ PBOOLEAN WritePermission); +NTKERNELAPI ULONG NTAPI IoSizeofWorkItem(VOID); +NTKERNELAPI VOID NTAPI IoInitializeWorkItem( _In_ PVOID IoObject, _Out_ PIO_WORKITEM IoWorkItem); +NTKERNELAPI VOID NTAPI IoUninitializeWorkItem( _Inout_ PIO_WORKITEM IoWorkItem); _IRQL_requires_max_(DISPATCH_LEVEL) +NTKERNELAPI VOID NTAPI IoQueueWorkItemEx( @@ -2356,17 +2360,20 @@ IoQueueWorkItemEx( _In_ WORK_QUEUE_TYPE QueueType, _In_opt_ __drv_aliasesMem PVOID Context); +NTKERNELAPI IO_PRIORITY_HINT NTAPI IoGetIoPriorityHint( _In_ PIRP Irp); +NTKERNELAPI NTSTATUS NTAPI IoSetIoPriorityHint( _In_ PIRP Irp, _In_ IO_PRIORITY_HINT PriorityHint); +NTKERNELAPI NTSTATUS NTAPI IoAllocateSfioStreamIdentifier( @@ -2381,6 +2388,7 @@ IoGetSfioStreamIdentifier( _In_ PFILE_OBJECT FileObject, _In_ PVOID Signature); +NTKERNELAPI NTSTATUS NTAPI IoFreeSfioStreamIdentifier( @@ -2437,6 +2445,7 @@ IoUpdateDiskGeometry( _In_ struct _DISK_GEOMETRY_EX* OldDiskGeometry, _In_ struct _DISK_GEOMETRY_EX* NewDiskGeometry); +NTKERNELAPI PTXN_PARAMETER_BLOCK NTAPI IoGetTransactionParameterBlock( @@ -2462,23 +2471,27 @@ IoCreateFileEx( _In_ ULONG Options, _In_opt_ PIO_DRIVER_CREATE_CONTEXT DriverContext); +NTKERNELAPI NTSTATUS NTAPI IoSetIrpExtraCreateParameter( _Inout_ PIRP Irp, _In_ struct _ECP_LIST *ExtraCreateParameter); +NTKERNELAPI VOID NTAPI IoClearIrpExtraCreateParameter( _Inout_ PIRP Irp); +NTKERNELAPI NTSTATUS NTAPI IoGetIrpExtraCreateParameter( _In_ PIRP Irp, _Outptr_result_maybenull_ struct _ECP_LIST **ExtraCreateParameter); +NTKERNELAPI BOOLEAN NTAPI IoIsFileObjectIgnoringSharing( @@ -2594,6 +2607,35 @@ IoReplaceFileObjectName( $endif (_NTIFS_) #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ +#if (NTDDI_VERSION >= NTDDI_WIN8) +_IRQL_requires_max_(PASSIVE_LEVEL) +_Must_inspect_result_ +NTKERNELAPI +NTSTATUS +IoSetDeviceInterfacePropertyData( + _In_ PUNICODE_STRING SymbolicLinkName, + _In_ CONST DEVPROPKEY *PropertyKey, + _In_ LCID Lcid, + _In_ ULONG Flags, + _In_ DEVPROPTYPE Type, + _In_ ULONG Size, + _In_reads_bytes_opt_(Size) PVOID Data); + +_IRQL_requires_max_(PASSIVE_LEVEL) +_Must_inspect_result_ +NTKERNELAPI +NTSTATUS +IoGetDeviceInterfacePropertyData ( + _In_ PUNICODE_STRING SymbolicLinkName, + _In_ CONST DEVPROPKEY *PropertyKey, + _In_ LCID Lcid, + _Reserved_ ULONG Flags, + _In_ ULONG Size, + _Out_writes_bytes_to_(Size, *RequiredSize) PVOID Data, + _Out_ PULONG RequiredSize, + _Out_ PDEVPROPTYPE Type); +#endif /* (NTDDI_VERSION >= NTDDI_WIN8) */ + $if (_WDMDDK_) #if defined(_WIN64) NTKERNELAPI diff --git a/sdk/include/xdk/iotypes.h b/sdk/include/xdk/iotypes.h index 5a40a71f6a5..d53d9371532 100644 --- a/sdk/include/xdk/iotypes.h +++ b/sdk/include/xdk/iotypes.h @@ -246,6 +246,8 @@ $if (_WDMDDK_) #define FILE_CHARACTERISTIC_PNP_DEVICE 0x00000800 #define FILE_CHARACTERISTIC_TS_DEVICE 0x00001000 #define FILE_CHARACTERISTIC_WEBDAV_DEVICE 0x00002000 +#define FILE_PORTABLE_DEVICE 0x00004000 +#define FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL 0x00020000 /* DEVICE_OBJECT.AlignmentRequirement */ #define FILE_BYTE_ALIGNMENT 0x00000000 @@ -1134,7 +1136,10 @@ typedef enum _DEVICE_USAGE_NOTIFICATION_TYPE { DeviceUsageTypeUndefined, DeviceUsageTypePaging, DeviceUsageTypeHibernation, - DeviceUsageTypeDumpFile + DeviceUsageTypeDumpFile, + DeviceUsageTypeBoot, + DeviceUsageTypePostDisplay, + DeviceUsageTypeGuestAssigned, } DEVICE_USAGE_NOTIFICATION_TYPE; typedef struct _POWER_SEQUENCE { diff --git a/sdk/include/xdk/kefuncs.h b/sdk/include/xdk/kefuncs.h index aa8597b56fe..2cfe56348b0 100644 --- a/sdk/include/xdk/kefuncs.h +++ b/sdk/include/xdk/kefuncs.h @@ -1200,67 +1200,6 @@ KeDeregisterProcessorChangeCallback( $endif (_WDMDDK_) $if (_WDMDDK_ || _NTDDK_) #if (NTDDI_VERSION >= NTDDI_WIN7) -$endif (_WDMDDK_ || _NTDDK_) - -$if (_WDMDDK_) -_IRQL_requires_max_(DISPATCH_LEVEL) -_IRQL_requires_min_(PASSIVE_LEVEL) -_IRQL_requires_same_ -ULONG64 -NTAPI -KeQueryTotalCycleTimeProcess( - _Inout_ PKPROCESS Process, - _Out_ PULONG64 CycleTimeStamp); - -_IRQL_requires_max_(APC_LEVEL) -_IRQL_requires_min_(PASSIVE_LEVEL) -_IRQL_requires_same_ -ULONG64 -NTAPI -KeQueryTotalCycleTimeThread( - _Inout_ PKTHREAD Thread, - _Out_ PULONG64 CycleTimeStamp); - -_Must_inspect_result_ -NTKERNELAPI -NTSTATUS -NTAPI -KeSetTargetProcessorDpcEx( - _Inout_ PKDPC Dpc, - _In_ PPROCESSOR_NUMBER ProcNumber); - -_IRQL_requires_min_(PASSIVE_LEVEL) -_IRQL_requires_max_(APC_LEVEL) -NTKERNELAPI -VOID -NTAPI -KeSetSystemGroupAffinityThread( - _In_ PGROUP_AFFINITY Affinity, - _Out_opt_ PGROUP_AFFINITY PreviousAffinity); - -_IRQL_requires_min_(PASSIVE_LEVEL) -_IRQL_requires_max_(APC_LEVEL) -NTKERNELAPI -VOID -NTAPI -KeRevertToUserGroupAffinityThread( - _In_ PGROUP_AFFINITY PreviousAffinity); - -_IRQL_requires_max_(DISPATCH_LEVEL) -NTKERNELAPI -BOOLEAN -NTAPI -KeSetCoalescableTimer( - _Inout_ PKTIMER Timer, - _In_ LARGE_INTEGER DueTime, - _In_ ULONG Period, - _In_ ULONG TolerableDelay, - _In_opt_ PKDPC Dpc); - -NTKERNELAPI -ULONGLONG -NTAPI -KeQueryUnbiasedInterruptTime(VOID); NTKERNELAPI ULONG @@ -1330,6 +1269,68 @@ KeQueryLogicalProcessorRelationship( _Out_writes_bytes_opt_(*Length) PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX Information, _Inout_ PULONG Length); +$endif (_WDMDDK_ || _NTDDK_) + +$if (_WDMDDK_) +_IRQL_requires_max_(DISPATCH_LEVEL) +_IRQL_requires_min_(PASSIVE_LEVEL) +_IRQL_requires_same_ +ULONG64 +NTAPI +KeQueryTotalCycleTimeProcess( + _Inout_ PKPROCESS Process, + _Out_ PULONG64 CycleTimeStamp); + +_IRQL_requires_max_(APC_LEVEL) +_IRQL_requires_min_(PASSIVE_LEVEL) +_IRQL_requires_same_ +ULONG64 +NTAPI +KeQueryTotalCycleTimeThread( + _Inout_ PKTHREAD Thread, + _Out_ PULONG64 CycleTimeStamp); + +_Must_inspect_result_ +NTKERNELAPI +NTSTATUS +NTAPI +KeSetTargetProcessorDpcEx( + _Inout_ PKDPC Dpc, + _In_ PPROCESSOR_NUMBER ProcNumber); + +_IRQL_requires_min_(PASSIVE_LEVEL) +_IRQL_requires_max_(APC_LEVEL) +NTKERNELAPI +VOID +NTAPI +KeSetSystemGroupAffinityThread( + _In_ PGROUP_AFFINITY Affinity, + _Out_opt_ PGROUP_AFFINITY PreviousAffinity); + +_IRQL_requires_min_(PASSIVE_LEVEL) +_IRQL_requires_max_(APC_LEVEL) +NTKERNELAPI +VOID +NTAPI +KeRevertToUserGroupAffinityThread( + _In_ PGROUP_AFFINITY PreviousAffinity); + +_IRQL_requires_max_(DISPATCH_LEVEL) +NTKERNELAPI +BOOLEAN +NTAPI +KeSetCoalescableTimer( + _Inout_ PKTIMER Timer, + _In_ LARGE_INTEGER DueTime, + _In_ ULONG Period, + _In_ ULONG TolerableDelay, + _In_opt_ PKDPC Dpc); + +NTKERNELAPI +ULONGLONG +NTAPI +KeQueryUnbiasedInterruptTime(VOID); + _Must_inspect_result_ _IRQL_requires_max_(DISPATCH_LEVEL) _Ret_range_(<=, 0) @@ -1363,74 +1364,6 @@ KeGetProcessorIndexFromNumber( _In_ PPROCESSOR_NUMBER ProcNumber); $endif (_WDMDDK_) $if (_NTDDK_) -NTKERNELAPI -ULONG -NTAPI -KeQueryActiveProcessorCountEx( - _In_ USHORT GroupNumber); - -NTKERNELAPI -ULONG -NTAPI -KeQueryMaximumProcessorCountEx( - _In_ USHORT GroupNumber); - -NTKERNELAPI -USHORT -NTAPI -KeQueryActiveGroupCount(VOID); - -NTKERNELAPI -USHORT -NTAPI -KeQueryMaximumGroupCount(VOID); - -NTKERNELAPI -KAFFINITY -NTAPI -KeQueryGroupAffinity( - _In_ USHORT GroupNumber); - -NTKERNELAPI -ULONG -NTAPI -KeGetCurrentProcessorNumberEx( - _Out_opt_ PPROCESSOR_NUMBER ProcNumber); - -NTKERNELAPI -VOID -NTAPI -KeQueryNodeActiveAffinity( - _In_ USHORT NodeNumber, - _Out_opt_ PGROUP_AFFINITY Affinity, - _Out_opt_ PUSHORT Count); - -NTKERNELAPI -USHORT -NTAPI -KeQueryNodeMaximumProcessorCount( - _In_ USHORT NodeNumber); - -NTKERNELAPI -USHORT -NTAPI -KeQueryHighestNodeNumber(VOID); - -NTKERNELAPI -USHORT -NTAPI -KeGetCurrentNodeNumber(VOID); - -_IRQL_requires_max_(DISPATCH_LEVEL) -NTKERNELAPI -NTSTATUS -NTAPI -KeQueryLogicalProcessorRelationship( - _In_opt_ PPROCESSOR_NUMBER ProcessorNumber, - _In_ LOGICAL_PROCESSOR_RELATIONSHIP RelationshipType, - _Out_writes_bytes_opt_(*Length) PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX Information, - _Inout_ PULONG Length); - _IRQL_requires_max_(APC_LEVEL) NTKERNELAPI NTSTATUS diff --git a/sdk/include/xdk/potypes.h b/sdk/include/xdk/potypes.h index c720d260d87..43ee700c8bb 100644 --- a/sdk/include/xdk/potypes.h +++ b/sdk/include/xdk/potypes.h @@ -294,6 +294,7 @@ DEFINE_GUID(GUID_CONSOLE_DISPLAY_STATE, 0x6fe69556, 0x704a, 0x47a0, 0x8f, 0x24, DEFINE_GUID(GUID_ALLOW_DISPLAY_REQUIRED, 0xA9CEB8DA, 0xCD46, 0x44FB, 0xA9, 0x8B, 0x02, 0xAF, 0x69, 0xDE, 0x46, 0x23); DEFINE_GUID(GUID_DISK_SUBGROUP, 0x0012EE47, 0x9041, 0x4B5D, 0x9B, 0x77, 0x53, 0x5F, 0xBA, 0x8B, 0x14, 0x42); DEFINE_GUID(GUID_DISK_POWERDOWN_TIMEOUT, 0x6738E2C4, 0xE8A5, 0x4A42, 0xB1, 0x6A, 0xE0, 0x40, 0xE7, 0x69, 0x75, 0x6E); +DEFINE_GUID(GUID_DISK_IDLE_TIMEOUT, 0x58E39BA8, 0xB8E6, 0x4EF6, 0x90, 0xD0, 0x89, 0xAE, 0x32, 0xB2, 0x58, 0xD6); DEFINE_GUID(GUID_DISK_BURST_IGNORE_THRESHOLD, 0x80e3c60e, 0xbb94, 0x4ad8, 0xbb, 0xe0, 0x0d, 0x31, 0x95, 0xef, 0xc6, 0x63); DEFINE_GUID(GUID_DISK_ADAPTIVE_POWERDOWN, 0x396A32E1, 0x499A, 0x40B2, 0x91, 0x24, 0xA9, 0x6A, 0xFE, 0x70, 0x76, 0x67); DEFINE_GUID(GUID_SLEEP_SUBGROUP, 0x238C9FA8, 0x0AAD, 0x41ED, 0x83, 0xF4, 0x97, 0xBE, 0x24, 0x2C, 0x8F, 0x20); diff --git a/sdk/include/xdk/rtltypes.h b/sdk/include/xdk/rtltypes.h index 51190a204d9..527d3ed67ce 100644 --- a/sdk/include/xdk/rtltypes.h +++ b/sdk/include/xdk/rtltypes.h @@ -21,6 +21,9 @@ $if (_WDMDDK_) #define RTL_QUERY_REGISTRY_NOEXPAND 0x00000010 #define RTL_QUERY_REGISTRY_DIRECT 0x00000020 #define RTL_QUERY_REGISTRY_DELETE 0x00000040 +#define RTL_QUERY_REGISTRY_TYPECHECK 0x00000100 + +#define RTL_QUERY_REGISTRY_TYPECHECK_SHIFT 24 #define HASH_STRING_ALGORITHM_DEFAULT 0 #define HASH_STRING_ALGORITHM_X65599 1 @@ -40,13 +43,14 @@ _Function_class_(RTL_QUERY_REGISTRY_ROUTINE) _IRQL_requires_max_(PASSIVE_LEVEL) _IRQL_requires_same_ typedef NTSTATUS -(NTAPI *PRTL_QUERY_REGISTRY_ROUTINE)( +(NTAPI RTL_QUERY_REGISTRY_ROUTINE)( _In_z_ PWSTR ValueName, _In_ ULONG ValueType, _In_reads_bytes_opt_(ValueLength) PVOID ValueData, _In_ ULONG ValueLength, _In_opt_ PVOID Context, _In_opt_ PVOID EntryContext); +typedef RTL_QUERY_REGISTRY_ROUTINE *PRTL_QUERY_REGISTRY_ROUTINE; typedef struct _RTL_QUERY_REGISTRY_TABLE { PRTL_QUERY_REGISTRY_ROUTINE QueryRoutine;

4 years, 3 months

[reactos] 01/01: [COMCTL32] Addendum to last commit

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c909cbc7c58484337ffa… commit 7c909cbc7c58484337ffa1a34f92449fcf2eb41e Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Aug 28 01:02:00 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Aug 28 01:02:00 2020 +0200 [COMCTL32] Addendum to last commit Sorry, something went terribly wrong with the CORE-ID in my head 2 times, one time in the commit comment and one time in the code! Addendum to 0.4.15-dev-663-g cd7db5df89d3f9e8ddce6e909debedc423e3e8a1 --- dll/win32/comctl32/toolbar.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/comctl32/toolbar.c b/dll/win32/comctl32/toolbar.c index e5ebf3211cc..e2b6193b663 100644 --- a/dll/win32/comctl32/toolbar.c +++ b/dll/win32/comctl32/toolbar.c @@ -1453,7 +1453,7 @@ TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPtr) if( !(infoPtr->dwStyle & TBSTYLE_WRAPABLE) && !(infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL) ) return; -#ifdef __REACTOS__ /* workaround CORE-17244 part 1 of 2 */ +#ifdef __REACTOS__ /* workaround CORE-16169 part 1 of 2 */ /* if width is zero then return */ if (infoPtr->client_rect.right == 0) return; #endif @@ -3208,7 +3208,7 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) TRACE("auto sizing, style=%#x\n", infoPtr->dwStyle); TRACE("nRows: %d, infoPtr->nButtonHeight: %d\n", infoPtr->nRows, infoPtr->nButtonHeight); -#ifdef __REACTOS__ /* workaround CORE-17244 part 2 of 2 */ +#ifdef __REACTOS__ /* workaround CORE-16169 part 2 of 2 */ if ((infoPtr->dwStyle & TBSTYLE_WRAPABLE) || (infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL)) { TOOLBAR_LayoutToolbar(infoPtr);

4 years, 3 months

[reactos] 01/01: [COMCTL32] Workaround regression with toolbar in 7zip CORE-16996

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd7db5df89d3f9e8ddce6… commit cd7db5df89d3f9e8ddce6e909debedc423e3e8a1 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Aug 28 00:53:18 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Aug 28 00:53:18 2020 +0200 [COMCTL32] Workaround regression with toolbar in 7zip CORE-16996 The regression was introduced by SVN r68553 3b13364f058238213d85a461725002330d3743f9 Many thanks to the author Doug Lyons for excellent cooperation once more. Always a pleasure. --- dll/win32/comctl32/toolbar.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dll/win32/comctl32/toolbar.c b/dll/win32/comctl32/toolbar.c index c43dc0c980d..e5ebf3211cc 100644 --- a/dll/win32/comctl32/toolbar.c +++ b/dll/win32/comctl32/toolbar.c @@ -1453,6 +1453,11 @@ TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPtr) if( !(infoPtr->dwStyle & TBSTYLE_WRAPABLE) && !(infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL) ) return; +#ifdef __REACTOS__ /* workaround CORE-17244 part 1 of 2 */ + /* if width is zero then return */ + if (infoPtr->client_rect.right == 0) return; +#endif + btnPtr = infoPtr->buttons; x = infoPtr->nIndent; width = infoPtr->client_rect.right - infoPtr->client_rect.left; @@ -3203,6 +3208,14 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) TRACE("auto sizing, style=%#x\n", infoPtr->dwStyle); TRACE("nRows: %d, infoPtr->nButtonHeight: %d\n", infoPtr->nRows, infoPtr->nButtonHeight); +#ifdef __REACTOS__ /* workaround CORE-17244 part 2 of 2 */ + if ((infoPtr->dwStyle & TBSTYLE_WRAPABLE) || (infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL)) + { + TOOLBAR_LayoutToolbar(infoPtr); + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + } +#endif + if (!(infoPtr->dwStyle & CCS_NORESIZE)) { RECT window_rect, parent_rect;

4 years, 3 months

[reactos] 01/01: [RAMDISK] Add Russian (ru-RU) translation to INF file

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=27ad576ff123c9d88844b… commit 27ad576ff123c9d88844ba8bbf635255d4bfcaad Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Aug 27 02:34:08 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Aug 27 02:36:27 2020 +0300 [RAMDISK] Add Russian (ru-RU) translation to INF file Addendum to c166933. --- drivers/storage/class/ramdisk/ramdisk.inf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/storage/class/ramdisk/ramdisk.inf b/drivers/storage/class/ramdisk/ramdisk.inf index 5ff855fde8e..5e300cf6ceb 100644 --- a/drivers/storage/class/ramdisk/ramdisk.inf +++ b/drivers/storage/class/ramdisk/ramdisk.inf @@ -67,3 +67,10 @@ RamdiskClassName = "Ramdisk" RamdiskBus.Desc = "Kontroler dysku RAM" RamdiskVolume.Desc = "Urządzenie dysku RAM (wolumin)" Ramdisk.ServiceDesc = "Sterownik dysku RAM systemu ReactOS" + +[Strings.0419] +ReactOS = "Команда ReactOS" +RamdiskClassName = "RAM-диски" +RamdiskBus.Desc = "Контроллер RAM-диска" +RamdiskVolume.Desc = "Устройство RAM-диска (том)" +Ramdisk.ServiceDesc = "Драйвер RAM-диска ReactOS"

4 years, 4 months

[reactos] 01/01: [LocalSpl] Fix Type and Paste

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=240207691d29cbf9828e2… commit 240207691d29cbf9828e27aeca9813d589267db5 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Wed Aug 26 18:15:10 2020 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Wed Aug 26 18:15:10 2020 -0500 [LocalSpl] Fix Type and Paste Fix cap on leading function. --- win32ss/printing/providers/localspl/forms.c | 2 +- win32ss/printing/providers/localspl/main.c | 2 +- win32ss/printing/providers/localspl/precomp.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/printing/providers/localspl/forms.c b/win32ss/printing/providers/localspl/forms.c index 03c016218fe..767a28618ec 100644 --- a/win32ss/printing/providers/localspl/forms.c +++ b/win32ss/printing/providers/localspl/forms.c @@ -679,7 +679,7 @@ Cleanup: } BOOL WINAPI -localSetForm(HANDLE hPrinter, PWSTR pFormName, DWORD Level, PBYTE pForm) +LocalSetForm(HANDLE hPrinter, PWSTR pFormName, DWORD Level, PBYTE pForm) { DWORD dwErrorCode, cbNeeded; PFORM_INFO_LIST pfil; diff --git a/win32ss/printing/providers/localspl/main.c b/win32ss/printing/providers/localspl/main.c index c54e663ba50..ba563a7c511 100644 --- a/win32ss/printing/providers/localspl/main.c +++ b/win32ss/printing/providers/localspl/main.c @@ -67,7 +67,7 @@ static const PRINTPROVIDOR _PrintProviderFunctions = { LocalAddForm, // fpAddForm LocalDeleteForm, // fpDeleteForm LocalGetForm, // fpGetForm - localSetForm, // fpSetForm + LocalSetForm, // fpSetForm LocalEnumForms, // fpEnumForms LocalEnumMonitors, // fpEnumMonitors LocalEnumPorts, // fpEnumPorts diff --git a/win32ss/printing/providers/localspl/precomp.h b/win32ss/printing/providers/localspl/precomp.h index d8e0626ce1b..20ecdec0ba0 100644 --- a/win32ss/printing/providers/localspl/precomp.h +++ b/win32ss/printing/providers/localspl/precomp.h @@ -251,7 +251,7 @@ BOOL WINAPI LocalAddForm(HANDLE hPrinter, DWORD Level, PBYTE pForm); BOOL WINAPI LocalDeleteForm(HANDLE hPrinter, PWSTR pFormName); BOOL WINAPI LocalEnumForms(HANDLE hPrinter, DWORD Level, PBYTE pForm, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned); BOOL WINAPI LocalGetForm(HANDLE hPrinter, PWSTR pFormName, DWORD Level, PBYTE pForm, DWORD cbBuf, PDWORD pcbNeeded); -BOOL WINAPI localSetForm(HANDLE hPrinter, PWSTR pFormName, DWORD Level, PBYTE pForm); +BOOL WINAPI LocalSetForm(HANDLE hPrinter, PWSTR pFormName, DWORD Level, PBYTE pForm); // jobs.c extern SKIPLIST GlobalJobList;

4 years, 4 months

[reactos] 01/01: [LocalSpl] Fix MsVC Builds

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19caafcb9ea646c554c8f… commit 19caafcb9ea646c554c8fe731fc2558330c8b91f Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Wed Aug 26 17:37:17 2020 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Wed Aug 26 17:37:17 2020 -0500 [LocalSpl] Fix MsVC Builds Fix unresolved external symbol. --- win32ss/printing/providers/localspl/tools.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/printing/providers/localspl/tools.c b/win32ss/printing/providers/localspl/tools.c index 16c433e4e39..764877d664e 100644 --- a/win32ss/printing/providers/localspl/tools.c +++ b/win32ss/printing/providers/localspl/tools.c @@ -120,7 +120,7 @@ LONG copy_servername_from_name(LPCWSTR name, LPWSTR target) len = ARRAYSIZE(buffer); if (GetComputerNameW(buffer, &len)) { - if ((serverlen == len) && (wcsnicmp(server, buffer, len) == 0)) + if ((serverlen == len) && (_wcsnicmp(server, buffer, len) == 0)) { /* The requested Servername is our computername */ return 0;

4 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2020