Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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);

1 year, 9 months

[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

1 year, 9 months

[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;

1 year, 9 months

[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];

1 year, 9 months

[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;

1 year, 9 months

[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

1 year, 9 months

[reactos] 02/02: [MSVCRT] Initialize exception support in DllMain

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a6b6a27b2e39ed47dc4d… commit 1a6b6a27b2e39ed47dc4dff04f104e1b8171a638 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Sep 20 15:42:04 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Dec 16 13:52:15 2023 +0200 [MSVCRT] Initialize exception support in DllMain --- dll/win32/msvcrt/dllmain.c | 3 +++ dll/win32/msvcrt/msvcrt.spec | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dll/win32/msvcrt/dllmain.c b/dll/win32/msvcrt/dllmain.c index d47430db39e..8d556bdb5c0 100644 --- a/dll/win32/msvcrt/dllmain.c +++ b/dll/win32/msvcrt/dllmain.c @@ -30,6 +30,7 @@ extern char** _environ; /* pointer to environment block */ extern char** __initenv; /* pointer to initial environment block */ extern wchar_t** _wenviron; /* pointer to environment block */ extern wchar_t** __winitenv; /* pointer to initial environment block */ +extern void msvcrt_init_exception(void*) DECLSPEC_HIDDEN; /* LIBRARY ENTRY POINT ********************************************************/ @@ -43,6 +44,8 @@ DllMain(PVOID hinstDll, ULONG dwReason, PVOID reserved) TRACE("Process Attach\n"); + msvcrt_init_exception(hinstDll); + if (!crt_process_init()) { ERR("crt_init() failed!\n"); diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index 0cd58fe0fd0..76e7d0b37f3 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -934,7 +934,7 @@ @ stub -version=0x600+ _scwprintf_p_l @ cdecl _searchenv(str str ptr) @ cdecl -version=0x600+ _searchenv_s(str str ptr long) -@ stub -version=0x600+ -arch=i386 _seh_longjmp_unwind4 +@ stdcall -version=0x600+ -arch=i386 _seh_longjmp_unwind4(ptr) @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ stub -arch=i386 _set_SSE2_enable @ stub -version=0x600+ _set_controlfp

1 year, 9 months

[reactos] 01/02: [NTDLL] Initialize keyed event for condition variables

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86f2d4cd4ed5f306aafcc… commit 86f2d4cd4ed5f306aafcce362bdebd63f9283f7b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 12 19:33:46 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Dec 16 13:52:15 2023 +0200 [NTDLL] Initialize keyed event for condition variables --- dll/ntdll/include/ntdllp.h | 5 +++++ dll/ntdll/ldr/ldrinit.c | 5 +++++ dll/ntdll/nt_0600/DllMain.c | 2 ++ dll/win32/kernel32/kernel32.spec | 2 +- sdk/lib/rtl/condvar.c | 2 ++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dll/ntdll/include/ntdllp.h b/dll/ntdll/include/ntdllp.h index 42a164514b0..cb5b6cad02f 100644 --- a/dll/ntdll/include/ntdllp.h +++ b/dll/ntdll/include/ntdllp.h @@ -226,4 +226,9 @@ RtlDoesFileExists_UStr( IN PUNICODE_STRING FileName ); +VOID +NTAPI +RtlpInitializeKeyedEvent( + VOID); + /* EOF */ diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index 03e80968f3d..24730bb80da 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -2405,6 +2405,11 @@ LdrpInitializeProcess(IN PCONTEXT Context, /* Check whether all static imports were properly loaded and return here */ if (!NT_SUCCESS(ImportStatus)) return ImportStatus; +#if (DLL_EXPORT_VERSION >= _WIN32_WINNT_VISTA) + /* Initialize the keyed event for condition variables */ + RtlpInitializeKeyedEvent(); +#endif + /* Initialize TLS */ Status = LdrpInitializeTls(); if (!NT_SUCCESS(Status)) diff --git a/dll/ntdll/nt_0600/DllMain.c b/dll/ntdll/nt_0600/DllMain.c index 9266b525aa4..90a01419b97 100644 --- a/dll/ntdll/nt_0600/DllMain.c +++ b/dll/ntdll/nt_0600/DllMain.c @@ -14,9 +14,11 @@ #include <debug.h> VOID +NTAPI RtlpInitializeKeyedEvent(VOID); VOID +NTAPI RtlpCloseKeyedEvent(VOID); BOOL diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index 5fe3047cb42..6c963fe5b6e 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -711,7 +711,7 @@ @ stdcall -version=0x600+ InitOnceBeginInitialize(ptr long ptr ptr) @ stdcall -version=0x600+ InitOnceComplete(ptr long ptr) @ stdcall -version=0x600+ InitOnceExecuteOnce(ptr ptr ptr ptr) -@ stdcall -version=0x600+ InitOnceInitialize(ptr) NTDLL.RtlRunOnceInitialize +@ stdcall -version=0x600+ InitOnceInitialize(ptr) ntdll.RtlRunOnceInitialize @ stdcall -version=0x600+ InitializeConditionVariable(ptr) ntdll.RtlInitializeConditionVariable @ stdcall InitializeCriticalSection(ptr) @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) diff --git a/sdk/lib/rtl/condvar.c b/sdk/lib/rtl/condvar.c index edbe074cd99..f7f9d01533c 100644 --- a/sdk/lib/rtl/condvar.c +++ b/sdk/lib/rtl/condvar.c @@ -456,6 +456,7 @@ InternalSleep(IN OUT PRTL_CONDITION_VARIABLE ConditionVariable, } VOID +NTAPI RtlpInitializeKeyedEvent(VOID) { ASSERT(CondVarKeyedEventHandle == NULL); @@ -463,6 +464,7 @@ RtlpInitializeKeyedEvent(VOID) } VOID +NTAPI RtlpCloseKeyedEvent(VOID) { ASSERT(CondVarKeyedEventHandle != NULL);

1 year, 9 months

[reactos] 01/01: [SHIMGVW] Enable middle button dragging (#6173)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fed7ee70a662f7c44a7d8… commit fed7ee70a662f7c44a7d8faa3b00dd74bc6d5f03 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 16 20:46:40 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 16 20:46:40 2023 +0900 [SHIMGVW] Enable middle button dragging (#6173) --- dll/win32/shimgvw/CMakeLists.txt | 3 ++ dll/win32/shimgvw/res/handdrag.cur | Bin 0 -> 326 bytes dll/win32/shimgvw/resource.h | 3 ++ dll/win32/shimgvw/shimgvw.c | 70 +++++++++++++++++++++++++++++++++++-- dll/win32/shimgvw/shimgvw.rc | 2 ++ 5 files changed, 76 insertions(+), 2 deletions(-) diff --git a/dll/win32/shimgvw/CMakeLists.txt b/dll/win32/shimgvw/CMakeLists.txt index 3c2f5a1f3c3..1a4589abd43 100644 --- a/dll/win32/shimgvw/CMakeLists.txt +++ b/dll/win32/shimgvw/CMakeLists.txt @@ -9,6 +9,9 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/shimgvw_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/shimgvw.def) +file(GLOB_RECURSE shimgvw_rc_deps res/*.*) +add_rc_deps(shimgvw.rc ${shimgvw_rc_deps}) + add_library(shimgvw MODULE ${SOURCE}) set_module_type(shimgvw win32dll UNICODE) target_link_libraries(shimgvw wine) diff --git a/dll/win32/shimgvw/res/handdrag.cur b/dll/win32/shimgvw/res/handdrag.cur new file mode 100644 index 00000000000..74e5ba6b9c2 Binary files /dev/null and b/dll/win32/shimgvw/res/handdrag.cur differ diff --git a/dll/win32/shimgvw/resource.h b/dll/win32/shimgvw/resource.h index 68f91679139..96da8e444cf 100644 --- a/dll/win32/shimgvw/resource.h +++ b/dll/win32/shimgvw/resource.h @@ -7,6 +7,9 @@ #define IDI_JPG_ICON 4 #define IDI_PNG_ICON 5 +/* Cursors */ +#define IDC_HANDDRAG 100 + /* Toolbar images */ #define IDB_PREV_PIC 50 #define IDB_NEXT_PIC 51 diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index b04363ed896..0503449d87c 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -103,6 +103,8 @@ typedef struct tagPREVIEW_DATA ANIME m_Anime; /* Animation */ INT m_xScrollOffset; INT m_yScrollOffset; + UINT m_nMouseDownMsg; + POINT m_ptOrigin; } PREVIEW_DATA, *PPREVIEW_DATA; static inline PPREVIEW_DATA @@ -885,9 +887,56 @@ Preview_EndSlideShow(HWND hwnd) static VOID ZoomWnd_OnButtonDown(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + PPREVIEW_DATA pData = Preview_GetData(hwnd); HWND hParent = GetParent(hwnd); - if (!Preview_IsMainWnd(hParent)) - Preview_EndSlideShow(hParent); + if ((uMsg == WM_LBUTTONDOWN) || (uMsg == WM_RBUTTONDOWN)) + { + if (!Preview_IsMainWnd(hParent)) + Preview_EndSlideShow(hParent); + return; + } + + pData->m_nMouseDownMsg = uMsg; + pData->m_ptOrigin.x = GET_X_LPARAM(lParam); + pData->m_ptOrigin.y = GET_Y_LPARAM(lParam); + SetCapture(hwnd); + SetCursor(LoadCursorW(g_hInstance, MAKEINTRESOURCEW(IDC_HANDDRAG))); +} + +static VOID +ZoomWnd_OnMouseMove(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + PPREVIEW_DATA pData = Preview_GetData(hwnd); + POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + + if (pData->m_nMouseDownMsg == WM_MBUTTONDOWN) + { + INT x = GetScrollPos(hwnd, SB_HORZ) - (pt.x - pData->m_ptOrigin.x); + INT y = GetScrollPos(hwnd, SB_VERT) - (pt.y - pData->m_ptOrigin.y); + SendMessageW(hwnd, WM_HSCROLL, MAKEWPARAM(SB_THUMBPOSITION, x), 0); + SendMessageW(hwnd, WM_VSCROLL, MAKEWPARAM(SB_THUMBPOSITION, y), 0); + pData->m_ptOrigin = pt; + } +} + +static BOOL +ZoomWnd_OnSetCursor(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + PPREVIEW_DATA pData = Preview_GetData(hwnd); + if (pData->m_nMouseDownMsg == WM_MBUTTONDOWN) + { + SetCursor(LoadCursorW(g_hInstance, MAKEINTRESOURCEW(IDC_HANDDRAG))); + return TRUE; + } + return FALSE; +} + +static VOID +ZoomWnd_OnButtonUp(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + PPREVIEW_DATA pData = Preview_GetData(hwnd); + pData->m_nMouseDownMsg = 0; + ReleaseCapture(); } static VOID @@ -995,6 +1044,23 @@ ZoomWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ZoomWnd_OnButtonDown(hwnd, uMsg, wParam, lParam); break; } + case WM_MOUSEMOVE: + { + ZoomWnd_OnMouseMove(hwnd, uMsg, wParam, lParam); + break; + } + case WM_SETCURSOR: + { + if (!ZoomWnd_OnSetCursor(hwnd, uMsg, wParam, lParam)) + return DefWindowProcW(hwnd, uMsg, wParam, lParam); + } + case WM_LBUTTONUP: + case WM_MBUTTONUP: + case WM_RBUTTONUP: + { + ZoomWnd_OnButtonUp(hwnd, uMsg, wParam, lParam); + break; + } case WM_PAINT: { ZoomWnd_OnPaint(pData, hwnd); diff --git a/dll/win32/shimgvw/shimgvw.rc b/dll/win32/shimgvw/shimgvw.rc index 58684a5d95b..f42c29154cd 100644 --- a/dll/win32/shimgvw/shimgvw.rc +++ b/dll/win32/shimgvw/shimgvw.rc @@ -17,6 +17,8 @@ IDI_APP_ICON ICON "res/main.ico" IDI_BMP_ICON ICON "res/bmp.ico" IDI_PNG_ICON ICON "res/png.ico" +IDC_HANDDRAG CURSOR "res/handdrag.cur" + IDB_PREV_PIC BITMAP "res/prev.bmp" IDB_NEXT_PIC BITMAP "res/next.bmp" IDB_BEST_FIT BITMAP "res/best_fit.bmp"

1 year, 9 months

[reactos] 01/01: [SHIMGVW] Enable scrolling (#6172)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e62d12b1401f2f9e44673… commit e62d12b1401f2f9e4467301d12b77c5c74572639 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 16 19:45:37 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 16 19:45:37 2023 +0900 [SHIMGVW] Enable scrolling (#6172) - Add m_xScrollOffset and m_yScrollOffset to PREVIEW_DATA structure. - Add ZoomWnd_UpdateScroll helper function. - Handle WM_HSCROLL and WM_VSCROLL messages. - Enable mouse wheel scrolling. CORE-19358 --- dll/win32/shimgvw/shimgvw.c | 214 +++++++++++++++++++++++++++++++++++++++----- dll/win32/shimgvw/shimgvw.h | 1 - 2 files changed, 192 insertions(+), 23 deletions(-) diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index c84314b1828..b04363ed896 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -101,6 +101,8 @@ typedef struct tagPREVIEW_DATA HWND m_hwndToolBar; INT m_nZoomPercents; ANIME m_Anime; /* Animation */ + INT m_xScrollOffset; + INT m_yScrollOffset; } PREVIEW_DATA, *PPREVIEW_DATA; static inline PPREVIEW_DATA @@ -125,6 +127,78 @@ Preview_RestartTimer(HWND hwnd) } } +static VOID +ZoomWnd_UpdateScroll(PPREVIEW_DATA pData, HWND hwnd, BOOL bResetPos) +{ + RECT rcClient; + UINT ImageWidth, ImageHeight, ZoomedWidth, ZoomedHeight; + SCROLLINFO si; + BOOL bShowHorz, bShowVert; + + if (bResetPos) + pData->m_xScrollOffset = pData->m_yScrollOffset = 0; + + if (!g_pImage) + { + ShowScrollBar(hwnd, SB_BOTH, FALSE); + InvalidateRect(hwnd, NULL, TRUE); + return; + } + + GdipGetImageWidth(g_pImage, &ImageWidth); + GdipGetImageHeight(g_pImage, &ImageHeight); + + ZoomedWidth = (ImageWidth * pData->m_nZoomPercents) / 100; + ZoomedHeight = (ImageHeight * pData->m_nZoomPercents) / 100; + + GetClientRect(hwnd, &rcClient); + + bShowHorz = (rcClient.right < ZoomedWidth); + bShowVert = (rcClient.bottom < ZoomedHeight); + ShowScrollBar(hwnd, SB_HORZ, bShowHorz); + ShowScrollBar(hwnd, SB_VERT, bShowVert); + + GetClientRect(hwnd, &rcClient); + + ZeroMemory(&si, sizeof(si)); + si.cbSize = sizeof(si); + si.fMask = SIF_ALL; + + if (bShowHorz) + { + GetScrollInfo(hwnd, SB_HORZ, &si); + si.nPage = rcClient.right; + si.nMin = 0; + si.nMax = ZoomedWidth; + si.nPos = (ZoomedWidth - rcClient.right) / 2 + pData->m_xScrollOffset; + si.nPos = max(min(si.nPos, si.nMax - (INT)si.nPage), si.nMin); + SetScrollInfo(hwnd, SB_HORZ, &si, TRUE); + pData->m_xScrollOffset = si.nPos - (ZoomedWidth - rcClient.right) / 2; + } + else + { + pData->m_xScrollOffset = 0; + } + + if (bShowVert) + { + GetScrollInfo(hwnd, SB_VERT, &si); + si.nPage = rcClient.bottom; + si.nMin = 0; + si.nMax = ZoomedHeight; + si.nPos = (ZoomedHeight - rcClient.bottom) / 2 + pData->m_yScrollOffset; + si.nPos = max(min(si.nPos, si.nMax - (INT)si.nPage), si.nMin); + SetScrollInfo(hwnd, SB_VERT, &si, TRUE); + pData->m_yScrollOffset = si.nPos - (ZoomedHeight - rcClient.bottom) / 2; + } + else + { + pData->m_yScrollOffset = 0; + } + + InvalidateRect(hwnd, NULL, TRUE); +} + static VOID Preview_UpdateZoom(PPREVIEW_DATA pData, UINT NewZoom, BOOL bEnableBestFit, BOOL bEnableRealSize) { @@ -148,6 +222,9 @@ Preview_UpdateZoom(PPREVIEW_DATA pData, UINT NewZoom, BOOL bEnableBestFit, BOOL /* Restart timer if necessary */ Preview_RestartTimer(pData->m_hwnd); + + /* Update scroll info */ + ZoomWnd_UpdateScroll(pData, pData->m_hwndZoom, FALSE); } static VOID @@ -399,11 +476,15 @@ Preview_UpdateUI(PPREVIEW_DATA pData) BOOL bEnable = (g_pImage != NULL); PostMessageW(pData->m_hwndToolBar, TB_ENABLEBUTTON, IDC_SAVEAS, bEnable); PostMessageW(pData->m_hwndToolBar, TB_ENABLEBUTTON, IDC_PRINT, bEnable); +} +static VOID +Preview_UpdateImage(PPREVIEW_DATA pData) +{ if (!Preview_IsMainWnd(pData->m_hwnd)) Preview_ResetZoom(pData); - InvalidateRect(pData->m_hwndZoom, NULL, FALSE); + ZoomWnd_UpdateScroll(pData, pData->m_hwndZoom, TRUE); } static SHIMGVW_FILENODE* @@ -651,7 +732,9 @@ ZoomWnd_OnDraw( rect.top = (rcClient.bottom - ZoomedHeight) / 2; rect.right = rect.left + ZoomedWidth; rect.bottom = rect.top + ZoomedHeight; - OffsetRect(&rect, -prcPaint->left, -prcPaint->top); + OffsetRect(&rect, + -prcPaint->left - pData->m_xScrollOffset, + -prcPaint->top - pData->m_yScrollOffset); InflateRect(&rect, +1, +1); /* Add Rectangle() pen width */ @@ -807,6 +890,98 @@ ZoomWnd_OnButtonDown(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) Preview_EndSlideShow(hParent); } +static VOID +ZoomWnd_OnHVScroll(PPREVIEW_DATA pData, HWND hwnd, WPARAM wParam, BOOL bVertical) +{ + UINT ImageWidth, ImageHeight, ZoomedWidth, ZoomedHeight; + RECT rcClient; + UINT nBar = (bVertical ? SB_VERT : SB_HORZ); + SCROLLINFO si = { sizeof(si), SIF_ALL }; + GetScrollInfo(hwnd, nBar, &si); + + if (!g_pImage) + return; + + if (bVertical) + { + if (!(GetWindowLongPtrW(hwnd, GWL_STYLE) & WS_VSCROLL)) + return; + } + else + { + if (!(GetWindowLongPtrW(hwnd, GWL_STYLE) & WS_HSCROLL)) + return; + } + + switch (LOWORD(wParam)) + { + case SB_THUMBTRACK: + case SB_THUMBPOSITION: + si.nPos = (SHORT)HIWORD(wParam); + break; + case SB_LINELEFT: + si.nPos -= 48; + break; + case SB_LINERIGHT: + si.nPos += 48; + break; + case SB_PAGELEFT: + si.nPos -= si.nPage; + break; + case SB_PAGERIGHT: + si.nPos += si.nPage; + break; + } + + si.fMask = SIF_POS; + SetScrollInfo(hwnd, nBar, &si, TRUE); + GetScrollInfo(hwnd, nBar, &si); + + GetClientRect(hwnd, &rcClient); + + if (bVertical) + { + GdipGetImageHeight(g_pImage, &ImageHeight); + ZoomedHeight = (ImageHeight * pData->m_nZoomPercents) / 100; + pData->m_yScrollOffset = si.nPos - (ZoomedHeight - rcClient.bottom) / 2; + } + else + { + GdipGetImageWidth(g_pImage, &ImageWidth); + ZoomedWidth = (ImageWidth * pData->m_nZoomPercents) / 100; + pData->m_xScrollOffset = si.nPos - (ZoomedWidth - rcClient.right) / 2; + } + + InvalidateRect(hwnd, NULL, TRUE); +} + +static VOID +ZoomWnd_OnMouseWheel(HWND hwnd, INT x, INT y, INT zDelta, UINT fwKeys) +{ + PPREVIEW_DATA pData = Preview_GetData(hwnd); + if (zDelta == 0) + return; + + if (GetKeyState(VK_CONTROL) < 0) + { + Preview_ZoomInOrOut(pData, zDelta > 0); + } + else if (GetKeyState(VK_SHIFT) < 0) + { + if (zDelta > 0) + SendMessageW(hwnd, WM_HSCROLL, SB_LINELEFT, 0); + else + SendMessageW(hwnd, WM_HSCROLL, SB_LINERIGHT, 0); + } + else + { + if (zDelta > 0) + SendMessageW(hwnd, WM_VSCROLL, SB_LINEUP, 0); + else + SendMessageW(hwnd, WM_VSCROLL, SB_LINEDOWN, 0); + } +} + LRESULT CALLBACK ZoomWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -825,6 +1000,16 @@ ZoomWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ZoomWnd_OnPaint(pData, hwnd); break; } + case WM_MOUSEWHEEL: + { + ZoomWnd_OnMouseWheel(hwnd, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), + (SHORT)HIWORD(wParam), (UINT)LOWORD(wParam)); + break; + } + case WM_HSCROLL: + case WM_VSCROLL: + ZoomWnd_OnHVScroll(pData, hwnd, wParam, uMsg == WM_VSCROLL); + break; case WM_TIMER: { if (Anime_OnTimer(&pData->m_Anime, wParam)) @@ -893,23 +1078,13 @@ Preview_OnCreate(HWND hwnd, LPCREATESTRUCT pCS) g_pCurrentFile = pBuildFileList(szFile); Preview_pLoadImageFromNode(pData, g_pCurrentFile); + Preview_UpdateImage(pData); Preview_UpdateUI(pData); } return TRUE; } -static VOID -Preview_OnMouseWheel(HWND hwnd, INT x, INT y, INT zDelta, UINT fwKeys) -{ - PPREVIEW_DATA pData = Preview_GetData(hwnd); - if (zDelta != 0) - { - if (GetKeyState(VK_CONTROL) < 0) - Preview_ZoomInOrOut(pData, zDelta > 0); - } -} - static VOID Preview_OnMoveSize(HWND hwnd) { @@ -1075,6 +1250,7 @@ Preview_GoNextPic(PPREVIEW_DATA pData, BOOL bNext) else g_pCurrentFile = g_pCurrentFile->Prev; Preview_pLoadImageFromNode(pData, g_pCurrentFile); + Preview_UpdateImage(pData); Preview_UpdateUI(pData); } } @@ -1140,7 +1316,7 @@ Preview_OnCommand(HWND hwnd, UINT nCommandID) if (g_pImage) { GdipImageRotateFlip(g_pImage, Rotate270FlipNone); - Preview_UpdateUI(pData); + Preview_UpdateImage(pData); } break; @@ -1148,18 +1324,18 @@ Preview_OnCommand(HWND hwnd, UINT nCommandID) if (g_pImage) { GdipImageRotateFlip(g_pImage, Rotate90FlipNone); - Preview_UpdateUI(pData); + Preview_UpdateImage(pData); } break; case IDC_DELETE: Preview_Delete(pData); + Preview_UpdateImage(pData); Preview_UpdateUI(pData); break; case IDC_MODIFY: Preview_Edit(hwnd); - Preview_UpdateUI(pData); break; default: @@ -1245,12 +1421,6 @@ PreviewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) Preview_OnCommand(hwnd, LOWORD(wParam)); break; } - case WM_MOUSEWHEEL: - { - Preview_OnMouseWheel(hwnd, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), - (SHORT)HIWORD(wParam), (UINT)LOWORD(wParam)); - break; - } case WM_NOTIFY: { return Preview_OnNotify(hwnd, (LPNMHDR)lParam); diff --git a/dll/win32/shimgvw/shimgvw.h b/dll/win32/shimgvw/shimgvw.h index 0506c2a6af2..776da7f849c 100644 --- a/dll/win32/shimgvw/shimgvw.h +++ b/dll/win32/shimgvw/shimgvw.h @@ -24,7 +24,6 @@ #include <shlwapi.h> #include <strsafe.h> -#define NDEBUG #include <debug.h> #include "resource.h"

1 year, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs