Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [REACTOS] Temporarily revert 0ca4e6dcfaf, as requested by Hermès
by Stanislav Motylkov 23 Nov '24

23 Nov '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bbdcc14b1c2078c98dbd0… commit bbdcc14b1c2078c98dbd02cc498423c081e133fd Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Nov 23 23:12:02 2024 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Nov 23 23:12:02 2024 +0100 [REACTOS] Temporarily revert 0ca4e6dcfaf, as requested by Hermès The setup mistakes the unpartitioned disk as GPT. This reverts commit 0ca4e6dcfaf93165300cc1866eeae50d221ab403. --- base/setup/lib/utils/partlist.c | 80 +++++++++++++++++++++++------------------ base/setup/lib/utils/partlist.h | 10 +++--- base/setup/reactos/drivepage.c | 4 +-- base/setup/usetup/usetup.c | 6 ++-- 4 files changed, 56 insertions(+), 44 deletions(-) diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index 6793ec855a9..c045518cbfe 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -2818,48 +2818,41 @@ GetAdjUnpartitionedEntry( return NULL; } -static ERROR_NUMBER -MBRPartitionCreateChecks( - _In_ PPARTENTRY PartEntry, - _In_opt_ ULONGLONG SizeBytes, - _In_opt_ ULONG_PTR PartitionInfo) +ERROR_NUMBER +PartitionCreationChecks( + _In_ PPARTENTRY PartEntry) { PDISKENTRY DiskEntry = PartEntry->DiskEntry; - BOOLEAN isContainer = IsContainerPartition((UCHAR)PartitionInfo); - ASSERT(DiskEntry->DiskStyle == PARTITION_STYLE_MBR); - ASSERT(!PartEntry->IsPartitioned); - - if (isContainer) + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) { - /* Cannot create an extended partition within logical partition space */ - if (PartEntry->LogicalPartition) - return ERROR_ONLY_ONE_EXTENDED; - - /* Fail if there is another extended partition in the list */ - if (DiskEntry->ExtendedPartition) - return ERROR_ONLY_ONE_EXTENDED; + DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + return ERROR_WARN_PARTITION; } + /* Fail if the partition is already in use */ + if (PartEntry->IsPartitioned) + return ERROR_NEW_PARTITION; + /* - * Primary or Extended partitions + * For primary partitions */ - if (!PartEntry->LogicalPartition || isContainer) + if (!PartEntry->LogicalPartition) { /* Only one primary partition is allowed on super-floppy */ if (IsSuperFloppy(DiskEntry)) return ERROR_PARTITION_TABLE_FULL; - /* Fail if there are too many primary partitions */ + /* Fail if there are already 4 primary partitions in the list */ if (GetPrimaryPartitionCount(DiskEntry) >= 4) return ERROR_PARTITION_TABLE_FULL; } /* - * Logical partitions + * For logical partitions */ else { - // TODO: Check that we are inside an extended partition! + // TODO: Check that we are inside an extended partition!! // Then the following check will be useless. /* Only one (primary) partition is allowed on super-floppy */ @@ -2871,24 +2864,38 @@ MBRPartitionCreateChecks( } ERROR_NUMBER -PartitionCreateChecks( - _In_ PPARTENTRY PartEntry, - _In_opt_ ULONGLONG SizeBytes, - _In_opt_ ULONG_PTR PartitionInfo) +ExtendedPartitionCreationChecks( + _In_ PPARTENTRY PartEntry) { PDISKENTRY DiskEntry = PartEntry->DiskEntry; - /* Fail if the partition is already in use */ - if (PartEntry->IsPartitioned) - return ERROR_NEW_PARTITION; - - if (DiskEntry->DiskStyle == PARTITION_STYLE_MBR) - return MBRPartitionCreateChecks(PartEntry, SizeBytes, PartitionInfo); - else // if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) { DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n"); return ERROR_WARN_PARTITION; } + + /* Fail if the partition is already in use */ + if (PartEntry->IsPartitioned) + return ERROR_NEW_PARTITION; + + /* Cannot create an extended partition within logical partition space */ + if (PartEntry->LogicalPartition) + return ERROR_ONLY_ONE_EXTENDED; + + /* Only one primary partition is allowed on super-floppy */ + if (IsSuperFloppy(DiskEntry)) + return ERROR_PARTITION_TABLE_FULL; + + /* Fail if there are already 4 primary partitions in the list */ + if (GetPrimaryPartitionCount(DiskEntry) >= 4) + return ERROR_PARTITION_TABLE_FULL; + + /* Fail if there is another extended partition in the list */ + if (DiskEntry->ExtendedPartition) + return ERROR_ONLY_ONE_EXTENDED; + + return ERROR_SUCCESS; } // TODO: Improve upon the PartitionInfo parameter later @@ -2919,10 +2926,13 @@ CreatePartition( return FALSE; } - Error = PartitionCreateChecks(PartEntry, SizeBytes, PartitionInfo); + if (isContainer) + Error = ExtendedPartitionCreationChecks(PartEntry); + else + Error = PartitionCreationChecks(PartEntry); if (Error != NOT_AN_ERROR) { - DPRINT1("PartitionCreateChecks(%s) failed with error %lu\n", mainType, Error); + DPRINT1("PartitionCreationChecks(%s) failed with error %lu\n", mainType, Error); return FALSE; } diff --git a/base/setup/lib/utils/partlist.h b/base/setup/lib/utils/partlist.h index 71b9eb99181..fb20f1500c0 100644 --- a/base/setup/lib/utils/partlist.h +++ b/base/setup/lib/utils/partlist.h @@ -338,10 +338,12 @@ GetAdjUnpartitionedEntry( _In_ BOOLEAN Direction); ERROR_NUMBER -PartitionCreateChecks( - _In_ PPARTENTRY PartEntry, - _In_opt_ ULONGLONG SizeBytes, - _In_opt_ ULONG_PTR PartitionInfo); +PartitionCreationChecks( + _In_ PPARTENTRY PartEntry); + +ERROR_NUMBER +ExtendedPartitionCreationChecks( + _In_ PPARTENTRY PartEntry); BOOLEAN CreatePartition( diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c index dc4fc64cfb5..5afdb57b084 100644 --- a/base/setup/reactos/drivepage.c +++ b/base/setup/reactos/drivepage.c @@ -1975,7 +1975,7 @@ DriveDlgProc( // TODO: In the future: first test needs to be augmented with: // (... && PartEntry->Volume->IsSimpleVolume) if ((PartEntry->IsPartitioned && PartEntry->Volume) || - (!PartEntry->IsPartitioned && (PartitionCreateChecks(PartEntry, 0ULL, 0) == NOT_AN_ERROR))) + (!PartEntry->IsPartitioned && (PartitionCreationChecks(PartEntry) == NOT_AN_ERROR))) { // ASSERT(PartEntry != PartEntry->DiskEntry->ExtendedPartition); ASSERT(!IsContainerPartition(PartEntry->PartitionType)); @@ -2090,7 +2090,7 @@ DisableWizNext: { ULONG Error; - Error = PartitionCreateChecks(PartEntry, 0ULL, 0); + Error = PartitionCreationChecks(PartEntry); if (Error != NOT_AN_ERROR) { // MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 10d133eb560..d5d569ede42 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -1711,7 +1711,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) { ASSERT(CurrentPartition); - Error = PartitionCreateChecks(CurrentPartition, 0ULL, 0); + Error = PartitionCreationChecks(CurrentPartition); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); @@ -1729,7 +1729,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) if (CurrentPartition->LogicalPartition) continue; - Error = PartitionCreateChecks(CurrentPartition, 0ULL, PARTITION_EXTENDED); + Error = ExtendedPartitionCreationChecks(CurrentPartition); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); @@ -1789,7 +1789,7 @@ CreateInstallPartition: /* Create the partition if the selected region is empty */ if (!CurrentPartition->IsPartitioned) { - Error = PartitionCreateChecks(CurrentPartition, 0ULL, 0); + Error = PartitionCreationChecks(CurrentPartition); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY);

