Ros-diffs December 2023

ros-diffs@reactos.org

20 participants
274 discussions

[reactos] 01/01: [NTUSER] accelerator.c: Don't use RETURN() macro (#6166)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95657698e72e706cbcf72… commit 95657698e72e706cbcf729ac7cb20ad783793b64 Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Sun Dec 17 17:22:58 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 17 17:22:58 2023 +0700 [NTUSER] accelerator.c: Don't use RETURN() macro (#6166) --- win32ss/user/ntuser/accelerator.c | 75 +++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 42 deletions(-) diff --git a/win32ss/user/ntuser/accelerator.c b/win32ss/user/ntuser/accelerator.c index 8348cea2b2f..7da1a82133b 100644 --- a/win32ss/user/ntuser/accelerator.c +++ b/win32ss/user/ntuser/accelerator.c @@ -174,8 +174,7 @@ NtUserCopyAcceleratorTable( ULONG EntriesCount) { PACCELERATOR_TABLE Accel; - ULONG Ret; - DECLARE_RETURN(int); + ULONG Ret = 0; TRACE("Enter NtUserCopyAcceleratorTable\n"); UserEnterShared(); @@ -183,21 +182,20 @@ NtUserCopyAcceleratorTable( Accel = UserGetAccelObject(hAccel); if (!Accel) { - RETURN(0); + goto Exit; } /* If Entries is NULL return table size */ if (!Entries) { - RETURN(Accel->Count); + Ret = Accel->Count; + goto Exit; } /* Don't overrun */ if (Accel->Count < EntriesCount) EntriesCount = Accel->Count; - Ret = 0; - _SEH2_TRY { ProbeForWrite(Entries, EntriesCount*sizeof(Entries[0]), 4); @@ -216,12 +214,10 @@ NtUserCopyAcceleratorTable( } _SEH2_END; - RETURN(Ret); - -CLEANUP: - TRACE("Leave NtUserCopyAcceleratorTable, ret=%i\n", _ret_); +Exit: + TRACE("Leave NtUserCopyAcceleratorTable, ret=%lu\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } HACCEL @@ -234,7 +230,7 @@ NtUserCreateAcceleratorTable( HACCEL hAccel; ULONG Index; NTSTATUS Status = STATUS_SUCCESS; - DECLARE_RETURN(HACCEL); + HACCEL Ret = NULL; PTHREADINFO pti; TRACE("Enter NtUserCreateAcceleratorTable(Entries %p, EntriesCount %u)\n", @@ -244,7 +240,7 @@ NtUserCreateAcceleratorTable( if (!Entries || EntriesCount <= 0) { SetLastNtError(STATUS_INVALID_PARAMETER); - RETURN( (HACCEL) NULL ); + goto Exit; } pti = PsGetCurrentThreadWin32Thread(); @@ -259,7 +255,7 @@ NtUserCreateAcceleratorTable( if (Accel == NULL) { SetLastNtError(STATUS_NO_MEMORY); - RETURN( (HACCEL) NULL ); + goto Exit; } Accel->Count = EntriesCount; @@ -269,7 +265,7 @@ NtUserCreateAcceleratorTable( UserDereferenceObject(Accel); UserDeleteObject(hAccel, TYPE_ACCELTABLE); SetLastNtError(STATUS_NO_MEMORY); - RETURN( (HACCEL) NULL); + goto Exit; } _SEH2_TRY @@ -307,7 +303,7 @@ NtUserCreateAcceleratorTable( UserDereferenceObject(Accel); UserDeleteObject(hAccel, TYPE_ACCELTABLE); SetLastNtError(Status); - RETURN( (HACCEL) NULL); + goto Exit; } /* FIXME: Save HandleTable in a list somewhere so we can clean it up again */ @@ -315,13 +311,13 @@ NtUserCreateAcceleratorTable( /* Release the extra reference (UserCreateObject added 2 references) */ UserDereferenceObject(Accel); - RETURN(hAccel); + Ret = hAccel; -CLEANUP: +Exit: TRACE("Leave NtUserCreateAcceleratorTable(Entries %p, EntriesCount %u) = %p\n", - Entries, EntriesCount, _ret_); + Entries, EntriesCount, Ret); UserLeave(); - END_CLEANUP; + return Ret; } BOOLEAN @@ -345,7 +341,7 @@ NtUserDestroyAcceleratorTable( HACCEL hAccel) { PACCELERATOR_TABLE Accel; - DECLARE_RETURN(BOOLEAN); + BOOLEAN Ret = FALSE; /* FIXME: If the handle table is from a call to LoadAcceleratorTable, decrement it's usage count (and return TRUE). @@ -355,19 +351,15 @@ NtUserDestroyAcceleratorTable( TRACE("NtUserDestroyAcceleratorTable(Table %p)\n", hAccel); UserEnterExclusive(); - if (!(Accel = UserGetAccelObject(hAccel))) + Accel = UserGetAccelObject(hAccel); + if (Accel) { - RETURN( FALSE); + Ret = UserDestroyAccelTable(Accel); } - UserDestroyAccelTable(Accel); - - RETURN( TRUE); - -CLEANUP: - TRACE("Leave NtUserDestroyAcceleratorTable(Table %p) = %u\n", hAccel, _ret_); + TRACE("Leave NtUserDestroyAcceleratorTable(Table %p) = %u\n", hAccel, Ret); UserLeave(); - END_CLEANUP; + return Ret; } int @@ -382,7 +374,7 @@ NtUserTranslateAccelerator( ULONG i; MSG Message; USER_REFERENCE_ENTRY AccelRef, WindowRef; - DECLARE_RETURN(int); + int Ret = 0; TRACE("NtUserTranslateAccelerator(hWnd %p, hAccel %p, Message %p)\n", hWnd, hAccel, pUnsafeMessage); @@ -390,7 +382,7 @@ NtUserTranslateAccelerator( if (hWnd == NULL) { - RETURN( 0); + goto Cleanup; } _SEH2_TRY @@ -401,7 +393,7 @@ NtUserTranslateAccelerator( _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { SetLastNtError(_SEH2_GetExceptionCode()); - _SEH2_YIELD(RETURN( 0)); + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -410,13 +402,13 @@ NtUserTranslateAccelerator( (Message.message != WM_SYSCHAR) && (Message.message != WM_CHAR)) { - RETURN( 0); + goto Cleanup; } Accel = UserGetAccelObject(hAccel); if (!Accel) { - RETURN( 0); + goto Cleanup; } UserRefObjectCo(Accel, &AccelRef); @@ -424,7 +416,7 @@ NtUserTranslateAccelerator( Window = UserGetWindowObject(hWnd); if (!Window) { - RETURN( 0); + goto Cleanup; } UserRefObjectCo(Window, &WindowRef); @@ -435,7 +427,8 @@ NtUserTranslateAccelerator( { if (co_IntTranslateAccelerator(Window, &Message, &Accel->Table[i])) { - RETURN( 1); + Ret = 1; + break; } /* Undocumented feature... */ @@ -443,13 +436,11 @@ NtUserTranslateAccelerator( break; } - RETURN( 0); - -CLEANUP: +Cleanup: if (Window) UserDerefObjectCo(Window); if (Accel) UserDerefObjectCo(Accel); - TRACE("NtUserTranslateAccelerator returns %d\n", _ret_); + TRACE("NtUserTranslateAccelerator returns %d\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; }

10 months

[reactos] 01/01: [DC21X4] Fix minor issues (#6161)

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bbe6b0761296eaa518984… commit bbe6b0761296eaa518984332b19dda70e8d2d3ed Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Sun Dec 17 15:00:25 2023 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 17 12:00:25 2023 +0300 [DC21X4] Fix minor issues (#6161) - The return value got lost when refactoring the setup function - The check against 0xFFFFFFFF was meant to reject an empty EEPROM image - Add missing PAGED_CODE(); macros CORE-8724 --- drivers/network/dd/dc21x4/eeprom.c | 6 +++++- drivers/network/dd/dc21x4/power.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/network/dd/dc21x4/eeprom.c b/drivers/network/dd/dc21x4/eeprom.c index 6937a5723df..fed1cb160f3 100644 --- a/drivers/network/dd/dc21x4/eeprom.c +++ b/drivers/network/dd/dc21x4/eeprom.c @@ -859,6 +859,8 @@ AddressRomChecksumValid( ULONG64 TestPatterm; ULONG Checksum, i; + PAGED_CODE(); + NdisMoveMemory(&TestPatterm, &Octet[24], 8); if (TestPatterm != EAR_TEST_PATTERN) return FALSE; @@ -886,6 +888,8 @@ SRomReadMacAddress( { ULONG MacOffset; + PAGED_CODE(); + /* Check if we have a board with an old EAR format */ if (NdisEqualMemory(SRom, &SRom[16], 8)) { @@ -912,7 +916,7 @@ SRomReadMacAddress( } /* Sanity check */ - if (*(PULONG)SRom == 0xFFFFFFF || *(PULONG)SRom == 0) + if (*(PULONG)SRom == 0xFFFFFFFF || *(PULONG)SRom == 0) return FALSE; WARN("Legacy/unknown board found\n"); diff --git a/drivers/network/dd/dc21x4/power.c b/drivers/network/dd/dc21x4/power.c index 38ea470724a..30d994a9615 100644 --- a/drivers/network/dd/dc21x4/power.c +++ b/drivers/network/dd/dc21x4/power.c @@ -146,7 +146,7 @@ DcPowerUp( /* Re-initialize the chip to leave D3 state */ if (Adapter->PrevPowerState == NdisDeviceStateD3) { - NT_VERIFY(DcSetupAdapter(Adapter) == TRUE); + NT_VERIFY(DcSetupAdapter(Adapter) == NDIS_STATUS_SUCCESS); } else {

10 months

[reactos] 01/01: [BASESRV][CSRLIB][NTVDM] Add missing \n to DPRINT() calls (#5951)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7d612f3e3148ff6b1dd6… commit f7d612f3e3148ff6b1dd62cfa5d262ac2cb5c92e Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Dec 16 23:57:35 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 16 23:57:35 2023 +0100 [BASESRV][CSRLIB][NTVDM] Add missing \n to DPRINT() calls (#5951) and promote 1 DPRINT(). --- subsystems/csr/csrlib/connect.c | 4 ++-- subsystems/mvdm/ntvdm/bios/bios32/vbe.c | 2 +- subsystems/mvdm/ntvdm/bios/rom.c | 4 ++-- subsystems/mvdm/ntvdm/vddsup.c | 3 +-- subsystems/win/basesrv/vdm.c | 3 +-- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/subsystems/csr/csrlib/connect.c b/subsystems/csr/csrlib/connect.c index 5b7c84c3e13..1d6a9165b24 100644 --- a/subsystems/csr/csrlib/connect.c +++ b/subsystems/csr/csrlib/connect.c @@ -63,7 +63,7 @@ CsrpConnectToServer( sizeof(CSR_PORT_NAME); if (PortNameLength > UNICODE_STRING_MAX_BYTES) { - DPRINT1("PortNameLength too big: %Iu", PortNameLength); + DPRINT1("PortNameLength too big: %Iu\n", PortNameLength); return STATUS_NAME_TOO_LONG; } @@ -374,7 +374,7 @@ CsrClientCallServer( /* Make sure the length is valid */ if (DataLength > (MAXSHORT - sizeof(CSR_API_MESSAGE))) { - DPRINT1("DataLength too big: %lu", DataLength); + DPRINT1("DataLength too big: %lu\n", DataLength); return STATUS_INVALID_PARAMETER; } diff --git a/subsystems/mvdm/ntvdm/bios/bios32/vbe.c b/subsystems/mvdm/ntvdm/bios/bios32/vbe.c index f7399709017..a58c0a1124a 100644 --- a/subsystems/mvdm/ntvdm/bios/bios32/vbe.c +++ b/subsystems/mvdm/ntvdm/bios/bios32/vbe.c @@ -646,7 +646,7 @@ VOID WINAPI VbeService(LPWORD Stack) default: { - DPRINT("VESA INT 0x10, AL = 0x05, Unknown subfunction: %02X", getBH()); + DPRINT1("VESA INT 0x10, AL = 0x05, Unknown subfunction: 0x%02X\n", getBH()); } } diff --git a/subsystems/mvdm/ntvdm/bios/rom.c b/subsystems/mvdm/ntvdm/bios/rom.c index 6fbf272d142..83214858543 100644 --- a/subsystems/mvdm/ntvdm/bios/rom.c +++ b/subsystems/mvdm/ntvdm/bios/rom.c @@ -49,7 +49,7 @@ OpenRomFile(IN PCSTR RomFileName, if (ulRomSize > 0x40000) { /* We failed, bail out */ - DPRINT1("ROM image size 0x%lx too large, expected at most 0x40000 (256kB)", ulRomSize); + DPRINT1("ROM image size 0x%lx too large, expected at most 0x40000 (256kB)\n", ulRomSize); FileClose(hRomFile); return NULL; } @@ -72,7 +72,7 @@ LoadRomFileByHandle(IN HANDLE RomFileHandle, */ if (RomSize > 0x40000) { - DPRINT1("ROM image size 0x%lx too large, expected at most 0x40000 (256kB)", RomSize); + DPRINT1("ROM image size 0x%lx too large, expected at most 0x40000 (256kB)\n", RomSize); return FALSE; } diff --git a/subsystems/mvdm/ntvdm/vddsup.c b/subsystems/mvdm/ntvdm/vddsup.c index accc241ff2e..6b9526cadf7 100644 --- a/subsystems/mvdm/ntvdm/vddsup.c +++ b/subsystems/mvdm/ntvdm/vddsup.c @@ -341,7 +341,7 @@ static BOOL LoadInstallableVDD(VOID) VDDValueName = VDDList; while (*VDDList) { - DPRINT1("Loading VDD '%S'...", VDDList); + DPRINT1("Loading VDD '%S'... ", VDDList); hVDD = LoadLibraryW(VDDList); if (hVDD == NULL) { @@ -503,7 +503,6 @@ VOID VDDResumeUserHook(VOID) } - VOID VDDSupInitialize(VOID) { /* Register the 3rd-party VDD BOP Handler */ diff --git a/subsystems/win/basesrv/vdm.c b/subsystems/win/basesrv/vdm.c index ca9c33e7e7e..fce165c72da 100644 --- a/subsystems/win/basesrv/vdm.c +++ b/subsystems/win/basesrv/vdm.c @@ -89,7 +89,6 @@ VOID BaseSrvDestroyConsoleRecord(PVDM_CONSOLE_RECORD ConsoleRecord) /* Remove the console record */ // RemoveEntryList(&ConsoleRecord->Entry); RtlFreeHeap(BaseSrvHeap, 0, ConsoleRecord); - } NTSTATUS GetConsoleRecordBySessionId(ULONG TaskId, PVDM_CONSOLE_RECORD *Record) @@ -904,7 +903,7 @@ CSR_API(BaseSrvUpdateVDMEntry) case VdmEntryUpdateControlCHandler: { // TODO: NOT IMPLEMENTED - DPRINT1("BaseSrvUpdateVDMEntry: VdmEntryUpdateControlCHandler not implemented!"); + DPRINT1("BaseSrvUpdateVDMEntry: VdmEntryUpdateControlCHandler not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break;

10 months

[reactos] 01/01: [USETUP] Shorten the Portuguese translation to fit on one line (#6174)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=80751952bacfa2c452405… commit 80751952bacfa2c452405baff8506dbc1d3f167f Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Sat Dec 16 20:58:08 2023 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 16 20:58:08 2023 +0000 [USETUP] Shorten the Portuguese translation to fit on one line (#6174) --- base/setup/usetup/lang/pt-PT.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index 9983f682c8b..6d504d37a62 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -1432,7 +1432,7 @@ static MUI_ENTRY ptPTBootLoaderSelectPageEntries[] = { 6, 8, - "Por favor seleccione onde o instalador dever\240 instalar o gestor de arranque:", + "Por favor seleccione a unidade onde instalar o gestor de arranque:", TEXT_STYLE_NORMAL, TEXT_ID_STATIC },

10 months

[reactos] 01/01: [BROWSEUI] Fix item deletion in CExplorerBand::OnTreeItemDeleted().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=231ac99414f3cc3f7cd36… commit 231ac99414f3cc3f7cd36fa084463ae781895eb5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Dec 16 15:25:52 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 16 15:25:52 2023 +0100 [BROWSEUI] Fix item deletion in CExplorerBand::OnTreeItemDeleted(). Addendum to commit 1b634b38e (r73706) CORE-10838 The TVN_DELETEITEM notification sends the info about the item to be deleted in the itemOld member of the NMTREEVIEW structure, and not in the itemNew one! --- dll/win32/browseui/explorerband.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/browseui/explorerband.cpp b/dll/win32/browseui/explorerband.cpp index 5c90d5d9dd7..18ea0c2fe77 100644 --- a/dll/win32/browseui/explorerband.cpp +++ b/dll/win32/browseui/explorerband.cpp @@ -347,7 +347,7 @@ BOOL CExplorerBand::OnTreeItemExpanding(LPNMTREEVIEW pnmtv) BOOL CExplorerBand::OnTreeItemDeleted(LPNMTREEVIEW pnmtv) { /* Destroy memory associated to our node */ - NodeInfo* ptr = GetNodeInfo(pnmtv->itemNew.hItem); + NodeInfo* ptr = GetNodeInfo(pnmtv->itemOld.hItem); if (ptr) { ILFree(ptr->relativePidl);

10 months, 1 week

[reactos] 05/05: [NDK] Sync KUSER_SHARED_DATA with XDK

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=835438f614511829483d4… commit 835438f614511829483d4d3fd3ad13988dc31791 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Dec 3 10:41:56 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Dec 16 14:04:36 2023 +0200 [NDK] Sync KUSER_SHARED_DATA with XDK --- sdk/include/ndk/ketypes.h | 172 ++++++++++++++++++++++++++++++---------------- sdk/include/xdk/ketypes.h | 4 ++ 2 files changed, 116 insertions(+), 60 deletions(-) diff --git a/sdk/include/ndk/ketypes.h b/sdk/include/ndk/ketypes.h index 3ad526c733c..a3a24f86768 100644 --- a/sdk/include/ndk/ketypes.h +++ b/sdk/include/ndk/ketypes.h @@ -561,76 +561,128 @@ typedef struct _XSTATE_CONFIGURATION // // Shared Kernel User Data +// Keep in sync with sdk/include/xdk/ketypes.h // typedef struct _KUSER_SHARED_DATA { - ULONG TickCountLowDeprecated; - ULONG TickCountMultiplier; - volatile KSYSTEM_TIME InterruptTime; - volatile KSYSTEM_TIME SystemTime; - volatile KSYSTEM_TIME TimeZoneBias; - USHORT ImageNumberLow; - USHORT ImageNumberHigh; - WCHAR NtSystemRoot[260]; - ULONG MaxStackTraceDepth; - ULONG CryptoExponent; - ULONG TimeZoneId; - ULONG LargePageMinimum; - ULONG Reserved2[7]; - NT_PRODUCT_TYPE NtProductType; - BOOLEAN ProductTypeIsValid; - ULONG NtMajorVersion; - ULONG NtMinorVersion; - BOOLEAN ProcessorFeatures[PROCESSOR_FEATURE_MAX]; - ULONG Reserved1; - ULONG Reserved3; - volatile ULONG TimeSlip; - ALTERNATIVE_ARCHITECTURE_TYPE AlternativeArchitecture; - LARGE_INTEGER SystemExpirationDate; - ULONG SuiteMask; - BOOLEAN KdDebuggerEnabled; + ULONG TickCountLowDeprecated; // 0x0 + ULONG TickCountMultiplier; // 0x4 + volatile KSYSTEM_TIME InterruptTime; // 0x8 + volatile KSYSTEM_TIME SystemTime; // 0x14 + volatile KSYSTEM_TIME TimeZoneBias; // 0x20 + USHORT ImageNumberLow; // 0x2c + USHORT ImageNumberHigh; // 0x2e + WCHAR NtSystemRoot[260]; // 0x30 + ULONG MaxStackTraceDepth; // 0x238 + ULONG CryptoExponent; // 0x23c + ULONG TimeZoneId; // 0x240 + ULONG LargePageMinimum; // 0x244 + ULONG Reserved2[7]; // 0x248 + NT_PRODUCT_TYPE NtProductType; // 0x264 + BOOLEAN ProductTypeIsValid; // 0x268 + ULONG NtMajorVersion; // 0x26c + ULONG NtMinorVersion; // 0x270 + BOOLEAN ProcessorFeatures[PROCESSOR_FEATURE_MAX]; // 0x274 + ULONG Reserved1; // 0x2b4 + ULONG Reserved3; // 0x2b8 + volatile ULONG TimeSlip; // 0x2bc + ALTERNATIVE_ARCHITECTURE_TYPE AlternativeArchitecture; // 0x2c0 + ULONG AltArchitecturePad[1]; // 0x2c4 + LARGE_INTEGER SystemExpirationDate; // 0x2c8 + ULONG SuiteMask; // 0x2d0 + BOOLEAN KdDebuggerEnabled; // 0x2d4 #if (NTDDI_VERSION >= NTDDI_WINXPSP2) - UCHAR NXSupportPolicy; -#endif - volatile ULONG ActiveConsoleId; - volatile ULONG DismountCount; - ULONG ComPlusPackage; - ULONG LastSystemRITEventTickCount; - ULONG NumberOfPhysicalPages; - BOOLEAN SafeBootMode; + UCHAR NXSupportPolicy; // 0x2d5 +#endif + volatile ULONG ActiveConsoleId; // 0x2d8 + volatile ULONG DismountCount; // 0x2dc + ULONG ComPlusPackage; // 0x2e0 + ULONG LastSystemRITEventTickCount; // 0x2e4 + ULONG NumberOfPhysicalPages; // 0x2e8 + BOOLEAN SafeBootMode; // 0x2ec +#if (NTDDI_VERSION >= NTDDI_WIN7) + union + { + UCHAR TscQpcData; // 0x2ed + struct + { + UCHAR TscQpcEnabled:1; // 0x2ed + UCHAR TscQpcSpareFlag:1; // 0x2ed + UCHAR TscQpcShift:6; // 0x2ed + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + UCHAR TscQpcPad[2]; // 0x2ee +#endif +#if (NTDDI_VERSION >= NTDDI_VISTA) + union + { + ULONG SharedDataFlags; // 0x2f0 + struct + { + ULONG DbgErrorPortPresent:1; // 0x2f0 + ULONG DbgElevationEnabled:1; // 0x2f0 + ULONG DbgVirtEnabled:1; // 0x2f0 + ULONG DbgInstallerDetectEnabled:1; // 0x2f0 + ULONG DbgSystemDllRelocated:1; // 0x2f0 + ULONG DbgDynProcessorEnabled:1; // 0x2f0 + ULONG DbgSEHValidationEnabled:1; // 0x2f0 + ULONG SpareBits:25; // 0x2f0 + } DUMMYSTRUCTNAME2; + } DUMMYUNIONNAME2; +#else ULONG TraceLogging; - ULONG Fill0; - ULONGLONG TestRetInstruction; - ULONG SystemCall; - ULONG SystemCallReturn; - ULONGLONG SystemCallPad[3]; - union { - volatile KSYSTEM_TIME TickCount; - volatile ULONG64 TickCountQuad; - }; - ULONG Cookie; -#if (NTDDI_VERSION >= NTDDI_WS03) - LONGLONG ConsoleSessionForegroundProcessId; - ULONG Wow64SharedInformation[MAX_WOW64_SHARED_ENTRIES]; #endif -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - USHORT UserModeGlobalLogger[8]; - ULONG HeapTracingPid[2]; - ULONG CritSecTracingPid[2]; + ULONG DataFlagsPad[1]; // 0x2f4 + ULONGLONG TestRetInstruction; // 0x2f8 + ULONG SystemCall; // 0x300 + ULONG SystemCallReturn; // 0x304 + ULONGLONG SystemCallPad[3]; // 0x308 union { - ULONG SharedDataFlags; + volatile KSYSTEM_TIME TickCount; // 0x320 + volatile ULONG64 TickCountQuad; // 0x320 struct { - ULONG DbgErrorPortPresent:1; - ULONG DbgElevationEnabled:1; - ULONG DbgVirtEnabled:1; - ULONG DbgInstallerDetectEnabled:1; - ULONG SpareBits:28; - }; - }; - ULONG ImageFileExecutionOptions; - KAFFINITY ActiveProcessorAffinity; + ULONG ReservedTickCountOverlay[3]; // 0x320 + ULONG TickCountPad[1]; // 0x32c + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME3; + ULONG Cookie; // 0x330 +#if (NTDDI_VERSION >= NTDDI_VISTA) + ULONG CookiePad[1]; // 0x334 + LONGLONG ConsoleSessionForegroundProcessId; // 0x338 +#endif +#if (NTDDI_VERSION >= NTDDI_WS03) + ULONG Wow64SharedInformation[MAX_WOW64_SHARED_ENTRIES]; // 2K3: 0x334 / Vista+: 0x340 +#endif +#if (NTDDI_VERSION >= NTDDI_VISTA) +#if (NTDDI_VERSION >= NTDDI_WIN7) + USHORT UserModeGlobalLogger[16]; // 0x380 +#else + USHORT UserModeGlobalLogger[8]; // 0x380 + ULONG HeapTracingPid[2]; // 0x390 + ULONG CritSecTracingPid[2]; // 0x398 +#endif + ULONG ImageFileExecutionOptions; // 0x3a0 +#if (NTDDI_VERSION >= NTDDI_VISTASP1) + ULONG LangGenerationCount; // 0x3a4 +#else + /* 4 bytes padding */ +#endif + ULONGLONG Reserved5; // 0x3a8 + volatile ULONG64 InterruptTimeBias; // 0x3b0 +#endif // NTDDI_VERSION >= NTDDI_VISTA +#if (NTDDI_VERSION >= NTDDI_WIN7) + volatile ULONG64 TscQpcBias; // 0x3b8 + volatile ULONG ActiveProcessorCount; // 0x3c0 + volatile USHORT ActiveGroupCount; // 0x3c4 + USHORT Reserved4; // 0x3c6 + volatile ULONG AitSamplingValue; // 0x3c8 + volatile ULONG AppCompatFlag; // 0x3cc + ULONGLONG SystemDllNativeRelocation; // 0x3d0 + ULONG SystemDllWowRelocation; // 0x3d8 + ULONG XStatePad[1]; // 0x3dc + XSTATE_CONFIGURATION XState; // 0x3e0 #endif } KUSER_SHARED_DATA, *PKUSER_SHARED_DATA; diff --git a/sdk/include/xdk/ketypes.h b/sdk/include/xdk/ketypes.h index 921a24f989f..e6ae528d1d2 100644 --- a/sdk/include/xdk/ketypes.h +++ b/sdk/include/xdk/ketypes.h @@ -1263,6 +1263,10 @@ typedef struct _XSTATE_CONFIGURATION #define NX_SUPPORT_POLICY_OPTOUT 3 #endif +// +// Shared Kernel User Data +// Keep in sync with sdk/include/ndk/ketypes.h +// typedef struct _KUSER_SHARED_DATA { ULONG TickCountLowDeprecated; // 0x0

10 months, 1 week

[reactos] 04/05: [XDK] Add offsets to KUSER_SHARED_DATA and improve structure

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f0e98ea3ca170bb6b28c… commit 5f0e98ea3ca170bb6b28ca2651f0fc0c4c8d3d16 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Dec 3 12:03:04 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Dec 16 14:04:36 2023 +0200 [XDK] Add offsets to KUSER_SHARED_DATA and improve structure Offsets taken from vergiliusproject.com. --- sdk/include/xdk/ketypes.h | 158 +++++++++++++++++++++++----------------------- 1 file changed, 80 insertions(+), 78 deletions(-) diff --git a/sdk/include/xdk/ketypes.h b/sdk/include/xdk/ketypes.h index 57ae6b8e455..921a24f989f 100644 --- a/sdk/include/xdk/ketypes.h +++ b/sdk/include/xdk/ketypes.h @@ -1265,122 +1265,124 @@ typedef struct _XSTATE_CONFIGURATION typedef struct _KUSER_SHARED_DATA { - ULONG TickCountLowDeprecated; - ULONG TickCountMultiplier; - volatile KSYSTEM_TIME InterruptTime; - volatile KSYSTEM_TIME SystemTime; - volatile KSYSTEM_TIME TimeZoneBias; - USHORT ImageNumberLow; - USHORT ImageNumberHigh; - WCHAR NtSystemRoot[260]; - ULONG MaxStackTraceDepth; - ULONG CryptoExponent; - ULONG TimeZoneId; - ULONG LargePageMinimum; - ULONG Reserved2[7]; - NT_PRODUCT_TYPE NtProductType; - BOOLEAN ProductTypeIsValid; - ULONG NtMajorVersion; - ULONG NtMinorVersion; - BOOLEAN ProcessorFeatures[PROCESSOR_FEATURE_MAX]; - ULONG Reserved1; - ULONG Reserved3; - volatile ULONG TimeSlip; - ALTERNATIVE_ARCHITECTURE_TYPE AlternativeArchitecture; - ULONG AltArchitecturePad[1]; - LARGE_INTEGER SystemExpirationDate; - ULONG SuiteMask; - BOOLEAN KdDebuggerEnabled; + ULONG TickCountLowDeprecated; // 0x0 + ULONG TickCountMultiplier; // 0x4 + volatile KSYSTEM_TIME InterruptTime; // 0x8 + volatile KSYSTEM_TIME SystemTime; // 0x14 + volatile KSYSTEM_TIME TimeZoneBias; // 0x20 + USHORT ImageNumberLow; // 0x2c + USHORT ImageNumberHigh; // 0x2e + WCHAR NtSystemRoot[260]; // 0x30 + ULONG MaxStackTraceDepth; // 0x238 + ULONG CryptoExponent; // 0x23c + ULONG TimeZoneId; // 0x240 + ULONG LargePageMinimum; // 0x244 + ULONG Reserved2[7]; // 0x248 + NT_PRODUCT_TYPE NtProductType; // 0x264 + BOOLEAN ProductTypeIsValid; // 0x268 + ULONG NtMajorVersion; // 0x26c + ULONG NtMinorVersion; // 0x270 + BOOLEAN ProcessorFeatures[PROCESSOR_FEATURE_MAX]; // 0x274 + ULONG Reserved1; // 0x2b4 + ULONG Reserved3; // 0x2b8 + volatile ULONG TimeSlip; // 0x2bc + ALTERNATIVE_ARCHITECTURE_TYPE AlternativeArchitecture; // 0x2c0 + ULONG AltArchitecturePad[1]; // 0x2c4 + LARGE_INTEGER SystemExpirationDate; // 0x2c8 + ULONG SuiteMask; // 0x2d0 + BOOLEAN KdDebuggerEnabled; // 0x2d4 #if (NTDDI_VERSION >= NTDDI_WINXPSP2) - UCHAR NXSupportPolicy; + UCHAR NXSupportPolicy; // 0x2d5 #endif - volatile ULONG ActiveConsoleId; - volatile ULONG DismountCount; - ULONG ComPlusPackage; - ULONG LastSystemRITEventTickCount; - ULONG NumberOfPhysicalPages; - BOOLEAN SafeBootMode; + volatile ULONG ActiveConsoleId; // 0x2d8 + volatile ULONG DismountCount; // 0x2dc + ULONG ComPlusPackage; // 0x2e0 + ULONG LastSystemRITEventTickCount; // 0x2e4 + ULONG NumberOfPhysicalPages; // 0x2e8 + BOOLEAN SafeBootMode; // 0x2ec #if (NTDDI_VERSION >= NTDDI_WIN7) union { - UCHAR TscQpcData; + UCHAR TscQpcData; // 0x2ed struct { - UCHAR TscQpcEnabled:1; - UCHAR TscQpcSpareFlag:1; - UCHAR TscQpcShift:6; + UCHAR TscQpcEnabled:1; // 0x2ed + UCHAR TscQpcSpareFlag:1; // 0x2ed + UCHAR TscQpcShift:6; // 0x2ed } DUMMYSTRUCTNAME; } DUMMYUNIONNAME; - UCHAR TscQpcPad[2]; + UCHAR TscQpcPad[2]; // 0x2ee #endif #if (NTDDI_VERSION >= NTDDI_VISTA) union { - ULONG SharedDataFlags; + ULONG SharedDataFlags; // 0x2f0 struct { - ULONG DbgErrorPortPresent:1; - ULONG DbgElevationEnabled:1; - ULONG DbgVirtEnabled:1; - ULONG DbgInstallerDetectEnabled:1; - ULONG DbgSystemDllRelocated:1; - ULONG DbgDynProcessorEnabled:1; - ULONG DbgSEHValidationEnabled:1; - ULONG SpareBits:25; + ULONG DbgErrorPortPresent:1; // 0x2f0 + ULONG DbgElevationEnabled:1; // 0x2f0 + ULONG DbgVirtEnabled:1; // 0x2f0 + ULONG DbgInstallerDetectEnabled:1; // 0x2f0 + ULONG DbgSystemDllRelocated:1; // 0x2f0 + ULONG DbgDynProcessorEnabled:1; // 0x2f0 + ULONG DbgSEHValidationEnabled:1; // 0x2f0 + ULONG SpareBits:25; // 0x2f0 } DUMMYSTRUCTNAME2; } DUMMYUNIONNAME2; #else ULONG TraceLogging; #endif - ULONG DataFlagsPad[1]; - ULONGLONG TestRetInstruction; - ULONG SystemCall; - ULONG SystemCallReturn; - ULONGLONG SystemCallPad[3]; + ULONG DataFlagsPad[1]; // 0x2f4 + ULONGLONG TestRetInstruction; // 0x2f8 + ULONG SystemCall; // 0x300 + ULONG SystemCallReturn; // 0x304 + ULONGLONG SystemCallPad[3]; // 0x308 union { - volatile KSYSTEM_TIME TickCount; - volatile ULONG64 TickCountQuad; + volatile KSYSTEM_TIME TickCount; // 0x320 + volatile ULONG64 TickCountQuad; // 0x320 struct { - ULONG ReservedTickCountOverlay[3]; - ULONG TickCountPad[1]; + ULONG ReservedTickCountOverlay[3]; // 0x320 + ULONG TickCountPad[1]; // 0x32c } DUMMYSTRUCTNAME; } DUMMYUNIONNAME3; - ULONG Cookie; - ULONG CookiePad[1]; + ULONG Cookie; // 0x330 +#if (NTDDI_VERSION >= NTDDI_VISTA) + ULONG CookiePad[1]; // 0x334 + LONGLONG ConsoleSessionForegroundProcessId; // 0x338 +#endif #if (NTDDI_VERSION >= NTDDI_WS03) - LONGLONG ConsoleSessionForegroundProcessId; - ULONG Wow64SharedInformation[MAX_WOW64_SHARED_ENTRIES]; + ULONG Wow64SharedInformation[MAX_WOW64_SHARED_ENTRIES]; // 2K3: 0x334 / Vista+: 0x340 #endif #if (NTDDI_VERSION >= NTDDI_VISTA) #if (NTDDI_VERSION >= NTDDI_WIN7) - USHORT UserModeGlobalLogger[16]; + USHORT UserModeGlobalLogger[16]; // 0x380 #else - USHORT UserModeGlobalLogger[8]; - ULONG HeapTracingPid[2]; - ULONG CritSecTracingPid[2]; + USHORT UserModeGlobalLogger[8]; // 0x380 + ULONG HeapTracingPid[2]; // 0x390 + ULONG CritSecTracingPid[2]; // 0x398 #endif - ULONG ImageFileExecutionOptions; + ULONG ImageFileExecutionOptions; // 0x3a0 #if (NTDDI_VERSION >= NTDDI_VISTASP1) - ULONG LangGenerationCount; + ULONG LangGenerationCount; // 0x3a4 #else /* 4 bytes padding */ #endif - ULONGLONG Reserved5; - volatile ULONG64 InterruptTimeBias; + ULONGLONG Reserved5; // 0x3a8 + volatile ULONG64 InterruptTimeBias; // 0x3b0 #endif // NTDDI_VERSION >= NTDDI_VISTA #if (NTDDI_VERSION >= NTDDI_WIN7) - volatile ULONG64 TscQpcBias; - volatile ULONG ActiveProcessorCount; - volatile USHORT ActiveGroupCount; - USHORT Reserved4; - volatile ULONG AitSamplingValue; - volatile ULONG AppCompatFlag; - ULONGLONG SystemDllNativeRelocation; - ULONG SystemDllWowRelocation; - ULONG XStatePad[1]; - XSTATE_CONFIGURATION XState; + volatile ULONG64 TscQpcBias; // 0x3b8 + volatile ULONG ActiveProcessorCount; // 0x3c0 + volatile USHORT ActiveGroupCount; // 0x3c4 + USHORT Reserved4; // 0x3c6 + volatile ULONG AitSamplingValue; // 0x3c8 + volatile ULONG AppCompatFlag; // 0x3cc + ULONGLONG SystemDllNativeRelocation; // 0x3d0 + ULONG SystemDllWowRelocation; // 0x3d8 + ULONG XStatePad[1]; // 0x3dc + XSTATE_CONFIGURATION XState; // 0x3e0 #endif } KUSER_SHARED_DATA, *PKUSER_SHARED_DATA;

10 months, 1 week

[reactos] 03/05: [XDK] Remove obsolete _ANONYMOUS_STRUCT/UNION

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aafe33ca853e3ef2e1c92… commit aafe33ca853e3ef2e1c9293eb3ac22b776b9143a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Dec 3 11:30:53 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Dec 16 14:04:36 2023 +0200 [XDK] Remove obsolete _ANONYMOUS_STRUCT/UNION --- sdk/include/xdk/ketypes.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/include/xdk/ketypes.h b/sdk/include/xdk/ketypes.h index 20b8bd50d74..57ae6b8e455 100644 --- a/sdk/include/xdk/ketypes.h +++ b/sdk/include/xdk/ketypes.h @@ -1301,10 +1301,10 @@ typedef struct _KUSER_SHARED_DATA ULONG NumberOfPhysicalPages; BOOLEAN SafeBootMode; #if (NTDDI_VERSION >= NTDDI_WIN7) - _ANONYMOUS_UNION union + union { UCHAR TscQpcData; - _ANONYMOUS_STRUCT struct + struct { UCHAR TscQpcEnabled:1; UCHAR TscQpcSpareFlag:1; @@ -1314,10 +1314,10 @@ typedef struct _KUSER_SHARED_DATA UCHAR TscQpcPad[2]; #endif #if (NTDDI_VERSION >= NTDDI_VISTA) - _ANONYMOUS_UNION union + union { ULONG SharedDataFlags; - _ANONYMOUS_STRUCT struct + struct { ULONG DbgErrorPortPresent:1; ULONG DbgElevationEnabled:1; @@ -1337,11 +1337,11 @@ typedef struct _KUSER_SHARED_DATA ULONG SystemCall; ULONG SystemCallReturn; ULONGLONG SystemCallPad[3]; - _ANONYMOUS_UNION union + union { volatile KSYSTEM_TIME TickCount; volatile ULONG64 TickCountQuad; - _ANONYMOUS_STRUCT struct + struct { ULONG ReservedTickCountOverlay[3]; ULONG TickCountPad[1];

10 months, 1 week

[reactos] 02/05: [XDK] Apply standard formatting to KUSER_SHARED_DATA

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f42e9029f750d70fe28b0… commit f42e9029f750d70fe28b0d97afa8b338d369dd7c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Dec 3 11:28:11 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Dec 16 14:04:36 2023 +0200 [XDK] Apply standard formatting to KUSER_SHARED_DATA --- sdk/include/xdk/ketypes.h | 193 ++++++++++++++++++++++++---------------------- 1 file changed, 100 insertions(+), 93 deletions(-) diff --git a/sdk/include/xdk/ketypes.h b/sdk/include/xdk/ketypes.h index dae1cec4f98..20b8bd50d74 100644 --- a/sdk/include/xdk/ketypes.h +++ b/sdk/include/xdk/ketypes.h @@ -1263,117 +1263,124 @@ typedef struct _XSTATE_CONFIGURATION #define NX_SUPPORT_POLICY_OPTOUT 3 #endif -typedef struct _KUSER_SHARED_DATA { - ULONG TickCountLowDeprecated; - ULONG TickCountMultiplier; - volatile KSYSTEM_TIME InterruptTime; - volatile KSYSTEM_TIME SystemTime; - volatile KSYSTEM_TIME TimeZoneBias; - USHORT ImageNumberLow; - USHORT ImageNumberHigh; - WCHAR NtSystemRoot[260]; - ULONG MaxStackTraceDepth; - ULONG CryptoExponent; - ULONG TimeZoneId; - ULONG LargePageMinimum; - ULONG Reserved2[7]; - NT_PRODUCT_TYPE NtProductType; - BOOLEAN ProductTypeIsValid; - ULONG NtMajorVersion; - ULONG NtMinorVersion; - BOOLEAN ProcessorFeatures[PROCESSOR_FEATURE_MAX]; - ULONG Reserved1; - ULONG Reserved3; - volatile ULONG TimeSlip; - ALTERNATIVE_ARCHITECTURE_TYPE AlternativeArchitecture; - ULONG AltArchitecturePad[1]; - LARGE_INTEGER SystemExpirationDate; - ULONG SuiteMask; - BOOLEAN KdDebuggerEnabled; +typedef struct _KUSER_SHARED_DATA +{ + ULONG TickCountLowDeprecated; + ULONG TickCountMultiplier; + volatile KSYSTEM_TIME InterruptTime; + volatile KSYSTEM_TIME SystemTime; + volatile KSYSTEM_TIME TimeZoneBias; + USHORT ImageNumberLow; + USHORT ImageNumberHigh; + WCHAR NtSystemRoot[260]; + ULONG MaxStackTraceDepth; + ULONG CryptoExponent; + ULONG TimeZoneId; + ULONG LargePageMinimum; + ULONG Reserved2[7]; + NT_PRODUCT_TYPE NtProductType; + BOOLEAN ProductTypeIsValid; + ULONG NtMajorVersion; + ULONG NtMinorVersion; + BOOLEAN ProcessorFeatures[PROCESSOR_FEATURE_MAX]; + ULONG Reserved1; + ULONG Reserved3; + volatile ULONG TimeSlip; + ALTERNATIVE_ARCHITECTURE_TYPE AlternativeArchitecture; + ULONG AltArchitecturePad[1]; + LARGE_INTEGER SystemExpirationDate; + ULONG SuiteMask; + BOOLEAN KdDebuggerEnabled; #if (NTDDI_VERSION >= NTDDI_WINXPSP2) - UCHAR NXSupportPolicy; + UCHAR NXSupportPolicy; #endif - volatile ULONG ActiveConsoleId; - volatile ULONG DismountCount; - ULONG ComPlusPackage; - ULONG LastSystemRITEventTickCount; - ULONG NumberOfPhysicalPages; - BOOLEAN SafeBootMode; + volatile ULONG ActiveConsoleId; + volatile ULONG DismountCount; + ULONG ComPlusPackage; + ULONG LastSystemRITEventTickCount; + ULONG NumberOfPhysicalPages; + BOOLEAN SafeBootMode; #if (NTDDI_VERSION >= NTDDI_WIN7) - _ANONYMOUS_UNION union { - UCHAR TscQpcData; - _ANONYMOUS_STRUCT struct { - UCHAR TscQpcEnabled:1; - UCHAR TscQpcSpareFlag:1; - UCHAR TscQpcShift:6; - } DUMMYSTRUCTNAME; - } DUMMYUNIONNAME; - UCHAR TscQpcPad[2]; + _ANONYMOUS_UNION union + { + UCHAR TscQpcData; + _ANONYMOUS_STRUCT struct + { + UCHAR TscQpcEnabled:1; + UCHAR TscQpcSpareFlag:1; + UCHAR TscQpcShift:6; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + UCHAR TscQpcPad[2]; #endif #if (NTDDI_VERSION >= NTDDI_VISTA) - _ANONYMOUS_UNION union { - ULONG SharedDataFlags; - _ANONYMOUS_STRUCT struct { - ULONG DbgErrorPortPresent:1; - ULONG DbgElevationEnabled:1; - ULONG DbgVirtEnabled:1; - ULONG DbgInstallerDetectEnabled:1; - ULONG DbgSystemDllRelocated:1; - ULONG DbgDynProcessorEnabled:1; - ULONG DbgSEHValidationEnabled:1; - ULONG SpareBits:25; - } DUMMYSTRUCTNAME2; - } DUMMYUNIONNAME2; + _ANONYMOUS_UNION union + { + ULONG SharedDataFlags; + _ANONYMOUS_STRUCT struct + { + ULONG DbgErrorPortPresent:1; + ULONG DbgElevationEnabled:1; + ULONG DbgVirtEnabled:1; + ULONG DbgInstallerDetectEnabled:1; + ULONG DbgSystemDllRelocated:1; + ULONG DbgDynProcessorEnabled:1; + ULONG DbgSEHValidationEnabled:1; + ULONG SpareBits:25; + } DUMMYSTRUCTNAME2; + } DUMMYUNIONNAME2; #else - ULONG TraceLogging; + ULONG TraceLogging; #endif - ULONG DataFlagsPad[1]; - ULONGLONG TestRetInstruction; - ULONG SystemCall; - ULONG SystemCallReturn; - ULONGLONG SystemCallPad[3]; - _ANONYMOUS_UNION union { - volatile KSYSTEM_TIME TickCount; - volatile ULONG64 TickCountQuad; - _ANONYMOUS_STRUCT struct { - ULONG ReservedTickCountOverlay[3]; - ULONG TickCountPad[1]; - } DUMMYSTRUCTNAME; - } DUMMYUNIONNAME3; - ULONG Cookie; - ULONG CookiePad[1]; + ULONG DataFlagsPad[1]; + ULONGLONG TestRetInstruction; + ULONG SystemCall; + ULONG SystemCallReturn; + ULONGLONG SystemCallPad[3]; + _ANONYMOUS_UNION union + { + volatile KSYSTEM_TIME TickCount; + volatile ULONG64 TickCountQuad; + _ANONYMOUS_STRUCT struct + { + ULONG ReservedTickCountOverlay[3]; + ULONG TickCountPad[1]; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME3; + ULONG Cookie; + ULONG CookiePad[1]; #if (NTDDI_VERSION >= NTDDI_WS03) - LONGLONG ConsoleSessionForegroundProcessId; - ULONG Wow64SharedInformation[MAX_WOW64_SHARED_ENTRIES]; + LONGLONG ConsoleSessionForegroundProcessId; + ULONG Wow64SharedInformation[MAX_WOW64_SHARED_ENTRIES]; #endif #if (NTDDI_VERSION >= NTDDI_VISTA) #if (NTDDI_VERSION >= NTDDI_WIN7) - USHORT UserModeGlobalLogger[16]; + USHORT UserModeGlobalLogger[16]; #else - USHORT UserModeGlobalLogger[8]; - ULONG HeapTracingPid[2]; - ULONG CritSecTracingPid[2]; + USHORT UserModeGlobalLogger[8]; + ULONG HeapTracingPid[2]; + ULONG CritSecTracingPid[2]; #endif - ULONG ImageFileExecutionOptions; + ULONG ImageFileExecutionOptions; #if (NTDDI_VERSION >= NTDDI_VISTASP1) - ULONG LangGenerationCount; + ULONG LangGenerationCount; #else /* 4 bytes padding */ #endif - ULONGLONG Reserved5; - volatile ULONG64 InterruptTimeBias; -#endif + ULONGLONG Reserved5; + volatile ULONG64 InterruptTimeBias; +#endif // NTDDI_VERSION >= NTDDI_VISTA #if (NTDDI_VERSION >= NTDDI_WIN7) - volatile ULONG64 TscQpcBias; - volatile ULONG ActiveProcessorCount; - volatile USHORT ActiveGroupCount; - USHORT Reserved4; - volatile ULONG AitSamplingValue; - volatile ULONG AppCompatFlag; - ULONGLONG SystemDllNativeRelocation; - ULONG SystemDllWowRelocation; - ULONG XStatePad[1]; - XSTATE_CONFIGURATION XState; + volatile ULONG64 TscQpcBias; + volatile ULONG ActiveProcessorCount; + volatile USHORT ActiveGroupCount; + USHORT Reserved4; + volatile ULONG AitSamplingValue; + volatile ULONG AppCompatFlag; + ULONGLONG SystemDllNativeRelocation; + ULONG SystemDllWowRelocation; + ULONG XStatePad[1]; + XSTATE_CONFIGURATION XState; #endif } KUSER_SHARED_DATA, *PKUSER_SHARED_DATA;

10 months, 1 week

[reactos] 01/05: [XDK][NDK] Update XSTATE definitions

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=766a093f70d55af2ee455… commit 766a093f70d55af2ee455d6d812658bcd5a69cce Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Nov 14 16:42:08 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Dec 16 14:04:36 2023 +0200 [XDK][NDK] Update XSTATE definitions --- sdk/include/ndk/ketypes.h | 41 +++++++++++++++++ sdk/include/xdk/ketypes.h | 109 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 145 insertions(+), 5 deletions(-) diff --git a/sdk/include/ndk/ketypes.h b/sdk/include/ndk/ketypes.h index 37627fc39a4..3ad526c733c 100644 --- a/sdk/include/ndk/ketypes.h +++ b/sdk/include/ndk/ketypes.h @@ -518,6 +518,47 @@ typedef struct _KSYSTEM_TIME LONG High2Time; } KSYSTEM_TIME, *PKSYSTEM_TIME; +#define MAXIMUM_XSTATE_FEATURES 64 + +typedef struct _XSTATE_FEATURE +{ + ULONG Offset; + ULONG Size; +} XSTATE_FEATURE, *PXSTATE_FEATURE; + +typedef struct _XSTATE_CONFIGURATION +{ + ULONG64 EnabledFeatures; +#if (NTDDI_VERSION >= NTDDI_WINBLUE) + ULONG64 EnabledVolatileFeatures; +#endif + ULONG Size; + union + { + ULONG ControlFlags; + struct + { + ULONG OptimizedSave:1; + ULONG CompactionEnabled:1; // WIN10+ + }; + }; + XSTATE_FEATURE Features[MAXIMUM_XSTATE_FEATURES]; +#if (NTDDI_VERSION >= NTDDI_WIN10) + ULONG64 EnabledSupervisorFeatures; + ULONG64 AlignedFeatures; + ULONG AllFeatureSize; + ULONG AllFeatures[MAXIMUM_XSTATE_FEATURES]; +#endif +#if (NTDDI_VERSION >= NTDDI_WIN10_RS5) + ULONG64 EnabledUserVisibleSupervisorFeatures; +#endif +#if (NTDDI_VERSION >= NTDDI_WIN11) + ULONG64 ExtendedFeatureDisableFeatures; + ULONG AllNonLargeFeatureSize; + ULONG Spare; +#endif +} XSTATE_CONFIGURATION, *PXSTATE_CONFIGURATION; + // // Shared Kernel User Data // diff --git a/sdk/include/xdk/ketypes.h b/sdk/include/xdk/ketypes.h index f5b3b02f8c9..dae1cec4f98 100644 --- a/sdk/include/xdk/ketypes.h +++ b/sdk/include/xdk/ketypes.h @@ -1132,11 +1132,84 @@ typedef struct _TIMER_SET_COALESCABLE_TIMER_INFO { #define XSTATE_LEGACY_FLOATING_POINT 0 #define XSTATE_LEGACY_SSE 1 #define XSTATE_GSSE 2 +#define XSTATE_AVX XSTATE_GSSE +#define XSTATE_MPX_BNDREGS 3 +#define XSTATE_MPX_BNDCSR 4 +#define XSTATE_AVX512_KMASK 5 +#define XSTATE_AVX512_ZMM_H 6 +#define XSTATE_AVX512_ZMM 7 +#define XSTATE_IPT 8 +#define XSTATE_PASID 10 +#define XSTATE_CET_U 11 +#define XSTATE_CET_S 12 +#define XSTATE_AMX_TILE_CONFIG 17 +#define XSTATE_AMX_TILE_DATA 18 +#define XSTATE_LWP 62 +#define MAXIMUM_XSTATE_FEATURES 64 #define XSTATE_MASK_LEGACY_FLOATING_POINT (1LL << (XSTATE_LEGACY_FLOATING_POINT)) #define XSTATE_MASK_LEGACY_SSE (1LL << (XSTATE_LEGACY_SSE)) #define XSTATE_MASK_LEGACY (XSTATE_MASK_LEGACY_FLOATING_POINT | XSTATE_MASK_LEGACY_SSE) #define XSTATE_MASK_GSSE (1LL << (XSTATE_GSSE)) +#define XSTATE_MASK_AVX XSTATE_MASK_GSSE +#define XSTATE_MASK_MPX ((1LL << (XSTATE_MPX_BNDREGS)) | (1LL << (XSTATE_MPX_BNDCSR))) +#define XSTATE_MASK_AVX512 ((1LL << (XSTATE_AVX512_KMASK)) | (1LL << (XSTATE_AVX512_ZMM_H)) | (1LL << (XSTATE_AVX512_ZMM))) +#define XSTATE_MASK_IPT (1LL << (XSTATE_IPT)) +#define XSTATE_MASK_PASID (1LL << (XSTATE_PASID)) +#define XSTATE_MASK_CET_U (1LL << (XSTATE_CET_U)) +#define XSTATE_MASK_CET_S (1LL << (XSTATE_CET_S)) +#define XSTATE_MASK_AMX_TILE_CONFIG (1LL << (XSTATE_AMX_TILE_CONFIG)) +#define XSTATE_MASK_AMX_TILE_DATA (1LL << (XSTATE_AMX_TILE_DATA)) +#define XSTATE_MASK_LWP (1LL << (XSTATE_LWP)) + +#if defined(_AMD64_) +#define XSTATE_MASK_ALLOWED \ + (XSTATE_MASK_LEGACY | \ + XSTATE_MASK_AVX | \ + XSTATE_MASK_MPX | \ + XSTATE_MASK_AVX512 | \ + XSTATE_MASK_IPT | \ + XSTATE_MASK_PASID | \ + XSTATE_MASK_CET_U | \ + XSTATE_MASK_AMX_TILE_CONFIG | \ + XSTATE_MASK_AMX_TILE_DATA | \ + XSTATE_MASK_LWP) +#elif defined(_X86_) +#define XSTATE_MASK_ALLOWED \ + (XSTATE_MASK_LEGACY | \ + XSTATE_MASK_AVX | \ + XSTATE_MASK_MPX | \ + XSTATE_MASK_AVX512 | \ + XSTATE_MASK_IPT | \ + XSTATE_MASK_CET_U | \ + XSTATE_MASK_LWP) +#endif + +#define XSTATE_MASK_PERSISTENT ((1LL << (XSTATE_MPX_BNDCSR)) | XSTATE_MASK_LWP) +#define XSTATE_MASK_USER_VISIBLE_SUPERVISOR (XSTATE_MASK_CET_U) +#define XSTATE_MASK_LARGE_FEATURES (XSTATE_MASK_AMX_TILE_DATA) + +#if defined(_X86_) +#if !defined(__midl) && !defined(MIDL_PASS) +C_ASSERT((XSTATE_MASK_ALLOWED & XSTATE_MASK_LARGE_FEATURES) == 0); +#endif +#endif + +#define XSTATE_COMPACTION_ENABLE 63 +#define XSTATE_COMPACTION_ENABLE_MASK (1LL << (XSTATE_COMPACTION_ENABLE)) +#define XSTATE_ALIGN_BIT 1 +#define XSTATE_ALIGN_MASK (1LL << (XSTATE_ALIGN_BIT)) + +#define XSTATE_XFD_BIT 2 +#define XSTATE_XFD_MASK (1LL << (XSTATE_XFD_BIT)) + +#define XSTATE_CONTROLFLAG_XSAVEOPT_MASK 1 +#define XSTATE_CONTROLFLAG_XSAVEC_MASK 2 +#define XSTATE_CONTROLFLAG_XFD_MASK 4 +#define XSTATE_CONTROLFLAG_VALID_MASK \ + (XSTATE_CONTROLFLAG_XSAVEOPT_MASK | \ + XSTATE_CONTROLFLAG_XSAVEC_MASK | \ + XSTATE_CONTROLFLAG_XFD_MASK) #define MAXIMUM_XSTATE_FEATURES 64 @@ -1145,11 +1218,37 @@ typedef struct _XSTATE_FEATURE { ULONG Size; } XSTATE_FEATURE, *PXSTATE_FEATURE; -typedef struct _XSTATE_CONFIGURATION { - ULONG64 EnabledFeatures; - ULONG Size; - ULONG OptimizedSave:1; - XSTATE_FEATURE Features[MAXIMUM_XSTATE_FEATURES]; +typedef struct _XSTATE_CONFIGURATION +{ + ULONG64 EnabledFeatures; +#if (NTDDI_VERSION >= NTDDI_WINBLUE) + ULONG64 EnabledVolatileFeatures; +#endif + ULONG Size; + union + { + ULONG ControlFlags; + struct + { + ULONG OptimizedSave:1; + ULONG CompactionEnabled:1; // WIN10+ + }; + }; + XSTATE_FEATURE Features[MAXIMUM_XSTATE_FEATURES]; +#if (NTDDI_VERSION >= NTDDI_WIN10) + ULONG64 EnabledSupervisorFeatures; + ULONG64 AlignedFeatures; + ULONG AllFeatureSize; + ULONG AllFeatures[MAXIMUM_XSTATE_FEATURES]; +#endif +#if (NTDDI_VERSION >= NTDDI_WIN10_RS5) + ULONG64 EnabledUserVisibleSupervisorFeatures; +#endif +#if (NTDDI_VERSION >= NTDDI_WIN11) + ULONG64 ExtendedFeatureDisableFeatures; + ULONG AllNonLargeFeatureSize; + ULONG Spare; +#endif } XSTATE_CONFIGURATION, *PXSTATE_CONFIGURATION; #define MAX_WOW64_SHARED_ENTRIES 16

10 months, 1 week

← Newer
1
...
11
12
13
14
15
16
17
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2023