Ros-diffs January 2025

ros-diffs@reactos.org

23 participants
278 discussions

[reactos] 07/30: [NTOS:KD64] Add annotations to debugger control routines used in Kd/Nt/ZwSystemDebugControl

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c61d4ce903bdc7920d05… commit 1c61d4ce903bdc7920d055280e78b31e0d436456 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Mar 13 01:09:57 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 28 22:00:33 2025 +0100 [NTOS:KD64] Add annotations to debugger control routines used in Kd/Nt/ZwSystemDebugControl --- ntoskrnl/include/internal/kd64.h | 95 ++++++++++++++++++---------------------- ntoskrnl/kd64/amd64/kdx64.c | 92 ++++++++++++++++++++------------------ ntoskrnl/kd64/arm/kdarm.c | 92 ++++++++++++++++++++------------------ ntoskrnl/kd64/i386/kdx86.c | 92 ++++++++++++++++++++------------------ ntoskrnl/kd64/kdapi.c | 3 +- 5 files changed, 195 insertions(+), 179 deletions(-) diff --git a/ntoskrnl/include/internal/kd64.h b/ntoskrnl/include/internal/kd64.h index d9a68589f44..060832423ba 100644 --- a/ntoskrnl/include/internal/kd64.h +++ b/ntoskrnl/include/internal/kd64.h @@ -375,8 +375,7 @@ KdpZeroMemory( VOID NTAPI KdpSysGetVersion( - IN PDBGKD_GET_VERSION64 Version -); + _Out_ PDBGKD_GET_VERSION64 Version); // // Context @@ -401,16 +400,14 @@ KdpSetContextState( NTSTATUS NTAPI KdpSysReadMsr( - IN ULONG Msr, - OUT PLARGE_INTEGER MsrValue -); + _In_ ULONG Msr, + _Out_ PLARGE_INTEGER MsrValue); NTSTATUS NTAPI KdpSysWriteMsr( - IN ULONG Msr, - IN PLARGE_INTEGER MsrValue -); + _In_ ULONG Msr, + _In_ PLARGE_INTEGER MsrValue); // // Bus @@ -418,26 +415,24 @@ KdpSysWriteMsr( NTSTATUS NTAPI KdpSysReadBusData( - IN ULONG BusDataType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN ULONG Offset, - IN PVOID Buffer, - IN ULONG Length, - OUT PULONG ActualLength -); + _In_ BUS_DATA_TYPE BusDataType, + _In_ ULONG BusNumber, + _In_ ULONG SlotNumber, + _In_ ULONG Offset, + _Out_writes_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _Out_ PULONG ActualLength); NTSTATUS NTAPI KdpSysWriteBusData( - IN ULONG BusDataType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN ULONG Offset, - IN PVOID Buffer, - IN ULONG Length, - OUT PULONG ActualLength -); + _In_ BUS_DATA_TYPE BusDataType, + _In_ ULONG BusNumber, + _In_ ULONG SlotNumber, + _In_ ULONG Offset, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _Out_ PULONG ActualLength); // // Control Space @@ -445,22 +440,20 @@ KdpSysWriteBusData( NTSTATUS NTAPI KdpSysReadControlSpace( - IN ULONG Processor, - IN ULONG64 BaseAddress, - IN PVOID Buffer, - IN ULONG Length, - OUT PULONG ActualLength -); + _In_ ULONG Processor, + _In_ ULONG64 BaseAddress, + _Out_writes_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _Out_ PULONG ActualLength); NTSTATUS NTAPI KdpSysWriteControlSpace( - IN ULONG Processor, - IN ULONG64 BaseAddress, - IN PVOID Buffer, - IN ULONG Length, - OUT PULONG ActualLength -); + _In_ ULONG Processor, + _In_ ULONG64 BaseAddress, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _Out_ PULONG ActualLength); // // I/O Space @@ -468,26 +461,24 @@ KdpSysWriteControlSpace( NTSTATUS NTAPI KdpSysReadIoSpace( - IN ULONG InterfaceType, - IN ULONG BusNumber, - IN ULONG AddressSpace, - IN ULONG64 IoAddress, - IN PVOID DataValue, - IN ULONG DataSize, - OUT PULONG ActualDataSize -); + _In_ INTERFACE_TYPE InterfaceType, + _In_ ULONG BusNumber, + _In_ ULONG AddressSpace, + _In_ ULONG64 IoAddress, + _Out_writes_bytes_(DataSize) PVOID DataValue, + _In_ ULONG DataSize, + _Out_ PULONG ActualDataSize); NTSTATUS NTAPI KdpSysWriteIoSpace( - IN ULONG InterfaceType, - IN ULONG BusNumber, - IN ULONG AddressSpace, - IN ULONG64 IoAddress, - IN PVOID DataValue, - IN ULONG DataSize, - OUT PULONG ActualDataSize -); + _In_ INTERFACE_TYPE InterfaceType, + _In_ ULONG BusNumber, + _In_ ULONG AddressSpace, + _In_ ULONG64 IoAddress, + _In_reads_bytes_(DataSize) PVOID DataValue, + _In_ ULONG DataSize, + _Out_ PULONG ActualDataSize); // // Low Memory diff --git a/ntoskrnl/kd64/amd64/kdx64.c b/ntoskrnl/kd64/amd64/kdx64.c index 5c6871d3a9e..b403bfa5918 100644 --- a/ntoskrnl/kd64/amd64/kdx64.c +++ b/ntoskrnl/kd64/amd64/kdx64.c @@ -93,8 +93,9 @@ KdpSetContextState(IN PDBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange, NTSTATUS NTAPI -KdpSysReadMsr(IN ULONG Msr, - OUT PLARGE_INTEGER MsrValue) +KdpSysReadMsr( + _In_ ULONG Msr, + _Out_ PLARGE_INTEGER MsrValue) { /* Use SEH to protect from invalid MSRs */ _SEH2_TRY @@ -112,8 +113,9 @@ KdpSysReadMsr(IN ULONG Msr, NTSTATUS NTAPI -KdpSysWriteMsr(IN ULONG Msr, - IN PLARGE_INTEGER MsrValue) +KdpSysWriteMsr( + _In_ ULONG Msr, + _In_ PLARGE_INTEGER MsrValue) { /* Use SEH to protect from invalid MSRs */ _SEH2_TRY @@ -131,13 +133,14 @@ KdpSysWriteMsr(IN ULONG Msr, NTSTATUS NTAPI -KdpSysReadBusData(IN ULONG BusDataType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN ULONG Offset, - IN PVOID Buffer, - IN ULONG Length, - OUT PULONG ActualLength) +KdpSysReadBusData( + _In_ BUS_DATA_TYPE BusDataType, + _In_ ULONG BusNumber, + _In_ ULONG SlotNumber, + _In_ ULONG Offset, + _Out_writes_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _Out_ PULONG ActualLength) { UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; @@ -145,13 +148,14 @@ KdpSysReadBusData(IN ULONG BusDataType, NTSTATUS NTAPI -KdpSysWriteBusData(IN ULONG BusDataType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN ULONG Offset, - IN PVOID Buffer, - IN ULONG Length, - OUT PULONG ActualLength) +KdpSysWriteBusData( + _In_ BUS_DATA_TYPE BusDataType, + _In_ ULONG BusNumber, + _In_ ULONG SlotNumber, + _In_ ULONG Offset, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _Out_ PULONG ActualLength) { UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; @@ -159,11 +163,12 @@ KdpSysWriteBusData(IN ULONG BusDataType, NTSTATUS NTAPI -KdpSysReadControlSpace(IN ULONG Processor, - IN ULONG64 BaseAddress, - IN PVOID Buffer, - IN ULONG Length, - OUT PULONG ActualLength) +KdpSysReadControlSpace( + _In_ ULONG Processor, + _In_ ULONG64 BaseAddress, + _Out_writes_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _Out_ PULONG ActualLength) { PVOID ControlStart; PKPRCB Prcb = KiProcessorBlock[Processor]; @@ -210,11 +215,12 @@ KdpSysReadControlSpace(IN ULONG Processor, NTSTATUS NTAPI -KdpSysWriteControlSpace(IN ULONG Processor, - IN ULONG64 BaseAddress, - IN PVOID Buffer, - IN ULONG Length, - OUT PULONG ActualLength) +KdpSysWriteControlSpace( + _In_ ULONG Processor, + _In_ ULONG64 BaseAddress, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _Out_ PULONG ActualLength) { PVOID ControlStart; PKPRCB Prcb = KiProcessorBlock[Processor]; @@ -241,13 +247,14 @@ KdpSysWriteControlSpace(IN ULONG Processor, NTSTATUS NTAPI -KdpSysReadIoSpace(IN ULONG InterfaceType, - IN ULONG BusNumber, - IN ULONG AddressSpace, - IN ULONG64 IoAddress, - OUT PVOID DataValue, - IN ULONG DataSize, - OUT PULONG ActualDataSize) +KdpSysReadIoSpace( + _In_ INTERFACE_TYPE InterfaceType, + _In_ ULONG BusNumber, + _In_ ULONG AddressSpace, + _In_ ULONG64 IoAddress, + _Out_writes_bytes_(DataSize) PVOID DataValue, + _In_ ULONG DataSize, + _Out_ PULONG ActualDataSize) { /* Verify parameters */ if (InterfaceType != Isa || BusNumber != 0 || AddressSpace != 1) @@ -297,13 +304,14 @@ KdpSysReadIoSpace(IN ULONG InterfaceType, NTSTATUS NTAPI -KdpSysWriteIoSpace(IN ULONG InterfaceType, - IN ULONG BusNumber, - IN ULONG AddressSpace, - IN ULONG64 IoAddress, - IN PVOID DataValue, - IN ULONG DataSize, - OUT PULONG ActualDataSize) +KdpSysWriteIoSpace( + _In_ INTERFACE_TYPE InterfaceType, + _In_ ULONG BusNumber, + _In_ ULONG AddressSpace, + _In_ ULONG64 IoAddress, + _In_reads_bytes_(DataSize) PVOID DataValue, + _In_ ULONG DataSize, + _Out_ PULONG ActualDataSize) { /* Verify parameters */ if (InterfaceType != Isa || BusNumber != 0 || AddressSpace != 1) diff --git a/ntoskrnl/kd64/arm/kdarm.c b/ntoskrnl/kd64/arm/kdarm.c index a62956d1065..e322726c548 100644 --- a/ntoskrnl/kd64/arm/kdarm.c +++ b/ntoskrnl/kd64/arm/kdarm.c @@ -35,8 +35,9 @@ KdpSetContextState(IN PDBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange, NTSTATUS NTAPI -KdpSysReadMsr(IN ULONG Msr, - OUT PLARGE_INTEGER MsrValue) +KdpSysReadMsr( + _In_ ULONG Msr, + _Out_ PLARGE_INTEGER MsrValue) { UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; @@ -44,8 +45,9 @@ KdpSysReadMsr(IN ULONG Msr, NTSTATUS NTAPI -KdpSysWriteMsr(IN ULONG Msr, - IN PLARGE_INTEGER MsrValue) +KdpSysWriteMsr( + _In_ ULONG Msr, + _In_ PLARGE_INTEGER MsrValue) { UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; @@ -53,13 +55,14 @@ KdpSysWriteMsr(IN ULONG Msr, NTSTATUS NTAPI -KdpSysReadBusData(IN ULONG BusDataType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN ULONG Offset, - IN PVOID Buffer, - IN ULONG Length, - OUT PULONG ActualLength) +KdpSysReadBusData( + _In_ BUS_DATA_TYPE BusDataType, + _In_ ULONG BusNumber, + _In_ ULONG SlotNumber, + _In_ ULONG Offset, + _Out_writes_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _Out_ PULONG ActualLength) { UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; @@ -67,13 +70,14 @@ KdpSysReadBusData(IN ULONG BusDataType, NTSTATUS NTAPI -KdpSysWriteBusData(IN ULONG BusDataType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN ULONG Offset, - IN PVOID Buffer, - IN ULONG Length, - OUT PULONG ActualLength) +KdpSysWriteBusData( + _In_ BUS_DATA_TYPE BusDataType, + _In_ ULONG BusNumber, + _In_ ULONG SlotNumber, + _In_ ULONG Offset, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _Out_ PULONG ActualLength) { UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; @@ -81,11 +85,12 @@ KdpSysWriteBusData(IN ULONG BusDataType, NTSTATUS NTAPI -KdpSysReadControlSpace(IN ULONG Processor, - IN ULONG64 BaseAddress, - IN PVOID Buffer, - IN ULONG Length, - OUT PULONG ActualLength) +KdpSysReadControlSpace( + _In_ ULONG Processor, + _In_ ULONG64 BaseAddress, + _Out_writes_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _Out_ PULONG ActualLength) { UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; @@ -93,11 +98,12 @@ KdpSysReadControlSpace(IN ULONG Processor, NTSTATUS NTAPI -KdpSysWriteControlSpace(IN ULONG Processor, - IN ULONG64 BaseAddress, - IN PVOID Buffer, - IN ULONG Length, - OUT PULONG ActualLength) +KdpSysWriteControlSpace( + _In_ ULONG Processor, + _In_ ULONG64 BaseAddress, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _Out_ PULONG ActualLength) { UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; @@ -105,13 +111,14 @@ KdpSysWriteControlSpace(IN ULONG Processor, NTSTATUS NTAPI -KdpSysReadIoSpace(IN ULONG InterfaceType, - IN ULONG BusNumber, - IN ULONG AddressSpace, - IN ULONG64 IoAddress, - IN PVOID DataValue, - IN ULONG DataSize, - OUT PULONG ActualDataSize) +KdpSysReadIoSpace( + _In_ INTERFACE_TYPE InterfaceType, + _In_ ULONG BusNumber, + _In_ ULONG AddressSpace, + _In_ ULONG64 IoAddress, + _Out_writes_bytes_(DataSize) PVOID DataValue, + _In_ ULONG DataSize, + _Out_ PULONG ActualDataSize) { UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; @@ -119,13 +126,14 @@ KdpSysReadIoSpace(IN ULONG InterfaceType, NTSTATUS NTAPI -KdpSysWriteIoSpace(IN ULONG InterfaceType, - IN ULONG BusNumber, - IN ULONG AddressSpace, - IN ULONG64 IoAddress, - IN PVOID DataValue, - IN ULONG DataSize, - OUT PULONG ActualDataSize) +KdpSysWriteIoSpace( + _In_ INTERFACE_TYPE InterfaceType, + _In_ ULONG BusNumber, + _In_ ULONG AddressSpace, + _In_ ULONG64 IoAddress, + _In_reads_bytes_(DataSize) PVOID DataValue, + _In_ ULONG DataSize, + _Out_ PULONG ActualDataSize) { UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; diff --git a/ntoskrnl/kd64/i386/kdx86.c b/ntoskrnl/kd64/i386/kdx86.c index 843f6e88b0d..64736cc8ef6 100644 --- a/ntoskrnl/kd64/i386/kdx86.c +++ b/ntoskrnl/kd64/i386/kdx86.c @@ -91,8 +91,9 @@ KdpSetContextState(IN PDBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange, NTSTATUS NTAPI -KdpSysReadMsr(IN ULONG Msr, - OUT PLARGE_INTEGER MsrValue) +KdpSysReadMsr( + _In_ ULONG Msr, + _Out_ PLARGE_INTEGER MsrValue) { /* Wrap this in SEH in case the MSR doesn't exist */ _SEH2_TRY @@ -113,8 +114,9 @@ KdpSysReadMsr(IN ULONG Msr, NTSTATUS NTAPI -KdpSysWriteMsr(IN ULONG Msr, - IN PLARGE_INTEGER MsrValue) +KdpSysWriteMsr( + _In_ ULONG Msr, + _In_ PLARGE_INTEGER MsrValue) { /* Wrap this in SEH in case the MSR doesn't exist */ _SEH2_TRY @@ -135,13 +137,14 @@ KdpSysWriteMsr(IN ULONG Msr, NTSTATUS NTAPI -KdpSysReadBusData(IN ULONG BusDataType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN ULONG Offset, - IN PVOID Buffer, - IN ULONG Length, - OUT PULONG ActualLength) +KdpSysReadBusData( + _In_ BUS_DATA_TYPE BusDataType, + _In_ ULONG BusNumber, + _In_ ULONG SlotNumber, + _In_ ULONG Offset, + _Out_writes_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _Out_ PULONG ActualLength) { /* Just forward to HAL */ *ActualLength = HalGetBusDataByOffset(BusDataType, @@ -157,13 +160,14 @@ KdpSysReadBusData(IN ULONG BusDataType, NTSTATUS NTAPI -KdpSysWriteBusData(IN ULONG BusDataType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN ULONG Offset, - IN PVOID Buffer, - IN ULONG Length, - OUT PULONG ActualLength) +KdpSysWriteBusData( + _In_ BUS_DATA_TYPE BusDataType, + _In_ ULONG BusNumber, + _In_ ULONG SlotNumber, + _In_ ULONG Offset, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _Out_ PULONG ActualLength) { /* Just forward to HAL */ *ActualLength = HalSetBusDataByOffset(BusDataType, @@ -179,11 +183,12 @@ KdpSysWriteBusData(IN ULONG BusDataType, NTSTATUS NTAPI -KdpSysReadControlSpace(IN ULONG Processor, - IN ULONG64 BaseAddress, - IN PVOID Buffer, - IN ULONG Length, - OUT PULONG ActualLength) +KdpSysReadControlSpace( + _In_ ULONG Processor, + _In_ ULONG64 BaseAddress, + _Out_writes_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _Out_ PULONG ActualLength) { PVOID ControlStart; ULONG RealLength; @@ -219,11 +224,12 @@ KdpSysReadControlSpace(IN ULONG Processor, NTSTATUS NTAPI -KdpSysWriteControlSpace(IN ULONG Processor, - IN ULONG64 BaseAddress, - IN PVOID Buffer, - IN ULONG Length, - OUT PULONG ActualLength) +KdpSysWriteControlSpace( + _In_ ULONG Processor, + _In_ ULONG64 BaseAddress, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Length, + _Out_ PULONG ActualLength) { PVOID ControlStart; @@ -254,13 +260,14 @@ KdpSysWriteControlSpace(IN ULONG Processor, NTSTATUS NTAPI -KdpSysReadIoSpace(IN ULONG InterfaceType, - IN ULONG BusNumber, - IN ULONG AddressSpace, - IN ULONG64 IoAddress, - IN PVOID DataValue, - IN ULONG DataSize, - OUT PULONG ActualDataSize) +KdpSysReadIoSpace( + _In_ INTERFACE_TYPE InterfaceType, + _In_ ULONG BusNumber, + _In_ ULONG AddressSpace, + _In_ ULONG64 IoAddress, + _Out_writes_bytes_(DataSize) PVOID DataValue, + _In_ ULONG DataSize, + _Out_ PULONG ActualDataSize) { NTSTATUS Status; @@ -335,13 +342,14 @@ KdpSysReadIoSpace(IN ULONG InterfaceType, NTSTATUS NTAPI -KdpSysWriteIoSpace(IN ULONG InterfaceType, - IN ULONG BusNumber, - IN ULONG AddressSpace, - IN ULONG64 IoAddress, - IN PVOID DataValue, - IN ULONG DataSize, - OUT PULONG ActualDataSize) +KdpSysWriteIoSpace( + _In_ INTERFACE_TYPE InterfaceType, + _In_ ULONG BusNumber, + _In_ ULONG AddressSpace, + _In_ ULONG64 IoAddress, + _In_reads_bytes_(DataSize) PVOID DataValue, + _In_ ULONG DataSize, + _Out_ PULONG ActualDataSize) { NTSTATUS Status; diff --git a/ntoskrnl/kd64/kdapi.c b/ntoskrnl/kd64/kdapi.c index 4baeb4d9c42..bd27655346b 100644 --- a/ntoskrnl/kd64/kdapi.c +++ b/ntoskrnl/kd64/kdapi.c @@ -430,7 +430,8 @@ KdpSetCommonState(IN ULONG NewState, VOID NTAPI -KdpSysGetVersion(IN PDBGKD_GET_VERSION64 Version) +KdpSysGetVersion( + _Out_ PDBGKD_GET_VERSION64 Version) { /* Copy the version block */ KdpMoveMemory(Version,

