Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/19: [ASM:X64] ASSERT that interrupts are enabled, when returning to user mode
by Timo Kreuzer 31 Oct '20

31 Oct '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ec888487af60784a3e76… commit 8ec888487af60784a3e7655c676cdb0479a79498 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Feb 12 20:48:11 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Oct 31 14:23:16 2020 +0100 [ASM:X64] ASSERT that interrupts are enabled, when returning to user mode --- ntoskrnl/ke/amd64/trap.S | 5 +++++ sdk/include/asm/trapamd64.inc | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 3bcaa1684bf..75707e1d72d 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -786,6 +786,11 @@ PUBLIC KiSystemCallEntry64 #if DBG /* Restore rbp */ mov rbp, [rsp + SYSCALL_ALLOCATION + KTRAP_FRAME_Rbp] + + test dword ptr [rsp + MAX_SYSCALL_PARAM_SIZE + KTRAP_FRAME_EFlags], HEX(200) + jnz IntsEnabled + int 3 +IntsEnabled: #endif /* Disable interrupts for return */ diff --git a/sdk/include/asm/trapamd64.inc b/sdk/include/asm/trapamd64.inc index 88a8d182cc2..74209493d90 100644 --- a/sdk/include/asm/trapamd64.inc +++ b/sdk/include/asm/trapamd64.inc @@ -142,6 +142,7 @@ ENDM */ MACRO(ExitTrap, Flags) LOCAL kernel_mode_return + LOCAL IntsEnabled #if DBG /* Check previous irql */ @@ -177,6 +178,14 @@ MACRO(ExitTrap, Flags) endif +#if DBG + /*Make sure interrupts are enabled */ + test dword ptr [rbp + KTRAP_FRAME_EFlags], HEX(200) + jnz IntsEnabled + int HEX(2c) +IntsEnabled: +#endif + /* Swap gs to user mode */ swapgs

1 0

[reactos] 01/19: [ASM:X64] Add initial version of kxamd64.inc, macamd64.inc
by Timo Kreuzer 31 Oct '20

31 Oct '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce5aa24c509f765d54877… commit ce5aa24c509f765d5487759f71a216cc67bf9344 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Feb 9 21:04:28 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Oct 31 14:23:16 2020 +0100 [ASM:X64] Add initial version of kxamd64.inc, macamd64.inc --- sdk/include/asm/ksamd64.template.h | 209 +++++++++++++++++++++---------------- sdk/include/asm/ksx.template.h | 142 ++++++++++++++++--------- sdk/include/asm/kxamd64.inc | 82 +++++++++++++++ sdk/include/asm/macamd64.inc | 159 ++++++++++++++++++++++++++++ 4 files changed, 452 insertions(+), 140 deletions(-) diff --git a/sdk/include/asm/ksamd64.template.h b/sdk/include/asm/ksamd64.template.h index 7ad83dc557d..8b3b82ff850 100644 --- a/sdk/include/asm/ksamd64.template.h +++ b/sdk/include/asm/ksamd64.template.h @@ -1,5 +1,8 @@ -RAW("include kxamd64.inc"), +RAW("#include <kxamd64.inc>"), + +SIZE(SizeofPointer, PVOID), + HEADER("CPU type"), CONSTANT(CPU_AMD), @@ -37,6 +40,8 @@ CONSTANT(DEBUG_ACTIVE_DR7), CONSTANT(DEBUG_ACTIVE_INSTRUMENTED), CONSTANT(DEBUG_ACTIVE_DBG_INSTRUMENTED), CONSTANT(DEBUG_ACTIVE_MINIMAL_THREAD), +//CONSTANT(DEBUG_ACTIVE_SET_CONTEXT_STATE_LOCK_BIT), +//CONSTANT(DEBUG_ACTIVE_SET_CONTEXT_STATE_LOCK), CONSTANT(DEBUG_ACTIVE_PRIMARY_THREAD), CONSTANT(DEBUG_ACTIVE_PRIMARY_THREAD_BIT), @@ -58,7 +63,7 @@ CONSTANT(EFLAGS_TF_SHIFT), CONSTANT(EFLAGS_IF_MASK), CONSTANT(EFLAGS_IF_SHIFT), CONSTANT(EFLAGS_ID_MASK), -CONSTANTX(EFLAGS_IF_BIT, EFLAGS_IF_MASK), +CONSTANTX(EFLAGS_IF_BIT, EFLAGS_IF_SHIFT), HEADER("Exception codes"), CONSTANT(EXCEPTION_DIVIDED_BY_ZERO), @@ -77,6 +82,7 @@ CONSTANT(EXCEPTION_GP_FAULT), CONSTANT(EXCEPTION_RESERVED_TRAP), CONSTANT(EXCEPTION_NPX_ERROR), CONSTANT(EXCEPTION_ALIGNMENT_CHECK), +//CONSTANT(EXCEPTION_VIRTUALIZATION_FAULT), HEADER("Legacy Floating Status Bit Masks"), CONSTANT(FSW_INVALID_OPERATION), @@ -105,6 +111,9 @@ HEADER("Hypervisor Enlightenment Definitions"), //CONSTANT(HV_VIRTUAL_APIC_NO_EOI_REQUIRED), // win 10 //CONSTANT(HV_VIRTUAL_APIC_NO_EOI_REQUIRED_V), // not win 10 //CONSTANT(HvApicFlags), +//HvVirtualFaultCode equ 00044H +//HvVirtualFaultParam equ 00048H +//HvExtVirtualizationFaultEpf equ 00001H CONSTANT(KEXCEPTION_ACTIVE_INTERRUPT_FRAME), CONSTANT(KEXCEPTION_ACTIVE_EXCEPTION_FRAME), @@ -122,6 +131,8 @@ CONSTANT(KF_XSTATE), // win 10 CONSTANT(KF_XSAVEOPT_BIT), // win 10 CONSTANT(KF_XSTATE_BIT), // win 10 CONSTANT(KF_RDWRFSGSBASE_BIT), // win 10 +//CONSTANT(KF_XSAVES_BIT), +//CONSTANT(KF_FPU_LEAKAGE_BIT), HEADER("KGDT selectors"), CONSTANT(KGDT64_NULL), @@ -157,6 +168,11 @@ CONSTANT(MSR_GS_SWAP), CONSTANT(MSR_MCG_STATUS), CONSTANT(MSR_AMD_ACCESS), CONSTANT(MSR_IA32_MISC_ENABLE), +CONSTANT(MSR_DEBUG_CTL), +CONSTANT(MSR_LAST_BRANCH_FROM), // not win 10 +CONSTANT(MSR_LAST_BRANCH_TO), // not win 10 +CONSTANT(MSR_LAST_EXCEPTION_FROM), // not win 10 +CONSTANT(MSR_LAST_EXCEPTION_TO), // not win 10 HEADER("Flags for MSR_EFER"), CONSTANT(MSR_LMA), @@ -164,11 +180,6 @@ CONSTANT(MSR_LME), CONSTANT(MSR_SCE), CONSTANT(MSR_NXE), CONSTANT(MSR_PAT), -CONSTANT(MSR_DEBUG_CTL), -CONSTANT(MSR_LAST_BRANCH_FROM), // not win 10 -CONSTANT(MSR_LAST_BRANCH_TO), // not win 10 -CONSTANT(MSR_LAST_EXCEPTION_FROM), // not win 10 -CONSTANT(MSR_LAST_EXCEPTION_TO), // not win 10 HEADER("Flags for MSR_DEBUG_CTL"), //CONSTANT(MSR_DEBUG_CTL_LBR), @@ -241,6 +252,7 @@ CONSTANT(EVENT_INCREMENT), //CONSTANT(KUMS_UCH_VOLATILE_MASK), CONSTANT(PF_COMPARE_EXCHANGE128), //CONSTANT(PF_RDWRFSGSBASE_AVAILABLE), +//CONSTANT(PF_RDTSCP_INSTRUCTION_AVAILABLE), //CONSTANT(UMS_TLS_THREAD_CONTEXT), //CONSTANT(XHF_NOEXECUTE), @@ -362,6 +374,8 @@ OFFSET(ExXmm12, KEXCEPTION_FRAME, Xmm12), OFFSET(ExXmm13, KEXCEPTION_FRAME, Xmm13), OFFSET(ExXmm14, KEXCEPTION_FRAME, Xmm14), OFFSET(ExXmm15, KEXCEPTION_FRAME, Xmm15), +OFFSET(ExOutputBuffer, KEXCEPTION_FRAME, OutputBuffer), // not Win 10 +OFFSET(ExOutputLength, KEXCEPTION_FRAME, OutputLength), // not Win 10 OFFSET(ExMxCsr, KEXCEPTION_FRAME, MxCsr), OFFSET(ExRbp, KEXCEPTION_FRAME, Rbp), OFFSET(ExRbx, KEXCEPTION_FRAME, Rbx), @@ -413,15 +427,21 @@ OFFSET(LfMxCsr, XSAVE_FORMAT, MxCsr), OFFSET(LfMxCsr_Mask, XSAVE_FORMAT, MxCsr_Mask), OFFSET(LfFloatRegisters, XSAVE_FORMAT, FloatRegisters), OFFSET(LfXmmRegisters, XSAVE_FORMAT, XmmRegisters), +//OFFSET(LfFloatSaveLength, XSAVE_FORMAT, FloatSaveLength), + +//X87ErrorOffset equ 0000CH +//X87FloatSaveLength equ 0006CH HEADER("KGDTENTRY64 offsets"), OFFSET(KgdtBaseLow, KGDTENTRY64, BaseLow), OFFSET(KgdtBaseMiddle, KGDTENTRY64, Bytes.BaseMiddle), OFFSET(KgdtBaseHigh, KGDTENTRY64, Bytes.BaseHigh), OFFSET(KgdtBaseUpper, KGDTENTRY64, BaseUpper), +//OFFSET(KgdtFlags1, KGDTENTRY64, Flags1), OFFSET(KgdtLimitHigh, KGDTENTRY64, Bytes.Flags2), OFFSET(KgdtLimitLow, KGDTENTRY64, LimitLow), //CONSTANT(KGDT_LIMIT_ENCODE_MASK), +//CONSTANT(KGDT_ENTRY_PRESENT), HEADER("MACHINE_FRAME offsets"), OFFSET(MfRip, MACHINE_FRAME, Rip), @@ -450,7 +470,7 @@ OFFSET(PbPrcbLock, KPRCB, PrcbLock), #if (NTDDI_VERSION >= NTDDI_VISTA) OFFSET(PbPriorityState, KPRCB, PriorityState), #endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ -OFFSET(PbSetMember, KPRCB, SetMember), +OFFSET(PbSetMember, KPRCB, SetMember), // not Win 10 OFFSET(PbProcessorState, KPRCB, ProcessorState), OFFSET(PbCpuType, KPRCB, CpuType), OFFSET(PbCpuID, KPRCB, CpuID), @@ -468,7 +488,7 @@ OFFSET(PbApicMask, KPRCB, ApicMask), OFFSET(PbCFlushSize, KPRCB, CFlushSize), OFFSET(PbAcpiReserved, KPRCB, AcpiReserved), OFFSET(PbInitialApicId, KPRCB, InitialApicId), -//OFFSET(PbStride, KPRCB, Stride), +//OFFSET(PbStride, KPRCB, Stride), // not Win 10 OFFSET(PbLockQueue, KPRCB, LockQueue), OFFSET(PbPPLookasideList, KPRCB, PPLookasideList), OFFSET(PbPPNPagedLookasideList, KPRCB, PPNPagedLookasideList), @@ -484,16 +504,16 @@ OFFSET(PbLookasideIrpFloat, KPRCB, LookasideIrpFloat), //OFFSET(PbWriteTransferCount, KPRCB, IoWriteTransferCount), //OFFSET(PbOtherTransferCount, KPRCB, IoOtherTransferCount), //OFFSET(PbContextSwitches, KPRCB, KeContextSwitches), -//OFFSET(PbLdtSelector, KPRCB, LdtSelector), -OFFSET(PbTargetSet, KPRCB, TargetSet), +//OFFSET(PbLdtSelector, KPRCB, LdtSelector), // not Win 10 +OFFSET(PbTargetSet, KPRCB, TargetSet), // not Win 10 //OFFSET(PbTargetCount, KPRCB, TargetCount), OFFSET(PbIpiFrozen, KPRCB, IpiFrozen), OFFSET(PbRequestMailbox, KPRCB, RequestMailbox), -OFFSET(PbSenderSummary, KPRCB, SenderSummary), -//OFFSET(PbDpcListHead, KPRCB, DpcListHead), +OFFSET(PbSenderSummary, KPRCB, SenderSummary), // not Win 10 +//OFFSET(PbDpcListHead, KPRCB, DpcListHead), // not Win 10 //OFFSET(PbDpcList, KPRCB, DpcList), //OFFSET(PbDpcLock, KPRCB, DpcLock), -//OFFSET(PbDpcQueueDepth, KPRCB, DpcQueueDepth), +//OFFSET(PbDpcQueueDepth, KPRCB, DpcQueueDepth), // not Win 10 //OFFSET(PbDpcCount, KPRCB, DpcCount), OFFSET(PbDpcStack, KPRCB, DpcStack), OFFSET(PbMaximumDpcQueueDepth, KPRCB, MaximumDpcQueueDepth), @@ -501,18 +521,18 @@ OFFSET(PbDpcRequestRate, KPRCB, DpcRequestRate), OFFSET(PbMinimumDpcRate, KPRCB, MinimumDpcRate), //OFFSET(PbDpcRequestSummary, KPRCB, DpcRequestSummary), //OFFSET(PbNormalDpcState, KPRCB, NormalDpcState), -OFFSET(PbDpcInterruptRequested, KPRCB, DpcInterruptRequested), -OFFSET(PbDpcThreadRequested, KPRCB, DpcThreadRequested), +OFFSET(PbDpcInterruptRequested, KPRCB, DpcInterruptRequested), // not Win 10 +OFFSET(PbDpcThreadRequested, KPRCB, DpcThreadRequested), // not Win 10 OFFSET(PbDpcRoutineActive, KPRCB, DpcRoutineActive), -OFFSET(PbDpcThreadActive, KPRCB, DpcThreadActive), -OFFSET(PbTimerHand, KPRCB, TimerHand), -OFFSET(PbTimerRequest, KPRCB, TimerRequest), -OFFSET(PbTickOffset, KPRCB, TickOffset), +OFFSET(PbDpcThreadActive, KPRCB, DpcThreadActive), // not Win 10 +OFFSET(PbTimerHand, KPRCB, TimerHand), // not Win 10 +OFFSET(PbTimerRequest, KPRCB, TimerRequest), // not Win 10 +OFFSET(PbTickOffset, KPRCB, TickOffset), // not Win 10 //OFFSET(PbInterruptObject, KPRCB, InterruptObject), -OFFSET(PbMasterOffset, KPRCB, MasterOffset), +OFFSET(PbMasterOffset, KPRCB, MasterOffset), // not Win 10 OFFSET(PbDpcLastCount, KPRCB, DpcLastCount), OFFSET(PbQuantumEnd, KPRCB, QuantumEnd), -OFFSET(PbDpcSetEventRequest, KPRCB, DpcSetEventRequest), +OFFSET(PbDpcSetEventRequest, KPRCB, DpcSetEventRequest), // not Win 10 OFFSET(PbIdleSchedule, KPRCB, IdleSchedule), OFFSET(PbReadySummary, KPRCB, ReadySummary), OFFSET(PbDispatcherReadyListHead, KPRCB, DispatcherReadyListHead), @@ -522,17 +542,17 @@ OFFSET(PbUserTime, KPRCB, UserTime), OFFSET(PbDpcTime, KPRCB, DpcTime), OFFSET(PbInterruptTime, KPRCB, InterruptTime), OFFSET(PbAdjustDpcThreshold, KPRCB, AdjustDpcThreshold), -OFFSET(PbSkipTick, KPRCB, SkipTick), -OFFSET(PbPollSlot, KPRCB, PollSlot), +OFFSET(PbSkipTick, KPRCB, SkipTick), // not Win 10 +OFFSET(PbPollSlot, KPRCB, PollSlot), // not Win 10 OFFSET(PbParentNode, KPRCB, ParentNode), OFFSET(PbMultiThreadProcessorSet, KPRCB, MultiThreadProcessorSet), -OFFSET(PbMultiThreadSetMaster, KPRCB, MultiThreadSetMaster), +OFFSET(PbMultiThreadSetMaster, KPRCB, MultiThreadSetMaster), // not Win 10 //OFFSET(PbStartCycles, KPRCB, StartCycles), OFFSET(PbPageColor, KPRCB, PageColor), OFFSET(PbNodeColor, KPRCB, NodeColor), OFFSET(PbNodeShiftedColor, KPRCB,NodeShiftedColor), OFFSET(PbSecondaryColorMask, KPRCB, SecondaryColorMask), -OFFSET(PbSleeping, KPRCB, Sleeping), +OFFSET(PbSleeping, KPRCB, Sleeping), // not Win 10 //OFFSET(PbCycleTime, KPRCB, CycleTime), //OFFSET(PbFastReadNoWait, KPRCB, FastReadNoWait), //OFFSET(PbFastReadWait, KPRCB, FastReadWait), @@ -544,12 +564,13 @@ OFFSET(PbSleeping, KPRCB, Sleeping), //OFFSET(PbExceptionDispatchCount, KPRCB, ExceptionDispatchCount), //OFFSET(PbKeSpinLockOrdering, KPRCB, KeSpinLockOrdering), OFFSET(PbVendorString, KPRCB, VendorString), -OFFSET(PbPowerState, KPRCB, PowerState), +OFFSET(PbPowerState, KPRCB, PowerState), // not Win 10 //OFFSET(PbContext, KPRCB, Context), //OFFSET(PbIsrStack, KPRCB, IsrStack), -//OFFSET(PbEntropyCount, KPRCB, EntropyTimingState.EntropyCount), -//OFFSET(PbEntropyBuffer, KPRCB, EntropyTimingState.Buffer), +//OFFSET(PbEntropyCount, KPRCB, EntropyTimingState.EntropyCount), // not Win 10 +//OFFSET(PbEntropyBuffer, KPRCB, EntropyTimingState.Buffer), // not Win 10 //OFFSET(PbMailbox, KPRCB, Mailbox), +//OFFSET(PbBamFlags, KPRCB, BamFlags), SIZE(ProcessorBlockLength, KPRCB), HEADER("KPCR"), @@ -559,8 +580,8 @@ OFFSET(PcUserRsp, KPCR, UserRsp), OFFSET(PcSelf, KPCR, Self), OFFSET(PcCurrentPrcb, KPCR, CurrentPrcb), OFFSET(PcLockArray, KPCR, LockArray), -//OFFSET(PcTeb, KPCR, Teb), -//OFFSET(PcIdt, KPCR, Idt), +//OFFSET(PcTeb, KPCR, Used_Self), +//OFFSET(PcIdt, KPCR, IdtBase), OFFSET(PcIrql, KPCR, Irql), OFFSET(PcStallScaleFactor, KPCR, StallScaleFactor), OFFSET(PcHalReserved, KPCR, HalReserved), @@ -576,7 +597,7 @@ OFFSET(PcCurrentThread, KIPCR, Prcb.CurrentThread), //OFFSET(PcNestingLevel, KPCR, NestingLevel), OFFSET(PcRspBase, KIPCR, Prcb.RspBase), //OFFSET(PcPrcbLock, KPCR, PrcbLock), -OFFSET(PcSetMember, KIPCR, Prcb.SetMember), +OFFSET(PcSetMember, KIPCR, Prcb.SetMember), // not Win 10 #if 0 OFFSET(PcCr0, KIPCR, Prcb.Cr0), OFFSET(PcCr2, KIPCR, Prcb.Cr2), @@ -610,9 +631,9 @@ OFFSET(PcSystemCalls, KIPCR, Prcb.KeSystemCalls), OFFSET(PcDpcRoutineActive, KIPCR, Prcb.DpcRoutineActive), OFFSET(PcInterruptCount, KIPCR, Prcb.InterruptCount), OFFSET(PcDebuggerSavedIRQL, KIPCR, Prcb.DebuggerSavedIRQL), -OFFSET(PcTickOffset, KIPCR, Prcb.TickOffset), +OFFSET(PcTickOffset, KIPCR, Prcb.TickOffset), // not Win 10 OFFSET(PcMasterOffset, KIPCR, Prcb.MasterOffset), -OFFSET(PcSkipTick, KIPCR, Prcb.SkipTick), +OFFSET(PcSkipTick, KIPCR, Prcb.SkipTick), // not Win 10 #if (NTDDI_VERSION >= NTDDI_LONGHORN) OFFSET(PcVirtualApicAssist, KIPCR, Prcb.VirtualApicAssist), OFFSET(PcStartCycles, KIPCR, Prcb.StartCycles), @@ -620,6 +641,8 @@ OFFSET(PcStartCycles, KIPCR, Prcb.StartCycles), //OFFSET(PcFeatureBits, KIPCR, Prcb.FeatureBits), //OFFSET(PcNmiActive, KIPCR, Prcb.NmiActive), //OFFSET(PcDeepSleep, KIPCR, Prcb.DeepSleep), +//OFFSET(PcSfCode equ 066A8H, KIPCR, Prcb.SfCode), +//OFFSET(PcSfVa equ 066B0H, KIPCR, Prcb.SfVa), SIZE(ProcessorControlRegisterLength, KIPCR), HEADER("KPROCESSOR_START_BLOCK offsets"), @@ -663,6 +686,7 @@ OFFSET(PsMxCsr, KPROCESSOR_STATE, SpecialRegisters.MxCsr), //OFFSET(PsMsrCStar, KPROCESSOR_STATE, MsrCStar), //OFFSET(PsMsrSyscallMask, KPROCESSOR_STATE, MsrSyscallMask), //OFFSET(PsXcr0, KPROCESSOR_STATE, Xcr0), +//OFFSET(PsMsrFsBase, KPROCESSOR_STATE, MsrFsBase), OFFSET(PsContextFrame, KPROCESSOR_STATE, ContextFrame), OFFSET(PsDebugControl, KPROCESSOR_STATE, SpecialRegisters.DebugControl), OFFSET(PsLastBranchToRip, KPROCESSOR_STATE, SpecialRegisters.LastBranchToRip), @@ -698,6 +722,7 @@ OFFSET(SrMsrLStar, KSPECIAL_REGISTERS, MsrLStar), OFFSET(SrMsrCStar, KSPECIAL_REGISTERS, MsrCStar), OFFSET(SrMsrSyscallMask, KSPECIAL_REGISTERS, MsrSyscallMask), //OFFSET(SrXcr0, KSPECIAL_REGISTERS, Xcr0), +//OFFSET(SrMsrFsBase, KSPECIAL_REGISTERS, MsrFsBase), HEADER("KSYSTEM_TIME"), // obsolete in win 10 OFFSET(StLowTime, KSYSTEM_TIME, LowPart), @@ -709,7 +734,7 @@ OFFSET(SwP5Home, KSWITCH_FRAME, P5Home), OFFSET(SwApcBypass, KSWITCH_FRAME, ApcBypass), OFFSET(SwRbp, KSWITCH_FRAME, Rbp), OFFSET(SwReturn, KSWITCH_FRAME, Return), -SIZE(SwitchFrameLength, KSWITCH_FRAME), +SIZE(SwitchFrameLength, KSWITCH_FRAME), // not in Win 10 SIZE(KSWITCH_FRAME_LENGTH, KSWITCH_FRAME), #if (NTDDI_VERSION >= NTDDI_WIN7) @@ -724,60 +749,60 @@ SIZE(KTIMER_TABLE_SIZE, KTIMER_TABLE), #if 0 // FIXME: reloffset??? HEADER("KTRAP_FRAME offsets"), OFFSET(TrP1Home, KTRAP_FRAME, TrP1Home), -TrP2Home, KTRAP_FRAME, TrP1Home), -TrP3Home, KTRAP_FRAME, TrP1Home), -TrP4Home, KTRAP_FRAME, TrP1Home), -TrP5, KTRAP_FRAME, TrP1Home), -TrPreviousMode, KTRAP_FRAME, TrP1Home), -TrPreviousIrql, KTRAP_FRAME, TrP1Home), -TrFaultIndicator, KTRAP_FRAME, TrP1Home), -TrExceptionActive, KTRAP_FRAME, TrP1Home), -TrMxCsr, KTRAP_FRAME, TrP1Home), -TrRax equ 0FFFFFFB0H -TrRcx equ 0FFFFFFB8H -TrRdx equ 0FFFFFFC0H -TrR8 equ 0FFFFFFC8H -TrR9 equ 0FFFFFFD0H -TrR10 equ 0FFFFFFD8H -TrR11 equ 0FFFFFFE0H -TrGsBase equ 0FFFFFFE8H -TrGsSwap equ 0FFFFFFE8H -TrXmm0 equ 0FFFFFFF0H -TrXmm1 equ 00000H -TrXmm2 equ 00010H -TrXmm3 equ 00020H -TrXmm4 equ 00030H -TrXmm5 equ 00040H -TrFaultAddress equ 00050H -TrDr0 equ 00058H -TrDr1 equ 00060H -TrDr2 equ 00068H -TrDr3 equ 00070H -TrDr6 equ 00078H -TrDr7 equ 00080H -TrDebugControl equ 00088H -TrLastBranchToRip equ 00090H -TrLastBranchFromRip equ 00098H -TrLastExceptionToRip equ 000A0H -TrLastExceptionFromRip equ 000A8H -TrSegDs equ 000B0H -TrSegEs equ 000B2H -TrSegFs equ 000B4H -TrSegGs equ 000B6H -TrTrapFrame equ 000B8H -TrRbx equ 000C0H -TrRdi equ 000C8H -TrRsi equ 000D0H -TrRbp equ 000D8H -TrErrorCode equ 000E0H -TrRip equ 000E8H -TrSegCs equ 000F0H -TrLogging equ 000F3H -TrEFlags equ 000F8H -TrRsp equ 00100H -TrSegSs equ 00108H -SIZE(KTRAP_FRAME_LENGTH, KTRAP_FRAME), +OFFSET(TrP2Home, KTRAP_FRAME, TrP2Home), +OFFSET(TrP3Home, KTRAP_FRAME, TrP3Home), +OFFSET(TrP4Home, KTRAP_FRAME, TrP4Home), +OFFSET(TrP5, KTRAP_FRAME, P5), +OFFSET(TrPreviousMode, KTRAP_FRAME, PreviousMode), +OFFSET(TrPreviousIrql, KTRAP_FRAME, PreviousIrql), +OFFSET(TrFaultIndicator, KTRAP_FRAME, TrP1Home), +OFFSET(TrExceptionActive, KTRAP_FRAME, TrP1Home), +OFFSET(TrMxCsr, KTRAP_FRAME, TrP1Home), +OFFSET(TrRax equ 0FFFFFFB0H +OFFSET(TrRcx equ 0FFFFFFB8H +OFFSET(TrRdx equ 0FFFFFFC0H +OFFSET(TrR8 equ 0FFFFFFC8H +OFFSET(TrR9 equ 0FFFFFFD0H +OFFSET(TrR10 equ 0FFFFFFD8H +OFFSET(TrR11 equ 0FFFFFFE0H +OFFSET(TrGsBase equ 0FFFFFFE8H +OFFSET(TrGsSwap equ 0FFFFFFE8H +OFFSET(TrXmm0 equ 0FFFFFFF0H +OFFSET(TrXmm1 equ 00000H +OFFSET(TrXmm2 equ 00010H +OFFSET(TrXmm3 equ 00020H +OFFSET(TrXmm4 equ 00030H +OFFSET(TrXmm5 equ 00040H +OFFSET(TrFaultAddress equ 00050H +OFFSET(TrDr0 equ 00058H +OFFSET(TrDr1 equ 00060H +OFFSET(TrDr2 equ 00068H +OFFSET(TrDr3 equ 00070H +OFFSET(TrDr6 equ 00078H +OFFSET(TrDr7 equ 00080H +OFFSET(TrDebugControl equ 00088H +OFFSET(TrLastBranchToRip equ 00090H +OFFSET(TrLastBranchFromRip equ 00098H +OFFSET(TrLastExceptionToRip equ 000A0H +OFFSET(TrLastExceptionFromRip equ 000A8H +OFFSET(TrSegDs equ 000B0H +OFFSET(TrSegEs equ 000B2H +OFFSET(TrSegFs equ 000B4H +OFFSET(TrSegGs equ 000B6H +OFFSET(TrTrapFrame equ 000B8H +OFFSET(TrRbx equ 000C0H +OFFSET(TrRdi equ 000C8H +OFFSET(TrRsi equ 000D0H +OFFSET(TrRbp equ 000D8H +OFFSET(TrErrorCode equ 000E0H +OFFSET(TrRip equ 000E8H +OFFSET(TrSegCs equ 000F0H +OFFSET(TrLogging equ 000F3H +OFFSET(TrEFlags equ 000F8H +OFFSET(TrRsp equ 00100H +OFFSET(TrSegSs equ 00108H #endif +SIZE(KTRAP_FRAME_LENGTH, KTRAP_FRAME), HEADER("KTSS offsets"), OFFSET(TssRsp0, KTSS64, Rsp0), @@ -818,6 +843,7 @@ HEADER("XSTATE_CONFIGURATION offsets"), OFFSET(XcfgEnabledFeatures, XSTATE_CONFIGURATION, EnabledFeatures), #if (NTDDI_VERSION >= NTDDI_WIN10) OFFSET(XcfgEnabledVolatileFeatures, XSTATE_CONFIGURATION, EnabledFeatures), +OFFSET(XcfgEnabledSupervisorFeatures, XSTATE_CONFIGURATION, EnabledSupervisorFeaturestures), #endif HEADER("XSTATE_CONTEXT offsets"), @@ -834,7 +860,7 @@ CONSTANTX(XSAVE_ALIGN, _alignof(XSAVE_AREA)), HEADER("KTHREAD offsets"), #if (NTDDI_VERSION >= NTDDI_VISTA) -OFFSET(ThTebMappedLowVa, KTHREAD, TebMappedLowVa), +OFFSET(ThTebMappedLowVa, KTHREAD, TebMappedLowVa), // not Win 10 OFFSET(ThUcb, KTHREAD, Ucb), //OFFSET(ThBase, KTHREAD, Base?), //OFFSET(ThLimit, KTHREAD, Limit?), @@ -842,8 +868,8 @@ OFFSET(ThUcb, KTHREAD, Ucb), #if (NTDDI_VERSION >= NTDDI_VISTA) HEADER("KPROCESS offsets"), -OFFSET(PrLdtSystemDescriptor, KPROCESS, LdtSystemDescriptor), -OFFSET(PrLdtBaseAddress, KPROCESS, LdtBaseAddress), +OFFSET(PrLdtSystemDescriptor, KPROCESS, LdtSystemDescriptor), // not Win 10 +OFFSET(PrLdtBaseAddress, KPROCESS, LdtBaseAddress), // not Win 10 #endif @@ -996,6 +1022,7 @@ OFFSET(KTRAP_FRAME_Rdi, KTRAP_FRAME, Rdi), OFFSET(KTRAP_FRAME_Rsi, KTRAP_FRAME, Rsi), OFFSET(KTRAP_FRAME_Rbp, KTRAP_FRAME, Rbp), OFFSET(KTRAP_FRAME_ErrorCode, KTRAP_FRAME, ErrorCode), +OFFSET(KTRAP_FRAME_ExceptionFrame, KTRAP_FRAME, ExceptionFrame), OFFSET(KTRAP_FRAME_TimeStampKlog, KTRAP_FRAME, TimeStampKlog), OFFSET(KTRAP_FRAME_Rip, KTRAP_FRAME, Rip), OFFSET(KTRAP_FRAME_SegCs, KTRAP_FRAME, SegCs), diff --git a/sdk/include/asm/ksx.template.h b/sdk/include/asm/ksx.template.h index 96d64c3d47c..d19b8e2600b 100644 --- a/sdk/include/asm/ksx.template.h +++ b/sdk/include/asm/ksx.template.h @@ -40,6 +40,8 @@ CONSTANT(ATTEMPTED_SWITCH_FROM_DPC), // 0xb8 CONSTANT(KERNEL_SECURITY_CHECK_FAILURE), // 0x139 //CONSTANT(UNSUPPORTED_INSTRUCTION_MODE), // 0x151 //CONSTANT(BUGCHECK_CONTEXT_MODIFIER), // 0x80000000 +//CONSTANT(INVALID_CALLBACK_STACK_ADDRESS), +//CONSTANT(INVALID_KERNEL_STACK_ADDRESS), HEADER("Breakpoints"), CONSTANT(BREAKPOINT_BREAK), @@ -89,6 +91,11 @@ CONSTANT(FAST_FAIL_GUARD_ICALL_CHECK_FAILURE), CONSTANT(FAST_FAIL_INVALID_JUMP_BUFFER), CONSTANT(FAST_FAIL_INVALID_SET_OF_CONTEXT), #endif // _M_ASM64 +//CONSTANT(FAST_FAIL_INVALID_NEXT_THREAD), +//CONSTANT(FAST_FAIL_INVALID_CONTROL_STACK), +//CONSTANT(FAST_FAIL_SET_CONTEXT_DENIED), +//CONSTANT(FAST_FAIL_ENCLAVE_CALL_FAILURE), +//CONSTANT(FAST_FAIL_GUARD_SS_FAILURE), HEADER("Interrupt object types"), CONSTANTX(InLevelSensitive, LevelSensitive), @@ -154,9 +161,8 @@ CONSTANT(LockQueueDispatcherLock), /// FIXE: obsolete //CONSTANT(PERF_IPI_OFFSET), // 00008H //CONSTANT(PERF_IPI_FLAG), // 0400000H //CONSTANT(PERF_IPI), // 040400000H -//CONSTANT(PERF_INTERRUPT), // 020004000H #endif -//CONSTANT(NTOS_YIELD_MACRO), +//CONSTANT(PERF_INTERRUPT), // 020004000H//CONSTANT(NTOS_YIELD_MACRO), HEADER("Process states"), CONSTANT(ProcessInMemory), @@ -223,6 +229,7 @@ CONSTANT(STATUS_UNWIND_CONSOLIDATE), CONSTANT(STATUS_USER_APC), CONSTANT(STATUS_WAKE_SYSTEM), CONSTANT(STATUS_WAKE_SYSTEM_DEBUGGER), +//CONSTANT(STATUS_SET_CONTEXT_DENIED), //HEADER("Thread flags"), //CONSTANT(THREAD_FLAGS_CYCLE_PROFILING), @@ -272,7 +279,7 @@ CONSTANT(WaitAll), HEADER("Stack sizes"), CONSTANT(KERNEL_STACK_SIZE), /// FIXME: Obsolete CONSTANT(KERNEL_LARGE_STACK_SIZE), -CONSTANT(KERNEL_LARGE_STACK_COMMIT), /// FIXME: Obsolete +CONSTANT(KERNEL_LARGE_STACK_COMMIT), //CONSTANT(DOUBLE_FAULT_STACK_SIZE), #ifdef _M_AMD64 CONSTANT(KERNEL_MCA_EXCEPTION_STACK_SIZE), @@ -284,6 +291,8 @@ CONSTANT(ISR_STACK_SIZE), //CONSTANT(KTHREAD_GUI_THREAD_MASK), //CONSTANT(KTHREAD_SYSTEM_THREAD_BIT), //CONSTANT(KTHREAD_QUEUE_DEFER_PREEMPTION_BIT), +//CONSTANT(KTHREAD_RESTRICTED_GUI_THREAD_MASK), +//CONSTANT(KTHREAD_BAM_QOS_LEVEL_MASK), HEADER("Miscellaneous Definitions"), CONSTANT(TRUE), @@ -309,6 +318,8 @@ CONSTANT(INITIAL_STALL_COUNT), //CONSTANT(KI_EXCEPTION_INVALID_OP), // not i386 //CONSTANT(KI_EXCEPTION_INTEGER_DIVIDE_BY_ZERO), // amd64 CONSTANT(KI_EXCEPTION_ACCESS_VIOLATION), +//CONSTANT(KI_EXCEPTION_SECURE_FAULT), +//CONSTANT(KI_EXCEPTION_SEGMENT_NOT_PRESENT), //CONSTANT(KINTERRUPT_STATE_DISABLED_BIT), //CONSTANT(KINTERRUPT_STATE_DISABLED), //CONSTANT(TARGET_FREEZE), // amd64 @@ -318,7 +329,6 @@ CONSTANT(DBG_STATUS_CONTROL_C), //CONSTANT(MM_SHARED_USER_DATA_VA), //CONSTANT(KERNEL_STACK_CONTROL_LARGE_STACK), // FIXME: obsolete //CONSTANT(DISPATCH_LENGTH), // FIXME: obsolete -//CONSTANT(MAXIMUM_PRIMARY_VECTOR), // not arm //CONSTANT(KI_SLIST_FAULT_COUNT_MAXIMUM), // i386 //CONSTANTUSER_CALLBACK_FILTER), @@ -338,6 +348,7 @@ CONSTANT(MODE_MASK), //HEADER("KAFFINITY_EX"), //OFFSET(AfCount, KAFFINITY_EX, Count), //OFFSET(AfBitmap, KAFFINITY_EX, Bitmap), +//SIZE(AffinityExLength, KAFFINITY_EX), //HEADER("Aligned Affinity"), //OFFSET(AfsCpuSet, ???, CpuSet), // FIXME: obsolete @@ -376,7 +387,7 @@ HEADER("CLIENT_ID"), OFFSET(CidUniqueProcess, CLIENT_ID, UniqueProcess), OFFSET(CidUniqueThread, CLIENT_ID, UniqueThread), -HEADER("RTL_CRITICAL_SECTION"), +HEADER("RTL_CRITICAL_SECTION"), // No longer in Win 10 amd64 OFFSET(CsDebugInfo, RTL_CRITICAL_SECTION, DebugInfo), OFFSET(CsLockCount, RTL_CRITICAL_SECTION, LockCount), OFFSET(CsRecursionCount, RTL_CRITICAL_SECTION, RecursionCount), @@ -384,7 +395,7 @@ OFFSET(CsOwningThread, RTL_CRITICAL_SECTION, OwningThread), OFFSET(CsLockSemaphore, RTL_CRITICAL_SECTION, LockSemaphore), OFFSET(CsSpinCount, RTL_CRITICAL_SECTION, SpinCount), -HEADER("RTL_CRITICAL_SECTION_DEBUG"), +HEADER("RTL_CRITICAL_SECTION_DEBUG"), // No longer in Win 10 amd64 OFFSET(CsType, RTL_CRITICAL_SECTION_DEBUG, Type), OFFSET(CsCreatorBackTraceIndex, RTL_CRITICAL_SECTION_DEBUG, CreatorBackTraceIndex), OFFSET(CsCriticalSection, RTL_CRITICAL_SECTION_DEBUG, CriticalSection), @@ -439,6 +450,7 @@ SIZE(ExecutiveProcessObjectLength, EPROCESS), HEADER("ETHREAD offsets"), OFFSET(EtCid, ETHREAD, Cid), // 0x364 +//OFFSET(EtPicoContext, ETHREAD, PicoContext), SIZE(ExecutiveThreadObjectLength, ETHREAD), // 0x418 HEADER("KEVENT"), @@ -520,7 +532,7 @@ OFFSET(KcExceptionList, KSTACK_CONTROL, PreviousExceptionList), SIZE(KSTACK_CONTROL_LENGTH, KSTACK_CONTROL), CONSTANT(KSTACK_ACTUAL_LIMIT_EXPANDED), // move somewhere else? #else -//HEADER("KERNEL_STACK_CONTROL"), +//HEADER("KERNEL_STACK_CONTROL"), // obsolete #endif #if 0 // no longer in win 10, different struct @@ -629,7 +641,6 @@ OFFSET(PrUserTime, KPROCESS, UserTime), OFFSET(PrVdmTrapcHandler, KPROCESS, VdmTrapcHandler), //OFFSET(PrVdmObjects, KPROCESS, VdmObjects), OFFSET(PrFlags, KPROCESS, Flags), -//PrInstrumentationCallback equ 0031CH // ??? #endif SIZE(KernelProcessObjectLength, KPROCESS), @@ -750,12 +761,13 @@ OFFSET(ThSystemCallNumber, KTHREAD, SystemCallNumber), //OFFSET(ThFirstArgument, KTHREAD, FirstArgument), OFFSET(ThTrapFrame, KTHREAD, TrapFrame), OFFSET(ThApcState, KTHREAD, ApcState), -OFFSET(ThPriority, KTHREAD, Priority), +OFFSET(ThPriority, KTHREAD, Priority), // obsolete OFFSET(ThContextSwitches, KTHREAD, ContextSwitches), OFFSET(ThState, KTHREAD, State), +OFFSET(ThProcess, KTHREAD, Process), // thProcess in native headers OFFSET(ThNpxState, KTHREAD, NpxState), OFFSET(ThWaitIrql, KTHREAD, WaitIrql), -OFFSET(ThWaitMode, KTHREAD, WaitMode), +OFFSET(ThWaitMode, KTHREAD, WaitMode), // obsolete OFFSET(ThTeb, KTHREAD, Teb), OFFSET(ThTimer, KTHREAD, Timer), OFFSET(ThWin32Thread, KTHREAD, Win32Thread), @@ -769,31 +781,34 @@ OFFSET(ThSpecialApcDisable, KTHREAD, SpecialApcDisable), OFFSET(ThNextProcessor, KTHREAD, NextProcessor), OFFSET(ThProcess, KTHREAD, Process), OFFSET(ThPreviousMode, KTHREAD, PreviousMode), -OFFSET(ThPriorityDecrement, KTHREAD, PriorityDecrement), +OFFSET(ThPriorityDecrement, KTHREAD, PriorityDecrement), // obsolete OFFSET(ThAdjustReason, KTHREAD, AdjustReason), OFFSET(ThAdjustIncrement, KTHREAD, AdjustIncrement), -OFFSET(ThAffinity, KTHREAD, Affinity), +OFFSET(ThAffinity, KTHREAD, Affinity), // obsolete OFFSET(ThApcStateIndex, KTHREAD, ApcStateIndex), -OFFSET(ThIdealProcessor, KTHREAD, IdealProcessor), -OFFSET(ThApcStatePointer, KTHREAD, ApcStatePointer), -OFFSET(ThSavedApcState, KTHREAD, SavedApcState), +OFFSET(ThIdealProcessor, KTHREAD, IdealProcessor), // obsolete +OFFSET(ThApcStatePointer, KTHREAD, ApcStatePointer), // obsolete +OFFSET(ThSavedApcState, KTHREAD, SavedApcState), // obsolete OFFSET(ThWaitReason, KTHREAD, WaitReason), -OFFSET(ThSaturation, KTHREAD, Saturation), +OFFSET(ThSaturation, KTHREAD, Saturation), // obsolete OFFSET(ThLegoData, KTHREAD, LegoData), //#if defined(_M_ARM) && (NTDDI_VERSION >= NTDDI_WIN10) -//#define ThUserRoBase 0x434 -//#define ThUserRwBase 0x438 +//OFFSET(ThUserRoBase, KTHREAD, UserRoBase), +//OFFSET(ThUserRwBase, KTHREAD, UserRwBase), //#endif #ifdef _M_IX86 -OFFSET(ThSListFaultCount, KTHREAD, WaitReason), // 0x18E -OFFSET(ThSListFaultAddress, KTHREAD, WaitReason), // 0x10 +//OFFSET(ThSListFaultCount, KTHREAD, SListFaultCount), // 0x18E +//OFFSET(ThSListFaultAddress, KTHREAD, ListFaultAddress), // 0x10 #endif // _M_IX86 #if defined(_M_IX86) || defined(_M_AMD64) -OFFSET(ThUserFsBase, KTHREAD, WaitReason), // 0x434 -OFFSET(ThUserGsBase, KTHREAD, WaitReason), // 0x438 +//OFFSET(ThUserFsBase, KTHREAD, UserFsBase), // 0x434 +//OFFSET(ThUserGsBase, KTHREAD, GsBase), // 0x438 #endif // defined SIZE(KernelThreadObjectLength, KTHREAD), +HEADER("ETHREAD"), +//OFFSET(ThSetContextState, ETHREAD, SetContextState), + HEADER("KTIMER"), OFFSET(TiType, KTIMER, Header.Type), OFFSET(TiSize, KTIMER, Header.Size), @@ -876,42 +891,71 @@ OFFSET(WbNextWaitBlock, KWAIT_BLOCK, NextWaitBlock), // not in win10 OFFSET(WbWaitKey, KWAIT_BLOCK, WaitKey), OFFSET(WbWaitType, KWAIT_BLOCK, WaitType), +#ifdef _M_AMD64 +SIZE(KSTART_FRAME_LENGTH, KSTART_FRAME), +#endif #if 0 -//OFFSET(IbCfgBitMap, ????, CfgBitMap), -CONSTANT(Win32BatchFlushCallout 0x7 - - -#define CmThreadEnvironmentBlockOffset 0x1000 -; Process Parameters Block Structure Offset Definitions -#define PpFlags 0x8 - - -// Extended context structure offset definitions -#define CxxLegacyOffset 0x8 -#define CxxLegacyLength 0xc -#define CxxXStateOffset 0x10 -#define CxxXStateLength 0x14 +CONSTANT(CFlushSize), +CONSTANT(Win32BatchFlushCallout), +CONSTANT(ServiceCpupReturnFromSimulatedCode), +CONSTANT(X86AMD64_R3_LONG_MODE_CODE), +CONSTANT(USER_CALLBACK_FILTER), +CONSTANT(SYSTEM_CALL_INT_2E), + +HEADER("Process mitigation option flags"), +CONSTANT(PS_MITIGATION_OPTION_BITS_PER_OPTION), +CONSTANT(PS_MITIGATION_OPTION_ALWAYS_ON), +CONSTANT(PS_MITIGATION_OPTION_ALWAYS_OFF), +CONSTANT(PS_MITIGATION_OPTION_MASK), +CONSTANT(PS_MITIGATION_OPTION_RETURN_FLOW_GUARD), +CONSTANT(PS_MITIGATION_OPTION_RESTRICT_SET_THREAD_CONTEXT), #ifndef _M_ARM -; Bounds Callback Status Code Definitions -BoundExceptionContinueSearch equ 00000H -BoundExceptionHandled equ 00001H -BoundExceptionError equ 00002H +HEADER("Bounds Callback Status Codes"), +CONSTANT(BoundExceptionContinueSearch), +CONSTANT(BoundExceptionHandled), +CONSTANT(BoundExceptionError), #endif +HEADER("PS_SYSTEM_DLL_INIT_BLOCK"), +OFFSET(IbCfgBitMap, PS_SYSTEM_DLL_INIT_BLOCK, CfgBitMap), +OFFSET(IbWow64CfgBitMap, PS_SYSTEM_DLL_INIT_BLOCK, Wow64CfgBitMap), +OFFSET(IbMitigationOptionsMap, PS_SYSTEM_DLL_INIT_BLOCK, MitigationOptionsMap), + +HEADER("Extended context"), +OFFSET(CxxLegacyOffset 0x8 +OFFSET(CxxLegacyLength 0xc +OFFSET(CxxXStateOffset 0x10 +OFFSET(CxxXStateLength 0x14 + +HEADER("Enclave call dispatch frame"), +OFFSET(EcEnclaveNumber, ???, EnclaveNumber), +OFFSET(EcParameterAddress, ???, ParameterAddress), +OFFSET(EcParameterValue, ???, ParameterValue), +OFFSET(EcOriginalReturn, ???, OriginalReturn), +OFFSET(EcFramePointer, ???, FramePointer), +OFFSET(EcReturnAddress, ???, ReturnAddress), + #ifndef _M_ARM -; Enlightenment structure definitions -HeEnlightenments equ 00000H -HeHypervisorConnected equ 00004H -HeEndOfInterrupt equ 00008H -HeApicWriteIcr equ 0000CH -HeSpinCountMask equ 00014H -HeLongSpinWait equ 00018H +HEADER("Enlightenment"), +OFFSET(HeEnlightenments, ???, Enlightenments), +OFFSET(HeHypervisorConnected, ???, HypervisorConnected), +OFFSET(HeEndOfInterrupt, ???, EndOfInterrupt), +OFFSET(HeApicWriteIcr, ???, ApicWriteIcr), +OFFSET(HeSpinCountMask, ???, SpinCountMask), +OFFSET(HeLongSpinWait, ???, LongSpinWait), #endif -// KAFFINITY_EX -#define AffinityExLength 0xc // not i386 +HEADER("Processor Descriptor Area"), +OFFSET(PdaGdt, ????, ), +OFFSET(PdaKernelGsBase, ????, ), + +OFFSET(PpFlags, ????, Flags), +OFFSET(EtwTSLength, ????, ), +OFFSET(CmThreadEnvironmentBlockOffset, ????, ), +OFFSET(PbEntropyCount, ????, ), +OFFSET(PbEntropyBuffer, ????, ), #endif diff --git a/sdk/include/asm/kxamd64.inc b/sdk/include/asm/kxamd64.inc new file mode 100644 index 00000000000..187cf74e4ff --- /dev/null +++ b/sdk/include/asm/kxamd64.inc @@ -0,0 +1,82 @@ +;++ +; PROJECT: ReactOS SDK +; LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) +; PURPOSE: ReactOS AMD64 architecture asm macros +; COPYRIGHT: Timo Kreuzer (timo.kreuzer(a)reactos.org) +;-- + +#include <macamd64.inc> + +MACRO(GENERATE_EXCEPTION_FRAME) + + ; Allocate a KEXCEPTION_FRAME on the stack + ; -8 because the last field is the return address + sub rsp, KEXCEPTION_FRAME_LENGTH - 8 + .allocstack KEXCEPTION_FRAME_LENGTH - 8 + + ; Save non-volatiles in KEXCEPTION_FRAME + mov [rsp + ExRbp], rbp + .savereg rbp, ExRbp + mov [rsp + ExRbx], rbx + .savereg rbx, ExRbx + mov [rsp +ExRdi], rdi + .savereg rdi, ExRdi + mov [rsp + ExRsi], rsi + .savereg rsi, ExRsi + mov [rsp + ExR12], r12 + .savereg r12, ExR12 + mov [rsp + ExR13], r13 + .savereg r13, ExR13 + mov [rsp + ExR14], r14 + .savereg r14, ExR14 + mov [rsp + ExR15], r15 + .savereg r15, ExR15 + movaps [rsp + ExXmm6], xmm6 + .savexmm128 xmm6, ExXmm6 + movaps [rsp + ExXmm7], xmm7 + .savexmm128 xmm7, ExXmm7 + movaps [rsp + ExXmm8], xmm8 + .savexmm128 xmm8, ExXmm8 + movaps [rsp + ExXmm9], xmm9 + .savexmm128 xmm9, ExXmm9 + movaps [rsp + ExXmm10], xmm10 + .savexmm128 xmm10, ExXmm10 + movaps [rsp + ExXmm11], xmm11 + .savexmm128 xmm11, ExXmm11 + movaps [rsp + ExXmm12], xmm12 + .savexmm128 xmm12, ExXmm12 + movaps [rsp + ExXmm13], xmm13 + .savexmm128 xmm13, ExXmm13 + movaps [rsp + ExXmm14], xmm14 + .savexmm128 xmm14, ExXmm14 + movaps [rsp + ExXmm15], xmm15 + .savexmm128 xmm15, ExXmm15 + .endprolog +ENDM + +MACRO(RESTORE_EXCEPTION_STATE) + + ; Restore non-volatile registers + mov rbp, [rsp + ExRbp] + mov rbx, [rsp + ExRbx] + mov rdi, [rsp + ExRdi] + mov rsi, [rsp + ExRsi] + mov r12, [rsp + ExR12] + mov r13, [rsp + ExR13] + mov r14, [rsp + ExR14] + mov r15, [rsp + ExR15] + movaps xmm6, [rsp + ExXmm6] + movaps xmm7, [rsp + ExXmm7] + movaps xmm8, [rsp + ExXmm8] + movaps xmm9, [rsp + ExXmm9] + movaps xmm10, [rsp + ExXmm10] + movaps xmm11, [rsp + ExXmm11] + movaps xmm12, [rsp + ExXmm12] + movaps xmm13, [rsp + ExXmm13] + movaps xmm14, [rsp + ExXmm14] + movaps xmm15, [rsp + ExXmm15] + + ; Clean stack and return + add rsp, KEXCEPTION_FRAME_LENGTH - 8 + +ENDM diff --git a/sdk/include/asm/macamd64.inc b/sdk/include/asm/macamd64.inc new file mode 100644 index 00000000000..e342e440ded --- /dev/null +++ b/sdk/include/asm/macamd64.inc @@ -0,0 +1,159 @@ +;++ +; PROJECT: ReactOS SDK +; LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) +; PURPOSE: ReactOS AMD64 architecture asm macros +; COPYRIGHT: Timo Kreuzer (timo.kreuzer(a)reactos.org) +;-- + +#include <asm.inc> + +MACRO(push_reg, Reg) + push Reg + .pushreg Reg +ENDM + +MACRO(rex_push_reg, Reg) + db HEX(048) ; REX prefix + push Reg + .pushreg Reg +ENDM + +MACRO(push_eflags) + pushfq + .allocstack 8 +ENDM + +MACRO(rex_push_eflags) + db HEX(048) ; REX prefix + pushfq + .allocstack 8 +ENDM + +MACRO(rex_jmp_reg, Reg) + db HEX(048) ; REX prefix / hint tail call to unwinder + jmp Reg +ENDM + +MACRO(ret_zero) + ret +ENDM + +MACRO(alloc_stack, Size) + sub rsp, Size + .allocstack Size +ENDM + +MACRO(save_reg, Reg, Offset) + mov [rsp + Offset], Reg + .savereg Reg, Offset +ENDM + +MACRO(save_xmm128, Reg, Offset) + movaps [rsp + Offset], Reg + .savexmm128 Reg, Offset +ENDM + +MACRO(push_frame, Code) + .pushframe Code +ENDM + +MACRO(set_frame, Reg, Offset) + if Offset + lea Reg, [rsp + Offset] + else + mov Reg, rsp + endif + .setframe Reg, Offset +ENDM + +MACRO(END_PROLOGUE) + .endprolog +ENDM + +MACRO(BEGIN_EPILOGUE) + .beginepilog +ENDM + +MACRO(LEAF_ENTRY, Name, Section, NoPad) + Section segment para 'CODE' + ifb <NoPad> + db 6 dup HEX(CC) + endif + align 16 + public Name +Name proc frame + END_PROLOGUE +ENDM + +MACRO(LEAF_ENTRY_ARG1, Name, Section, Arg1, NoPad) + Section segment para 'CODE' + ifb <NoPad> + db 6 dup HEX(CC) + endif + align 16 + public Name +Name proc frame + END_PROLOGUE +ENDM + +MACRO(LEAF_ENTRY_ARG2, Name, Section, Arg1, Arg2, NoPad) + Section segment para 'CODE' + ifb <NoPad> + db 6 dup HEX(CC) + endif + align 16 + public Name +Name proc frame + END_PROLOGUE +ENDM + +MACRO(LEAF_ENTRY_ARG3, Name, Section, Arg1, Arg2, Arg3, NoPad) + Section segment para 'CODE' + ifb <NoPad> + db 6 dup HEX(CC) + endif + align 16 + public Name +Name proc frame + END_PROLOGUE +ENDM + +MACRO(LEAF_END, Name, section) + Name endp + Section ends +ENDM + +MACRO(NESTED_ENTR, Name, Section, Handler, NoPad) + ifdef _CurrentSection_ + ifdif <Section>, _CurrentSection_ + .err <NESTED_ENTRY invoked for different sections within same module> + endif + endif + _CurrentSection_ EQU <Section> + Section segment para 'CODE' + ifb <NoPad> + db 6 dup (0cch) + endif + align 16 + public Name + ifb <Handler> +Name proc frame + else +Name proc frame:Handler + endif +ENDM + +MACRO(NESTED_END, Name, section) +Name endp +Section ends +ENDM + +MACRO(ALTERNATE_ENTRY, Name) +Name: +ENDM + +MACRO(Yield) + pause +ENDM + +; EOF

1 0

[reactos] 01/01: [COMPILER_APITEST] Add SEH tests from MS (#2435)
by Timo Kreuzer 31 Oct '20

31 Oct '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe36f081c75a0d35aea4e… commit fe36f081c75a0d35aea4ea9a83640f970f7170ff Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 31 11:08:27 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Oct 31 11:08:27 2020 +0100 [COMPILER_APITEST] Add SEH tests from MS (#2435) * [COMPILER_APITEST] Import MS EH/SEH tests Taken from https://github.com/microsoft/compiler-tests * [CRT] Add missing declaration of _longjmpex * [COMPILER_APITEST] Add cmake build files for MS SEH test It is built as a static library * [COMPILER_APITEST] Fix GCC build of MS SEH tests There are a number of hacks in there now. Also the volatile hacks should be separated and sent upstream. * [COMPILER_APITEST] Fix x64 build of MS SEH tests * [COMPILER_APITEST] Fix clang build of MS SEH tests * [COMPILER_APITEST] Include MS SEH tests --- modules/rostests/apitests/compiler/CMakeLists.txt | 5 +- .../rostests/apitests/compiler/ms/CMakeLists.txt | 2 + modules/rostests/apitests/compiler/ms/LICENSE.TXT | 21 + modules/rostests/apitests/compiler/ms/README.md | 28 + modules/rostests/apitests/compiler/ms/changes.txt | 11 + .../rostests/apitests/compiler/ms/eh/ehframes.cpp | 552 + .../rostests/apitests/compiler/ms/eh/ehframes.out | 67 + .../rostests/apitests/compiler/ms/eh/ehthrow.amd64 | 676 + .../rostests/apitests/compiler/ms/eh/ehthrow.arm | 676 + .../rostests/apitests/compiler/ms/eh/ehthrow.cxx | 547 + .../rostests/apitests/compiler/ms/eh/ehthrow.out | 676 + .../rostests/apitests/compiler/ms/eh/ihateeh.cxx | 199 + .../apitests/compiler/ms/eh/ihateeh.out.correct | 73231 +++++++++++++++++++ .../rostests/apitests/compiler/ms/eh/nesttry.cxx | 38 + .../rostests/apitests/compiler/ms/eh/nesttry.out | 7 + .../rostests/apitests/compiler/ms/eh/noreturn.cpp | 54 + .../apitests/compiler/ms/eh/recursive_throw.cpp | 77 + .../apitests/compiler/ms/eh/recursive_throw.out | 21 + .../rostests/apitests/compiler/ms/eh/rethrow1.cpp | 44 + .../rostests/apitests/compiler/ms/eh/rethrow1.out | 9 + .../rostests/apitests/compiler/ms/eh/rethrow4.cpp | 44 + .../rostests/apitests/compiler/ms/eh/rethrow4.out | 9 + .../rostests/apitests/compiler/ms/eh/rethrow5.cpp | 43 + .../rostests/apitests/compiler/ms/eh/rethrow5.out | 6 + .../apitests/compiler/ms/eh/rethrow_unknown.cpp | 58 + .../rostests/apitests/compiler/ms/eh/runtest.cmd | 71 + .../rostests/apitests/compiler/ms/eh/terminate.cpp | 123 + .../rostests/apitests/compiler/ms/eh/terminate.out | 11 + .../apitests/compiler/ms/eh/unreachedeh.cpp | 17 + .../rostests/apitests/compiler/ms/eh/vcatch.cpp | 57 + .../apitests/compiler/ms/seh/CMakeLists.txt | 26 + .../rostests/apitests/compiler/ms/seh/clean.cmd | 122 + .../rostests/apitests/compiler/ms/seh/runtests.cmd | 196 + modules/rostests/apitests/compiler/ms/seh/seh.h | 31 + .../rostests/apitests/compiler/ms/seh/seh0001.c | 31 + .../rostests/apitests/compiler/ms/seh/seh0002.c | 36 + .../rostests/apitests/compiler/ms/seh/seh0003.c | 34 + .../rostests/apitests/compiler/ms/seh/seh0004.c | 33 + .../rostests/apitests/compiler/ms/seh/seh0005.c | 38 + .../rostests/apitests/compiler/ms/seh/seh0006.c | 55 + .../rostests/apitests/compiler/ms/seh/seh0007.c | 56 + .../rostests/apitests/compiler/ms/seh/seh0008.c | 42 + .../rostests/apitests/compiler/ms/seh/seh0009.c | 46 + .../rostests/apitests/compiler/ms/seh/seh0010.c | 57 + .../rostests/apitests/compiler/ms/seh/seh0011.c | 64 + .../rostests/apitests/compiler/ms/seh/seh0012.c | 50 + .../rostests/apitests/compiler/ms/seh/seh0013.c | 69 + .../rostests/apitests/compiler/ms/seh/seh0014.c | 49 + .../rostests/apitests/compiler/ms/seh/seh0015.c | 48 + .../rostests/apitests/compiler/ms/seh/seh0016.c | 56 + .../rostests/apitests/compiler/ms/seh/seh0017.c | 46 + .../rostests/apitests/compiler/ms/seh/seh0018.c | 62 + .../rostests/apitests/compiler/ms/seh/seh0019.c | 59 + .../rostests/apitests/compiler/ms/seh/seh0020.c | 35 + .../rostests/apitests/compiler/ms/seh/seh0021.c | 43 + .../rostests/apitests/compiler/ms/seh/seh0022.c | 47 + .../rostests/apitests/compiler/ms/seh/seh0023.c | 49 + .../rostests/apitests/compiler/ms/seh/seh0024.c | 87 + .../rostests/apitests/compiler/ms/seh/seh0025.c | 85 + .../rostests/apitests/compiler/ms/seh/seh0026.c | 77 + .../rostests/apitests/compiler/ms/seh/seh0027.c | 91 + .../rostests/apitests/compiler/ms/seh/seh0028.c | 42 + .../rostests/apitests/compiler/ms/seh/seh0029.c | 70 + .../rostests/apitests/compiler/ms/seh/seh0030.c | 39 + .../rostests/apitests/compiler/ms/seh/seh0031.c | 45 + .../rostests/apitests/compiler/ms/seh/seh0032.c | 44 + .../rostests/apitests/compiler/ms/seh/seh0033.c | 56 + .../rostests/apitests/compiler/ms/seh/seh0034.c | 48 + .../rostests/apitests/compiler/ms/seh/seh0035.c | 55 + .../rostests/apitests/compiler/ms/seh/seh0036.c | 51 + .../rostests/apitests/compiler/ms/seh/seh0037.c | 38 + .../rostests/apitests/compiler/ms/seh/seh0038.c | 42 + .../rostests/apitests/compiler/ms/seh/seh0039.c | 43 + .../rostests/apitests/compiler/ms/seh/seh0040.c | 57 + .../rostests/apitests/compiler/ms/seh/seh0041.c | 48 + .../rostests/apitests/compiler/ms/seh/seh0042.c | 56 + .../rostests/apitests/compiler/ms/seh/seh0043.c | 55 + .../rostests/apitests/compiler/ms/seh/seh0044.c | 52 + .../rostests/apitests/compiler/ms/seh/seh0045.c | 50 + .../rostests/apitests/compiler/ms/seh/seh0046.c | 56 + .../rostests/apitests/compiler/ms/seh/seh0047.c | 55 + .../rostests/apitests/compiler/ms/seh/seh0048.c | 52 + .../rostests/apitests/compiler/ms/seh/seh0049.c | 60 + .../rostests/apitests/compiler/ms/seh/seh0050.c | 52 + .../rostests/apitests/compiler/ms/seh/seh0051.c | 39 + .../rostests/apitests/compiler/ms/seh/seh0052.c | 41 + .../rostests/apitests/compiler/ms/seh/seh0053.c | 45 + .../rostests/apitests/compiler/ms/seh/seh0054.c | 56 + .../rostests/apitests/compiler/ms/seh/seh0055.c | 51 + .../rostests/apitests/compiler/ms/seh/seh0056.c | 40 + .../rostests/apitests/compiler/ms/seh/seh0057.c | 40 + .../rostests/apitests/compiler/ms/seh/seh0058.c | 38 + .../apitests/compiler/ms/seh/seh_noreturn.c | 25 + .../apitests/compiler/ms/seh/sehframes.cpp | 974 + .../apitests/compiler/ms/seh/sehframes.out | 99 + modules/rostests/apitests/compiler/ms/seh/xcpt4u.c | 3463 + .../apitests/compiler/ms/seh/xcpt4u.correct | 89 + .../rostests/apitests/compiler/ms/seh/xcpt4u.out | 89 + .../apitests/compiler/ms/seh/xcpt4u.test.out | 89 + modules/rostests/apitests/compiler/ms_seh.c | 144 + modules/rostests/apitests/compiler/testlist.c | 2 + sdk/include/crt/setjmpex.h | 1 + 102 files changed, 85690 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/compiler/CMakeLists.txt b/modules/rostests/apitests/compiler/CMakeLists.txt index 1cff26dbe19..7bd2a6a6b22 100644 --- a/modules/rostests/apitests/compiler/CMakeLists.txt +++ b/modules/rostests/apitests/compiler/CMakeLists.txt @@ -1,12 +1,15 @@ +add_subdirectory(ms) + list(APPEND SOURCE + ms_seh.c pseh.c pseh_cpp.cpp psehtest2.c testlist.c) add_executable(compiler_apitest ${SOURCE}) -target_link_libraries(compiler_apitest wine ${PSEH_LIB}) +target_link_libraries(compiler_apitest ms_seh_test wine ${PSEH_LIB}) set_module_type(compiler_apitest win32cui) add_importlibs(compiler_apitest msvcrt kernel32 ntdll) add_rostests_file(TARGET compiler_apitest) diff --git a/modules/rostests/apitests/compiler/ms/CMakeLists.txt b/modules/rostests/apitests/compiler/ms/CMakeLists.txt new file mode 100644 index 00000000000..0e707316d3f --- /dev/null +++ b/modules/rostests/apitests/compiler/ms/CMakeLists.txt @@ -0,0 +1,2 @@ + +add_subdirectory(seh) diff --git a/modules/rostests/apitests/compiler/ms/LICENSE.TXT b/modules/rostests/apitests/compiler/ms/LICENSE.TXT new file mode 100644 index 00000000000..7bb386e6f7e --- /dev/null +++ b/modules/rostests/apitests/compiler/ms/LICENSE.TXT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) Microsoft Corporation + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/modules/rostests/apitests/compiler/ms/README.md b/modules/rostests/apitests/compiler/ms/README.md new file mode 100644 index 00000000000..678ae8ceaec --- /dev/null +++ b/modules/rostests/apitests/compiler/ms/README.md @@ -0,0 +1,28 @@ +Microsoft compiler-tests +======================== + +Introduction +------------ +This repo includes selected tests from the Microsoft compiler-tests directory. +The initial focus is on exception handling tests, both for C++EH and SEH, to make it easier to test WinEH implementations for compatibility with the platform. The expectation is that this set of tests will grow and ultimately be added to the LLVM test-suite. Opening this as a separate repo is intended as a stop gap as the work to get the LLVM test-suite to run clean on Windows progresses. + +Supported Platforms +------------------- +The first round of tests being opened are EH, the bulk of which are SEH tests. This is naturally Windows specific. Additionally only the most rudimentary harness is included (runtests.cmd) due to our objective to move these tests into the LLVM harness. + +Quick Start +----------- +There are two main sub directories in the compiler-tests directory. The descriptions of what they contain are listed below. Overtime we expect to open more tests in these directories as well as add new areas of testing. + +####EH (C++EH) +Only one test is included here now, ihateeh.cxx. This tests object destructor semantics on Windows. Compile the file with usual flag combinations (MSVC) and compare with the output file ihateeh.out.correct. + +####SEH +The main tests in this directory are sehframes.cpp which tests various funclet frames, and xcpt4u.c which is a large collection of SEH torture tests. This last test is one of the main litmus tests used to verify that a compiler supports SEH suffiently to be used in the Windows kernel. Remaining sehxxxx.c tests are particular break outs from xcpt4u.c for ease of debugging. + +- Run the runtest.cmd in the seh directory to build the tests with MSVC. +- Run the clean.cmd to clean up obj/exes left after running the tests. + +Next Steps +---------- +More tests will follow. If there are particular areas where there are questions please open an issue and we'll see if there are tests that can meet the need. diff --git a/modules/rostests/apitests/compiler/ms/changes.txt b/modules/rostests/apitests/compiler/ms/changes.txt new file mode 100644 index 00000000000..03e47affad4 --- /dev/null +++ b/modules/rostests/apitests/compiler/ms/changes.txt @@ -0,0 +1,11 @@ +Outline of changes from the old legacy tree to clean up for the open. + +all +- Removed commented out legacy code hooking to the old test.h system. +- Formated to LLVM style. + +xcpt4u.c +- Cleaned up old comments refering to old products/bug numbers. + +ihateeh.cxx +- Switched main to return int. diff --git a/modules/rostests/apitests/compiler/ms/eh/ehframes.cpp b/modules/rostests/apitests/compiler/ms/eh/ehframes.cpp new file mode 100644 index 00000000000..3d1684dc2b6 --- /dev/null +++ b/modules/rostests/apitests/compiler/ms/eh/ehframes.cpp @@ -0,0 +1,552 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for +// full license information. + +/* + * Exercise lots of different kinds of C++ EH frames. Compile this with + * every combination of opts you can to stress the C++ EH frame code in the + * backend. + */ + +#include <stdio.h> +#include <malloc.h> + +#ifndef ALIGN +#define ALIGN 64 +#endif + +extern int TestFunc(int, ...); + +int failures; + +int global; +bool TestFuncThrows; + +struct SmallObj +{ + virtual ~SmallObj() + { + TestFunc(1, this); + }; + + int x; +}; + +struct BigObj +{ + virtual ~BigObj() + { + TestFunc(1, this); + }; + + char x[4096]; +}; + +int Simple(int arg) +{ + puts(__FUNCTION__); + int res = 0; + SmallObj f; + return TestFunc(1, &f, &res, &arg); +} + +int Try(int arg) +{ + puts(__FUNCTION__); + int res = 0; + SmallObj f; + try { + res = TestFunc(1, &f, &res, &arg); + } catch (double) { + res = TestFunc(2, &f, &res, &arg); + } + return res; +} + +int GSCookie(int arg) +{ + puts(__FUNCTION__); + int res = 0; + char buf[16]; + SmallObj f; + return TestFunc(1, buf, &f, &res, &arg); +} + +int TryAndGSCookie(int arg) +{ + puts(__FUNCTION__); + int res = 0; + char buf[16]; + SmallObj f; + try { + res = TestFunc(1, &buf, &f, &res, &arg); + } catch (double) { + res = TestFunc(2, &buf, &f, &res, &arg); + } + return res; +} + +int Align(int arg) +{ + puts(__FUNCTION__); + int res = 0; + __declspec(align(ALIGN)) double d[4]; + SmallObj f; + return TestFunc(1, d, &f, &res, &arg); +} + +int TryAndAlign(int arg) +{ + puts(__FUNCTION__); + int res = 0; + __declspec(align(ALIGN)) double d[4]; + SmallObj f; + try { + res = TestFunc(1, d, &f, &res, &arg); + } catch (double) { + res = TestFunc(2, d, &f, &res, &arg); + } + return res; +} + +int GSCookieAndAlign(int arg) +{ + puts(__FUNCTION__); + int res = 0; + char buf[16]; + __declspec(align(ALIGN)) double d[4]; + SmallObj f; + return TestFunc(1, buf, d, &f, &res, &arg); +} + +int TryAndGSCookieAndAlign(int arg) +{ + puts(__FUNCTION__); + int res = 0; + char buf[16]; + __declspec(align(ALIGN)) double d[4]; + SmallObj f; + try { + res = TestFunc(1, buf, d, &f, &res, &arg); + } catch (double) { + res = TestFunc(2, buf, d, &f, &res, &arg); + } + return res; +} + +int Alloca(int arg) +{ + puts(__FUNCTION__); + int res = 0; + SmallObj f; + return TestFunc(1, _alloca(global), &f, &res, &arg); +} + +int TryAndAlloca(int arg) +{ + puts(__FUNCTION__); + int res = 0; + SmallObj f; + try { + res = TestFunc(1, _alloca(global), &f, &res, &arg); + } catch (double) { + res = TestFunc(2, &f, &res, &arg); + } + return res; +} + +int GSCookieAndAlloca(int arg) +{ + puts(__FUNCTION__); + int res = 0; + char buf[16]; + SmallObj f; + return TestFunc(1, buf, _alloca(global), &f, &res, &arg); +} + +int TryAndGSCookieAndAlloca(int arg) +{ + puts(__FUNCTION__); + int res = 0; + char buf[16]; + SmallObj f; + try { + res = TestFunc(1, &buf, _alloca(global), &f, &res, &arg); + } catch (double) { + res = TestFunc(2, &buf, &f, &res, &arg); + } + return res; +} + +int AlignAndAlloca(int arg) +{ + puts(__FUNCTION__); + int res = 0; + __declspec(align(ALIGN)) double d[4]; + SmallObj f; + return TestFunc(1, d, _alloca(global), &f, &res, &arg); +} + +int TryAndAlignAndAlloca(int arg) +{ + puts(__FUNCTION__); + int res = 0; + __declspec(align(ALIGN)) double d[4]; + SmallObj f; + try { + res = TestFunc(1, d, _alloca(global), &f, &res, &arg); + } catch (double) { + res = TestFunc(2, d, &f, &res, &arg); + } + return res; +} + +int GSCookieAndAlignAndAlloca(int arg) +{ + puts(__FUNCTION__); + int res = 0; + char buf[16]; + __declspec(align(ALIGN)) double d[4]; + SmallObj f; + return TestFunc(1, buf, d, _alloca(global), &f, &res, &arg); +} + +int TryAndGSCookieAndAlignAndAlloca(int arg) +{ + puts(__FUNCTION__); + int res = 0; + char buf[16]; + __declspec(align(ALIGN)) double d[4]; + SmallObj f; + try { + res = TestFunc(1, buf, d, _alloca(global), &f, &res, &arg); + } catch (double) { + res = TestFunc(2, buf, d, &f, &res, &arg); + } + return res; +} + +/* The *AndBigLocals set of functions try to trigger EBP adjustment */ + +int BigLocals(int arg) +{ + puts(__FUNCTION__); + int res = 0; + BigObj f1; + return TestFunc(1, &f1, &res, &res, &res, &res, &res, &arg); +} + +int TryAndBigLocals(int arg) +{ + puts(__FUNCTION__); + int res = 0; + BigObj f1; + try { + res = TestFunc(1, &f1, &res, &res, &res, &res, &res, &arg); + } catch (double) { + res = TestFunc(2, &f1, &res, &res, &res, &res, &res, &arg); + } + return res; +} + +int GSCookieAndBigLocals(int arg) +{ + puts(__FUNCTION__); + int res = 0; + char buf[16]; + BigObj f1; + return TestFunc(1, buf, &f1, &res, &res, &res, &res, &res, &arg); +} + +int TryAndGSCookieAndBigLocals(int arg) +{ + puts(__FUNCTION__); + int res = 0; + char buf[16]; + BigObj f1; + try { + res = TestFunc(1, &buf, &f1, &res, &res, &res, &res, &res, &arg); + } catch (double) { + res = TestFunc(2, &buf, &f1, &res, &res, &res, &res, &res, &arg); + } + return res; +} + +int AlignAndBigLocals(int arg) +{ + puts(__FUNCTION__); + int res = 0; + __declspec(align(ALIGN)) double d[4]; + BigObj f1; + return TestFunc(1, d, &f1, &res, &res, &res, &res, &res, &arg); +} + +int TryAndAlignAndBigLocals(int arg) +{ + puts(__FUNCTION__); + int res = 0; + __declspec(align(ALIGN)) double d[4]; + BigObj f1; + try { + res = TestFunc(1, d, &f1, &res, &res, &res, &res, &res, &arg); + } catch (double) { + res = TestFunc(2, d, &f1, &res, &res, &res, &res, &res, &arg); + } + return res; +} + +int GSCookieAndAlignAndBigLocals(int arg) +{ + puts(__FUNCTION__); + int res = 0; + char buf[16]; + __declspec(align(ALIGN)) double d[4]; + BigObj f1; + return TestFunc(1, buf, d, &f1, &res, &res, &res, &res, &res, &arg); +} + +int TryAndGSCookieAndAlignAndBigLocals(int arg) +{ + puts(__FUNCTION__); + int res = 0; + char buf[16]; + __declspec(align(ALIGN)) double d[4]; + BigObj f1; + try { + res = TestFunc(1, buf, d, &f1, &res, &res, &res, &res, &res, &arg); + } catch (double) { + res = TestFunc(2, buf, d, &f1, &res, &res, &res, &res, &res, &arg); + } + return res; +} + +int AllocaAndBigLocals(int arg) +{ + puts(__FUNCTION__); + int res = 0; + BigObj f1; + return TestFunc(1, _alloca(global), &f1, &res, &res, &res, &res, &res, &arg); +} + +int TryAndAllocaAndBigLocals(int arg) +{ + puts(__FUNCTION__); + int res = 0; + BigObj f1; + try { + res = TestFunc(1, _alloca(global), &f1, &res, &res, &res, &res, &res, &arg); + } catch (double) { + res = TestFunc(2, &f1, &res, &res, &res, &res, &res, &arg); + } + return res; +} + +int GSCookieAndAllocaAndBigLocals(int arg) +{ + puts(__FUNCTION__); + int res = 0; + char buf[16]; + BigObj f1; + return TestFunc(1, buf, _alloca(global), &f1, &res, &res, &res, &res, &res, &arg); +} + +int TryAndGSCookieAndAllocaAndBigLocals(int arg) +{ + puts(__FUNCTION__); + int res = 0; + char buf[16]; + BigObj f1; + try { + res = TestFunc(1, &buf, _alloca(global), &f1, &res, &res, &res, &res, &res, &arg); + } catch (double) { + res = TestFunc(2, &buf, &f1, &res, &res, &res, &res, &res, &arg); + } + return res; +} + +int AlignAndAllocaAndBigLocals(int arg) +{ + puts(__FUNCTION__); + int res = 0; + __declspec(align(ALIGN)) double d[4]; + BigObj f1; + return TestFunc(1, d, _alloca(global), &f1, &res, &res, &res, &res, &res, &arg); +} + +int TryAndAlignAndAllocaAndBigLocals(int arg) +{ + puts(__FUNCTION__); + int res = 0; + __declspec(align(ALIGN)) double d[4]; + BigObj f1; + try { + res = TestFunc(1, d, _alloca(global), &f1, &res, &res, &res, &res, &res, &arg); + } catch (double) { + res = TestFunc(2, d, &f1, &res, &res, &res, &res, &res, &arg); + } + return res; +} + +int GSCookieAndAlignAndAllocaAndBigLocals(int arg) +{ + puts(__FUNCTION__); + int res = 0; + char buf[16]; + __declspec(align(ALIGN)) double d[4]; + BigObj f1; + return TestFunc(1, buf, d, _alloca(global), &f1, &res, &res, &res, &res, &res, &arg); +} + +int TryAndGSCookieAndAlignAndAllocaAndBigLocals(int arg) +{ + puts(__FUNCTION__); + int res = 0; + char buf[16]; + __declspec(align(ALIGN)) double d[4]; + BigObj f1; + try { + res = TestFunc(1, buf, d, _alloca(global), &f1, &res, &res, &res, &res, &res, &arg); + } catch (double) { + res = TestFunc(2, buf, d, &f1, &res, &res, &res, &res, &res, &arg); + } + return res; +} + +__declspec(noinline) +int TestFunc(int, ...) +{ + if (TestFuncThrows) + { + TestFuncThrows = false; + throw 123; + } + + return global; +} + +void RunTests() +{ + puts("Test pass 1 - no throws"); + + try + { + Simple(1); + Try(1); + GSCookie(1); + TryAndGSCookie(1); + Align(1); + TryAndAlign(1); + GSCookieAndAlign(1); + TryAndGSCookieAndAlign(1); + Alloca(1); + TryAndAlloca(1); + GSCookieAndAlloca(1); + TryAndGSCookieAndAlloca(1); + AlignAndAlloca(1); + TryAndAlignAndAlloca(1); + GSCookieAndAlignAndAlloca(1); + TryAndGSCookieAndAlignAndAlloca(1); + BigLocals(1); + TryAndBigLocals(1); + GSCookieAndBigLocals(1); + TryAndGSCookieAndBigLocals(1); + AlignAndBigLocals(1); + TryAndAlignAndBigLocals(1); + GSCookieAndAlignAndBigLocals(1); + TryAndGSCookieAndAlignAndBigLocals(1); + AllocaAndBigLocals(1); + TryAndAllocaAndBigLocals(1); + GSCookieAndAllocaAndBigLocals(1); + TryAndGSCookieAndAllocaAndBigLocals(1); + AlignAndAllocaAndBigLocals(1); + TryAndAlignAndAllocaAndBigLocals(1); + GSCookieAndAlignAndAllocaAndBigLocals(1); + TryAndGSCookieAndAlignAndAllocaAndBigLocals(1); + } + catch (...) + { + puts("ERROR - throw not expected"); + ++failures; + } + + puts("Test pass 2 - throws"); + + for (int i = 0; i < 32; ++i) + { + TestFuncThrows = true; + bool caught = false; + try + { + switch (i) + { + case 0: Simple(1); break; + case 1: Try(1); break; + case 2: GSCookie(1); break; + case 3: TryAndGSCookie(1); break; + case 4: Align(1); break; + case 5: TryAndAlign(1); break; + case 6: GSCookieAndAlign(1); break; + case 7: TryAndGSCookieAndAlign(1); break; + case 8: Alloca(1); break; + case 9: TryAndAlloca(1); break; + case 10: GSCookieAndAlloca(1); break; + case 11: TryAndGSCookieAndAlloca(1); break; + case 12: AlignAndAlloca(1); break; + case 13: TryAndAlignAndAlloca(1); break; + case 14: GSCookieAndAlignAndAlloca(1); break; + case 15: TryAndGSCookieAndAlignAndAlloca(1); break; + case 16: BigLocals(1); break; + case 17: TryAndBigLocals(1); break; + case 18: GSCookieAndBigLocals(1); break; + case 19: TryAndGSCookieAndBigLocals(1); break; + case 20: AlignAndBigLocals(1); break; + case 21: TryAndAlignAndBigLocals(1); break; + case 22: GSCookieAndAlignAndBigLocals(1); break; + case 23: TryAndGSCookieAndAlignAndBigLocals(1); break; + case 24: AllocaAndBigLocals(1); break; + case 25: TryAndAllocaAndBigLocals(1); break; + case 26: GSCookieAndAllocaAndBigLocals(1); break; + case 27: TryAndGSCookieAndAllocaAndBigLocals(1); break; + case 28: AlignAndAllocaAndBigLocals(1); break; + case 29: TryAndAlignAndAllocaAndBigLocals(1); break; + case 30: GSCookieAndAlignAndAllocaAndBigLocals(1); break; + case 31: TryAndGSCookieAndAlignAndAllocaAndBigLocals(1); break; + } + } + catch (int) + { + caught = true; + } + + if (!caught) + { + puts("ERROR - did not catch expected thrown object"); + ++failures; + } + } +} + +int main() +{ + __try + { + RunTests(); + } + __except (1) + { + puts("ERROR - Unexpectedly caught an exception"); + ++failures; + } + + if (failures) + { + printf("Test failed with %d failure%s\n", + failures, failures == 1 ? "" : "s"); + } + else + { + puts("Test passed"); + } + + return failures; +} diff --git a/modules/rostests/apitests/compiler/ms/eh/ehframes.out b/modules/rostests/apitests/compiler/ms/eh/ehframes.out new file mode 100644 index 00000000000..bf9dd82b8b9 --- /dev/null +++ b/modules/rostests/apitests/compiler/ms/eh/ehframes.out @@ -0,0 +1,67 @@ +Test pass 1 - no throws +Simple +Try +GSCookie +TryAndGSCookie +Align +TryAndAlign +GSCookieAndAlign +TryAndGSCookieAndAlign +Alloca +TryAndAlloca +GSCookieAndAlloca +TryAndGSCookieAndAlloca +AlignAndAlloca +TryAndAlignAndAlloca +GSCookieAndAlignAndAlloca +TryAndGSCookieAndAlignAndAlloca +BigLocals +TryAndBigLocals +GSCookieAndBigLocals +TryAndGSCookieAndBigLocals +AlignAndBigLocals +TryAndAlignAndBigLocals +GSCookieAndAlignAndBigLocals +TryAndGSCookieAndAlignAndBigLocals +AllocaAndBigLocals +TryAndAllocaAndBigLocals +GSCookieAndAllocaAndBigLocals +TryAndGSCookieAndAllocaAndBigLocals +AlignAndAllocaAndBigLocals +TryAndAlignAndAllocaAndBigLocals +GSCookieAndAlignAndAllocaAndBigLocals +TryAndGSCookieAndAlignAndAllocaAndBigLocals +Test pass 2 - throws +Simple +Try +GSCookie +TryAndGSCookie +Align +TryAndAlign +GSCookieAndAlign +TryAndGSCookieAndAlign +Alloca +TryAndAlloca +GSCookieAndAlloca +TryAndGSCookieAndAlloca +AlignAndAlloca +TryAndAlignAndAlloca +GSCookieAndAlignAndAlloca +TryAndGSCookieAndAlignAndAlloca +BigLocals +TryAndBigLocals +GSCookieAndBigLocals +TryAndGSCookieAndBigLocals +AlignAndBigLocals +TryAndAlignAndBigLocals +GSCookieAndAlignAndBigLocals +TryAndGSCookieAndAlignAndBigLocals +AllocaAndBigLocals +TryAndAllocaAndBigLocals +GSCookieAndAllocaAndBigLocals +TryAndGSCookieAndAllocaAndBigLocals +AlignAndAllocaAndBigLocals +TryAndAlignAndAllocaAndBigLocals +GSCookieAndAlignAndAllocaAndBigLocals +TryAndGSCookieAndAlignAndAllocaAndBigLocals +Test passed diff --git a/modules/rostests/apitests/compiler/ms/eh/ehthrow.amd64 b/modules/rostests/apitests/compiler/ms/eh/ehthrow.amd64 new file mode 100644 index 00000000000..97dd80befd9 --- /dev/null +++ b/modules/rostests/apitests/compiler/ms/eh/ehthrow.amd64 @@ -0,0 +1,676 @@ + +Test #1 +A ctor. i = 0 +B ctor. i = 1 +A ctor. i = 2 +B ctor. i = 3 +B ctor. i = 4 +A copy ctor. i = 5 +B dtor. i = 4 +B dtor. i = 3 +Throwing +B ctor. i = 6 +B ctor. i = 7 +A copy ctor. i = 8 +B dtor. i = 7 +B dtor. i = 6 +B ctor. i = 9 +B ctor. i = 10 +A copy ctor. i = 11 +B dtor. i = 10 +B dtor. i = 9 +B ctor. i = 12 +B ctor. i = 13 +A dtor. i = 5 +B dtor. i = 13 +B dtor. i = 12 +B ctor. i = 14 +B ctor. i = 15 +A dtor. i = 2 +B dtor. i = 15 +B dtor. i = 14 +B dtor. i = 1 +B ctor. i = 16 +B ctor. i = 17 +A dtor. i = 0 +B dtor. i = 17 +B dtor. i = 16 +In main's catch +B ctor. i = 18 +B ctor. i = 19 +A dtor. i = 11 +B dtor. i = 19 +B dtor. i = 18 +B ctor. i = 20 +B ctor. i = 21 +A dtor. i = 8 +B dtor. i = 21 +B dtor. i = 20 + + +Test #2 +A ctor. i = 0 +B ctor. i = 1 +A ctor. i = 2 +A ctor. i = 3 +B ctor. i = 4 +B ctor. i = 5 +A copy ctor. i = 6 +B dtor. i = 5 +B dtor. i = 4 +Throwing +B ctor. i = 7 +B ctor. i = 8 +A copy ctor. i = 9 +B dtor. i = 8 +B dtor. i = 7 +B ctor. i = 10 +B ctor. i = 11 +A copy ctor. i = 12 +B dtor. i = 11 +B dtor. i = 10 +B ctor. i = 13 +B ctor. i = 14 +A dtor. i = 6 +B dtor. i = 14 +B dtor. i = 13 +B ctor. i = 15 +B ctor. i = 16 +A dtor. i = 3 +B dtor. i = 16 +B dtor. i = 15 +B ctor. i = 17 +B ctor. i = 18 +A dtor. i = 2 +B dtor. i = 18 +B dtor. i = 17 +In catch; +A ctor. i = 19 +Rethrowing +B ctor. i = 20 +B ctor. i = 21 +A dtor. i = 19 +B dtor. i = 21 +B dtor. i = 20 +B ctor. i = 22 +B ctor. i = 23 +A dtor. i = 12 +B dtor. i = 23 +B dtor. i = 22 +B ctor. i = 24 +B ctor. i = 25 +A copy ctor. i = 26 +B dtor. i = 25 +B dtor. i = 24 +B dtor. i = 1 +B ctor. i = 27 +B ctor. i = 28 +A dtor. i = 0 +B dtor. i = 28 +B dtor. i = 27 +In main's catch +B ctor. i = 29 +B ctor. i = 30 +A dtor. i = 26 +B dtor. i = 30 +B dtor. i = 29 +B ctor. i = 31 +B ctor. i = 32 +A dtor. i = 9 +B dtor. i = 32 +B dtor. i = 31 + + +Test #3 +A ctor. i = 0 +B ctor. i = 1 +A ctor. i = 2 +A ctor. i = 3 +B ctor. i = 4 +B ctor. i = 5 +A copy ctor. i = 6 +B dtor. i = 5 +B dtor. i = 4 +Throwing +B ctor. i = 7 +B ctor. i = 8 +A copy ctor. i = 9 +B dtor. i = 8 +B dtor. i = 7 +B ctor. i = 10 +B ctor. i = 11 +A copy ctor. i = 12 +B dtor. i = 11 +B dtor. i = 10 +B ctor. i = 13 +B ctor. i = 14 +A dtor. i = 6 +B dtor. i = 14 +B dtor. i = 13 +B ctor. i = 15 +B ctor. i = 16 +A dtor. i = 3 +B dtor. i = 16 +B dtor. i = 15 +B ctor. i = 17 +B ctor. i = 18 +A dtor. i = 2 +B dtor. i = 18 +B dtor. i = 17 +In catch +A ctor. i = 19 +Throwing new a +B ctor. i = 20 +B ctor. i = 21 +A copy ctor. i = 22 +B dtor. i = 21 +B dtor. i = 20 +B ctor. i = 23 +B ctor. i = 24 +A copy ctor. i = 25 +B dtor. i = 24 +B dtor. i = 23 +B ctor. i = 26 +B ctor. i = 27 +A dtor. i = 19 +B dtor. i = 27 +B dtor. i = 26 +B ctor. i = 28 +B ctor. i = 29 +A dtor. i = 12 +B dtor. i = 29 +B dtor. i = 28 +B ctor. i = 30 +B ctor. i = 31 +A dtor. i = 9 +B dtor. i = 31 +B dtor. i = 30 +B dtor. i = 1 +B ctor. i = 32 +B ctor. i = 33 +A dtor. i = 0 +B dtor. i = 33 +B dtor. i = 32 +In main's catch +B ctor. i = 34 +B ctor. i = 35 +A dtor. i = 25 +B dtor. i = 35 +B dtor. i = 34 +B ctor. i = 36 +B ctor. i = 37 +A dtor. i = 22 +B dtor. i = 37 +B dtor. i = 36 + + +Test #4 +A ctor. i = 0 +B ctor. i = 1 +B ctor. i = 2 +A ctor. i = 3 +A ctor. i = 4 +A ctor. i = 5 +A ctor. i = 6 +B ctor. i = 7 +A ctor. i = 8 +A ctor. i = 9 +B ctor. i = 10 +B ctor. i = 11 +A copy ctor. i = 12 +B dtor. i = 11 +B dtor. i = 10 +Throwing +B ctor. i = 13 +B ctor. i = 14 +A copy ctor. i = 15 +B dtor. i = 14 +B dtor. i = 13 +B ctor. i = 16 +B ctor. i = 17 +A copy ctor. i = 18 +B dtor. i = 17 +B dtor. i = 16 +B ctor. i = 19 +B ctor. i = 20 +A dtor. i = 12 +B dtor. i = 20 +B dtor. i = 19 +B ctor. i = 21 +B ctor. i = 22 +A dtor. i = 9 +B dtor. i = 22 +B dtor. i = 21 +B ctor. i = 23 +B ctor. i = 24 +A dtor. i = 8 +B dtor. i = 24 +B dtor. i = 23 +In catch; +A ctor. i = 25 +Rethrowing +B ctor. i = 26 +B ctor. i = 27 +A dtor. i = 25 +B dtor. i = 27 +B dtor. i = 26 +B ctor. i = 28 +B ctor. i = 29 +A dtor. i = 18 +B dtor. i = 29 +B dtor. i = 28 +B ctor. i = 30 +B ctor. i = 31 +A copy ctor. i = 32 +B dtor. i = 31 +B dtor. i = 30 +B dtor. i = 7 +B ctor. i = 33 +B ctor. i = 34 +A dtor. i = 6 +B dtor. i = 34 +B dtor. i = 33 +B ctor. i = 35 +B ctor. i = 36 +A dtor. i = 5 +B dtor. i = 36 +B dtor. i = 35 +In catch #1 +B ctor. i = 37 +Rethrowing +B dtor. i = 37 +B ctor. i = 38 +B ctor. i = 39 +A dtor. i = 32 +B dtor. i = 39 +B dtor. i = 38 +B ctor. i = 40 +B ctor. i = 41 +A dtor. i = 4 +B dtor. i = 41 +B dtor. i = 40 +B ctor. i = 42 +B ctor. i = 43 +A dtor. i = 3 +B dtor. i = 43 +B dtor. i = 42 +In catch #2 +A ctor. i = 44 +Throwing new a +B ctor. i = 45 +B ctor. i = 46 +A copy ctor. i = 47 +B dtor. i = 46 +B dtor. i = 45 +B ctor. i = 48 +B ctor. i = 49 +A copy ctor. i = 50 +B dtor. i = 49 +B dtor. i = 48 +B ctor. i = 51 +B ctor. i = 52 +A dtor. i = 44 +B dtor. i = 52 +B dtor. i = 51 +B ctor. i = 53 +B ctor. i = 54 +A dtor. i = 15 +B dtor. i = 54 +B dtor. i = 53 +B dtor. i = 2 +In catch #3 +B ctor. i = 55 +Rethrowing +B dtor. i = 55 +B ctor. i = 56 +B ctor. i = 57 +A dtor. i = 50 +B dtor. i = 57 +B dtor. i = 56 +B ctor. i = 58 +B ctor. i = 59 +A copy ctor. i = 60 +B dtor. i = 59 +B dtor. i = 58 +B dtor. i = 1 +B ctor. i = 61 +B ctor. i = 62 +A dtor. i = 0 +B dtor. i = 62 +B dtor. i = 61 +In main's catch +B ctor. i = 63 +B ctor. i = 64 +A dtor. i = 60 +B dtor. i = 64 +B dtor. i = 63 +B ctor. i = 65 +B ctor. i = 66 +A dtor. i = 47 +B dtor. i = 66 +B dtor. i = 65 + + +Test #5 +A ctor. i = 0 +B ctor. i = 1 +B ctor. i = 2 +B ctor. i = 3 +B ctor. i = 4 +A ctor. i = 5 +B ctor. i = 6 +B ctor. i = 7 +A copy ctor. i = 8 +B dtor. i = 7 +B dtor. i = 6 +Throwing +B ctor. i = 9 +B ctor. i = 10 +A copy ctor. i = 11 +B dtor. i = 10 +B dtor. i = 9 +B ctor. i = 12 +B ctor. i = 13 +A copy ctor. i = 14 +B dtor. i = 13 +B dtor. i = 12 +B ctor. i = 15 +B ctor. i = 16 +A dtor. i = 8 +B dtor. i = 16 +B dtor. i = 15 +B ctor. i = 17 +B ctor. i = 18 +A dtor. i = 5 +B dtor. i = 18 +B dtor. i = 17 +B dtor. i = 4 +B dtor. i = 3 +B dtor. i = 2 +A ctor. i = 19 +In catch #2 +B ctor. i = 20 +Throwing a new b +B copy ctor. i = 21 +B copy ctor. i = 22 +B dtor. i = 20 +B ctor. i = 23 +B ctor. i = 24 +A dtor. i = 19 +B dtor. i = 24 +B dtor. i = 23 +B ctor. i = 25 +B ctor. i = 26 +A dtor. i = 14 +B dtor. i = 26 +B dtor. i = 25 +B ctor. i = 27 +B ctor. i = 28 +A dtor. i = 11 +B dtor. i = 28 +B dtor. i = 27 +B dtor. i = 1 +In catch #3 +Throwing a new a +A ctor. i = 29 +B ctor. i = 30 +B ctor. i = 31 +A copy ctor. i = 32 +B dtor. i = 31 +B dtor. i = 30 +B dtor. i = 22 +B dtor. i = 21 +B ctor. i = 33 +B ctor. i = 34 +A dtor. i = 0 +B dtor. i = 34 +B dtor. i = 33 +In main's catch +B ctor. i = 35 +B ctor. i = 36 +A dtor. i = 32 +B dtor. i = 36 +B dtor. i = 35 +B ctor. i = 37 +B ctor. i = 38 +A dtor. i = 29 +B dtor. i = 38 +B dtor. i = 37 + + +Test #6 +B ctor. i = 0 +B ctor. i = 1 +B ctor. i = 2 +Throwing a b +B copy ctor. i = 3 +B copy ctor. i = 4 +B dtor. i = 2 +B ctor. i = 5 +In catch #1 +Throwing a new b +B copy ctor. i = 6 +B copy ctor. i = 7 +B dtor. i = 5 +B dtor. i = 4 +B dtor. i = 3 +B dtor. i = 1 +B ctor. i = 8 +In catch #2 +Throwing a new b +B copy ctor. i = 9 +B copy ctor. i = 10 +B dtor. i = 8 +B dtor. i = 7 +B dtor. i = 6 +B dtor. i = 0 +A ctor. i = 11 +In catch #3 +Throwing a new a +B ctor. i = 12 +B ctor. i = 13 +A copy ctor. i = 14 +B dtor. i = 13 +B dtor. i = 12 +B ctor. i = 15 +B ctor. i = 16 +A copy ctor. i = 17 +B dtor. i = 16 +B dtor. i = 15 +B ctor. i = 18 +B ctor. i = 19 +A dtor. i = 11 +B dtor. i = 19 +B dtor. i = 18 +B dtor. i = 10 +B dtor. i = 9 +In main's catch +B ctor. i = 20 +B ctor. i = 21 +A dtor. i = 17 +B dtor. i = 21 +B dtor. i = 20 +B ctor. i = 22 +B ctor. i = 23 +A dtor. i = 14 +B dtor. i = 23 +B dtor. i = 22 + + +Test #7 +B ctor. i = 0 +B ctor. i = 1 +B ctor. i = 2 +Throwing a b +B ctor. i = 3 +B copy ctor. i = 4 +B dtor. i = 2 +B ctor. i = 5 +In catch #1 +B ctor. i = 6 +Rethrowing b +B copy ctor. i = 7 +B dtor. i = 6 +B ctor. i = 8 +In catch #1 of catch#1 +Rethrowing b +B dtor. i = 8 +B dtor. i = 7 +B copy ctor. i = 9 +B dtor. i = 5 +B dtor. i = 4 +B dtor. i = 1 +B ctor. i = 10 +In catch #2 +Throwing a new A +A ctor. i = 11 +B ctor. i = 12 +B ctor. i = 13 +A copy ctor. i = 14 +B dtor. i = 13 +B dtor. i = 12 +B dtor. i = 10 +B dtor. i = 9 +B dtor. i = 3 +B dtor. i = 0 +In main's catch +B ctor. i = 15 +B ctor. i = 16 +A dtor. i = 14 +B dtor. i = 16 +B dtor. i = 15 +B ctor. i = 17 +B ctor. i = 18 +A dtor. i = 11 +B dtor. i = 18 +B dtor. i = 17 + + +Test #8 +B ctor. i = 0 +B ctor. i = 1 +B ctor. i = 2 +B ctor. i = 3 +Throwing a b +B ctor. i = 4 +B ctor. i = 5 +B copy ctor. i = 6 +B dtor. i = 4 +B dtor. i = 3 +B ctor. i = 7 +In catch #1 +B ctor. i = 8 +Rethrowing b +A ctor. i = 9 +Rethrowing +B copy ctor. i = 10 +B ctor. i = 11 +B ctor. i = 12 +A dtor. i = 9 +B dtor. i = 12 +B dtor. i = 11 +B dtor. i = 8 +B ctor. i = 13 +In catch #1 of catch#1 +Rethrowing b +A ctor. i = 14 +Rethrowing +B ctor. i = 15 +B ctor. i = 16 +A dtor. i = 14 +B dtor. i = 16 +B dtor. i = 15 +B dtor. i = 13 +B dtor. i = 10 +B copy ctor. i = 17 +B dtor. i = 7 +B dtor. i = 6 +B dtor. i = 2 +B dtor. i = 1 +B ctor. i = 18 +In catch #2 +Throwing a new A +A ctor. i = 19 +B ctor. i = 20 +B ctor. i = 21 +A copy ctor. i = 22 +B dtor. i = 21 +B dtor. i = 20 +B dtor. i = 18 +B dtor. i = 17 +B dtor. i = 5 +B dtor. i = 0 +In main's catch +B ctor. i = 23 +B ctor. i = 24 +A dtor. i = 22 +B dtor. i = 24 +B dtor. i = 23 +B ctor. i = 25 +B ctor. i = 26 +A dtor. i = 19 +B dtor. i = 26 +B dtor. i = 25 + + +Test #9 +B ctor. i = 0 +Throwing B +B copy ctor. i = 1 +B dtor. i = 0 +In catch #1 +Rethrow +In catch #2 +B dtor. i = 1 +End of test9, throwing a A +A ctor. i = 2 +B ctor. i = 3 +B ctor. i = 4 +A copy ctor. i = 5 +B dtor. i = 4 +B dtor. i = 3 +In main's catch +B ctor. i = 6 +B ctor. i = 7 +A dtor. i = 5 +B dtor. i = 7 +B dtor. i = 6 +B ctor. i = 8 +B ctor. i = 9 +A dtor. i = 2 +B dtor. i = 9 +B dtor. i = 8 + + +Test #10 +B ctor. i = 0 +Throwing B +B copy ctor. i = 1 +B dtor. i = 0 +In catch #1 +Throwing a new B() +B ctor. i = 2 +In catch #2 +B dtor. i = 2 +B dtor. i = 1 +End of test10, throwing a A +A ctor. i = 3 +B ctor. i = 4 +B ctor. i = 5 +A copy ctor. i = 6 +B dtor. i = 5 +B dtor. i = 4 +In main's catch +B ctor. i = 7 +B ctor. i = 8 +A dtor. i = 6 +B dtor. i = 8 +B dtor. i = 7 +B ctor. i = 9 +B ctor. i = 10 +A dtor. i = 3 +B dtor. i = 10 +B dtor. i = 9 + + +Passed diff --git a/modules/rostests/apitests/compiler/ms/eh/ehthrow.arm b/modules/rostests/apitests/compiler/ms/eh/ehthrow.arm new file mode 100644 index 00000000000..9154c519367 --- /dev/null +++ b/modules/rostests/apitests/compiler/ms/eh/ehthrow.arm @@ -0,0 +1,676 @@ + +Test #1 +A ctor. i = 0 +B ctor. i = 1 +A ctor. i = 2 +B ctor. i = 3 +B ctor. i = 4 +A copy ctor. i = 5 +B dtor. i = 4 +B dtor. i = 3 +Throwing +B ctor. i = 6 +B ctor. i = 7 +A copy ctor. i = 8 +B dtor. i = 7 +B dtor. i = 6 +B ctor. i = 9 +B ctor. i = 10 +A copy ctor. i = 11 +B dtor. i = 10 +B dtor. i = 9 +B ctor. i = 12 +B ctor. i = 13 +A dtor. i = 5 +B dtor. i = 13 +B dtor. i = 12 +B ctor. i = 14 +B ctor. i = 15 +A dtor. i = 2 +B dtor. i = 15 +B dtor. i = 14 +B dtor. i = 1 +B ctor. i = 16 +B ctor. i = 17 +A dtor. i = 0 +B dtor. i = 17 +B dtor. i = 16 +In main's catch +B ctor. i = 18 +B ctor. i = 19 +A dtor. i = 11 +B dtor. i = 19 +B dtor. i = 18 +B ctor. i = 20 +B ctor. i = 21 +A dtor. i = 8 +B dtor. i = 21 +B dtor. i = 20 + + +Test #2 +A ctor. i = 0 +B ctor. i = 1 +A ctor. i = 2 +A ctor. i = 3 +B ctor. i = 4 +B ctor. i = 5 +A copy ctor. i = 6 +B dtor. i = 5 +B dtor. i = 4 +Throwing +B ctor. i = 7 +B ctor. i = 8 +A copy ctor. i = 9 +B dtor. i = 8 +B dtor. i = 7 +B ctor. i = 10 +B ctor. i = 11 +A copy ctor. i = 12 +B dtor. i = 11 +B dtor. i = 10 +B ctor. i = 13 +B ctor. i = 14 +A dtor. i = 6 +B dtor. i = 14 +B dtor. i = 13 +B ctor. i = 15 +B ctor. i = 16 +A dtor. i = 3 +B dtor. i = 16 +B dtor. i = 15 +B ctor. i = 17 +B ctor. i = 18 +A dtor. i = 2 +B dtor. i = 18 +B dtor. i = 17 +In catch; +A ctor. i = 19 +Rethrowing +B ctor. i = 20 +B ctor. i = 21 +A dtor. i = 19 +B dtor. i = 21 +B dtor. i = 20 +B ctor. i = 22 +B ctor. i = 23 +A dtor. i = 12 +B dtor. i = 23 +B dtor. i = 22 +B ctor. i = 24 +B ctor. i = 25 +A copy ctor. i = 26 +B dtor. i = 25 +B dtor. i = 24 +B dtor. i = 1 +B ctor. i = 27 +B ctor. i = 28 +A dtor. i = 0 +B dtor. i = 28 +B dtor. i = 27 +In main's catch +B ctor. i = 29 +B ctor. i = 30 +A dtor. i = 26 +B dtor. i = 30 +B dtor. i = 29 +B ctor. i = 31 +B ctor. i = 32 +A dtor. i = 9 +B dtor. i = 32 +B dtor. i = 31 + + +Test #3 +A ctor. i = 0 +B ctor. i = 1 +A ctor. i = 2 +A ctor. i = 3 +B ctor. i = 4 +B ctor. i = 5 +A copy ctor. i = 6 +B dtor. i = 5 +B dtor. i = 4 +Throwing +B ctor. i = 7 +B ctor. i = 8 +A copy ctor. i = 9 +B dtor. i = 8 +B dtor. i = 7 +B ctor. i = 10 +B ctor. i = 11 +A copy ctor. i = 12 +B dtor. i = 11 +B dtor. i = 10 +B ctor. i = 13 +B ctor. i = 14 +A dtor. i = 6 +B dtor. i = 14 +B dtor. i = 13 +B ctor. i = 15 +B ctor. i = 16 +A dtor. i = 3 +B dtor. i = 16 +B dtor. i = 15 +B ctor. i = 17 +B ctor. i = 18 +A dtor. i = 2 +B dtor. i = 18 +B dtor. i = 17 +In catch +A ctor. i = 19 +Throwing new a +B ctor. i = 20 +B ctor. i = 21 +A copy ctor. i = 22 +B dtor. i = 21 +B dtor. i = 20 +B ctor. i = 23 +B ctor. i = 24 +A copy ctor. i = 25 +B dtor. i = 24 +B dtor. i = 23 +B ctor. i = 26 +B ctor. i = 27 +A dtor. i = 19 +B dtor. i = 27 +B dtor. i = 26 +B ctor. i = 28 +B ctor. i = 29 +A dtor. i = 12 +B dtor. i = 29 +B dtor. i = 28 +B ctor. i = 30 +B ctor. i = 31 +A dtor. i = 9 +B dtor. i = 31 +B dtor. i = 30 +B dtor. i = 1 +B ctor. i = 32 +B ctor. i = 33 +A dtor. i = 0 +B dtor. i = 33 +B dtor. i = 32 +In main's catch +B ctor. i = 34 +B ctor. i = 35 +A dtor. i = 25 +B dtor. i = 35 +B dtor. i = 34 +B ctor. i = 36 +B ctor. i = 37 +A dtor. i = 22 +B dtor. i = 37 +B dtor. i = 36 + + +Test #4 +A ctor. i = 0 +B ctor. i = 1 +B ctor. i = 2 +A ctor. i = 3 +A ctor. i = 4 +A ctor. i = 5 +A ctor. i = 6 +B ctor. i = 7 +A ctor. i = 8 +A ctor. i = 9 +B ctor. i = 10 +B ctor. i = 11 +A copy ctor. i = 12 +B dtor. i = 11 +B dtor. i = 10 +Throwing +B ctor. i = 13 +B ctor. i = 14 +A copy ctor. i = 15 +B dtor. i = 14 +B dtor. i = 13 +B ctor. i = 16 +B ctor. i = 17 +A copy ctor. i = 18 +B dtor. i = 17 +B dtor. i = 16 +B ctor. i = 19 +B ctor. i = 20 +A dtor. i = 12 +B dtor. i = 20 +B dtor. i = 19 +B ctor. i = 21 +B ctor. i = 22 +A dtor. i = 9 +B dtor. i = 22 +B dtor. i = 21 +B ctor. i = 23 +B ctor. i = 24 +A dtor. i = 8 +B dtor. i = 24 +B dtor. i = 23 +In catch; +A ctor. i = 25 +Rethrowing +B ctor. i = 26 +B ctor. i = 27 +A dtor. i = 25 +B dtor. i = 27 +B dtor. i = 26 +B ctor. i = 28 +B ctor. i = 29 +A dtor. i = 18 +B dtor. i = 29 +B dtor. i = 28 +B ctor. i = 30 +B ctor. i = 31 +A copy ctor. i = 32 +B dtor. i = 31 +B dtor. i = 30 +B dtor. i = 7 +B ctor. i = 33 +B ctor. i = 34 +A dtor. i = 6 +B dtor. i = 34 +B dtor. i = 33 +B ctor. i = 35 +B ctor. i = 36 +A dtor. i = 5 +B dtor. i = 36 +B dtor. i = 35 +In catch #1 +B ctor. i = 37 +Rethrowing +B dtor. i = 37 +B ctor. i = 38 +B ctor. i = 39 +A dtor. i = 32 +B dtor. i = 39 +B dtor. i = 38 +B ctor. i = 40 +B ctor. i = 41 +A dtor. i = 4 +B dtor. i = 41 +B dtor. i = 40 +B ctor. i = 42 +B ctor. i = 43 +A dtor. i = 3 +B dtor. i = 43 +B dtor. i = 42 +In catch #2 +A ctor. i = 44 +Throwing new a +B ctor. i = 45 +B ctor. i = 46 +A copy ctor. i = 47 +B dtor. i = 46 +B dtor. i = 45 +B ctor. i = 48 +B ctor. i = 49 +A copy ctor. i = 50 +B dtor. i = 49 +B dtor. i = 48 +B ctor. i = 51 +B ctor. i = 52 +A dtor. i = 44 +B dtor. i = 52 +B dtor. i = 51 +B ctor. i = 53 +B ctor. i = 54 +A dtor. i = 15 +B dtor. i = 54 +B dtor. i = 53 +B dtor. i = 2 +In catch #3 +B ctor. i = 55 +Rethrowing +B dtor. i = 55 +B ctor. i = 56 +B ctor. i = 57 +A dtor. i = 50 +B dtor. i = 57 +B dtor. i = 56 +B ctor. i = 58 +B ctor. i = 59 +A copy ctor. i = 60 +B dtor. i = 59 +B dtor. i = 58 +B dtor. i = 1 +B ctor. i = 61 +B ctor. i = 62 +A dtor. i = 0 +B dtor. i = 62 +B dtor. i = 61 +In main's catch +B ctor. i = 63 +B ctor. i = 64 +A dtor. i = 60 +B dtor. i = 64 +B dtor. i = 63 +B ctor. i = 65 +B ctor. i = 66 +A dtor. i = 47 +B dtor. i = 66 +B dtor. i = 65 + + +Test #5 +A ctor. i = 0 +B ctor. i = 1 +B ctor. i = 2 +B ctor. i = 3 +B ctor. i = 4 +A ctor. i = 5 +B ctor. i = 6 +B ctor. i = 7 +A copy ctor. i = 8 +B dtor. i = 7 +B dtor. i = 6 +Throwing +B ctor. i = 9 +B ctor. i = 10 +A copy ctor. i = 11 +B dtor. i = 10 +B dtor. i = 9 +B ctor. i = 12 +B ctor. i = 13 +A copy ctor. i = 14 +B dtor. i = 13 +B dtor. i = 12 +B ctor. i = 15 +B ctor. i = 16 +A dtor. i = 8 +B dtor. i = 16 +B dtor. i = 15 +B ctor. i = 17 +B ctor. i = 18 +A dtor. i = 5 +B dtor. i = 18 +B dtor. i = 17 +B dtor. i = 4 +B dtor. i = 3 +B dtor. i = 2 +A ctor. i = 19 +In catch #2 +B ctor. i = 20 +Throwing a new b +B copy ctor. i = 21 +B copy ctor. i = 22 +B dtor. i = 20 +B ctor. i = 23 +B ctor. i = 24 +A dtor. i = 19 +B dtor. i = 24 +B dtor. i = 23 +B ctor. i = 25 +B ctor. i = 26 +A dtor. i = 14 +B dtor. i = 26 +B dtor. i = 25 +B ctor. i = 27 +B ctor. i = 28 +A dtor. i = 11 +B dtor. i = 28 +B dtor. i = 27 +B dtor. i = 1 +In catch #3 +Throwing a new a +A ctor. i = 29 +B ctor. i = 30 +B ctor. i = 31 +A copy ctor. i = 32 +B dtor. i = 31 +B dtor. i = 30 +B dtor. i = 22 +B dtor. i = 21 +B ctor. i = 33 +B ctor. i = 34 +A dtor. i = 0 +B dtor. i = 34 +B dtor. i = 33 +In main's catch +B ctor. i = 35 +B ctor. i = 36 +A dtor. i = 32 +B dtor. i = 36 +B dtor. i = 35 +B ctor. i = 37 +B ctor. i = 38 +A dtor. i = 29 +B dtor. i = 38 +B dtor. i = 37 + + +Test #6 +B ctor. i = 0 +B ctor. i = 1 +B ctor. i = 2 +Throwing a b +B copy ctor. i = 3 +B copy ctor. i = 4 +B dtor. i = 2 +B ctor. i = 5 +In catch #1 +Throwing a new b +B copy ctor. i = 6 +B copy ctor. i = 7 +B dtor. i = 5 +B dtor. i = 4 +B dtor. i = 3 +B dtor. i = 1 +B ctor. i = 8 +In catch #2 +Throwing a new b +B copy ctor. i = 9 +B copy ctor. i = 10 +B dtor. i = 8 +B dtor. i = 7 +B dtor. i = 6 +B dtor. i = 0 +A ctor. i = 11 +In catch #3 +Throwing a new a +B ctor. i = 12 +B ctor. i = 13 +A copy ctor. i = 14 +B dtor. i = 13 +B dtor. i = 12 +B ctor. i = 15 +B ctor. i = 16 +A copy ctor. i = 17 +B dtor. i = 16 +B dtor. i = 15 +B ctor. i = 18 +B ctor. i = 19 +A dtor. i = 11 +B dtor. i = 19 +B dtor. i = 18 +B dtor. i = 10 +B dtor. i = 9 +In main's catch +B ctor. i = 20 +B ctor. i = 21 +A dtor. i = 17 +B dtor. i = 21 +B dtor. i = 20 +B ctor. i = 22 +B ctor. i = 23 +A dtor. i = 14 +B dtor. i = 23 +B dtor. i = 22 + + +Test #7 +B ctor. i = 0 +B ctor. i = 1 +B ctor. i = 2 +Throwing a b +B ctor. i = 3 +B copy ctor. i = 4 +B dtor. i = 2 +B ctor. i = 5 +In catch #1 +B ctor. i = 6 +Rethrowing b +B copy ctor. i = 7 +B dtor. i = 6 +B ctor. i = 8 +In catch #1 of catch#1 +Rethrowing b +B dtor. i = 8 +B dtor. i = 7 +B dtor. i = 5 +B dtor. i = 4 +B copy ctor. i = 9 +B dtor. i = 1 +B ctor. i = 10 +In catch #2 +Throwing a new A +A ctor. i = 11 +B ctor. i = 12 +B ctor. i = 13 +A copy ctor. i = 14 +B dtor. i = 13 +B dtor. i = 12 +B dtor. i = 10 +B dtor. i = 9 +B dtor. i = 3 +B dtor. i = 0 +In main's catch +B ctor. i = 15 +B ctor. i = 16 +A dtor. i = 14 +B dtor. i = 16 +B dtor. i = 15 +B ctor. i = 17 +B ctor. i = 18 +A dtor. i = 11 +B dtor. i = 18 +B dtor. i = 17 + + +Test #8 +B ctor. i = 0 +B ctor. i = 1 +B ctor. i = 2 +B ctor. i = 3 +Throwing a b +B ctor. i = 4 +B ctor. i = 5 +B copy ctor. i = 6 +B dtor. i = 4 +B dtor. i = 3 +B ctor. i = 7 +In catch #1 +B ctor. i = 8 +Rethrowing b +A ctor. i = 9 +Rethrowing +B copy ctor. i = 10 +B ctor. i = 11 +B ctor. i = 12 +A dtor. i = 9 +B dtor. i = 12 +B dtor. i = 11 +B dtor. i = 8 +B ctor. i = 13 +In catch #1 of catch#1 +Rethrowing b +A ctor. i = 14 +Rethrowing +B ctor. i = 15 +B ctor. i = 16 +A dtor. i = 14 +B dtor. i = 16 +B dtor. i = 15 +B dtor. i = 13 +B dtor. i = 10 +B copy ctor. i = 17 +B dtor. i = 7 +B dtor. i = 6 +B dtor. i = 2 +B dtor. i = 1 +B ctor. i = 18 +In catch #2 +Throwing a new A +A ctor. i = 19 +B ctor. i = 20 +B ctor. i = 21 +A copy ctor. i = 22 +B dtor. i = 21 +B dtor. i = 20 +B dtor. i = 18 +B dtor. i = 17 +B dtor. i = 5 +B dtor. i = 0 +In main's catch +B ctor. i = 23 +B ctor. i = 24 +A dtor. i = 22 +B dtor. i = 24 +B dtor. i = 23 +B ctor. i = 25 +B ctor. i = 26 +A dtor. i = 19 +B dtor. i = 26 +B dtor. i = 25 + + +Test #9 +B ctor. i = 0 +Throwing B +B copy ctor. i = 1 +B dtor. i = 0 +In catch #1 +Rethrow +In catch #2 +B dtor. i = 1 +End of test9, throwing a A +A ctor. i = 2 +B ctor. i = 3 +B ctor. i = 4 +A copy ctor. i = 5 +B dtor. i = 4 +B dtor. i = 3 +In main's catch +B ctor. i = 6 +B ctor. i = 7 +A dtor. i = 5 +B dtor. i = 7 +B dtor. i = 6 +B ctor. i = 8 +B ctor. i = 9 +A dtor. i = 2 +B dtor. i = 9 +B dtor. i = 8 + + +Test #10 +B ctor. i = 0 +Throwing B +B copy ctor. i = 1 +B dtor. i = 0 +In catch #1 +Throwing a new B() +B ctor. i = 2 +In catch #2 +B dtor. i = 2 +B dtor. i = 1 +End of test10, throwing a A +A ctor. i = 3 +B ctor. i = 4 +B ctor. i = 5 +A copy ctor. i = 6 +B dtor. i = 5 +B dtor. i = 4 +In main's catch +B ctor. i = 7 +B ctor. i = 8 +A dtor. i = 6 +B dtor. i = 8 +B dtor. i = 7 +B ctor. i = 9 +B ctor. i = 10 +A dtor. i = 3 +B dtor. i = 10 +B dtor. i = 9 + + +Passed diff --git a/modules/rostests/apitests/compiler/ms/eh/ehthrow.cxx b/modules/rostests/apitests/compiler/ms/eh/ehthrow.cxx new file mode 100644 index 00000000000..27a695638f2 --- /dev/null +++ b/modules/rostests/apitests/compiler/ms/eh/ehthrow.cxx @@ -0,0 +1,547 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for +// full license information. + +/* + Tests some throw and rethrow situations (mostly CRT a test) +*/ + + +#include <stdlib.h> +#include <stdio.h> + + +#define FALSE 0 +#define TRUE 1 +#define NO_CTOR_THROW 1 +#define NO_DTOR_THROW 2 + + +int Object[100]; +int CurrentObjectNumber, Test; +int MaxTest = 10; +int MaxObjectCount = 1; +int Fail; + + +void FAIL(int i) +{ + printf("FAILED on %d\n", i); + Fail++; +} + +void dealloc(int i, int no_throw) +{ + /* Make sure i is valid, and object exists */ + if(i<0 || i>=MaxObjectCount || !Object[i]) + FAIL(i); + + Object[i] = 0; +} + +void alloc(int i, int no_throw) +{ + if(CurrentObjectNumber > MaxObjectCount) + MaxObjectCount = CurrentObjectNumber; + + /* Object already exists? */ + if(Object[i]) FAIL(i); + + Object[i] = 1; +} + +class B +{ +public: + int i; + int flag; + B(); + B(int); + B(const B &b); + ~B(); +}; + +B::B() +{ + i = CurrentObjectNumber++; + printf("B ctor. i = %d\n", i); + alloc(i, FALSE); +} + +B::B(int f) +{ + i = CurrentObjectNumber++; + flag = f; + printf("B ctor. i = %d\n", i); + alloc(i, flag==NO_CTOR_THROW); +} + +B::B(const B &b) +{ + i = CurrentObjectNumber++; + printf("B copy ctor. i = %d\n", i); + alloc(i, FALSE); +} + +B::~B() +{ + printf("B dtor. i = %d\n", i); + dealloc(i, flag==NO_DTOR_THROW); +} + +class A +{ +public: + int i; + A(); + A(int) + { + i = CurrentObjectNumber++; + printf("A(int) ctor. i = %d\n", i); + alloc(i, FALSE); + } + A operator+(A a); + A(const A &a) + { + /* Try objects in ctor */ + B b1 = NO_DTOR_THROW, b2 = NO_DTOR_THROW; + + i = CurrentObjectNumber++; + printf("A copy ctor. i = %d\n", i); + alloc(i, FALSE); + } + + ~A(){ + /* Try objects in dtor */ + B b1 = NO_CTOR_THROW, b2 = NO_CTOR_THROW; + + printf("A dtor. i = %d\n", i); + dealloc(i, FALSE); + }; +}; + +A::A() +{ + i=CurrentObjectNumber++; + printf("A ctor. i = %d\n", i); + alloc(i, FALSE); +} + +A A::operator+(A a) +{ + printf("A%d + A%d\n", i, a.i); + return A(); +} + +void Throwa(A a) +{ + printf("Throwing\n"); + throw a; +} + +void bar() +{ + A a; + + Throwa(a); +} + +void foobar() +{ + B b; + bar(); +} + +// Somehow, inlining this causes different unwinding order.. + +__declspec(noinline) void Rethrow2() +{ + A a; + printf("Rethrowing\n"); + throw; +} + +#pragma inline_depth(0) +void Rethrow() +{ + Rethrow2(); +} +#pragma inline_depth() + +void foobar2() +{ + B b; + + try{ + A a; + bar(); + }catch(A a){ + printf("In catch;\n"); + Rethrow(); + } +} + +void foobar3() +{ + B b; + + try{ + A a; + bar(); + }catch(A a){ + printf("In catch\n"); + A a2; + + printf("Throwing new a\n"); + throw a2; + } +} + +void foobar4() +{ + B b; + + try{ + B b; + try{ + A a1, a2; + try { + A a1, a2; + foobar2(); + }catch(A a){ + printf("In catch #1\n"); + B b; + printf("Rethrowing\n"); + throw; + } + }catch(A &a){ + printf("In catch #2\n"); + A a2; + + printf("Throwing new a\n"); + throw a; + } + }catch(A a){ + printf("In catch #3\n"); + B b; + printf("Rethrowing\n"); + throw; + } +} + +__declspec(noinline) void throw_B_2() +{ + B b; + printf("Throwing a new b\n"); + throw b; +} + +#pragma inline_depth(0) +void throw_B() +{ + throw_B_2(); +} +#pragma inline_depth() + + +void foobar5() +{ + try { + B b1; + try { + B b2; + try { + B b3; + foobar(); + }catch(B b){ + printf("In catch #1\n"); + FAIL(-1); + } + FAIL(-1); + }catch(A a){ + A a2; + printf("In catch #2\n"); + throw_B(); + } + FAIL(-1); + }catch(B b){ + printf("In catch #3\n"); + printf("Throwing a new a\n"); + throw A(); + } + FAIL(-1); +} + + +/* Simple throw with unwinds */ +void test1() +{ + A a; + foobar(); +} + +/* Throw followed by a rethrow */ +void test2() +{ + A a; + foobar2(); +} + +/* Throw followed by a new throw */ +void test3() +{ + A a; + foobar3(); +} + +/* Nested trys with rethrow/throw/rethrow */ +void test4() +{ + A a; + foobar4(); +} + +/* Makes sure a new throw skips appropriate unwound frames. */ +void test5() +{ + A a; + foobar5(); +} + +// Tests 3 level of new throw +void test6() +{ + try{ + B b1; + try{ + B b2; + try{ + B b3; + printf("Throwing a b\n"); + throw(b3); + }catch(B b){ + B b4; + printf("In catch #1\n"); + printf("Throwing a new b\n"); + throw(b4); + } + FAIL(-1); + }catch(B b){ + B b5; + printf("In catch #2\n"); + printf("Throwing a new b\n"); + throw(b5); + } + FAIL(-1); + }catch(B b){ + A a1; + printf("In catch #3\n"); + printf("Throwing a new a\n"); + throw(a1); + } + FAIL(-1); +} + +// Testing try/catch inside a catch +void test7() +{ + B b1; + try{ + B b2; + try{ + B b3; + + printf("Throwing a b\n"); + throw(B()); + }catch(B b){ + B b4; + printf("In catch #1\n"); + try{ + B b5; + printf("Rethrowing b\n"); + throw; + }catch(B b){ + B b5; + printf("In catch #1 of catch#1\n"); + printf("Rethrowing b\n"); + throw; + } + } + }catch(B b){ + B b6; + printf("In catch #2\n"); + printf("Throwing a new A\n"); + throw(A()); + } +} + +void ThrowB() +{ + B b; + + throw(B()); +} + +void bar8() +{ + try{ + B b5; + printf("Rethrowing b\n"); + Rethrow(); + }catch(B b){ + B b5; + printf("In catch #1 of catch#1\n"); + printf("Rethrowing b\n"); + Rethrow(); + } +} + +void foo8() +{ + B b; + try{ + B b3; + + printf("Throwing a b\n"); + ThrowB(); + }catch(B b){ + B b4; + printf("In catch #1\n"); + bar8(); + } +} + +// Testing call to try/catch function inside a catch +void test8() +{ + B b1; + try{ + B b2; + foo8(); + }catch(B b){ + B b6; + printf("In catch #2\n"); + printf("Throwing a new A\n"); + throw(A()); + } +} + +void foo9() +{ + try { + puts("Rethrow"); + throw; + }catch(...){ + puts("In catch #2"); + } +} + +void test9() +{ + try{ + B b; + puts("Throwing B"); + throw b; + }catch(...){ + puts("In catch #1"); + foo9(); + } + puts("End of test9, throwing a A"); + throw A(); +} + +void foo10() +{ + try { + puts("Throwing a new B()"); + throw B(); + }catch(...){ + puts("In catch #2"); + } +} + +void test10() +{ + try{ + B b; + puts("Throwing B"); + throw b; + }catch(...){ + puts("In catch #1"); + foo10(); + } + puts("End of test10, throwing a A"); + throw A(); +} + +int main() +{ + int i; + + /* Call test(), with a different ctor/dtor throwing each time */ + for(Test = 1; Test <= MaxTest; Test++) { + + CurrentObjectNumber = 0; + + printf("\nTest #%d\n", Test); + + try { + switch(Test){ + case 1: + test1(); + break; + case 2: + test2(); + break; + case 3: + test3(); + break; + case 4: + test4(); + break; + case 5: + test5(); + break; + case 6: + test6(); + break; + case 7: + test7(); + break; + case 8: + test8(); + break; + case 9: + test9(); + break; + case 10: + test10(); + break; + } + + FAIL(-1); + + }catch(A a){ + printf("In main's catch\n"); + }catch(...){ + FAIL(-1); + } + + /* Any objects which didn't get dtor'd? */ + for(i = 0; i < MaxObjectCount; i++) { + if(Object[i]) { + FAIL(i); + Object[i] = 0; + } + } + + printf("\n"); + } + + printf("\n"); + if(Fail) + printf("FAILED %d tests\n", Fail); + else + printf("Passed\n"); + +} diff --git a/modules/rostests/apitests/compiler/ms/eh/ehthrow.out b/modules/rostests/apitests/compiler/ms/eh/ehthrow.out new file mode 100644 index 00000000000..7f2237199d8 --- /dev/null +++ b/modules/rostests/apitests/compiler/ms/eh/ehthrow.out @@ -0,0 +1,676 @@ + +Test #1 +A ctor. i = 0 +B ctor. i = 1 +A ctor. i = 2 +B ctor. i = 3 +B ctor. i = 4 +A copy ctor. i = 5 +B dtor. i = 4 +B dtor. i = 3 +Throwing +B ctor. i = 6 +B ctor. i = 7 +A copy ctor. i = 8 +B dtor. i = 7 +B dtor. i = 6 +B ctor. i = 9 +B ctor. i = 10 +A copy ctor. i = 11 +B dtor. i = 10 +B dtor. i = 9 +B ctor. i = 12 +B ctor. i = 13 +A dtor. i = 5 +B dtor. i = 13 +B dtor. i = 12 +B ctor. i = 14 +B ctor. i = 15 +A dtor. i = 2 +B dtor. i = 15 +B dtor. i = 14 +B dtor. i = 1 +B ctor. i = 16 +B ctor. i = 17 +A dtor. i = 0 +B dtor. i = 17 +B dtor. i = 16 +In main's catch +B ctor. i = 18 +B ctor. i = 19 +A dtor. i = 11 +B dtor. i = 19 +B dtor. i = 18 +B ctor. i = 20 +B ctor. i = 21 +A dtor. i = 8 +B dtor. i = 21 +B dtor. i = 20 + + +Test #2 +A ctor. i = 0 +B ctor. i = 1 +A ctor. i = 2 +A ctor. i = 3 +B ctor. i = 4 +B ctor. i = 5 +A copy ctor. i = 6 +B dtor. i = 5 +B dtor. i = 4 +Throwing +B ctor. i = 7 +B ctor. i = 8 +A copy ctor. i = 9 +B dtor. i = 8 +B dtor. i = 7 +B ctor. i = 10 +B ctor. i = 11 +A copy ctor. i = 12 +B dtor. i = 11 +B dtor. i = 10 +B ctor. i = 13 +B ctor. i = 14 +A dtor. i = 6 +B dtor. i = 14 +B dtor. i = 13 +B ctor. i = 15 +B ctor. i = 16 +A dtor. i = 3 +B dtor. i = 16 +B dtor. i = 15 +B ctor. i = 17 +B ctor. i = 18 +A dtor. i = 2 +B dtor. i = 18 +B dtor. i = 17 +In catch; +A ctor. i = 19 +Rethrowing +B ctor. i = 20 +B ctor. i = 21 +A dtor. i = 19 +B dtor. i = 21 +B dtor. i = 20 +B ctor. i = 22 +B ctor. i = 23 +A dtor. i = 12 +B dtor. i = 23 +B dtor. i = 22 +B ctor. i = 24 +B ctor. i = 25 +A copy ctor. i = 26 +B dtor. i = 25 +B dtor. i = 24 +B dtor. i = 1 +B ctor. i = 27 +B ctor. i = 28 +A dtor. i = 0 +B dtor. i = 28 +B dtor. i = 27 +In main's catch +B ctor. i = 29 +B ctor. i = 30 +A dtor. i = 26 +B dtor. i = 30 +B dtor. i = 29 +B ctor. i = 31 +B ctor. i = 32 +A dtor. i = 9 +B dtor. i = 32 +B dtor. i = 31 + + +Test #3 +A ctor. i = 0 +B ctor. i = 1 +A ctor. i = 2 +A ctor. i = 3 +B ctor. i = 4 +B ctor. i = 5 +A copy ctor. i = 6 +B dtor. i = 5 +B dtor. i = 4 +Throwing +B ctor. i = 7 +B ctor. i = 8 +A copy ctor. i = 9 +B dtor. i = 8 +B dtor. i = 7 +B ctor. i = 10 +B ctor. i = 11 +A copy ctor. i = 12 +B dtor. i = 11 +B dtor. i = 10 +B ctor. i = 13 +B ctor. i = 14 +A dtor. i = 6 +B dtor. i = 14 +B dtor. i = 13 +B ctor. i = 15 +B ctor. i = 16 +A dtor. i = 3 +B dtor. i = 16 +B dtor. i = 15 +B ctor. i = 17 +B ctor. i = 18 +A dtor. i = 2 +B dtor. i = 18 +B dtor. i = 17 +In catch +A ctor. i = 19 +Throwing new a +B ctor. i = 20 +B ctor. i = 21 +A copy ctor. i = 22 +B dtor. i = 21 +B dtor. i = 20 +B ctor. i = 23 +B ctor. i = 24 +A copy ctor. i = 25 +B dtor. i = 24 +B dtor. i = 23 +B ctor. i = 26 +B ctor. i = 27 +A dtor. i = 9 +B dtor. i = 27 +B dtor. i = 26 +B ctor. i = 28 +B ctor. i = 29 +A dtor. i = 19 +B dtor. i = 29 +B dtor. i = 28 +B ctor. i = 30 +B ctor. i = 31 +A dtor. i = 12 +B dtor. i = 31 +B dtor. i = 30 +B dtor. i = 1 +B ctor. i = 32 +B ctor. i = 33 +A dtor. i = 0 +B dtor. i = 33 +B dtor. i = 32 +In main's catch +B ctor. i = 34 +B ctor. i = 35 +A dtor. i = 25 +B dtor. i = 35 +B dtor. i = 34 +B ctor. i = 36 +B ctor. i = 37 +A dtor. i = 22 +B dtor. i = 37 +B dtor. i = 36 + + +Test #4 +A ctor. i = 0 +B ctor. i = 1 +B ctor. i = 2 +A ctor. i = 3 +A ctor. i = 4 +A ctor. i = 5 +A ctor. i = 6 +B ctor. i = 7 +A ctor. i = 8 +A ctor. i = 9 +B ctor. i = 10 +B ctor. i = 11 +A copy ctor. i = 12 +B dtor. i = 11 +B dtor. i = 10 +Throwing +B ctor. i = 13 +B ctor. i = 14 +A copy ctor. i = 15 +B dtor. i = 14 +B dtor. i = 13 +B ctor. i = 16 +B ctor. i = 17 +A copy ctor. i = 18 +B dtor. i = 17 +B dtor. i = 16 +B ctor. i = 19 +B ctor. i = 20 +A dtor. i = 12 +B dtor. i = 20 +B dtor. i = 19 +B ctor. i = 21 +B ctor. i = 22 +A dtor. i = 9 +B dtor. i = 22 +B dtor. i = 21 +B ctor. i = 23 +B ctor. i = 24 +A dtor. i = 8 +B dtor. i = 24 +B dtor. i = 23 +In catch; +A ctor. i = 25 +Rethrowing +B ctor. i = 26 +B ctor. i = 27 +A dtor. i = 25 +B dtor. i = 27 +B dtor. i = 26 +B ctor. i = 28 +B ctor. i = 29 +A dtor. i = 18 +B dtor. i = 29 +B dtor. i = 28 +B ctor. i = 30 +B ctor. i = 31 +A copy ctor. i = 32 +B dtor. i = 31 +B dtor. i = 30 +B dtor. i = 7 +B ctor. i = 33 +B ctor. i = 34 +A dtor. i = 6 +B dtor. i = 34 +B dtor. i = 33 +B ctor. i = 35 +B ctor. i = 36 +A dtor. i = 5 +B dtor. i = 36 +B dtor. i = 35 +In catch #1 +B ctor. i = 37 +Rethrowing +B dtor. i = 37 +B ctor. i = 38 +B ctor. i = 39 +A dtor. i = 32 +B dtor. i = 39 +B dtor. i = 38 +B ctor. i = 40 +B ctor. i = 41 +A dtor. i = 4 +B dtor. i = 41 +B dtor. i = 40 +B ctor. i = 42 +B ctor. i = 43 +A dtor. i = 3 +B dtor. i = 43 +B dtor. i = 42 +In catch #2 +A ctor. i = 44 +Throwing new a +B ctor. i = 45 +B ctor. i = 46 +A copy ctor. i = 47 +B dtor. i = 46 +B dtor. i = 45 +B ctor. i = 48 +B ctor. i = 49 +A copy ctor. i = 50 +B dtor. i = 49 +B dtor. i = 48 +B ctor. i = 51 +B ctor. i = 52 +A dtor. i = 15 +B dtor. i = 52 +B dtor. i = 51 +B ctor. i = 53 +B ctor. i = 54 +A dtor. i = 44 +B dtor. i = 54 +B dtor. i = 53 +B dtor. i = 2 +In catch #3 +B ctor. i = 55 +Rethrowing +B dtor. i = 55 +B ctor. i = 56 +B ctor. i = 57 +A dtor. i = 50 +B dtor. i = 57 +B dtor. i = 56 +B ctor. i = 58 +B ctor. i = 59 +A copy ctor. i = 60 +B dtor. i = 59 +B dtor. i = 58 +B dtor. i = 1 +B ctor. i = 61 +B ctor. i = 62 +A dtor. i = 0 +B dtor. i = 62 +B dtor. i = 61 +In main's catch +B ctor. i = 63 +B ctor. i = 64 +A dtor. i = 60 +B dtor. i = 64 +B dtor. i = 63 +B ctor. i = 65 +B ctor. i = 66 +A dtor. i = 47 +B dtor. i = 66 +B dtor. i = 65 + + +Test #5 +A ctor. i = 0 +B ctor. i = 1 +B ctor. i = 2 +B ctor. i = 3 +B ctor. i = 4 +A ctor. i = 5 +B ctor. i = 6 +B ctor. i = 7 +A copy ctor. i = 8 +B dtor. i = 7 +B dtor. i = 6 +Throwing +B ctor. i = 9 +B ctor. i = 10 +A copy ctor. i = 11 +B dtor. i = 10 +B dtor. i = 9 +B ctor. i = 12 +B ctor. i = 13 +A copy ctor. i = 14 +B dtor. i = 13 +B dtor. i = 12 +B ctor. i = 15 +B ctor. i = 16 +A dtor. i = 8 +B dtor. i = 16 +B dtor. i = 15 +B ctor. i = 17 +B ctor. i = 18 +A dtor. i = 5 +B dtor. i = 18 +B dtor. i = 17 +B dtor. i = 4 +B dtor. i = 3 +B dtor. i = 2 +A ctor. i = 19 +In catch #2 +B ctor. i = 20 +Throwing a new b +B copy ctor. i = 21 +B copy ctor. i = 22 +B dtor. i = 20 +B ctor. i = 23 +B ctor. i = 24 +A dtor. i = 11 +B dtor. i = 24 +B dtor. i = 23 +B ctor. i = 25 +B ctor. i = 26 +A dtor. i = 19 +B dtor. i = 26 +B dtor. i = 25 +B ctor. i = 27 +B ctor. i = 28 +A dtor. i = 14 +B dtor. i = 28 +B dtor. i = 27 +B dtor. i = 1 +In catch #3 +Throwing a new a +A ctor. i = 29 +B ctor. i = 30 +B ctor. i = 31 +A copy ctor. i = 32 +B dtor. i = 31 +B dtor. i = 30 +B dtor. i = 21 +B dtor. i = 22 +B ctor. i = 33 +B ctor. i = 34 +A dtor. i = 0 +B dtor. i = 34 +B dtor. i = 33 +In main's catch +B ctor. i = 35 +B ctor. i = 36 +A dtor. i = 32 +B dtor. i = 36 +B dtor. i = 35 +B ctor. i = 37 +B ctor. i = 38 +A dtor. i = 29 +B dtor. i = 38 +B dtor. i = 37 + + +Test #6 +B ctor. i = 0 +B ctor. i = 1 +B ctor. i = 2 +Throwing a b +B copy ctor. i = 3 +B copy ctor. i = 4 +B dtor. i = 2 +B ctor. i = 5 +In catch #1 +Throwing a new b +B copy ctor. i = 6 +B copy ctor. i = 7 +B dtor. i = 3 +B dtor. i = 5 +B dtor. i = 4 +B dtor. i = 1 +B ctor. i = 8 +In catch #2 +Throwing a new b +B copy ctor. i = 9 +B copy ctor. i = 10 +B dtor. i = 6 +B dtor. i = 8 +B dtor. i = 7 +B dtor. i = 0 +A ctor. i = 11 +In catch #3 +Throwing a new a +B ctor. i = 12 +B ctor. i = 13 +A copy ctor. i = 14 +B dtor. i = 13 +B dtor. i = 12 +B ctor. i = 15 +B ctor. i = 16 +A copy ctor. i = 17 +B dtor. i = 16 +B dtor. i = 15 +B dtor. i = 9 +B ctor. i = 18 +B ctor. i = 19 +A dtor. i = 11 +B dtor. i = 19 +B dtor. i = 18 +B dtor. i = 10 +In main's catch +B ctor. i = 20 +B ctor. i = 21 +A dtor. i = 17 +B dtor. i = 21 +B dtor. i = 20 +B ctor. i = 22 +B ctor. i = 23 +A dtor. i = 14 +B dtor. i = 23 +B dtor. i = 22 + + +Test #7 +B ctor. i = 0 +B ctor. i = 1 +B ctor. i = 2 +Throwing a b +B ctor. i = 3 +B copy ctor. i = 4 +B dtor. i = 2 +B ctor. i = 5 +In catch #1 +B ctor. i = 6 +Rethrowing b +B copy ctor. i = 7 +B dtor. i = 6 +B ctor. i = 8 +In catch #1 of catch#1 +Rethrowing b +B dtor. i = 8 +B dtor. i = 7 +B dtor. i = 5 +B dtor. i = 4 +B copy ctor. i = 9 +B dtor. i = 1 +B ctor. i = 10 +In catch #2 +Throwing a new A +A ctor. i = 11 +B ctor. i = 12 +B ctor. i = 13 +A copy ctor. i = 14 +B dtor. i = 13 +B dtor. i = 12 +B dtor. i = 3 +B dtor. i = 10 +B dtor. i = 9 +B dtor. i = 0 +In main's catch +B ctor. i = 15 +B ctor. i = 16 +A dtor. i = 14 +B dtor. i = 16 +B dtor. i = 15 +B ctor. i = 17 +B ctor. i = 18 +A dtor. i = 11 +B dtor. i = 18 +B dtor. i = 17 + + +Test #8 +B ctor. i = 0 +B ctor. i = 1 +B ctor. i = 2 +B ctor. i = 3 +Throwing a b +B ctor. i = 4 +B ctor. i = 5 +B copy ctor. i = 6 +B dtor. i = 4 +B dtor. i = 3 +B ctor. i = 7 +In catch #1 +B ctor. i = 8 +Rethrowing b +A ctor. i = 9 +Rethrowing +B copy ctor. i = 10 +B ctor. i = 11 +B ctor. i = 12 +A dtor. i = 9 +B dtor. i = 12 +B dtor. i = 11 +B dtor. i = 8 +B ctor. i = 13 +In catch #1 of catch#1 +Rethrowing b +A ctor. i = 14 +Rethrowing +B ctor. i = 15 +B ctor. i = 16 +A dtor. i = 14 +B dtor. i = 16 +B dtor. i = 15 +B dtor. i = 13 +B dtor. i = 10 +B dtor. i = 7 +B dtor. i = 6 +B copy ctor. i = 17 +B dtor. i = 2 +B dtor. i = 1 +B ctor. i = 18 +In catch #2 +Throwing a new A +A ctor. i = 19 +B ctor. i = 20 +B ctor. i = 21 +A copy ctor. i = 22 +B dtor. i = 21 +B dtor. i = 20 +B dtor. i = 5 +B dtor. i = 18 +B dtor. i = 17 +B dtor. i = 0 +In main's catch +B ctor. i = 23 +B ctor. i = 24 +A dtor. i = 22 +B dtor. i = 24 +B dtor. i = 23 +B ctor. i = 25 +B ctor. i = 26 +A dtor. i = 19 +B dtor. i = 26 +B dtor. i = 25 + + +Test #9 +B ctor. i = 0 +Throwing B +B copy ctor. i = 1 +B dtor. i = 0 +In catch #1 +Rethrow +In catch #2 +B dtor. i = 1 +End of test9, throwing a A +A ctor. i = 2 +B ctor. i = 3 +B ctor. i = 4 +A copy ctor. i = 5 +B dtor. i = 4 +B dtor. i = 3 +In main's catch +B ctor. i = 6 +B ctor. i = 7 +A dtor. i = 5 +B dtor. i = 7 +B dtor. i = 6 +B ctor. i = 8 +B ctor. i = 9 +A dtor. i = 2 +B dtor. i = 9 +B dtor. i = 8 + + +Test #10 +B ctor. i = 0 +Throwing B +B copy ctor. i = 1 +B dtor. i = 0 +In catch #1 +Throwing a new B() +B ctor. i = 2 +In catch #2 +B dtor. i = 2 +B dtor. i = 1 +End of test10, throwing a A +A ctor. i = 3 +B ctor. i = 4 +B ctor. i = 5 +A copy ctor. i = 6 +B dtor. i = 5 +B dtor. i = 4 +In main's catch +B ctor. i = 7 +B ctor. i = 8 +A dtor. i = 6 +B dtor. i = 8 +B dtor. i = 7 +B ctor. i = 9 +B ctor. i = 10 +A dtor. i = 3 +B dtor. i = 10 +B dtor. i = 9 + + +Passed diff --git a/modules/rostests/apitests/compiler/ms/eh/ihateeh.cxx b/modules/rostests/apitests/compiler/ms/eh/ihateeh.cxx new file mode 100644 index 00000000000..960e74598c8 --- /dev/null +++ b/modules/rostests/apitests/compiler/ms/eh/ihateeh.cxx @@ -0,0 +1,199 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for +// full license information. + +#include <stdlib.h> +#include <stdio.h> + +#define FALSE 0 +#define TRUE 1 +#define NO_CTOR_THROW 1 +#define NO_DTOR_THROW 2 + +#define TEST_DTOR + +#define MAX_OBJECTS 500 + +#define NOEXCEPT(_x) + +int Object[MAX_OBJECTS]; +int CurrentObjectNumber, ThrowCount, MaxObjectCount = 1; +int Fail; + +void FAIL(int i) { + printf("FAILED on %d\n", i); + Fail++; +} + +void dealloc(int i, int no_throw) { + /* Make sure i is valid, and object exists */ + if (i < 0 || i >= MaxObjectCount || !Object[i]) + FAIL(i); + + Object[i] = 0; + +/* Try throw in this dtor.. */ +#ifdef TEST_DTOR + if (i + MaxObjectCount == ThrowCount && !no_throw) { + printf("Throwing\n"); + throw(1); + } +#endif +} + +void alloc(int i, int no_throw) { + if (CurrentObjectNumber > MaxObjectCount) + MaxObjectCount = CurrentObjectNumber; + + /* Object already exists? */ + if (Object[i]) + FAIL(i); + + /* Try throw in this ctor.. */ + if (i == ThrowCount && !no_throw) { + printf("Throwing\n"); + throw(1); + } + + if (i >= MAX_OBJECTS) { + printf("\n*** Number of objects exceeded. Increase MAX_OBJECTS ***\n\n"); + FAIL(i); + i = 0; + } + + Object[i] = 1; +} + +class B { +public: + int i; + int flag; + B(); + B(int); + ~B() NOEXCEPT(false); +}; + +B::B() { + i = CurrentObjectNumber++; + printf("B ctor. i = %d\n", i); + alloc(i, FALSE); +} + +B::B(int f) { + i = CurrentObjectNumber++; + flag = f; + printf("B ctor. i = %d\n", i); + alloc(i, flag == NO_CTOR_THROW); +} + +B::~B() NOEXCEPT(false) { + printf("B dtor. i = %d\n", i); + dealloc(i, flag == NO_DTOR_THROW); +} + +class A { +public: + int i; + A(); + A(int) { + i = CurrentObjectNumber++; + printf("A(int) ctor. i = %d\n", i); + alloc(i, FALSE); + } + A operator+(A a); + A(const A &a) { + /* Try objects in ctor */ + B b1 = NO_DTOR_THROW, b2 = NO_DTOR_THROW; + + i = CurrentObjectNumber++; + printf("A copy ctor. i = %d\n", i); + alloc(i, FALSE); + } + + ~A() NOEXCEPT(false) { + /* Try objects in dtor */ + B b1 = NO_CTOR_THROW, b2 = NO_CTOR_THROW; + + printf("A dtor. i = %d\n", i); + dealloc(i, FALSE); + }; +}; + +A::A() { + i = CurrentObjectNumber++; + printf("A ctor. i = %d\n", i); + alloc(i, FALSE); +} + +A A::operator+(A a) { + printf("A%d + A%d\n", i, a.i); + return A(); +} + +A foo(A a1, A a2) { return a1 + a2; }; + +int bar() { + A a; + + return 666; +} + +void foo2(int i, A a1, A a2, A a3) { + if (i != 666) + FAIL(666); + foo(a1, a3); +} + +A test() { + puts("Try simple ctor"); + A a1; + + puts("Try question op ctor"); + A a2 = (ThrowCount & 1) ? A() : ThrowCount; + + puts("Try a more complex question op ctor"); + A a3 = (ThrowCount & 1) ? A() + a1 + A() + a2 : a2 + A() + A() + ThrowCount; + + puts("Try mbarg copy ctors, and return UDT"); + A a4 = foo(a1, a2); + + puts("Try a more complex mbarg copy ctors, and a function call"); + foo2(bar(), a1 + a2, a2 + A() + a3 + a4, a3); + + puts("Try temporary expressions, and return UDT"); + return a1 + A() + a2 + A() + a3 + a4; +} + +int main() { + int i; + + /* Call test(), with a different ctor/dtor throwing each time */ + for (ThrowCount = 0; ThrowCount < MaxObjectCount * 2; ThrowCount++) { + printf("ThrowCount = %d MaxObjectCount = %d\n", ThrowCount, + MaxObjectCount); + + CurrentObjectNumber = 0; + + try { + test(); + } catch (int) { + printf("In catch\n"); + } + + /* Any objects which didn't get dtor'd? */ + for (i = 0; i < MaxObjectCount; i++) { + if (Object[i]) { + FAIL(i); + Object[i] = 0; + } + } + + printf("\n"); + } + + printf("\n"); + if (Fail) + printf("FAILED %d tests\n", Fail); + else + printf("Passed\n"); +} diff --git a/modules/rostests/apitests/compiler/ms/eh/ihateeh.out.correct b/modules/rostests/apitests/compiler/ms/eh/ihateeh.out.correct new file mode 100644 index 00000000000..48ca04381ce --- /dev/null +++ b/modules/rostests/apitests/compiler/ms/eh/ihateeh.out.correct @@ -0,0 +1,73231 @@ +ThrowCount = 0 MaxObjectCount = 1 +Try simple ctor +A ctor. i = 0 +Throwing +In catch + +ThrowCount = 1 MaxObjectCount = 1 +Try simple ctor +A ctor. i = 0 +Try question op ctor +A ctor. i = 1 +Throwing +B ctor. i = 2 +B ctor. i = 3 +A dtor. i = 0 +B dtor. i = 3 +B dtor. i = 2 +In catch + +ThrowCount = 2 MaxObjectCount = 4 +Try simple ctor +A ctor. i = 0 +Try question op ctor +A(int) ctor. i = 1 +B ctor. i = 2 +Throwing +B ctor. i = 3 +B ctor. i = 4 +A dtor. i = 1 +B dtor. i = 4 +B dtor. i = 3 +B ctor. i = 5 +B ctor. i = 6 +A dtor. i = 0 +B dtor. i = 6 +B dtor. i = 5 +In catch + +ThrowCount = 3 MaxObjectCount = 7 +Try simple ctor +A ctor. i = 0 +Try question op ctor +A ctor. i = 1 +B ctor. i = 2 +B ctor. i = 3 +Throwing +B dtor. i = 2 +B ctor. i = 4 +B ctor. i = 5 +A dtor. i = 1 +B dtor. i = 5 +B dtor. i = 4 +B ctor. i = 6 +B ctor. i = 7 +A dtor. i = 0 +B dtor. i = 7 +B dtor. i = 6 +In catch + +ThrowCount = 4 MaxObjectCount = 8 +Try simple ctor +A ctor. i = 0 +Try question op ctor +A(int) ctor. i = 1 +B ctor. i = 2 +B ctor. i = 3 +A copy ctor. i = 4 +Throwing +B dtor. i = 3 +B dtor. i = 2 +B ctor. i = 5 +B ctor. i = 6 +A dtor. i = 1 +B dtor. i = 6 +B dtor. i = 5 +B ctor. i = 7 +B ctor. i = 8 +A dtor. i = 0 +B dtor. i = 8 +B dtor. i = 7 +In catch + +ThrowCount = 5 MaxObjectCount = 9 +Try simple ctor +A ctor. i = 0 +Try question op ctor +A ctor. i = 1 +B ctor. i = 2 +B ctor. i = 3 +A copy ctor. i = 4 +B dtor. i = 3 +B dtor. i = 2 +B ctor. i = 5 +B ctor. i = 6 +A dtor. i = 1 +B dtor. i = 6 +B dtor. i = 5 +Try a more complex question op ctor +B ctor. i = 7 +B ctor. i = 8 +A copy ctor. i = 9 +B dtor. i = 8 +B dtor. i = 7 +A ctor. i = 10 +B ctor. i = 11 +B ctor. i = 12 +A copy ctor. i = 13 +B dtor. i = 12 +B dtor. i = 11 +A ctor. i = 14 +A14 + A13 +A ctor. i = 15 +B ctor. i = 16 +B ctor. i = 17 +A dtor. i = 13 +B dtor. i = 17 +B dtor. i = 16 +A15 + A10 +A ctor. i = 18 +B ctor. i = 19 +B ctor. i = 20 +A dtor. i = 10 +B dtor. i = 20 +B dtor. i = 19 +A18 + A9 +A ctor. i = 21 +B ctor. i = 22 +B ctor. i = 23 +A dtor. i = 9 +B dtor. i = 23 +B dtor. i = 22 +B ctor. i = 24 +B ctor. i = 25 +A copy ctor. i = 26 +B dtor. i = 25 +B dtor. i = 24 +B ctor. i = 27 +B ctor. i = 28 +A dtor. i = 21 +B dtor. i = 28 +B dtor. i = 27 +B ctor. i = 29 +B ctor. i = 30 +A dtor. i = 18 +B dtor. i = 30 +B dtor. i = 29 +B ctor. i = 31 +B ctor. i = 32 +A dtor. i = 15 +B dtor. i = 32 +B dtor. i = 31 +B ctor. i = 33 +B ctor. i = 34 +A dtor. i = 14 +B dtor. i = 34 +B dtor. i = 33 +Try mbarg copy ctors, and return UDT +B ctor. i = 35 +B ctor. i = 36 +A copy ctor. i = 37 +B dtor. i = 36 +B dtor. i = 35 +B ctor. i = 38 +B ctor. i = 39 +A copy ctor. i = 40 +B dtor. i = 39 +B dtor. i = 38 +B ctor. i = 41 +B ctor. i = 42 +A copy ctor. i = 43 +B dtor. i = 42 +B dtor. i = 41 +A40 + A43 +A ctor. i = 44 +B ctor. i = 45 +B ctor. i = 46 +A dtor. i = 43 +B dtor. i = 46 +B dtor. i = 45 +B ctor. i = 47 +B ctor. i = 48 +A dtor. i = 40 +B dtor. i = 48 +B dtor. i = 47 +B ctor. i = 49 +B ctor. i = 50 +A dtor. i = 37 +B dtor. i = 50 +B dtor. i = 49 +Try a more complex mbarg copy ctors, and a function call +B ctor. i = 51 +B ctor. i = 52 +A copy ctor. i = 53 +B dtor. i = 52 +B dtor. i = 51 +B ctor. i = 54 +B ctor. i = 55 +A copy ctor. i = 56 +B dtor. i = 55 +B dtor. i = 54 +B ctor. i = 57 +B ctor. i = 58 +A copy ctor. i = 59 +B dtor. i = 58 +B dtor. i = 57 +A ctor. i = 60 +A4 + A60 +A ctor. i = 61 +B ctor. i = 62 +B ctor. i = 63 +A dtor. i = 60 +B dtor. i = 63 +B dtor. i = 62 +A61 + A59 +A ctor. i = 64 +B ctor. i = 65 +B ctor. i = 66 +A dtor. i = 59 +B dtor. i = 66 +B dtor. i = 65 +A64 + A56 +A ctor. i = 67 +B ctor. i = 68 +B ctor. i = 69 +A dtor. i = 56 +B dtor. i = 69 +B dtor. i = 68 +B ctor. i = 70 +B ctor. i = 71 +A copy ctor. i = 72 +B dtor. i = 71 +B dtor. i = 70 +A0 + A72 +A ctor. i = 73 +B ctor. i = 74 +B ctor. i = 75 +A dtor. i = 72 +B dtor. i = 75 +B dtor. i = 74 +A ctor. i = 76 +B ctor. i = 77 +B ctor. i = 78 +A dtor. i = 76 +B dtor. i = 78 +B dtor. i = 77 +B ctor. i = 79 +B ctor. i = 80 +A copy ctor. i = 81 +B dtor. i = 80 +B dtor. i = 79 +B ctor. i = 82 +B ctor. i = 83 +A copy ctor. i = 84 +B dtor. i = 83 +B dtor. i = 82 +B ctor. i = 85 +B ctor. i = 86 +A copy ctor. i = 87 +B dtor. i = 86 +B dtor. i = 85 +A84 + A87 +A ctor. i = 88 +B ctor. i = 89 +B ctor. i = 90 +A dtor. i = 87 +B dtor. i = 90 +B dtor. i = 89 +B ctor. i = 91 +B ctor. i = 92 +A dtor. i = 84 +B dtor. i = 92 +B dtor. i = 91 +B ctor. i = 93 +B ctor. i = 94 +A dtor. i = 81 +B dtor. i = 94 +B dtor. i = 93 +B ctor. i = 95 +B ctor. i = 96 +A dtor. i = 88 +B dtor. i = 96 +B dtor. i = 95 +B ctor. i = 97 +B ctor. i = 98 +A dtor. i = 73 +B dtor. i = 98 +B dtor. i = 97 +B ctor. i = 99 +B ctor. i = 100 +A dtor. i = 67 +B dtor. i = 100 +B dtor. i = 99 +B ctor. i = 101 +B ctor. i = 102 +A dtor. i = 53 +B dtor. i = 102 +B dtor. i = 101 +B ctor. i = 103 +B ctor. i = 104 +A dtor. i = 64 +B dtor. i = 104 +B dtor. i = 103 +B ctor. i = 105 +B ctor. i = 106 +A dtor. i = 61 +B dtor. i = 106 +B dtor. i = 105 +Try temporary expressions, and return UDT +B ctor. i = 107 +B ctor. i = 108 +A copy ctor. i = 109 +B dtor. i = 108 +B dtor. i = 107 +B ctor. i = 110 +B ctor. i = 111 +A copy ctor. i = 112 +B dtor. i = 111 +B dtor. i = 110 +A ctor. i = 113 +B ctor. i = 114 +B ctor. i = 115 +A copy ctor. i = 116 +B dtor. i = 115 +B dtor. i = 114 +A ctor. i = 117 +A0 + A117 +A ctor. i = 118 +B ctor. i = 119 +B ctor. i = 120 +A dtor. i = 117 +B dtor. i = 120 +B dtor. i = 119 +A118 + A116 +A ctor. i = 121 +B ctor. i = 122 +B ctor. i = 123 +A dtor. i = 116 +B dtor. i = 123 +B dtor. i = 122 +A121 + A113 +A ctor. i = 124 +B ctor. i = 125 +B ctor. i = 126 +A dtor. i = 113 +B dtor. i = 126 +B dtor. i = 125 +A124 + A112 +A ctor. i = 127 +B ctor. i = 128 +B ctor. i = 129 +A dtor. i = 112 +B dtor. i = 129 +B dtor. i = 128 +A127 + A109 +A ctor. i = 130 +B ctor. i = 131 +B ctor. i = 132 +A dtor. i = 109 +B dtor. i = 132 +B dtor. i = 131 +B ctor. i = 133 +B ctor. i = 134 +A dtor. i = 127 +B dtor. i = 134 +B dtor. i = 133 +B ctor. i = 135 +B ctor. i = 136 +A dtor. i = 124 +B dtor. i = 136 +B dtor. i = 135 +B ctor. i = 137 +B ctor. i = 138 +A dtor. i = 121 +B dtor. i = 138 +B dtor. i = 137 +B ctor. i = 139 +B ctor. i = 140 +A dtor. i = 118 +B dtor. i = 140 +B dtor. i = 139 +B ctor. i = 141 +B ctor. i = 142 +A dtor. i = 44 +B dtor. i = 142 +B dtor. i = 141 +B ctor. i = 143 +B ctor. i = 144 +A dtor. i = 26 +B dtor. i = 144 +B dtor. i = 143 +B ctor. i = 145 +B ctor. i = 146 +A dtor. i = 4 +B dtor. i = 146 +B dtor. i = 145 +B ctor. i = 147 +B ctor. i = 148 +A dtor. i = 0 +B dtor. i = 148 +B dtor. i = 147 +B ctor. i = 149 +B ctor. i = 150 +A dtor. i = 130 +B dtor. i = 150 +B dtor. i = 149 + +ThrowCount = 6 MaxObjectCount = 151 +Try simple ctor +A ctor. i = 0 +Try question op ctor +A(int) ctor. i = 1 +B ctor. i = 2 +B ctor. i = 3 +A copy ctor. i = 4 +B dtor. i = 3 +B dtor. i = 2 +B ctor. i = 5 +B ctor. i = 6 +A dtor. i = 1 +B dtor. i = 6 +B dtor. i = 5 +Try a more complex question op ctor +A(int) ctor. i = 7 +A ctor. i = 8 +A ctor. i = 9 +A4 + A9 +A ctor. i = 10 +B ctor. i = 11 +B ctor. i = 12 +A dtor. i = 9 +B dtor. i = 12 +B dtor. i = 11 +A10 + A8 +A ctor. i = 13 +B ctor. i = 14 +B ctor. i = 15 +A dtor. i = 8 +B dtor. i = 15 +B dtor. i = 14 +A13 + A7 +A ctor. i = 16 +B ctor. i = 17 +B ctor. i = 18 +A dtor. i = 7 +B dtor. i = 18 +B dtor. i = 17 +B ctor. i = 19 +B ctor. i = 20 +A copy ctor. i = 21 +B dtor. i = 20 +B dtor. i = 19 +B ctor. i = 22 +B ctor. i = 23 +A dtor. i = 16 +B dtor. i = 23 +B dtor. i = 22 +B ctor. i = 24 +B ctor. i = 25 +A dtor. i = 13 +B dtor. i = 25 +B dtor. i = 24 +B ctor. i = 26 +B ctor. i = 27 +A dtor. i = 10 +B dtor. i = 27 +B dtor. i = 26 +Try mbarg copy ctors, and return UDT +B ctor. i = 28 +B ctor. i = 29 +A copy ctor. i = 30 +B dtor. i = 29 +B dtor. i = 28 +B ctor. i = 31 +B ctor. i = 32 +A copy ctor. i = 33 +B dtor. i = 32 +B dtor. i = 31 +B ctor. i = 34 +B ctor. i = 35 +A copy ctor. i = 36 +B dtor. i = 35 +B dtor. i = 34 +A33 + A36 +A ctor. i = 37 +B ctor. i = 38 +B ctor. i = 39 +A dtor. i = 36 +B dtor. i = 39 +B dtor. i = 38 +B ctor. i = 40 +B ctor. i = 41 +A dtor. i = 33 +B dtor. i = 41 +B dtor. i = 40 +B ctor. i = 42 +B ctor. i = 43 +A dtor. i = 30 +B dtor. i = 43 +B dtor. i = 42 +Try a more complex mbarg copy ctors, and a function call +B ctor. i = 44 +B ctor. i = 45 +A copy ctor. i = 46 +B dtor. i = 45 +B dtor. i = 44 +B ctor. i = 47 +B ctor. i = 48 +A copy ctor. i = 49 +B dtor. i = 48 +B dtor. i = 47 +B ctor. i = 50 +B ctor. i = 51 +A copy ctor. i = 52 +B dtor. i = 51 +B dtor. i = 50 +A ctor. i = 53 +A4 + A53 +A ctor. i = 54 +B ctor. i = 55 +B ctor. i = 56 +A dtor. i = 53 +B dtor. i = 56 +B dtor. i = 55 +A54 + A52 +A ctor. i = 57 +B ctor. i = 58 +B ctor. i = 59 +A dtor. i = 52 +B dtor. i = 59 +B dtor. i = 58 +A57 + A49 +A ctor. i = 60 +B ctor. i = 61 +B ctor. i = 62 +A dtor. i = 49 +B dtor. i = 62 +B dtor. i = 61 +B ctor. i = 63 +B ctor. i = 64 +A copy ctor. i = 65 +B dtor. i = 64 +B dtor. i = 63 +A0 + A65 +A ctor. i = 66 +B ctor. i = 67 +B ctor. i = 68 +A dtor. i = 65 +B dtor. i = 68 +B dtor. i = 67 +A ctor. i = 69 +B ctor. i = 70 +B ctor. i = 71 +A dtor. i = 69 +B dtor. i = 71 +B dtor. i = 70 +B ctor. i = 72 +B ctor. i = 73 +A copy ctor. i = 74 +B dtor. i = 73 +B dtor. i = 72 +B ctor. i = 75 +B ctor. i = 76 +A copy ctor. i = 77 +B dtor. i = 76 +B dtor. i = 75 +B ctor. i = 78 +B ctor. i = 79 +A copy ctor. i = 80 +B dtor. i = 79 +B dtor. i = 78 +A77 + A80 +A ctor. i = 81 +B ctor. i = 82 +B ctor. i = 83 +A dtor. i = 80 +B dtor. i = 83 +B dtor. i = 82 +B ctor. i = 84 +B ctor. i = 85 +A dtor. i = 77 +B dtor. i = 85 +B dtor. i = 84 +B ctor. i = 86 +B ctor. i = 87 +A dtor. i = 74 +B dtor. i = 87 +B dtor. i = 86 +B ctor. i = 88 +B ctor. i = 89 +A dtor. i = 81 +B dtor. i = 89 +B dtor. i = 88 +B ctor. i = 90 +B ctor. i = 91 +A dtor. i = 66 +B dtor. i = 91 +B dtor. i = 90 +B ctor. i = 92 +B ctor. i = 93 +A dtor. i = 60 +B dtor. i = 93 +B dtor. i = 92 +B ctor. i = 94 +B ctor. i = 95 +A dtor. i = 46 +B dtor. i = 95 +B dtor. i = 94 +B ctor. i = 96 +B ctor. i = 97 +A dtor. i = 57 +B dtor. i = 97 +B dtor. i = 96 +B ctor. i = 98 +B ctor. i = 99 +A dtor. i = 54 +B dtor. i = 99 +B dtor. i = 98 +Try temporary expressions, and return UDT +B ctor. i = 100 +B ctor. i = 101 +A copy ctor. i = 102 +B dtor. i = 101 +B dtor. i = 100 +B ctor. i = 103 +B ctor. i = 104 +A copy ctor. i = 105 +B dtor. i = 104 +B dtor. i = 103 +A ctor. i = 106 +B ctor. i = 107 +B ctor. i = 108 +A copy ctor. i = 109 +B dtor. i = 108 +B dtor. i = 107 +A ctor. i = 110 +A0 + A110 +A ctor. i = 111 +B ctor. i = 112 +B ctor. i = 113 +A dtor. i = 110 +B dtor. i = 113 +B dtor. i = 112 +A111 + A109 +A ctor. i = 114 +B ctor. i = 115 +B ctor. i = 116 +A dtor. i = 109 +B dtor. i = 116 +B dtor. i = 115 +A114 + A106 +A ctor. i = 117 +B ctor. i = 118 +B ctor. i = 119 +A dtor. i = 106 +B dtor. i = 119 +B dtor. i = 118 +A117 + A105 +A ctor. i = 120 +B ctor. i = 121 +B ctor. i = 122 +A dtor. i = 105 +B dtor. i = 122 +B dtor. i = 121 +A120 + A102 +A ctor. i = 123 +B ctor. i = 124 +B ctor. i = 125 +A dtor. i = 102 +B dtor. i = 125 +B dtor. i = 124 +B ctor. i = 126 +B ctor. i = 127 +A dtor. i = 120 +B dtor. i = 127 +B dtor. i = 126 +B ctor. i = 128 +B ctor. i = 129 +A dtor. i = 117 +B dtor. i = 129 +B dtor. i = 128 +B ctor. i = 130 +B ctor. i = 131 +A dtor. i = 114 +B dtor. i = 131 +B dtor. i = 130 +B ctor. i = 132 +B ctor. i = 133 +A dtor. i = 111 +B dtor. i = 133 +B dtor. i = 132 +B ctor. i = 134 +B ctor. i = 135 +A dtor. i = 37 +B dtor. i = 135 +B dtor. i = 134 +B ctor. i = 136 +B ctor. i = 137 +A dtor. i = 21 +B dtor. i = 137 +B dtor. i = 136 +B ctor. i = 138 +B ctor. i = 139 +A dtor. i = 4 +B dtor. i = 139 +B dtor. i = 138 +B ctor. i = 140 +B ctor. i = 141 +A dtor. i = 0 +B dtor. i = 141 +B dtor. i = 140 +B ctor. i = 142 +B ctor. i = 143 +A dtor. i = 123 +B dtor. i = 143 +B dtor. i = 142 + +ThrowCount = 7 MaxObjectCount = 151 +Try simple ctor +A ctor. i = 0 +Try question op ctor +A ctor. i = 1 +B ctor. i = 2 +B ctor. i = 3 +A copy ctor. i = 4 +B dtor. i = 3 +B dtor. i = 2 +B ctor. i = 5 +B ctor. i = 6 +A dtor. i = 1 +B dtor. i = 6 +B dtor. i = 5 +Try a more complex question op ctor +B ctor. i = 7 +Throwing +B ctor. i = 8 +B ctor. i = 9 +A dtor. i = 4 +B dtor. i = 9 +B dtor. i = 8 +B ctor. i = 10 +B ctor. i = 11 +A dtor. i = 0 +B dtor. i = 11 +B dtor. i = 10 +In catch + +ThrowCount = 8 MaxObjectCount = 151 +Try simple ctor +A ctor. i = 0 +Try question op ctor +A(int) ctor. i = 1 +B ctor. i = 2 +B ctor. i = 3 +A copy ctor. i = 4 +B dtor. i = 3 +B dtor. i = 2 +B ctor. i = 5 +B ctor. i = 6 +A dtor. i = 1 +B dtor. i = 6 +B dtor. i = 5 +Try a more complex question op ctor +A(int) ctor. i = 7 +A ctor. i = 8 +Throwing +B ctor. i = 9 +B ctor. i = 10 +A dtor. i = 7 +B dtor. i = 10 +B dtor. i = 9 +B ctor. i = 11 +B ctor. i = 12 +A dtor. i = 4 +B dtor. i = 12 +B dtor. i = 11 +B ctor. i = 13 +B ctor. i = 14 +A dtor. i = 0 +B dtor. i = 14 +B dtor. i = 13 +In catch + +ThrowCount = 9 MaxObjectCount = 151 +Try simple ctor +A ctor. i = 0 +Try question op ctor +A ctor. i = 1 +B ctor. i = 2 +B ctor. i = 3 +A copy ctor. i = 4 +B dtor. i = 3 +B dtor. i = 2 +B ctor. i = 5 +B ctor. i = 6 +A dtor. i = 1 +B dtor. i = 6 +B dtor. i = 5 +Try a more complex question op ctor +B ctor. i = 7 +B ctor. i = 8 +A copy ctor. i = 9 +Throwing +B dtor. i = 8 +B dtor. i = 7 +B ctor. i = 10 +B ctor. i = 11 +A dtor. i = 4 +B dtor. i = 11 +B dtor. i = 10 +B ctor. i = 12 +B ctor. i = 13 +A dtor. i = 0 +B dtor. i = 13 +B dtor. i = 12 +In catch + +ThrowCount = 10 MaxObjectCount = 151 +Try simple ctor +A ctor. i = 0 +Try question op ctor +A(int) ctor. i = 1 +B ctor. i = 2 +B ctor. i = 3 +A copy ctor. i = 4 +B dtor. i = 3 +B dtor. i = 2 +B ctor. i = 5 +B ctor. i = 6 +A dtor. i = 1 +B dtor. i = 6 +B dtor. i = 5 +Try a more complex question op ctor +A(int) ctor. i = 7 +A ctor. i = 8 +A ctor. i = 9 +A4 + A9 +A ctor. i = 10 +Throwing +B ctor. i = 11 +B ctor. i = 12 +A dtor. i = 9 +B dtor. i = 12 +B dtor. i = 11 +B ctor. i = 13 +B ctor. i = 14 +A dtor. i = 8 +B dtor. i = 14 +B dtor. i = 13 +B ctor. i = 15 +B ctor. i = 16 +A dtor. i = 7 +B dtor. i = 16 +B dtor. i = 15 +B ctor. i = 17 +B ctor. i = 18 +A dtor. i = 4 +B dtor. i = 18 +B dtor. i = 17 +B ctor. i = 19 +B ctor. i = 20 +A dtor. i = 0 +B dtor. i = 20 +B dtor. i = 19 +In catch + +ThrowCount = 11 MaxObjectCount = 151 +Try simple ctor +A ctor. i = 0 +Try question op ctor +A ctor. i = 1 +B ctor. i = 2 +B ctor. i = 3 +A copy ctor. i = 4 +B dtor. i = 3 +B dtor. i = 2 +B ctor. i = 5 +B ctor. i = 6 +A dtor. i = 1 +B dtor. i = 6 +B dtor. i = 5 +Try a more complex question op ctor +B ctor. i = 7 +B ctor. i = 8 +A copy ctor. i = 9 +B dtor. i = 8 +B dtor. i = 7 +A ctor. i = 10 +B ctor. i = 11 +Throwing +B ctor. i = 12 +B ctor. i = 13 +A dtor. i = 10 +B dtor. i = 13 +B dtor. i = 12 +B ctor. i = 14 +B ctor. i = 15 +A dtor. i = 9 +B dtor. i = 15 +B dtor. i = 14 +B ctor. i = 16 +B ctor. i = 17 +A dtor. i = 4 +B dtor. i = 17 +B dtor. i = 16 +B ctor. i = 18 +B ctor. i = 19 +A dtor. i = 0 +B dtor. i = 19 +B dtor. i = 18 +In catch + +ThrowCount = 12 MaxObjectCount = 151 +Try simple ctor +A ctor. i = 0 +Try question op ctor +A(int) ctor. i = 1 +B ctor. i = 2 +B ctor. i = 3 +A copy ctor. i = 4 +B dtor. i = 3 +B dtor. i = 2 +B ctor. i = 5 +B ctor. i = 6 +A dtor. i = 1 +B dtor. i = 6 +B dtor. i = 5 +Try a more complex question op ctor +A(int) ctor. i = 7 +A ctor. i = 8 +A ctor. i = 9 +A4 + A9 +A ctor. i = 10 +B ctor. i = 11 +B ctor. i = 12 +A dtor. i = 9 +B dtor. i = 12 +B dtor. i = 11 +A10 + A8 +A ctor. i = 13 +B ctor. i = 14 +B ctor. i = 15 +A dtor. i = 8 +B dtor. i = 15 +B dtor. i = 14 +A13 + A7 +A ctor. i = 16 +B ctor. i = 17 +B ctor. i = 18 +A dtor. i = 7 +B dtor. i = 18 +B dtor. i = 17 +B ctor. i = 19 +B ctor. i = 20 +A copy ctor. i = 21 +B dtor. i = 20 +B dtor. i = 19 +B ctor. i = 22 +B ctor. i = 23 +A dtor. i = 16 +B dtor. i = 23 +B dtor. i = 22 +B ctor. i = 24 +B ctor. i = 25 +A dtor. i = 13 +B dtor. i = 25 +B dtor. i = 24 +B ctor. i = 26 +B ctor. i = 27 +A dtor. i = 10 +B dtor. i = 27 +B dtor. i = 26 +Try mbarg copy ctors, and return UDT +B ctor. i = 28 +B ctor. i = 29 +A copy ctor. i = 30 +B dtor. i = 29 +B dtor. i = 28 +B ctor. i = 31 +B ctor. i = 32 +A copy ctor. i = 33 +B dtor. i = 32 +B dtor. i = 31 +B ctor. i = 34 +B ctor. i = 35 +A copy ctor. i = 36 +B dtor. i = 35 +B dtor. i = 34 +A33 + A36 +A ctor. i = 37 +B ctor. i = 38 +B ctor. i = 39 +A dtor. i = 36 +B dtor. i = 39 +B dtor. i = 38 +B ctor. i = 40 +B ctor. i = 41 +A dtor. i = 33 +B dtor. i = 41 +B dtor. i = 40 +B ctor. i = 42 +B ctor. i = 43 +A dtor. i = 30 +B dtor. i = 43 +B dtor. i = 42 +Try a more complex mbarg copy ctors, and a function call +B ctor. i = 44 +B ctor. i = 45 +A copy ctor. i = 46 +B dtor. i = 45 +B dtor. i = 44 +B ctor. i = 47 +B ctor. i = 48 +A copy ctor. i = 49 +B dtor. i = 48 +B dtor. i = 47 +B ctor. i = 50 +B ctor. i = 51 +A copy ctor. i = 52 +B dtor. i = 51 +B dtor. i = 50 +A ctor. i = 53 +A4 + A53 +A ctor. i = 54 +B ctor. i = 55 +B ctor. i = 56 +A dtor. i = 53 +B dtor. i = 56 +B dtor. i = 55 +A54 + A52 +A ctor. i = 57 +B ctor. i = 58 +B ctor. i = 59 +A dtor. i = 52 +B dtor. i = 59 +B dtor. i = 58 +A57 + A49 +A ctor. i = 60 +B ctor. i = 61 +B ctor. i = 62 +A dtor. i = 49 +B dtor. i = 62 +B dtor. i = 61 +B ctor. i = 63 +B ctor. i = 64 +A copy ctor. i = 65 +B dtor. i = 64 +B dtor. i = 63 +A0 + A65 +A ctor. i = 66 +B ctor. i = 67 +B ctor. i = 68 +A dtor. i = 65 +B dtor. i = 68 +B dtor. i = 67 +A ctor. i = 69 +B ctor. i = 70 +B ctor. i = 71 +A dtor. i = 69 +B dtor. i = 71 +B dtor. i = 70 +B ctor. i = 72 +B ctor. i = 73 +A copy ctor. i = 74 +B dtor. i = 73 +B dtor. i = 72 +B ctor. i = 75 +B ctor. i = 76 +A copy ctor. i = 77 +B dtor. i = 76 +B dtor. i = 75 +B ctor. i = 78 +B ctor. i = 79 +A copy ctor. i = 80 +B dtor. i = 79 +B dtor. i = 78 +A77 + A80 +A ctor. i = 81 +B ctor. i = 82 +B ctor. i = 83 +A dtor. i = 80 +B dtor. i = 83 +B dtor. i = 82 +B ctor. i = 84 +B ctor. i = 85 +A dtor. i = 77 +B dtor. i = 85 +B dtor. i = 84 +B ctor. i = 86 +B ctor. i = 87 +A dtor. i = 74 +B dtor. i = 87 +B dtor. i = 86 +B ctor. i = 88 +B ctor. i = 89 +A dtor. i = 81 +B dtor. i = 89 +B dtor. i = 88 +B ctor. i = 90 +B ctor. i = 91 +A dtor. i = 66 +B dtor. i = 91 +B dtor. i = 90 +B ctor. i = 92 +B ctor. i = 93 +A dtor. i = 60 +B dtor. i = 93 +B dtor. i = 92 +B ctor. i = 94 +B ctor. i = 95 +A dtor. i = 46 +B dtor. i = 95 +B dtor. i = 94 +B ctor. i = 96 +B ctor. i = 97 +A dtor. i = 57 +B dtor. i = 97 +B dtor. i = 96 +B ctor. i = 98 +B ctor. i = 99 +A dtor. i = 54 +B dtor. i = 99 +B dtor. i = 98 +Try temporary expressions, and return UDT +B ctor. i = 100 +B ctor. i = 101 +A copy ctor. i = 102 +B dtor. i = 101 +B dtor. i = 100 +B ctor. i = 103 +B ctor. i = 104 +A copy ctor. i = 105 +B dtor. i = 104 +B dtor. i = 103 +A ctor. i = 106 +B ctor. i = 107 +B ctor. i = 108 +A copy ctor. i = 109 +B dtor. i = 108 +B dtor. i = 107 +A ctor. i = 110 +A0 + A110 +A ctor. i = 111 +B ctor. i = 112 +B ctor. i = 113 +A dtor. i = 110 +B dtor. i = 113 +B dtor. i = 112 +A111 + A109 +A ctor. i = 114 +B ctor. i = 115 +B ctor. i = 116 +A dtor. i = 109 +B dtor. i = 116 +B dtor. i = 115 +A114 + A106 +A ctor. i = 117 +B ctor. i = 118 +B ctor. i = 119 +A dtor. i = 106 +B dtor. i = 119 +B dtor. i = 118 +A117 + A105 +A ctor. i = 120 +B ctor. i = 121 +B ctor. i = 122 +A dtor. i = 105 +B dtor. i = 122 +B dtor. i = 121 +A120 + A102 +A ctor. i = 123 +B ctor. i = 124 +B ctor. i = 125 +A dtor. i = 102 +B dtor. i = 125 +B dtor. i = 124 +B ctor. i = 126 +B ctor. i = 127 +A dtor. i = 120 +B dtor. i = 127 +B dtor. i = 126 +B ctor. i = 128 +B ctor. i = 129 +A dtor. i = 117 +B dtor. i = 129 +B dtor. i = 128 +B ctor. i = 130 +B ctor. i = 131 +A dtor. i = 114 +B dtor. i = 131 +B dtor. i = 130 +B ctor. i = 132 +B ctor. i = 133 +A dtor. i = 111 +B dtor. i = 133 +B dtor. i = 132 +B ctor. i = 134 +B ctor. i = 135 +A dtor. i = 37 +B dtor. i = 135 +B dtor. i = 134 +B ctor. i = 136 +B ctor. i = 137 +A dtor. i = 21 +B dtor. i = 137 +B dtor. i = 136 +B ctor. i = 138 +B ctor. i = 139 +A dtor. i = 4 +B dtor. i = 139 +B dtor. i = 138 +B ctor. i = 140 +B ctor. i = 141 +A dtor. i = 0 +B dtor. i = 141 +B dtor. i = 140 +B ctor. i = 142 +B ctor. i = 143 +A dtor. i = 123 +B dtor. i = 143 +B dtor. i = 142 + +ThrowCount = 13 MaxObjectCount = 151 +Try simple ctor +A ctor. i = 0 +Try question op ctor +A ctor. i = 1 +B ctor. i = 2 +B ctor. i = 3 +A copy ctor. i = 4 +B dtor. i = 3 +B dtor. i = 2 +B ctor. i = 5 +B ctor. i = 6 +A dtor. i = 1 +B dtor. i = 6 +B dtor. i = 5 +Try a more complex question op ctor +B ctor. i = 7 +B ctor. i = 8 +A copy ctor. i = 9 +B dtor. i = 8 +B dtor. i = 7 +A ctor. i = 10 +B ctor. i = 11 +B ctor. i = 12 +A copy ctor. i = 13 +Throwing +B dtor. i = 12 +B dtor. i = 11 +B ctor. i = 14 +B ctor. i = 15 +A dtor. i = 10 +B dtor. i = 15 +B dtor. i = 14 +B ctor. i = 16 +B ctor. i = 17 +A dtor. i = 9 +B dtor. i = 17 +B dtor. i = 16 +B ctor. i = 18 +B ctor. i = 19 +A dtor. i = 4 +B dtor. i = 19 +B dtor. i = 18 +B ctor. i = 20 +B ctor. i = 21 +A dtor. i = 0 +B dtor. i = 21 +B dtor. i = 20 +In catch + +ThrowCount = 14 MaxObjectCount = 151 +Try simple ctor +A ctor. i = 0 +Try question op ctor +A(int) ctor. i = 1 +B ctor. i = 2 +B ctor. i = 3 +A copy ctor. i = 4 +B dtor. i = 3 +B dtor. i = 2 +B ctor. i = 5 +B ctor. i = 6 +A dtor. i = 1 +B dtor. i = 6 +B dtor. i = 5 +Try a more complex question op ctor +A(int) ctor. i = 7 +A ctor. i = 8 +A ctor. i = 9 +A4 + A9 +A ctor. i = 10 +B ctor. i = 11 +B ctor. i = 12 +A dtor. i = 9 +B dtor. i = 12 +B dtor. i = 11 +A10 + A8 +A ctor. i = 13 +B ctor. i = 14 +B ctor. i = 15 +A dtor. i = 8 +B dtor. i = 15 +B dtor. i = 14 +A13 + A7 +A ctor. i = 16 +B ctor. i = 17 +B ctor. i = 18 +A dtor. i = 7 +B dtor. i = 18 +B dtor. i = 17 +B ctor. i = 19 +B ctor. i = 20 +A copy ctor. i = 21 +B dtor. i = 20 +B dtor. i = 19 +B ctor. i = 22 +B ctor. i = 23 +A dtor. i = 16 ... 81462 lines suppressed ...

1 0

[reactos] 01/01: [DOC] 3rd Party Files.txt: Add 'rdesktop' entry (#3333)
by Serge Gautherie 30 Oct '20

30 Oct '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=698a8e65541d4a7f9b63d… commit 698a8e65541d4a7f9b63d9bf6a340aa26ed0cc66 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Oct 30 13:35:49 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 30 15:35:49 2020 +0300 [DOC] 3rd Party Files.txt: Add 'rdesktop' entry (#3333) --- media/doc/3rd Party Files.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 322c063191f..26228dd37ab 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -6,6 +6,12 @@ SPDX identifier of a license was used where possible. Please update this file when you port/sync an external project. +Title: rdesktop +Path: base/applications/mstsc +Used Version: 1.8.3 +License: GPL-3.0-or-later (https://spdx.org/licenses/GPL-3.0-or-later.html) +URL: https://github.com/rdesktop/rdesktop + Title: TreeList Path: base/setup/reactos/treelist.c Path: base/setup/reactos/treelist.h

1 0

[reactos] 01/01: [BASESRV] Re-enable and actually fix the CsrValidateMessageBuffer() checks in BaseSrvDefineDosDevice(). (#3304)
by Hermès Bélusca-Maïto 30 Oct '20

30 Oct '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=731eddfe40a0ae641a6a4… commit 731eddfe40a0ae641a6a4b99273a9564a5b4ddc0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Oct 17 16:40:50 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Oct 30 01:58:16 2020 +0100 [BASESRV] Re-enable and actually fix the CsrValidateMessageBuffer() checks in BaseSrvDefineDosDevice(). (#3304) Addendum to commit 0a392b18. The actual problem that existed all along was that the buffers being validated with CsrValidateMessageBuffer() were not the correct ones! What had to be checked is the string buffer **INSIDE** the UNICODE_STRING structures! Indeed, it is these buffers that we are allocating on client side, see https://github.com/reactos/reactos/blob/9b421af1/dll/win32/kernel32/client/… Dedicated to Pierre Schweitzer. --- subsystems/win/basesrv/dosdev.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/subsystems/win/basesrv/dosdev.c b/subsystems/win/basesrv/dosdev.c index 958dceca8ee..85cb0d79b57 100644 --- a/subsystems/win/basesrv/dosdev.c +++ b/subsystems/win/basesrv/dosdev.c @@ -514,22 +514,21 @@ CSR_API(BaseSrvDefineDosDevice) PWSTR InterPtr; BOOLEAN RemoveFound; -#if 0 - /* FIXME: Check why it fails.... */ if (!CsrValidateMessageBuffer(ApiMessage, - (PVOID*)&DefineDosDeviceRequest->DeviceName, + (PVOID*)&DefineDosDeviceRequest->DeviceName.Buffer, DefineDosDeviceRequest->DeviceName.Length, - 1) || + sizeof(BYTE)) || (DefineDosDeviceRequest->DeviceName.Length & 1) != 0 || !CsrValidateMessageBuffer(ApiMessage, - (PVOID*)&DefineDosDeviceRequest->TargetPath, - (DefineDosDeviceRequest->TargetPath.Length != 0 ? sizeof(UNICODE_NULL) : 0) + DefineDosDeviceRequest->TargetPath.Length, - 1) || + (PVOID*)&DefineDosDeviceRequest->TargetPath.Buffer, + DefineDosDeviceRequest->TargetPath.Length + + (DefineDosDeviceRequest->TargetPath.Length != 0 + ? sizeof(UNICODE_NULL) : 0), + sizeof(BYTE)) || (DefineDosDeviceRequest->TargetPath.Length & 1) != 0) { return STATUS_INVALID_PARAMETER; } -#endif DPRINT("BaseSrvDefineDosDevice entered, Flags:%d, DeviceName:%wZ (%d), TargetPath:%wZ (%d)\n", DefineDosDeviceRequest->Flags,

1 0

[reactos] 01/01: [CSRSRV] Clarify few comments, and use MAXULONG.
by Hermès Bélusca-Maïto 30 Oct '20

30 Oct '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4279fc356df67bce5cfe… commit f4279fc356df67bce5cfefa7b29fb05e722e5b00 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Oct 30 01:08:23 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Oct 30 01:55:16 2020 +0100 [CSRSRV] Clarify few comments, and use MAXULONG. --- subsystems/win32/csrsrv/api.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/subsystems/win32/csrsrv/api.c b/subsystems/win32/csrsrv/api.c index 62bb06b3eba..a0b3de17c55 100644 --- a/subsystems/win32/csrsrv/api.c +++ b/subsystems/win32/csrsrv/api.c @@ -1240,7 +1240,7 @@ CsrCaptureArguments(IN PCSR_THREAD CsrThread, BufferDistance = (ULONG_PTR)ServerCaptureBuffer - (ULONG_PTR)ClientCaptureBuffer; /* - * All the pointer offsets correspond to pointers which point + * All the pointer offsets correspond to pointers that point * to the server data buffer instead of the client one. */ // PointerCount = ServerCaptureBuffer->PointerCount; @@ -1355,7 +1355,7 @@ CsrReleaseCapturedArguments(IN PCSR_API_MESSAGE ApiMessage) BufferDistance = (ULONG_PTR)ServerCaptureBuffer - (ULONG_PTR)ClientCaptureBuffer; /* - * All the pointer offsets correspond to pointers which point + * All the pointer offsets correspond to pointers that point * to the client data buffer instead of the server one (reverse * the logic of CsrCaptureArguments()). */ @@ -1438,7 +1438,7 @@ CsrValidateMessageBuffer(IN PCSR_API_MESSAGE ApiMessage, * of non-trivial size and that we don't overflow. */ if (!Buffer || ElementSize == 0 || - (ULONGLONG)ElementCount * ElementSize > (ULONGLONG)0xFFFFFFFF) + (ULONGLONG)ElementCount * ElementSize > (ULONGLONG)MAXULONG) { return FALSE; } @@ -1451,10 +1451,7 @@ CsrValidateMessageBuffer(IN PCSR_API_MESSAGE ApiMessage, /* Check if we have no capture buffer */ if (!CaptureBuffer) { - /* - * In this case, check only the Process ID - * and if there is a match, we succeed. - */ + /* In this case, succeed only if the caller is CSRSS */ if (NtCurrentTeb()->ClientId.UniqueProcess == ApiMessage->Header.ClientId.UniqueProcess) { @@ -1463,7 +1460,7 @@ CsrValidateMessageBuffer(IN PCSR_API_MESSAGE ApiMessage, } else { - /* Make sure that there is still space left in the buffer */ + /* Make sure that there is still space left in the capture buffer */ if ((CaptureBuffer->Size - (ULONG_PTR)*Buffer + (ULONG_PTR)CaptureBuffer) >= (ElementCount * ElementSize)) { @@ -1473,8 +1470,8 @@ CsrValidateMessageBuffer(IN PCSR_API_MESSAGE ApiMessage, while (PointerCount--) { /* - * The pointer offset must be equal to the delta between - * the addresses of the buffer and of the API message. + * Find in the array, the pointer offset (from the + * API message) that corresponds to the buffer. */ if (*OffsetPointer == BufferDistance) {

1 0

[reactos] 01/01: [NTDLL_APITEST] Fix LdrEnumResources testdata initialization ROSTESTS-361
by Mark Jansen 29 Oct '20

29 Oct '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9b421af118427bad62122… commit 9b421af118427bad62122ed7c16e72e59d6c04d2 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Oct 28 20:14:34 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Oct 29 20:17:58 2020 +0100 [NTDLL_APITEST] Fix LdrEnumResources testdata initialization ROSTESTS-361 --- modules/rostests/apitests/ntdll/LdrEnumResources.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/rostests/apitests/ntdll/LdrEnumResources.c b/modules/rostests/apitests/ntdll/LdrEnumResources.c index 7dfd08b5991..e20cfd2bef5 100644 --- a/modules/rostests/apitests/ntdll/LdrEnumResources.c +++ b/modules/rostests/apitests/ntdll/LdrEnumResources.c @@ -172,6 +172,7 @@ InitializeTestImage( TestImage->NtHeaders.OptionalHeader.ImageBase = (DWORD_PTR)TestImage; TestImage->NtHeaders.OptionalHeader.SizeOfImage = sizeof(TEST_IMAGE); TestImage->NtHeaders.OptionalHeader.SizeOfHeaders = sizeof(IMAGE_DOS_HEADER) + sizeof(IMAGE_NT_HEADERS); + TestImage->NtHeaders.OptionalHeader.NumberOfRvaAndSizes = ARRAYSIZE(TestImage->NtHeaders.OptionalHeader.DataDirectory); ResourceDirectory = &TestImage->NtHeaders.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE]; ResourceDirectory->VirtualAddress = FIELD_OFFSET(TEST_IMAGE, Resources); @@ -359,6 +360,7 @@ Test_Parameters(PTEST_IMAGE TestImage) START_TEST(LdrEnumResources) { TEST_IMAGE TestImage; + RtlZeroMemory(&TestImage, sizeof(TestImage)); Test_Parameters(&TestImage); Test_Data(&TestImage);

1 0

[reactos] 01/01: [PSDK] Import some SAL headers from MS
by Timo Kreuzer 29 Oct '20

29 Oct '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e5a4d5afe38aeae6145c… commit 0e5a4d5afe38aeae6145c2ddcef766baf66863a2 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 24 14:18:09 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Oct 29 06:51:28 2020 +0100 [PSDK] Import some SAL headers from MS Taken from https://github.com/microsoft/ChakraCore/tree/master/pal/inc/rt * Move _Check_return_opt_ and _Check_return_wat_ to crtdefs.h * Update sal.h from https://github.com/microsoft/ChakraCore/blob/master/pal/inc/rt/sal.h * Import no_sal2.h from MS and remove the one in NDK * Import specstrings.h from MS * Import specstrings_strict.h from MS * Add specstrings_undef.h (based on defines in specstrings_strict.h) * Remove __REACTOS__ hacks from cdfs --- drivers/filesystems/cdfs/cdstruc.h | 6 - sdk/include/crt/crtdefs.h | 12 + sdk/include/ndk/no_sal2.h | 707 ------------------- sdk/include/psdk/no_sal2.h | 544 +++++++++++++++ sdk/include/psdk/sal.h | 13 +- sdk/include/psdk/specstrings.h | 582 ++++++++++++++-- sdk/include/psdk/specstrings_strict.h | 1198 +++++++++++++++++++++++++++++++++ sdk/include/psdk/specstrings_undef.h | 491 ++++++++++++++ 8 files changed, 2772 insertions(+), 781 deletions(-) diff --git a/drivers/filesystems/cdfs/cdstruc.h b/drivers/filesystems/cdfs/cdstruc.h index 270cf9cf596..78143456d37 100644 --- a/drivers/filesystems/cdfs/cdstruc.h +++ b/drivers/filesystems/cdfs/cdstruc.h @@ -170,12 +170,6 @@ typedef PVOID PBCB; //**** Bcb's are now part of the cache module #define BYTE_COUNT_EMBEDDED_NAME (32) -#ifdef __REACTOS__ -#define __volatile volatile -#define _Unreferenced_parameter_ -#define __field_range(a,b) -#define __analysis_assert(x) -#endif // // The CD_MCB is used to store the mapping of logical file offset to diff --git a/sdk/include/crt/crtdefs.h b/sdk/include/crt/crtdefs.h index 7a2d728638f..0162e7a46de 100644 --- a/sdk/include/crt/crtdefs.h +++ b/sdk/include/crt/crtdefs.h @@ -426,6 +426,18 @@ typedef struct localeinfo_struct { } #endif +#if defined(_PREFAST_) && defined(_PFT_SHOULD_CHECK_RETURN) +#define _Check_return_opt_ _Check_return_ +#else +#define _Check_return_opt_ +#endif + +#if defined(_PREFAST_) && defined(_PFT_SHOULD_CHECK_RETURN_WAT) +#define _Check_return_wat_ _Check_return_ +#else +#define _Check_return_wat_ +#endif + #pragma pack(pop) #endif /* !_INC_CRTDEFS */ diff --git a/sdk/include/ndk/no_sal2.h b/sdk/include/ndk/no_sal2.h deleted file mode 100644 index f106e1b3231..00000000000 --- a/sdk/include/ndk/no_sal2.h +++ /dev/null @@ -1,707 +0,0 @@ - -#pragma once - -#define _NO_SAL_2_H_ - -/* From sal.h */ -#define _Always_(annos) -#define _Analysis_mode_(mode) -#define _Analysis_noreturn_ -#define _Analysis_assume_(expr) __analysis_assume(expr) -#define _At_(target, annos) -#define _At_buffer_(target, iter, bound, annos) -#define _Check_return_ -#define _COM_Outptr_ -#define _COM_Outptr_opt_ -#define _COM_Outptr_opt_result_maybenull_ -#define _COM_Outptr_result_maybenull_ -#define _Const_ -#define _Deref_in_bound_ -#define _Deref_in_range_(lb,ub) -#define _Deref_inout_bound_ -#define _Deref_inout_z_ -#define _Deref_inout_z_bytecap_c_(size) -#define _Deref_inout_z_cap_c_(size) -#define _Deref_opt_out_ -#define _Deref_opt_out_opt_ -#define _Deref_opt_out_opt_z_ -#define _Deref_opt_out_z_ -#define _Deref_out_ -#define _Deref_out_bound_ -#define _Deref_out_opt_ -#define _Deref_out_opt_z_ -#define _Deref_out_range_(lb,ub) -#define _Deref_out_z_ -#define _Deref_out_z_bytecap_c_(size) -#define _Deref_out_z_cap_c_(size) -#define _Deref_post_bytecap_(size) -#define _Deref_post_bytecap_c_(size) -#define _Deref_post_bytecap_x_(size) -#define _Deref_post_bytecount_(size) -#define _Deref_post_bytecount_c_(size) -#define _Deref_post_bytecount_x_(size) -#define _Deref_post_cap_(size) -#define _Deref_post_cap_c_(size) -#define _Deref_post_cap_x_(size) -#define _Deref_post_count_(size) -#define _Deref_post_count_c_(size) -#define _Deref_post_count_x_(size) -#define _Deref_post_maybenull_ -#define _Deref_post_notnull_ -#define _Deref_post_null_ -#define _Deref_post_opt_bytecap_(size) -#define _Deref_post_opt_bytecap_c_(size) -#define _Deref_post_opt_bytecap_x_(size) -#define _Deref_post_opt_bytecount_(size) -#define _Deref_post_opt_bytecount_c_(size) -#define _Deref_post_opt_bytecount_x_(size) -#define _Deref_post_opt_cap_(size) -#define _Deref_post_opt_cap_c_(size) -#define _Deref_post_opt_cap_x_(size) -#define _Deref_post_opt_count_(size) -#define _Deref_post_opt_count_c_(size) -#define _Deref_post_opt_count_x_(size) -#define _Deref_post_opt_valid_ -#define _Deref_post_opt_valid_bytecap_(size) -#define _Deref_post_opt_valid_bytecap_c_(size) -#define _Deref_post_opt_valid_bytecap_x_(size) -#define _Deref_post_opt_valid_cap_(size) -#define _Deref_post_opt_valid_cap_c_(size) -#define _Deref_post_opt_valid_cap_x_(size) -#define _Deref_post_opt_z_ -#define _Deref_post_opt_z_bytecap_(size) -#define _Deref_post_opt_z_bytecap_c_(size) -#define _Deref_post_opt_z_bytecap_x_(size) -#define _Deref_post_opt_z_cap_(size) -#define _Deref_post_opt_z_cap_c_(size) -#define _Deref_post_opt_z_cap_x_(size) -#define _Deref_post_valid_ -#define _Deref_post_valid_bytecap_(size) -#define _Deref_post_valid_bytecap_c_(size) -#define _Deref_post_valid_bytecap_x_(size) -#define _Deref_post_valid_cap_(size) -#define _Deref_post_valid_cap_c_(size) -#define _Deref_post_valid_cap_x_(size) -#define _Deref_post_z_ -#define _Deref_post_z_bytecap_(size) -#define _Deref_post_z_bytecap_c_(size) -#define _Deref_post_z_bytecap_x_(size) -#define _Deref_post_z_cap_(size) -#define _Deref_post_z_cap_c_(size) -#define _Deref_post_z_cap_x_(size) -#define _Deref_pre_bytecap_(size) -#define _Deref_pre_bytecap_c_(size) -#define _Deref_pre_bytecap_x_(size) -#define _Deref_pre_bytecount_(size) -#define _Deref_pre_bytecount_c_(size) -#define _Deref_pre_bytecount_x_(size) -#define _Deref_pre_cap_(size) -#define _Deref_pre_cap_c_(size) -#define _Deref_pre_cap_x_(size) -#define _Deref_pre_count_(size) -#define _Deref_pre_count_c_(size) -#define _Deref_pre_count_x_(size) -#define _Deref_pre_invalid_ -#define _Deref_pre_maybenull_ -#define _Deref_pre_notnull_ -#define _Deref_pre_null_ -#define _Deref_pre_opt_bytecap_(size) -#define _Deref_pre_opt_bytecap_c_(size) -#define _Deref_pre_opt_bytecap_x_(size) -#define _Deref_pre_opt_bytecount_(size) -#define _Deref_pre_opt_bytecount_c_(size) -#define _Deref_pre_opt_bytecount_x_(size) -#define _Deref_pre_opt_cap_(size) -#define _Deref_pre_opt_cap_c_(size) -#define _Deref_pre_opt_cap_x_(size) -#define _Deref_pre_opt_count_(size) -#define _Deref_pre_opt_count_c_(size) -#define _Deref_pre_opt_count_x_(size) -#define _Deref_pre_opt_valid_ -#define _Deref_pre_opt_valid_bytecap_(size) -#define _Deref_pre_opt_valid_bytecap_c_(size) -#define _Deref_pre_opt_valid_bytecap_x_(size) -#define _Deref_pre_opt_valid_cap_(size) -#define _Deref_pre_opt_valid_cap_c_(size) -#define _Deref_pre_opt_valid_cap_x_(size) -#define _Deref_pre_opt_z_ -#define _Deref_pre_opt_z_bytecap_(size) -#define _Deref_pre_opt_z_bytecap_c_(size) -#define _Deref_pre_opt_z_bytecap_x_(size) -#define _Deref_pre_opt_z_cap_(size) -#define _Deref_pre_opt_z_cap_c_(size) -#define _Deref_pre_opt_z_cap_x_(size) -#define _Deref_pre_readonly_ -#define _Deref_pre_valid_ -#define _Deref_pre_valid_bytecap_(size) -#define _Deref_pre_valid_bytecap_c_(size) -#define _Deref_pre_valid_bytecap_x_(size) -#define _Deref_pre_valid_cap_(size) -#define _Deref_pre_valid_cap_c_(size) -#define _Deref_pre_valid_cap_x_(size) -#define _Deref_pre_writeonly_ -#define _Deref_pre_z_ -#define _Deref_pre_z_bytecap_(size) -#define _Deref_pre_z_bytecap_c_(size) -#define _Deref_pre_z_bytecap_x_(size) -#define _Deref_pre_z_cap_(size) -#define _Deref_pre_z_cap_c_(size) -#define _Deref_pre_z_cap_x_(size) -#define _Deref_prepost_bytecap_(size) -#define _Deref_prepost_bytecap_x_(size) -#define _Deref_prepost_bytecount_(size) -#define _Deref_prepost_bytecount_x_(size) -#define _Deref_prepost_cap_(size) -#define _Deref_prepost_cap_x_(size) -#define _Deref_prepost_count_(size) -#define _Deref_prepost_count_x_(size) -#define _Deref_prepost_opt_bytecap_(size) -#define _Deref_prepost_opt_bytecap_x_(size) -#define _Deref_prepost_opt_bytecount_(size) -#define _Deref_prepost_opt_bytecount_x_(size) -#define _Deref_prepost_opt_cap_(size) -#define _Deref_prepost_opt_cap_x_(size) -#define _Deref_prepost_opt_count_(size) -#define _Deref_prepost_opt_count_x_(size) -#define _Deref_prepost_opt_valid_ -#define _Deref_prepost_opt_valid_bytecap_(size) -#define _Deref_prepost_opt_valid_bytecap_x_(size) -#define _Deref_prepost_opt_valid_cap_(size) -#define _Deref_prepost_opt_valid_cap_x_(size) -#define _Deref_prepost_opt_z_ -#define _Deref_prepost_opt_z_bytecap_(size) -#define _Deref_prepost_opt_z_cap_(size) -#define _Deref_prepost_valid_ -#define _Deref_prepost_valid_bytecap_(size) -#define _Deref_prepost_valid_bytecap_x_(size) -#define _Deref_prepost_valid_cap_(size) -#define _Deref_prepost_valid_cap_x_(size) -#define _Deref_prepost_z_ -#define _Deref_prepost_z_bytecap_(size) -#define _Deref_prepost_z_cap_(size) -#define _Deref_ret_bound_ -#define _Deref_ret_opt_z_ -#define _Deref_ret_range_(lb,ub) -#define _Deref_ret_z_ -#define _Deref2_pre_readonly_ -#define _Enum_is_bitflag_ -#define _Field_range_(min,max) -#define _Field_size_(size) -#define _Field_size_bytes_(size) -#define _Field_size_bytes_full_(size) -#define _Field_size_bytes_full_opt_(size) -#define _Field_size_bytes_opt_(size) -#define _Field_size_bytes_part_(size, count) -#define _Field_size_bytes_part_opt_(size, count) -#define _Field_size_full_(size) -#define _Field_size_full_opt_(size) -#define _Field_size_opt_(size) -#define _Field_size_part_(size, count) -#define _Field_size_part_opt_(size, count) -#define _Field_z_ -#define _Function_class_(x) -#define _Group_(annos) -#define _In_ -#define _In_bound_ -#define _In_bytecount_(size) -#define _In_bytecount_c_(size) -#define _In_bytecount_x_(size) -#define _In_count_(size) -#define _In_count_c_(size) -#define _In_count_x_(size) -#define _In_defensive_(annotes) -#define _In_opt_ -#define _In_opt_bytecount_(size) -#define _In_opt_bytecount_c_(size) -#define _In_opt_bytecount_x_(size) -#define _In_opt_count_(size) -#define _In_opt_count_c_(size) -#define _In_opt_count_x_(size) -#define _In_opt_ptrdiff_count_(size) -#define _In_opt_z_ -#define _In_opt_z_bytecount_(size) -#define _In_opt_z_bytecount_c_(size) -#define _In_opt_z_count_(size) -#define _In_opt_z_count_c_(size) -#define _In_ptrdiff_count_(size) -#define _In_range_(lb,ub) -#define _In_reads_(size) -#define _In_reads_bytes_(size) -#define _In_reads_bytes_opt_(size) -#define _In_reads_opt_(size) -#define _In_reads_opt_z_(size) -#define _In_reads_or_z_(size) -#define _In_reads_to_ptr_(ptr) -#define _In_reads_to_ptr_opt_(ptr) -#define _In_reads_to_ptr_opt_z_(ptr) -#define _In_reads_to_ptr_z_(ptr) -#define _In_reads_z_(size) -#define _In_z_ -#define _In_z_bytecount_(size) -#define _In_z_bytecount_c_(size) -#define _In_z_count_(size) -#define _In_z_count_c_(size) -#define _Inout_ -#define _Inout_bytecap_(size) -#define _Inout_bytecap_c_(size) -#define _Inout_bytecap_x_(size) -#define _Inout_bytecount_(size) -#define _Inout_bytecount_c_(size) -#define _Inout_bytecount_x_(size) -#define _Inout_cap_(size) -#define _Inout_cap_c_(size) -#define _Inout_cap_x_(size) -#define _Inout_count_(size) -#define _Inout_count_c_(size) -#define _Inout_count_x_(size) -#define _Inout_defensive_(annotes) -#define _Inout_opt_ -#define _Inout_opt_bytecap_(size) -#define _Inout_opt_bytecap_c_(size) -#define _Inout_opt_bytecap_x_(size) -#define _Inout_opt_bytecount_(size) -#define _Inout_opt_bytecount_c_(size) -#define _Inout_opt_bytecount_x_(size) -#define _Inout_opt_cap_(size) -#define _Inout_opt_cap_c_(size) -#define _Inout_opt_cap_x_(size) -#define _Inout_opt_count_(size) -#define _Inout_opt_count_c_(size) -#define _Inout_opt_count_x_(size) -#define _Inout_opt_ptrdiff_count_(size) -#define _Inout_opt_z_ -#define _Inout_opt_z_bytecap_(size) -#define _Inout_opt_z_bytecap_c_(size) -#define _Inout_opt_z_bytecap_x_(size) -#define _Inout_opt_z_bytecount_(size) -#define _Inout_opt_z_bytecount_c_(size) -#define _Inout_opt_z_cap_(size) -#define _Inout_opt_z_cap_c_(size) -#define _Inout_opt_z_cap_x_(size) -#define _Inout_opt_z_count_(size) -#define _Inout_opt_z_count_c_(size) -#define _Inout_ptrdiff_count_(size) -#define _Inout_updates_(size) -#define _Inout_updates_all_(size) -#define _Inout_updates_all_opt_(size) -#define _Inout_updates_bytes_(size) -#define _Inout_updates_bytes_all_(size) -#define _Inout_updates_bytes_all_opt_(size) -#define _Inout_updates_bytes_opt_(size) -#define _Inout_updates_bytes_to_(size,count) -#define _Inout_updates_bytes_to_opt_(size,count) -#define _Inout_updates_opt_(size) -#define _Inout_updates_opt_z_(size) -#define _Inout_updates_to_(size,count) -#define _Inout_updates_to_opt_(size,count) -#define _Inout_updates_z_(size) -#define _Inout_z_ -#define _Inout_z_bytecap_(size) -#define _Inout_z_bytecap_c_(size) -#define _Inout_z_bytecap_x_(size) -#define _Inout_z_bytecount_(size) -#define _Inout_z_bytecount_c_(size) -#define _Inout_z_cap_(size) -#define _Inout_z_cap_c_(size) -#define _Inout_z_cap_x_(size) -#define _Inout_z_count_(size) -#define _Inout_z_count_c_(size) -#define _Interlocked_operand_ -#define _Literal_ -#define _Maybenull_ -#define _Maybevalid_ -#define _Maybe_raises_SEH_exception_ -#define _Must_inspect_result_ -#define _Notliteral_ -#define _Notnull_ -#define _Notref_ -#define _Notvalid_ -#define _Null_ -#define _Null_terminated_ -#define _NullNull_terminated_ -#define _On_failure_(annos) -#define _Out_ -#define _Out_bound_ -#define _Out_bytecap_(size) -#define _Out_bytecap_c_(size) -#define _Out_bytecap_post_bytecount_(cap,count) -#define _Out_bytecap_x_(size) -#define _Out_bytecapcount_(capcount) -#define _Out_bytecapcount_x_(capcount) -#define _Out_cap_(size) -#define _Out_cap_c_(size) -#define _Out_cap_m_(mult,size) -#define _Out_cap_post_count_(cap,count) -#define _Out_cap_x_(size) -#define _Out_capcount_(capcount) -#define _Out_capcount_x_(capcount) -#define _Out_defensive_(annotes) -#define _Out_opt_ -#define _Out_opt_bytecap_(size) -#define _Out_opt_bytecap_c_(size) -#define _Out_opt_bytecap_post_bytecount_(cap,count) -#define _Out_opt_bytecap_x_(size) -#define _Out_opt_bytecapcount_(capcount) -#define _Out_opt_bytecapcount_x_(capcount) -#define _Out_opt_cap_(size) -#define _Out_opt_cap_c_(size) -#define _Out_opt_cap_m_(mult,size) -#define _Out_opt_cap_post_count_(cap,count) -#define _Out_opt_cap_x_(size) -#define _Out_opt_capcount_(capcount) -#define _Out_opt_capcount_x_(capcount) -#define _Out_opt_ptrdiff_cap_(size) -#define _Out_opt_z_bytecap_(size) -#define _Out_opt_z_bytecap_c_(size) -#define _Out_opt_z_bytecap_post_bytecount_(cap,count) -#define _Out_opt_z_bytecap_x_(size) -#define _Out_opt_z_bytecapcount_(capcount) -#define _Out_opt_z_cap_(size) -#define _Out_opt_z_cap_c_(size) -#define _Out_opt_z_cap_m_(mult,size) -#define _Out_opt_z_cap_post_count_(cap,count) -#define _Out_opt_z_cap_x_(size) -#define _Out_opt_z_capcount_(capcount) -#define _Out_ptrdiff_cap_(size) -#define _Out_range_(lb,ub) -#define _Out_writes_(size) -#define _Out_writes_all_(size) -#define _Out_writes_all_opt_(size) -#define _Out_writes_bytes_(size) -#define _Out_writes_bytes_all_(size) -#define _Out_writes_bytes_all_opt_(size) -#define _Out_writes_bytes_opt_(size) -#define _Out_writes_bytes_to_(size,count) -#define _Out_writes_bytes_to_opt_(size,count) -#define _Out_writes_opt_(size) -#define _Out_writes_opt_z_(size) -#define _Out_writes_to_(size,count) -#define _Out_writes_to_opt_(size,count) -#define _Out_writes_to_ptr_(ptr) -#define _Out_writes_to_ptr_opt_(ptr) -#define _Out_writes_to_ptr_opt_z_(ptr) -#define _Out_writes_to_ptr_z_(ptr) -#define _Out_writes_z_(size) -#define _Out_z_bytecap_(size) -#define _Out_z_bytecap_c_(size) -#define _Out_z_bytecap_post_bytecount_(cap,count) -#define _Out_z_bytecap_x_(size) -#define _Out_z_bytecapcount_(capcount) -#define _Out_z_cap_(size) -#define _Out_z_cap_c_(size) -#define _Out_z_cap_m_(mult,size) -#define _Out_z_cap_post_count_(cap,count) -#define _Out_z_cap_x_(size) -#define _Out_z_capcount_(capcount) -#define _Outptr_ -#define _Outptr_opt_ -#define _Outptr_opt_result_buffer_(size) -#define _Outptr_opt_result_buffer_all_(size) -#define _Outptr_opt_result_buffer_all_maybenull_(size) -#define _Outptr_opt_result_buffer_maybenull_(size) -#define _Outptr_opt_result_buffer_to_(size, count) -#define _Outptr_opt_result_buffer_to_maybenull_(size, count) -#define _Outptr_opt_result_bytebuffer_(size) -#define _Outptr_opt_result_bytebuffer_all_(size) -#define _Outptr_opt_result_bytebuffer_all_maybenull_(size) -#define _Outptr_opt_result_bytebuffer_maybenull_(size) -#define _Outptr_opt_result_bytebuffer_to_(size, count) -#define _Outptr_opt_result_bytebuffer_to_maybenull_(size, count) -#define _Outptr_opt_result_maybenull_ -#define _Outptr_opt_result_maybenull_z_ -#define _Outptr_opt_result_nullonfailure_ -#define _Outptr_opt_result_z_ -#define _Outptr_result_buffer_(size) -#define _Outptr_result_buffer_all_(size) -#define _Outptr_result_buffer_all_maybenull_(size) -#define _Outptr_result_buffer_maybenull_(size) -#define _Outptr_result_buffer_to_(size, count) -#define _Outptr_result_buffer_to_maybenull_(size, count) -#define _Outptr_result_bytebuffer_(size) -#define _Outptr_result_bytebuffer_all_(size) -#define _Outptr_result_bytebuffer_all_maybenull_(size) -#define _Outptr_result_bytebuffer_maybenull_(size) -#define _Outptr_result_bytebuffer_to_(size, count) -#define _Outptr_result_bytebuffer_to_maybenull_(size, count) -#define _Outptr_result_maybenull_ -#define _Outptr_result_maybenull_z_ -#define _Outptr_result_nullonfailure_ -#define _Outptr_result_z_ -#define _Outref_ -#define _Outref_result_buffer_(size) -#define _Outref_result_buffer_all_(size) -#define _Outref_result_buffer_all_maybenull_(size) -#define _Outref_result_buffer_maybenull_(size) -#define _Outref_result_buffer_to_(size, count) -#define _Outref_result_buffer_to_maybenull_(size, count) -#define _Outref_result_bytebuffer_(size) -#define _Outref_result_bytebuffer_all_(size) -#define _Outref_result_bytebuffer_all_maybenull_(size) -#define _Outref_result_bytebuffer_maybenull_(size) -#define _Outref_result_bytebuffer_to_(size, count) -#define _Outref_result_bytebuffer_to_maybenull_(size, count) -#define _Outref_result_maybenull_ -#define _Outref_result_nullonfailure_ -#define _Points_to_data_ -#define _Post_ -#define _Post_bytecap_(size) -#define _Post_bytecount_(size) -#define _Post_bytecount_c_(size) -#define _Post_bytecount_x_(size) -#define _Post_cap_(size) -#define _Post_count_(size) -#define _Post_count_c_(size) -#define _Post_count_x_(size) -#define _Post_defensive_ -#define _Post_equal_to_(expr) -#define _Post_invalid_ -#define _Post_maybenull_ -#define _Post_maybez_ -#define _Post_notnull_ -#define _Post_null_ -#define _Post_ptr_invalid_ -#define _Post_readable_byte_size_(size) -#define _Post_readable_size_(size) -#define _Post_satisfies_(cond) -#define _Post_valid_ -#define _Post_writable_byte_size_(size) -#define _Post_writable_size_(size) -#define _Post_z_ -#define _Post_z_bytecount_(size) -#define _Post_z_bytecount_c_(size) -#define _Post_z_bytecount_x_(size) -#define _Post_z_count_(size) -#define _Post_z_count_c_(size) -#define _Post_z_count_x_(size) -#define _Pre_ -#define _Pre_bytecap_(size) -#define _Pre_bytecap_c_(size) -#define _Pre_bytecap_x_(size) -#define _Pre_bytecount_(size) -#define _Pre_bytecount_c_(size) -#define _Pre_bytecount_x_(size) -#define _Pre_cap_(size) -#define _Pre_cap_c_(size) -#define _Pre_cap_c_one_ -#define _Pre_cap_for_(param) -#define _Pre_cap_m_(mult,size) -#define _Pre_cap_x_(size) -#define _Pre_count_(size) -#define _Pre_count_c_(size) -#define _Pre_count_x_(size) -#define _Pre_defensive_ -#define _Pre_equal_to_(expr) -#define _Pre_invalid_ -#define _Pre_maybenull_ -#define _Pre_notnull_ -#define _Pre_null_ -#define _Pre_opt_bytecap_(size) -#define _Pre_opt_bytecap_c_(size) -#define _Pre_opt_bytecap_x_(size) -#define _Pre_opt_bytecount_(size) -#define _Pre_opt_bytecount_c_(size) -#define _Pre_opt_bytecount_x_(size) -#define _Pre_opt_cap_(size) -#define _Pre_opt_cap_c_(size) -#define _Pre_opt_cap_c_one_ -#define _Pre_opt_cap_for_(param) -#define _Pre_opt_cap_m_(mult,size) -#define _Pre_opt_cap_x_(size) -#define _Pre_opt_count_(size) -#define _Pre_opt_count_c_(size) -#define _Pre_opt_count_x_(size) -#define _Pre_opt_ptrdiff_cap_(ptr) -#define _Pre_opt_ptrdiff_count_(ptr) -#define _Pre_opt_valid_ -#define _Pre_opt_valid_bytecap_(size) -#define _Pre_opt_valid_bytecap_c_(size) -#define _Pre_opt_valid_bytecap_x_(size) -#define _Pre_opt_valid_cap_(size) -#define _Pre_opt_valid_cap_c_(size) -#define _Pre_opt_valid_cap_x_(size) -#define _Pre_opt_z_ -#define _Pre_opt_z_bytecap_(size) -#define _Pre_opt_z_bytecap_c_(size) -#define _Pre_opt_z_bytecap_x_(size) -#define _Pre_opt_z_cap_(size) -#define _Pre_opt_z_cap_c_(size) -#define _Pre_opt_z_cap_x_(size) -#define _Pre_ptrdiff_cap_(ptr) -#define _Pre_ptrdiff_count_(ptr) -#define _Pre_readable_byte_size_(size) -#define _Pre_readable_size_(size) -#define _Pre_readonly_ -#define _Pre_satisfies_(cond) -#define _Pre_unknown_ -#define _Pre_valid_ -#define _Pre_valid_bytecap_(size) -#define _Pre_valid_bytecap_c_(size) -#define _Pre_valid_bytecap_x_(size) -#define _Pre_valid_cap_(size) -#define _Pre_valid_cap_c_(size) -#define _Pre_valid_cap_x_(size) -#define _Pre_writable_byte_size_(size) -#define _Pre_writable_size_(size) -#define _Pre_writeonly_ -#define _Pre_z_ -#define _Pre_z_bytecap_(size) -#define _Pre_z_bytecap_c_(size) -#define _Pre_z_bytecap_x_(size) -#define _Pre_z_cap_(size) -#define _Pre_z_cap_c_(size) -#define _Pre_z_cap_x_(size) -#define _Prepost_bytecount_(size) -#define _Prepost_bytecount_c_(size) -#define _Prepost_bytecount_x_(size) -#define _Prepost_count_(size) -#define _Prepost_count_c_(size) -#define _Prepost_count_x_(size) -#define _Prepost_opt_bytecount_(size) -#define _Prepost_opt_bytecount_c_(size) -#define _Prepost_opt_bytecount_x_(size) -#define _Prepost_opt_count_(size) -#define _Prepost_opt_count_c_(size) -#define _Prepost_opt_count_x_(size) -#define _Prepost_opt_valid_ -#define _Prepost_opt_z_ -#define _Prepost_valid_ -#define _Prepost_z_ -#define _Printf_format_string_ -#define _Raises_SEH_exception_ -#define _Readable_bytes_(size) -#define _Readable_elements_(size) -#define _Reserved_ -#define _Result_nullonfailure_ -#define _Result_zeroonfailure_ -#define _Ret_ -#define _Ret_bound_ -#define _Ret_bytecap_(size) -#define _Ret_bytecap_c_(size) -#define _Ret_bytecap_x_(size) -#define _Ret_bytecount_(size) -#define _Ret_bytecount_c_(size) -#define _Ret_bytecount_x_(size) -#define _Ret_cap_(size) -#define _Ret_cap_c_(size) -#define _Ret_cap_x_(size) -#define _Ret_count_(size) -#define _Ret_count_c_(size) -#define _Ret_count_x_(size) -#define _Ret_maybenull_ -#define _Ret_maybenull_z_ -#define _Ret_notnull_ -#define _Ret_null_ -#define _Ret_opt_ -#define _Ret_opt_bytecap_(size) -#define _Ret_opt_bytecap_c_(size) -#define _Ret_opt_bytecap_x_(size) -#define _Ret_opt_bytecount_(size) -#define _Ret_opt_bytecount_c_(size) -#define _Ret_opt_bytecount_x_(size) -#define _Ret_opt_cap_(size) -#define _Ret_opt_cap_c_(size) -#define _Ret_opt_cap_x_(size) -#define _Ret_opt_count_(size) -#define _Ret_opt_count_c_(size) -#define _Ret_opt_count_x_(size) -#define _Ret_opt_valid_ -#define _Ret_opt_z_ -#define _Ret_opt_z_bytecap_(size) -#define _Ret_opt_z_bytecount_(size) -#define _Ret_opt_z_cap_(size) -#define _Ret_opt_z_count_(size) -#define _Ret_range_(lb,ub) -#define _Ret_valid_ -#define _Ret_writes_(size) -#define _Ret_writes_bytes_(size) -#define _Ret_writes_bytes_maybenull_(size) -#define _Ret_writes_bytes_to_(size,count) -#define _Ret_writes_bytes_to_maybenull_(size,count) -#define _Ret_writes_maybenull_(size) -#define _Ret_writes_maybenull_z_(size) -#define _Ret_writes_to_(size,count) -#define _Ret_writes_to_maybenull_(size,count) -#define _Ret_writes_z_(size) -#define _Ret_z_ -#define _Ret_z_bytecap_(size) -#define _Ret_z_bytecount_(size) -#define _Ret_z_cap_(size) -#define _Ret_z_count_(size) -#define _Return_type_success_(expr) -#define _Scanf_format_string_ -#define _Scanf_s_format_string_ -#define _Strict_type_match_ -#define _Struct_size_bytes_(size) -#define _Success_(expr) -#define _Unchanged_(e) -#define _Use_decl_annotations_ -#define _Valid_ -#define _When_(expr, annos) -#define _Writable_bytes_(size) -#define _Writable_elements_(size) - -/* driverspecs.h */ -#define _Dispatch_type_(type) -#define _IRQL_always_function_max_(irql) -#define _IRQL_always_function_min_(irql) -#define _IRQL_is_cancel_ -#define _IRQL_raises_(irql) -#define _IRQL_requires_(irql) -#define _IRQL_requires_max_(irql) -#define _IRQL_requires_min_(irql) -#define _IRQL_requires_same_ -#define _IRQL_restores_ -#define _IRQL_restores_global_(kind,param) -#define _IRQL_saves_ -#define _IRQL_saves_global_(kind,param) -#define _IRQL_uses_cancel_ -#define _Kernel_clear_do_init_(yesNo) -#define _Kernel_float_restored_ -#define _Kernel_float_saved_ -#define _Kernel_float_used_ -#define _Kernel_IoGetDmaAdapter_ -#define _Kernel_releases_resource_(kind) -#define _Kernel_requires_resource_held_(kind) -#define _Kernel_requires_resource_not_held_(kind) -#define _Kernel_acquires_resource_(kind) -#define _Landmark_(name) -#define __prefast_operator_new_null -#define __prefast_operator_new_throws - -/* concurrencysal.h */ -#define _Benign_race_begin_ __pragma(warning(push)) -#define _Benign_race_end_ __pragma(warning(pop)) -#define _No_competing_thread_begin_ __pragma(warning(push)) -#define _No_competing_thread_end_ __pragma(warning(pop)) -#define _Acquires_exclusive_lock_(lock) -#define _Acquires_lock_(lock) -#define _Acquires_nonreentrant_lock_(lock) -#define _Acquires_shared_lock_(lock) -#define _Analysis_assume_lock_acquired_(lock) -#define _Analysis_assume_lock_released_(lock) -#define _Analysis_assume_lock_held_(lock) -#define _Analysis_assume_lock_not_held_(lock) -#define _Analysis_assume_same_lock_(lock1, lock2) -#define _Analysis_suppress_lock_checking_(lock) -#define _Create_lock_level_(level) -#define _Csalcat1_(x,y) -#define _Csalcat2_(x,y) -#define _Function_ignore_lock_checking_(lock) -#define _Guarded_by_(lock) -#define _Has_lock_kind_(kind) -#define _Has_lock_level_(level) -#define _Interlocked_ -#define _Internal_lock_level_order_(a,b) -#define _Lock_level_order_(a,b) -#define _No_competing_thread_ -#define _Post_same_lock_(lock1,lock2) -#define _Releases_exclusive_lock_(lock) -#define _Releases_lock_(lock) -#define _Releases_nonreentrant_lock_(lock) -#define _Releases_shared_lock_(lock) -#define _Requires_exclusive_lock_held_(lock) -#define _Requires_shared_lock_held_(lock) -#define _Requires_lock_held_(lock) -#define _Requires_lock_not_held_(lock) -#define _Requires_no_locks_held_ -#define _Write_guarded_by_(lock) diff --git a/sdk/include/psdk/no_sal2.h b/sdk/include/psdk/no_sal2.h new file mode 100644 index 00000000000..a652717bdcf --- /dev/null +++ b/sdk/include/psdk/no_sal2.h @@ -0,0 +1,544 @@ +/* + * PROJECT: ReactOS PSDK + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Renders the SAL annotations for documenting APIs harmless. + * COPYRIGHT: Microsoft Corporation. + * SOURCE: https://github.com/microsoft/ChakraCore/blob/master/pal/inc/rt/no_sal2.h + */ +// +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// + + +/*** +* no_sal2.h - renders the SAL annotations for documenting APIs harmless. +* + +* +*Purpose: +* sal.h provides a set of SAL2 annotations to describe how a function uses its +* parameters - the assumptions it makes about them, and the guarantees it makes +* upon finishing. This file redefines all those annotation macros to be harmless. +* It is designed for use in down-level build environments where the tooling may +* be unhappy with the standard SAL2 macro definitions. +* +* [Public] +* + +* +****/ + +#ifndef _NO_SAL_2_H_ +#define _NO_SAL_2_H_ + +#undef __notnull +#define __notnull +#undef _When_ +#define _When_(c,a) +#undef _At_ +#define _At_(t,a) +#undef _At_buffer_ +#define _At_buffer_(t,i,c,a) +#undef _Group_ +#define _Group_(a) +#undef _Pre_ +#define _Pre_ +#undef _Post_ +#define _Post_ +#undef _Deref_ +#define _Deref_ +#undef _Null_ +#define _Null_ +#undef _Notnull_ +#define _Notnull_ +#undef _Maybenull_ +#define _Maybenull_ +#undef _Const_ +#define _Const_ +#undef _Check_return_ +#define _Check_return_ +#undef _Must_inspect_result_ +#define _Must_inspect_result_ +#undef _Pre_satisfies_ +#define _Pre_satisfies_(e) +#undef _Post_satisfies_ +#define _Post_satisfies_(e) +#undef _Writable_elements_ +#define _Writable_elements_(s) +#undef _Writable_bytes_ +#define _Writable_bytes_(s) +#undef _Readable_elements_ +#define _Readable_elements_(s) +#undef _Readable_bytes_ +#define _Readable_bytes_(s) +#undef _Null_terminated_ +#define _Null_terminated_ +#undef _NullNull_terminated_ +#define _NullNull_terminated_ +#undef _Valid_ +#define _Valid_ +#undef _Notvalid_ +#define _Notvalid_ +#undef _Success_ +#define _Success_(c) +#undef _Return_type_success_ +#define _Return_type_success_(c) +#undef _On_failure_ +#define _On_failure_(a) +#undef _Always_ +#define _Always_(a) +#undef _Use_decl_annotations_ +#define _Use_decl_annotations_ +#undef _Pre_defensive_ +#define _Pre_defensive_ +#undef _Post_defensive_ +#define _Post_defensive_ +#undef _Pre_unknown_ +#define _Pre_unknown_ +#undef _Acquires_lock_ +#define _Acquires_lock_(e) +#undef _Releases_lock_ +#define _Releases_lock_(e) +#undef _Requires_lock_held_ +#define _Requires_lock_held_(e) +#undef _Requires_lock_not_held_ +#define _Requires_lock_not_held_(e) +#undef _Requires_no_locks_held_ +#define _Requires_no_locks_held_ +#undef _Guarded_by_ +#define _Guarded_by_(e) +#undef _Write_guarded_by_ +#define _Write_guarded_by_(e) +#undef _Interlocked_ +#define _Interlocked_ +#undef _Post_same_lock_ +#define _Post_same_lock_(e1,e2) +#undef _Benign_race_begin_ +#define _Benign_race_begin_ +#undef _Benign_race_end_ +#define _Benign_race_end_ +#undef _No_competing_thread_ +#define _No_competing_thread_ +#undef _No_competing_thread_begin_ +#define _No_competing_thread_begin_ +#undef _No_competing_thread_end_ +#define _No_competing_thread_end_ +#undef _Acquires_shared_lock_ +#define _Acquires_shared_lock_(e) +#undef _Releases_shared_lock_ +#define _Releases_shared_lock_(e) +#undef _Requires_shared_lock_held_ +#define _Requires_shared_lock_held_(e) +#undef _Acquires_exclusive_lock_ +#define _Acquires_exclusive_lock_(e) +#undef _Releases_exclusive_lock_ +#define _Releases_exclusive_lock_(e) +#undef _Requires_exclusive_lock_held_ +#define _Requires_exclusive_lock_held_(e) +#undef _Has_lock_kind_ +#define _Has_lock_kind_(n) +#undef _Create_lock_level_ +#define _Create_lock_level_(n) +#undef _Has_lock_level_ +#define _Has_lock_level_(n) +#undef _Lock_level_order_ +#define _Lock_level_order_(n1,n2) +#undef _Analysis_assume_lock_acquired_ +#define _Analysis_assume_lock_acquired_(e) +#undef _Analysis_assume_lock_released_ +#define _Analysis_assume_lock_released_(e) +#undef _Analysis_assume_lock_held_ +#define _Analysis_assume_lock_held_(e) +#undef _Analysis_assume_lock_not_held_ +#define _Analysis_assume_lock_not_held_(e) +#undef _Analysis_assume_same_lock_ +#define _Analysis_assume_same_lock_(e) +#undef _In_ +#define _In_ +#undef _Out_ +#define _Out_ +#undef _Inout_ +#define _Inout_ +#undef _In_z_ +#define _In_z_ +#undef _Inout_z_ +#define _Inout_z_ +#undef _In_reads_ +#define _In_reads_(s) +#undef _In_reads_bytes_ +#define _In_reads_bytes_(s) +#undef _In_reads_z_ +#define _In_reads_z_(s) +#undef _In_reads_or_z_ +#define _In_reads_or_z_(s) +#undef _Out_writes_ +#define _Out_writes_(s) +#undef _Out_writes_bytes_ +#define _Out_writes_bytes_(s) +#undef _Out_writes_z_ +#define _Out_writes_z_(s) +#undef _Inout_updates_ +#define _Inout_updates_(s) +#undef _Inout_updates_bytes_ +#define _Inout_updates_bytes_(s) +#undef _Inout_updates_z_ +#define _Inout_updates_z_(s) +#undef _Out_writes_to_ +#define _Out_writes_to_(s,c) +#undef _Out_writes_bytes_to_ +#define _Out_writes_bytes_to_(s,c) +#undef _Out_writes_all_ +#define _Out_writes_all_(s) +#undef _Out_writes_bytes_all_ +#define _Out_writes_bytes_all_(s) +#undef _Inout_updates_to_ +#define _Inout_updates_to_(s,c) +#undef _Inout_updates_bytes_to_ +#define _Inout_updates_bytes_to_(s,c) +#undef _Inout_updates_all_ +#define _Inout_updates_all_(s) +#undef _Inout_updates_bytes_all_ +#define _Inout_updates_bytes_all_(s) +#undef _In_reads_to_ptr_ +#define _In_reads_to_ptr_(p) +#undef _In_reads_to_ptr_z_ +#define _In_reads_to_ptr_z_(p) +#undef _Out_writes_to_ptr_ +#define _Out_writes_to_ptr_(p) +#undef _Out_writes_to_ptr_z_ +#define _Out_writes_to_ptr_z_(p) +#undef _In_opt_ +#define _In_opt_ +#undef _Out_opt_ +#define _Out_opt_ +#undef _Inout_opt_ +#define _Inout_opt_ +#undef _In_opt_z_ +#define _In_opt_z_ +#undef _Inout_opt_z_ +#define _Inout_opt_z_ +#undef _In_reads_opt_ +#define _In_reads_opt_(s) +#undef _In_reads_bytes_opt_ +#define _In_reads_bytes_opt_(s) +#undef _Out_writes_opt_ +#define _Out_writes_opt_(s) +#undef _Out_writes_bytes_opt_ +#define _Out_writes_bytes_opt_(s) +#undef _Out_writes_opt_z_ +#define _Out_writes_opt_z_(s) +#undef _Inout_updates_opt_ +#define _Inout_updates_opt_(s) +#undef _Inout_updates_bytes_opt_ +#define _Inout_updates_bytes_opt_(s) +#undef _Inout_updates_opt_z_ +#define _Inout_updates_opt_z_(s) +#undef _Out_writes_to_opt_ +#define _Out_writes_to_opt_(s,c) +#undef _Out_writes_bytes_to_opt_ +#define _Out_writes_bytes_to_opt_(s,c) +#undef _Out_writes_all_opt_ +#define _Out_writes_all_opt_(s) +#undef _Out_writes_bytes_all_opt_ +#define _Out_writes_bytes_all_opt_(s) +#undef _Inout_updates_to_opt_ +#define _Inout_updates_to_opt_(s,c) +#undef _Inout_updates_bytes_to_opt_ +#define _Inout_updates_bytes_to_opt_(s,c) +#undef _Inout_updates_all_opt_ +#define _Inout_updates_all_opt_(s) +#undef _Inout_updates_bytes_all_opt_ +#define _Inout_updates_bytes_all_opt_(s) +#undef _In_reads_to_ptr_opt_ +#define _In_reads_to_ptr_opt_(p) +#undef _In_reads_to_ptr_opt_z_ +#define _In_reads_to_ptr_opt_z_(p) +#undef _Out_writes_to_ptr_opt_ +#define _Out_writes_to_ptr_opt_(p) +#undef _Out_writes_to_ptr_opt_z_ +#define _Out_writes_to_ptr_opt_z_(p) +#undef _Outptr_ +#define _Outptr_ +#undef _Outptr_opt_ +#define _Outptr_opt_ +#undef _Outptr_result_maybenull_ +#define _Outptr_result_maybenull_ +#undef _Outptr_opt_result_maybenull_ +#define _Outptr_opt_result_maybenull_ +#undef _Outptr_z_ +#define _Outptr_z_ +#undef _Outptr_opt_z_ +#define _Outptr_opt_z_ +#undef _Outptr_result_maybenull_z_ +#define _Outptr_result_maybenull_z_ +#undef _Outptr_opt_result_maybenull_z_ +#define _Outptr_opt_result_maybenull_z_ +#undef _COM_Outptr_ +#define _COM_Outptr_ +#undef _COM_Outptr_opt_ +#define _COM_Outptr_opt_ +#undef _COM_Outptr_result_maybenull_ +#define _COM_Outptr_result_maybenull_ +#undef _COM_Outptr_opt_result_maybenull_ +#define _COM_Outptr_opt_result_maybenull_ +#undef _Outptr_result_buffer_ +#define _Outptr_result_buffer_(s) +#undef _Outptr_result_bytebuffer_ +#define _Outptr_result_bytebuffer_(s) +#undef _Outptr_opt_result_buffer_ +#define _Outptr_opt_result_buffer_(s) +#undef _Outptr_opt_result_bytebuffer_ +#define _Outptr_opt_result_bytebuffer_(s) +#undef _Outptr_result_buffer_to_ +#define _Outptr_result_buffer_to_(s,c) +#undef _Outptr_result_bytebuffer_to_ +#define _Outptr_result_bytebuffer_to_(s,c) +#undef _Outptr_opt_result_buffer_to_ +#define _Outptr_opt_result_buffer_to_(s,c) +#undef _Outptr_opt_result_bytebuffer_to_ +#define _Outptr_opt_result_bytebuffer_to_(s,c) +#undef _Ret_ +#define _Ret_ +#undef _Ret_valid_ +#define _Ret_valid_ +#undef _Ret_z_ +#define _Ret_z_ +#undef _Ret_writes_ +#define _Ret_writes_(s) +#undef _Ret_writes_bytes_ +#define _Ret_writes_bytes_(s) +#undef _Ret_writes_z_ +#define _Ret_writes_z_(s) +#undef _Ret_writes_to_ +#define _Ret_writes_to_(s,c) +#undef _Ret_writes_bytes_to_ +#define _Ret_writes_bytes_to_(s,c) +#undef _Ret_writes_maybenull_ +#define _Ret_writes_maybenull_(s) +#undef _Ret_writes_bytes_maybenull_ +#define _Ret_writes_bytes_maybenull_(s) +#undef _Ret_writes_to_maybenull_ +#define _Ret_writes_to_maybenull_(s,c) +#undef _Ret_writes_bytes_to_maybenull_ +#define _Ret_writes_bytes_to_maybenull_(s,c) +#undef _Ret_writes_maybenull_z_ +#define _Ret_writes_maybenull_z_(s) +#undef _Ret_maybenull_ +#define _Ret_maybenull_ +#undef _Ret_maybenull_z_ +#define _Ret_maybenull_z_ +#undef _Field_size_ +#define _Field_size_(s) +#undef _Field_size_opt_ +#define _Field_size_opt_(s) +#undef _Field_size_bytes_ +#define _Field_size_bytes_(s) +#undef _Field_size_bytes_opt_ +#define _Field_size_bytes_opt_(s) +#undef _Field_size_part_ +#define _Field_size_part_(s,c) +#undef _Field_size_part_opt_ +#define _Field_size_part_opt_(s,c) +#undef _Field_size_bytes_part_ +#define _Field_size_bytes_part_(s,c) +#undef _Field_size_bytes_part_opt_ +#define _Field_size_bytes_part_opt_(s,c) +#undef _Field_size_full_ +#define _Field_size_full_(s) +#undef _Field_size_full_opt_ +#define _Field_size_full_opt_(s) +#undef _Field_size_bytes_full_ +#define _Field_size_bytes_full_(s) +#undef _Field_size_bytes_full_opt_ +#define _Field_size_bytes_full_opt_(s) +#undef _Printf_format_string_ +#define _Printf_format_string_ +#undef _Scanf_format_string_ +#define _Scanf_format_string_ +#undef _Scanf_s_format_string_ +#define _Scanf_s_format_string_ +#undef _Printf_format_string_params_ +#define _Printf_format_string_params_(x) +#undef _Scanf_format_string_params_ +#define _Scanf_format_string_params_(x) +#undef _Scanf_s_format_string_params_ +#define _Scanf_s_format_string_params_(x) +#undef _In_range_ +#define _In_range_(l,h) +#undef _Out_range_ +#define _Out_range_(l,h) +#undef _Ret_range_ +#define _Ret_range_(l,h) +#undef _Deref_in_range_ +#define _Deref_in_range_(l,h) +#undef _Deref_out_range_ +#define _Deref_out_range_(l,h) +#undef _Deref_inout_range_ +#define _Deref_inout_range_(l,h) +#undef _Field_range_ +#define _Field_range_(l,h) +#undef _Pre_equal_to_ +#define _Pre_equal_to_(e) +#undef _Post_equal_to_ +#define _Post_equal_to_(e) +#undef _Struct_size_bytes_ +#define _Struct_size_bytes_(s) +#undef _Analysis_assume_ +#define _Analysis_assume_ +#undef _Analysis_mode_ +#define _Analysis_mode_(m) +#undef _Analysis_noreturn_ +#define _Analysis_noreturn_ +#undef _Raises_SEH_exception_ +#define _Raises_SEH_exception_ +#undef _Maybe_raises_SEH_exception_ +#define _Maybe_raises_SEH_exception_ +#undef _Function_class_ +#define _Function_class_(n) +#undef _Literal_ +#define _Literal_ +#undef _Notliteral_ +#define _Notliteral_ +#undef _Enum_is_bitflag_ +#define _Enum_is_bitflag_ +#undef _Strict_type_match_ +#define _Strict_type_match_ +#undef _Points_to_data_ +#define _Points_to_data_ +#undef _Interlocked_operand_ +#define _Interlocked_operand_ +#undef _IRQL_raises_ +#define _IRQL_raises_(i) +#undef _IRQL_requires_ +#define _IRQL_requires_(i) +#undef _IRQL_requires_max_ +#define _IRQL_requires_max_(i) +#undef _IRQL_requires_min_ +#define _IRQL_requires_min_(i) +#undef _IRQL_saves_ +#define _IRQL_saves_ +#undef _IRQL_saves_global_ +#define _IRQL_saves_global_(k,s) +#undef _IRQL_restores_ +#define _IRQL_restores_ +#undef _IRQL_restores_global_ +#define _IRQL_restores_global_(k,s) +#undef _IRQL_always_function_min_ +#define _IRQL_always_function_min_(i) +#undef _IRQL_always_function_max_ +#define _IRQL_always_function_max_(i) +#undef _IRQL_requires_same_ +#define _IRQL_requires_same_ +#undef _IRQL_uses_cancel_ +#define _IRQL_uses_cancel_ +#undef _IRQL_is_cancel_ +#define _IRQL_is_cancel_ +#undef _Kernel_float_saved_ +#define _Kernel_float_saved_ +#undef _Kernel_float_restored_ +#define _Kernel_float_restored_ +#undef _Kernel_float_used_ +#define _Kernel_float_used_ +#undef _Kernel_acquires_resource_ +#define _Kernel_acquires_resource_(k) +#undef _Kernel_releases_resource_ +#define _Kernel_releases_resource_(k) +#undef _Kernel_requires_resource_held_ +#define _Kernel_requires_resource_held_(k) +#undef _Kernel_requires_resource_not_held_ +#define _Kernel_requires_resource_not_held_(k) +#undef _Kernel_clear_do_init_ +#define _Kernel_clear_do_init_(yn) +#undef _Kernel_IoGetDmaAdapter_ +#define _Kernel_IoGetDmaAdapter_ +#undef _Outref_ +#define _Outref_ +#undef _Outref_result_maybenull_ +#define _Outref_result_maybenull_ +#undef _Outref_result_buffer_ +#define _Outref_result_buffer_(s) +#undef _Outref_result_bytebuffer_ +#define _Outref_result_bytebuffer_(s) +#undef _Outref_result_buffer_to_ +#define _Outref_result_buffer_to_(s,c) +#undef _Outref_result_bytebuffer_to_ +#define _Outref_result_bytebuffer_to_(s,c) +#undef _Outref_result_buffer_all_ +#define _Outref_result_buffer_all_(s) +#undef _Outref_result_bytebuffer_all_ +#define _Outref_result_bytebuffer_all_(s) +#undef _Outref_result_buffer_maybenull_ +#define _Outref_result_buffer_maybenull_(s) +#undef _Outref_result_bytebuffer_maybenull_ +#define _Outref_result_bytebuffer_maybenull_(s) +#undef _Outref_result_buffer_to_maybenull_ +#define _Outref_result_buffer_to_maybenull_(s,c) +#undef _Outref_result_bytebuffer_to_maybenull_ +#define _Outref_result_bytebuffer_to_maybenull_(s,c) +#undef _Outref_result_buffer_all_maybenull_ +#define _Outref_result_buffer_all_maybenull_(s) +#undef _Outref_result_bytebuffer_all_maybenull_ +#define _Outref_result_bytebuffer_all_maybenull_(s) +#undef _In_defensive_ +#define _In_defensive_(a) +#undef _Out_defensive_ +#define _Out_defensive_(a) +#undef _Inout_defensive_ +#define _Inout_defensive_(a) +#undef _Outptr_result_nullonfailure_ +#define _Outptr_result_nullonfailure_ +#undef _Outptr_opt_result_nullonfailure_ +#define _Outptr_opt_result_nullonfailure_ +#undef _Outref_result_nullonfailure_ +#define _Outref_result_nullonfailure_ +#undef _Result_nullonfailure_ +#define _Result_nullonfailure_ +#undef _Result_zeroonfailure_ +#define _Result_zeroonfailure_ +#undef _Acquires_nonreentrant_lock_ +#define _Acquires_nonreentrant_lock_(e) +#undef _Releases_nonreentrant_lock_ +#define _Releases_nonreentrant_lock_(e) +#undef _Reserved_ +#define _Reserved_ _Pre_equal_to_(0) _Pre_ _Null_ +#undef _Pre_z_ +#define _Pre_z_ _Pre_ _Null_terminated_ +#undef _Post_z_ +#define _Post_z_ _Post_ _Null_terminated_ +#undef _Prepost_z_ +#define _Prepost_z_ _Pre_z_ _Post_z_ +#undef _Pre_null_ +#define _Pre_null_ _Pre_ _Null_ +#undef _Pre_maybenull_ +#define _Pre_maybenull_ _Pre_ _Maybenull_ +#undef _Pre_notnull_ +#define _Pre_notnull_ _Pre_ _Notnull_ +#undef _Pre_valid_ +#define _Pre_valid_ _Pre_notnull_ _Pre_ _Valid_ +#undef _Pre_opt_valid_ +#define _Pre_opt_valid_ _Pre_maybenull_ _Pre_ _Valid_ +#undef _Post_valid_ +#define _Post_valid_ _Post_ _Valid_ +#undef _Post_invalid_ +#define _Post_invalid_ _Post_ _Deref_ _Notvalid_ +#undef _Post_ptr_invalid_ +#define _Post_ptr_invalid_ _Post_ _Notvalid_ +#undef _Pre_readable_size_ +#define _Pre_readable_size_(s) _Pre_ _Readable_elements_(s) _Pre_ _Valid_ +#undef _Pre_writable_size_ +#define _Pre_writable_size_(s) _Pre_ _Writable_elements_(s) +#undef _Pre_readable_byte_size_ +#define _Pre_readable_byte_size_(s) _Pre_ _Readable_bytes_(s) _Pre_ _Valid_ +#undef _Pre_writable_byte_size_ +#define _Pre_writable_byte_size_(s) _Pre_ _Writable_bytes_(s) +#undef _Post_readable_size_ +#define _Post_readable_size_(s) _Post_ _Readable_elements_(s) _Post_ _Valid_ +#undef _Post_writable_size_ +#define _Post_writable_size_(s) _Post_ _Writable_elements_(s) +#undef _Post_readable_byte_size_ +#define _Post_readable_byte_size_(s) _Post_ _Readable_bytes_(s) _Post_ _Valid_ +#undef _Post_writable_byte_size_ +#define _Post_writable_byte_size_(s) _Post_ _Writable_bytes_(s) + +#endif /* _NO_SAL_2_H_ */ diff --git a/sdk/include/psdk/sal.h b/sdk/include/psdk/sal.h index 6b865345224..96cc8eab228 100644 --- a/sdk/include/psdk/sal.h +++ b/sdk/include/psdk/sal.h @@ -3,7 +3,7 @@ * LICENSE: MIT (https://spdx.org/licenses/MIT) * PURPOSE: Standard Annotation Language (SAL) definitions * COPYRIGHT: Microsoft Corporation. - * SOURCE: https://github.com/microsoft/service-fabric/blob/master/src/prod/src/pal/sr… + * SOURCE: https://github.com/microsoft/ChakraCore/blob/master/pal/inc/rt/sal.h */ // ------------------------------------------------------------ // Copyright (c) Microsoft Corporation. All rights reserved. @@ -26,7 +26,7 @@ The comments in this file are intended to give basic understanding of the usage of SAL, the Microsoft Source Code Annotation Language. - For more details, please see http://go.microsoft.com/fwlink/?LinkID=242134 + For more details, please see https://go.microsoft.com/fwlink/?LinkID=242134 The macros are defined in 3 layers, plus the structural set: @@ -2611,8 +2611,8 @@ extern "C" { #else // ][ #ifndef PAL_STDCPP_COMPAT #define __null -#endif // !PAL_STDCPP_COMPAT #define __notnull +#endif // !PAL_STDCPP_COMPAT #define __maybenull #define __readonly #define __notreadonly @@ -2667,10 +2667,6 @@ buffer, use the table in the buffer annotations section. #define __out _SAL1_Source_(__out, (), _Out_) #endif // !PAL_STDCPP_COMPAT -#define __in_xcount(size) _SAL1_Source_(__in_xcount, (size), __in _Pre_ __inexpressible_readableTo(size)) -#define __in_xcount_opt(size) _SAL1_Source_(__in_xcount_opt, (size), __in_xcount(size) __exceptthat __maybenull) -#define __out_xcount(size) _SAL1_Source_(__out_xcount, (size), __xcount(size) _Post_ __valid __refparam) - #define __ecount(size) _SAL1_Source_(__ecount, (size), __notnull __elem_writableTo(size)) #define __bcount(size) _SAL1_Source_(__bcount, (size), __notnull __byte_writableTo(size)) #define __in_ecount(size) _SAL1_Source_(__in_ecount, (size), _In_reads_(size)) @@ -2873,7 +2869,7 @@ of each annotation, see the advanced annotations section. #define __success(expr) _Success_(expr) #define __nullterminated _Null_terminated_ #define __nullnullterminated -#define __clr_reserved _SAL1_Source_(__reserved, (), _Reserved_) +#define __reserved _SAL1_Source_(__reserved, (), _Reserved_) #define __checkReturn _SAL1_Source_(__checkReturn, (), _Check_return_) #define __typefix(ctype) _SAL1_Source_(__typefix, (ctype), __inner_typefix(ctype)) #define __override __inner_override @@ -2966,3 +2962,4 @@ __PRIMOP(int, _In_function_class_(__In_impl_ char*);) // Rotor doesn't need concurrency sal. // #include <ConcurrencySal.h> + diff --git a/sdk/include/psdk/specstrings.h b/sdk/include/psdk/specstrings.h index 33a13e340f1..e2d4cc31538 100644 --- a/sdk/include/psdk/specstrings.h +++ b/sdk/include/psdk/specstrings.h @@ -1,82 +1,544 @@ /* - * specstrings.h - * - * Standard Annotation Language (SAL) definitions - * - * This file is part of the ReactOS PSDK package. - * - * Contributors: - * Timo Kreuzer (timo.kreuzer(a)reactos.org) - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * PROJECT: ReactOS PSDK + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Support for markers for documenting the semantics of APIs + * COPYRIGHT: Microsoft Corporation. + * SOURCE: https://github.com/microsoft/ChakraCore/blob/master/pal/inc/rt/specstrings.h */ +// +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// -#pragma once + +// +#ifndef SPECSTRINGS_H #define SPECSTRINGS_H +/*** +*specstrings.h - support for markers for documenting the semantics of APIs +* + +* +* [Public] +****/ + +/************************************************************************* +* See specstrings_strict.h for documentation of all user visible macros. +*************************************************************************/ + +#if _MSC_VER +#pragma once +#endif + +#if !defined(_SAL_VERSION_SAL2) + + #if defined(__BUILDMACHINE__) || defined(_USE_SAL2_ONLY) + #define _SAL_VERSION_SAL2(_A) SAL_2_Clean_Violation_using ## _A + #else + #define _SAL_VERSION_SAL2(_A) + #endif + + #ifdef _USE_SAL2_ONLY + #define _SAL2_STRICT + #define _SAL_VERSION_CHECK(_A) _SAL_VERSION_SAL2(_A) + #else + #define _SAL_VERSION_CHECK(_A) + #endif + + #ifndef SAL_VERSION_CHECK + #define SAL_VERSION_CHECK(_A) _SAL_VERSION_CHECK(_A) + #define SAL_VERSION_SAL2(_A) _SAL_VERSION_SAL2(_A) + #endif + +#endif + #include <sal.h> -#include <driverspecs.h> - -#define __field_bcount(size) __notnull __byte_writableTo(size) -#define __field_bcount_full(size) __notnull __byte_writableTo(size) __byte_readableTo(size) -#define __field_ecount(size) __notnull __elem_writableTo(size) -#define __post_invalid _Post_ __notvalid - -#define __deref_in -#define __deref_in_ecount(size) -#define __deref_in_bcount(size) -#define __deref_in_opt -#define __deref_in_ecount_opt(size) -#define __deref_in_bcount_opt(size) -#define __deref_opt_in -#define __deref_opt_in_ecount(size) -#define __deref_opt_in_bcount(size) -#define __deref_opt_in_opt -#define __deref_opt_in_ecount_opt(size) -#define __deref_opt_in_bcount_opt(size) -#define __out_awcount(expr,size) -#define __in_awcount(expr,size) -#define __nullnullterminated -#define __in_data_source(src_sym) -#define __kernel_entry -#define __range(lb,ub) -#define __in_bound -#define __out_bound -#define __in_range(lb,ub) -#define __out_range(lb,ub) -#define __deref_in_range(lb,ub) -#define __deref_out_range(lb,ub) + +#ifndef __SAL_H_FULL_VER +#define __SAL_H_FULL_VER 140050727 +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* version specific fixes to bring sal.h upto date */ +#if __SAL_H_FULL_VER <= 140050727 + +#if !defined(__midl) && defined(_PREFAST_) && _MSC_VER >= 1000 // [ + +/* Missing from RTM sal.h */ +#define __inner_bound _SA_annotes0(SAL_bound) +#define __inner_range(lb,ub) _SA_annotes2(SAL_range,lb,ub) +#define __inner_assume_bound_dec __inline __nothrow void __AssumeBoundInt(_Post_ __inner_bound int i) {i;} +#define __inner_assume_bound(i) __AssumeBoundInt(i); +#define __inner_allocator _SA_annotes0(SAL_allocator) + +#define __static_context(ctx, annotes) \ + _SA_annotes1(SAL_context,ctx) _Group_(__nop_impl(annotes)) + +#define __failure(x) __static_context(SAL_return_convention, \ + _SA_annotes1(SAL_failure,x)) + +__ANNOTATION(SAL_valueUndefined()); +#define __valueUndefined _SA_annotes0(SAL_valueUndefined) + +enum __SAL_failureKind{__failureUnspecified = 0, __failureUndefined = 1}; + +__ANNOTATION(SAL_failureDefault(enum __SAL_failureKind)); +#define __failureDefault(kind) __static_context(SAL_return_convention, \ + _SA_annotes1(SAL_failureDefault,kind)) + +#else // ][ + +#define __inner_bound +#define __inner_range(lb,ub) +#define __inner_assume_bound_dec +#define __inner_assume_bound(i) +#define __inner_allocator + +#define __static_context(ctx, annotes) +#define __failure(x) +#define __valueUndefined +#define __failureDefault(x) + +#endif // ] + +#define __xcount(size) __notnull __inexpressible_writableTo(size) +#define __in_xcount(size) __in _Pre_ __inexpressible_readableTo(size) +#define __out_xcount(size) __xcount(size) _Post_ __valid __refparam +#define __out_xcount_part(size,length) __out_xcount(size) _Post_ __inexpressible_readableTo(length) +#define __out_xcount_full(size) __out_xcount_part(size,size) +#define __inout_xcount(size) __out_xcount(size) _Pre_ __valid +#define __inout_xcount_part(size,length) __out_xcount_part(size,length) _Pre_ __valid _Pre_ __inexpressible_readableTo(length) +#define __inout_xcount_full(size) __inout_xcount_part(size,size) +#define __xcount_opt(size) __xcount(size) __exceptthat __maybenull +#define __in_xcount_opt(size) __in_xcount(size) __exceptthat __maybenull +#define __out_xcount_opt(size) __out_xcount(size) __exceptthat __maybenull +#define __out_xcount_part_opt(size,length) __out_xcount_part(size,length) __exceptthat __maybenull +#define __out_xcount_full_opt(size) __out_xcount_full(size) __exceptthat __maybenull +#define __inout_xcount_opt(size) __inout_xcount(size) __exceptthat __maybenull +#define __inout_xcount_part_opt(size,length) __inout_xcount_part(size,length) __exceptthat __maybenull +#define __inout_xcount_full_opt(size) __inout_xcount_full(size) __exceptthat __maybenull +#define __deref_xcount(size) __ecount(1) _Post_ __elem_readableTo(1) _Post_ __deref __notnull _Post_ __deref __inexpressible_writableTo(size) +#define __deref_in __in _Pre_ __deref __deref __readonly +#define __deref_in_ecount(size) __deref_in _Pre_ __deref __elem_readableTo(size) +#define __deref_in_bcount(size) __deref_in _Pre_ __deref __byte_readableTo(size) +#define __deref_in_xcount(size) __deref_in _Pre_ __deref __inexpressible_readableTo(size) +#define __deref_out_xcount(size) __deref_xcount(size) _Post_ __deref __valid __refparam +#define __deref_out_xcount_part(size,length) __deref_out_xcount(size) _Post_ __deref __inexpressible_readableTo(length) +#define __deref_out_xcount_full(size) __deref_out_xcount_part(size,size) +#define __deref_out_xcount(size) __deref_xcount(size) _Post_ __deref __valid __refparam +#define __inout_xcount_opt(size) __inout_xcount(size) __exceptthat __maybenull +#define __inout_xcount_part_opt(size,length) __inout_xcount_part(size,length) __exceptthat __maybenull +#define __inout_xcount_full_opt(size) __inout_xcount_full(size) __exceptthat __maybenull +#define __deref_xcount(size) __ecount(1) _Post_ __elem_readableTo(1) _Post_ __deref __notnull _Post_ __deref __inexpressible_writableTo(size) +#define __deref_in __in _Pre_ __deref __deref __readonly +#define __deref_in_ecount(size) __deref_in _Pre_ __deref __elem_readableTo(size) +#define __deref_in_bcount(size) __deref_in _Pre_ __deref __byte_readableTo(size) +#define __deref_in_xcount(size) __deref_in _Pre_ __deref __inexpressible_readableTo(size) +#define __deref_out_xcount(size) __deref_xcount(size) _Post_ __deref __valid __refparam +#define __deref_out_xcount_part(size,length) __deref_out_xcount(size) _Post_ __deref __inexpressible_readableTo(length) +#define __deref_out_xcount_full(size) __deref_out_xcount_part(size,size) +#define __deref_out_xcount(size) __deref_xcount(size) _Post_ __deref __valid __refparam +#define __deref_inout_xcount(size) __deref_inout _Pre_ __deref __inexpressible_writableTo(size) _Post_ __deref __inexpressible_writableTo(size) +#define __deref_inout_xcount_part(size,length) __deref_inout_xcount(size) _Pre_ __deref __inexpressible_readableTo(length) _Post_ __deref __inexpressible_readableTo(length) +#define __deref_inout_xcount_full(size) __deref_inout_xcount_part(size,size) +#define __deref_xcount_opt(size) __deref_xcount(size) _Post_ __deref __exceptthat __maybenull +#define __deref_in_opt __deref_in _Pre_ __deref __exceptthat __maybenull +#define __deref_in_opt_out __deref_inout _Pre_ __deref __exceptthat __maybenull _Post_ __deref __notnull +#define __deref_in_ecount_opt(size) __deref_in_ecount(size) _Pre_ __deref __exceptthat __maybenull +#define __deref_in_bcount_opt(size) __deref_in_bcount(size) _Pre_ __deref __exceptthat __maybenull +#define __deref_in_xcount_opt(size) __deref_in_xcount(size) _Pre_ __deref __exceptthat __maybenull +#define __deref_out_xcount_opt(size) __deref_out_xcount(size) _Post_ __deref __exceptthat __maybenull +#define __deref_out_xcount_part_opt(size,length) __deref_out_xcount_part(size,length) _Post_ __deref __exceptthat __maybenull +#define __deref_out_xcount_full_opt(size) __deref_out_xcount_full(size) _Post_ __deref __exceptthat __maybenull +#define __deref_inout_xcount_opt(size) __deref_inout_xcount(size) _Pre_ __deref __exceptthat __maybenull _Post_ __deref __exceptthat __maybenull +#define __deref_inout_xcount_part_opt(size,length) __deref_inout_xcount_part(size,length) _Pre_ __deref __exceptthat __maybenull _Post_ __deref __exceptthat __maybenull +#define __deref_inout_xcount_full_opt(size) __deref_inout_xcount_full(size) _Pre_ __deref __exceptthat __maybenull _Post_ __deref __exceptthat __maybenull +#define __deref_opt_xcount(size) __deref_xcount(size) __exceptthat __maybenull +#define __deref_opt_in __deref_in __exceptthat __maybenull +#define __deref_opt_in_ecount(size) __deref_in_ecount(size) __exceptthat __maybenull +#define __deref_opt_in_bcount(size) __deref_in_bcount(size) __exceptthat __maybenull +#define __deref_opt_in_xcount(size) __deref_in_xcount(size) __exceptthat __maybenull +#define __deref_opt_out_xcount(size) __deref_out_xcount(size) __exceptthat __maybenull +#define __deref_opt_out_xcount_part(size,length) __deref_out_xcount_part(size,length) __exceptthat __maybenull +#define __deref_opt_out_xcount_full(size) __deref_out_xcount_full(size) __exceptthat __maybenull +#define __deref_opt_inout_xcount(size) __deref_inout_xcount(size) __exceptthat __maybenull +#define __deref_opt_inout_xcount_part(size,length) __deref_inout_xcount_part(size,length) __exceptthat __maybenull +#define __deref_opt_inout_xcount_full(size) __deref_inout_xcount_full(size) __exceptthat __maybenull +#define __deref_opt_xcount_opt(size) __deref_xcount_opt(size) __exceptthat __maybenull +#define __deref_opt_in_opt __deref_in_opt __exceptthat __maybenull +#define __deref_opt_in_ecount_opt(size) __deref_in_ecount_opt(size) __exceptthat __maybenull +#define __deref_opt_in_bcount_opt(size) __deref_in_bcount_opt(size) __exceptthat __maybenull +#define __deref_opt_in_xcount_opt(size) __deref_in_xcount_opt(size) __exceptthat __maybenull +#define __deref_opt_out_xcount_opt(size) __deref_out_xcount_opt(size) __exceptthat __maybenull +#define __deref_opt_out_xcount_part_opt(size,length) __deref_out_xcount_part_opt(size,length) __exceptthat __maybenull +#define __deref_opt_out_xcount_full_opt(size) __deref_out_xcount_full_opt(size) __exceptthat __maybenull +#define __deref_opt_inout_xcount_opt(size) __deref_inout_xcount_opt(size) __exceptthat __maybenull +#define __deref_opt_inout_xcount_part_opt(size,length) __deref_inout_xcount_part_opt(size,length) __exceptthat __maybenull +#define __deref_opt_inout_xcount_full_opt(size) __deref_inout_xcount_full_opt(size) __exceptthat __maybenull + +#define __deref_in_ecount_iterator(size, incr) __inout _Pre_ __deref __elem_readableTo(size) __deref_out_range(==, _Old_(*_Curr_) + incr) +#define __deref_out_ecount_iterator(size, incr) __inout _Pre_ __deref __elem_writableTo(size) __deref_out_range(==, _Old_(*_Curr_) + incr) +#define __deref_inout_ecount_iterator(size, incr) __inout _Pre_ __deref __elem_readableTo(size) _Pre_ __deref __elem_writableTo(size) __deref_out_range(==, _Old_(*_Curr_) + incr) + +#define __post_bcount(size) _Post_ __byte_writableTo(size) +#define __post_ecount(size) _Post_ __elem_writableTo(size) + +#define __deref_realloc_bcount(insize, outsize) __inout _Pre_ __deref __byte_readableTo(insize) _Post_ __deref __byte_writableTo(outsize) + +/* __in_ecount_or_z(c) specifies semantics like strncmp, where a string + * parameter is either null terminated, or valid up to c elements. + */ +#define __in_ecount_or_z(c) _When_(_String_length_(_Curr_) < (c), __in_z) \ + _When_(_String_length_(_Curr_) >= (c), __in_ecount(c)) + + +/* Provide default definition to be overridden when needed */ +#define __post_nullnullterminated + +/* Must protect redfinitions of macros to workaround rc.exe issues. */ +#ifndef RC_INVOKED + +#undef __nullnullterminated +#define __nullnullterminated __inexpressible_readableTo("string terminated by two nulls") __nullterminated + +#undef __post_nullnullterminated +#define __post_nullnullterminated _Post_ __inexpressible_readableTo("string terminated by two nulls") _Post_ __nullterminated + +#endif +#endif //__SAL_H_FULL_VER <= 140050727 + +/************************************************************************ + New extensions to sal.h follow here. +*************************************************************************/ #if (_MSC_VER >= 1000) && !defined(__midl) && defined(_PREFAST_) +#define __file_parser(typ) _SA_annotes2(SAL_file_parser,"function",typ) +#define __file_parser_class(typ) _SA_annotes2(SAL_file_parser,"class",typ) +#define __file_parser_library(typ) extern int _SA_annotes2(SAL_file_parser, "library", typ) __iSALFileParserLibrary##typ; +#define __source_code_content(typ) extern int _SA_annotes1(SAL_source_code_content, typ) __iSAL_Source_Code_Content##typ; +#define __class_code_content(typ) _SA_annotes1(SAL_class_code_content, typ) +#define __analysis_assert(e) __assume(e) +#define __analysis_hint(hint) _SA_annotes1(SAL_analysisHint, hint) +// For "breakpoint": doesn't return as far as analysis is concerned. +#define __analysis_noreturn __declspec(noreturn) +/* Internal defintions */ #define __inner_data_source(src_raw) _SA_annotes1(SAL_untrusted_data_source,src_raw) -#define __out_data_source(src_sym) _Post_ __inner_data_source(#src_sym) -#define __analysis_noreturn __declspec(noreturn) +#define __inner_this_data_source(src_raw) _SA_annotes1(SAL_untrusted_data_source_this,src_raw) +#define __inner_out_validated(typ_raw) _Post_ _SA_annotes1(SAL_validated,typ_raw) +#define __inner_this_out_validated(typ_raw) _SA_annotes1(SAL_validated_this,typ_raw) +#define __inner_assume_validated_dec __inline __nothrow void __AssumeValidated(__inner_out_validated("BY_DESIGN") const void *p) {p;} +#define __inner_assume_validated(p) __AssumeValidated(p) +#define __inner_transfer(formal) _SA_annotes1(SAL_transfer_adt_property_from,formal) +#define __inner_encoded _SA_annotes0(SAL_encoded) + +#if defined(_MSC_EXTENSIONS) || defined(_PREFAST_) || defined(OACR) +#define __inner_adt_prop(adt,prop) _SA_annotes2(SAL_adt, adt,prop) +#define __inner_adt_add_prop(adt,prop) _SA_annotes2(SAL_add_adt_property,adt,prop) +#define __inner_adt_remove_prop(adt,prop) _SA_annotes2(SAL_remove_adt_property,adt,prop) +#define __inner_adt_transfer_prop(arg) _SA_annotes1(SAL_transfer_adt_property_from,arg) +#define __inner_adt_type_props(typ) _SA_annotes1(SAL_post_type,typ) +#define __inner_volatile _SA_annotes0(SAL_volatile) +#define __inner_nonvolatile _SA_annotes0(SAL_nonvolatile) +#define __inner_possibly_notnullterminated _SA_annotes1(SAL_nullTerminated,__maybe) +#define __inner_analysis_assume_nullterminated_dec __inline __nothrow void __AnalysisAssumeNullterminated(_Post_ __nullterminated void *p) {*(char*)p=0;} +#define __inner_analysis_assume_nullterminated(x) __AnalysisAssumeNullterminated(x); +#endif #else -#define __out_data_source(src_sym) +#define __file_parser(typ) +#define __file_parser_class(typ) +#define __file_parser_library(typ) +#define __source_code_content(typ) +#define __class_code_content(typ) +#define __analysis_assert(e) +#define __analysis_hint(hint) #define __analysis_noreturn +/* Internal defintions */ +#define __inner_data_source(src_raw) +#define __inner_this_data_source(src_raw) +#define __inner_out_validated(typ_raw) +#define __inner_this_out_validated(typ_raw) +#define __inner_assume_validated_dec +#define __inner_assume_validated(p) +#define __inner_transfer(formal) +#define __inner_encoded +#define __inner_adt_prop(adt,prop) +#define __inner_adt_add_prop(adt,prop) +#define __inner_adt_remove_prop(adt,prop) +#define __inner_adt_transfer_prop(arg) +#define __inner_adt_type_props(typ) +#define __inner_volatile +#define __inner_nonvolatile +#define __inner_possibly_notnullterminated +#define __inner_analysis_assume_nullterminated_dec +#define __inner_analysis_assume_nullterminated(x) + +#endif // #if (_MSC_VER >= 1000) && !defined(__midl) && defined(_PREFAST_) + +#define __field_ecount(size) __notnull __elem_writableTo(size) +#define __field_bcount(size) __notnull __byte_writableTo(size) +#define __field_xcount(size) __notnull __inexpressible_writableTo(size) + +#define __field_ecount_opt(size) __maybenull __elem_writableTo(size) +#define __field_bcount_opt(size) __maybenull __byte_writableTo(size) +#define __field_xcount_opt(size) __maybenull __inexpressible_writableTo(size) + +#define __field_ecount_part(size,init) __notnull __elem_writableTo(size) __elem_readableTo(init) +#define __field_bcount_part(size,init) __notnull __byte_writableTo(size) __byte_readableTo(init) +#define __field_xcount_part(size,init) __notnull __inexpressible_writableTo(size) __inexpressible_readableTo(init) + +#define __field_ecount_part_opt(size,init) __maybenull __elem_writableTo(size) __elem_readableTo(init) +#define __field_bcount_part_opt(size,init) __maybenull __byte_writableTo(size) __byte_readableTo(init) +#define __field_xcount_part_opt(size,init) __maybenull __inexpressible_writableTo(size) __inexpressible_readableTo(init) +#define __field_ecount_full(size) __field_ecount_part(size,size) +#define __field_bcount_full(size) __field_bcount_part(size,size) +#define __field_xcount_full(size) __field_xcount_part(size,size) + +#define __field_ecount_full_opt(size) __field_ecount_part_opt(size,size) +#define __field_bcount_full_opt(size) __field_bcount_part_opt(size,size) +#define __field_xcount_full_opt(size) __field_xcount_part_opt(size,size) + +#define __field_nullterminated __nullterminated + +#define __struct_bcount(size) __byte_writableTo(size) +#define __struct_xcount(size) __inexpressible_writableTo(size) + +#define __out_awcount(expr,size) _Pre_ __notnull \ + __byte_writableTo((expr) ? (size) : (size) * 2) \ + _Post_ __valid __refparam +#define __in_awcount(expr,size) _Pre_ __valid \ + _Pre_ _Notref_ __deref __readonly \ + __byte_readableTo((expr) ? (size) : (size) * 2) +#define __post_invalid _Post_ __notvalid +/* integer related macros */ +#define __allocator __inner_allocator +#ifndef PAL_STDCPP_COMPAT +#define __deallocate(kind) _Pre_ __notnull __post_invalid +#define __deallocate_opt(kind) _Pre_ __maybenull __post_invalid #endif +#define __bound __inner_bound +#define __range(lb,ub) __inner_range(lb,ub) +#define __in_bound _Pre_ __inner_bound +#define __out_bound _Post_ __inner_bound +#define __deref_out_bound _Post_ __deref __inner_bound +#define __in_range(lb,ub) _Pre_ __inner_range(lb,ub) +#define __out_range(lb,ub) _Post_ __inner_range(lb,ub) +#define __deref_in_range(lb,ub) _Pre_ __deref __inner_range(lb,ub) +#define __deref_out_range(lb,ub) _Post_ __deref __inner_range(lb,ub) +#define __deref_inout_range(lb,ub) __deref_in_range(lb,ub) __deref_out_range(lb,ub) +#define __field_range(lb,ub) __range(lb,ub) +#define __field_data_source(src_sym) __inner_data_source(#src_sym) + +#define __range_max(a,b) __range(==, a > b ? a : b) +#define __range_min(a,b) __range(==, a < b ? a : b) + -#if defined(_PREFAST_) && defined(_PFT_SHOULD_CHECK_RETURN) -#define _Check_return_opt_ _Check_return_ +/* Penetration review macros */ +#define __in_data_source(src_sym) _Pre_ __inner_data_source(#src_sym) +#define __out_data_source(src_sym) _Post_ __inner_data_source(#src_sym) +#define __out_validated(typ_sym) __inner_out_validated(#typ_sym) +#define __this_out_data_source(src_sym) __inner_this_data_source(#src_sym) +#define __this_out_validated(typ_sym) __inner_this_out_validated(#typ_sym) +#define __transfer(formal) _Post_ __inner_transfer(formal) +#define __rpc_entry __inner_control_entrypoint(RPC) +#define __kernel_entry __inner_control_entrypoint(UserToKernel) +#define __gdi_entry __inner_control_entrypoint(GDI) +#define __encoded_pointer __inner_encoded +#define __encoded_array __inner_encoded +#define __field_encoded_pointer __inner_encoded +#define __field_encoded_array __inner_encoded +#if defined(_MSC_EXTENSIONS) || defined(_PREFAST_) || defined(OACR) +#define __type_has_adt_prop(adt,prop) __inner_adt_prop(adt,prop) +#define __out_has_adt_prop(adt,prop) _Post_ __inner_adt_add_prop(adt,prop) +#define __out_not_has_adt_prop(adt,prop) _Post_ __inner_adt_remove_prop(adt,prop) +#define __out_transfer_adt_prop(arg) _Post_ __inner_adt_transfer_prop(arg) +#define __out_has_type_adt_props(typ) _Post_ __inner_adt_type_props(typ) + +/* useful PFD related macros */ +#define __possibly_notnullterminated __inner_possibly_notnullterminated + +/* Windows Internal */ +#define __volatile __inner_volatile +#define __nonvolatile __inner_nonvolatile #else -#define _Check_return_opt_ +#define __out_has_type_adt_props(typ) /* nothing */ +#endif +#define __deref_volatile __deref __volatile +#define __deref_nonvolatile __deref __nonvolatile + +/* declare stub functions for macros */ +__inner_assume_validated_dec +__inner_assume_bound_dec +__inner_analysis_assume_nullterminated_dec +#define __analysis_assume_nullterminated(x) __inner_analysis_assume_nullterminated(x) +#define __assume_validated(p) __inner_assume_validated(p) +#define __assume_bound(i) __inner_assume_bound(i) + + +/************************************************************************** +* SAL 2 extensions for Windows-specific APIs. +***************************************************************************/ + +// Annotation for parameters that are not used in any way by the function. +// Unlike _Reserved_, an _Unreferenced_parameter_ pointer need not be NULL. +#ifndef _Unreferenced_parameter_ +#define _Unreferenced_parameter_ _Const_ +#endif + +// Pointer parameters that are freed by the function, and thus the pointed-to +// memory should not be used after return. +#ifndef _Frees_ptr_ +#define _Frees_ptr_ _Pre_notnull_ _Post_ptr_invalid_ +#endif +#ifndef _Frees_ptr_opt_ +#define _Frees_ptr_opt_ _Pre_maybenull_ _Post_ptr_invalid_ #endif -#if defined(_PREFAST_) && defined(_PFT_SHOULD_CHECK_RETURN_WAT) -#define _Check_return_wat_ _Check_return_ +// NLS APIs allow strings to be specified either by an element count or +// null termination. Unlike _In_reads_or_z_, this is not whichever comes +// first, but based on whether the size is negative or not. +#define _In_NLS_string_(size) _When_((size) < 0, _In_z_) \ + _When_((size) >= 0, _In_reads_(size)) + + +// Minifilter CompletionContext parameters on the pre-operation callback +// default to NULL. For return type FLT_PREOP_SUCCESS_WITH_CALLBACK or +// FLT_PREOP_SYNCHRONIZE, it may be set to NULL or a valid pointer. For all +// other returns, it must be NULL. +#define _Flt_CompletionContext_Outptr_ \ + _Outptr_result_maybenull_ _Pre_valid_ \ + _At_(*_Curr_, _Pre_null_ \ + _When_(return != FLT_PREOP_SUCCESS_WITH_CALLBACK && return != FLT_PREOP_SYNCHRONIZE, _Post_null_)) + +// Minifilter ConnectionCookie parameters on the port connect notify callback +// default to NULL. On successful return, it may be set to NULL or non-NULL, +// but it must be NULL on failure. +#define _Flt_ConnectionCookie_Outptr_ \ + _Outptr_result_maybenull_ _Pre_valid_ \ + _At_(*_Curr_, _Pre_null_ _On_failure_(_Post_null_)) + + +// +// A common pattern is to pass an "_Inout_ PCHAR* ppBuf" of size "_Inout_ DWORD* pSize" +// to a function that writes to **pBuf, incrementing *ppBuf to point to one +// past the last written byte. Thus the length of the write is +// (*ppBuf - Old(*ppBuf)). The size of the remaining unwritten capacity +// is written to *pSize. +// +// This pattern is frequently used when progressively filling a +// large buffer in chunks +// (e.g. when reading from a network interface in a driver). +// +// It is expected that these supplementary annotations would be used inside an +// _At_, like so: +// +// _At_(*ppBuf, _Writes_and_advances_ptr_(*pBufSize)) +// HRESULT WriteChunkOfData(_Inout_ PCHAR* ppBuf, _Inout_ DWORD* pBufSize); +// +#ifndef _Writes_and_advances_ptr_ +#define _Writes_and_advances_ptr_(size) \ + _At_((void*)_Curr_, _Inout_) \ + _At_(_Curr_, \ + _Pre_writable_size_(size) \ + _Post_writable_size_(size) \ + _Post_satisfies_(_Curr_ - _Old_(_Curr_) == size)) \ + _At_(_Old_(_Curr_), \ + _Post_readable_size_(_Old_(size) - size)) +#endif + +#ifndef _Writes_bytes_and_advances_ptr_ +#define _Writes_bytes_and_advances_ptr_(size) \ + _At_((void*)_Curr_, _Inout_) \ + _At_(_Curr_, \ + _Pre_writable_byte_size_(size) \ + _Post_writable_byte_size_(size) \ + _Post_satisfies_(((char*)_Curr_) - ((void*)_Old_(_Curr_)) == size)) \ + _At_(_Old_(_Curr_), \ + _Post_readable_byte_size_(_Old_(size) - size)) +#endif + +// +// Gets the current error code (as returned by GetLastError()), and stores +// in _Curr_ as a postcondition. This is currently approximated by assuming +// that GetLastError() always returns a failed error code. This is not a +// completely accurate approximation, but reasonable. +// +#define _Post_equals_last_error_ _Post_satisfies_(_Curr_ != 0) + +#ifdef __cplusplus +} +#endif + +#ifdef _PREFIX_ +/************************************************************************** +* Defintion of __pfx_assume and __pfx_assert. Thse should be the only +* defintions of these functions. +***************************************************************************/ +#if __cplusplus +extern "C" void __pfx_assert(bool, const char *); +extern "C" void __pfx_assume(bool, const char *); #else -#define _Check_return_wat_ +void __pfx_assert(int, const char *); +void __pfx_assume(int, const char *); #endif +/************************************************************************** +* Redefintion of __analysis_assume and __analysis_assert for PREFIX build +**************************************************************************/ +#undef __analysis_assume +#undef __analysis_assert +#define __analysis_assume(e) (__pfx_assume(e,"pfx_assume"),__assume(e)); +#define __analysis_assert(e) (__pfx_assert(e,"pfx_assert"),__assume(e)); +#endif /* ifdef _PREFIX_ */ + +/************************************************************************** +* This include should always be the last thing in this file. +* Must avoid redfinitions of macros to workaround rc.exe issues. +***************************************************************************/ +#if !(defined(RC_INVOKED) || defined(SORTPP_PASS)) +#include <specstrings_strict.h> +#endif /* if !(defined(RC_INVOKED) || defined(SORTPP_PASS)) */ + +/* + If no SAL 2 appears to have been defined (_Outptr_ is a representative choice) + then we must be operating in a downlevel build environment (such as VS10). + We also test against the compiler version to identify a downlevel environment, + as VS11 is the minimum required for SAL 2 support. + + If we are operating in a downlevel build environment (such as VS10) + we need to undefine the following symbols before including driverspecs.h + or we will end up referencing SAL 2 implementation symbols and cause + build failures. +*/ +#if (!defined(_Outptr_) || _MSC_VER <= 1600) && !( defined( MIDL_PASS ) || defined(__midl) || defined(RC_INVOKED) ) /*IFSTRIP=IGN*/ +#undef __ANNOTATION +#define __ANNOTATION(fun) /* fun */ +#undef __PRIMOP +#define __PRIMOP(type, fun) +#endif /* !defined(_Outptr_) || _MSC_VER <= 1600 */ + +// ROTOR doesn't need driverspecs.h +// #include <driverspecs.h> + +/* + If no SAL 2 appears to have been defined (_Outptr_ is a representative choice) + then we must be operating in a downlevel build environment (such as VS10). + We also test against the compiler version to identify a downlevel environment, + as VS11 is the minimum required for SAL 2 support. + + If we are in a downlevel environment, we can go ahead and include no_sal2.h + to make all of SAL 2 no-ops to ensure no build failures. +*/ +#if (!defined(_Outptr_) /* || _MSC_VER <= 1600 */) && !( defined( MIDL_PASS ) || defined(__midl) || defined(RC_INVOKED) ) && !( defined( _SDV_ ) ) /*IFSTRIP=IGN*/ +#include <no_sal2.h> +#endif /* !defined(_Outptr_) || _MSC_VER <= 1600 */ + +#endif /* #ifndef SPECSTRINGS_H */ + + diff --git a/sdk/include/psdk/specstrings_strict.h b/sdk/include/psdk/specstrings_strict.h new file mode 100644 index 00000000000..a458a0d98fd --- /dev/null +++ b/sdk/include/psdk/specstrings_strict.h @@ -0,0 +1,1198 @@ +/* + * PROJECT: ReactOS PSDK + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Documents all the macros approved for use in windows source + * COPYRIGHT: Microsoft Corporation. + * SOURCE: https://github.com/microsoft/ChakraCore/blob/master/pal/inc/rt/specstrings_… + */ +// +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// + +/************************************************************************* +* This file documents all the macros approved for use in windows source +* code. It includes some experimental macros which should only be used by +* experts. +* +* DO NOT include this file directly. This file is include after +* specstrings.h. So we can undefine every possible old definition including +* private internal macros people should not be using, as well as macros from +* sal.h. Macros are redefined here in a way to cause syntax errors when used +* incorrectly during a normal build when specstrings.h is included and +* __SPECSTRINGS_STRICT_LEVEL is defined. +* +* There are several levels of strictness, each level includes the behavior of +* all previous levels. +* +* 0 - Disable strict checking +* 1 - Break on unapproved macros and misuse of statement +* macros such as __fallthrough (default) +* 2 - Deprecated some old macros that should not be used +* 3 - Use VS 2005 Source Annotation to make sure every macro +* is used in the right context. For example placing __in on a return +* parameter will result in an error. +* + +* +************************************************************************/ +#ifndef __SPECSTRINGS_STRICT_LEVEL +#define __SPECSTRINGS_STRICT_LEVEL 1 +#endif +/************************************************************************ +* Introduction +* +* specstrings.h provides a set of annotations to describe how a function uses +* its parameters - the assumptions it makes about them, and the guarantees it +* makes upon finishing. +* +* Annotations must be placed before a function parameter's type or its return +* type. There are two basic classes of common annotations buffer annotations +* and advanced annotations. Buffer annotations describe how functions use +* their pointer parameters, and advanced annotations either describe +* complex/unusual buffer behavior, or provide additional information about a +* parameter that is not otherwise expressible. +* +* Buffer Annotations +* +* The most important annotations in SpecStrings.h provide a consistent way to +* annotate buffer parameters or return values for a function. Each of these +* annotations describes a single buffer (which could be a string, a +* fixed-length or variable-length array, or just a pointer) that the function +* interacts with: where it is, how large it is, how much is initialized, and +* what the function does with it. +* +* The appropriate macro for a given buffer can be constructed using the table +* below. Just pick the appropriate values from each category, and combine +* them together with a leading underscore. Some combinations of values do not +* make sense as buffer annotations. Only meaningful annotations can be added +* to your code; for a list of these, see the buffer annotation definitions +* section. +* +* Only a single buffer annotation should be used for each parameter. +* +* |------------|------------|---------|--------|----------|---------------| +* | Level | Usage | Size | Output | Optional | Parameters | +* |------------|------------|---------|--------|----------|---------------| +* | <> | <> | <> | <> | <> | <> | +* | _deref | _in | _ecount | _full | _opt | (size) | +* | _deref_opt | _out | _bcount | _part | | (size,length) | +* | | _inout | | | | | +* | | | | | | | +* |------------|------------|---------|--------|----------|---------------| +* +* Note: "<>" represents the empty string. +* +* Level: Describes the buffer pointer's level of indirection from the +* parameter or return value 'p'. +* +* <> : p is the buffer pointer. +* _deref : *p is the buffer pointer. p must not be NULL. +* _deref_opt : *p may be the buffer pointer. p may be NULL, in which case the +* rest of the annotation is ignored. +* +* Usage: Describes how the function uses the buffer. +* +* <> : The buffer is not accessed. If used on the return value or with +* _deref, the function will provide the buffer, and it will be uninitialized +* at exit. Otherwise, the caller must provide the buffer. This should only +* be used for alloc and free functions. +* +* _in : The function will only read from the buffer. The caller must provide +* the buffer and initialize it. +* +* _out : The function will only write to the buffer. If used on the return +* value or with _deref, the function will provide the buffer and initialize +* it. Otherwise, the caller must provide the buffer, and the function will +* initialize it. +* +* _inout : The function may freely read from and write to the buffer. The +* caller must provide the buffer and initialize it. If used with _deref, the +* buffer may be reallocated by the function. +* +* Size: Describes the total size of the buffer. This may be less than the +* space actually allocated for the buffer, in which case it describes the +* accessible amount. +* +* <> : No buffer size is given. If the type specifies the buffer size (such +* as with LPSTR and LPWSTR), that amount is used. Otherwise, the buffer is +* one element long. Must be used with _in, _out, or _inout. +* +* _ecount : The buffer size is an explicit element count. +* +* _bcount : The buffer size is an explicit byte count. +* +* Output: Describes how much of the buffer will be initialized by the +* function. For _inout buffers, this also describes how much is initialized +* at entry. Omit this category for _in buffers; they must be fully +* initialized by the caller. +* +* <> : The type specifies how much is initialized. For instance, a function +* initializing an LPWSTR must NULL-terminate the string. +* +* _full : The function initializes the entire buffer. +* +* _part : The function initializes part of the buffer, and explicitly +* indicates how much. +* +* Optional: Describes if the buffer itself is optional. +* +* <> : The pointer to the buffer must not be NULL. +* +* _opt : The pointer to the buffer might be NULL. It will be checked before +* being dereferenced. +* +* Parameters: Gives explicit counts for the size and length of the buffer. +* +* <> : There is no explicit count. Use when neither _ecount nor _bcount is +* used. +* +* (size) : Only the buffer's total size is given. Use with _ecount or _bcount +* but not _part. +* +* (size,length) : The buffer's total size and initialized length are +* given. Use with _ecount_part and _bcount_part. +* +* ---------------------------------------------------------------------------- +* Buffer Annotation Examples +* +* LWSTDAPI_(BOOL) StrToIntExA( +* LPCSTR pszString, // No annotation required, const implies __in. +* DWORD dwFlags, +* __out int *piRet // A pointer whose dereference will be filled in. +* ); +* +* void MyPaintingFunction( +* __in HWND hwndControl, // An initialized read-only parameter. +* __in_opt HDC hdcOptional, // An initialized read-only parameter that +* // might be NULL. +* __inout IPropertyStore *ppsStore // An initialized parameter that +* // may be freely used and modified. +* ); +* +* LWSTDAPI_(BOOL) PathCompactPathExA( +* __out_ecount(cchMax) LPSTR pszOut, // A string buffer with cch elements +* // that will be '\0' terminated +* // on exit. +* LPCSTR pszSrc, // No annotation required, +* // const implies __in. +* UINT cchMax, +* DWORD dwFlags +* ); +* +* HRESULT SHLocalAllocBytes( +* size_t cb, +* __deref_bcount(cb) T **ppv // A pointer whose dereference will be set +* // to an uninitialized buffer with cb bytes. +* ); +* +* __inout_bcount_full(cb) : A buffer with cb elements that is fully +* initialized at entry and exit, and may be written to by this function. +* +* __out_ecount_part(count, *countOut) : A buffer with count elements that +* will be partially initialized by this function. The function indicates how +* much it initialized by setting *countOut. +* +************************************************************************/ + +#if (_MSC_VER >= 1400) && !defined(__midl) && !defined(_PREFAST_) && (__SPECSTRINGS_STRICT_LEVEL > 0) +#pragma once +#include <specstrings_undef.h> +#define __ecount(size) _SAL_VERSION_CHECK(__ecount) +#define __bcount(size) _SAL_VERSION_CHECK(__bcount) +#define __xcount(size) _SAL_VERSION_CHECK(__xcount) +#define __in _SAL_VERSION_CHECK(__in) +#define __in_ecount(size) _SAL_VERSION_CHECK(__in_ecount) +#define __in_bcount(size) _SAL_VERSION_CHECK(__in_bcount) +#define __in_xcount(size) _SAL_VERSION_CHECK(__in_xcount) +#define __in_z _SAL_VERSION_CHECK(__in_z) +#define __in_ecount_z(size) _SAL_VERSION_CHECK(__in_ecount_z) +#define __in_bcount_z(size) _SAL_VERSION_CHECK(__in_bcount_z) +#define __out _SAL_VERSION_CHECK(__out) +#define __out_ecount(size) _SAL_VERSION_CHECK(__out_ecount) +#define __out_bcount(size) _SAL_VERSION_CHECK(__out_bcount) +#define __out_xcount(size) _SAL_VERSION_CHECK(__out_xcount) +#define __out_ecount_part(size,len) _SAL_VERSION_CHECK(__out_ecount_part) +#define __out_bcount_part(size,len) _SAL_VERSION_CHECK(__out_bcount_part) +#define __out_xcount_part(size,len) _SAL_VERSION_CHECK(__out_xcount_part) +#define __out_ecount_full(size) _SAL_VERSION_CHECK(__out_ecount_full) +#define __out_bcount_full(size) _SAL_VERSION_CHECK(__out_bcount_full) +#define __out_xcount_full(size) _SAL_VERSION_CHECK(__out_xcount_full) +#define __out_z _SAL_VERSION_CHECK(__out_z) +#define __out_ecount_z(size) _SAL_VERSION_CHECK(__out_ecount_z) +#define __out_bcount_z(size) _SAL_VERSION_CHECK(__out_bcount_z) +#define __inout _SAL_VERSION_CHECK(__inout) +#define __inout_ecount(size) _SAL_VERSION_CHECK(__inout_ecount) +#define __inout_bcount(size) _SAL_VERSION_CHECK(__inout_bcount) +#define __inout_xcount(size) _SAL_VERSION_CHECK(__inout_xcount) +#define __inout_ecount_part(size,len) _SAL_VERSION_CHECK(__inout_ecount_part) +#define __inout_bcount_part(size,len) _SAL_VERSION_CHECK(__inout_bcount_part) +#define __inout_xcount_part(size,len) _SAL_VERSION_CHECK(__inout_xcount_part) +#define __inout_ecount_full(size) _SAL_VERSION_CHECK(__inout_ecount_full) +#define __inout_bcount_full(size) _SAL_VERSION_CHECK(__inout_bcount_full) +#define __inout_xcount_full(size) _SAL_VERSION_CHECK(__inout_xcount_full) +#define __inout_z __allowed(on_parameter) +#define __inout_ecount_z(size) __allowed(on_parameter) +#define __inout_bcount_z(size) __allowed(on_parameter) +#define __ecount_opt(size) __allowed(on_parameter) +#define __bcount_opt(size) __allowed(on_parameter) +#define __xcount_opt(size) __allowed(on_parameter) +#define __in_opt _SAL_VERSION_CHECK(__in_opt) +#define __in_ecount_opt(size) _SAL_VERSION_CHECK(__in_ecount_opt) +#define __in_bcount_opt(size) _SAL_VERSION_CHECK(__in_bcount_opt) +#define __in_z_opt __allowed(on_parameter) +#define __in_ecount_z_opt(size) __allowed(on_parameter) +#define __in_bcount_z_opt(size) __allowed(on_parameter) +#define __in_xcount_opt(size) __allowed(on_parameter) +#define __out_opt _SAL_VERSION_CHECK(__out_opt) +#define __out_ecount_opt(size) _SAL_VERSION_CHECK(__out_ecount_opt) +#define __out_bcount_opt(size) _SAL_VERSION_CHECK(__out_bcount_opt) +#define __out_xcount_opt(size) __allowed(on_parameter) +#define __out_ecount_part_opt(size,len) __allowed(on_parameter) +#define __out_bcount_part_opt(size,len) __allowed(on_parameter) +#define __out_xcount_part_opt(size,len) __allowed(on_parameter) +#define __out_ecount_full_opt(size) __allowed(on_parameter) +#define __out_bcount_full_opt(size) __allowed(on_parameter) +#define __out_xcount_full_opt(size) __allowed(on_parameter) +#define __out_ecount_z_opt(size) __allowed(on_parameter) +#define __out_bcount_z_opt(size) __allowed(on_parameter) +#define __inout_opt _SAL_VERSION_CHECK(__inout_opt) +#define __inout_ecount_opt(size) _SAL_VERSION_CHECK(__inout_ecount_opt) +#define __inout_bcount_opt(size) _SAL_VERSION_CHECK(__inout_bcount_opt) +#define __inout_xcount_opt(size) _SAL_VERSION_CHECK(__inout_xcount_opt) +#define __inout_ecount_part_opt(size,len) _SAL_VERSION_CHECK(__inout_ecount_part_opt) +#define __inout_bcount_part_opt(size,len) _SAL_VERSION_CHECK(__inout_bcount_part_opt) +#define __inout_xcount_part_opt(size,len) _SAL_VERSION_CHECK(__inout_xcount_part_opt) +#define __inout_ecount_full_opt(size) _SAL_VERSION_CHECK(__inout_ecount_full_opt) +#define __inout_bcount_full_opt(size) _SAL_VERSION_CHECK(__inout_bcount_full_opt) +#define __inout_xcount_full_opt(size) _SAL_VERSION_CHECK(__inout_xcount_full_opt) +#define __inout_z_opt __allowed(on_parameter) +#define __inout_ecount_z_opt(size) __allowed(on_parameter) +#define __inout_ecount_z_opt(size) __allowed(on_parameter) +#define __inout_bcount_z_opt(size) __allowed(on_parameter) +#define __deref_ecount(size) __allowed(on_parameter) +#define __deref_bcount(size) __allowed(on_parameter) +#define __deref_xcount(size) __allowed(on_parameter) +#define __deref_in _SAL_VERSION_CHECK(__deref_in) +#define __deref_in_ecount(size) _SAL_VERSION_CHECK(__deref_in_ecount) +#define __deref_in_bcount(size) _SAL_VERSION_CHECK(__deref_in_bcount) +#define __deref_in_xcount(size) _SAL_VERSION_CHECK(__deref_in_xcount) +#define __deref_out _SAL_VERSION_CHECK(__deref_out) +#define __deref_out_ecount(size) _SAL_VERSION_CHECK(__deref_out_ecount) +#define __deref_out_bcount(size) _SAL_VERSION_CHECK(__deref_out_bcount) +#define __deref_out_xcount(size) _SAL_VERSION_CHECK(__deref_out_xcount) +#define __deref_out_ecount_part(size,len) _SAL_VERSION_CHECK(__deref_out_ecount_part) +#define __deref_out_bcount_part(size,len) _SAL_VERSION_CHECK(__deref_out_bcount_part) +#define __deref_out_xcount_part(size,len) _SAL_VERSION_CHECK(__deref_out_xcount_part) +#define __deref_out_ecount_full(size) _SAL_VERSION_CHECK(__deref_out_ecount_full) +#define __deref_out_bcount_full(size) _SAL_VERSION_CHECK(__deref_out_bcount_full) +#define __deref_out_xcount_full(size) _SAL_VERSION_CHECK(__deref_out_xcount_full) +#define __deref_out_z __allowed(on_parameter) +#define __deref_out_ecount_z(size) __allowed(on_parameter) +#define __deref_out_bcount_z(size) __allowed(on_parameter) +#define __deref_inout _SAL_VERSION_CHECK(__deref_inout) +#define __deref_inout_ecount(size) _SAL_VERSION_CHECK(__deref_inout_ecount) +#define __deref_inout_bcount(size) _SAL_VERSION_CHECK(__deref_inout_bcount) +#define __deref_inout_xcount(size) _SAL_VERSION_CHECK(__deref_inout_xcount) +#define __deref_inout_ecount_part(size,len) __allowed(on_parameter) +#define __deref_inout_bcount_part(size,len) __allowed(on_parameter) +#define __deref_inout_xcount_part(size,len) __allowed(on_parameter) +#define __deref_inout_ecount_full(size) __allowed(on_parameter) +#define __deref_inout_bcount_full(size) __allowed(on_parameter) +#define __deref_inout_xcount_full(size) __allowed(on_parameter) +#define __deref_inout_z __allowed(on_parameter) +#define __deref_inout_ecount_z(size) __allowed(on_parameter) +#define __deref_inout_bcount_z(size) __allowed(on_parameter) +#define __deref_ecount_opt(size) __allowed(on_parameter) +#define __deref_bcount_opt(size) __allowed(on_parameter) +#define __deref_xcount_opt(size) __allowed(on_parameter) +#define __deref_in_opt __allowed(on_parameter) +#define __deref_in_opt_out __allowed(on_parameter) +#define __deref_in_ecount_opt(size) __allowed(on_parameter) +#define __deref_in_bcount_opt(size) __allowed(on_parameter) +#define __deref_in_xcount_opt(size) __allowed(on_parameter) +#define __deref_out_opt _SAL_VERSION_CHECK(__deref_out_opt) +#define __deref_out_ecount_opt(size) _SAL_VERSION_CHECK(__deref_out_ecount_opt) +#define __deref_out_bcount_opt(size) _SAL_VERSION_CHECK(__deref_out_bcount_opt) +#define __deref_out_xcount_opt(size) _SAL_VERSION_CHECK(__deref_out_xcount_opt) +#define __deref_out_ecount_part_opt(size,len) _SAL_VERSION_CHECK(__deref_out_ecount_part_opt) +#define __deref_out_bcount_part_opt(size,len) _SAL_VERSION_CHECK(__deref_out_bcount_part_opt) +#define __deref_out_xcount_part_opt(size,len) _SAL_VERSION_CHECK(__deref_out_xcount_part_opt) +#define __deref_out_ecount_full_opt(size) _SAL_VERSION_CHECK(__deref_out_ecount_full_opt) +#define __deref_out_bcount_full_opt(size) _SAL_VERSION_CHECK(__deref_out_bcount_full_opt) +#define __deref_out_xcount_full_opt(size) _SAL_VERSION_CHECK(__deref_out_xcount_full_opt) +#define __deref_out_z_opt __allowed(on_parameter) +#define __deref_out_ecount_z_opt(size) __allowed(on_parameter) +#define __deref_out_bcount_z_opt(size) __allowed(on_parameter) +#define __deref_inout_opt __allowed(on_parameter) +#define __deref_inout_ecount_opt(size) __allowed(on_parameter) +#define __deref_inout_bcount_opt(size) __allowed(on_parameter) +#define __deref_inout_xcount_opt(size) __allowed(on_parameter) +#define __deref_inout_ecount_part_opt(size,len) __allowed(on_parameter) +#define __deref_inout_bcount_part_opt(size,len) __allowed(on_parameter) +#define __deref_inout_xcount_part_opt(size,len) __allowed(on_parameter) +#define __deref_inout_ecount_full_opt(size) __allowed(on_parameter) +#define __deref_inout_bcount_full_opt(size) __allowed(on_parameter) +#define __deref_inout_xcount_full_opt(size) __allowed(on_parameter) +#define __deref_inout_z_opt __allowed(on_parameter) +#define __deref_inout_ecount_z_opt(size) __allowed(on_parameter) +#define __deref_inout_bcount_z_opt(size) __allowed(on_parameter) +#define __deref_opt_ecount(size) __allowed(on_parameter) +#define __deref_opt_bcount(size) __allowed(on_parameter) +#define __deref_opt_xcount(size) __allowed(on_parameter) +#define __deref_opt_in __allowed(on_parameter) +#define __deref_opt_in_ecount(size) __allowed(on_parameter) +#define __deref_opt_in_bcount(size) __allowed(on_parameter) +#define __deref_opt_in_xcount(size) __allowed(on_parameter) +#define __deref_opt_out _SAL_VERSION_CHECK(__deref_opt_out) +#define __deref_opt_out_ecount(size) _SAL_VERSION_CHECK(__deref_opt_out_ecount) +#define __deref_opt_out_bcount(size) _SAL_VERSION_CHECK(__deref_opt_out_bcount) +#define __deref_opt_out_xcount(size) _SAL_VERSION_CHECK(__deref_opt_out_xcount) +#define __deref_opt_out_ecount_part(size,len) __allowed(on_parameter) +#define __deref_opt_out_bcount_part(size,len) __allowed(on_parameter) +#define __deref_opt_out_xcount_part(size,len) __allowed(on_parameter) +#define __deref_opt_out_ecount_full(size) __allowed(on_parameter) +#define __deref_opt_out_bcount_full(size) __allowed(on_parameter) +#define __deref_opt_out_xcount_full(size) __allowed(on_parameter) +#define __deref_opt_inout __allowed(on_parameter) +#define __deref_opt_inout_ecount(size) __allowed(on_parameter) +#define __deref_opt_inout_bcount(size) __allowed(on_parameter) +#define __deref_opt_inout_xcount(size) __allowed(on_parameter) +#define __deref_opt_inout_ecount_part(size,len) __allowed(on_parameter) +#define __deref_opt_inout_bcount_part(size,len) __allowed(on_parameter) +#define __deref_opt_inout_xcount_part(size,len) __allowed(on_parameter) +#define __deref_opt_inout_ecount_full(size) __allowed(on_parameter) +#define __deref_opt_inout_bcount_full(size) __allowed(on_parameter) +#define __deref_opt_inout_xcount_full(size) __allowed(on_parameter) +#define __deref_opt_inout_z __allowed(on_parameter) +#define __deref_opt_inout_ecount_z(size) __allowed(on_parameter) +#define __deref_opt_inout_bcount_z(size) __allowed(on_parameter) +#define __deref_opt_ecount_opt(size) __allowed(on_parameter) +#define __deref_opt_bcount_opt(size) __allowed(on_parameter) +#define __deref_opt_xcount_opt(size) __allowed(on_parameter) +#define __deref_opt_in_opt __allowed(on_parameter) +#define __deref_opt_in_ecount_opt(size) __allowed(on_parameter) +#define __deref_opt_in_bcount_opt(size) __allowed(on_parameter) +#define __deref_opt_in_xcount_opt(size) __allowed(on_parameter) +#define __deref_opt_out_opt __allowed(on_parameter) +#define __deref_opt_out_ecount_opt(size) __allowed(on_parameter) +#define __deref_opt_out_bcount_opt(size) __allowed(on_parameter) +#define __deref_opt_out_xcount_opt(size) __allowed(on_parameter) +#define __deref_opt_out_ecount_part_opt(size,len) __allowed(on_parameter) +#define __deref_opt_out_bcount_part_opt(size,len) __allowed(on_parameter) +#define __deref_opt_out_xcount_part_opt(size,len) __allowed(on_parameter) +#define __deref_opt_out_ecount_full_opt(size) __allowed(on_parameter) +#define __deref_opt_out_bcount_full_opt(size) __allowed(on_parameter) +#define __deref_opt_out_xcount_full_opt(size) __allowed(on_parameter) +#define __deref_opt_out_z_opt __allowed(on_parameter) +#define __deref_opt_out_ecount_z_opt(size) __allowed(on_parameter) +#define __deref_opt_out_bcount_z_opt(size) __allowed(on_parameter) +#define __deref_opt_inout_opt __allowed(on_parameter) +#define __deref_opt_inout_ecount_opt(size) __allowed(on_parameter) +#define __deref_opt_inout_bcount_opt(size) __allowed(on_parameter) +#define __deref_opt_inout_xcount_opt(size) __allowed(on_parameter) +#define __deref_opt_inout_ecount_part_opt(size,len) __allowed(on_parameter) +#define __deref_opt_inout_bcount_part_opt(size,len) __allowed(on_parameter) +#define __deref_opt_inout_xcount_part_opt(size,len) __allowed(on_parameter) +#define __deref_opt_inout_ecount_full_opt(size) __allowed(on_parameter) +#define __deref_opt_inout_bcount_full_opt(size) __allowed(on_parameter) +#define __deref_opt_inout_xcount_full_opt(size) __allowed(on_parameter) +#define __deref_opt_inout_z_opt __allowed(on_parameter) +#define __deref_opt_inout_ecount_z_opt(size) __allowed(on_parameter) +#define __deref_opt_inout_bcount_z_opt(size) __allowed(on_parameter) +#define __deref_in_ecount_iterator(size,incr) __allowed(on_parameter) +#define __deref_out_ecount_iterator(size,incr) __allowed(on_parameter) +#define __deref_inout_ecount_iterator(size,incr) __allowed(on_parameter) +#define __deref_realloc_bcount(insize,outsize) __allowed(on_parameter) + +/************************************************************************ +* SAL 2 _Ouptr_ family of annotations +************************************************************************/ + +#define _Outptr_ __allowed(on_parameter) +#define _Outptr_result_maybenull_ __allowed(on_parameter) +#define _Outptr_opt_ __allowed(on_parameter) +#define _Outptr_opt_result_maybenull_ __allowed(on_parameter) +#define _Outptr_result_z_ __allowed(on_parameter) +#define _Outptr_opt_result_z_ __allowed(on_parameter) +#define _Outptr_result_maybenull_z_ __allowed(on_parameter) +#define _Outptr_opt_result_maybenull_z_ __allowed(on_parameter) +#define _Outptr_result_nullonfailure_ __allowed(on_parameter) +#define _Outptr_opt_result_nullonfailure_ __allowed(on_parameter) +#define _COM_Outptr_ __allowed(on_parameter) +#define _COM_Outptr_result_maybenull_ __allowed(on_parameter) +#define _COM_Outptr_opt_ __allowed(on_parameter) +#define _COM_Outptr_opt_result_maybenull_ __allowed(on_parameter) +#define _Outptr_result_buffer_(size) __allowed(on_parameter) +#define _Outptr_opt_result_buffer_(size) __allowed(on_parameter) +#define _Outptr_result_buffer_to_(size, count) __allowed(on_parameter) +#define _Outptr_opt_result_buffer_to_(size, count) __allowed(on_parameter) +#define _Outptr_result_buffer_all_(size) __allowed(on_parameter) +#define _Outptr_opt_result_buffer_all_(size) __allowed(on_parameter) +#define _Outptr_result_buffer_maybenull_(size) __allowed(on_parameter) +#define _Outptr_opt_result_buffer_maybenull_(size) __allowed(on_parameter) +#define _Outptr_result_buffer_to_maybenull_(size, count) __allowed(on_parameter) +#define _Outptr_opt_result_buffer_to_maybenull_(size, count) __allowed(on_parameter) +#define _Outptr_result_buffer_all_maybenull_(size) __allowed(on_parameter) +#define _Outptr_opt_result_buffer_all_maybenull_(size) __allowed(on_parameter) +#define _Outptr_result_bytebuffer_(size) __allowed(on_parameter) +#define _Outptr_opt_result_bytebuffer_(size) __allowed(on_parameter) +#define _Outptr_result_bytebuffer_to_(size, count) __allowed(on_parameter) +#define _Outptr_opt_result_bytebuffer_to_(size, count) __allowed(on_parameter) +#define _Outptr_result_bytebuffer_all_(size) __allowed(on_parameter) +#define _Outptr_opt_result_bytebuffer_all_(size) __allowed(on_parameter) +#define _Outptr_result_bytebuffer_maybenull_(size) __allowed(on_parameter) +#define _Outptr_opt_result_bytebuffer_maybenull_(size) __allowed(on_parameter) +#define _Outptr_result_bytebuffer_to_maybenull_(size, count) __allowed(on_parameter) +#define _Outptr_opt_result_bytebuffer_to_maybenull_(size, count) __allowed(on_parameter) +#define _Outptr_result_bytebuffer_all_maybenull_(size) __allowed(on_parameter) +#define _Outptr_opt_result_bytebuffer_all_maybenull_(size) __allowed(on_parameter) + +/************************************************************************ +* Orcas SAL +************************************************************************/ +#define _Deref_out_ _SAL_VERSION_CHECK(_Deref_out_) +#define _Deref_out_opt_ _SAL_VERSION_CHECK(_Deref_out_opt_) +#define _Deref_opt_out_ _SAL_VERSION_CHECK(_Deref_opt_out_) +#define _Deref_opt_out_opt_ _SAL_VERSION_CHECK(_Deref_opt_out_opt_) +#define _In_count_(size) _SAL_VERSION_CHECK(_In_count_) +#define _In_opt_count_(size) _SAL_VERSION_CHECK(_In_opt_count_) +#define _In_bytecount_(size) _SAL_VERSION_CHECK(_In_bytecount_) +#define _In_opt_bytecount_(size) _SAL_VERSION_CHECK(_In_opt_bytecount_) +#define _Out_cap_(size) _SAL_VERSION_CHECK(_Out_cap_) +#define _Out_opt_cap_(size) _SAL_VERSION_CHECK(_Out_opt_cap_) +#define _Out_bytecap_(size) _SAL_VERSION_CHECK(_Out_bytecap_) +#define _Out_opt_bytecap_(size) _SAL_VERSION_CHECK(_Out_opt_bytecap_) +#define _Deref_post_count_(size) _SAL_VERSION_CHECK(_Deref_post_count_) +#define _Deref_post_opt_count_(size) _SAL_VERSION_CHECK(_Deref_post_opt_count_) +#define _Deref_post_bytecount_(size) _SAL_VERSION_CHECK(_Deref_post_bytecount_) +#define _Deref_post_opt_bytecount_(size) _SAL_VERSION_CHECK(_Deref_post_opt_bytecount_) +#define _Deref_post_cap_(size) _SAL_VERSION_CHECK(_Deref_post_cap_) +#define _Deref_post_opt_cap_(size) _SAL_VERSION_CHECK(_Deref_post_opt_cap_) +#define _Deref_post_bytecap_(size) _SAL_VERSION_CHECK(_Deref_post_bytecap_) +#define _Deref_post_opt_bytecap_(size) _SAL_VERSION_CHECK(_Deref_post_opt_bytecap_) + +/************************************************************************ +* Advanced Annotations +* +* Advanced annotations describe behavior that is not expressible with the +* regular buffer macros. These may be used either to annotate buffer +* parameters that involve complex or conditional behavior, or to enrich +* existing annotations with additional information. +* +* _At_(expr, annotes) : annotation list annotes applies to target 'expr' +* +* _When_(expr, annotes) : annotation list annotes applies when 'expr' is true +* +* __success(expr) T f() : <expr> indicates whether function f succeeded or +* not. If <expr> is true at exit, all the function's guarantees (as given +* by other annotations) must hold. If <expr> is false at exit, the caller +* should not expect any of the function's guarantees to hold. If not used, +* the function must always satisfy its guarantees. Added automatically to +* functions that indicate success in standard ways, such as by returning an +* HRESULT. +* +* __out_awcount(expr, size) T *p : Pointer p is a buffer whose size may be +* given in either bytes or elements. If <expr> is true, this acts like +* __out_bcount. If <expr> is false, this acts like __out_ecount. This +* should only be used to annotate old APIs. +* +* __in_awcount(expr, size) T* p : Pointer p is a buffer whose size may be given +* in either bytes or elements. If <expr> is true, this acts like +* __in_bcount. If <expr> is false, this acts like __in_ecount. This should +* only be used to annotate old APIs. +* +* __nullterminated T* p : Pointer p is a buffer that may be read or written +* up to and including the first '\0' character or pointer. May be used on +* typedefs, which marks valid (properly initialized) instances of that type +* as being null-terminated. +* +* __nullnullterminated T* p : Pointer p is a buffer that may be read or +* written up to and including the first sequence of two '\0' characters or +* pointers. May be used on typedefs, which marks valid instances of that +* type as being double-null terminated. +* +* __reserved T v : Value v must be 0/NULL, reserved for future use. +* +* __checkReturn T f(); : Return value of f must not be ignored by callers +* of this function. +* +* __typefix(ctype) T v : Value v should be treated as an instance of ctype, +* rather than its declared type when considering validity. +* +* __override T f(); : Specify C#-style 'override' behaviour for overriding +* virtual methods. +* +* __callback T f(); : Function f can be used as a function pointer. +* +* __format_string T p : Pointer p is a string that contains % markers in +* the style of printf. +* +* __blocksOn(resource) f(); : Function f blocks on the resource 'resource'. +* +* __fallthrough : Annotates switch statement labels where fall-through is +* desired, to distinguish from forgotten break statements. +* +* __range(low_bnd, up_bnd) int f(): The return from the function "f" must +* be in the inclusive numeric range [low_bnd, up_bnd]. +* +* __in_range(low_bnd, up_bnd) int i : Precondition that integer i must be +* in the inclusive numeric range [low_bnd, up_bnd]. +* +* __out_range(low_bnd, up_bnd) int i : Postcondition that integer i must be +* in the inclusive numeric range [low_bnd, up_bnd]. +* +* __deref_in_range(low_bnd, up_bnd) int* pi : Precondition that integer *pi +* must be in the inclusive numeric range [low_bnd, up_bnd]. +* +* __deref_out_range(low_bnd, up_bnd) int* pi : Postcondition that integer +* *pi must be in the inclusive numeric range [low_bnd, up_bnd]. +* +* __deref_inout_range(low_bnd, up_bnd) int* pi : Invariant that the integer +* *pi must be in the inclusive numeric range [low_bnd, up_bnd]. +* +* The first argument of a range macro may also be a C relational operator +* (<,>,!=, ==, <=, >=). +* +* __range(rel_op, j) int f(): Postcondition that "f() rel_op j" must be +* true. Note that j may be a expression known only at runtime. +* +* __in_range(rel_op, j) int i : Precondition that "i rel_op j" must be +* true. Note that j may be a expression known only at runtime. +* +* __out_range(rel_op, j) int i : Postcondition that integer "i rel_op j" +* must be true. Note that j may be a expression known only at runtime. +* +* __deref_in_range(rel_op, j) int *pi : Precondition that "*pi rel_op j" +* must be true. Note that j may be a expression known only at runtime. +* +* __deref_out_range(rel_op, j) int *pi : Postcondition that "*pi rel_op j" +* must be true. Note that j may be a expression known only at runtime. +* +* __deref_inout_range(rel_op, j) int *pi : Invariant that "*pi rel_op j" +* must be true. Note that j may be a expression known only at runtime. +* +* __range_max(a, b) int f(): Postcondition f acts as 'max', returns larger +* of a and b. Note that a and b may be expressions known only at runtime. +* +* __range_min(a, b) int f(): Postcondition f acts as 'min', returns smaller +* of a and b. Note that a and b may be expressions known only at runtime. +* +* __in_bound int i : Precondition that integer i must be bound, but the +* exact range can't be specified at compile time. __in_range should be +* used if the range can be explicitly stated. +* +* __out_bound int i : Postcondition that integer i must be bound, but the +* exact range can't be specified at compile time. __out_range should be +* used if the range can be explicitly stated. +* +* __deref_out_bound int pi : Postcondition that integer *pi must be bound, +* but the exact range can't be specified at compile time. +* __deref_out_range should be used if the range can be explicitly stated. +* +* __assume_bound(expr); : Assume that the expression is bound to some known +* range. This can be used to suppress integer overflow warnings on integral +* expressions that are known to be bound due to reasons not explicit in the +* code. Use as a statement in the body of a function. +* +* __analysis_assume_nulltermianted(expr); : Assume that the expression is +* a null terminated buffer. Use this to suppress tool noise specific to +* nulltermination warnings, and capture deeper invariants tools can not +* discover. +* +* __allocator void f(): Function allocates memory using an integral size +* argument +* +* void myfree(__deallocate(Mem) void *p) : Memory is freed, no longer usable +* upon return, and p may not be null. +* +* void myfree(__deallocate_opt(Mem) void *p) : Memory is freed, no longer +* usable upon return, and p may be null. +* +* void free(__post_invalid void* x): Mark memory as untouchable when +* function returns. +* +* ---------------------------------------------------------------------------- +* Advanced Annotation Examples +* +* __success(return == TRUE) LWSTDAPI_(BOOL) +* PathCanonicalizeA(__out_ecount(MAX_PATH) LPSTR pszBuf, LPCSTR pszPath); +* // pszBuf is only guaranteed to be null-terminated when TRUE is returned. +* +* // Initialized LPWSTRs are null-terminated strings. +* typedef __nullterminated WCHAR* LPWSTR; +* +* __out_ecount(cch) __typefix(LPWSTR) void *psz; +* // psz is a buffer parameter which will be a null-terminated WCHAR string +* // at exit, and which initially contains cch WCHARs. +* +************************************************************************/ +#define _At_(expr, annotes) __allowed(on_parameter_or_return) +#define _When_(expr, annotes) __allowed(on_parameter_or_return) +#define __success(expr) _SAL_VERSION_CHECK(__success) +#define __out_awcount(expr,size) __allowed(on_parameter) +#define __in_awcount(expr,size) __allowed(on_parameter) +#define __nullterminated _SAL_VERSION_CHECK(__nullterminated) +#define __nullnullterminated _SAL_VERSION_CHECK(__nullnullterminated) +#define __reserved _SAL_VERSION_CHECK(__reserved) +#define __checkReturn _SAL_VERSION_CHECK(__checkReturn) +#define __typefix(ctype) __allowed(on_parameter_or_return) +#define __override __allowed(on_function) +#define __callback __allowed(on_function) +#define __format_string __allowed(on_parameter_or_return) +#define __blocksOn(resource) __allowed(on_function) +#define __fallthrough __allowed(as_statement) +#define __range(lb,ub) __allowed(on_return) +#define __in_range(lb,ub) _SAL_VERSION_CHECK(__in_range) +#define __out_range(lb,ub) _SAL_VERSION_CHECK(__out_range) +#define __deref_in_range(lb,ub) __allowed(on_parameter) +#define __deref_out_range(lb,ub) _SAL_VERSION_CHECK(__deref_out_range) +#define __deref_inout_range(lb,ub) __allowed(on_parameter) +#define __field_range(lb,ub) _SAL_VERSION_CHECK(__field_range) +#define __range_max(a,b) __allowed(on_return) +#define __range_min(a,b) __allowed(on_return) +#define __bound __allowed(on_return) +#define __in_bound __allowed(on_parameter) +#define __out_bound __allowed(on_parameter) +#define __deref_out_bound __allowed(on_parameter) +#define __assume_bound(i) __allowed(as_statement_with_arg(i)) +#define __analysis_assume_nullterminated(x) \ + __allowed(as_statement_with_arg(x)) +#define __allocator __allowed(on_function) +#define __deallocate(kind) __allowed(on_parameter) +#define __deallocate_opt(kind) __allowed(on_parameter) +#define __post_invalid __allowed(on_parameter_or_return) +#define __post_nullnullterminated \ + __allowed(on_parameter_or_return) +/*************************************************************************** +* Expert Macros +***************************************************************************/ +#define __null __allowed(on_typedecl) +#define __notnull __allowed(on_typedecl) +#define __maybenull __allowed(on_typedecl) +#define __exceptthat __allowed(on_typedecl) +/*************************************************************************** +* Macros to classify fields of structures. +* Structure Annotations +* +* The buffer annotations are a convenient way of describing +* relationships between buffers and their size on a function by +* function basis. Very often struct or class data members have similar +* invariants, which can be expressed directly on the type. +* +* Similar to our buffer annotations we can summarize all the various +* structure annotations by one choosing an element from each column of +* this table to build a composite annotation. +* +* +--------------------------------------------------+ +* | Selector | Units | Size/Init | Optional | +* |----------+---------+------------------+----------| +* | __field | _ecount | (size) | empty | +* |----------+---------+------------------+----------| +* | __struct | _bcount | _full(size) | _opt | +* |----------+---------+------------------+----------| +* | | _xcount | _part(size,init) | | +* +--------------------------------------------------+ +* +* Note that empty represents the empty string. Sometime arguments need +* to be "floated" to the left to give us a valid annotation name. For +* example the naive combination __field_ecount(size)_opt is actually +* written as __field_ecount_opt(size). Not all possible combinations +* are currently supported or sensible. See specstrings_strict.h for +* the currently supported set. Those that are supported are documented +* below. +* +*Summary of Elements +* +* Selector +* +* __field +* The annotation should only be placed in front +* of data members of structures and classes. The +* data members are pointers to a block of data. +* The annotations describe properties about the +* size of the block of data. This can be used for +* +* __struct +* The annotation should only be placed at the +* beginning of the definition of a structure or +* class. These annotations are used when a struct +* or class is used as a "header" that is +* allocated inline with a block of data and there +* is no apparent field that represents the tail +* end of the structure. +* +* Units +* +* _ecount +* All size and initialization values are in terms +* of elements of the appropriate type +* +* _bcount +* All size and initialization values are in terms +* of raw byte sizes. +* +* _xcount +* The size or initialization values cannot be +* properly expressed as a simple byte or element +* count, and instead a place holder is used to +* document the relationship. +* +* Size/Init +* All the size/init expressions can contain references to +* other fields in the struct or class. +* +* (size) +* The size of the buffer is determined by the +* expression size. Unless, the type of the buffer +* provides more information nothing is know about +* how much of this data is initialized. For +* example, if the data member happens to be a +* string type such as LPSTR. It is assumed that +* the data is initialized to the first '\0'. +* +* _full(size) +* The size of the buffer is determined by the +* expression size and all the data in the buffer +* is guaranteed to be initialized. +* +* _part(size,init) +* The size of the buffer is determined by the +* expression size and all the data in the buffer +* is guaranteed to be initialized up to init +* elements or bytes. +* +* Optional +* +* empty +* The pointer to the block of memory is never +* NULL +* +* _opt +* The pointer to the block of memory is may be +* NULL +* +* +* // Basic Usage of Struct Annotations +* #include <stdio.h> +* #include <stdlib.h> +* struct buf_s { +* int sz; +* __field_bcount_full(sz) +* char *buf; +* }; +* void InitBuf(__out struct *buf_s b,int sz) { +* b->buf = calloc(sz,sizeof(char)); +* b->sz = sz; +* } +* void WriteBuf(__in FILE *fp,__in struct *buf_s b) { +* fwrite(b->buf,b->sz,sizeof(char),fp); +* } +* void ReadBuf(__in FILE *fp,__inout struct *buf_s b) { +* fread(b->buf,b->sz,sizeof(char),fp); +* } +* +* +* +* // Inline Allocated Buffer +* struct buf_s { +* int sz; +* __field_bcount(sz) +* char buf[1]; +* }; +* void WriteBuf(__in FILE *fp,__in struct *buf_s b) { +* fwrite(&(b->buf),b->sz,sizeof(char),fp); +* } +* void ReadBuf(__in FILE *fp,__inout struct *buf_s b) { +* fread(&(b->buf),b->sz,sizeof(char),fp); +* } +* +* +* +* // Embedded Header Structure +* __struct_bcount(sz) +* struct buf_s { +* int sz; +* }; +* void WriteBuf(__in FILE *fp,__in struct *buf_s b) { +* fwrite(&b,b->sz,sizeof(char),fp); +* } +* void ReadBuf(__in FILE *fp,__inout struct *buf_s b) { +* fread(&b,b->sz,sizeof(char),fp); +* } +* +* +****************************************************************************/ +#define __field_ecount(size) _SAL_VERSION_CHECK(__field_ecount) +#define __field_bcount(size) _SAL_VERSION_CHECK(__field_bcount) +#define __field_xcount(size) __allowed(on_field) +#define __field_ecount_opt(size) __allowed(on_field) +#define __field_bcount_opt(size) __allowed(on_field) +#define __field_xcount_opt(size) __allowed(on_field) +#define __field_ecount_part(size,init) __allowed(on_field) +#define __field_bcount_part(size,init) __allowed(on_field) +#define __field_xcount_part(size,init) __allowed(on_field) +#define __field_ecount_part_opt(size,init) __allowed(on_field) +#define __field_bcount_part_opt(size,init) __allowed(on_field) +#define __field_xcount_part_opt(size,init) __allowed(on_field) +#define __field_ecount_full(size) __allowed(on_field) +#define __field_bcount_full(size) __allowed(on_field) +#define __field_xcount_full(size) __allowed(on_field) +#define __field_ecount_full_opt(size) __allowed(on_field) +#define __field_bcount_full_opt(size) __allowed(on_field) +#define __field_xcount_full_opt(size) __allowed(on_field) +#define __field_nullterminated __allowed(on_field) +#define __struct_bcount(size) __allowed(on_struct) +#define __struct_xcount(size) __allowed(on_struct) + +/*************************************************************************** +* Macros to classify the entrypoints and indicate their category. +* +* Pre-defined control point categories include: RPC, KERNEL, GDI. +* +* Pre-defined control point macros include: +* __rpc_entry, __kernel_entry, __gdi_entry. +***************************************************************************/ +#define __control_entrypoint(category) __allowed(on_function) +#define __rpc_entry __allowed(on_function) +#define __kernel_entry __allowed(on_function) +#define __gdi_entry __allowed(on_function) + +/*************************************************************************** +* Macros to track untrusted data and their validation. The list of untrusted +* sources include: +* +* FILE - File reading stream or API +* NETWORK - Socket readers +* INTERNET - WinInet and WinHttp readers +* USER_REGISTRY - HKCU portions of the registry +* USER_MODE - Parameters to kernel entry points +* RPC - Parameters to RPC entry points +* DRIVER - Device driver +***************************************************************************/ +#define __in_data_source(src_sym) __allowed(on_parameter) +#define __out_data_source(src_sym) __allowed(on_parameter) +#define __field_data_source(src_sym) __allowed(on_field) +#define __this_out_data_source(src_syn) __allowed(on_function) + +/************************************************************************** +* Macros to tag file parsing code. Predefined formats include: +* PNG - Portable Network Graphics +* JPEG - Joint Photographic Experts Group +* BMP - Bitmap +* RC_BMP - Resource bitmap +* WMF - Windows Metafile +* EMF - Windows Enhanced Metafile +* GIF - Graphics Interchange Format +* MIME_TYPE - MIME type from header tokens +* MAIL_MONIKER - MAIL information refered by URL moniker +* HTML - HyperText Markup Language +* WMPHOTO - Windows media photo +* OE_VCARD - Outlook Express virtual card +* OE_CONTACT - Outlook Express contact +* MIDI - Musical Instrument Digital Interface +* LDIF - LDAP Data Interchange Format +* AVI - Audio Visual Interchange +* ACM - Audio Compression Manager +**************************************************************************/ +#define __out_validated(filetype_sym) __allowed(on_parameter) +#define __this_out_validated(filetype_sym) __allowed(on_function) +#define __file_parser(filetype_sym) __allowed(on_function) +#define __file_parser_class(filetype_sym) __allowed(on_struct) +#define __file_parser_library(filetype_sym) __allowed(as_global_decl) + +/*************************************************************************** +* Macros to track the code content in the file. The type of code +* contents currently tracked: +* +* NDIS_DRIVER - NDIS Device driver +***************************************************************************/ +#define __source_code_content(codetype_sym) __allowed(as_global_decl) + +/*************************************************************************** +* Macros to track the code content in the class. The type of code +* contents currently tracked: +* +* DCOM - Class implementing DCOM +***************************************************************************/ +#define __class_code_content(codetype_sym) __allowed(on_struct) + +/************************************************************************* +* Macros to tag encoded function pointers +**************************************************************************/ +#define __encoded_pointer +#define __encoded_array +#define __field_encoded_pointer __allowed(on_field) +#define __field_encoded_array __allowed(on_field) + +#define __transfer(formal) __allowed(on_parameter_or_return) +#define __assume_validated(exp) __allowed(as_statement_with_arg(exp)) + +/************************************************************************* +* __analysis_assume(expr) : Expert macro use only when directed. Use this to +* tell static analysis tools like PREfix and PREfast about a non-coded +* assumption that you wish the tools to assume. The assumption will be +* understood by those tools. By default there is no dynamic checking or +* static checking of the assumption in any build. +* +* To obtain dynamic checking wrap this macro in your local version of a debug +* assert. +* Please do not put function calls in the expression because this is not +* supported by all tools: +* __analysis_assume(GetObject () != NULL); // DO NOT DO THIS +* +*************************************************************************/ +#define __analysis_assume(expr) __allowed(as_statement_with_arg(expr)) +#define __analysis_assert(expr) __allowed(as_statement_with_arg(expr)) + +/************************************************************************* +* __analysis_hint(hint_sym) : Expert macro use only when +* directed. Use this to influence certain analysis heuristics +* used by the tools. These hints do not describe the semantics +* of functions but simply direct the tools to act in a certain +* way. +* +* Current hints that are supported are: +* +* INLINE - inline this function during analysis overrides any +* default heuristics +* NOINLINE - do not inline this function during analysis overrides +* and default heuristics +*************************************************************************/ +#define __analysis_hint(hint) __allowed(on_function) + +/************************************************************************* +* Macros to encode abstract properties of values. Used by SALadt.h +*************************************************************************/ +#define __type_has_adt_prop(adt,prop) __allowed(on_typdecl) +#define __out_has_adt_prop(adt,prop) __allowed(on_parameter) +#define __out_not_has_adt_prop(adt,prop) __allowed(on_parameter) +#define __out_transfer_adt_prop(arg) __allowed(on_parameter) +#define __out_has_type_adt_props(typ) __allowed(on_parameter) + +/************************************************************************* +* Macros used by Prefast for Drivers +* +* __possibly_notnullterminated : +* +* Used for return values of parameters or functions that do not +* guarantee nulltermination in all cases. +* +*************************************************************************/ +#define __possibly_notnullterminated __allowed(on_parameter_or_return) + +/************************************************************************* +* Advanced macros +* +* __volatile +* The __volatile annotation identifies a global variable or +* structure field that: +* 1) is not declared volatile; +* 2) is accessed concurrently by multiple threads. +* +* The __deref_volatile annotation identifies a global variable +* or structure field that stores a pointer to some data that: +* 1) is not declared volatile; +* 2) is accessed concurrently by multiple threads. +* +* Prefast uses these annotations to find patterns of code that +* may result in unexpected re-fetching of the global variable +* into a local variable. +* +* We also provide two complimentary annotations __nonvolatile +* and __deref_nonvolatile that could be used to suppress Prefast +* +* re-fetching warnings on variables that are known either: +* 1) not to be in danger of being re-fetched or, +* 2) not to lead to incorrect results if they are re-fetched +* +*************************************************************************/ +#define __volatile __allowed(on_global_or_field) +#define __deref_volatile __allowed(on_global_or_field) +#define __nonvolatile __allowed(on_global_or_field) +#define __deref_nonvolatile __allowed(on_global_or_field) + +/************************************************************************* +* Macros deprecated with strict level greater then 1. +**************************************************************************/ +#if (__SPECSTRINGS_STRICT_LEVEL > 1) +/* Must come before macro defintions */ +#pragma deprecated(__in_nz) +#pragma deprecated(__in_ecount_nz) +#pragma deprecated(__in_bcount_nz) +#pragma deprecated(__out_nz) +#pragma deprecated(__out_nz_opt) +#pragma deprecated(__out_ecount_nz) +#pragma deprecated(__out_bcount_nz) +#pragma deprecated(__inout_nz) +#pragma deprecated(__inout_ecount_nz) +#pragma deprecated(__inout_bcount_nz) +#pragma deprecated(__in_nz_opt) +#pragma deprecated(__in_ecount_nz_opt) +#pragma deprecated(__in_bcount_nz_opt) +#pragma deprecated(__out_ecount_nz_opt) +#pragma deprecated(__out_bcount_nz_opt) +#pragma deprecated(__inout_nz_opt) +#pragma deprecated(__inout_ecount_nz_opt) +#pragma deprecated(__inout_bcount_nz_opt) +#pragma deprecated(__deref_out_nz) +#pragma deprecated(__deref_out_ecount_nz) +#pragma deprecated(__deref_out_bcount_nz) +#pragma deprecated(__deref_inout_nz) +#pragma deprecated(__deref_inout_ecount_nz) +#pragma deprecated(__deref_inout_bcount_nz) +#pragma deprecated(__deref_out_nz_opt) +#pragma deprecated(__deref_out_ecount_nz_opt) +#pragma deprecated(__deref_out_bcount_nz_opt) +#pragma deprecated(__deref_inout_nz_opt) +#pragma deprecated(__deref_inout_ecount_nz_opt) +#pragma deprecated(__deref_inout_bcount_nz_opt) +#pragma deprecated(__deref_opt_inout_nz) +#pragma deprecated(__deref_opt_inout_ecount_nz) +#pragma deprecated(__deref_opt_inout_bcount_nz) +#pragma deprecated(__deref_opt_out_nz_opt) +#pragma deprecated(__deref_opt_out_ecount_nz_opt) +#pragma deprecated(__deref_opt_out_bcount_nz_opt) +#pragma deprecated(__deref_opt_inout_nz_opt) +#pragma deprecated(__deref_opt_inout_ecount_nz_opt) +#pragma deprecated(__deref_opt_inout_bcount_nz_opt) +#pragma deprecated(__deref) +#pragma deprecated(__pre) +#pragma deprecated(__post) +#pragma deprecated(__readableTo) +#pragma deprecated(__writableTo) +#pragma deprecated(__maybevalid) +#pragma deprecated(__data_entrypoint) +#pragma deprecated(__inexpressible_readableTo) +#pragma deprecated(__readonly) +#pragma deprecated(__byte_writableTo) +#pragma deprecated(__byte_readableTo) +#pragma deprecated(__elem_readableTo) +#pragma deprecated(__elem_writableTo) +#pragma deprecated(__valid) +#pragma deprecated(__notvalid) +#pragma deprecated(__refparam) +#pragma deprecated(__precond) +#endif +/* Define soon to be deprecated macros to nops. */ +#define __in_nz +#define __in_ecount_nz(size) +#define __in_bcount_nz(size) +#define __out_nz +#define __out_nz_opt +#define __out_ecount_nz(size) +#define __out_bcount_nz(size) +#define __inout_nz +#define __inout_ecount_nz(size) +#define __inout_bcount_nz(size) +#define __in_nz_opt +#define __in_ecount_nz_opt(size) +#define __in_bcount_nz_opt(size) +#define __out_ecount_nz_opt(size) +#define __out_bcount_nz_opt(size) +#define __inout_nz_opt +#define __inout_ecount_nz_opt(size) +#define __inout_bcount_nz_opt(size) +#define __deref_out_nz +#define __deref_out_ecount_nz(size) +#define __deref_out_bcount_nz(size) +#define __deref_inout_nz +#define __deref_inout_ecount_nz(size) +#define __deref_inout_bcount_nz(size) +#define __deref_out_nz_opt +#define __deref_out_ecount_nz_opt(size) +#define __deref_out_bcount_nz_opt(size) +#define __deref_inout_nz_opt +#define __deref_inout_ecount_nz_opt(size) +#define __deref_inout_bcount_nz_opt(size) +#define __deref_opt_inout_nz +#define __deref_opt_inout_ecount_nz(size) +#define __deref_opt_inout_bcount_nz(size) +#define __deref_opt_out_nz_opt +#define __deref_opt_out_ecount_nz_opt(size) +#define __deref_opt_out_bcount_nz_opt(size) +#define __deref_opt_inout_nz_opt +#define __deref_opt_inout_ecount_nz_opt(size) +#define __deref_opt_inout_bcount_nz_opt(size) +#define __deref +#define __pre +#define __post +#define __readableTo(count) +#define __writableTo(count) +#define __maybevalid +#define __inexpressible_readableTo(string) +#define __data_entrypoint(category) +#define __readonly +#define __byte_writableTo(count) +#define __byte_readableTo(count) +#define __elem_readableTo(count) +#define __elem_writableTo(count) +#define __valid +#define __notvalid +#define __refparam +#define __precond(condition) + +/************************************************************************* +* Definitions to force a compile error when macros are used improperly. +* Relies on VS 2005 source annotations. +*************************************************************************/ +#if !defined(_MSC_EXTENSIONS) && !defined(_PREFAST_) && !defined(OACR) +#define __allowed(p) /* nothing */ +#else +#define __allowed(p) __$allowed_##p +#define __$allowed_as_global_decl /* empty */ +#define __$allowed_as_statement_with_arg(x) \ + __pragma(warning(push)) __pragma(warning(disable : 4548)) \ + do {__noop(x);} while((0,0) __pragma(warning(pop)) ) +#define __$allowed_as_statement __$allowed_as_statement_with_arg(1) + +/************************************************************************** +* This should go away. It's only for __success which we should split into. +* __success and __typdecl_sucess +***************************************************************************/ +#define __$allowed_on_function_or_typedecl /* empty */ +#if (__SPECSTRINGS_STRICT_LEVEL == 1) || (__SPECSTRINGS_STRICT_LEVEL == 2) +#define __$allowed_on_typedecl /* empty */ +#define __$allowed_on_return /* empty */ +#define __$allowed_on_parameter /* empty */ +#define __$allowed_on_function /* empty */ +#define __$allowed_on_struct /* empty */ +#define __$allowed_on_field /* empty */ +#define __$allowed_on_parameter_or_return /* empty */ +#define __$allowed_on_global_or_field /* empty */ +#elif __SPECSTRINGS_STRICT_LEVEL == 3 +#define __$allowed_on_typedecl /* empty */ +/* Define dummy source attributes. Still needs more testing */ +#define __$allowed_on_return [returnvalue: OnReturnOnly] +#define __$allowed_on_parameter [OnParameterOnly] +#define __$allowed_on_function [method: OnFunctionOnly] +#define __$allowed_on_struct [OnStructOnly] +#define __$allowed_on_field [OnFieldOnly] +#define __$allowed_on_parameter_or_return [OnParameterOrReturnOnly] +#define __$allowed_on_global_or_field /* empty */ +#pragma push_macro( "DECL_SA" ) +#pragma push_macro( "SA" ) +#ifdef __cplusplus +#define SA(x) x +#define DECL_SA(name,loc) \ + [repeatable] \ + [source_annotation_attribute( loc )] \ + struct name##Attribute { name##Attribute(); const char* ignored; }; +#else +#define SA(x) SA_##x +#define DECL_SA(name,loc) \ + [source_annotation_attribute( loc )] \ + struct name { const char* ignored; };\ + typedef struct name name; +#endif /* #endif __cplusplus */ +DECL_SA(OnParameterOnly,SA(Parameter)); +DECL_SA(OnReturnOnly,SA(ReturnValue)); +DECL_SA(OnFunctionOnly,SA(Method)); +DECL_SA(OnStructOnly,SA(Struct)); +DECL_SA(OnFieldOnly,SA(Field)); +DECL_SA(OnParameterOrReturnOnly,SA(Parameter) | SA(ReturnValue)); +#pragma pop_macro( "SA" ) +#pragma pop_macro( "DECL_SA" ) +#endif +#endif +#endif diff --git a/sdk/include/psdk/specstrings_undef.h b/sdk/include/psdk/specstrings_undef.h new file mode 100644 index 00000000000..9477d555801 --- /dev/null +++ b/sdk/include/psdk/specstrings_undef.h @@ -0,0 +1,491 @@ +/* + * PROJECT: ReactOS PSDK + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Undefines SAL definitions + * COPYRIGHT: Copyright 2020 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#pragma once + +#undef __ecount +#undef __bcount +#undef __xcount +#undef __in +#undef __in_ecount +#undef __in_bcount +#undef __in_xcount +#undef __in_z +#undef __in_ecount_z +#undef __in_bcount_z +#undef __out +#undef __out_ecount +#undef __out_bcount +#undef __out_xcount +#undef __out_ecount_part +#undef __out_bcount_part +#undef __out_xcount_part +#undef __out_ecount_full +#undef __out_bcount_full +#undef __out_xcount_full +#undef __out_z +#undef __out_ecount_z +#undef __out_bcount_z +#undef __inout +#undef __inout_ecount +#undef __inout_bcount +#undef __inout_xcount +#undef __inout_ecount_part +#undef __inout_bcount_part +#undef __inout_xcount_part +#undef __inout_ecount_full +#undef __inout_bcount_full +#undef __inout_xcount_full +#undef __inout_z +#undef __inout_ecount_z +#undef __inout_bcount_z +#undef __ecount_opt +#undef __bcount_opt +#undef __xcount_opt +#undef __in_opt +#undef __in_ecount_opt +#undef __in_bcount_opt +#undef __in_z_opt +#undef __in_ecount_z_opt +#undef __in_bcount_z_opt +#undef __in_xcount_opt +#undef __out_opt +#undef __out_ecount_opt +#undef __out_bcount_opt +#undef __out_xcount_opt +#undef __out_ecount_part_opt +#undef __out_bcount_part_opt +#undef __out_xcount_part_opt +#undef __out_ecount_full_opt +#undef __out_bcount_full_opt +#undef __out_xcount_full_opt +#undef __out_ecount_z_opt +#undef __out_bcount_z_opt +#undef __inout_opt +#undef __inout_ecount_opt +#undef __inout_bcount_opt +#undef __inout_xcount_opt +#undef __inout_ecount_part_opt +#undef __inout_bcount_part_opt +#undef __inout_xcount_part_opt +#undef __inout_ecount_full_opt +#undef __inout_bcount_full_opt +#undef __inout_xcount_full_opt +#undef __inout_z_opt +#undef __inout_ecount_z_opt +#undef __inout_ecount_z_opt +#undef __inout_bcount_z_opt +#undef __deref_ecount +#undef __deref_bcount +#undef __deref_xcount +#undef __deref_in +#undef __deref_in_ecount +#undef __deref_in_bcount +#undef __deref_in_xcount +#undef __deref_out +#undef __deref_out_ecount +#undef __deref_out_bcount +#undef __deref_out_xcount +#undef __deref_out_ecount_part +#undef __deref_out_bcount_part +#undef __deref_out_xcount_part +#undef __deref_out_ecount_full +#undef __deref_out_bcount_full +#undef __deref_out_xcount_full +#undef __deref_out_z +#undef __deref_out_ecount_z +#undef __deref_out_bcount_z +#undef __deref_inout +#undef __deref_inout_ecount +#undef __deref_inout_bcount +#undef __deref_inout_xcount +#undef __deref_inout_ecount_part +#undef __deref_inout_bcount_part +#undef __deref_inout_xcount_part +#undef __deref_inout_ecount_full +#undef __deref_inout_bcount_full +#undef __deref_inout_xcount_full +#undef __deref_inout_z +#undef __deref_inout_ecount_z +#undef __deref_inout_bcount_z +#undef __deref_ecount_opt +#undef __deref_bcount_opt +#undef __deref_xcount_opt +#undef __deref_in_opt +#undef __deref_in_opt_out +#undef __deref_in_ecount_opt +#undef __deref_in_bcount_opt +#undef __deref_in_xcount_opt +#undef __deref_out_opt +#undef __deref_out_ecount_opt +#undef __deref_out_bcount_opt +#undef __deref_out_xcount_opt +#undef __deref_out_ecount_part_opt +#undef __deref_out_bcount_part_opt +#undef __deref_out_xcount_part_opt +#undef __deref_out_ecount_full_opt +#undef __deref_out_bcount_full_opt +#undef __deref_out_xcount_full_opt +#undef __deref_out_z_opt +#undef __deref_out_ecount_z_opt +#undef __deref_out_bcount_z_opt +#undef __deref_inout_opt +#undef __deref_inout_ecount_opt +#undef __deref_inout_bcount_opt +#undef __deref_inout_xcount_opt +#undef __deref_inout_ecount_part_opt +#undef __deref_inout_bcount_part_opt +#undef __deref_inout_xcount_part_opt +#undef __deref_inout_ecount_full_opt +#undef __deref_inout_bcount_full_opt +#undef __deref_inout_xcount_full_opt +#undef __deref_inout_z_opt +#undef __deref_inout_ecount_z_opt +#undef __deref_inout_bcount_z_opt +#undef __deref_opt_ecount +#undef __deref_opt_bcount +#undef __deref_opt_xcount +#undef __deref_opt_in +#undef __deref_opt_in_ecount +#undef __deref_opt_in_bcount +#undef __deref_opt_in_xcount +#undef __deref_opt_out +#undef __deref_opt_out_ecount +#undef __deref_opt_out_bcount +#undef __deref_opt_out_xcount +#undef __deref_opt_out_ecount_part +#undef __deref_opt_out_bcount_part +#undef __deref_opt_out_xcount_part +#undef __deref_opt_out_ecount_full +#undef __deref_opt_out_bcount_full +#undef __deref_opt_out_xcount_full +#undef __deref_opt_inout +#undef __deref_opt_inout_ecount +#undef __deref_opt_inout_bcount +#undef __deref_opt_inout_xcount +#undef __deref_opt_inout_ecount_part +#undef __deref_opt_inout_bcount_part +#undef __deref_opt_inout_xcount_part +#undef __deref_opt_inout_ecount_full +#undef __deref_opt_inout_bcount_full +#undef __deref_opt_inout_xcount_full +#undef __deref_opt_inout_z +#undef __deref_opt_inout_ecount_z +#undef __deref_opt_inout_bcount_z +#undef __deref_opt_ecount_opt +#undef __deref_opt_bcount_opt +#undef __deref_opt_xcount_opt +#undef __deref_opt_in_opt +#undef __deref_opt_in_ecount_opt +#undef __deref_opt_in_bcount_opt +#undef __deref_opt_in_xcount_opt +#undef __deref_opt_out_opt +#undef __deref_opt_out_ecount_opt +#undef __deref_opt_out_bcount_opt +#undef __deref_opt_out_xcount_opt +#undef __deref_opt_out_ecount_part_opt +#undef __deref_opt_out_bcount_part_opt +#undef __deref_opt_out_xcount_part_opt +#undef __deref_opt_out_ecount_full_opt +#undef __deref_opt_out_bcount_full_opt +#undef __deref_opt_out_xcount_full_opt +#undef __deref_opt_out_z_opt +#undef __deref_opt_out_ecount_z_opt +#undef __deref_opt_out_bcount_z_opt +#undef __deref_opt_inout_opt +#undef __deref_opt_inout_ecount_opt +#undef __deref_opt_inout_bcount_opt +#undef __deref_opt_inout_xcount_opt +#undef __deref_opt_inout_ecount_part_opt +#undef __deref_opt_inout_bcount_part_opt +#undef __deref_opt_inout_xcount_part_opt +#undef __deref_opt_inout_ecount_full_opt +#undef __deref_opt_inout_bcount_full_opt +#undef __deref_opt_inout_xcount_full_opt +#undef __deref_opt_inout_z_opt +#undef __deref_opt_inout_ecount_z_opt +#undef __deref_opt_inout_bcount_z_opt +#undef __deref_in_ecount_iterator +#undef __deref_out_ecount_iterator +#undef __deref_inout_ecount_iterator +#undef __deref_realloc_bcount + +/************************************************************************ +* SAL 2 _Ouptr_ family of annotations +************************************************************************/ + +#undef _Outptr_ +#undef _Outptr_result_maybenull_ +#undef _Outptr_opt_ +#undef _Outptr_opt_result_maybenull_ +#undef _Outptr_result_z_ +#undef _Outptr_opt_result_z_ +#undef _Outptr_result_maybenull_z_ +#undef _Outptr_opt_result_maybenull_z_ +#undef _Outptr_result_nullonfailure_ +#undef _Outptr_opt_result_nullonfailure_ +#undef _COM_Outptr_ +#undef _COM_Outptr_result_maybenull_ +#undef _COM_Outptr_opt_ +#undef _COM_Outptr_opt_result_maybenull_ +#undef _Outptr_result_buffer_ +#undef _Outptr_opt_result_buffer_ +#undef _Outptr_result_buffer_to_ +#undef _Outptr_opt_result_buffer_to_ +#undef _Outptr_result_buffer_all_ +#undef _Outptr_opt_result_buffer_all_ +#undef _Outptr_result_buffer_maybenull_ +#undef _Outptr_opt_result_buffer_maybenull_ +#undef _Outptr_result_buffer_to_maybenull_ +#undef _Outptr_opt_result_buffer_to_maybenull_ +#undef _Outptr_result_buffer_all_maybenull_ +#undef _Outptr_opt_result_buffer_all_maybenull_ +#undef _Outptr_result_bytebuffer_ +#undef _Outptr_opt_result_bytebuffer_ +#undef _Outptr_result_bytebuffer_to_ +#undef _Outptr_opt_result_bytebuffer_to_ +#undef _Outptr_result_bytebuffer_all_ +#undef _Outptr_opt_result_bytebuffer_all_ +#undef _Outptr_result_bytebuffer_maybenull_ +#undef _Outptr_opt_result_bytebuffer_maybenull_ +#undef _Outptr_result_bytebuffer_to_maybenull_ +#undef _Outptr_opt_result_bytebuffer_to_maybenull_ +#undef _Outptr_result_bytebuffer_all_maybenull_ +#undef _Outptr_opt_result_bytebuffer_all_maybenull_ + +/************************************************************************ +* Orcas SAL +************************************************************************/ +#undef _Deref_out_ +#undef _Deref_out_opt_ +#undef _Deref_opt_out_ +#undef _Deref_opt_out_opt_ +#undef _In_count_ +#undef _In_opt_count_ +#undef _In_bytecount_ +#undef _In_opt_bytecount_ +#undef _Out_cap_ +#undef _Out_opt_cap_ +#undef _Out_bytecap_ +#undef _Out_opt_bytecap_ +#undef _Deref_post_count_ +#undef _Deref_post_opt_count_ +#undef _Deref_post_bytecount_ +#undef _Deref_post_opt_bytecount_ +#undef _Deref_post_cap_ +#undef _Deref_post_opt_cap_ +#undef _Deref_post_bytecap_ +#undef _Deref_post_opt_bytecap_ + +/************************************************************************ +* Advanced Annotations +************************************************************************/ +#undef _At_ +#undef _When_ +#undef __success +#undef __out_awcount +#undef __in_awcount +#undef __nullterminated +#undef __nullnullterminated +#undef __reserved +#undef __checkReturn +#undef __typefix +#undef __override +#undef __callback +#undef __format_string +#undef __blocksOn +#undef __fallthrough +#undef __range +#undef __in_range +#undef __out_range +#undef __deref_in_range +#undef __deref_out_range +#undef __deref_inout_range +#undef __field_range +#undef __range_max +#undef __range_min +#undef __bound +#undef __in_bound +#undef __out_bound +#undef __deref_out_bound +#undef __assume_bound +#undef __analysis_assume_nullterminated +#undef __allocator +#undef __deallocate +#undef __deallocate_opt +#undef __post_invalid +#undef __post_nullnullterminated +/*************************************************************************** +* Expert Macros +***************************************************************************/ +#undef __null +#undef __notnull +#undef __maybenull +#undef __exceptthat +/*************************************************************************** +* Macros to classify fields of structures. +****************************************************************************/ +#undef __field_ecount +#undef __field_bcount +#undef __field_xcount +#undef __field_ecount_opt +#undef __field_bcount_opt +#undef __field_xcount_opt +#undef __field_ecount_part +#undef __field_bcount_part +#undef __field_xcount_part +#undef __field_ecount_part_opt +#undef __field_bcount_part_opt +#undef __field_xcount_part_opt +#undef __field_ecount_full +#undef __field_bcount_full +#undef __field_xcount_full +#undef __field_ecount_full_opt +#undef __field_bcount_full_opt +#undef __field_xcount_full_opt +#undef __field_nullterminated +#undef __struct_bcount +#undef __struct_xcount + +/*************************************************************************** +* Macros to classify the entrypoints and indicate their category. +***************************************************************************/ +#undef __control_entrypoint +#undef __rpc_entry +#undef __kernel_entry +#undef __gdi_entry + +/*************************************************************************** +* Macros to track untrusted data and their validation. +***************************************************************************/ +#undef __in_data_source +#undef __out_data_source +#undef __field_data_source +#undef __this_out_data_source + +/************************************************************************** +* Macros to tag file parsing code. +**************************************************************************/ +#undef __out_validated +#undef __this_out_validated +#undef __file_parser +#undef __file_parser_class +#undef __file_parser_library + +/*************************************************************************** +* Macros to track the code content in the file. +***************************************************************************/ +#undef __source_code_content + +/*************************************************************************** +* Macros to track the code content in the class. +***************************************************************************/ +#undef __class_code_content + +/************************************************************************* +* Macros to tag encoded function pointers +**************************************************************************/ +#undef __encoded_pointer +#undef __encoded_array +#undef __field_encoded_pointer +#undef __field_encoded_array + +#undef __transfer +#undef __assume_validated + +/************************************************************************* +* __analysis_assume +*************************************************************************/ +#undef __analysis_assume +#undef __analysis_assert + +/************************************************************************* +* __analysis_hint +*************************************************************************/ +#undef __analysis_hint + +/************************************************************************* +* Macros to encode abstract properties of values. Used by SALadt.h +*************************************************************************/ +#undef __type_has_adt_prop +#undef __out_has_adt_prop +#undef __out_not_has_adt_prop +#undef __out_transfer_adt_prop +#undef __out_has_type_adt_props + +/************************************************************************* +* Macros used by Prefast for Drivers +*************************************************************************/ +#undef __possibly_notnullterminated + +/************************************************************************* +* Advanced macros +*************************************************************************/ +#undef __volatile +#undef __deref_volatile +#undef __nonvolatile +#undef __deref_nonvolatile + +/************************************************************************* +* Macros deprecated with strict level greater then 1. +**************************************************************************/ +#undef __in_nz +#undef __in_ecount_nz +#undef __in_bcount_nz +#undef __out_nz +#undef __out_nz_opt +#undef __out_ecount_nz +#undef __out_bcount_nz +#undef __inout_nz +#undef __inout_ecount_nz +#undef __inout_bcount_nz +#undef __in_nz_opt +#undef __in_ecount_nz_opt +#undef __in_bcount_nz_opt +#undef __out_ecount_nz_opt +#undef __out_bcount_nz_opt +#undef __inout_nz_opt +#undef __inout_ecount_nz_opt +#undef __inout_bcount_nz_opt +#undef __deref_out_nz +#undef __deref_out_ecount_nz +#undef __deref_out_bcount_nz +#undef __deref_inout_nz +#undef __deref_inout_ecount_nz +#undef __deref_inout_bcount_nz +#undef __deref_out_nz_opt +#undef __deref_out_ecount_nz_opt +#undef __deref_out_bcount_nz_opt +#undef __deref_inout_nz_opt +#undef __deref_inout_ecount_nz_opt +#undef __deref_inout_bcount_nz_opt +#undef __deref_opt_inout_nz +#undef __deref_opt_inout_ecount_nz +#undef __deref_opt_inout_bcount_nz +#undef __deref_opt_out_nz_opt +#undef __deref_opt_out_ecount_nz_opt +#undef __deref_opt_out_bcount_nz_opt +#undef __deref_opt_inout_nz_opt +#undef __deref_opt_inout_ecount_nz_opt +#undef __deref_opt_inout_bcount_nz_opt +#undef __deref +#undef __pre +#undef __post +#undef __readableTo +#undef __writableTo +#undef __maybevalid +#undef __inexpressible_readableTo +#undef __data_entrypoint +#undef __readonly +#undef __byte_writableTo +#undef __byte_readableTo +#undef __elem_readableTo +#undef __elem_writableTo +#undef __valid +#undef __notvalid +#undef __refparam +#undef __precond

1 0

[reactos] 01/01: [CMAKE] Make reactos_cab_inf really depend on reactos.inf
by Jérôme Gardou 28 Oct '20

28 Oct '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95d873091b8ef49aa82f2… commit 95d873091b8ef49aa82f2cec15f3c18617e70d6d Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Oct 28 15:09:15 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Oct 28 18:03:34 2020 +0100 [CMAKE] Make reactos_cab_inf really depend on reactos.inf Instead of being always out of date & always trigger reactos.cab creation --- boot/bootdata/packages/CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/boot/bootdata/packages/CMakeLists.txt b/boot/bootdata/packages/CMakeLists.txt index 3f1cc6ff00c..4b11979b6a1 100644 --- a/boot/bootdata/packages/CMakeLists.txt +++ b/boot/bootdata/packages/CMakeLists.txt @@ -31,17 +31,19 @@ add_custom_command( -D SRC2=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.$<CONFIG>.dyn -D DST=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.maydiff -P ${CMAKE_CURRENT_BINARY_DIR}/concat.cmake - COMMAND ${CMAKE_COMMAND} -E copy_if_different + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.maydiff ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/reactos.dff.in DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.$<CONFIG>.dyn) -add_custom_target( - reactos_cab_inf +add_custom_command( COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -L ${CMAKE_CURRENT_BINARY_DIR} -I -P ${REACTOS_SOURCE_DIR} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff native-cabman - BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf) + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf) + +add_custom_target( + reactos_cab_inf DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf) add_cd_file( TARGET reactos_cab_inf

1 0

[reactos] 01/01: Revert "[CMAKE] Make unattended bootcd configurable via cmake"
by Jérôme Gardou 26 Oct '20

26 Oct '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2cf5a4c03a31b48b6167… commit b2cf5a4c03a31b48b6167aeba3465ff33b866c5f Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Oct 26 18:11:55 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Mon Oct 26 18:13:50 2020 +0100 Revert "[CMAKE] Make unattended bootcd configurable via cmake" This reverts commit cfd4ef9384eb1f2b55a5b195ee39475f015c8a7c. This was way more controversial than I would have thought --- boot/bootdata/CMakeLists.txt | 2 +- boot/bootdata/bootcd/CMakeLists.txt | 42 ---------------------- .../bootcd/{unattend.inf.in => unattend.inf} | 30 ++++++++-------- 3 files changed, 16 insertions(+), 58 deletions(-) diff --git a/boot/bootdata/CMakeLists.txt b/boot/bootdata/CMakeLists.txt index 90a54bdc60b..f1e6153f8a7 100644 --- a/boot/bootdata/CMakeLists.txt +++ b/boot/bootdata/CMakeLists.txt @@ -1,6 +1,5 @@ add_subdirectory(packages) -add_subdirectory(bootcd) # Common hives @@ -62,6 +61,7 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd.ini DESTINATION root NAME_ # Unattend add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/unattend.inf DESTINATION reactos NO_CAB FOR regtest) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd/unattend.inf DESTINATION reactos NO_CAB FOR bootcd) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/livecd/unattend.inf DESTINATION reactos NO_CAB FOR livecd) # LiveCD shortcuts diff --git a/boot/bootdata/bootcd/CMakeLists.txt b/boot/bootdata/bootcd/CMakeLists.txt deleted file mode 100644 index 8c164f7b687..00000000000 --- a/boot/bootdata/bootcd/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -set(UNATTENDED_BOOTCD "no" CACHE STRING "Whether to build a self-installing bootcd (yes/no)") - -function(add_unattended_bootcd_option _var _default _doc) - if (UNATTENDED_BOOTCD STREQUAL "yes") - set(${_var} "${_default}" CACHE STRING ${_doc}) - endif() -endfunction() - -add_unattended_bootcd_option(UNATTENDED_BOOTCD_DestinationDiskNumber "0" - "The Disk Number ReactOS will be installed on during bootcd unattended setup") -add_unattended_bootcd_option(UNATTENDED_BOOTCD_DestinationPartitionNumber "1" - "The Partition Number ReactOS will be installed on during bootcd unattended setup") -add_unattended_bootcd_option(UNATTENDED_BOOTCD_InstallationDirectory "ReactOS" - "The directory ReactOS will be installed in during bootcd unattended setup") -add_unattended_bootcd_option(UNATTENDED_BOOTCD_MBRInstallType "2" - "MBR installation type during bootcd unattended setup: 0: skip, 1: On floppy, 2: On HDD") -add_unattended_bootcd_option(UNATTENDED_BOOTCD_FullName "MyName" - "The user name used for unattended bootcd installation") -add_unattended_bootcd_option(UNATTENDED_BOOTCD_OrgName "" - "The organisation name used for unattended bootcd installation (None if empty)") -add_unattended_bootcd_option(UNATTENDED_BOOTCD_ComputerName "MYCOMPUTERNAME" - "The computer name used for unattended bootcd installation") -add_unattended_bootcd_option(UNATTENDED_BOOTCD_AdminPassword "" - "The administrator password used for unattended bootcd installation (None if empty)") -add_unattended_bootcd_option(UNATTENDED_BOOTCD_FormatPartition "1" - "Whether to format the partition during bootcd unattended setup. 0: Don't format, 1: Format)") -add_unattended_bootcd_option(UNATTENDED_BOOTCD_AutoPartition "1" - "Whether to automatically create the partition during bootcd unattended setup. 0: Don't create partition, 1: Create partition") -add_unattended_bootcd_option(UNATTENDED_BOOTCD_FsType "0" - "The filesystem used during bootcd unattended setup. 0: FAT, 1: BTRFS") -add_unattended_bootcd_option(UNATTENDED_BOOTCD_DisableGeckoInst "no" - "Whether to disable the Gecko module installation. (yes/no)") -add_unattended_bootcd_option(UNATTENDED_BOOTCD_LocaleID "409" - "The locale used during bootcd unattended setup. See hivesys.inf for values") -add_unattended_bootcd_option(UNATTENDED_BOOTCD_ProductOption "0" - "The product installed during bootcd unattended setup. 0: Server, 1: WorkStation") - -if (UNATTENDED_BOOTCD STREQUAL "yes") - configure_file(unattend.inf.in unattend.inf @ONLY) - add_cd_file(FILE ${CMAKE_CURRENT_BINARY_DIR}/unattend.inf DESTINATION reactos NO_CAB FOR bootcd) -endif() - diff --git a/boot/bootdata/bootcd/unattend.inf.in b/boot/bootdata/bootcd/unattend.inf similarity index 67% rename from boot/bootdata/bootcd/unattend.inf.in rename to boot/bootdata/bootcd/unattend.inf index 651d6fa022e..ce5593788e2 100644 --- a/boot/bootdata/bootcd/unattend.inf.in +++ b/boot/bootdata/bootcd/unattend.inf @@ -4,22 +4,22 @@ Signature = "$ReactOS$" ; Set UnattendSetupEnabled to yes in order to get unattended setup working ; yes - unattend setup enabled ; no - unattend setup disabled -UnattendSetupEnabled = @UNATTENDED_BOOTCD@ +UnattendSetupEnabled = no ; Install to \Device\Harddisk0\Partition1\ReactOS -DestinationDiskNumber = @UNATTENDED_BOOTCD_DestinationDiskNumber@ -DestinationPartitionNumber = @UNATTENDED_BOOTCD_DestinationPartitionNumber@ -InstallationDirectory=@UNATTENDED_BOOTCD_InstallationDirectory@ +DestinationDiskNumber = 0 +DestinationPartitionNumber = 1 +InstallationDirectory=ReactOS ; MBRInstallType=0 skips MBR installation ; MBRInstallType=1 install MBR on floppy ; MBRInstallType=2 install MBR on hdd -MBRInstallType=@UNATTENDED_BOOTCD_MBRInstallType@ +MBRInstallType=2 -FullName="@UNATTENDED_BOOTCD_FullName@" -OrgName="@UNATTENDED_BOOTCD_OrgName@" -ComputerName="@UNATTENDED_BOOTCD_ComputerName@" -AdminPassword="@UNATTENDED_BOOTCD_AdminPassword@" +FullName="MyName" +;OrgName="MyOrg" +ComputerName="MYCOMPUTERNAME" +;AdminPassword="MyPassword" ; TimeZone is set GMT as default TimeZoneIndex=85 @@ -30,33 +30,33 @@ TimeZoneIndex=85 ; enable this setting to format the selected partition ; 1 - format enabled ; 0 - format disabled -FormatPartition=@UNATTENDED_BOOTCD_FormatPartition@ +FormatPartition=1 ; enable this setting to automatically create a partition ; during installation ; 1 - enabled ; 0 - disabled -AutoPartition = @UNATTENDED_BOOTCD_AutoPartition@ +AutoPartition = 1 ; choose default file system type ; 0 - FAT ; 1 - BtrFS -FsType = @UNATTENDED_BOOTCD_FsType@ +FsType = 0 ; enable this setting to disable Gecko install ; yes - disabled ; no - enabled -DisableGeckoInst = @UNATTENDED_BOOTCD_DisableGeckoInst@ +DisableGeckoInst = no ; set this option to automatically ; specify language in 2nd mode setup ; see hivesys.inf for available languages -LocaleID = @UNATTENDED_BOOTCD_LocaleID@ +LocaleID = 409 ; set product option ; 0: ReactOS Server ; 1: ReactOS Workstation -ProductOption = @UNATTENDED_BOOTCD_ProductOption@ +ProductOption = 0 ; enable this section to automatically launch programs ; after 3rd boot

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs