Ros-diffs August 2024

ros-diffs@reactos.org

26 participants
139 discussions

[reactos] 01/01: [HALX86] acpi/madt.c: Rewrite it (#6032)
by Serge Gautherie 31 Aug '24

31 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c8d083fc019cdfb465b8… commit 2c8d083fc019cdfb465b8e64fd1438d394629c4c Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Aug 31 23:35:50 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 31 14:35:50 2024 -0700 [HALX86] acpi/madt.c: Rewrite it (#6032) Especially HalpParseApicTables() which looked early-WIP and was buggy. And keep smp/mps/mps.c in sync'. --- hal/halx86/acpi/madt.c | 248 ++++++++++++++++++++++++++++++++++++++++------- hal/halx86/include/smp.h | 13 ++- hal/halx86/smp/mps/mps.c | 29 ++++-- 3 files changed, 239 insertions(+), 51 deletions(-) diff --git a/hal/halx86/acpi/madt.c b/hal/halx86/acpi/madt.c index cd26be67b21..f61d51b5d02 100644 --- a/hal/halx86/acpi/madt.c +++ b/hal/halx86/acpi/madt.c @@ -3,6 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Source File for MADT Table parsing * COPYRIGHT: Copyright 2021 Justin Miller <justinmiller100(a)gmail.com> + * Copyright 2023 Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> */ /* INCLUDES *******************************************************************/ @@ -12,77 +13,250 @@ /* ACPI_BIOS_ERROR defined in acoutput.h and bugcodes.h */ #undef ACPI_BIOS_ERROR #include <smp.h> + #define NDEBUG #include <debug.h> +// See HalpParseApicTables(). Only enable this to local-debug it. +// That needs, for example, to test-call the function later or to use the "FrLdrDbgPrint" hack. +#if DBG && 0 + #define DPRINT01 DPRINT1 + #define DPRINT00 DPRINT +#else +#if defined(_MSC_VER) + #define DPRINT01 __noop + #define DPRINT00 __noop +#else + #define DPRINT01(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #define DPRINT00(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) +#endif // _MSC_VER +#endif // DBG && 0 + /* GLOBALS ********************************************************************/ -PROCESSOR_IDENTITY HalpStaticProcessorIdentity[MAXIMUM_PROCESSORS] = {{0}}; -PPROCESSOR_IDENTITY HalpProcessorIdentity = NULL; HALP_APIC_INFO_TABLE HalpApicInfoTable; -ACPI_TABLE_MADT *MadtTable; -ACPI_SUBTABLE_HEADER *AcpiHeader; -ACPI_MADT_LOCAL_APIC *LocalApic; + +// ACPI_MADT_LOCAL_APIC.LapicFlags masks +#define LAPIC_FLAG_ENABLED 0x00000001 +#define LAPIC_FLAG_ONLINE_CAPABLE 0x00000002 +// Bits 2-31 are reserved. + +static PROCESSOR_IDENTITY HalpStaticProcessorIdentity[MAXIMUM_PROCESSORS]; +const PPROCESSOR_IDENTITY HalpProcessorIdentity = HalpStaticProcessorIdentity; + +#if 0 +extern ULONG HalpPicVectorRedirect[16]; +#endif /* FUNCTIONS ******************************************************************/ +// Note: HalpParseApicTables() is called early, so its DPRINT*() do nothing. VOID HalpParseApicTables( _In_ PLOADER_PARAMETER_BLOCK LoaderBlock) { + ACPI_TABLE_MADT *MadtTable; + ACPI_SUBTABLE_HEADER *AcpiHeader; ULONG_PTR TableEnd; - ULONG ValidProcessorCount; - /* We only support legacy APIC for now, this will be updated in the future */ - HalpApicInfoTable.ApicMode = 0x10; - MadtTable = HalAcpiGetTable(LoaderBlock, 'CIPA'); + MadtTable = HalAcpiGetTable(LoaderBlock, APIC_SIGNATURE); + if (!MadtTable) + { + DPRINT01("MADT table not found\n"); + return; + } + + if (MadtTable->Header.Length < sizeof(*MadtTable)) + { + DPRINT01("Length is too short: %p, %u\n", MadtTable, MadtTable->Header.Length); + return; + } - AcpiHeader = (ACPI_SUBTABLE_HEADER*)MadtTable; - AcpiHeader->Length = sizeof(ACPI_TABLE_MADT); - TableEnd = (ULONG_PTR)MadtTable + MadtTable->Header.Length; + DPRINT00("MADT table: Address %08X, Flags %08X\n", MadtTable->Address, MadtTable->Flags); - HalpApicInfoTable.ProcessorCount = 0; - HalpProcessorIdentity = HalpStaticProcessorIdentity; +#if 1 - AcpiHeader = (ACPI_SUBTABLE_HEADER*)MadtTable; - AcpiHeader->Length = sizeof(ACPI_TABLE_MADT); - TableEnd = (ULONG_PTR)MadtTable + MadtTable->Header.Length; + // TODO: We support only legacy APIC for now + HalpApicInfoTable.ApicMode = HALP_APIC_MODE_LEGACY; + // TODO: What about 'MadtTable->Flags & ACPI_MADT_PCAT_COMPAT'? - while ((ULONG_PTR)AcpiHeader <= TableEnd) +#else // TODO: Is that correct? + + if ((MadtTable->Flags & ACPI_MADT_PCAT_COMPAT) == ACPI_MADT_DUAL_PIC) + { + HalpApicInfoTable.ApicMode = HALP_APIC_MODE_LEGACY; + } + else // if ((MadtTable->Flags & ACPI_MADT_PCAT_COMPAT) == ACPI_MADT_MULTIPLE_APIC) { - LocalApic = (ACPI_MADT_LOCAL_APIC*)AcpiHeader; +#if 1 + DPRINT01("ACPI_MADT_MULTIPLE_APIC support is UNIMPLEMENTED\n"); + return; +#else + HalpApicInfoTable.ApicMode = HALP_APIC_MODE_xyz; +#endif + } - if (LocalApic->Header.Type == ACPI_MADT_TYPE_LOCAL_APIC && - LocalApic->Header.Length == sizeof(ACPI_MADT_LOCAL_APIC)) - { - ValidProcessorCount = HalpApicInfoTable.ProcessorCount; +#endif + + HalpApicInfoTable.LocalApicPA = MadtTable->Address; - HalpProcessorIdentity[ValidProcessorCount].LapicId = LocalApic->Id; - HalpProcessorIdentity[ValidProcessorCount].ProcessorId = LocalApic->ProcessorId; + AcpiHeader = (ACPI_SUBTABLE_HEADER *)((ULONG_PTR)MadtTable + sizeof(*MadtTable)); + TableEnd = (ULONG_PTR)MadtTable + MadtTable->Header.Length; + DPRINT00(" MadtTable %p, subtables %p - %p\n", MadtTable, AcpiHeader, (PVOID)TableEnd); - HalpApicInfoTable.ProcessorCount++; + while ((ULONG_PTR)(AcpiHeader + 1) <= TableEnd) + { + if (AcpiHeader->Length < sizeof(*AcpiHeader)) + { + DPRINT01("Length is too short: %p, %u\n", AcpiHeader, AcpiHeader->Length); + return; + } - AcpiHeader = (ACPI_SUBTABLE_HEADER*)((ULONG_PTR)AcpiHeader + AcpiHeader->Length); + if ((ULONG_PTR)AcpiHeader + AcpiHeader->Length > TableEnd) + { + DPRINT01("Length mismatch: %p, %u, %p\n", + AcpiHeader, AcpiHeader->Length, (PVOID)TableEnd); + return; } - else + + switch (AcpiHeader->Type) { - /* End the parsing early if we don't use the currently selected table */ - AcpiHeader = (ACPI_SUBTABLE_HEADER*)((ULONG_PTR)AcpiHeader + 1); + case ACPI_MADT_TYPE_LOCAL_APIC: + { + ACPI_MADT_LOCAL_APIC *LocalApic = (ACPI_MADT_LOCAL_APIC *)AcpiHeader; + + if (AcpiHeader->Length != sizeof(*LocalApic)) + { + DPRINT01("Type/Length mismatch: %p, %u\n", AcpiHeader, AcpiHeader->Length); + return; + } + + DPRINT00(" Local Apic, Processor %lu: ProcessorId %u, Id %u, LapicFlags %08X\n", + HalpApicInfoTable.ProcessorCount, + LocalApic->ProcessorId, LocalApic->Id, LocalApic->LapicFlags); + + if (!(LocalApic->LapicFlags & (LAPIC_FLAG_ONLINE_CAPABLE | LAPIC_FLAG_ENABLED))) + { + DPRINT00(" Ignored: unusable\n"); + break; + } + + if (HalpApicInfoTable.ProcessorCount == _countof(HalpStaticProcessorIdentity)) + { + DPRINT00(" Skipped: array is full\n"); + // We assume ignoring this processor is acceptable, until proven otherwise. + break; + } + + // Note: ProcessorId and Id are not validated in any way (yet). + HalpProcessorIdentity[HalpApicInfoTable.ProcessorCount].ProcessorId = + LocalApic->ProcessorId; + HalpProcessorIdentity[HalpApicInfoTable.ProcessorCount].LapicId = LocalApic->Id; + + HalpApicInfoTable.ProcessorCount++; + + break; + } + case ACPI_MADT_TYPE_IO_APIC: + { + ACPI_MADT_IO_APIC *IoApic = (ACPI_MADT_IO_APIC *)AcpiHeader; + + if (AcpiHeader->Length != sizeof(*IoApic)) + { + DPRINT01("Type/Length mismatch: %p, %u\n", AcpiHeader, AcpiHeader->Length); + return; + } + + DPRINT00(" Io Apic: Id %u, Address %08X, GlobalIrqBase %08X\n", + IoApic->Id, IoApic->Address, IoApic->GlobalIrqBase); + + // Ensure HalpApicInfoTable.IOAPICCount consistency. + if (HalpApicInfoTable.IoApicPA[IoApic->Id] != 0) + { + DPRINT01("Id duplication: %p, %u\n", IoApic, IoApic->Id); + return; + } + + // Note: Address and GlobalIrqBase are not validated in any way (yet). + HalpApicInfoTable.IoApicPA[IoApic->Id] = IoApic->Address; + HalpApicInfoTable.IoApicIrqBase[IoApic->Id] = IoApic->GlobalIrqBase; + + HalpApicInfoTable.IOAPICCount++; + + break; + } + case ACPI_MADT_TYPE_INTERRUPT_OVERRIDE: + { + ACPI_MADT_INTERRUPT_OVERRIDE *InterruptOverride = + (ACPI_MADT_INTERRUPT_OVERRIDE *)AcpiHeader; + + if (AcpiHeader->Length != sizeof(*InterruptOverride)) + { + DPRINT01("Type/Length mismatch: %p, %u\n", AcpiHeader, AcpiHeader->Length); + return; + } + + DPRINT00(" Interrupt Override: Bus %u, SourceIrq %u, GlobalIrq %08X, IntiFlags %04X / UNIMPLEMENTED\n", + InterruptOverride->Bus, InterruptOverride->SourceIrq, + InterruptOverride->GlobalIrq, InterruptOverride->IntiFlags); + + if (InterruptOverride->Bus != 0) // 0 = ISA + { + DPRINT01("Invalid Bus: %p, %u\n", InterruptOverride, InterruptOverride->Bus); + return; + } + +#if 1 + // TODO: Implement it. +#else // TODO: Is that correct? + if (InterruptOverride->SourceIrq > _countof(HalpPicVectorRedirect)) + { + DPRINT01("Invalid SourceIrq: %p, %u\n", + InterruptOverride, InterruptOverride->SourceIrq); + return; + } + + // Note: GlobalIrq is not validated in any way (yet). + HalpPicVectorRedirect[InterruptOverride->SourceIrq] = InterruptOverride->GlobalIrq; + // TODO: What about 'InterruptOverride->IntiFlags'? +#endif + + break; + } + default: + { + DPRINT01(" UNIMPLEMENTED: Type %u, Length %u\n", + AcpiHeader->Type, AcpiHeader->Length); + return; + } } + + AcpiHeader = (ACPI_SUBTABLE_HEADER *)((ULONG_PTR)AcpiHeader + AcpiHeader->Length); + } + + if ((ULONG_PTR)AcpiHeader != TableEnd) + { + DPRINT01("Length mismatch: %p, %p, %p\n", MadtTable, AcpiHeader, (PVOID)TableEnd); + return; } } VOID HalpPrintApicTables(VOID) -{ - UINT32 i; +{ +#if DBG + ULONG i; - DPRINT1("HAL has detected a physical processor count of: %d\n", HalpApicInfoTable.ProcessorCount); + DPRINT1("Physical processor count: %lu\n", HalpApicInfoTable.ProcessorCount); for (i = 0; i < HalpApicInfoTable.ProcessorCount; i++) { - DPRINT1("Information about the following processor is for processors number: %d\n" - " The BSPCheck is set to: %X\n" - " The LapicID is set to: %X\n", - i, HalpProcessorIdentity[i].BSPCheck, HalpProcessorIdentity[i].LapicId); + DPRINT1(" Processor %lu: ProcessorId %u, LapicId %u, ProcessorStarted %u, BSPCheck %u, ProcessorPrcb %p\n", + i, + HalpProcessorIdentity[i].ProcessorId, + HalpProcessorIdentity[i].LapicId, + HalpProcessorIdentity[i].ProcessorStarted, + HalpProcessorIdentity[i].BSPCheck, + HalpProcessorIdentity[i].ProcessorPrcb); } +#endif } diff --git a/hal/halx86/include/smp.h b/hal/halx86/include/smp.h index 7efa12afc39..d38a5be4f16 100644 --- a/hal/halx86/include/smp.h +++ b/hal/halx86/include/smp.h @@ -15,22 +15,25 @@ typedef struct _PROCESSOR_IDENTITY BOOLEAN ProcessorStarted; BOOLEAN BSPCheck; PKPRCB ProcessorPrcb; - } PROCESSOR_IDENTITY, *PPROCESSOR_IDENTITY; /* This table is counter of the overall APIC constants acquired from madt */ +#define HALP_APIC_INFO_TABLE_IOAPIC_NUMBER 256 // ACPI_MADT_IO_APIC.Id is a UINT8. typedef struct _HALP_APIC_INFO_TABLE { ULONG ApicMode; ULONG ProcessorCount; /* Count of all physical cores, This includes BSP */ ULONG IOAPICCount; ULONG LocalApicPA; // The 32-bit physical address at which each processor can access its local interrupt controller - ULONG IoApicVA[256]; - ULONG IoApicPA[256]; - ULONG IoApicIrqBase[256]; // Global system interrupt base - + ULONG IoApicVA[HALP_APIC_INFO_TABLE_IOAPIC_NUMBER]; + ULONG IoApicPA[HALP_APIC_INFO_TABLE_IOAPIC_NUMBER]; + ULONG IoApicIrqBase[HALP_APIC_INFO_TABLE_IOAPIC_NUMBER]; // Global system interrupt base } HALP_APIC_INFO_TABLE, *PHALP_APIC_INFO_TABLE; +/* HALP_APIC_INFO_TABLE.ApicMode values */ +// TODO: What are the other modes/values? +#define HALP_APIC_MODE_LEGACY 0x00000010 + VOID HalpParseApicTables( _In_ PLOADER_PARAMETER_BLOCK LoaderBlock); diff --git a/hal/halx86/smp/mps/mps.c b/hal/halx86/smp/mps/mps.c index a55a962f02d..7b1a279772f 100644 --- a/hal/halx86/smp/mps/mps.c +++ b/hal/halx86/smp/mps/mps.c @@ -9,14 +9,17 @@ #include <hal.h> #include <smp.h> + #define NDEBUG #include <debug.h> /* GLOBALS ********************************************************************/ -PROCESSOR_IDENTITY HalpStaticProcessorIdentity[MAXIMUM_PROCESSORS] = {{0}}; -PPROCESSOR_IDENTITY HalpProcessorIdentity = NULL; -UINT32 PhysicalProcessorCount = 0; +static // TODO: While HalpParseApicTables() is UNIMPLEMENTED. +ULONG PhysicalProcessorCount; + +static PROCESSOR_IDENTITY HalpStaticProcessorIdentity[MAXIMUM_PROCESSORS]; +const PPROCESSOR_IDENTITY HalpProcessorIdentity = HalpStaticProcessorIdentity; /* FUNCTIONS ******************************************************************/ @@ -24,20 +27,28 @@ VOID HalpParseApicTables( _In_ PLOADER_PARAMETER_BLOCK LoaderBlock) { + UNREFERENCED_PARAMETER(LoaderBlock); + + // TODO: Fill HalpStaticProcessorIdentity[]. UNIMPLEMENTED; } VOID HalpPrintApicTables(VOID) { - UINT32 i; +#if DBG + ULONG i; - DPRINT1("HAL has detected a physical processor count of: %d\n", PhysicalProcessorCount); + DPRINT1("Physical processor count: %lu\n", PhysicalProcessorCount); for (i = 0; i < PhysicalProcessorCount; i++) { - DPRINT1("Information about the following processor is for processors number: %d\n" - " The BSPCheck is set to: %X\n" - " The LapicID is set to: %X\n", - i, HalpProcessorIdentity[i].BSPCheck, HalpProcessorIdentity[i].LapicId); + DPRINT1(" Processor %lu: ProcessorId %u, LapicId %u, ProcessorStarted %u, BSPCheck %u, ProcessorPrcb %p\n", + i, + HalpProcessorIdentity[i].ProcessorId, + HalpProcessorIdentity[i].LapicId, + HalpProcessorIdentity[i].ProcessorStarted, + HalpProcessorIdentity[i].BSPCheck, + HalpProcessorIdentity[i].ProcessorPrcb); } +#endif }

1 0

[reactos] 01/01: [ADVPACK] files.c: Properly mark Wine diff
by Serge Gautherie 31 Aug '24

31 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7661f7826c991d5d30692… commit 7661f7826c991d5d30692d9ceccb456000e95a12 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Oct 13 19:56:10 2022 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Sep 1 00:18:42 2024 +0300 [ADVPACK] files.c: Properly mark Wine diff Addendum to 6eb8a1d (0.4.15-dev-6918). --- dll/win32/advpack/files.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dll/win32/advpack/files.c b/dll/win32/advpack/files.c index 6f06bf0e9ab..f373e78dda7 100644 --- a/dll/win32/advpack/files.c +++ b/dll/win32/advpack/files.c @@ -341,17 +341,13 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags) HANDLE hFindFile; WIN32_FIND_DATAW w32fd; BOOL done = TRUE; - int fname_len; - + int fname_len = lstrlenW(fname); #ifdef __REACTOS__ if (flags & ADN_DEL_IF_EMPTY) - { goto deleteinitialdirectory; - } #endif /* Generate a path with wildcard suitable for iterating */ - fname_len = lstrlenW(fname); if (fname_len && fname[fname_len-1] != '\\') fname[fname_len++] = '\\'; lstrcpyW(fname + fname_len, asterisk); @@ -381,7 +377,9 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags) { #ifdef __REACTOS__ deleteinitialdirectory: +#endif TRACE("%s: directory\n", debugstr_w(fname)); +#ifdef __REACTOS__ SetFileAttributesW(fname, FILE_ATTRIBUTE_NORMAL); if (RemoveDirectoryW(fname)) #else @@ -454,7 +452,7 @@ HRESULT WINAPI DelNodeW(LPCWSTR pszFileOrDirName, DWORD dwFlags) HRESULT ret = E_FAIL; TRACE("(%s, %d)\n", debugstr_w(pszFileOrDirName), dwFlags); - + #ifdef __REACTOS__ if (dwFlags & ~ADN_DEL_IF_EMPTY) FIXME("Flags %#x ignored!\n", dwFlags & ~ADN_DEL_IF_EMPTY);

1 0

[reactos] 01/01: [NTOS:KE] Clear NpxThread on rundown for SMP as well (#7151)
by Justin Miller 31 Aug '24

31 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49e07292edb09a3739a17… commit 49e07292edb09a3739a172e3caee4d053dce85a7 Author: Justin Miller <justin.miller(a)reactos.org> AuthorDate: Sat Aug 31 13:18:07 2024 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 31 13:18:07 2024 -0700 [NTOS:KE] Clear NpxThread on rundown for SMP as well (#7151) clear NpxThread on rundown for SMP as well Fixes the crash whenever a usermode thread is destroyed on x86 --- ntoskrnl/include/internal/i386/ke.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ntoskrnl/include/internal/i386/ke.h b/ntoskrnl/include/internal/i386/ke.h index 01cef59b053..81194e91e0e 100644 --- a/ntoskrnl/include/internal/i386/ke.h +++ b/ntoskrnl/include/internal/i386/ke.h @@ -386,7 +386,6 @@ FORCEINLINE VOID KiRundownThread(IN PKTHREAD Thread) { -#ifndef CONFIG_SMP /* Check if this is the NPX Thread */ if (KeGetCurrentPrcb()->NpxThread == Thread) { @@ -394,9 +393,6 @@ KiRundownThread(IN PKTHREAD Thread) KeGetCurrentPrcb()->NpxThread = NULL; Ke386FnInit(); } -#else - /* Nothing to do */ -#endif } CODE_SEG("INIT")

1 0

[reactos] 01/01: [RAPPS] Fix AppInfo panel WM_SYSCOLORCHANGE bug (#7290)
by Whindmar Saksit 31 Aug '24

31 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f54e0e504640028a09e3… commit 3f54e0e504640028a09e3ea0c1034d083ef012d1 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Aug 31 22:10:35 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 31 22:10:35 2024 +0200 [RAPPS] Fix AppInfo panel WM_SYSCOLORCHANGE bug (#7290) --- base/applications/rapps/appview.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index a173d9530ac..e16c0929a92 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -792,6 +792,11 @@ CAppInfoDisplay::ProcessWindowMessage( } break; } + case WM_SYSCOLORCHANGE: + { + RichEdit->SendMessageW(EM_SETBKGNDCOLOR, 0, GetSysColor(COLOR_BTNFACE)); + break; + } } return FALSE; @@ -1587,7 +1592,7 @@ CApplicationView::ProcessWindowMessage( { /* Forward WM_SYSCOLORCHANGE to common controls */ m_ListView->SendMessageW(WM_SYSCOLORCHANGE, wParam, lParam); - m_ListView->SendMessageW(EM_SETBKGNDCOLOR, 0, GetSysColor(COLOR_BTNFACE)); + m_AppsInfo->SendMessageW(WM_SYSCOLORCHANGE, wParam, lParam); m_Toolbar->SendMessageW(WM_SYSCOLORCHANGE, wParam, lParam); m_ComboBox->SendMessageW(WM_SYSCOLORCHANGE, wParam, lParam); }

1 0

[reactos] 01/01: [NTUSER] Address memory leak in co_WinPosSetWindowPos(). (#7284)
by Marek Benc 31 Aug '24

31 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=633d2e6d0cd4938dc6227… commit 633d2e6d0cd4938dc6227c22f30cc2fd81c673aa Author: Marek Benc <benc.marek.elektro98(a)proton.me> AuthorDate: Sat Aug 31 22:07:33 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 31 15:07:33 2024 -0500 [NTUSER] Address memory leak in co_WinPosSetWindowPos(). (#7284) CORE-19723 --- win32ss/user/ntuser/winpos.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 7256f59ad56..d06730112be 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -2071,11 +2071,6 @@ co_WinPosSetWindowPos( RgnType = IntGdiCombineRgn(CopyRgn, VisAfter, VisBeforeJustClient, RGN_AND); } - if (VisBeforeJustClient != NULL) - { - REGION_Delete(VisBeforeJustClient); - } - /* Now use in copying bits which are in the update region. */ if (Window->hrgnUpdate != NULL) { @@ -2223,11 +2218,6 @@ co_WinPosSetWindowPos( } } - if (CopyRgn != NULL) - { - REGION_Delete(CopyRgn); - } - /* Expose what was covered before but not covered anymore */ if (VisBefore != NULL) { @@ -2248,12 +2238,6 @@ co_WinPosSetWindowPos( } REGION_Delete(ExposedRgn); } - REGION_Delete(VisBefore); - } - - if (VisAfter != NULL) - { - REGION_Delete(VisAfter); } } @@ -2301,6 +2285,27 @@ co_WinPosSetWindowPos( WinPos.flags |= SWP_NOZORDER|SWP_NOREDRAW; } + if (VisBefore != NULL) + { + REGION_Delete(VisBefore); + VisBefore = NULL; + } + if (VisBeforeJustClient != NULL) + { + REGION_Delete(VisBeforeJustClient); + VisBeforeJustClient = NULL; + } + if (VisAfter != NULL) + { + REGION_Delete(VisAfter); + VisAfter = NULL; + } + if (CopyRgn != NULL) + { + REGION_Delete(CopyRgn); + CopyRgn = NULL; + } + if(!(flags & SWP_DEFERERASE)) { /* erase parent when hiding or resizing child */

1 0

[reactos] 01/01: [RAPPS] Show listview context menu when the keyboard menu button/Shift+F10 is pressed (#5620)
by Whindmar Saksit 31 Aug '24

31 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=163f3407c8fa93ce06773… commit 163f3407c8fa93ce06773fdf9fc53064506bd05e Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Aug 31 18:30:45 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 31 18:30:45 2024 +0200 [RAPPS] Show listview context menu when the keyboard menu button/Shift+F10 is pressed (#5620) --- base/applications/rapps/appview.cpp | 33 ++++++++++++++++++++++++--------- base/applications/rapps/include/misc.h | 2 +- base/applications/rapps/misc.cpp | 9 ++++++--- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index e2af2ab6c5c..a173d9530ac 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -1569,15 +1569,6 @@ CApplicationView::ProcessWindowMessage( } } break; - - case NM_RCLICK: - { - if (((LPNMLISTVIEW)lParam)->iItem != -1) - { - ShowPopupMenuEx(m_hWnd, m_hWnd, 0, ID_INSTALL); - } - } - break; } } else if (pNotifyHeader->hwndFrom == m_Toolbar->GetWindow()) @@ -1613,6 +1604,30 @@ CApplicationView::ProcessWindowMessage( OnCommand(wParam, lParam); } break; + + case WM_CONTEXTMENU: + { + bool kbd = -1 == (int)(INT_PTR)lParam; + if ((HWND)wParam == m_ListView->m_hWnd) + { + int item = m_ListView->GetNextItem(-1, LVNI_FOCUSED | LVNI_SELECTED); + if (item != -1) + { + POINT *ppt = NULL, pt; + if (kbd) + { + RECT r; + ListView_GetItemRect((HWND)wParam, item, &r, LVIR_LABEL); + pt.x = r.left + (r.right - r.left) / 2; + pt.y = r.top + (r.bottom - r.top) / 2; + ::ClientToScreen((HWND)wParam, ppt = &pt); + } + ShowPopupMenuEx(m_hWnd, m_hWnd, 0, ID_INSTALL, ppt); + return TRUE; + } + } + } + break; } return FALSE; } diff --git a/base/applications/rapps/include/misc.h b/base/applications/rapps/include/misc.h index b43585d748a..91ede797f08 100644 --- a/base/applications/rapps/include/misc.h +++ b/base/applications/rapps/include/misc.h @@ -29,7 +29,7 @@ ErrorFromHResult(HRESULT hr) VOID CopyTextToClipboard(LPCWSTR lpszText); VOID -ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem); +ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem, POINT *Point = NULL); BOOL StartProcess(const CStringW &Path, BOOL Wait); BOOL diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index f2b15d5c645..400f0b588e6 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -40,7 +40,7 @@ CopyTextToClipboard(LPCWSTR lpszText) } VOID -ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem) +ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem, POINT *Point) { HMENU hMenu = NULL; HMENU hPopupMenu; @@ -68,10 +68,13 @@ ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem) SetMenuDefaultItem(hPopupMenu, DefaultItem, FALSE); } - GetCursorPos(&pt); + if (!Point) + { + GetCursorPos(Point = &pt); + } SetForegroundWindow(hwnd); - TrackPopupMenu(hPopupMenu, 0, pt.x, pt.y, 0, hwndOwner, NULL); + TrackPopupMenu(hPopupMenu, 0, Point->x, Point->y, 0, hwndOwner, NULL); if (hMenu) {

1 0

[reactos] 01/01: [XMLLITE_WINETEST] Fully mark Wine diff
by Serge Gautherie 31 Aug '24

31 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0197a5bcae9ac32541285… commit 0197a5bcae9ac325412850a83aa66c49d132864a Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon May 24 08:56:17 2021 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Aug 31 18:30:16 2024 +0300 [XMLLITE_WINETEST] Fully mark Wine diff Addendum to 3d1ca45 (0.4.15-dev-5553). --- modules/rostests/winetests/xmllite/reader.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/rostests/winetests/xmllite/reader.c b/modules/rostests/winetests/xmllite/reader.c index c44fed4c8c0..f9b67a37835 100644 --- a/modules/rostests/winetests/xmllite/reader.c +++ b/modules/rostests/winetests/xmllite/reader.c @@ -538,7 +538,7 @@ static void test_reader_create(void) IUnknown *input, *unk; IXmlReader *reader; #ifdef __REACTOS__ - ULONG_PTR dtd; + LONG_PTR dtd; #else DtdProcessing dtd; #endif @@ -607,7 +607,11 @@ static void test_reader_create(void) dtd = 2; hr = IXmlReader_GetProperty(reader, XmlReaderProperty_DtdProcessing, (LONG_PTR*)&dtd); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); +#ifdef __REACTOS__ ok(dtd == DtdProcessing_Prohibit, "got %Id\n", dtd); +#else + ok(dtd == DtdProcessing_Prohibit, "got %d\n", dtd); +#endif dtd = 2; hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, dtd);

1 0

[reactos] 03/03: [VFD] Properly mark ReactOS's diffs
by Serge Gautherie 31 Aug '24

31 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ff08b6404534535415d9… commit 3ff08b6404534535415d9f6f84c4efeebf678eeb Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Jun 14 13:49:22 2020 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Aug 31 18:23:01 2024 +0300 [VFD] Properly mark ReactOS's diffs Addendum to 25c7e1a (0.4.7-dev-1106) and follow-ups. --- .../rosapps/applications/cmdutils/vfdcmd/vfdmsg.mc | 7 +++++++ modules/rosapps/drivers/vfd/imports.h | 8 ++++---- modules/rosapps/drivers/vfd/vfddbg.c | 4 +++- modules/rosapps/drivers/vfd/vfdimg.c | 2 +- modules/rosapps/drivers/vfd/vfdmnt.c | 2 +- modules/rosapps/drivers/vfd/vfdpnp.c | 2 +- modules/rosapps/include/vfd/vfdio.h | 4 ++-- modules/rosapps/lib/vfdlib/vfdctl.c | 4 ++-- modules/rosapps/lib/vfdlib/vfdguiopen.c | 8 ++++++-- modules/rosapps/lib/vfdlib/vfdguisave.c | 20 ++++++++++++++++++-- modules/rosapps/lib/vfdlib/vfdguitip.c | 13 +++++++++++++ modules/rosapps/lib/vfdlib/vfdmsg_lib.mc | 6 ++++++ modules/rosapps/lib/vfdlib/vfdshext.h | 2 +- modules/rosapps/lib/vfdlib/vfdshmenu.cpp | 3 ++- modules/rosapps/lib/vfdlib/vfdshutil.cpp | 4 ++-- 15 files changed, 69 insertions(+), 20 deletions(-) diff --git a/modules/rosapps/applications/cmdutils/vfdcmd/vfdmsg.mc b/modules/rosapps/applications/cmdutils/vfdcmd/vfdmsg.mc index 33ee9145c2c..8c428cf944a 100644 --- a/modules/rosapps/applications/cmdutils/vfdcmd/vfdmsg.mc +++ b/modules/rosapps/applications/cmdutils/vfdcmd/vfdmsg.mc @@ -11,6 +11,11 @@ ;#ifndef _VFDMSG_H_ ;#define _VFDMSG_H_ ; +;/* +; __REACTOS__: +; - Removed Japanese language. +; + Added a second blank line between some entries. +;*/ MessageIdTypedef=DWORD LanguageNames=(English=0x409:MSG0409) @@ -1161,6 +1166,7 @@ of the shell extension. . +;// __REACTOS__: s/read only/read-only/. MessageId= SymbolicName=MSG_HELP_OPEN Language=English @@ -1360,6 +1366,7 @@ The SAVE command always fails if the target is a ZIP compressed file. . +;// __REACTOS__: s/read only/read-only/. MessageId= SymbolicName=MSG_HELP_PROTECT Language=English diff --git a/modules/rosapps/drivers/vfd/imports.h b/modules/rosapps/drivers/vfd/imports.h index 8a9ca901be7..f88c03c0a9d 100644 --- a/modules/rosapps/drivers/vfd/imports.h +++ b/modules/rosapps/drivers/vfd/imports.h @@ -27,17 +27,15 @@ extern "C" { #endif // __cplusplus -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning(push,3) #endif #include <ntddk.h> #include <ntdddisk.h> #include <ntverp.h> -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning(pop) -#endif -#ifdef _MSC_VER // disable unwanted (and trivial) warnings : // 4054 - type cast from a function pointer to a data pointer // 4201 - anonymous structure @@ -179,6 +177,8 @@ typedef struct _MOUNTMGR_MOUNT_POINTS { #endif // (VER_PRODUCTBUILD < 2195) +// __REACTOS__: NTAPI added on some functions in this file, vfddrv.h and some *.c. + #if (VER_PRODUCTBUILD < 2600) // // Imports from Windows XP DDK <ntdddisk.h> diff --git a/modules/rosapps/drivers/vfd/vfddbg.c b/modules/rosapps/drivers/vfd/vfddbg.c index 829f25b07a4..286dae101fa 100644 --- a/modules/rosapps/drivers/vfd/vfddbg.c +++ b/modules/rosapps/drivers/vfd/vfddbg.c @@ -9,9 +9,11 @@ #if !DBG +#if !defined(__REACTOS__) || defined(_MSC_VER) // suppress empty compile unit warning #pragma warning (disable: 4206) #pragma message ("Debug feature is disabled.") +#endif #else // DBG @@ -514,7 +516,7 @@ GetIoControlName( CASE_RETURN_STR(IOCTL_DISK_GROW_PARTITION); CASE_RETURN_STR(IOCTL_DISK_GET_CACHE_INFORMATION); CASE_RETURN_STR(IOCTL_DISK_SET_CACHE_INFORMATION); -#if (NTDDI_VERSION < NTDDI_WS03) +#if !defined(__REACTOS__) || (NTDDI_VERSION < NTDDI_WS03) CASE_RETURN_STR(IOCTL_DISK_GET_WRITE_CACHE_STATE); #else CASE_RETURN_STR(OBSOLETE_DISK_GET_WRITE_CACHE_STATE); diff --git a/modules/rosapps/drivers/vfd/vfdimg.c b/modules/rosapps/drivers/vfd/vfdimg.c index c04d1978ffb..d20be32ee1e 100644 --- a/modules/rosapps/drivers/vfd/vfdimg.c +++ b/modules/rosapps/drivers/vfd/vfdimg.c @@ -284,7 +284,7 @@ VfdOpenImage ( #ifndef __REACTOS__ &file_object, #else - (PVOID *)&file_object, + (PVOID *)&file_object, #endif NULL); diff --git a/modules/rosapps/drivers/vfd/vfdmnt.c b/modules/rosapps/drivers/vfd/vfdmnt.c index 7d84180adac..2bcda2c75f8 100644 --- a/modules/rosapps/drivers/vfd/vfdmnt.c +++ b/modules/rosapps/drivers/vfd/vfdmnt.c @@ -13,7 +13,7 @@ so DO NOT define VFD_MOUNT_MANAGER macro unless you know exactly what you are doing... */ -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) // suppress empty compile unit warning #pragma warning (disable: 4206) #pragma message ("Mount Manager support feature is disabled.") diff --git a/modules/rosapps/drivers/vfd/vfdpnp.c b/modules/rosapps/drivers/vfd/vfdpnp.c index e0885e7ada0..9c943e25f6b 100644 --- a/modules/rosapps/drivers/vfd/vfdpnp.c +++ b/modules/rosapps/drivers/vfd/vfdpnp.c @@ -13,8 +13,8 @@ so DO NOT define VFD_PNP macro unless you know exactly what you are doing... */ +#if !defined(__REACTOS__) || defined(_MSC_VER) // suppress empty compile unit warning -#ifdef _MSC_VER #pragma warning (disable: 4206) #pragma message ("Plug and play support feature is disabled.") #endif diff --git a/modules/rosapps/include/vfd/vfdio.h b/modules/rosapps/include/vfd/vfdio.h index b3f4a56e4a9..6df7b76fd22 100644 --- a/modules/rosapps/include/vfd/vfdio.h +++ b/modules/rosapps/include/vfd/vfdio.h @@ -55,7 +55,7 @@ // Used for IOCTL_VFD_OPEN_IMAGE and IOCTL_VFD_QUERY_IMAGE // #pragma pack (push,2) -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning (push) #pragma warning (disable: 4200) // Zero sized struct member warning #endif @@ -70,7 +70,7 @@ typedef struct _VFD_IMAGE_INFO { CHAR FileName[0]; // variable length file name string } VFD_IMAGE_INFO, *PVFD_IMAGE_INFO; -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning (pop) #endif #pragma pack (pop) diff --git a/modules/rosapps/lib/vfdlib/vfdctl.c b/modules/rosapps/lib/vfdlib/vfdctl.c index 21672b96621..d3952dcedc2 100644 --- a/modules/rosapps/lib/vfdlib/vfdctl.c +++ b/modules/rosapps/lib/vfdlib/vfdctl.c @@ -15,12 +15,12 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <dbt.h> -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning (push, 3) #endif #include <shlobj.h> #include <winioctl.h> -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning (pop) #endif #include <stdio.h> diff --git a/modules/rosapps/lib/vfdlib/vfdguiopen.c b/modules/rosapps/lib/vfdlib/vfdguiopen.c index e7fb6262b59..35103a5954f 100644 --- a/modules/rosapps/lib/vfdlib/vfdguiopen.c +++ b/modules/rosapps/lib/vfdlib/vfdguiopen.c @@ -14,11 +14,11 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning(push,3) #endif #include <commdlg.h> -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning(pop) #endif @@ -404,7 +404,11 @@ void OnBrowse( ofn.nMaxFile = sizeof(file); ofn.lpstrInitialDir = dir; ofn.lpstrTitle = title ? title : FALLBACK_IMAGE_TITLE; +#ifndef __REACTOS__ + ofn.Flags = OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; +#else ofn.Flags = OFN_EXPLORER | OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; +#endif // show the open file dialog box diff --git a/modules/rosapps/lib/vfdlib/vfdguisave.c b/modules/rosapps/lib/vfdlib/vfdguisave.c index b0ea780d450..31f57ce73c2 100644 --- a/modules/rosapps/lib/vfdlib/vfdguisave.c +++ b/modules/rosapps/lib/vfdlib/vfdguisave.c @@ -14,11 +14,11 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning(push,3) #endif #include <commdlg.h> -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning(pop) #endif @@ -195,7 +195,11 @@ void OnInit( { // Store parameters +#ifndef __REACTOS__ + SetWindowLong(hDlg, GWL_USERDATA, (ULONG)pParam); +#else SetWindowLongPtr(hDlg, GWLP_USERDATA, (ULONG_PTR)pParam); +#endif // clear the target existence flag @@ -293,7 +297,11 @@ void OnTarget( // // get the current image info // +#ifndef __REACTOS__ + param = (PCSAVE_PARAM)GetWindowLong(hDlg, GWL_USERDATA); +#else param = (PCSAVE_PARAM)GetWindowLongPtr(hDlg, GWLP_USERDATA); +#endif if (_stricmp(param->ImageName, buf) == 0) { @@ -422,7 +430,11 @@ void OnBrowse( ofn.lpstrInitialDir = dir; ofn.lpstrTitle = title ? title : "Save Image"; ofn.lpstrFilter = "*.*\0*.*\0"; +#ifndef __REACTOS__ + ofn.Flags = OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; +#else ofn.Flags = OFN_EXPLORER | OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; +#endif if (GetSaveFileName(&ofn)) { SetDlgItemText(hDlg, IDC_TARGETFILE, file); @@ -469,7 +481,11 @@ DWORD OnOK( BOOL truncate; DWORD ret; +#ifndef __REACTOS__ + param = (PCSAVE_PARAM)GetWindowLong(hDlg, GWL_USERDATA); +#else param = (PCSAVE_PARAM)GetWindowLongPtr(hDlg, GWLP_USERDATA); +#endif if (!param) { return ERROR_INVALID_FUNCTION; diff --git a/modules/rosapps/lib/vfdlib/vfdguitip.c b/modules/rosapps/lib/vfdlib/vfdguitip.c index c3fcc3a7696..390233efea5 100644 --- a/modules/rosapps/lib/vfdlib/vfdguitip.c +++ b/modules/rosapps/lib/vfdlib/vfdguitip.c @@ -41,8 +41,13 @@ static LRESULT CALLBACK ToolTipProc( switch (uMsg) { case WM_CREATE: // Store Font handle +#ifndef __REACTOS__ + SetWindowLong(hWnd, GWL_USERDATA, + (LONG)((LPCREATESTRUCT)lParam)->lpCreateParams); +#else SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG_PTR)((LPCREATESTRUCT)lParam)->lpCreateParams); +#endif return 0; case WM_PAINT: @@ -56,7 +61,11 @@ static LRESULT CALLBACK ToolTipProc( RECT rc; +#ifndef __REACTOS__ + SelectObject(hDC, (HFONT)GetWindowLong(hWnd, GWL_USERDATA)); +#else SelectObject(hDC, (HFONT)GetWindowLongPtr(hWnd, GWLP_USERDATA)); +#endif SetTextColor(hDC, GetSysColor(COLOR_INFOTEXT)); SetBkMode(hDC, TRANSPARENT); @@ -121,7 +130,11 @@ static LRESULT CALLBACK ToolTipProc( case WM_DESTROY: // delete font +#ifndef __REACTOS__ + DeleteObject((HFONT)GetWindowLong(hWnd, GWL_USERDATA)); +#else DeleteObject((HFONT)GetWindowLongPtr(hWnd, GWLP_USERDATA)); +#endif return 0; } diff --git a/modules/rosapps/lib/vfdlib/vfdmsg_lib.mc b/modules/rosapps/lib/vfdlib/vfdmsg_lib.mc index cffa15b93d3..5292bef5b20 100644 --- a/modules/rosapps/lib/vfdlib/vfdmsg_lib.mc +++ b/modules/rosapps/lib/vfdlib/vfdmsg_lib.mc @@ -11,6 +11,12 @@ ;#ifndef _VFDMSG_H_ ;#define _VFDMSG_H_ ; +;/* +; __REACTOS__: +; * Renamed file from vfdmsg.mc. +; - Removed Japanese language. +; + Added a second blank line between some entries. +;*/ MessageIdTypedef=DWORD LanguageNames=(English=0x409:msg0409) diff --git a/modules/rosapps/lib/vfdlib/vfdshext.h b/modules/rosapps/lib/vfdlib/vfdshext.h index 728aaec6dcb..5d45b2287ee 100644 --- a/modules/rosapps/lib/vfdlib/vfdshext.h +++ b/modules/rosapps/lib/vfdlib/vfdshext.h @@ -70,7 +70,7 @@ public: #ifndef __REACTOS__ UINT idCmd, #else - UINT_PTR idCmd, + UINT_PTR idCmd, #endif UINT uFlags, UINT *reserved, diff --git a/modules/rosapps/lib/vfdlib/vfdshmenu.cpp b/modules/rosapps/lib/vfdlib/vfdshmenu.cpp index 35a67142659..cda760a870e 100644 --- a/modules/rosapps/lib/vfdlib/vfdshmenu.cpp +++ b/modules/rosapps/lib/vfdlib/vfdshmenu.cpp @@ -270,7 +270,7 @@ STDMETHODIMP CVfdShExt::GetCommandString( #ifndef __REACTOS__ UINT idCmd, #else - UINT_PTR idCmd, + UINT_PTR idCmd, #endif UINT uFlags, UINT *reserved, @@ -350,6 +350,7 @@ STDMETHODIMP CVfdShExt::InvokeCommand( } #endif + if (!unicode && HIWORD(lpcmi->lpVerb)) { VFDTRACE(0, ("ANSI: %s\n", lpcmi->lpVerb)); diff --git a/modules/rosapps/lib/vfdlib/vfdshutil.cpp b/modules/rosapps/lib/vfdlib/vfdshutil.cpp index be9b8f47c83..a3a6e965a7a 100644 --- a/modules/rosapps/lib/vfdlib/vfdshutil.cpp +++ b/modules/rosapps/lib/vfdlib/vfdshutil.cpp @@ -22,14 +22,14 @@ // Initialize the GUID instance //===================================== -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma data_seg(".text") #endif #define INITGUID #include <initguid.h> #include <shlguid.h> #include "vfdshguid.h" -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma data_seg() #endif

1 0

[reactos] 02/03: [VFD] Remove 2 useless CMakeLists.txt
by Serge Gautherie 31 Aug '24

31 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1abac8f6db4ee13334b16… commit 1abac8f6db4ee13334b16d718d14b22028d28436 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Jun 14 13:49:22 2020 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Aug 31 18:23:01 2024 +0300 [VFD] Remove 2 useless CMakeLists.txt Addendum to 25c7e1a (0.4.7-dev-1106). --- modules/rosapps/CMakeLists.txt | 1 - modules/rosapps/include/CMakeLists.txt | 1 - modules/rosapps/include/vfd/CMakeLists.txt | 0 3 files changed, 2 deletions(-) diff --git a/modules/rosapps/CMakeLists.txt b/modules/rosapps/CMakeLists.txt index 649429e3dad..0849142464e 100644 --- a/modules/rosapps/CMakeLists.txt +++ b/modules/rosapps/CMakeLists.txt @@ -1,7 +1,6 @@ add_subdirectory(applications) add_subdirectory(demos) add_subdirectory(drivers) -add_subdirectory(include) add_subdirectory(lib) if(ENABLE_ROSAPPS_TEMPLATES) diff --git a/modules/rosapps/include/CMakeLists.txt b/modules/rosapps/include/CMakeLists.txt deleted file mode 100644 index 2c82e7c2ed5..00000000000 --- a/modules/rosapps/include/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(vfd) diff --git a/modules/rosapps/include/vfd/CMakeLists.txt b/modules/rosapps/include/vfd/CMakeLists.txt deleted file mode 100644 index e69de29bb2d..00000000000

1 0

[reactos] 01/03: [DOC] 3rd Party Files.txt: Add 'Virtual Floppy Drive'
by Serge Gautherie 31 Aug '24

31 Aug '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=520ed9548689eeb967686… commit 520ed9548689eeb967686e93b471537b9c600117 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Jun 14 13:49:22 2020 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Aug 31 18:23:01 2024 +0300 [DOC] 3rd Party Files.txt: Add 'Virtual Floppy Drive' Addendum to 25c7e1a (0.4.7-dev-1106). --- media/doc/3rd Party Files.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 3852ec1cd30..bd86c57550f 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -287,3 +287,11 @@ Path: sdk/lib/crt/math/libm_sse2 Used Version: git commit 6121d02 License: MIT (https://spdx.org/licenses/MIT.html) URL: https://github.com/amd/win-libm + +Title: Virtual Floppy Drive +Path: modules/rosapps/applications/cmdutils/vfdcmd +Path: modules/rosapps/drivers/vfd +Path: modules/rosapps/lib/vfdlib +Used Version: 2.1.2008.206 +License: GPL-2.0 (https://spdx.org/licenses/GPL-2.0.html) +URL: https://vfd.sourceforge.net/

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 August 2024