1 0

[reactos] 01/01: [SETUPLIB][REACTOS][USETUP] Finish unification of MBR extended and primary/logical partitions
by Hermès Bélusca-Maïto 23 Nov '24

23 Nov '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ca4e6dcfaf93165300cc… commit 0ca4e6dcfaf93165300cc1866eeae50d221ab403 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Nov 22 22:20:58 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Nov 23 21:41:32 2024 +0100 [SETUPLIB][REACTOS][USETUP] Finish unification of MBR extended and primary/logical partitions Addendum to commmit 99f0937fd. The partition-creation checks are unified for these partitions into one single function. To prepare for GPT support, the specifics are put into a separate MBRPartitionCreateChecks() helper, called for MBR disks by the upper-level function. GPT disks will have a similar helper in the future. --- base/setup/lib/utils/partlist.c | 80 ++++++++++++++++++----------------------- base/setup/lib/utils/partlist.h | 10 +++--- base/setup/reactos/drivepage.c | 4 +-- base/setup/usetup/usetup.c | 6 ++-- 4 files changed, 44 insertions(+), 56 deletions(-) diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index c045518cbfe..6793ec855a9 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -2818,41 +2818,48 @@ GetAdjUnpartitionedEntry( return NULL; } -ERROR_NUMBER -PartitionCreationChecks( - _In_ PPARTENTRY PartEntry) +static ERROR_NUMBER +MBRPartitionCreateChecks( + _In_ PPARTENTRY PartEntry, + _In_opt_ ULONGLONG SizeBytes, + _In_opt_ ULONG_PTR PartitionInfo) { PDISKENTRY DiskEntry = PartEntry->DiskEntry; + BOOLEAN isContainer = IsContainerPartition((UCHAR)PartitionInfo); - if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + ASSERT(DiskEntry->DiskStyle == PARTITION_STYLE_MBR); + ASSERT(!PartEntry->IsPartitioned); + + if (isContainer) { - DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n"); - return ERROR_WARN_PARTITION; - } + /* Cannot create an extended partition within logical partition space */ + if (PartEntry->LogicalPartition) + return ERROR_ONLY_ONE_EXTENDED; - /* Fail if the partition is already in use */ - if (PartEntry->IsPartitioned) - return ERROR_NEW_PARTITION; + /* Fail if there is another extended partition in the list */ + if (DiskEntry->ExtendedPartition) + return ERROR_ONLY_ONE_EXTENDED; + } /* - * For primary partitions + * Primary or Extended partitions */ - if (!PartEntry->LogicalPartition) + if (!PartEntry->LogicalPartition || isContainer) { /* Only one primary partition is allowed on super-floppy */ if (IsSuperFloppy(DiskEntry)) return ERROR_PARTITION_TABLE_FULL; - /* Fail if there are already 4 primary partitions in the list */ + /* Fail if there are too many primary partitions */ if (GetPrimaryPartitionCount(DiskEntry) >= 4) return ERROR_PARTITION_TABLE_FULL; } /* - * For logical partitions + * Logical partitions */ else { - // TODO: Check that we are inside an extended partition!! + // TODO: Check that we are inside an extended partition! // Then the following check will be useless. /* Only one (primary) partition is allowed on super-floppy */ @@ -2864,38 +2871,24 @@ PartitionCreationChecks( } ERROR_NUMBER -ExtendedPartitionCreationChecks( - _In_ PPARTENTRY PartEntry) +PartitionCreateChecks( + _In_ PPARTENTRY PartEntry, + _In_opt_ ULONGLONG SizeBytes, + _In_opt_ ULONG_PTR PartitionInfo) { PDISKENTRY DiskEntry = PartEntry->DiskEntry; - if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) - { - DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n"); - return ERROR_WARN_PARTITION; - } - /* Fail if the partition is already in use */ if (PartEntry->IsPartitioned) return ERROR_NEW_PARTITION; - /* Cannot create an extended partition within logical partition space */ - if (PartEntry->LogicalPartition) - return ERROR_ONLY_ONE_EXTENDED; - - /* Only one primary partition is allowed on super-floppy */ - if (IsSuperFloppy(DiskEntry)) - return ERROR_PARTITION_TABLE_FULL; - - /* Fail if there are already 4 primary partitions in the list */ - if (GetPrimaryPartitionCount(DiskEntry) >= 4) - return ERROR_PARTITION_TABLE_FULL; - - /* Fail if there is another extended partition in the list */ - if (DiskEntry->ExtendedPartition) - return ERROR_ONLY_ONE_EXTENDED; - - return ERROR_SUCCESS; + if (DiskEntry->DiskStyle == PARTITION_STYLE_MBR) + return MBRPartitionCreateChecks(PartEntry, SizeBytes, PartitionInfo); + else // if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + return ERROR_WARN_PARTITION; + } } // TODO: Improve upon the PartitionInfo parameter later @@ -2926,13 +2919,10 @@ CreatePartition( return FALSE; } - if (isContainer) - Error = ExtendedPartitionCreationChecks(PartEntry); - else - Error = PartitionCreationChecks(PartEntry); + Error = PartitionCreateChecks(PartEntry, SizeBytes, PartitionInfo); if (Error != NOT_AN_ERROR) { - DPRINT1("PartitionCreationChecks(%s) failed with error %lu\n", mainType, Error); + DPRINT1("PartitionCreateChecks(%s) failed with error %lu\n", mainType, Error); return FALSE; } diff --git a/base/setup/lib/utils/partlist.h b/base/setup/lib/utils/partlist.h index fb20f1500c0..71b9eb99181 100644 --- a/base/setup/lib/utils/partlist.h +++ b/base/setup/lib/utils/partlist.h @@ -338,12 +338,10 @@ GetAdjUnpartitionedEntry( _In_ BOOLEAN Direction); ERROR_NUMBER -PartitionCreationChecks( - _In_ PPARTENTRY PartEntry); - -ERROR_NUMBER -ExtendedPartitionCreationChecks( - _In_ PPARTENTRY PartEntry); +PartitionCreateChecks( + _In_ PPARTENTRY PartEntry, + _In_opt_ ULONGLONG SizeBytes, + _In_opt_ ULONG_PTR PartitionInfo); BOOLEAN CreatePartition( diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c index 5afdb57b084..dc4fc64cfb5 100644 --- a/base/setup/reactos/drivepage.c +++ b/base/setup/reactos/drivepage.c @@ -1975,7 +1975,7 @@ DriveDlgProc( // TODO: In the future: first test needs to be augmented with: // (... && PartEntry->Volume->IsSimpleVolume) if ((PartEntry->IsPartitioned && PartEntry->Volume) || - (!PartEntry->IsPartitioned && (PartitionCreationChecks(PartEntry) == NOT_AN_ERROR))) + (!PartEntry->IsPartitioned && (PartitionCreateChecks(PartEntry, 0ULL, 0) == NOT_AN_ERROR))) { // ASSERT(PartEntry != PartEntry->DiskEntry->ExtendedPartition); ASSERT(!IsContainerPartition(PartEntry->PartitionType)); @@ -2090,7 +2090,7 @@ DisableWizNext: { ULONG Error; - Error = PartitionCreationChecks(PartEntry); + Error = PartitionCreateChecks(PartEntry, 0ULL, 0); if (Error != NOT_AN_ERROR) { // MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index d5d569ede42..10d133eb560 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -1711,7 +1711,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) { ASSERT(CurrentPartition); - Error = PartitionCreationChecks(CurrentPartition); + Error = PartitionCreateChecks(CurrentPartition, 0ULL, 0); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); @@ -1729,7 +1729,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) if (CurrentPartition->LogicalPartition) continue; - Error = ExtendedPartitionCreationChecks(CurrentPartition); + Error = PartitionCreateChecks(CurrentPartition, 0ULL, PARTITION_EXTENDED); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); @@ -1789,7 +1789,7 @@ CreateInstallPartition: /* Create the partition if the selected region is empty */ if (!CurrentPartition->IsPartitioned) { - Error = PartitionCreationChecks(CurrentPartition); + Error = PartitionCreateChecks(CurrentPartition, 0ULL, 0); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY);

