Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [PSDK] intsafe.h: Define MIN/MAX macros the same way as in stdint.h

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e3c859ed96edd0c6de0ac… commit e3c859ed96edd0c6de0accd1eaafb7bb492b893e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Oct 18 10:52:30 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Nov 19 17:06:21 2024 +0200 [PSDK] intsafe.h: Define MIN/MAX macros the same way as in stdint.h This avoids redefinition warnings. --- sdk/include/psdk/intsafe.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sdk/include/psdk/intsafe.h b/sdk/include/psdk/intsafe.h index 6e78f6b0e89..a5b4bbde6aa 100644 --- a/sdk/include/psdk/intsafe.h +++ b/sdk/include/psdk/intsafe.h @@ -117,9 +117,9 @@ C_ASSERT(sizeof(DWORD) == 4); C_ASSERT(sizeof(UINT_PTR) == sizeof(ULONG_PTR)); /* Integer range margins (use (x-1) to prevent warnings) */ -#define INT8_MIN ((signed char)(-127 - 1)) +#define INT8_MIN (-128) #define SHORT_MIN (-32768) -#define INT16_MIN ((short)(-32767 - 1)) +#define INT16_MIN (-32768) #define INT_MIN (-2147483647 - 1) #define INT32_MIN (-2147483647 - 1) #define LONG_MIN (-2147483647L - 1) @@ -139,18 +139,18 @@ C_ASSERT(sizeof(UINT_PTR) == sizeof(ULONG_PTR)); #define SSIZE_T_MIN (-2147483647L - 1) #endif /* _WIN64 */ -#define INT8_MAX ((signed char)127) -#define UINT8_MAX ((unsigned char)0xffU) -#define BYTE_MAX ((unsigned char)0xff) -#define SHORT_MAX ((short)32767) -#define INT16_MAX ((short)32767) -#define USHORT_MAX ((unsigned short)0xffff) -#define UINT16_MAX ((unsigned short)0xffff) -#define WORD_MAX ((unsigned short)0xffff) +#define INT8_MAX 127 +#define UINT8_MAX 0xff /* 255U */ +#define BYTE_MAX 0xff /* 255U */ +#define SHORT_MAX 32767 +#define INT16_MAX 32767 +#define USHORT_MAX 0xffff /* 65535U */ +#define UINT16_MAX 0xffff /* 65535U */ +#define WORD_MAX 0xffff /* 65535U */ #define INT_MAX 2147483647 #define INT32_MAX 2147483647 #define UINT_MAX 0xffffffff -#define UINT32_MAX 0xffffffffU +#define UINT32_MAX 0xffffffff /* 4294967295U */ #define LONG_MAX 2147483647L #define ULONG_MAX 0xffffffffUL #define DWORD_MAX 0xffffffffUL @@ -161,7 +161,7 @@ C_ASSERT(sizeof(UINT_PTR) == sizeof(ULONG_PTR)); #define DWORDLONG_MAX 0xffffffffffffffffULL #define ULONG64_MAX 0xffffffffffffffffULL #define DWORD64_MAX 0xffffffffffffffffULL -#define UINT64_MAX 0xffffffffffffffffULL +#define UINT64_MAX 0xffffffffffffffffULL /* 18446744073709551615ULL */ #define INT128_MAX 170141183460469231731687303715884105727i128 #define UINT128_MAX 0xffffffffffffffffffffffffffffffffui128 #undef SIZE_T_MAX

7 months, 1 week

