Ros-diffs

ros-diffs@reactos.org

16 participants
80953 discussions

[reactos] 01/03: [COMPBATT] Keep incoming Status on unknown IOCTL

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2323dbcb4f1fe2055199d… commit 2323dbcb4f1fe2055199df3cdbed1e3e6e6559c3 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Nov 20 18:38:35 2024 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Nov 20 21:47:13 2024 +0100 [COMPBATT] Keep incoming Status on unknown IOCTL --- drivers/bus/acpi/compbatt/comppnp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/bus/acpi/compbatt/comppnp.c b/drivers/bus/acpi/compbatt/comppnp.c index 9b430b8ee18..1083ae7f866 100644 --- a/drivers/bus/acpi/compbatt/comppnp.c +++ b/drivers/bus/acpi/compbatt/comppnp.c @@ -467,7 +467,6 @@ CompBattPnpDispatch(IN PDEVICE_OBJECT DeviceObject, default: /* Not supported */ - Status = STATUS_INVALID_DEVICE_REQUEST; break; }

1 month

[reactos] 01/01: [NTOS:FSRTL] FsRtlAcquireFileExclusiveCommon: don't return before acquiring a file resource, except special cases (#7273)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9e430f65ba85e52a0a8d… commit f9e430f65ba85e52a0a8d9f694f23373dbb56806 Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Wed Nov 20 16:52:38 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 20 09:52:38 2024 -0600 [NTOS:FSRTL] FsRtlAcquireFileExclusiveCommon: don't return before acquiring a file resource, except special cases (#7273) * Don't return before file object's resource is acquired in FsRtlAcquireFileExclusiveCommon, except some special return cases, when return is reuired. Based on hpoussin_filter_extra.patch by Herve Poussineau (hpoussin) with improved comment, which matches the actual behaviour now. This is required by fltmgr.sys driver from Windows XP/Server 2003 to work correctly, so this change fixes asserts/exceptions when releasing the file via FsRtlReleaseFile after acquiring, when using 3rd party filter drivers from several antivirus programs (e. g., Avast Free Antivirus all versions, AVG Antivirus Free 18.8, Avira AntiVir Personal 8.2, Dr. Web Security Space 8.0, Kaspersky Antivirus 2012 etc. etc.). CORE-14157, CORE-14635, CORE-19318 * Add braces around return Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> * Improve the comment (make it more detailed) * Correct checks sequence Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org>

1 month

[reactos] 01/01: [SHLWAPI][SHLWAPI_APITEST] Optimize StrRetToStrW WSTR handling (#7513)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d0a26db58cb6ce8c9d00… commit 4d0a26db58cb6ce8c9d000101f11b1f2eb987ce0 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Tue Nov 19 23:50:08 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Nov 19 23:50:08 2024 +0100 [SHLWAPI][SHLWAPI_APITEST] Optimize StrRetToStrW WSTR handling (#7513) This avoids Alloc/Free while also matching the Windows behavior. --- dll/win32/shlwapi/string.c | 6 ++++++ modules/rostests/apitests/shlwapi/StrDup.c | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dll/win32/shlwapi/string.c b/dll/win32/shlwapi/string.c index 0285f6cd58a..dec137a9d67 100644 --- a/dll/win32/shlwapi/string.c +++ b/dll/win32/shlwapi/string.c @@ -1635,8 +1635,14 @@ HRESULT WINAPI StrRetToStrW(LPSTRRET lpStrRet, const ITEMIDLIST *pidl, LPWSTR *p switch (lpStrRet->uType) { case STRRET_WSTR: +#ifdef __REACTOS__ + hRet = lpStrRet->u.pOleStr ? S_OK : E_FAIL; + *ppszName = lpStrRet->u.pOleStr; + lpStrRet->u.pOleStr = NULL; /* Windows does this, presumably in case someone calls SHFree */ +#else hRet = SHStrDupW(lpStrRet->u.pOleStr, ppszName); CoTaskMemFree(lpStrRet->u.pOleStr); +#endif break; case STRRET_CSTR: diff --git a/modules/rostests/apitests/shlwapi/StrDup.c b/modules/rostests/apitests/shlwapi/StrDup.c index 4872b77948d..7d53bddd243 100644 --- a/modules/rostests/apitests/shlwapi/StrDup.c +++ b/modules/rostests/apitests/shlwapi/StrDup.c @@ -39,8 +39,25 @@ static void TEST_StrDupW(void) LocalFree(ptrW); } +static void TEST_StrRet(void) +{ + LPWSTR input, output; + if (SUCCEEDED(SHStrDupW(L"Test", &input))) + { + STRRET strret; + strret.uType = STRRET_WSTR; + U(strret).pOleStr = input; + output = NULL; + ok_int(StrRetToStrW(&strret, NULL, &output), S_OK); + ok_ptr(U(strret).pOleStr, NULL); + ok_ptr(input, output); + CoTaskMemFree(output); + } +} + START_TEST(StrDup) { TEST_StrDupA(); TEST_StrDupW(); + TEST_StrRet(); }

1 month

[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

1 month

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

1 month, 1 week

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

1 month, 1 week

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

1 month, 1 week

[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

1 month, 1 week

[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

1 month, 1 week

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

1 month, 1 week

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