Ros-diffs January 2025

ros-diffs@reactos.org

23 participants
278 discussions

[reactos] 02/04: [UCRT] Make __local_stdio_printf/scanf_options GCC compatible

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ca68ffb1c8adef648400… commit 4ca68ffb1c8adef6484005ce457bfed7db82b8c3 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Nov 9 19:21:11 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 30 11:30:32 2025 +0200 [UCRT] Make __local_stdio_printf/scanf_options GCC compatible --- sdk/include/ucrt/corecrt_stdio_config.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/sdk/include/ucrt/corecrt_stdio_config.h b/sdk/include/ucrt/corecrt_stdio_config.h index 88e041260d5..360a45824d6 100644 --- a/sdk/include/ucrt/corecrt_stdio_config.h +++ b/sdk/include/ucrt/corecrt_stdio_config.h @@ -82,24 +82,20 @@ _CRT_BEGIN_C_HEADER #endif #if _CRT_FUNCTIONS_REQUIRED - // This function must not be inlined into callers to avoid ODR violations. The - // static local variable has different names in C and in C++ translation units. + __declspec(selectany) unsigned __int64 __local_stdio_printf_options_storage; _Check_return_ _Ret_notnull_ _CRT_INLINE_PURE_SECURITYCRITICAL_ATTRIBUTE - __declspec(noinline) __inline unsigned __int64* __CRTDECL __local_stdio_printf_options(void) + __inline unsigned __int64* __CRTDECL __local_stdio_printf_options(void) { - static unsigned __int64 _OptionsStorage; - return &_OptionsStorage; + return &__local_stdio_printf_options_storage; } - // This function must not be inlined into callers to avoid ODR violations. The - // static local variable has different names in C and in C++ translation units. + __declspec(selectany) unsigned __int64 __local_stdio_scanf_options_storage; _Check_return_ _Ret_notnull_ _CRT_INLINE_PURE_SECURITYCRITICAL_ATTRIBUTE - __declspec(noinline) __inline unsigned __int64* __CRTDECL __local_stdio_scanf_options(void) + __inline unsigned __int64* __CRTDECL __local_stdio_scanf_options(void) { - static unsigned __int64 _OptionsStorage; - return &_OptionsStorage; + return &__local_stdio_scanf_options_storage; } #endif

6 days, 12 hours

[reactos] 01/04: [CMAKE] Define _CRT_SUPPRESS_RESTRICT on GCC builds

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb9392e4e1b2cab035070… commit bb9392e4e1b2cab035070b99b9855072a3069974 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jan 28 21:30:42 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 30 11:30:32 2025 +0200 [CMAKE] Define _CRT_SUPPRESS_RESTRICT on GCC builds This prevents the use of __declspec(restrict) in UCRT headers. --- sdk/cmake/gcc.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 6043ab70e2e..54224a806ef 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -251,6 +251,9 @@ endif() # Fix build with GLIBCXX + our c++ headers add_definitions(-D_GLIBCXX_HAVE_BROKEN_VSWPRINTF) +# Fix build with UCRT headers +add_definitions(-D_CRT_SUPPRESS_RESTRICT) + # Alternative arch name if(ARCH STREQUAL "amd64") set(ARCH2 x86_64)

6 days, 12 hours