1 week, 1 day

[reactos] 06/30: [NTOS:MM] Allow not providing MMDBG_COPY_UNSAFE in MmDbgCopyMemory

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=20bd5e8a9c072db7f1ddc… commit 20bd5e8a9c072db7f1ddcca5e083414cbb8c5a09 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Fri Aug 16 09:07:14 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 28 22:00:31 2025 +0100 [NTOS:MM] Allow not providing MMDBG_COPY_UNSAFE in MmDbgCopyMemory Replace an assert by a log, as this works most of the times. --- ntoskrnl/mm/ARM3/mmdbg.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/mm/ARM3/mmdbg.c b/ntoskrnl/mm/ARM3/mmdbg.c index c47b8cfe156..316b43e1df8 100644 --- a/ntoskrnl/mm/ARM3/mmdbg.c +++ b/ntoskrnl/mm/ARM3/mmdbg.c @@ -132,7 +132,15 @@ MmDbgCopyMemory(IN ULONG64 Address, PVOID CopyDestination, CopySource; /* No local kernel debugging support yet, so don't worry about locking */ - ASSERT(Flags & MMDBG_COPY_UNSAFE); + if (!(Flags & MMDBG_COPY_UNSAFE)) + { + static BOOLEAN Warned = FALSE; + if (!Warned) + { + KdpDprintf("MmDbgCopyMemory: not providing MMDBG_COPY_UNSAFE is UNIMPLEMENTED\n"); + Warned = TRUE; + } + } /* We only handle 1, 2, 4 and 8 byte requests */ if ((Size != 1) &&

1 week, 1 day

[reactos] 05/30: [NTOS:EX] Allow calling ExLockUserBuffer up to DISPATCH_LEVEL

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69cd1e107a1e70afdc7c0… commit 69cd1e107a1e70afdc7c0585c27105d60efeac26 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Fri Aug 16 08:51:06 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 28 22:00:30 2025 +0100 [NTOS:EX] Allow calling ExLockUserBuffer up to DISPATCH_LEVEL --- ntoskrnl/ex/sysinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/ex/sysinfo.c b/ntoskrnl/ex/sysinfo.c index e7e67cd85b9..75e3dd452fd 100644 --- a/ntoskrnl/ex/sysinfo.c +++ b/ntoskrnl/ex/sysinfo.c @@ -208,7 +208,7 @@ ExLockUserBuffer( PMDL *OutMdl) { PMDL Mdl; - PAGED_CODE(); + ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); *MappedSystemVa = NULL; *OutMdl = NULL;

1 week, 1 day

[reactos] 04/30: [NTOS:EX] Add prototypes for ExLockUserBuffer/ExUnlockUserBuffer

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8e25f06b171608955b9c… commit d8e25f06b171608955b9c21781dd3c5f15fcaf4e Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Fri Aug 16 08:50:24 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 28 22:00:29 2025 +0100 [NTOS:EX] Add prototypes for ExLockUserBuffer/ExUnlockUserBuffer --- ntoskrnl/include/internal/ex.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ntoskrnl/include/internal/ex.h b/ntoskrnl/include/internal/ex.h index 4c212972fcb..3b3a2fbafb9 100644 --- a/ntoskrnl/include/internal/ex.h +++ b/ntoskrnl/include/internal/ex.h @@ -1510,6 +1510,20 @@ ExTimerRundown( VOID ); +VOID +NTAPI +ExUnlockUserBuffer(PMDL Mdl); + +NTSTATUS +NTAPI +ExLockUserBuffer( + PVOID BaseAddress, + ULONG Length, + KPROCESSOR_MODE AccessMode, + LOCK_OPERATION Operation, + PVOID *MappedSystemVa, + PMDL *OutMdl); + CODE_SEG("INIT") VOID NTAPI

1 week, 1 day

[reactos] 03/30: [NDK] SYSDBG: Add SysDbgKdPullRemoteFile enum value and structure (Win10 19041+)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c59b5b8cf34a47a59560… commit 2c59b5b8cf34a47a5956092856acdb48248f61a6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 12 21:50:42 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 28 22:00:28 2025 +0100 [NDK] SYSDBG: Add SysDbgKdPullRemoteFile enum value and structure (Win10 19041+) From https://github.com/processhacker/phnt/ --- sdk/include/ndk/kdtypes.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sdk/include/ndk/kdtypes.h b/sdk/include/ndk/kdtypes.h index 77b5545cfed..342f2824469 100644 --- a/sdk/include/ndk/kdtypes.h +++ b/sdk/include/ndk/kdtypes.h @@ -101,6 +101,9 @@ typedef enum _SYSDBG_COMMAND #if (NTDDI_VERSION >= NTDDI_WINBLUE) // NTDDI_WIN81 SysDbgGetLiveKernelDump = 37, #endif +#if (NTDDI_VERSION >= NTDDI_WIN10_VB) + SysDbgKdPullRemoteFile = 38, +#endif } SYSDBG_COMMAND; // @@ -248,6 +251,15 @@ typedef struct _SYSDBG_LIVEDUMP_CONTROL #endif // (NTDDI_VERSION >= NTDDI_WINBLUE) +#if (NTDDI_VERSION >= NTDDI_WIN10_VB) + +typedef struct _SYSDBG_KD_PULL_REMOTE_FILE +{ + UNICODE_STRING ImageFileName; +} SYSDBG_KD_PULL_REMOTE_FILE, *PSYSDBG_KD_PULL_REMOTE_FILE; + +#endif + // // KD Structures //

1 week, 1 day

[reactos] 02/30: [NDK] SYSDBG: Add SysDbgGetLiveKernelDump enum value and structures for kernel live dump.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d37135884e5504be66a5… commit 4d37135884e5504be66a51884804c6af896e4b17 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 12 20:29:21 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 28 22:00:28 2025 +0100 [NDK] SYSDBG: Add SysDbgGetLiveKernelDump enum value and structures for kernel live dump. For more information, see: https://crashdmp.wordpress.com/2014/08/04/livedump-1-0-is-available/ https://github.com/lilhoser/livedump https://gary-nebbett.blogspot.com/2016/04/examining-windows-kernel-mode-sta… https://github.com/processhacker/phnt --- sdk/include/ndk/kdtypes.h | 84 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/sdk/include/ndk/kdtypes.h b/sdk/include/ndk/kdtypes.h index 8ebd21a6f7e..77b5545cfed 100644 --- a/sdk/include/ndk/kdtypes.h +++ b/sdk/include/ndk/kdtypes.h @@ -98,6 +98,9 @@ typedef enum _SYSDBG_COMMAND SysDbgGetUmAttachPid = 35, SysDbgClearUmAttachPid = 36, #endif +#if (NTDDI_VERSION >= NTDDI_WINBLUE) // NTDDI_WIN81 + SysDbgGetLiveKernelDump = 37, +#endif } SYSDBG_COMMAND; // @@ -164,6 +167,87 @@ typedef struct _SYSDBG_TRIAGE_DUMP PHANDLE Handles; } SYSDBG_TRIAGE_DUMP, *PSYSDBG_TRIAGE_DUMP; +#if (NTDDI_VERSION >= NTDDI_WINBLUE) // NTDDI_WIN81 + +typedef union _SYSDBG_LIVEDUMP_CONTROL_FLAGS +{ + struct + { + ULONG UseDumpStorageStack : 1; + ULONG CompressMemoryPagesData : 1; + ULONG IncludeUserSpaceMemoryPages : 1; +#if (NTDDI_VERSION >= NTDDI_WIN10_RS4) + ULONG AbortIfMemoryPressure : 1; +#if (NTDDI_VERSION >= NTDDI_WIN11) + ULONG SelectiveDump : 1; + ULONG Reserved : 27; +#else + ULONG Reserved : 28; +#endif // (NTDDI_VERSION >= NTDDI_WIN11) +#else + ULONG Reserved : 29; +#endif // (NTDDI_VERSION >= NTDDI_WIN10_RS4) + }; + ULONG AsUlong; +} SYSDBG_LIVEDUMP_CONTROL_FLAGS; + +typedef union _SYSDBG_LIVEDUMP_CONTROL_ADDPAGES +{ + struct + { + ULONG HypervisorPages : 1; +#if (NTDDI_VERSION >= NTDDI_WIN11) + ULONG NonEssentialHypervisorPages : 1; + ULONG Reserved : 30; +#else + ULONG Reserved : 31; +#endif + }; + ULONG AsUlong; +} SYSDBG_LIVEDUMP_CONTROL_ADDPAGES; + +#if (NTDDI_VERSION >= NTDDI_WIN11) + +typedef struct _SYSDBG_LIVEDUMP_SELECTIVE_CONTROL +{ + ULONG Version; + ULONG Size; + union + { + ULONGLONG Flags; + struct + { + ULONGLONG ThreadKernelStacks : 1; + ULONGLONG ReservedFlags : 63; + }; + }; + ULONGLONG Reserved[4]; +} SYSDBG_LIVEDUMP_SELECTIVE_CONTROL, *PSYSDBG_LIVEDUMP_SELECTIVE_CONTROL; + +#define SYSDBG_LIVEDUMP_CONTROL_VERSION 1 +#define SYSDBG_LIVEDUMP_CONTROL_VERSION_WIN11 2 + +#endif // (NTDDI_VERSION >= NTDDI_WIN11) + +typedef struct _SYSDBG_LIVEDUMP_CONTROL +{ + ULONG Version; + ULONG BugCheckCode; + ULONG_PTR BugCheckParam1; + ULONG_PTR BugCheckParam2; + ULONG_PTR BugCheckParam3; + ULONG_PTR BugCheckParam4; + PVOID DumpFileHandle; + PVOID CancelEventHandle; + SYSDBG_LIVEDUMP_CONTROL_FLAGS Flags; + SYSDBG_LIVEDUMP_CONTROL_ADDPAGES AddPagesControl; +#if (NTDDI_VERSION >= NTDDI_WIN11) + PSYSDBG_LIVEDUMP_SELECTIVE_CONTROL SelectiveControl; +#endif +} SYSDBG_LIVEDUMP_CONTROL, *PSYSDBG_LIVEDUMP_CONTROL; + +#endif // (NTDDI_VERSION >= NTDDI_WINBLUE) + // // KD Structures //

1 week, 1 day

[reactos] 01/30: [NDK] SYSDBG: Add versioning info for Vista+ commands.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5007e09b1d072e5659d2… commit b5007e09b1d072e5659d226f0a702cefac1c7bd7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 29 20:28:13 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 28 22:00:27 2025 +0100 [NDK] SYSDBG: Add versioning info for Vista+ commands. --- sdk/include/ndk/kdtypes.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/include/ndk/kdtypes.h b/sdk/include/ndk/kdtypes.h index 26eb130cc57..8ebd21a6f7e 100644 --- a/sdk/include/ndk/kdtypes.h +++ b/sdk/include/ndk/kdtypes.h @@ -91,11 +91,13 @@ typedef enum _SYSDBG_COMMAND SysDbgGetTriageDump = 29, SysDbgGetKdBlockEnable = 30, SysDbgSetKdBlockEnable = 31, +#if (NTDDI_VERSION >= NTDDI_VISTA) SysDbgRegisterForUmBreakInfo = 32, SysDbgGetUmBreakPid = 33, SysDbgClearUmBreakPid = 34, SysDbgGetUmAttachPid = 35, SysDbgClearUmAttachPid = 36, +#endif } SYSDBG_COMMAND; //

1 week, 1 day

[reactos] 02/02: [UCRTSUPPORT] Add wine c++ exception code

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae0fa8ba497a01a88b4db… commit ae0fa8ba497a01a88b4dbd58193e227e733b984f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Nov 16 15:08:06 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 28 22:50:04 2025 +0200 [UCRTSUPPORT] Add wine c++ exception code --- dll/win32/ucrtbase/ucrtbase.spec | 80 ++++++++++++++++++++-------------------- sdk/lib/crt/misc/tls.c | 2 + sdk/lib/crt/ucrtsupport.cmake | 53 +++++++++++++++++++++++++- sdk/lib/crt/wine/cpp.c | 11 ++++-- sdk/lib/crt/wine/except.c | 2 +- 5 files changed, 103 insertions(+), 45 deletions(-) diff --git a/dll/win32/ucrtbase/ucrtbase.spec b/dll/win32/ucrtbase/ucrtbase.spec index c137b8080bc..e56735016dc 100644 --- a/dll/win32/ucrtbase/ucrtbase.spec +++ b/dll/win32/ucrtbase/ucrtbase.spec @@ -17,7 +17,7 @@ @ cdecl -stub _Cbuild(ptr double double) @ stub _Cmulcc @ stub _Cmulcr -@ cdecl -stub _CreateFrameInfo(ptr ptr) +@ cdecl _CreateFrameInfo(ptr ptr) @ cdecl -dbg _CrtCheckMemory() @ cdecl -dbg _CrtDbgReport(long str long str str) @ cdecl -dbg _CrtDbgReportW(long wstr long wstr wstr) @@ -46,19 +46,19 @@ @ cdecl -dbg _CrtSetReportHook2() # FIXME: params @ cdecl -dbg _CrtSetReportHookW2() # FIXME: params @ cdecl -dbg _CrtSetReportMode() # FIXME: params -@ stdcall -stub _CxxThrowException(ptr ptr) +@ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _Exit(long) @ stub _FCbuild @ stub _FCmulcc @ stub _FCmulcr -@ cdecl -stub _FindAndUnlinkFrame(ptr) +@ cdecl _FindAndUnlinkFrame(ptr) @ stub _GetImageBase @ stub _GetThrowImageBase @ cdecl _Getdays() @ cdecl _Getmonths() @ cdecl _Gettnames() -@ cdecl -stub _IsExceptionObjectToBeDestroyed(ptr) +@ cdecl _IsExceptionObjectToBeDestroyed(ptr) @ stub _LCbuild @ stub _LCmulcc @ stub _LCmulcr @@ -75,29 +75,29 @@ @ cdecl _W_Getmonths() @ cdecl _W_Gettnames() @ cdecl _Wcsftime(ptr long wstr ptr ptr) -@ cdecl -stub __AdjustPointer(ptr ptr) +@ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper @ cdecl -arch=!i386 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ cdecl -stub -arch=!i386 __C_specific_handler_noexcept(ptr long ptr ptr) -@ cdecl -stub __CxxDetectRethrow(ptr) -@ cdecl -stub __CxxExceptionFilter(ptr ptr long ptr) -@ cdecl -stub -norelay __CxxFrameHandler(ptr ptr ptr ptr) -@ cdecl -stub -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler -@ cdecl -stub -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler +@ cdecl __CxxDetectRethrow(ptr) +@ cdecl __CxxExceptionFilter(ptr ptr long ptr) +@ cdecl -norelay __CxxFrameHandler(ptr ptr ptr ptr) +@ cdecl -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler +@ cdecl -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler @ cdecl -stub -arch=x86_64 __CxxFrameHandler4(ptr long ptr ptr) -@ stdcall -stub -arch=i386 __CxxLongjmpUnwind(ptr) -@ cdecl -stub __CxxQueryExceptionSize() -@ cdecl -stub __CxxRegisterExceptionObject(ptr ptr) -@ cdecl -stub __CxxUnregisterExceptionObject(ptr long) -@ cdecl -stub __DestructExceptionObject(ptr) +@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) +@ cdecl __CxxQueryExceptionSize() +@ cdecl __CxxRegisterExceptionObject(ptr ptr) +@ cdecl __CxxUnregisterExceptionObject(ptr long) +@ cdecl __DestructExceptionObject(ptr) @ stub __FrameUnwindFilter @ stub __GetPlatformExceptionInfo @ stub __NLG_Dispatch2 @ stub __NLG_Return2 -@ cdecl -stub __RTCastToVoid(ptr) -@ cdecl -stub __RTDynamicCast(ptr long ptr ptr long) -@ cdecl -stub __RTtypeid(ptr) +@ cdecl __RTCastToVoid(ptr) +@ cdecl __RTDynamicCast(ptr long ptr ptr long) +@ cdecl __RTtypeid(ptr) @ stub __TypeMatch @ cdecl ___lc_codepage_func() @ cdecl ___lc_collate_cp_func() @@ -114,8 +114,8 @@ @ cdecl __conio_common_vcwprintf_s(int64 wstr ptr ptr) @ cdecl __conio_common_vcwscanf(int64 wstr ptr ptr) @ cdecl -stub -arch=i386 __control87_2(long long ptr ptr) -@ cdecl -stub __current_exception() -@ cdecl -stub __current_exception_context() +@ cdecl __current_exception() +@ cdecl __current_exception_context() @ cdecl __daylight() @ cdecl __dcrt_get_wide_environment_from_os() # FIXME: params @ cdecl __dcrt_initial_narrow_environment() @@ -170,18 +170,18 @@ @ cdecl __p__wenviron() @ cdecl __p__wpgmptr() @ cdecl __pctype_func() -@ cdecl -stub __processing_throw() +@ cdecl __processing_throw() @ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ cdecl __report_gsfailure() @ cdecl __setusermatherr(ptr) -@ cdecl -stub __std_exception_copy(ptr ptr) -@ cdecl -stub __std_exception_destroy(ptr) +@ cdecl __std_exception_copy(ptr ptr) +@ cdecl __std_exception_destroy(ptr) @ cdecl __std_terminate() terminate -@ cdecl -stub __std_type_info_compare(ptr ptr) -@ cdecl -stub __std_type_info_destroy_list(ptr) -@ cdecl -stub __std_type_info_hash(ptr) -@ cdecl -stub __std_type_info_name(ptr ptr) +@ cdecl __std_type_info_compare(ptr ptr) +@ cdecl __std_type_info_destroy_list(ptr) +@ cdecl __std_type_info_hash(ptr) +@ cdecl __std_type_info_name(ptr ptr) @ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) @ cdecl __stdio_common_vfprintf_p(int64 ptr str ptr ptr) @ cdecl __stdio_common_vfprintf_s(int64 ptr str ptr ptr) @@ -210,7 +210,7 @@ @ cdecl __tzname() @ cdecl __unDName(ptr str long ptr ptr long) @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) -@ cdecl -stub __uncaught_exception() +@ cdecl __uncaught_exception() @ cdecl -stub __uncaught_exceptions() @ cdecl __wcserror(wstr) @ cdecl __wcserror_s(ptr long wstr) @@ -267,7 +267,7 @@ @ cdecl _chdrive(long) @ cdecl _chgsign(double) @ cdecl _chgsignf(float) -@ cdecl -stub -arch=i386 -norelay _chkesp() +@ cdecl -arch=i386 -norelay _chkesp() @ cdecl _chmod(str long) @ cdecl _chsize(long long) @ cdecl _chsize_s(long int64) @@ -323,7 +323,7 @@ @ cdecl -stub _except1(long long double double long ptr) @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) -@ cdecl -stub -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) +@ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) @ varargs _execl(str str) @ varargs _execle(str str) @ varargs _execlp(str str) @@ -375,7 +375,7 @@ @ cdecl _flushall() @ cdecl _fpclass(double) @ cdecl -stub -arch=!i386 _fpclassf(float) -@ cdecl -stub _fpieee_flt(long ptr ptr) +@ cdecl _fpieee_flt(long ptr ptr) @ cdecl -stub _fpreset() @ cdecl _fputc_nolock(long ptr) @ cdecl _fputchar(long) @@ -430,7 +430,7 @@ @ cdecl _get_thread_local_invalid_parameter_handler() @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) -@ cdecl -stub _get_unexpected() +@ cdecl _get_unexpected() @ cdecl _get_wide_winmain_command_line() @ cdecl _get_wpgmptr(ptr) @ cdecl _getc_nolock(ptr) _fgetc_nolock @@ -481,7 +481,7 @@ @ cdecl _invalid_parameter_noinfo() @ cdecl _invalid_parameter_noinfo_noreturn() @ cdecl _invoke_watson(wstr wstr wstr long long) -@ stub _is_exception_typeof +@ cdecl _is_exception_typeof(ptr ptr) @ cdecl _isalnum_l(long ptr) @ cdecl _isalpha_l(long ptr) @ cdecl _isatty(long) @@ -612,7 +612,7 @@ @ cdecl _loaddll(str) @ cdecl -arch=win64 _local_unwind(ptr ptr) ntdll._local_unwind @ cdecl -arch=i386 _local_unwind2(ptr long) -@ cdecl -stub -arch=i386 _local_unwind4(ptr ptr long) +@ cdecl -arch=i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) @ cdecl _localtime32_s(ptr ptr) @ cdecl _localtime64(ptr) @@ -1902,7 +1902,7 @@ @ cdecl _pclose(ptr) @ cdecl _pipe(ptr long long) @ cdecl _popen(str str) -@ cdecl -stub _purecall() +@ cdecl _purecall() @ cdecl _putc_nolock(long ptr) _fputc_nolock @ cdecl _putch(long) @ cdecl _putch_nolock(long) @@ -1937,8 +1937,8 @@ @ cdecl _seh_filter_dll(long ptr) # __CppXcptFilter @ cdecl _seh_filter_exe(long ptr) # _XcptFilter @ cdecl -arch=win64 _set_FMA3_enable(long) -@ stdcall -stub -arch=i386 _seh_longjmp_unwind4(ptr) -@ stdcall -stub -arch=i386 _seh_longjmp_unwind(ptr) +@ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) +@ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ cdecl -stub -arch=i386 _set_SSE2_enable(long) @ cdecl _set_abort_behavior(long long) @ cdecl _set_app_type(long) @@ -1951,8 +1951,8 @@ @ cdecl _set_new_handler(ptr) @ cdecl _set_new_mode(long) @ cdecl _set_printf_count_output(long) -@ cdecl -stub _set_purecall_handler(ptr) -@ cdecl -stub _set_se_translator(ptr) +@ cdecl _set_purecall_handler(ptr) +@ cdecl _set_se_translator(ptr) @ cdecl _set_thread_local_invalid_parameter_handler(ptr) @ cdecl _seterrormode(long) @ cdecl -arch=i386 -norelay _setjmp3(ptr long) @@ -2549,7 +2549,7 @@ @ cdecl -stub scalbnf(float long) # float scalbnf(float x, int exp); @ cdecl scalbnl(double long) scalbn # long double scalbnl(long double x, int exp); @ cdecl set_terminate(ptr) -@ cdecl -stub set_unexpected(ptr) +@ cdecl set_unexpected(ptr) @ cdecl setbuf(ptr ptr) @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr ptr) _setjmp @ cdecl setlocale(long str) diff --git a/sdk/lib/crt/misc/tls.c b/sdk/lib/crt/misc/tls.c index da5f918d22a..568bd17be65 100644 --- a/sdk/lib/crt/misc/tls.c +++ b/sdk/lib/crt/misc/tls.c @@ -41,8 +41,10 @@ thread_data_t *msvcrt_get_thread_data(void) ptr->tid = GetCurrentThreadId(); ptr->handle = INVALID_HANDLE_VALUE; ptr->random_seed = 1; +#ifndef __UCRTSUPPORT__ ptr->locinfo = MSVCRT_locale->locinfo; ptr->mbcinfo = MSVCRT_locale->mbcinfo; +#endif /* !__UCRTSUPPORT__ */ } SetLastError( err ); return ptr; diff --git a/sdk/lib/crt/ucrtsupport.cmake b/sdk/lib/crt/ucrtsupport.cmake index 18216a5483f..2f558d96db5 100644 --- a/sdk/lib/crt/ucrtsupport.cmake +++ b/sdk/lib/crt/ucrtsupport.cmake @@ -2,21 +2,67 @@ list(APPEND UCRTSUPP_SOURCE ${CRT_FLOAT_SOURCE} ${CRT_MATH_SOURCE} + misc/amsg.c + misc/purecall.c + misc/tls.c + wine/cpp.c + wine/except.c wine/undname.c ) list(APPEND UCRTSUPP_ASM_SOURCE - ${CRT_EXCEPT_ASM_SOURCE} ${CRT_FLOAT_ASM_SOURCE} ${CRT_MATH_ASM_SOURCE} ${CRT_SETJMP_ASM_SOURCE} + ${CRT_WINE_ASM_SOURCE} ) +if(ARCH STREQUAL "i386") + list(APPEND UCRTSUPP_SOURCE + except/i386/CxxHandleV8Frame.c + wine/except_i386.c + ) + list(APPEND UCRTSUPP_ASM_SOURCE + except/i386/__CxxFrameHandler3.s + except/i386/chkesp.s + wine/rosglue_i386.s + ) + if(MSVC) + list(APPEND UCRTSUPP_ASM_SOURCE + except/i386/cpp.s + except/i386/prolog.s + ) + endif() +elseif(ARCH STREQUAL "amd64") + list(APPEND UCRTSUPP_SOURCE + wine/except_x86_64.c + ) + if(MSVC) + list(APPEND UCRTSUPP_ASM_SOURCE + except/amd64/cpp.s + ) + endif() +elseif(ARCH STREQUAL "arm") + list(APPEND UCRTSUPP_SOURCE + wine/except_arm.c + ) + if(MSVC) + list(APPEND UCRTSUPP_ASM_SOURCE + except/arm/cpp.s + ) + endif() +elseif(ARCH STREQUAL "arm64") + list(APPEND UCRTSUPP_SOURCE + wine/except_arm64.c + ) +endif() + add_asm_files(ucrtsupp_asm ${UCRTSUPP_ASM_SOURCE}) add_library(ucrtsupport ${UCRTSUPP_SOURCE} ${ucrtsupp_asm}) target_link_libraries(ucrtsupport chkstk ${PSEH_LIB}) target_compile_definitions(ucrtsupport PRIVATE + __UCRTSUPPORT__ CRTDLL _MSVCRT_LIB_ _MSVCRT_ @@ -24,6 +70,11 @@ target_compile_definitions(ucrtsupport PRIVATE USE_MSVCRT_PREFIX __MINGW_IMPORT=extern __fma3_lib_init=__acrt_initialize_fma3 + set_terminate=_wine_set_terminate + terminate=_wine_terminate + _get_terminate=_wine_get_terminate + unexpected=_wine_unexpected + __pxcptinfoptrs=_wine__pxcptinfoptrs ) #add_pch(crt precomp.h) add_dependencies(ucrtsupport psdk asm) diff --git a/sdk/lib/crt/wine/cpp.c b/sdk/lib/crt/wine/cpp.c index a256569584b..d7cc32aefc7 100644 --- a/sdk/lib/crt/wine/cpp.c +++ b/sdk/lib/crt/wine/cpp.c @@ -1025,7 +1025,7 @@ void WINAPI _CxxThrowException( void *object, const cxx_exception_type *type ) } #endif -#if _MSVCR_VER >= 80 +#if _MSVCR_VER >= 80 || defined(__UCRTSUPPORT__) /********************************************************************* * ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z @@ -1063,6 +1063,8 @@ int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) } } __EXCEPT_PAGE_FAULT + { + } __ENDTRY if(ret == -1) @@ -1104,6 +1106,8 @@ int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) } } __EXCEPT_PAGE_FAULT + { + } __ENDTRY if(ret == -1) @@ -1123,6 +1127,7 @@ void CDECL __clean_type_info_names_internal(void *p) /********************************************************************* * ?_name_internal_method@type_info@@QBEPBDPAU__type_info_node@@@Z (MSVCR100.@) */ +const char * __thiscall type_info_name_internal_method(type_info * _this, struct __type_info_node *node); DEFINE_THISCALL_WRAPPER(type_info_name_internal_method,8) const char * __thiscall type_info_name_internal_method(type_info * _this, struct __type_info_node *node) { @@ -1472,14 +1477,14 @@ bool __cdecl __ExceptionPtrCompare(const exception_ptr *ep1, const exception_ptr #endif /* _MSVCR_VER >= 100 */ -#if _MSVCR_VER >= 80 +#if _MSVCR_VER >= 80 || defined(__UCRTSUPPORT__) void* __cdecl __AdjustPointer(void *obj, const this_ptr_offsets *off) { return get_this_pointer(off, obj); } #endif -#if _MSVCR_VER >= 140 +#if _MSVCR_VER >= 140 || defined(__UCRTSUPPORT__) typedef struct { diff --git a/sdk/lib/crt/wine/except.c b/sdk/lib/crt/wine/except.c index 4679560dae5..8750379225b 100644 --- a/sdk/lib/crt/wine/except.c +++ b/sdk/lib/crt/wine/except.c @@ -487,7 +487,7 @@ struct __std_exception_data { char dofree; }; -#if _MSVCR_VER>=140 +#if _MSVCR_VER>=140 || defined(__UCRTSUPPORT__) /********************************************************************* * __std_exception_copy (UCRTBASE.@)

1 week, 1 day

[reactos] 01/02: [CRT] Split MSVC C++ aliases from cpp.s to cpp_alias.s

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2d69ad98cc10402e8772… commit e2d69ad98cc10402e87722d52e940ed53da48869 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Nov 14 18:36:07 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 28 22:50:04 2025 +0200 [CRT] Split MSVC C++ aliases from cpp.s to cpp_alias.s --- sdk/lib/crt/except/amd64/cpp.s | 58 -------------- sdk/lib/crt/except/amd64/{cpp.s => cpp_alias.s} | 25 ------ sdk/lib/crt/except/arm/cpp.s | 52 ------------ sdk/lib/crt/except/arm/{cpp.s => cpp_alias.s} | 44 ----------- sdk/lib/crt/except/except.cmake | 9 ++- sdk/lib/crt/except/i386/cpp.s | 79 ------------------ sdk/lib/crt/except/i386/{cpp.s => cpp_alias.s} | 101 ------------------------ 7 files changed, 6 insertions(+), 362 deletions(-) diff --git a/sdk/lib/crt/except/amd64/cpp.s b/sdk/lib/crt/except/amd64/cpp.s index ad869b8d609..c4f472d65a1 100644 --- a/sdk/lib/crt/except/amd64/cpp.s +++ b/sdk/lib/crt/except/amd64/cpp.s @@ -28,62 +28,4 @@ DEFINE_EXCEPTION_VTABLE bad_typeid, ??_7bad_typeid@@6B@ DEFINE_EXCEPTION_VTABLE bad_cast, ??_7bad_cast@@6B@ DEFINE_EXCEPTION_VTABLE __non_rtti_object, ??_7__non_rtti_object@@6B@ - -MACRO(DEFINE_ALIAS, alias, orig) -EXTERN &orig:ABS -ALIAS <&alias> = <&orig> -ENDM - -DEFINE_ALIAS ??3@YAXPEAX@Z, operator_delete -DEFINE_ALIAS ??_U@YAPEAX_K@Z, operator_new -DEFINE_ALIAS ??_U@YAPEAX_KHPEBDH@Z, operator_new_dbg -DEFINE_ALIAS ??_V@YAXPEAX@Z, operator_delete -DEFINE_ALIAS ??2@YAPEAX_K@Z, operator_new -DEFINE_ALIAS ??2@YAPEAX_KHPEBDH@Z, operator_new_dbg -DEFINE_ALIAS ?_query_new_handler@@YAP6AHI@ZXZ, _query_new_handler -DEFINE_ALIAS ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z, _set_new_handler -DEFINE_ALIAS ?set_new_handler@@YAP6AXXZP6AXXZ@Z, set_new_handler -DEFINE_ALIAS ?_query_new_mode@@YAHXZ, _query_new_mode -DEFINE_ALIAS ?_set_new_mode@@YAHH@Z, _set_new_mode -DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, _set_se_translator -DEFINE_ALIAS ?set_terminate@@YAP6AXXZP6AXXZ@Z, set_terminate -DEFINE_ALIAS ?set_unexpected@@YAP6AXXZP6AXXZ@Z, set_unexpected -DEFINE_ALIAS ?terminate@@YAXXZ, terminate -DEFINE_ALIAS ?unexpected@@YAXXZ, unexpected -DEFINE_ALIAS ?what@exception@@UEBAPEBDXZ, exception_what -DEFINE_ALIAS ??0exception@@QEAA@AEBQEBDH@Z, exception_ctor_noalloc -DEFINE_ALIAS ??0exception@@QEAA@AEBV0@@Z, exception_copy_ctor -DEFINE_ALIAS ??0exception@@QEAA@XZ, exception_default_ctor -DEFINE_ALIAS ??1exception@@UEAA@XZ, exception_dtor -DEFINE_ALIAS ??4exception@@QEAAAEAV0@AEBV0@@Z, exception_opequals -DEFINE_ALIAS ??1type_info@@UEAA@XZ, type_info_dtor -DEFINE_ALIAS ??0__non_rtti_object@@QEAA@AEBV0@@Z, __non_rtti_object_copy_ctor -DEFINE_ALIAS ??0__non_rtti_object@@QEAA@PEBD@Z, __non_rtti_object_ctor -DEFINE_ALIAS ??0bad_cast@@AAE@PBQBD@Z, bad_cast_ctor -DEFINE_ALIAS ??0bad_cast@@AEAA@PEBQEBD@Z, bad_cast_ctor -DEFINE_ALIAS ??0bad_cast@@QAE@ABQBD@Z, bad_cast_ctor -DEFINE_ALIAS ??0bad_cast@@QEAA@AEBQEBD@Z, bad_cast_ctor -DEFINE_ALIAS ??0bad_cast@@QEAA@AEBV0@@Z, bad_cast_copy_ctor -DEFINE_ALIAS ??0bad_cast@@QEAA@PEBD@Z, bad_cast_ctor_charptr -DEFINE_ALIAS ??0bad_typeid@@QEAA@AEBV0@@Z, bad_typeid_copy_ctor -DEFINE_ALIAS ??0bad_typeid@@QEAA@PEBD@Z, bad_typeid_ctor -DEFINE_ALIAS ??0exception@@QEAA@AEBQEBD@Z, exception_ctor -DEFINE_ALIAS ??1__non_rtti_object@@UEAA@XZ, __non_rtti_object_dtor -DEFINE_ALIAS ??1bad_cast@@UEAA@XZ, bad_cast_dtor -DEFINE_ALIAS ??1bad_typeid@@UEAA@XZ, bad_typeid_dtor -DEFINE_ALIAS ??4bad_cast@@QEAAAEAV0@AEBV0@@Z, bad_cast_opequals -DEFINE_ALIAS ??4bad_typeid@@QEAAAEAV0@AEBV0@@Z, bad_typeid_opequals -DEFINE_ALIAS ??8type_info@@QEBAHAEBV0@@Z, type_info_opequals_equals -DEFINE_ALIAS ??9type_info@@QEBAHAEBV0@@Z, type_info_opnot_equals -DEFINE_ALIAS ??_Fbad_cast@@QEAAXXZ, bad_cast_default_ctor -DEFINE_ALIAS ??_Fbad_typeid@@QEAAXXZ, bad_typeid_default_ctor -DEFINE_ALIAS ?_query_new_handler@@YAP6AH_K@ZXZ, _query_new_handler -DEFINE_ALIAS ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z, _set_new_handler -DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, _set_se_translator -DEFINE_ALIAS ?before@type_info@@QEBAHAEBV1@@Z, type_info_before -DEFINE_ALIAS ?name@type_info@@QEBAPEBDXZ, type_info_name -DEFINE_ALIAS ?raw_name@type_info@@QEBAPEBDXZ, type_info_raw_name -DEFINE_ALIAS ??4__non_rtti_object@@QEAAAEAV0@AEBV0@@Z, __non_rtti_object_opequals - END - diff --git a/sdk/lib/crt/except/amd64/cpp.s b/sdk/lib/crt/except/amd64/cpp_alias.s similarity index 82% copy from sdk/lib/crt/except/amd64/cpp.s copy to sdk/lib/crt/except/amd64/cpp_alias.s index ad869b8d609..a7da20ad93c 100644 --- a/sdk/lib/crt/except/amd64/cpp.s +++ b/sdk/lib/crt/except/amd64/cpp_alias.s @@ -5,30 +5,6 @@ .code64 .align 4 -MACRO(START_VTABLE, shortname, cxxname) -EXTERN shortname&_rtti:PROC -EXTERN &shortname&_vector_dtor:PROC - .quad shortname&_rtti -PUBLIC &shortname&_vtable -&shortname&_vtable: -PUBLIC &cxxname -&cxxname: - .quad &shortname&_vector_dtor -ENDM - -MACRO(DEFINE_EXCEPTION_VTABLE, shortname, cxxname) - START_VTABLE shortname, cxxname - EXTERN exception_what:ABS - .quad exception_what -ENDM - -START_VTABLE type_info, __dummyname_type_info -DEFINE_EXCEPTION_VTABLE exception, ??_7exception@@6B@ -DEFINE_EXCEPTION_VTABLE bad_typeid, ??_7bad_typeid@@6B@ -DEFINE_EXCEPTION_VTABLE bad_cast, ??_7bad_cast@@6B@ -DEFINE_EXCEPTION_VTABLE __non_rtti_object, ??_7__non_rtti_object@@6B@ - - MACRO(DEFINE_ALIAS, alias, orig) EXTERN &orig:ABS ALIAS <&alias> = <&orig> @@ -86,4 +62,3 @@ DEFINE_ALIAS ?raw_name@type_info@@QEBAPEBDXZ, type_info_raw_name DEFINE_ALIAS ??4__non_rtti_object@@QEAAAEAV0@AEBV0@@Z, __non_rtti_object_opequals END - diff --git a/sdk/lib/crt/except/arm/cpp.s b/sdk/lib/crt/except/arm/cpp.s index 5a45e587189..ddc1498896b 100644 --- a/sdk/lib/crt/except/arm/cpp.s +++ b/sdk/lib/crt/except/arm/cpp.s @@ -13,58 +13,6 @@ TEXTAREA - MACRO - DEFINE_ALIAS $FuncName, $Target - LCLS _FuncName - LCLS _Target -_FuncName SETS "|$FuncName|" -_Target SETS "|$Target|" - IMPORT $_FuncName, WEAK $_Target - MEND - - DEFINE_ALIAS ??0__non_rtti_object@@QAA@ABV0@@Z, __non_rtti_object_copy_ctor - DEFINE_ALIAS ??0__non_rtti_object@@QAA@PBD@Z, __non_rtti_object_ctor - DEFINE_ALIAS ??0bad_cast@@AAA@PBQBD@Z, bad_cast_ctor // private: __cdecl bad_cast::bad_cast(char const * const *) - DEFINE_ALIAS ??0bad_cast@@QAA@ABV0@@Z, bad_cast_copy_ctor // public: __cdecl bad_cast::bad_cast(class bad_cast const &) - DEFINE_ALIAS ??0bad_cast@@QAA@PBD@Z, bad_cast_ctor // public: __cdecl bad_cast::bad_cast(char const *) - DEFINE_ALIAS ??0bad_typeid@@QAA@ABV0@@Z, bad_typeid_copy_ctor // public: __cdecl bad_typeid::bad_typeid(class bad_typeid const &) - DEFINE_ALIAS ??0bad_typeid@@QAA@PBD@Z, bad_typeid_ctor // public: __cdecl bad_typeid::bad_typeid(char const *) - DEFINE_ALIAS ??0exception@@QAA@ABQBD@Z, exception_ctor // public: __cdecl exception::exception(char const * const &) - DEFINE_ALIAS ??0exception@@QAA@ABQBDH@Z, exception_ctor_noalloc // public: __cdecl exception::exception(char const * const &,int) - DEFINE_ALIAS ??0exception@@QAA@ABV0@@Z, exception_copy_ctor // public: __cdecl exception::exception(class exception const &) - DEFINE_ALIAS ??0exception@@QAA@XZ, exception_default_ctor // public: __cdecl exception::exception(void) - DEFINE_ALIAS ??1__non_rtti_object@@UAA@XZ, __non_rtti_object_dtor // public: virtual __cdecl __non_rtti_object::~__non_rtti_object(void) - DEFINE_ALIAS ??1bad_cast@@UAA@XZ, bad_cast_dtor // public: virtual __cdecl bad_cast::~bad_cast(void) - DEFINE_ALIAS ??1bad_typeid@@UAA@XZ, bad_typeid_dtor // public: virtual __cdecl bad_typeid::~bad_typeid(void) - DEFINE_ALIAS ??1exception@@UAA@XZ, exception_dtor // public: virtual __cdecl exception::~exception(void) - DEFINE_ALIAS ??1type_info@@UAA@XZ, type_info_dtor // public: virtual __cdecl type_info::~type_info(void) - DEFINE_ALIAS ??2@YAPAXI@Z, operator_new // void * __cdecl operator new(unsigned int) - DEFINE_ALIAS ??2@YAPAXIHPBDH@Z, operator_new_dbg // void * __cdecl operator new(unsigned int,int,char const *,int) - DEFINE_ALIAS ??3@YAXPAX@Z, operator_delete // void __cdecl operator delete(void *) - DEFINE_ALIAS ??4__non_rtti_object@@QAAAAV0@ABV0@@Z, __non_rtti_object_opequals // public: class __non_rtti_object & __cdecl __non_rtti_object::operator=(class __non_rtti_object const &) - DEFINE_ALIAS ??4bad_cast@@QAAAAV0@ABV0@@Z, bad_cast_opequals // public: class bad_cast & __cdecl bad_cast::operator=(class bad_cast const &) - DEFINE_ALIAS ??4bad_typeid@@QAAAAV0@ABV0@@Z, bad_typeid_opequals // public: class bad_typeid & __cdecl bad_typeid::operator=(class bad_typeid const &) - DEFINE_ALIAS ??4exception@@QAAAAV0@ABV0@@Z, exception_opequals // public: class exception & __cdecl exception::operator=(class exception const &) - DEFINE_ALIAS ??8type_info@@QBAHABV0@@Z, type_info_opequals_equals // public: int __cdecl type_info::operator==(class type_info const &)const - DEFINE_ALIAS ??9type_info@@QBAHABV0@@Z, type_info_opnot_equals // public: int __cdecl type_info::operator!=(class type_info const &)const - DEFINE_ALIAS ??_Fbad_cast@@QAAXXZ, bad_cast_default_ctor // public: void __cdecl bad_cast::`default constructor closure'(void) - DEFINE_ALIAS ??_Fbad_typeid@@QAAXXZ, bad_typeid_default_ctor // public: void __cdecl bad_typeid::`default constructor closure'(void) - DEFINE_ALIAS ??_U@YAPAXI@Z, operator_new // void * __cdecl operator new[](unsigned int) - DEFINE_ALIAS ??_U@YAPAXIHPBDH@Z, operator_new_dbg // void * __cdecl operator new[](unsigned int,int,char const *,int) - DEFINE_ALIAS ??_V@YAXPAX@Z, operator_delete // void __cdecl operator delete[](void *) - DEFINE_ALIAS ?_query_new_handler@@YAP6AHI@ZXZ, _query_new_handler // int (__cdecl*__cdecl _query_new_handler(void))(unsigned int) - DEFINE_ALIAS ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z, _set_new_handler // int (__cdecl*__cdecl _set_new_handler(int (__cdecl*)(unsigned int)))(unsigned int) - DEFINE_ALIAS ?_set_new_mode@@YAHH@Z, _set_new_mode // int __cdecl _set_new_mode(int) - DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, _set_se_translator // void (__cdecl*__cdecl _set_se_translator(void (__cdecl*)(unsigned int,struct _EXCEPTION_POINTERS *)))(unsigned int,struct _EXCEPTION_POINTERS *) - DEFINE_ALIAS ?before@type_info@@QBAHABV1@@Z, type_info_before // public: int __cdecl type_info::before(class type_info const &)const - DEFINE_ALIAS ?name@type_info@@QBAPBDXZ, type_info_name // public: char const * __cdecl type_info::name(void)const - DEFINE_ALIAS ?raw_name@type_info@@QBAPBDXZ, type_info_raw_name // public: char const * __cdecl type_info::raw_name(void)const - DEFINE_ALIAS ?set_terminate@@YAP6AXXZP6AXXZ@Z, set_terminate // void (__cdecl*__cdecl set_terminate(void (__cdecl*)(void)))(void) - DEFINE_ALIAS ?set_unexpected@@YAP6AXXZP6AXXZ@Z, set_unexpected // void (__cdecl*__cdecl set_unexpected(void (__cdecl*)(void)))(void) - DEFINE_ALIAS ?terminate@@YAXXZ, terminate // void __cdecl terminate(void) - DEFINE_ALIAS ?unexpected@@YAXXZ, unexpected // void __cdecl unexpected(void) - DEFINE_ALIAS ?what@exception@@UBAPBDXZ, exception_what // public: virtual char const * __cdecl exception::what(void)const - #undef _MSVCRT_ MACRO START_VTABLE $ShortName, $CxxName diff --git a/sdk/lib/crt/except/arm/cpp.s b/sdk/lib/crt/except/arm/cpp_alias.s similarity index 83% copy from sdk/lib/crt/except/arm/cpp.s copy to sdk/lib/crt/except/arm/cpp_alias.s index 5a45e587189..7b6ae45683e 100644 --- a/sdk/lib/crt/except/arm/cpp.s +++ b/sdk/lib/crt/except/arm/cpp_alias.s @@ -65,49 +65,5 @@ _Target SETS "|$Target|" DEFINE_ALIAS ?unexpected@@YAXXZ, unexpected // void __cdecl unexpected(void) DEFINE_ALIAS ?what@exception@@UBAPBDXZ, exception_what // public: virtual char const * __cdecl exception::what(void)const - #undef _MSVCRT_ - MACRO - START_VTABLE $ShortName, $CxxName - LCLS RttiName - LCLS VtblName - LCLS DtorName - LCLS CxxLabel -CxxLabel SETS "|$CxxName|" -RttiName SETS "|$ShortName._rtti|" -VtblName SETS "|":CC:"$ShortName._vtable|" -DtorName SETS "|":CC:"$ShortName._vector_dtor|" - EXTERN $RttiName - DCD $RttiName - EXPORT $VtblName -$VtblName - EXPORT $CxxLabel -$CxxLabel - EXTERN $DtorName - DCD $DtorName - MEND - - MACRO - DEFINE_EXCEPTION_VTABLE $ShortName, $CxxName - START_VTABLE $ShortName, $CxxName - EXTERN exception_what - DCD exception_what - MEND - - START_VTABLE type_info, __dummyname_type_info - DEFINE_EXCEPTION_VTABLE exception, ??_7exception@@6B@ - DEFINE_EXCEPTION_VTABLE bad_typeid, ??_7bad_typeid@@6B@ - DEFINE_EXCEPTION_VTABLE bad_cast, ??_7bad_cast@@6B@ - DEFINE_EXCEPTION_VTABLE __non_rtti_object, ??_7__non_rtti_object@@6B@ - - GBLS FuncName - - //EXTERN operator_delete - //__ExportName ??3@YAXPAX@Z - //b operator_delete - - //EXTERN operator_new - //__ExportName ??_U@YAPAXI@Z - //b operator_new - END /* EOF */ diff --git a/sdk/lib/crt/except/except.cmake b/sdk/lib/crt/except/except.cmake index 656853c097c..add149de4ec 100644 --- a/sdk/lib/crt/except/except.cmake +++ b/sdk/lib/crt/except/except.cmake @@ -13,7 +13,8 @@ if(ARCH STREQUAL "i386") ) if(MSVC) list(APPEND CRT_EXCEPT_ASM_SOURCE - except/i386/cpp.s) + except/i386/cpp.s + except/i386/cpp_alias.s) endif() elseif(ARCH STREQUAL "amd64") list(APPEND LIBCNTPR_EXCEPT_SOURCE @@ -28,7 +29,8 @@ elseif(ARCH STREQUAL "amd64") ) if(MSVC) list(APPEND CRT_EXCEPT_ASM_SOURCE - except/amd64/cpp.s) + except/amd64/cpp.s + except/amd64/cpp_alias.s) endif() elseif(ARCH STREQUAL "arm") list(APPEND LIBCNTPR_EXCEPT_SOURCE @@ -53,7 +55,8 @@ elseif(ARCH STREQUAL "arm") ) if(MSVC) list(APPEND CRT_EXCEPT_ASM_SOURCE - except/arm/cpp.s) + except/arm/cpp.s + except/arm/cpp_alias.s) endif() endif() diff --git a/sdk/lib/crt/except/i386/cpp.s b/sdk/lib/crt/except/i386/cpp.s index 99e2748edd6..7c524938dd4 100644 --- a/sdk/lib/crt/except/i386/cpp.s +++ b/sdk/lib/crt/except/i386/cpp.s @@ -7,55 +7,6 @@ EXTERN _cxx_frame_handler:PROC -MACRO(DEFINE_THISCALL_ALIAS, cxxname, target) -#ifdef _USE_ML - EXTERN ___thiscall&target:PROC - ALIAS <&cxxname> = <___thiscall&target> -#else - PUBLIC cxxname - .weakref &cxxname, &target -#endif -ENDM - -DEFINE_THISCALL_ALIAS ??0exception@@QAE@ABQBD@Z, _exception_ctor -DEFINE_THISCALL_ALIAS ??0exception@@QAE@ABQBDH@Z, _exception_ctor_noalloc -DEFINE_THISCALL_ALIAS ??0exception@@QAE@ABV0@@Z, _exception_copy_ctor -DEFINE_THISCALL_ALIAS ??0exception@@QAE@XZ, _exception_default_ctor -DEFINE_THISCALL_ALIAS ??1exception@@UAE@XZ, _exception_dtor -DEFINE_THISCALL_ALIAS ??4exception@@QAEAAV0@ABV0@@Z, _exception_opequals -DEFINE_THISCALL_ALIAS ??_Eexception@@UAEPAXI@Z, _exception_vector_dtor -DEFINE_THISCALL_ALIAS ??_Gexception@@UAEPAXI@Z, _exception_scalar_dtor -DEFINE_THISCALL_ALIAS ?what@exception@@UBEPBDXZ, _exception_what -DEFINE_THISCALL_ALIAS ??0bad_typeid@@QAE@ABV0@@Z, _bad_typeid_copy_ctor -DEFINE_THISCALL_ALIAS ??0bad_typeid@@QAE@PBD@Z, _bad_typeid_ctor -DEFINE_THISCALL_ALIAS ??_Fbad_typeid@@QAEXXZ, _bad_typeid_default_ctor -DEFINE_THISCALL_ALIAS ??1bad_typeid@@UAE@XZ, _bad_typeid_dtor -DEFINE_THISCALL_ALIAS ??4bad_typeid@@QAEAAV0@ABV0@@Z, _bad_typeid_opequals -DEFINE_THISCALL_ALIAS ??_Ebad_typeid@@UAEPAXI@Z, _bad_typeid_vector_dtor -DEFINE_THISCALL_ALIAS ??_Gbad_typeid@@UAEPAXI@Z, _bad_typeid_scalar_dtor -DEFINE_THISCALL_ALIAS ??0__non_rtti_object@@QAE@ABV0@@Z, ___non_rtti_object_copy_ctor -DEFINE_THISCALL_ALIAS ??0__non_rtti_object@@QAE@PBD@Z, ___non_rtti_object_ctor -DEFINE_THISCALL_ALIAS ??1__non_rtti_object@@UAE@XZ, ___non_rtti_object_dtor -DEFINE_THISCALL_ALIAS ??4__non_rtti_object@@QAEAAV0@ABV0@@Z, ___non_rtti_object_opequals -DEFINE_THISCALL_ALIAS ??_E__non_rtti_object@@UAEPAXI@Z, ___non_rtti_object_vector_dtor -DEFINE_THISCALL_ALIAS ??_G__non_rtti_object@@UAEPAXI@Z, ___non_rtti_object_scalar_dtor -DEFINE_THISCALL_ALIAS ??0bad_cast@@AAE@PBQBD@Z, _bad_cast_ctor -DEFINE_THISCALL_ALIAS ??0bad_cast@@QAE@ABQBD@Z, _bad_cast_ctor -DEFINE_THISCALL_ALIAS ??0bad_cast@@QAE@ABV0@@Z, _bad_cast_copy_ctor -DEFINE_THISCALL_ALIAS ??0bad_cast@@QAE@PBD@Z, _bad_cast_ctor_charptr -DEFINE_THISCALL_ALIAS ??_Fbad_cast@@QAEXXZ, _bad_cast_default_ctor -DEFINE_THISCALL_ALIAS ??1bad_cast@@UAE@XZ, _bad_cast_dtor -DEFINE_THISCALL_ALIAS ??4bad_cast@@QAEAAV0@ABV0@@Z, _bad_cast_opequals -DEFINE_THISCALL_ALIAS ??_Ebad_cast@@UAEPAXI@Z, _bad_cast_vector_dtor -DEFINE_THISCALL_ALIAS ??_Gbad_cast@@UAEPAXI@Z, _bad_cast_scalar_dtor -DEFINE_THISCALL_ALIAS ??8type_info@@QBEHABV0@@Z, _type_info_opequals_equals -DEFINE_THISCALL_ALIAS ??9type_info@@QBEHABV0@@Z, _type_info_opnot_equals -DEFINE_THISCALL_ALIAS ?before@type_info@@QBEHABV1@@Z, _type_info_before -DEFINE_THISCALL_ALIAS ??1type_info@@UAE@XZ, _type_info_dtor -DEFINE_THISCALL_ALIAS ?name@type_info@@QBEPBDXZ, _type_info_name -DEFINE_THISCALL_ALIAS ?raw_name@type_info@@QBEPBDXZ, _type_info_raw_name - - #undef _MSVCRT_ MACRO(START_VTABLE, shortname, cxxname) EXTERN _&shortname&_rtti:PROC @@ -80,36 +31,6 @@ DEFINE_EXCEPTION_VTABLE bad_typeid, ??_7bad_typeid@@6B@ DEFINE_EXCEPTION_VTABLE bad_cast, ??_7bad_cast@@6B@ DEFINE_EXCEPTION_VTABLE __non_rtti_object, ??_7__non_rtti_object@@6B@ -EXTERN _operator_delete:PROC -PUBLIC ??3@YAXPAX@Z -??3@YAXPAX@Z: - jmp _operator_delete - -EXTERN _operator_new:PROC -PUBLIC ??_U@YAPAXI@Z -??_U@YAPAXI@Z: - jmp _operator_new - - -MACRO(DEFINE_ALIAS, alias, orig, type) -EXTERN &orig:&type -ALIAS <&alias> = <&orig> -ENDM - -DEFINE_ALIAS ??_V@YAXPAX@Z, _operator_delete, PROC -DEFINE_ALIAS ??2@YAPAXI@Z, _operator_new, PROC -DEFINE_ALIAS ?_query_new_handler@@YAP6AHI@ZXZ, __query_new_handler, PROC -DEFINE_ALIAS ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z, __set_new_handler, PROC -DEFINE_ALIAS ?set_new_handler@@YAP6AXXZP6AXXZ@Z, _set_new_handler, PROC -DEFINE_ALIAS ?_query_new_mode@@YAHXZ, __query_new_mode, PROC -DEFINE_ALIAS ?_set_new_mode@@YAHH@Z, __set_new_mode, PROC -DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, __set_se_translator, PROC -DEFINE_ALIAS ?set_terminate@@YAP6AXXZP6AXXZ@Z, _set_terminate, PROC -DEFINE_ALIAS ?set_unexpected@@YAP6AXXZP6AXXZ@Z, _set_unexpected, PROC -DEFINE_ALIAS ?terminate@@YAXXZ, _terminate, PROC -DEFINE_ALIAS ?unexpected@@YAXXZ, _unexpected, PROC - - // void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); PUBLIC _call_copy_ctor _call_copy_ctor: diff --git a/sdk/lib/crt/except/i386/cpp.s b/sdk/lib/crt/except/i386/cpp_alias.s similarity index 63% copy from sdk/lib/crt/except/i386/cpp.s copy to sdk/lib/crt/except/i386/cpp_alias.s index 99e2748edd6..384a3ed0f52 100644 --- a/sdk/lib/crt/except/i386/cpp.s +++ b/sdk/lib/crt/except/i386/cpp_alias.s @@ -5,8 +5,6 @@ .code .align 4 -EXTERN _cxx_frame_handler:PROC - MACRO(DEFINE_THISCALL_ALIAS, cxxname, target) #ifdef _USE_ML EXTERN ___thiscall&target:PROC @@ -55,31 +53,6 @@ DEFINE_THISCALL_ALIAS ??1type_info@@UAE@XZ, _type_info_dtor DEFINE_THISCALL_ALIAS ?name@type_info@@QBEPBDXZ, _type_info_name DEFINE_THISCALL_ALIAS ?raw_name@type_info@@QBEPBDXZ, _type_info_raw_name - -#undef _MSVCRT_ -MACRO(START_VTABLE, shortname, cxxname) -EXTERN _&shortname&_rtti:PROC -EXTERN ___thiscall_&shortname&_vector_dtor:PROC - .long _&shortname&_rtti -PUBLIC _&shortname&_vtable -_&shortname&_vtable: -PUBLIC &cxxname -&cxxname: - .long ___thiscall_&shortname&_vector_dtor -ENDM - -MACRO(DEFINE_EXCEPTION_VTABLE, shortname, cxxname) - START_VTABLE shortname, cxxname - EXTERN ___thiscall_exception_what:PROC - .long ___thiscall_exception_what -ENDM - -START_VTABLE type_info, __dummyname_type_info -DEFINE_EXCEPTION_VTABLE exception, ??_7exception@@6B@ -DEFINE_EXCEPTION_VTABLE bad_typeid, ??_7bad_typeid@@6B@ -DEFINE_EXCEPTION_VTABLE bad_cast, ??_7bad_cast@@6B@ -DEFINE_EXCEPTION_VTABLE __non_rtti_object, ??_7__non_rtti_object@@6B@ - EXTERN _operator_delete:PROC PUBLIC ??3@YAXPAX@Z ??3@YAXPAX@Z: @@ -90,7 +63,6 @@ PUBLIC ??_U@YAPAXI@Z ??_U@YAPAXI@Z: jmp _operator_new - MACRO(DEFINE_ALIAS, alias, orig, type) EXTERN &orig:&type ALIAS <&alias> = <&orig> @@ -109,78 +81,5 @@ DEFINE_ALIAS ?set_unexpected@@YAP6AXXZP6AXXZ@Z, _set_unexpected, PROC DEFINE_ALIAS ?terminate@@YAXXZ, _terminate, PROC DEFINE_ALIAS ?unexpected@@YAXXZ, _unexpected, PROC - -// void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); -PUBLIC _call_copy_ctor -_call_copy_ctor: - push ebp - CFI_ADJUST_CFA_OFFSET 4 - CFI_REL_OFFSET ebp, 0 - mov ebp, esp - CFI_DEF_CFA_REGISTER ebp - push 1 - mov ecx, [ebp + 12] - push dword ptr [ebp + 16] - call dword ptr [ebp + 8] - leave - CFI_DEF_CFA esp, 4 - CFI_SAME_VALUE ebp - ret - -// void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ); -PUBLIC _continue_after_catch -_continue_after_catch: - mov edx, [esp + 4] - mov eax, [esp + 8] - mov esp, [edx - 4] - lea ebp, [edx + 12] - jmp eax - -// void DECLSPEC_NORETURN call_finally_block( void *code_block, void *base_ptr ); -PUBLIC _call_finally_block -_call_finally_block: - mov ebp, [esp +8] - jmp dword ptr [esp + 4] - -// int call_filter( int (*func)(PEXCEPTION_POINTERS), void *arg, void *ebp ); -PUBLIC _call_filter -_call_filter: - push ebp - push [esp + 12] - mov ebp, [esp + 20] - call dword ptr [esp + 12] - pop ebp - pop ebp - ret - -// void *call_handler( void * (*func)(void), void *ebp ); -PUBLIC _call_handler -_call_handler: - push ebp - push ebx - push esi - push edi - mov ebp, [esp + 24] - call dword ptr [esp + 20] - pop edi - pop esi - pop ebx - pop ebp - ret - - -PUBLIC ___CxxFrameHandler -___CxxFrameHandler: - push 0 - push 0 - push eax - push[esp + 28] - push[esp + 28] - push[esp + 28] - push[esp + 28] - call _cxx_frame_handler - add esp, 28 - ret - END

1 week, 1 day

[reactos] 03/03: [KMTESTS] Temporarily disable the debugger disable/reenable tests (#7424)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40ea0811982ca7faaf4d2… commit 40ea0811982ca7faaf4d243128e793a986d29649 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 12 20:01:20 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 28 15:54:04 2025 +0100 [KMTESTS] Temporarily disable the debugger disable/reenable tests (#7424) They will be re-enabled ONCE our KDBG and KDCOM dlls correctly support disabling and re-enabling. --- modules/rostests/kmtests/ntos_kd/NtSystemDebugControl.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/rostests/kmtests/ntos_kd/NtSystemDebugControl.c b/modules/rostests/kmtests/ntos_kd/NtSystemDebugControl.c index 021fc6b0fcf..352ed6c9f57 100644 --- a/modules/rostests/kmtests/ntos_kd/NtSystemDebugControl.c +++ b/modules/rostests/kmtests/ntos_kd/NtSystemDebugControl.c @@ -180,6 +180,11 @@ START_TEST(NtSystemDebugControl) * the next tests are going to change its state */ WasDebuggerEnabled = SharedUserData->KdDebuggerEnabled; +// +// FIXME: Re-enable ONCE our KDBG and KDCOM dlls support disabling and re-enabling. +// + DBG_UNREFERENCED_LOCAL_VARIABLE(WasDebuggerEnabled); +#if 0 /* Try to disable or enable the debugger, depending on its original state */ if (WasDebuggerEnabled) Command = SysDbgDisableKernelDebugger; // 22 @@ -219,6 +224,8 @@ START_TEST(NtSystemDebugControl) ok_eq_hex_test(Command, Status, STATUS_SUCCESS); else ok_eq_hex_test(Command, Status, STATUS_DEBUGGER_INACTIVE); +#endif +// END FIXME /* Supported commands */

1 week, 1 day

← Newer
1
2
3
4
5
6
7
8
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2025