1 0

[reactos] 01/01: [SHELL32] Refresh SHELLSTATE before writing it (#7516)
by Whindmar Saksit 22 Nov '24

22 Nov '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89a3b8fa8af8bb7b75f60… commit 89a3b8fa8af8bb7b75f60fb4d7c2f75c32eef1ab Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Fri Nov 22 20:33:12 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 22 20:33:12 2024 +0100 [SHELL32] Refresh SHELLSTATE before writing it (#7516) --- dll/win32/shell32/wine/shellord.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dll/win32/shell32/wine/shellord.c b/dll/win32/shell32/wine/shellord.c index 2300a7aab88..effe7f55bcd 100644 --- a/dll/win32/shell32/wine/shellord.c +++ b/dll/win32/shell32/wine/shellord.c @@ -279,6 +279,11 @@ VOID WINAPI SHGetSetSettings(LPSHELLSTATE lpss, DWORD dwMask, BOOL bSet) if (bSet) { DWORD changed = 0; + if (dwMask & ~g_CachedSSF) + { + SHELLSTATE tempstate; + SHGetSetSettings(&tempstate, dwMask, FALSE); // Read entries that are not in g_CachedSSF + } #define SHGSS_WriteAdv(name, value, SSF) \ do { \

1 0

[reactos] 01/01: [GITHUB] Fix MSVC ARM build
by Stanislav Motylkov 21 Nov '24

21 Nov '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=096a5518e50ca43535eeb… commit 096a5518e50ca43535eeb7b54e2375615f9128ad Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Nov 21 23:50:49 2024 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Nov 22 00:14:10 2024 +0100 [GITHUB] Fix MSVC ARM build The latest GitHub Actions runner image 20241113.3.0 uses WDK 10.0.26100.0, which dropped support for 32-bit ARM platform: - https://github.com/golang/go/issues/68552#issuecomment-2290064500 - https://github.com/actions/runner-images/issues/10981 Fix the failing build by sticking to WDK 10.0.22621.0. CORE-17604 --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d36e80ae571..6e53c2df7f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -165,6 +165,7 @@ jobs: uses: ilammy/msvc-dev-cmd@v1 with: arch: amd64_arm + sdk: 10.0.22621.0 # Windows SDK 10.0.26100.0 dropped support for 32-bit ARM toolset: ${{matrix.toolset}} - name: Activate VS cmd (arm64) if: ${{ matrix.arch == 'arm64' }}

1 0

[reactos] 01/01: [NTOS:KD64] Only use the UNIMPLEMENTED macro in the debugger's KdpSys* helpers.
by Hermès Bélusca-Maïto 21 Nov '24

21 Nov '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=edb6d19aa88b260e3c80b… commit edb6d19aa88b260e3c80b3d20aee709cdac36f83 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 21 22:34:15 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 21 22:34:37 2024 +0100 [NTOS:KD64] Only use the UNIMPLEMENTED macro in the debugger's KdpSys* helpers. This basically avoids re-entering the debugger (via the embedded breakpoint) while we are already running within its context. In addition, this allows the tests for Kd/NtSystemDebugControl (see PRs #7424 and #7426) to run without having ReactOS to crash. --- ntoskrnl/kd64/amd64/kdx64.c | 12 ++++++------ ntoskrnl/kd64/arm/kdarm.c | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ntoskrnl/kd64/amd64/kdx64.c b/ntoskrnl/kd64/amd64/kdx64.c index 26e4ecf2e9c..3bb2745d2c4 100644 --- a/ntoskrnl/kd64/amd64/kdx64.c +++ b/ntoskrnl/kd64/amd64/kdx64.c @@ -139,7 +139,7 @@ KdpSysReadBusData(IN ULONG BusDataType, IN ULONG Length, OUT PULONG ActualLength) { - UNIMPLEMENTED_DBGBREAK(); + UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } @@ -153,7 +153,7 @@ KdpSysWriteBusData(IN ULONG BusDataType, IN ULONG Length, OUT PULONG ActualLength) { - UNIMPLEMENTED_DBGBREAK(); + UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } @@ -284,7 +284,7 @@ KdpSysReadIoSpace(IN ULONG InterfaceType, default: /* Invalid data size */ - *ActualDataSize = 0; + *ActualDataSize = 0; return STATUS_INVALID_PARAMETER; } @@ -340,7 +340,7 @@ KdpSysWriteIoSpace(IN ULONG InterfaceType, default: /* Invalid data size */ - *ActualDataSize = 0; + *ActualDataSize = 0; return STATUS_INVALID_PARAMETER; } @@ -355,7 +355,7 @@ NTSTATUS NTAPI KdpSysCheckLowMemory(IN ULONG Flags) { - UNIMPLEMENTED_DBGBREAK(); + UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } @@ -363,7 +363,7 @@ NTSTATUS NTAPI KdpAllowDisable(VOID) { - UNIMPLEMENTED_DBGBREAK(); + UNIMPLEMENTED; return STATUS_ACCESS_DENIED; } diff --git a/ntoskrnl/kd64/arm/kdarm.c b/ntoskrnl/kd64/arm/kdarm.c index 04907d3e041..a62956d1065 100644 --- a/ntoskrnl/kd64/arm/kdarm.c +++ b/ntoskrnl/kd64/arm/kdarm.c @@ -22,7 +22,7 @@ NTAPI KdpGetStateChange(IN PDBGKD_MANIPULATE_STATE64 State, IN PCONTEXT Context) { - UNIMPLEMENTED_DBGBREAK(); + UNIMPLEMENTED; } VOID @@ -30,7 +30,7 @@ NTAPI KdpSetContextState(IN PDBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange, IN PCONTEXT Context) { - UNIMPLEMENTED_DBGBREAK(); + UNIMPLEMENTED; } NTSTATUS @@ -38,7 +38,7 @@ NTAPI KdpSysReadMsr(IN ULONG Msr, OUT PLARGE_INTEGER MsrValue) { - UNIMPLEMENTED_DBGBREAK(); + UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } @@ -47,7 +47,7 @@ NTAPI KdpSysWriteMsr(IN ULONG Msr, IN PLARGE_INTEGER MsrValue) { - UNIMPLEMENTED_DBGBREAK(); + UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } @@ -61,7 +61,7 @@ KdpSysReadBusData(IN ULONG BusDataType, IN ULONG Length, OUT PULONG ActualLength) { - UNIMPLEMENTED_DBGBREAK(); + UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } @@ -75,7 +75,7 @@ KdpSysWriteBusData(IN ULONG BusDataType, IN ULONG Length, OUT PULONG ActualLength) { - UNIMPLEMENTED_DBGBREAK(); + UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } @@ -87,7 +87,7 @@ KdpSysReadControlSpace(IN ULONG Processor, IN ULONG Length, OUT PULONG ActualLength) { - UNIMPLEMENTED_DBGBREAK(); + UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } @@ -99,7 +99,7 @@ KdpSysWriteControlSpace(IN ULONG Processor, IN ULONG Length, OUT PULONG ActualLength) { - UNIMPLEMENTED_DBGBREAK(); + UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } @@ -113,7 +113,7 @@ KdpSysReadIoSpace(IN ULONG InterfaceType, IN ULONG DataSize, OUT PULONG ActualDataSize) { - UNIMPLEMENTED_DBGBREAK(); + UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } @@ -127,7 +127,7 @@ KdpSysWriteIoSpace(IN ULONG InterfaceType, IN ULONG DataSize, OUT PULONG ActualDataSize) { - UNIMPLEMENTED_DBGBREAK(); + UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } @@ -135,7 +135,7 @@ NTSTATUS NTAPI KdpSysCheckLowMemory(IN ULONG Flags) { - UNIMPLEMENTED_DBGBREAK(); + UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } @@ -143,6 +143,6 @@ NTSTATUS NTAPI KdpAllowDisable(VOID) { - UNIMPLEMENTED_DBGBREAK(); + UNIMPLEMENTED; return STATUS_ACCESS_DENIED; }

1 0

[reactos] 03/03: [COMPBATT] Use BATTERY_TAG_INVALID instead 0 when applicable
by Hervé Poussineau 20 Nov '24

20 Nov '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d3f3a16134f67f5fba29… commit 2d3f3a16134f67f5fba29a981fc30972517764cf Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Nov 20 19:08:02 2024 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Nov 20 21:47:13 2024 +0100 [COMPBATT] Use BATTERY_TAG_INVALID instead 0 when applicable --- drivers/bus/acpi/compbatt/compbatt.c | 10 +++++----- drivers/bus/acpi/compbatt/comppnp.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/bus/acpi/compbatt/compbatt.c b/drivers/bus/acpi/compbatt/compbatt.c index e6ef0d738d9..2c947910c29 100644 --- a/drivers/bus/acpi/compbatt/compbatt.c +++ b/drivers/bus/acpi/compbatt/compbatt.c @@ -111,7 +111,7 @@ CompBattRecalculateTag(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) } /* No tag for this device extension, clear it */ - DeviceExtension->Tag = 0; + DeviceExtension->Tag = BATTERY_TAG_INVALID; NextEntry = NextEntry->Flink; } @@ -161,7 +161,7 @@ CompBattQueryTag(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, } /* Do we have a tag now? */ - if ((DeviceExtension->Flags & COMPBATT_TAG_ASSIGNED) && (DeviceExtension->Tag)) + if ((DeviceExtension->Flags & COMPBATT_TAG_ASSIGNED) && DeviceExtension->Tag != BATTERY_TAG_INVALID) { /* Return the tag */ *Tag = DeviceExtension->Tag; @@ -170,7 +170,7 @@ CompBattQueryTag(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, else { /* No tag */ - *Tag = 0; + *Tag = BATTERY_TAG_INVALID; Status = STATUS_NO_SUCH_DEVICE; } @@ -261,7 +261,7 @@ CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInfo, InputBuffer.AtRate = 0; /* Make sure the battery has a tag */ - if (BatteryData->Tag) + if (BatteryData->Tag != BATTERY_TAG_INVALID) { /* Do we already have the data? */ if (!(BatteryData->Flags & COMPBATT_BATTERY_INFORMATION_PRESENT)) @@ -419,7 +419,7 @@ CompBattGetBatteryGranularity(OUT PBATTERY_REPORTING_SCALE ReportingScale, InputBuffer.InformationLevel = BatteryGranularityInformation; /* Make sure the battery has a tag */ - if (BatteryData->Tag) + if (BatteryData->Tag != BATTERY_TAG_INVALID) { /* Send the IOCTL to query the information */ RtlZeroMemory(&BatteryData->BatteryInformation, diff --git a/drivers/bus/acpi/compbatt/comppnp.c b/drivers/bus/acpi/compbatt/comppnp.c index 61b87736758..141ec2ebbe4 100644 --- a/drivers/bus/acpi/compbatt/comppnp.c +++ b/drivers/bus/acpi/compbatt/comppnp.c @@ -134,7 +134,7 @@ CompBattAddNewBattery(IN PUNICODE_STRING BatteryName, { /* Initialize the data and write the battery name */ RtlZeroMemory(BatteryData, sizeof(COMPBATT_BATTERY_DATA)); - BatteryData->Tag = 0; + BatteryData->Tag = BATTERY_TAG_INVALID; BatteryData->BatteryName.MaximumLength = BatteryName->Length; BatteryData->BatteryName.Buffer = (PWCHAR)(BatteryData + 1); RtlCopyUnicodeString(&BatteryData->BatteryName, BatteryName);

1 0

[reactos] 02/03: [COMPBATT] Free device-related memory only if we failed
by Hervé Poussineau 20 Nov '24

20 Nov '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=05ae94092e6bf40344a5f… commit 05ae94092e6bf40344a5ffb4dbd58121a853668e Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Nov 20 18:59:20 2024 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Nov 20 21:47:13 2024 +0100 [COMPBATT] Free device-related memory only if we failed Otherwise, we just inserted in the BatteryList this device, and we will probably crash later when accessing it. --- drivers/bus/acpi/compbatt/comppnp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/bus/acpi/compbatt/comppnp.c b/drivers/bus/acpi/compbatt/comppnp.c index 1083ae7f866..61b87736758 100644 --- a/drivers/bus/acpi/compbatt/comppnp.c +++ b/drivers/bus/acpi/compbatt/comppnp.c @@ -199,8 +199,11 @@ CompBattAddNewBattery(IN PUNICODE_STRING BatteryName, Status); } - /* Free the battery data */ - ExFreePool(BatteryData); + if (!NT_SUCCESS(Status)) + { + /* Free the battery data */ + ExFreePool(BatteryData); + } } else {

1 0

[reactos] 01/03: [COMPBATT] Keep incoming Status on unknown IOCTL
by Hervé Poussineau 20 Nov '24

20 Nov '24

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 0

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

20 Nov '24

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 0

[reactos] 01/01: [SHLWAPI][SHLWAPI_APITEST] Optimize StrRetToStrW WSTR handling (#7513)
by Whindmar Saksit 19 Nov '24

19 Nov '24

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 0

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