[reactos] 01/01: [NTOS:KDBG] Add back 'cregs' command

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=70bf3bb8fa7ed1eefde80… commit 70bf3bb8fa7ed1eefde808efb3b43e85040b24bf Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Oct 12 07:46:41 2024 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Jan 29 18:25:24 2025 +0100 [NTOS:KDBG] Add back 'cregs' command This command was removed in commit baa47fa5e06948b7e76ba820f7a342547eaf0cde because there was no way to get the CRx registers from a CONTEXT structure. Previous code was also displaying current GDTR/LDTR and IDT. Rewrite the code to use KdSystemDebugControl(SysDbgReadControlSpace, ...) to get CRx, GDTR/LDTR and IDT values just before entering debugger. --- ntoskrnl/kdbg/kdb_cli.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index b4794dca739..c86b770c81d 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -353,6 +353,7 @@ static const struct #endif // _M_IX86 { "x", "x [address] [L count]", "Display count dwords, starting at address.", KdbpCmdDisassembleX }, { "regs", "regs", "Display general purpose registers.", KdbpCmdRegs }, + { "cregs", "cregs", "Display control, descriptor table and task segment registers.", KdbpCmdRegs }, { "sregs", "sregs", "Display status registers.", KdbpCmdRegs }, { "dregs", "dregs", "Display debug registers.", KdbpCmdRegs }, { "bt", "bt [*frameaddr|thread id]", "Prints current backtrace or from given frame address.", KdbpCmdBackTrace }, @@ -984,6 +985,84 @@ KdbpCmdRegs( } KdbpPrint("\n"); } + else if (Argv[0][0] == 'c') /* cregs */ + { + ULONG Cr0, Cr2, Cr3, Cr4; + KDESCRIPTOR Gdtr = {0, 0, 0}, Idtr = {0, 0, 0}; + USHORT Ldtr, Tr; + static const PCHAR Cr0Bits[32] = { " PE", " MP", " EM", " TS", " ET", " NE", NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + " WP", NULL, " AM", NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, " NW", " CD", " PG" }; + static const PCHAR Cr4Bits[32] = { " VME", " PVI", " TSD", " DE", " PSE", " PAE", " MCE", " PGE", + " PCE", " OSFXSR", " OSXMMEXCPT", NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; + SYSDBG_CONTROL_SPACE Input; + KSPECIAL_REGISTERS SpecialRegisters; + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + + /* Retrieve the control registers */ + RtlZeroMemory(&Input, sizeof(Input)); + Input.Buffer = &SpecialRegisters; + Input.Request = sizeof(SpecialRegisters); +#ifdef _M_IX86 + Input.Address = sizeof(CONTEXT); +#else + Input.Address = AMD64_DEBUG_CONTROL_SPACE_KSPECIAL; +#endif + Status = KdSystemDebugControl(SysDbgReadControlSpace, + &Input, sizeof(Input), + NULL, 0, + NULL, KernelMode); + if (!NT_SUCCESS(Status)) + { + KdbpPrint("Failed to get registers: status 0x%08x\n", Status); + return TRUE; + } + Cr0 = SpecialRegisters.Cr0; + Cr2 = SpecialRegisters.Cr2; + Cr3 = SpecialRegisters.Cr3; + Cr4 = SpecialRegisters.Cr4; + + /* Retrieve the descriptor table and task segment registers */ + Gdtr = SpecialRegisters.Gdtr; + Ldtr = SpecialRegisters.Ldtr; + Idtr = SpecialRegisters.Idtr; + Tr = SpecialRegisters.Tr; + + /* Display the control registers */ + KdbpPrint("CR0 0x%08x ", Cr0); + for (i = 0; i < 32; i++) + { + if (!Cr0Bits[i]) + continue; + + if ((Cr0 & (1 << i)) != 0) + KdbpPrint(Cr0Bits[i]); + } + KdbpPrint("\n"); + + KdbpPrint("CR2 0x%08x\n", Cr2); + KdbpPrint("CR3 0x%08x Pagedir-Base 0x%08x %s%s\n", Cr3, (Cr3 & 0xfffff000), + (Cr3 & (1 << 3)) ? " PWT" : "", (Cr3 & (1 << 4)) ? " PCD" : "" ); + KdbpPrint("CR4 0x%08x ", Cr4); + for (i = 0; i < 32; i++) + { + if (!Cr4Bits[i]) + continue; + + if ((Cr4 & (1 << i)) != 0) + KdbpPrint(Cr4Bits[i]); + } + KdbpPrint("\n"); + + /* Display the descriptor table and task segment registers */ + KdbpPrint("GDTR Base 0x%08x Size 0x%04x\n", Gdtr.Base, Gdtr.Limit); + KdbpPrint("LDTR 0x%04x\n", Ldtr); + KdbpPrint("IDTR Base 0x%08x Size 0x%04x\n", Idtr.Base, Idtr.Limit); + KdbpPrint("TR 0x%04x\n", Tr); + } else if (Argv[0][0] == 's') /* sregs */ { KdbpPrint("CS 0x%04x Index 0x%04x %cDT RPL%d\n",