[reactos] 01/01: [NTOS:MM] MmPurgeSegment: Fix missing MmDereferenceSegment cleanup (#7509)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d52031a4f1381282891f9… commit d52031a4f1381282891f9f97b0c5812356aa83dc Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Tue Nov 19 11:17:41 2024 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Nov 19 11:17:41 2024 +0700 [NTOS:MM] MmPurgeSegment: Fix missing MmDereferenceSegment cleanup (#7509) MiGrabDataSection adds a refcount. There is a missing MmDereferenceSegment cleanup in case of range check error. Fix that by moving MiGrabDataSection calling code to after range check. --- ntoskrnl/mm/section.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index f935e6f30c1..50609bac71c 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -4838,13 +4838,6 @@ MmPurgeSegment( LARGE_INTEGER PurgeStart, PurgeEnd; PMM_SECTION_SEGMENT Segment; - Segment = MiGrabDataSection(SectionObjectPointer); - if (!Segment) - { - /* Nothing to purge */ - return TRUE; - } - PurgeStart.QuadPart = Offset ? Offset->QuadPart : 0LL; if (Length && Offset) { @@ -4852,6 +4845,13 @@ MmPurgeSegment( return FALSE; } + Segment = MiGrabDataSection(SectionObjectPointer); + if (!Segment) + { + /* Nothing to purge */ + return TRUE; + } + MmLockSectionSegment(Segment); if (!Length || !Offset)

7 months, 2 weeks

[reactos] 01/01: [PSDK] Add definitions for WLAN_AVAILABLE_NETWORK.dwFlags member (#7504)

by Vitaly Orekhov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2e3a080e108f58e47385e… commit 2e3a080e108f58e47385e463babb3e31a29d40af Author: Vitaly Orekhov <vkvo2000(a)vivaldi.net> AuthorDate: Mon Nov 18 23:31:17 2024 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 18 21:31:17 2024 +0100 [PSDK] Add definitions for WLAN_AVAILABLE_NETWORK.dwFlags member (#7504) Enable use of flags denoting state of Wi-Fi access point relative to the network adapter trying to connect to it. Used when working with WLAN_AVAILABLE_NETWORK.dwFlags to check whether we are connected to the network or not, for instance. These flags have been introduced in Windows 10. References: - https://learn.microsoft.com/en-us/windows/win32/api/wlanapi/ns-wlanapi-wlan… - Windows SDK CORE-6905 --- sdk/include/psdk/wlanapi.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sdk/include/psdk/wlanapi.h b/sdk/include/psdk/wlanapi.h index 743edf2c2ee..e16089372a8 100644 --- a/sdk/include/psdk/wlanapi.h +++ b/sdk/include/psdk/wlanapi.h @@ -19,6 +19,16 @@ extern "C" { #define WLAN_AVAILABLE_NETWORK_INCLUDE_ALL_ADHOC_PROFILES 0x00000001 #define WLAN_AVAILABLE_NETWORK_INCLUDE_ALL_MANUAL_HIDDEN_PROFILES 0x00000002 +#define WLAN_AVAILABLE_NETWORK_CONNECTED 0x00000001 +#define WLAN_AVAILABLE_NETWORK_HAS_PROFILE 0x00000002 +#define WLAN_AVAILABLE_NETWORK_CONSOLE_USER_PROFILE 0x00000004 +#define WLAN_AVAILABLE_NETWORK_INTERWORKING_SUPPORTED 0x00000008 +#define WLAN_AVAILABLE_NETWORK_HOTSPOT2_ENABLED 0x00000010 +#define WLAN_AVAILABLE_NETWORK_ANQP_SUPPORTED 0x00000020 +#define WLAN_AVAILABLE_NETWORK_HOTSPOT2_DOMAIN 0x00000040 +#define WLAN_AVAILABLE_NETWORK_HOTSPOT2_ROAMING 0x00000080 +#define WLAN_AVAILABLE_NETWORK_AUTO_CONNECT_FAILED 0x00000100 + /* Enumerations */ #if defined(__midl) || defined(__WIDL__)

7 months, 2 weeks

[reactos] 01/01: [FS_REC] Rename Ext2 recognizer to Ext recognizer (#7497)

by Vincent Franchomme

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f2d67a841b7e427db7d9… commit 1f2d67a841b7e427db7d98de502bba5c9575c1c5 Author: Vincent Franchomme <franchomme.vincent(a)gmail.com> AuthorDate: Mon Nov 18 21:27:16 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 18 21:27:16 2024 +0100 [FS_REC] Rename Ext2 recognizer to Ext recognizer (#7497) Rename the Ext2 recognizer to a more generic Ext to be more future-proof with a possible upcoming ext4 support. Also, it already makes no sense to use the name ext2 as it already recognizes all the FS of the "Ext family". In addition, add the Ext Recognizer for CDs. --- drivers/filesystems/fs_rec/CMakeLists.txt | 2 +- drivers/filesystems/fs_rec/{ext2.c => ext.c} | 24 ++++++++++++------------ drivers/filesystems/fs_rec/{ext2.h => ext.h} | 24 ++++++++++++------------ drivers/filesystems/fs_rec/fs_rec.c | 28 ++++++++++++++++++++-------- drivers/filesystems/fs_rec/fs_rec.h | 4 ++-- 5 files changed, 47 insertions(+), 35 deletions(-) diff --git a/drivers/filesystems/fs_rec/CMakeLists.txt b/drivers/filesystems/fs_rec/CMakeLists.txt index c231d3d378d..d014a864719 100644 --- a/drivers/filesystems/fs_rec/CMakeLists.txt +++ b/drivers/filesystems/fs_rec/CMakeLists.txt @@ -2,7 +2,7 @@ list(APPEND SOURCE blockdev.c btrfs.c cdfs.c - ext2.c + ext.c fat.c fatx.c ffs.c diff --git a/drivers/filesystems/fs_rec/ext2.c b/drivers/filesystems/fs_rec/ext.c similarity index 83% rename from drivers/filesystems/fs_rec/ext2.c rename to drivers/filesystems/fs_rec/ext.c index 94464617e1b..40722e19b1d 100644 --- a/drivers/filesystems/fs_rec/ext2.c +++ b/drivers/filesystems/fs_rec/ext.c @@ -1,8 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS File System Recognizer - * FILE: drivers/filesystems/fs_rec/ext2.c - * PURPOSE: EXT2 Recognizer + * FILE: drivers/filesystems/fs_rec/ext.c + * PURPOSE: EXT Recognizer * PROGRAMMER: Eric Kohl * Pierre Schweitzer (pierre(a)reactos.org) */ @@ -10,7 +10,7 @@ /* INCLUDES *****************************************************************/ #include "fs_rec.h" -#include "ext2.h" +#include "ext.h" #define NDEBUG #include <debug.h> @@ -19,21 +19,21 @@ BOOLEAN NTAPI -FsRecIsExt2Volume(IN PEXT2_SUPER_BLOCK SuperBlock) +FsRecIsExtVolume(IN PEXT_SUPER_BLOCK SuperBlock) { /* Just check for magic */ - return (SuperBlock->Magic == EXT2_SUPER_MAGIC); + return (SuperBlock->Magic == EXT_SUPER_MAGIC); } NTSTATUS NTAPI -FsRecExt2FsControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) +FsRecExtFsControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { PIO_STACK_LOCATION Stack; NTSTATUS Status; PDEVICE_OBJECT MountDevice; - PEXT2_SUPER_BLOCK Spb = NULL; + PEXT_SUPER_BLOCK Spb = NULL; ULONG SectorSize; LARGE_INTEGER Offset; BOOLEAN DeviceError = FALSE; @@ -53,16 +53,16 @@ FsRecExt2FsControl(IN PDEVICE_OBJECT DeviceObject, if (FsRecGetDeviceSectorSize(MountDevice, &SectorSize)) { /* Try to read the superblock */ - Offset.QuadPart = EXT2_SB_OFFSET; + Offset.QuadPart = EXT_SB_OFFSET; if (FsRecReadBlock(MountDevice, &Offset, - EXT2_SB_SIZE, + EXT_SB_SIZE, SectorSize, (PVOID)&Spb, &DeviceError)) { - /* Check if it's an actual EXT2 volume */ - if (FsRecIsExt2Volume(Spb)) + /* Check if it's an actual EXT volume */ + if (FsRecIsExtVolume(Spb)) { /* It is! */ Status = STATUS_FS_DRIVER_REQUIRED; diff --git a/drivers/filesystems/fs_rec/ext2.h b/drivers/filesystems/fs_rec/ext.h similarity index 59% rename from drivers/filesystems/fs_rec/ext2.h rename to drivers/filesystems/fs_rec/ext.h index 7ff0303fe3d..17fea26cd07 100644 --- a/drivers/filesystems/fs_rec/ext2.h +++ b/drivers/filesystems/fs_rec/ext.h @@ -1,13 +1,13 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS File System Recognizer - * FILE: drivers/filesystems/fs_rec/ext2.h - * PURPOSE: EXT2 Header File + * FILE: drivers/filesystems/fs_rec/ext.h + * PURPOSE: EXT Header File * PROGRAMMER: Pierre Schweitzer (pierre(a)reactos.org) */ #include <pshpack1.h> -typedef struct _EXT2_SUPER_BLOCK { +typedef struct _EXT_SUPER_BLOCK { ULONG InodesCount; ULONG BlocksCount; ULONG ReservedBlocksCount; @@ -34,15 +34,15 @@ typedef struct _EXT2_SUPER_BLOCK { USHORT DefResUid; USHORT DefResGid; // Partial -} EXT2_SUPER_BLOCK, *PEXT2_SUPER_BLOCK; +} EXT_SUPER_BLOCK, *PEXT_SUPER_BLOCK; #include <poppack.h> -C_ASSERT(FIELD_OFFSET(EXT2_SUPER_BLOCK, FreeInodesCount) == 0x10); -C_ASSERT(FIELD_OFFSET(EXT2_SUPER_BLOCK, BlocksPerGroup) == 0x20); -C_ASSERT(FIELD_OFFSET(EXT2_SUPER_BLOCK, WriteTime) == 0x30); -C_ASSERT(FIELD_OFFSET(EXT2_SUPER_BLOCK, LastCheck) == 0x40); -C_ASSERT(FIELD_OFFSET(EXT2_SUPER_BLOCK, DefResUid) == 0x50); +C_ASSERT(FIELD_OFFSET(EXT_SUPER_BLOCK, FreeInodesCount) == 0x10); +C_ASSERT(FIELD_OFFSET(EXT_SUPER_BLOCK, BlocksPerGroup) == 0x20); +C_ASSERT(FIELD_OFFSET(EXT_SUPER_BLOCK, WriteTime) == 0x30); +C_ASSERT(FIELD_OFFSET(EXT_SUPER_BLOCK, LastCheck) == 0x40); +C_ASSERT(FIELD_OFFSET(EXT_SUPER_BLOCK, DefResUid) == 0x50); -#define EXT2_SUPER_MAGIC 0xEF53 -#define EXT2_SB_OFFSET 0x400 -#define EXT2_SB_SIZE 0x400 +#define EXT_SUPER_MAGIC 0xEF53 +#define EXT_SB_OFFSET 0x400 +#define EXT_SB_SIZE 0x400 diff --git a/drivers/filesystems/fs_rec/fs_rec.c b/drivers/filesystems/fs_rec/fs_rec.c index 1dd5b4d2697..8274c459fa0 100644 --- a/drivers/filesystems/fs_rec/fs_rec.c +++ b/drivers/filesystems/fs_rec/fs_rec.c @@ -158,10 +158,10 @@ FsRecFsControl(IN PDEVICE_OBJECT DeviceObject, Status = FsRecUdfsFsControl(DeviceObject, Irp); break; - case FS_TYPE_EXT2: + case FS_TYPE_EXT: - /* Send EXT2 command */ - Status = FsRecExt2FsControl(DeviceObject, Irp); + /* Send EXT command */ + Status = FsRecExtFsControl(DeviceObject, Irp); break; case FS_TYPE_BTRFS: @@ -329,6 +329,7 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT CdfsObject; PDEVICE_OBJECT UdfsObject; PDEVICE_OBJECT FatObject; + PDEVICE_OBJECT ExtObject; PAGED_CODE(); @@ -430,17 +431,28 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, 0); if (NT_SUCCESS(Status)) DeviceCount++; - /* Register EXT2 */ + /* Register EXT */ Status = FsRecRegisterFs(DriverObject, NULL, - NULL, - L"\\Ext2fs", - L"\\FileSystem\\Ext2Recognizer", - FS_TYPE_EXT2, + &ExtObject, + L"\\Extfs", + L"\\FileSystem\\ExtRecognizer", + FS_TYPE_EXT, FILE_DEVICE_DISK_FILE_SYSTEM, 0); if (NT_SUCCESS(Status)) DeviceCount++; + /* Register EXT for CDs */ + Status = FsRecRegisterFs(DriverObject, + ExtObject, + NULL, + L"\\ExtfsCdrom", + L"\\FileSystem\\ExtCdRomRecognizer", + FS_TYPE_EXT, + FILE_DEVICE_CD_ROM_FILE_SYSTEM, + 0); + if (NT_SUCCESS(Status)) DeviceCount++; + /* Register BTRFS */ Status = FsRecRegisterFs(DriverObject, NULL, diff --git a/drivers/filesystems/fs_rec/fs_rec.h b/drivers/filesystems/fs_rec/fs_rec.h index fe56d1ac18f..db3112b06c7 100644 --- a/drivers/filesystems/fs_rec/fs_rec.h +++ b/drivers/filesystems/fs_rec/fs_rec.h @@ -173,7 +173,7 @@ typedef enum _FILE_SYSTEM_TYPE FS_TYPE_NTFS, FS_TYPE_CDFS, FS_TYPE_UDFS, - FS_TYPE_EXT2, + FS_TYPE_EXT, FS_TYPE_BTRFS, FS_TYPE_REISERFS, FS_TYPE_FFS, @@ -227,7 +227,7 @@ FsRecUdfsFsControl( NTSTATUS NTAPI -FsRecExt2FsControl( +FsRecExtFsControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp );

7 months, 2 weeks

[reactos] 01/01: [TIMEDATE] Update German (de-DE) translation (#7490)

by Václav Zouzalík

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f0337f21724cdfd43d05… commit 8f0337f21724cdfd43d05b52e685f2643daffd65 Author: Václav Zouzalík <Vaclav.Zouzalik(a)seznam.cz> AuthorDate: Mon Nov 18 21:26:13 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 18 21:26:13 2024 +0100 [TIMEDATE] Update German (de-DE) translation (#7490) --- dll/cpl/timedate/lang/de-DE.rc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dll/cpl/timedate/lang/de-DE.rc b/dll/cpl/timedate/lang/de-DE.rc index c37b80fae84..b9e045a8bda 100644 --- a/dll/cpl/timedate/lang/de-DE.rc +++ b/dll/cpl/timedate/lang/de-DE.rc @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS Timedate Control Panel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: German resource file + * TRANSLATORS: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> + * Copyright 2016 Joachim Henze <Joachim.Henze(a)reactos.org> + * Copyright 2024 Václav Zouzalík (Venca24) <vaclav.zouzalik(a)seznam.cz> + */ + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 @@ -54,6 +63,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Nächste Synchronisierung am %s um %s." IDS_INETTIMESYNCING "Bitte warten Sie, während ReactOS die Zeit mit %s synchronisiert." IDS_INETTIMEERROR "Ein Fehler trat beim Synchronisieren mit %s auf." - IDS_INETTIMESUCFILL "Please type an NTP server name in order to synchronize the time" - IDS_INETTIMEWELCOME "Select an NTP server from the list or type an NTP server name to synchronize the computer's time" + IDS_INETTIMESUCFILL "Bitte geben Sie den Namen eines NTP-Servers ein, um die Zeit zu synchronisieren" + IDS_INETTIMEWELCOME "Wählen Sie einen NTP-Server aus der Liste aus oder geben Sie einen NTP-Servernamen ein, um die Uhrzeit des Computers zu synchronisieren" END

7 months, 2 weeks

[reactos] 01/01: [THEMEUI][INF] Update German (de-DE) translation (#7489)

by Václav Zouzalík

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=531c94a0c7f293b2079c6… commit 531c94a0c7f293b2079c6746c59ad3cd0a4b3cb7 Author: Václav Zouzalík <Vaclav.Zouzalik(a)seznam.cz> AuthorDate: Mon Nov 18 21:24:57 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 18 21:24:57 2024 +0100 [THEMEUI][INF] Update German (de-DE) translation (#7489) --- boot/bootdata/hivedef.inf | 2 +- dll/win32/themeui/lang/de-DE.rc | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index 0aa38716ffd..6ca744345cc 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -2491,7 +2491,7 @@ DESKTOP_SCHEME_18="Schiefer" DESKTOP_SCHEME_19="Sturm" DESKTOP_SCHEME_20="Türkis" DESKTOP_SCHEME_21="Gelbbraun" -DESKTOP_SCHEME_22="Red, White, and Blue" +DESKTOP_SCHEME_22="Rot, Weiß und Blau" DESKTOP_SCHEME_SIZE_0="Standardgröße" TEMP_DIR="%USERPROFILE%\Lokale Einstellungen\Temp" diff --git a/dll/win32/themeui/lang/de-DE.rc b/dll/win32/themeui/lang/de-DE.rc index df0a0469a56..3fda8e4d46c 100644 --- a/dll/win32/themeui/lang/de-DE.rc +++ b/dll/win32/themeui/lang/de-DE.rc @@ -1,10 +1,18 @@ +/* + * PROJECT: Theme UI Library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: German resource file + * TRANSLATORS: Copyright 2011 Matthias Kupfer <mkupfer(a)reactos.org> + * Copyright 2024 Václav Zouzalík (Venca24) <vaclav.zouzalik(a)seznam.cz> + */ + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_BRICK "Backstein" IDS_EGGPLANT "Aubergine" - IDS_GOLIVE "Olivgrün" //Spruce + IDS_GOLIVE "Olivgrün" IDS_HCONTRAST_1 "Hoher Kontrast 1" IDS_HCONTRAST_2 "Hoher Kontrast 2" IDS_HCONTRAST_BLACK "Hoher Kontrast Schwarz" @@ -15,11 +23,11 @@ BEGIN IDS_PLUM "Pflaume" IDS_PUMPKIN "Kürbis" IDS_RAIN "Regentag" - IDS_RWB "Red, White, and Blue" + IDS_RWB "Rot, Weiß und Blau" IDS_CLASSIC "ReactOS Klassisch" IDS_STANDARD "ReactOS Standard" IDS_ROSE "Rose" - IDS_SAND "Sand" //Desert + IDS_SAND "Sand" IDS_SLATE "Schiefer" IDS_SKY "Himmel" IDS_STORM "Sturm" @@ -29,7 +37,7 @@ END STRINGTABLE BEGIN - IDS_SIZE_NORMAL "Normal" - IDS_SIZE_LARGE "Large" - IDS_SIZE_XLARGE "Extra Large" + IDS_SIZE_NORMAL "Standardgröße" + IDS_SIZE_LARGE "Groß" + IDS_SIZE_XLARGE "Extragroß" END

7 months, 2 weeks

[reactos] 01/01: [SDK] d3dkmthk.h: Fix an '#ifdef __REACTOS__' (#7474)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9992fb183a8c75aa54de0… commit 9992fb183a8c75aa54de0954c009cf2025604705 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Nov 18 21:24:24 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 18 21:24:24 2024 +0100 [SDK] d3dkmthk.h: Fix an '#ifdef __REACTOS__' (#7474) Addendum to commit 6907831. - Reverse inclusion. - Remove copypasta about WDDM version. --- sdk/include/ddk/d3dkmthk.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sdk/include/ddk/d3dkmthk.h b/sdk/include/ddk/d3dkmthk.h index 5fabcc0d2f9..89b62a3da73 100644 --- a/sdk/include/ddk/d3dkmthk.h +++ b/sdk/include/ddk/d3dkmthk.h @@ -5649,15 +5649,13 @@ typedef _Check_return_ NTSTATUS (APIENTRY *PFND3DKMT_CANCELPRESENTS)(_In_ D3DKMT #endif -#ifdef __REACTOS__ -#if (DXGKDDI_INTERFACE_VERSION >= DXGKDDI_INTERFACE_VERSION_WDDM2_2) +#if !defined(__REACTOS__) || (DXGKDDI_INTERFACE_VERSION >= DXGKDDI_INTERFACE_VERSION_WDDM2_2) EXTERN_C _Check_return_ NTSTATUS APIENTRY D3DKMTShareObjectWithHost(_Inout_ D3DKMT_SHAREOBJECTWITHHOST*); EXTERN_C _Check_return_ NTSTATUS APIENTRY D3DKMTCreateSyncFile(_Inout_ D3DKMT_CREATESYNCFILE*); // Used in WSL to close the internal file descriptor to /dev/dxg EXTERN_C VOID APIENTRY D3DKMTCloseDxCoreDevice(); -#endif // DXGKDDI_INTERFACE_VERSION_WDDM3_0 -#endif // __REACTOS__ +#endif #if !defined(D3DKMDT_SPECIAL_MULTIPLATFORM_TOOL)

7 months, 2 weeks

[reactos] 01/01: [RAPPS] Initialize SHBrowseForFolder to current download folder (#7505)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2834e5b3c8435512b54df… commit 2834e5b3c8435512b54df952e4e3cbf291af86df Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Mon Nov 18 16:42:43 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 18 16:42:43 2024 +0100 [RAPPS] Initialize SHBrowseForFolder to current download folder (#7505) --- base/applications/rapps/settingsdlg.cpp | 38 +++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/base/applications/rapps/settingsdlg.cpp b/base/applications/rapps/settingsdlg.cpp index 2eccfdcbf19..92782d59484 100644 --- a/base/applications/rapps/settingsdlg.cpp +++ b/base/applications/rapps/settingsdlg.cpp @@ -9,6 +9,20 @@ SETTINGS_INFO NewSettingsInfo; +static int CALLBACK +BrowseFolderCallback(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData) +{ + switch (uMsg) + { + case BFFM_INITIALIZED: + SendMessageW(hwnd, BFFM_SETSELECTIONW, TRUE, lpData); + break; + case BFFM_VALIDATEFAILED: + return TRUE; + } + return 0; +} + BOOL ChooseFolder(HWND hwnd) { @@ -25,24 +39,24 @@ ChooseFolder(HWND hwnd) bi.ulFlags = BIF_USENEWUI | BIF_DONTGOBELOWDOMAIN | BIF_RETURNONLYFSDIRS | /* BIF_BROWSEFILEJUNCTIONS | */ BIF_VALIDATE; - if (SUCCEEDED(CoInitializeEx(NULL, COINIT_APARTMENTTHREADED))) + if (SUCCEEDED(CoInitialize(NULL))) { - CStringW szBuf; + WCHAR szDir[MAX_PATH]; + if (GetWindowTextW(GetDlgItem(hwnd, IDC_DOWNLOAD_DIR_EDIT), szDir, _countof(szDir))) + { + bi.lpfn = BrowseFolderCallback; + bi.lParam = (LPARAM)szDir; + } LPITEMIDLIST lpItemList = SHBrowseForFolderW(&bi); - if (lpItemList && SHGetPathFromIDListW(lpItemList, szBuf.GetBuffer(MAX_PATH))) + if (lpItemList && SHGetPathFromIDListW(lpItemList, szDir)) { - szBuf.ReleaseBuffer(); - if (!szBuf.IsEmpty()) + if (*szDir) { - SetDlgItemTextW(hwnd, IDC_DOWNLOAD_DIR_EDIT, szBuf); + SetDlgItemTextW(hwnd, IDC_DOWNLOAD_DIR_EDIT, szDir); bRet = TRUE; } } - else - { - szBuf.ReleaseBuffer(); - } CoTaskMemFree(lpItemList); CoUninitialize(); @@ -94,7 +108,9 @@ InitSettingsControls(HWND hDlg, PSETTINGS_INFO Info) SendDlgItemMessageW(hDlg, IDC_LOG_ENABLED, BM_SETCHECK, Info->bLogEnabled, 0); SendDlgItemMessageW(hDlg, IDC_DEL_AFTER_INSTALL, BM_SETCHECK, Info->bDelInstaller, 0); - SetWindowTextW(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT), Info->szDownloadDir); + HWND hCtl = GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT); + SetWindowTextW(hCtl, Info->szDownloadDir); + SendMessageW(hCtl, EM_LIMITTEXT, MAX_PATH - 1, 0); CheckRadioButton(hDlg, IDC_PROXY_DEFAULT, IDC_USE_PROXY, IDC_PROXY_DEFAULT + Info->Proxy);

7 months, 2 weeks

[reactos] 01/01: [NTOS:MM] Finish MmAllocateMappingAddress and MmFreeMappingAddress and fix test failures. (#7491)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e0759a5e350e9f44e7e7b… commit e0759a5e350e9f44e7e7b6fb28249adc78c2d0f6 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Mon Nov 18 02:44:51 2024 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 18 02:44:51 2024 -0600 [NTOS:MM] Finish MmAllocateMappingAddress and MmFreeMappingAddress and fix test failures. (#7491) * [NTOS:MM] Fix MmAllocateMappingAddress and MmFreeMappingAddress and their regression test failures. Follow up of #7260. This fixes kmtest:MmReservedMapping failures and hang. Based on mm-implement-mappingaddress.patch by Thomas Faber and some changes by Oleg Dubinskiy. kmtest:MmReservedMapping revisions and updates to Vista+ method by Timo Kreuzer. Signed-off-by: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> Signed-off-by: Timo Kreuzer <timo.kreuzer(a)reactos.org> CORE-10147, CORE-14635, CORE-17409, CORE-19318 --- .../rostests/kmtests/ntos_mm/MmReservedMapping.c | 27 ++- ntoskrnl/ex/init.c | 3 + ntoskrnl/mm/ARM3/mdlsup.c | 221 +++++++++++++++++++-- ntoskrnl/mm/ARM3/miarm.h | 15 +- ntoskrnl/mm/ARM3/pool.c | 4 + ntoskrnl/mm/freelist.c | 3 +- 6 files changed, 251 insertions(+), 22 deletions(-) diff --git a/modules/rostests/kmtests/ntos_mm/MmReservedMapping.c b/modules/rostests/kmtests/ntos_mm/MmReservedMapping.c index a8204b5a3c0..d0cd4c605ab 100644 --- a/modules/rostests/kmtests/ntos_mm/MmReservedMapping.c +++ b/modules/rostests/kmtests/ntos_mm/MmReservedMapping.c @@ -9,6 +9,8 @@ #include <kmt_test.h> static BOOLEAN g_IsPae; +static ULONG g_OsVersion; +static BOOLEAN g_IsReactOS; #ifdef _M_IX86 @@ -76,7 +78,7 @@ ValidateMapping( BOOLEAN Valid = TRUE; #if defined(_M_IX86) || defined(_M_AMD64) PUCHAR CurrentAddress; - ULONGLONG PteValue; + ULONGLONG PteValue, ExpectedValue; ULONG i; for (i = 0; i < ValidPtes; i++) @@ -110,10 +112,26 @@ ValidateMapping( CurrentAddress, PteValue, PoolTag & ~1); CurrentAddress = (PUCHAR)BaseAddress - 2 * PAGE_SIZE; PteValue = GET_PTE_VALUE(CurrentAddress); + + if (g_IsReactOS || g_OsVersion >= 0x0600) + { + /* On ReactOS and on Vista+ the size is stored in + * the NextEntry field of a MMPTE_LIST structure */ +#ifdef _M_IX86 + ExpectedValue = (TotalPtes + 2) << 12; +#elif defined(_M_AMD64) + ExpectedValue = ((ULONG64)TotalPtes + 2) << 32; +#endif + } + else + { + /* On Windows 2003 the size is shifted by 1 bit only */ + ExpectedValue = (TotalPtes + 2) * 2; + } Valid = Valid && - ok(PteValue == (TotalPtes + 2) * 2, + ok(PteValue == ExpectedValue, "PTE for %p contains 0x%I64x, expected %x\n", - CurrentAddress, PteValue, (TotalPtes + 2) * 2); + CurrentAddress, PteValue, ExpectedValue); #endif return Valid; @@ -281,6 +299,9 @@ START_TEST(MmReservedMapping) PVOID Mapping; g_IsPae = ExIsProcessorFeaturePresent(PF_PAE_ENABLED); + g_OsVersion = SharedUserData->NtMajorVersion << 8 | SharedUserData->NtMinorVersion; + g_IsReactOS = *(PULONG)(KI_USER_SHARED_DATA + PAGE_SIZE - sizeof(ULONG)) == 0x8eac705; + ok(g_IsReactOS == 1, "Not reactos\n"); pMmAllocatePagesForMdlEx = KmtGetSystemRoutineAddress(L"MmAllocatePagesForMdlEx"); diff --git a/ntoskrnl/ex/init.c b/ntoskrnl/ex/init.c index 00e5f453dd8..433a635d7d2 100644 --- a/ntoskrnl/ex/init.c +++ b/ntoskrnl/ex/init.c @@ -1330,6 +1330,9 @@ ExpInitializeExecutive(IN ULONG Cpu, /* Set the machine type */ SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_NATIVE; SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_NATIVE; + + /* ReactOS magic */ + *(PULONG)(KI_USER_SHARED_DATA + PAGE_SIZE - sizeof(ULONG)) = 0x8eac705; } VOID diff --git a/ntoskrnl/mm/ARM3/mdlsup.c b/ntoskrnl/mm/ARM3/mdlsup.c index 76b06f0c72e..1bd22c1e78a 100644 --- a/ntoskrnl/mm/ARM3/mdlsup.c +++ b/ntoskrnl/mm/ARM3/mdlsup.c @@ -529,7 +529,7 @@ MmAllocatePagesForMdlEx(IN PHYSICAL_ADDRESS LowAddress, else { // - // Conver to internal caching attribute + // Convert to internal caching attribute // CacheAttribute = MiPlatformCacheAttributes[FALSE][CacheType]; } @@ -1622,29 +1622,224 @@ MmAdvanceMdl(IN PMDL Mdl, } /* - * @unimplemented + * @implemented */ PVOID NTAPI -MmMapLockedPagesWithReservedMapping(IN PVOID MappingAddress, - IN ULONG PoolTag, - IN PMDL MemoryDescriptorList, - IN MEMORY_CACHING_TYPE CacheType) +MmMapLockedPagesWithReservedMapping( + _In_ PVOID MappingAddress, + _In_ ULONG PoolTag, + _In_ PMDL Mdl, + _In_ MEMORY_CACHING_TYPE CacheType) { - UNIMPLEMENTED; - return 0; + PPFN_NUMBER MdlPages, LastPage; + PFN_COUNT PageCount; + BOOLEAN IsIoMapping; + MI_PFN_CACHE_ATTRIBUTE CacheAttribute; + PMMPTE PointerPte; + MMPTE TempPte; + + ASSERT(Mdl->ByteCount != 0); + + // Get the list of pages and count + MdlPages = MmGetMdlPfnArray(Mdl); + PageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(MmGetMdlVirtualAddress(Mdl), + Mdl->ByteCount); + LastPage = MdlPages + PageCount; + + // Sanity checks + ASSERT((Mdl->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA | + MDL_SOURCE_IS_NONPAGED_POOL | + MDL_PARTIAL_HAS_BEEN_MAPPED)) == 0); + ASSERT((Mdl->MdlFlags & (MDL_PAGES_LOCKED | MDL_PARTIAL)) != 0); + + // Get the correct cache type + IsIoMapping = (Mdl->MdlFlags & MDL_IO_SPACE) != 0; + CacheAttribute = MiPlatformCacheAttributes[IsIoMapping][CacheType]; + + // Get the first PTE we reserved + ASSERT(MappingAddress); + PointerPte = MiAddressToPte(MappingAddress) - 2; + ASSERT(!PointerPte[0].u.Hard.Valid && + !PointerPte[1].u.Hard.Valid); + + // Verify that the pool tag matches + TempPte.u.Long = PoolTag; + TempPte.u.Hard.Valid = 0; + if (PointerPte[1].u.Long != TempPte.u.Long) + { + KeBugCheckEx(SYSTEM_PTE_MISUSE, + PTE_MAPPING_ADDRESS_NOT_OWNED, /* Trying to map an address it does not own */ + (ULONG_PTR)MappingAddress, + PoolTag, + PointerPte[1].u.Long); + } + + // We must have a size, and our helper PTEs must be invalid + if (PointerPte[0].u.List.NextEntry < 3) + { + KeBugCheckEx(SYSTEM_PTE_MISUSE, + PTE_MAPPING_ADDRESS_INVALID, /* Trying to map an invalid address */ + (ULONG_PTR)MappingAddress, + PoolTag, + (ULONG_PTR)_ReturnAddress()); + } + + // If the mapping isn't big enough, fail + if (PointerPte[0].u.List.NextEntry - 2 < PageCount) + { + DPRINT1("Reserved mapping too small. Need %Iu pages, have %Iu\n", + PageCount, + PointerPte[0].u.List.NextEntry - 2); + return NULL; + } + // Skip our two helper PTEs + PointerPte += 2; + + // Get the template + TempPte = ValidKernelPte; + switch (CacheAttribute) + { + case MiNonCached: + // Disable caching + MI_PAGE_DISABLE_CACHE(&TempPte); + MI_PAGE_WRITE_THROUGH(&TempPte); + break; + + case MiWriteCombined: + // Enable write combining + MI_PAGE_DISABLE_CACHE(&TempPte); + MI_PAGE_WRITE_COMBINED(&TempPte); + break; + + default: + // Nothing to do + break; + } + + // Loop all PTEs + for (; (MdlPages < LastPage) && (*MdlPages != LIST_HEAD); ++MdlPages) + { + // Write the PTE + TempPte.u.Hard.PageFrameNumber = *MdlPages; + MI_WRITE_VALID_PTE(PointerPte++, TempPte); + } + + // Mark it as mapped + ASSERT((Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA) == 0); + Mdl->MappedSystemVa = MappingAddress; + Mdl->MdlFlags |= MDL_MAPPED_TO_SYSTEM_VA; + + // Check if it was partial + if (Mdl->MdlFlags & MDL_PARTIAL) + { + // Write the appropriate flag here too + Mdl->MdlFlags |= MDL_PARTIAL_HAS_BEEN_MAPPED; + } + + // Return the mapped address + return (PVOID)((ULONG_PTR)MappingAddress + Mdl->ByteOffset); } /* - * @unimplemented + * @implemented */ VOID NTAPI -MmUnmapReservedMapping(IN PVOID BaseAddress, - IN ULONG PoolTag, - IN PMDL MemoryDescriptorList) +MmUnmapReservedMapping( + _In_ PVOID BaseAddress, + _In_ ULONG PoolTag, + _In_ PMDL Mdl) { - UNIMPLEMENTED; + PVOID Base; + PFN_COUNT PageCount, ExtraPageCount; + PPFN_NUMBER MdlPages; + PMMPTE PointerPte; + MMPTE TempPte; + + // Sanity check + ASSERT(Mdl->ByteCount != 0); + ASSERT(BaseAddress > MM_HIGHEST_USER_ADDRESS); + + // Get base and count information + Base = (PVOID)((ULONG_PTR)Mdl->StartVa + Mdl->ByteOffset); + PageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(Base, Mdl->ByteCount); + + // Sanity checks + ASSERT((Mdl->MdlFlags & MDL_PARENT_MAPPED_SYSTEM_VA) == 0); + ASSERT(PageCount != 0); + ASSERT(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA); + + // Get the first PTE we reserved + PointerPte = MiAddressToPte(BaseAddress) - 2; + ASSERT(!PointerPte[0].u.Hard.Valid && + !PointerPte[1].u.Hard.Valid); + + // Verify that the pool tag matches + TempPte.u.Long = PoolTag; + TempPte.u.Hard.Valid = 0; + if (PointerPte[1].u.Long != TempPte.u.Long) + { + KeBugCheckEx(SYSTEM_PTE_MISUSE, + PTE_UNMAPPING_ADDRESS_NOT_OWNED, /* Trying to unmap an address it does not own */ + (ULONG_PTR)BaseAddress, + PoolTag, + PointerPte[1].u.Long); + } + + // We must have a size + if (PointerPte[0].u.List.NextEntry < 3) + { + KeBugCheckEx(SYSTEM_PTE_MISUSE, + PTE_MAPPING_ADDRESS_EMPTY, /* Mapping apparently empty */ + (ULONG_PTR)BaseAddress, + PoolTag, + (ULONG_PTR)_ReturnAddress()); + } + + // Skip our two helper PTEs + PointerPte += 2; + + // This should be a resident system PTE + ASSERT(PointerPte >= MmSystemPtesStart[SystemPteSpace]); + ASSERT(PointerPte <= MmSystemPtesEnd[SystemPteSpace]); + ASSERT(PointerPte->u.Hard.Valid == 1); + + // TODO: check the MDL range makes sense with regard to the mapping range + // TODO: check if any of them are already zero + // TODO: check if any outside the MDL range are nonzero + // TODO: find out what to do with extra PTEs + + // Check if the caller wants us to free advanced pages + if (Mdl->MdlFlags & MDL_FREE_EXTRA_PTES) + { + // Get the MDL page array + MdlPages = MmGetMdlPfnArray(Mdl); + + /* Number of extra pages stored after the PFN array */ + ExtraPageCount = MdlPages[PageCount]; + + // Do the math + PageCount += ExtraPageCount; + PointerPte -= ExtraPageCount; + ASSERT(PointerPte >= MmSystemPtesStart[SystemPteSpace]); + ASSERT(PointerPte <= MmSystemPtesEnd[SystemPteSpace]); + + // Get the new base address + BaseAddress = (PVOID)((ULONG_PTR)BaseAddress - + (ExtraPageCount << PAGE_SHIFT)); + } + + // Zero the PTEs + RtlZeroMemory(PointerPte, PageCount * sizeof(MMPTE)); + + // Flush the TLB + KeFlushEntireTb(TRUE, TRUE); + + // Remove flags + Mdl->MdlFlags &= ~(MDL_MAPPED_TO_SYSTEM_VA | + MDL_PARTIAL_HAS_BEEN_MAPPED | + MDL_FREE_EXTRA_PTES); } /* diff --git a/ntoskrnl/mm/ARM3/miarm.h b/ntoskrnl/mm/ARM3/miarm.h index 7515b4c506b..8e5fc41b89c 100644 --- a/ntoskrnl/mm/ARM3/miarm.h +++ b/ntoskrnl/mm/ARM3/miarm.h @@ -156,11 +156,17 @@ C_ASSERT(SYSTEM_PD_SIZE == PAGE_SIZE); // // Some internal SYSTEM_PTE_MISUSE bugcheck subcodes +// These names were created by Oleg Dubinskiy and Doug Lyons for ReactOS. For reference, see +// https://learn.microsoft.com/en-us/windows-hardware/drivers/debugger/bug-che… // -#define PTE_MAPPING_NONE 0x100 -#define PTE_MAPPING_NOT_OWNED 0x101 -#define PTE_MAPPING_EMPTY 0x102 -#define PTE_MAPPING_RESERVED 0x103 +#define PTE_MAPPING_NONE 0x100 +#define PTE_MAPPING_NOT_OWNED 0x101 +#define PTE_MAPPING_EMPTY 0x102 +#define PTE_MAPPING_RESERVED 0x103 +#define PTE_MAPPING_ADDRESS_NOT_OWNED 0x104 +#define PTE_MAPPING_ADDRESS_INVALID 0x105 +#define PTE_UNMAPPING_ADDRESS_NOT_OWNED 0x108 +#define PTE_MAPPING_ADDRESS_EMPTY 0x109 // // Mask for image section page protection @@ -1002,7 +1008,6 @@ MI_WRITE_INVALID_PTE(IN PMMPTE PointerPte, { /* Write the invalid PTE */ ASSERT(InvalidPte.u.Hard.Valid == 0); - ASSERT(InvalidPte.u.Long != 0); *PointerPte = InvalidPte; } diff --git a/ntoskrnl/mm/ARM3/pool.c b/ntoskrnl/mm/ARM3/pool.c index badc8a3e4d7..aca50bb2149 100644 --- a/ntoskrnl/mm/ARM3/pool.c +++ b/ntoskrnl/mm/ARM3/pool.c @@ -1580,6 +1580,10 @@ MmAllocateMappingAddress( PMMPTE PointerPte; MMPTE TempPte; + /* Fast exit if PoolTag is NULL */ + if (!PoolTag) + return NULL; + /* How many PTEs does the caller want? */ SizeInPages = BYTES_TO_PAGES(NumberOfBytes); if (SizeInPages == 0) diff --git a/ntoskrnl/mm/freelist.c b/ntoskrnl/mm/freelist.c index 95d73eb3cd4..6f2f99bfc3c 100644 --- a/ntoskrnl/mm/freelist.c +++ b/ntoskrnl/mm/freelist.c @@ -192,8 +192,9 @@ MiAllocatePagesForMdl(IN PHYSICAL_ADDRESS LowAddress, KIRQL OldIrql; PMMPFN Pfn1; INT LookForZeroedPages; + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); - DPRINT1("ARM3-DEBUG: Being called with %I64x %I64x %I64x %lx %d %lu\n", LowAddress, HighAddress, SkipBytes, TotalBytes, CacheAttribute, MdlFlags); + DPRINT("ARM3-DEBUG: Being called with %I64x %I64x %I64x %lx %d %lu\n", LowAddress, HighAddress, SkipBytes, TotalBytes, CacheAttribute, MdlFlags); // // Convert the low address into a PFN

7 months, 2 weeks

[reactos] 01/01: [SETUPLIB] Use proper SEH instead of nasty hacks

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31334ebcfefc818cd04ff… commit 31334ebcfefc818cd04ff7c890bd116cbc5f5099 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Oct 13 19:10:22 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Nov 18 10:23:50 2024 +0200 [SETUPLIB] Use proper SEH instead of nasty hacks Addendum to commit 2268b3d --- base/setup/lib/CMakeLists.txt | 1 + base/setup/lib/utils/filesup.c | 9 +-------- base/setup/reactos/CMakeLists.txt | 2 +- base/setup/usetup/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/base/setup/lib/CMakeLists.txt b/base/setup/lib/CMakeLists.txt index 836c9ef5967..34b43018c23 100644 --- a/base/setup/lib/CMakeLists.txt +++ b/base/setup/lib/CMakeLists.txt @@ -5,6 +5,7 @@ if(_WINKD_) endif() include_directories(spapisup utils) +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/pseh/include) list(APPEND SOURCE spapisup/fileqsup.c diff --git a/base/setup/lib/utils/filesup.c b/base/setup/lib/utils/filesup.c index 81da91faa12..9c00675c59c 100644 --- a/base/setup/lib/utils/filesup.c +++ b/base/setup/lib/utils/filesup.c @@ -10,18 +10,11 @@ #include "precomp.h" #include "filesup.h" +#include <pseh/pseh2.h> #define NDEBUG #include <debug.h> - -// ACHTUNG! HAXX FIXME!! -#define _SEH2_TRY -#define _SEH2_LEAVE goto __SEH2_FINALLY__label; -#define _SEH2_FINALLY __SEH2_FINALLY__label: -#define _SEH2_END - - /* FUNCTIONS ****************************************************************/ static diff --git a/base/setup/reactos/CMakeLists.txt b/base/setup/reactos/CMakeLists.txt index 6516663e7fb..23adc345081 100644 --- a/base/setup/reactos/CMakeLists.txt +++ b/base/setup/reactos/CMakeLists.txt @@ -19,7 +19,7 @@ add_rc_deps(reactos.rc ${reactos_rc_deps}) add_executable(reactos ${SOURCE} reactos.rc) add_pch(reactos reactos.h SOURCE) set_module_type(reactos win32gui UNICODE) -target_link_libraries(reactos uuid setuplib ext2lib vfatlib btrfslib) +target_link_libraries(reactos uuid setuplib ext2lib vfatlib btrfslib ${PSEH_LIB}) target_link_libraries(reactos zlib_solo) ## We use USETUP's cabinet implementation add_importlibs(reactos advapi32 gdi32 user32 comctl32 shlwapi setupapi msvcrt kernel32 ntdll) add_cd_file(TARGET reactos DESTINATION reactos NO_CAB FOR bootcd) diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt index 94ef7cffd14..21d2bdcf646 100644 --- a/base/setup/usetup/CMakeLists.txt +++ b/base/setup/usetup/CMakeLists.txt @@ -35,6 +35,6 @@ endif() add_pch(usetup usetup.h SOURCE) set_module_type(usetup nativecui) -target_link_libraries(usetup inflib setuplib zlib_solo ext2lib vfatlib btrfslib chkstk) +target_link_libraries(usetup inflib setuplib zlib_solo ext2lib vfatlib btrfslib chkstk ${PSEH_LIB}) add_importlibs(usetup ntdll) add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NAME_ON_CD smss.exe FOR bootcd regtest)

7 months, 2 weeks

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