1 week

[reactos] 01/01: Revert "[NTUSER] Enable SM_CXICON etc. settings from registry (#7679)" (#7682)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f23e70ad55cc661bc756… commit 2f23e70ad55cc661bc756fb492535fdfab2e9921 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 29 21:34:19 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 29 21:34:19 2025 +0900 Revert "[NTUSER] Enable SM_CXICON etc. settings from registry (#7679)" (#7682) This reverts commit 3b3741c10af77bd54184e9d271206ac017e73b34 of #7679 . It seems like the shell icon size is not the system icon size. The wide string L"Shell Small Icon Size" is detected in shell32.dll and themeui.dll. No L"Shell Small Icon Size" in win32k.sys found. JIRA issue: CORE-12905 --- win32ss/user/ntuser/metric.c | 9 ++++----- win32ss/user/ntuser/sysparams.c | 10 ---------- win32ss/user/ntuser/sysparams.h | 3 --- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/win32ss/user/ntuser/metric.c b/win32ss/user/ntuser/metric.c index 4ece647717f..e070bb0fa51 100644 --- a/win32ss/user/ntuser/metric.c +++ b/win32ss/user/ntuser/metric.c @@ -5,7 +5,6 @@ * FILE: win32ss/user/ntuser/metric.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Timo Kreuzer (timo.kreuzer(a)reactos.org) - * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include <win32k.h> @@ -131,10 +130,10 @@ InitMetrics(VOID) piSysMet[SM_CXHTHUMB] = gspv.ncm.iScrollHeight; // 16; piSysMet[SM_CYVSCROLL] = gspv.ncm.iScrollHeight; // 16 piSysMet[SM_CXHSCROLL] = gspv.ncm.iScrollHeight; // 16; - piSysMet[SM_CXICON] = gspv.nIconSize; // 32 - piSysMet[SM_CYICON] = gspv.nIconSize; // 32 - piSysMet[SM_CXSMICON] = gspv.nSmallIconSize; // 16 - piSysMet[SM_CYSMICON] = gspv.nSmallIconSize; // 16 + piSysMet[SM_CXICON] = 32; + piSysMet[SM_CYICON] = 32; + piSysMet[SM_CXSMICON] = 16; + piSysMet[SM_CYSMICON] = 16; piSysMet[SM_CXICONSPACING] = gspv.im.iHorzSpacing; // 64; piSysMet[SM_CYICONSPACING] = gspv.im.iVertSpacing; // 64; piSysMet[SM_CXCURSOR] = 32; diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c index 538d18bb341..59cc76f13f9 100644 --- a/win32ss/user/ntuser/sysparams.c +++ b/win32ss/user/ntuser/sysparams.c @@ -4,7 +4,6 @@ * PURPOSE: System parameters functions * FILE: win32ss/user/ntuser/sysparams.c * PROGRAMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ // TODO: @@ -206,11 +205,6 @@ SpiFixupValues(VOID) // gspv.tmMenuFont.tmExternalLeading); if (gspv.iDblClickTime == 0) gspv.iDblClickTime = 500; - if (gspv.nIconSize <= 0) - gspv.nIconSize = 32; - if (gspv.nSmallIconSize <= 0) - gspv.nSmallIconSize = 16; - // FIXME: Hack!!! gspv.tmMenuFont.tmHeight = 11; gspv.tmMenuFont.tmExternalLeading = 2; @@ -302,10 +296,6 @@ SpiUpdatePerUserSystemParameters(VOID) gspv.im.iTitleWrap = SpiLoadMetric(VAL_ITWRAP, 1); SpiLoadFont(&gspv.im.lfFont, L"IconFont", &lf1); - /* Load icon size */ - gspv.nIconSize = SpiLoadInt(KEY_METRIC, L"Shell Icon Size", 32); - gspv.nSmallIconSize = SpiLoadInt(KEY_METRIC, L"Shell Small Icon Size", 16); - /* Load desktop settings */ gspv.bDragFullWindows = SpiLoadInt(KEY_DESKTOP, VAL_DRAG, 0); gspv.iWheelScrollLines = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLLINES, 3); diff --git a/win32ss/user/ntuser/sysparams.h b/win32ss/user/ntuser/sysparams.h index dafb7f4b181..0b564f86099 100644 --- a/win32ss/user/ntuser/sysparams.h +++ b/win32ss/user/ntuser/sysparams.h @@ -157,9 +157,6 @@ typedef struct _SPIVALUES DWORD dwForegroundFlashCount; DWORD dwCaretWidth; - INT nIconSize; - INT nSmallIconSize; - // SPI_LANGDRIVER // SPI_SETDESKPATTERN // SPI_SETPENWINDOWS

1 week

[reactos] 01/01: [NTUSER] Enable SM_CXICON etc. settings from registry (#7679)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b3741c10af77bd54184e… commit 3b3741c10af77bd54184e9d271206ac017e73b34 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 29 20:20:25 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 29 20:20:25 2025 +0900 [NTUSER] Enable SM_CXICON etc. settings from registry (#7679) Improve usability. JIRA issue: CORE-12905 - Add nIconSize and nSmallIconSize values to SPIVALUES structure. - Load "Shell Icon Size" and "Shell Small Icon Size" values from registry. - Enable changing of SM_CXICON, SM_CYICON, SM_CXSMICON, and SM_CYSMICON settings. --- win32ss/user/ntuser/metric.c | 9 +++++---- win32ss/user/ntuser/sysparams.c | 10 ++++++++++ win32ss/user/ntuser/sysparams.h | 3 +++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/win32ss/user/ntuser/metric.c b/win32ss/user/ntuser/metric.c index e070bb0fa51..4ece647717f 100644 --- a/win32ss/user/ntuser/metric.c +++ b/win32ss/user/ntuser/metric.c @@ -5,6 +5,7 @@ * FILE: win32ss/user/ntuser/metric.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Timo Kreuzer (timo.kreuzer(a)reactos.org) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include <win32k.h> @@ -130,10 +131,10 @@ InitMetrics(VOID) piSysMet[SM_CXHTHUMB] = gspv.ncm.iScrollHeight; // 16; piSysMet[SM_CYVSCROLL] = gspv.ncm.iScrollHeight; // 16 piSysMet[SM_CXHSCROLL] = gspv.ncm.iScrollHeight; // 16; - piSysMet[SM_CXICON] = 32; - piSysMet[SM_CYICON] = 32; - piSysMet[SM_CXSMICON] = 16; - piSysMet[SM_CYSMICON] = 16; + piSysMet[SM_CXICON] = gspv.nIconSize; // 32 + piSysMet[SM_CYICON] = gspv.nIconSize; // 32 + piSysMet[SM_CXSMICON] = gspv.nSmallIconSize; // 16 + piSysMet[SM_CYSMICON] = gspv.nSmallIconSize; // 16 piSysMet[SM_CXICONSPACING] = gspv.im.iHorzSpacing; // 64; piSysMet[SM_CYICONSPACING] = gspv.im.iVertSpacing; // 64; piSysMet[SM_CXCURSOR] = 32; diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c index 59cc76f13f9..538d18bb341 100644 --- a/win32ss/user/ntuser/sysparams.c +++ b/win32ss/user/ntuser/sysparams.c @@ -4,6 +4,7 @@ * PURPOSE: System parameters functions * FILE: win32ss/user/ntuser/sysparams.c * PROGRAMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ // TODO: @@ -205,6 +206,11 @@ SpiFixupValues(VOID) // gspv.tmMenuFont.tmExternalLeading); if (gspv.iDblClickTime == 0) gspv.iDblClickTime = 500; + if (gspv.nIconSize <= 0) + gspv.nIconSize = 32; + if (gspv.nSmallIconSize <= 0) + gspv.nSmallIconSize = 16; + // FIXME: Hack!!! gspv.tmMenuFont.tmHeight = 11; gspv.tmMenuFont.tmExternalLeading = 2; @@ -296,6 +302,10 @@ SpiUpdatePerUserSystemParameters(VOID) gspv.im.iTitleWrap = SpiLoadMetric(VAL_ITWRAP, 1); SpiLoadFont(&gspv.im.lfFont, L"IconFont", &lf1); + /* Load icon size */ + gspv.nIconSize = SpiLoadInt(KEY_METRIC, L"Shell Icon Size", 32); + gspv.nSmallIconSize = SpiLoadInt(KEY_METRIC, L"Shell Small Icon Size", 16); + /* Load desktop settings */ gspv.bDragFullWindows = SpiLoadInt(KEY_DESKTOP, VAL_DRAG, 0); gspv.iWheelScrollLines = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLLINES, 3); diff --git a/win32ss/user/ntuser/sysparams.h b/win32ss/user/ntuser/sysparams.h index 0b564f86099..dafb7f4b181 100644 --- a/win32ss/user/ntuser/sysparams.h +++ b/win32ss/user/ntuser/sysparams.h @@ -157,6 +157,9 @@ typedef struct _SPIVALUES DWORD dwForegroundFlashCount; DWORD dwCaretWidth; + INT nIconSize; + INT nSmallIconSize; + // SPI_LANGDRIVER // SPI_SETDESKPATTERN // SPI_SETPENWINDOWS

1 week

[reactos] 01/01: [ACPI] Move CMBATT and COMPBATT out of the acpi directory (#7599)

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8da29e8887d16de6e388… commit a8da29e8887d16de6e388cf64f6e4e9ba4ec6eaf Author: Justin Miller <justin.miller(a)reactos.org> AuthorDate: Wed Jan 29 00:49:35 2025 -0800 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 29 00:49:35 2025 -0800 [ACPI] Move CMBATT and COMPBATT out of the acpi directory (#7599) Move these out of ACPI in preparation for ACPI_NEW so they keep their juicy commit history. Also both ACPIs can coexist for awhile as I don't see the old driver getting removed anytime soon. --- drivers/CMakeLists.txt | 1 + drivers/acpi/CMakeLists.txt | 1 + drivers/{bus => }/acpi/cmbatt/CMakeLists.txt | 0 drivers/{bus => }/acpi/cmbatt/cmbatt.c | 0 drivers/{bus => }/acpi/cmbatt/cmbatt.h | 0 drivers/{bus => }/acpi/cmbatt/cmbatt.rc | 0 drivers/{bus => }/acpi/cmbatt/cmbpnp.c | 0 drivers/{bus => }/acpi/cmbatt/cmbwmi.c | 0 drivers/{bus => }/acpi/cmbatt/cmexec.c | 0 drivers/{bus => }/acpi/cmbatt/guid.c | 0 drivers/battery/CMakeLists.txt | 1 + drivers/{bus/acpi => battery}/compbatt/CMakeLists.txt | 0 drivers/{bus/acpi => battery}/compbatt/compbatt.c | 0 drivers/{bus/acpi => battery}/compbatt/compbatt.h | 0 drivers/{bus/acpi => battery}/compbatt/compbatt.rc | 0 drivers/{bus/acpi => battery}/compbatt/compmisc.c | 0 drivers/{bus/acpi => battery}/compbatt/comppnp.c | 0 drivers/{bus/acpi => battery}/compbatt/guid.c | 0 drivers/bus/acpi/CMakeLists.txt | 3 --- 19 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/CMakeLists.txt b/drivers/CMakeLists.txt index f9022a69dc7..5a0879f4c1a 100644 --- a/drivers/CMakeLists.txt +++ b/drivers/CMakeLists.txt @@ -1,6 +1,7 @@ PROJECT(Drivers) +add_subdirectory(acpi) add_subdirectory(base) add_subdirectory(battery) add_subdirectory(bluetooth) diff --git a/drivers/acpi/CMakeLists.txt b/drivers/acpi/CMakeLists.txt new file mode 100644 index 00000000000..1f630a0770c --- /dev/null +++ b/drivers/acpi/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(cmbatt) diff --git a/drivers/bus/acpi/cmbatt/CMakeLists.txt b/drivers/acpi/cmbatt/CMakeLists.txt similarity index 100% rename from drivers/bus/acpi/cmbatt/CMakeLists.txt rename to drivers/acpi/cmbatt/CMakeLists.txt diff --git a/drivers/bus/acpi/cmbatt/cmbatt.c b/drivers/acpi/cmbatt/cmbatt.c similarity index 100% rename from drivers/bus/acpi/cmbatt/cmbatt.c rename to drivers/acpi/cmbatt/cmbatt.c diff --git a/drivers/bus/acpi/cmbatt/cmbatt.h b/drivers/acpi/cmbatt/cmbatt.h similarity index 100% rename from drivers/bus/acpi/cmbatt/cmbatt.h rename to drivers/acpi/cmbatt/cmbatt.h diff --git a/drivers/bus/acpi/cmbatt/cmbatt.rc b/drivers/acpi/cmbatt/cmbatt.rc similarity index 100% rename from drivers/bus/acpi/cmbatt/cmbatt.rc rename to drivers/acpi/cmbatt/cmbatt.rc diff --git a/drivers/bus/acpi/cmbatt/cmbpnp.c b/drivers/acpi/cmbatt/cmbpnp.c similarity index 100% rename from drivers/bus/acpi/cmbatt/cmbpnp.c rename to drivers/acpi/cmbatt/cmbpnp.c diff --git a/drivers/bus/acpi/cmbatt/cmbwmi.c b/drivers/acpi/cmbatt/cmbwmi.c similarity index 100% rename from drivers/bus/acpi/cmbatt/cmbwmi.c rename to drivers/acpi/cmbatt/cmbwmi.c diff --git a/drivers/bus/acpi/cmbatt/cmexec.c b/drivers/acpi/cmbatt/cmexec.c similarity index 100% rename from drivers/bus/acpi/cmbatt/cmexec.c rename to drivers/acpi/cmbatt/cmexec.c diff --git a/drivers/bus/acpi/cmbatt/guid.c b/drivers/acpi/cmbatt/guid.c similarity index 100% rename from drivers/bus/acpi/cmbatt/guid.c rename to drivers/acpi/cmbatt/guid.c diff --git a/drivers/battery/CMakeLists.txt b/drivers/battery/CMakeLists.txt index 1a3ce814291..2f949902ebc 100644 --- a/drivers/battery/CMakeLists.txt +++ b/drivers/battery/CMakeLists.txt @@ -1,2 +1,3 @@ add_subdirectory(battc) +add_subdirectory(compbatt) diff --git a/drivers/bus/acpi/compbatt/CMakeLists.txt b/drivers/battery/compbatt/CMakeLists.txt similarity index 100% rename from drivers/bus/acpi/compbatt/CMakeLists.txt rename to drivers/battery/compbatt/CMakeLists.txt diff --git a/drivers/bus/acpi/compbatt/compbatt.c b/drivers/battery/compbatt/compbatt.c similarity index 100% rename from drivers/bus/acpi/compbatt/compbatt.c rename to drivers/battery/compbatt/compbatt.c diff --git a/drivers/bus/acpi/compbatt/compbatt.h b/drivers/battery/compbatt/compbatt.h similarity index 100% rename from drivers/bus/acpi/compbatt/compbatt.h rename to drivers/battery/compbatt/compbatt.h diff --git a/drivers/bus/acpi/compbatt/compbatt.rc b/drivers/battery/compbatt/compbatt.rc similarity index 100% rename from drivers/bus/acpi/compbatt/compbatt.rc rename to drivers/battery/compbatt/compbatt.rc diff --git a/drivers/bus/acpi/compbatt/compmisc.c b/drivers/battery/compbatt/compmisc.c similarity index 100% rename from drivers/bus/acpi/compbatt/compmisc.c rename to drivers/battery/compbatt/compmisc.c diff --git a/drivers/bus/acpi/compbatt/comppnp.c b/drivers/battery/compbatt/comppnp.c similarity index 100% rename from drivers/bus/acpi/compbatt/comppnp.c rename to drivers/battery/compbatt/comppnp.c diff --git a/drivers/bus/acpi/compbatt/guid.c b/drivers/battery/compbatt/guid.c similarity index 100% rename from drivers/bus/acpi/compbatt/guid.c rename to drivers/battery/compbatt/guid.c diff --git a/drivers/bus/acpi/CMakeLists.txt b/drivers/bus/acpi/CMakeLists.txt index 3535cf5604c..f56afd97228 100644 --- a/drivers/bus/acpi/CMakeLists.txt +++ b/drivers/bus/acpi/CMakeLists.txt @@ -209,6 +209,3 @@ add_importlibs(acpi ntoskrnl hal) add_pch(acpi precomp.h ACPI_SOURCE) add_cd_file(TARGET acpi DESTINATION reactos/system32/drivers NO_CAB FOR all) add_driver_inf(acpi acpi.inf) - -add_subdirectory(cmbatt) -add_subdirectory(compbatt)

1 week

[reactos] 01/01: [RAPPS] Set working directory for zip generated shortcuts (#7674)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b35becef2eb507c90d5b6… commit b35becef2eb507c90d5b6d4a8c66a2647445cde1 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Wed Jan 29 00:46:11 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 29 00:46:11 2025 +0100 [RAPPS] Set working directory for zip generated shortcuts (#7674) Some applications are broken and assume the working directory is the same as the .exe directory (xrick etc). --- base/applications/rapps/geninst.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/base/applications/rapps/geninst.cpp b/base/applications/rapps/geninst.cpp index ba57b53b502..8e96e9e280e 100644 --- a/base/applications/rapps/geninst.cpp +++ b/base/applications/rapps/geninst.cpp @@ -309,6 +309,9 @@ CreateShortcut(const CStringW &Target) { if (SUCCEEDED(hr = link->SetPath(Target))) { + SplitFileAndDirectory(Target, &tmp); + link->SetWorkingDirectory(tmp); + if (SUCCEEDED(GetCustomIconPath(Info, tmp))) { LPWSTR p = tmp.GetBuffer();

1 week

[reactos] 30/30: [NTOS:EX] HACK: on livecd, disable security features in NtSystemDebugControl

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9852e83d294f7f047943… commit b9852e83d294f7f047943ca5eaa89e9aa24462d8 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Sep 22 21:43:25 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 28 22:00:56 2025 +0100 [NTOS:EX] HACK: on livecd, disable security features in NtSystemDebugControl WinDBG can do some local debugging using 'windbg -kl'. In that case, WinDBG tries to directly use NtSystemDebugControl. If this function returns an error, WinDBG extracts a driver from its resources. WinDBG will send IOCTLs to this driver, and this driver will call KdSystemDebugControl. However, on livecd (where %SYSTEMROOT% is read-only), WinDBG is unable to extract the driver from its resources, and can't use the driver to call KdSystemDebugControl. As a work-around, allow all control classes in NtSystemDebugControl in case of livecd. WinDBG local debugging now also works on livecd (windbg -kl). --- ntoskrnl/ex/dbgctrl.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ex/dbgctrl.c b/ntoskrnl/ex/dbgctrl.c index a62345ee692..5ed32619fee 100644 --- a/ntoskrnl/ex/dbgctrl.c +++ b/ntoskrnl/ex/dbgctrl.c @@ -267,7 +267,17 @@ NtSystemDebugControl( case SysDbgWriteBusData: case SysDbgCheckLowMemory: /* Those are implemented in KdSystemDebugControl */ - Status = STATUS_NOT_IMPLEMENTED; + if (InitIsWinPEMode) + { + Status = KdSystemDebugControl(Command, + InputBuffer, InputBufferLength, + OutputBuffer, OutputBufferLength, + &Length, PreviousMode); + } + else + { + Status = STATUS_NOT_IMPLEMENTED; + } break; case SysDbgBreakPoint:

1 week, 1 day

[reactos] 29/30: [NTOS:KD64] Fix freezes on first chance exception when KDBG is enabled and KdIgnoreUmExceptions is TRUE

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5547b747179b163bcb115… commit 5547b747179b163bcb115f58f256c27b8552497c Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Sep 22 21:43:10 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 28 22:00:55 2025 +0100 [NTOS:KD64] Fix freezes on first chance exception when KDBG is enabled and KdIgnoreUmExceptions is TRUE This fixes the following use case: - Execute 'kdbgctrl.exe -du' - Execute 'kdbgctrl.exe -cu' - See that last command never finishes --- ntoskrnl/kd64/kdtrap.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ntoskrnl/kd64/kdtrap.c b/ntoskrnl/kd64/kdtrap.c index 4cfac2b04b0..8af25e3429f 100644 --- a/ntoskrnl/kd64/kdtrap.c +++ b/ntoskrnl/kd64/kdtrap.c @@ -318,7 +318,6 @@ KdIsThisAKdTrap(IN PEXCEPTION_RECORD ExceptionRecord, IN PCONTEXT Context, IN KPROCESSOR_MODE PreviousMode) { -#ifdef _WINKD_ /* * Determine if this is a valid debug service call and make sure that * it isn't a software breakpoint @@ -335,8 +334,4 @@ KdIsThisAKdTrap(IN PEXCEPTION_RECORD ExceptionRecord, /* We don't have to handle it */ return FALSE; } -#else - /* KDBG has its own mechanism for ignoring user mode exceptions */ - return FALSE; -#endif }

1 week, 1 day

[reactos] 28/30: [NTOS:KD64] Add a missing KdEnteredDebugger reset in KdExitDebugger()

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7068a790b2d9a24ff3cf8… commit 7068a790b2d9a24ff3cf8856f40e8cac1eb6d05e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 29 20:58:07 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 28 22:00:54 2025 +0100 [NTOS:KD64] Add a missing KdEnteredDebugger reset in KdExitDebugger() --- ntoskrnl/kd64/kdapi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/kd64/kdapi.c b/ntoskrnl/kd64/kdapi.c index 76f6786c112..dca8cc73cc2 100644 --- a/ntoskrnl/kd64/kdapi.c +++ b/ntoskrnl/kd64/kdapi.c @@ -1952,7 +1952,8 @@ KdExitDebugger(IN BOOLEAN Enable) { ULONG TimeSlip; - /* Restore the state and unlock the port */ + /* Reset the debugger entered flag, restore the port state and unlock it */ + KdEnteredDebugger = FALSE; KdRestore(FALSE); if (KdpPortLocked) KdpPortUnlock();

1 week, 1 day

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 January 2025