Ros-diffs January 2024

ros-diffs@reactos.org

17 participants
181 discussions

[reactos] 01/01: [SUBST] Update Romanian (ro-RO) translation (#6395)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82e6688e4da428dc1fba0… commit 82e6688e4da428dc1fba006e5e65a2cc05a12e8e Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Jan 21 22:26:30 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 21 21:26:30 2024 +0100 [SUBST] Update Romanian (ro-RO) translation (#6395) --- base/system/subst/lang/ro-RO.rc | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/base/system/subst/lang/ro-RO.rc b/base/system/subst/lang/ro-RO.rc index ca3ba4ff97e..3e86b424b49 100644 --- a/base/system/subst/lang/ro-RO.rc +++ b/base/system/subst/lang/ro-RO.rc @@ -1,4 +1,10 @@ -/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */ +/* + * PROJECT: ReactOS Subst Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2024 Andrei Miloiu <miloiuandrei(a)gmail.com> + */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -8,15 +14,15 @@ BEGIN IDS_INVALID_PARAMETER "Număr eronat de parametri - %s\n" IDS_INVALID_PARAMETER2 "Parametru eronat - %s\n" IDS_PATH_NOT_FOUND "Cale inexistentă - %s\n" - IDS_ACCESS_DENIED "Acces respins - %s\n" - IDS_DRIVE_ALREADY_SUBSTED "Unitatea este deja SUBSTituită\n" + IDS_ACCESS_DENIED "Acces interzis - %s\n" + IDS_DRIVE_ALREADY_SUBSTED "Discul este deja SUBSTituit\n" IDS_FAILED_WITH_ERRORCODE "Operația a eșuat. Codul de eroare 0x%x: %s\n" - IDS_USAGE "Substituie un director cu o unitate de stocare.\n\n\ -SUBST [unitate1: [unitate2:]cale]\n\ -SUBST unitate1: /D\n\n\ - unitate1: Unitatea virtuală ce va fi asociată directorului.\n\ - [unitate:]cale Unitatea fizică și calea directorului substituit\n\ - cu unitatea virtuală.\n\ - /D șterge o unitate (virtuală) de substituție.\n\n\ -Tastați SUBST fără argumente pentru a enumera unitățile virtuale curente.\n" + IDS_USAGE "Asociază o cale cu o literă de disc.\n\n\ +SUBST [disc1: [disc2:]cale]\n\ +SUBST disc1: /D\n\n\ + disc1: Discul virtual ce va fi asociat directorului.\n\ + [disc:]cale Discul fizic și calea directorului substituit\n\ + cu discul virtual.\n\ + /D șterge un disc (virtual) de substituție.\n\n\ +Tastați SUBST fără argumente pentru a enumera discurile virtuale curente.\n" END

8 months

[reactos] 01/01: [SETUPAPI] Update Romanian (ro-RO) translation (#6396)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34d63501ba808b5b98294… commit 34d63501ba808b5b982941dbabaffbdfd7600437 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Jan 21 22:07:06 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 21 21:07:06 2024 +0100 [SETUPAPI] Update Romanian (ro-RO) translation (#6396) --- dll/win32/setupapi/lang/ro-RO.rc | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dll/win32/setupapi/lang/ro-RO.rc b/dll/win32/setupapi/lang/ro-RO.rc index e0138376188..982684708f3 100644 --- a/dll/win32/setupapi/lang/ro-RO.rc +++ b/dll/win32/setupapi/lang/ro-RO.rc @@ -1,10 +1,16 @@ -/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */ +/* + * PROJECT: ReactOS SetupAPI DLL + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2024 Andrei Miloiu <miloiuandrei(a)gmail.com> + */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL COPYFILEDLGORD DIALOGEX 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Copiere fișiere" +CAPTION "Copiere fișiere..." FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "A&nulează", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP @@ -20,9 +26,9 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Fișiere necesare" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Introduceți discul de instalare al producătorului apoi\nverificați că mai jos e selectată unitatea corectă", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Introduceți discul de instalare al producătorului apoi\nverificați că discul corect e selectat mai jos", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Fișierele producătorului vor fi copiate din:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copiază fișierele producătorului din:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 DEFPUSHBUTTON "Con&firmă", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "A&nulează", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP @@ -31,15 +37,15 @@ END STRINGTABLE BEGIN - IDS_PROMPTDISK "Este necesar fișierul «%1» din %2" - IDS_UNKNOWN "Nespecificat" - IDS_COPYFROM "Copie fișiere din:" - IDS_INFO "Tastați calea unde sunt amplasate fișierele, apoi confirmați." + IDS_PROMPTDISK "Este necesar fișierul «%1» pe %2" + IDS_UNKNOWN "Necunoscut" + IDS_COPYFROM "Copiază fișiere din:" + IDS_INFO "Tastați calea unde sunt situate fișierele, apoi dați clic pe Confirmă." END STRINGTABLE BEGIN - IDS_QUERY_REBOOT_TEXT "Este necesară repornirea calculatorului pentru a finaliza instalarea. Continuați?" + IDS_QUERY_REBOOT_TEXT "Este necesară repornirea calculatorului dvs. pentru a finaliza instalarea. Continuați?" IDS_QUERY_REBOOT_CAPTION "Repornire" IDS_INF_FILE "Informație de instalare" END

8 months

[reactos] 01/01: [NTOS] Fix boot on UP build - PrcbLocks are not used on UP (#6391)

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=748a2e165534e107492a2… commit 748a2e165534e107492a2c97c231deb3e5d79bbc Author: Justin Miller <justin.miller(a)reactos.org> AuthorDate: Sat Jan 20 08:59:13 2024 -0800 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 20 08:59:13 2024 -0800 [NTOS] Fix boot on UP build - PrcbLocks are not used on UP (#6391) On the uniprocessor kernel KiAcquirePrcbLock is a stub that doesn't modify the current Prcb's PrcbLock value. Quickly protect this assert around CONFIG_SMP --- ntoskrnl/include/internal/ke_x.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ntoskrnl/include/internal/ke_x.h b/ntoskrnl/include/internal/ke_x.h index fcf3edb2786..ae431649773 100644 --- a/ntoskrnl/include/internal/ke_x.h +++ b/ntoskrnl/include/internal/ke_x.h @@ -1359,7 +1359,9 @@ KxQueueReadyThread(IN PKTHREAD Thread, /* Sanity checks */ ASSERT(Prcb == KeGetCurrentPrcb()); +#ifdef CONFIG_SMP ASSERT(Prcb->PrcbLock != 0); +#endif ASSERT(Thread->State == Running); ASSERT(Thread->NextProcessor == Prcb->Number);

8 months

[reactos] 01/01: [NTOS:KE] Acquire PRCB lock before marking thread ready for execution in dispatch interrupt routine (#6387)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab528ac6ae105b19d4575… commit ab528ac6ae105b19d457587dc680d8016720bc3d Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Sat Jan 20 15:58:39 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 20 15:58:39 2024 +0100 [NTOS:KE] Acquire PRCB lock before marking thread ready for execution in dispatch interrupt routine (#6387) Fixed in x86 and ARM (this was already done in x64). This is needed because thread preparation routine KxQueueReadyThread() releases PRCB lock, but does not acquire it, so that the locking must always be done outside the function, same as in all its other usage cases. This fixes an assert from release PRCB routine, when booting x86 ReactOS in SMP mode, because it attempts to release the lock when it is not actually acquired. Addendum to commit a011d19ed. + Add an assert in KxQueueReadyThread() to ensure the PRCB lock is actually acquired. --- ntoskrnl/include/internal/ke_x.h | 1 + ntoskrnl/ke/arm/thrdini.c | 3 +++ ntoskrnl/ke/i386/thrdini.c | 3 +++ 3 files changed, 7 insertions(+) diff --git a/ntoskrnl/include/internal/ke_x.h b/ntoskrnl/include/internal/ke_x.h index 70fa05e1d12..fcf3edb2786 100644 --- a/ntoskrnl/include/internal/ke_x.h +++ b/ntoskrnl/include/internal/ke_x.h @@ -1359,6 +1359,7 @@ KxQueueReadyThread(IN PKTHREAD Thread, /* Sanity checks */ ASSERT(Prcb == KeGetCurrentPrcb()); + ASSERT(Prcb->PrcbLock != 0); ASSERT(Thread->State == Running); ASSERT(Thread->NextProcessor == Prcb->Number); diff --git a/ntoskrnl/ke/arm/thrdini.c b/ntoskrnl/ke/arm/thrdini.c index 190b73f926c..c32b39c392d 100644 --- a/ntoskrnl/ke/arm/thrdini.c +++ b/ntoskrnl/ke/arm/thrdini.c @@ -334,6 +334,9 @@ KiDispatchInterrupt(VOID) } else if (Prcb->NextThread) { + /* Acquire the PRCB lock */ + KiAcquirePrcbLock(Prcb); + /* Capture current thread data */ OldThread = Prcb->CurrentThread; NewThread = Prcb->NextThread; diff --git a/ntoskrnl/ke/i386/thrdini.c b/ntoskrnl/ke/i386/thrdini.c index 3214f560872..91e8ad3931f 100644 --- a/ntoskrnl/ke/i386/thrdini.c +++ b/ntoskrnl/ke/i386/thrdini.c @@ -495,6 +495,9 @@ KiDispatchInterrupt(VOID) } else if (Prcb->NextThread) { + /* Acquire the PRCB lock */ + KiAcquirePrcbLock(Prcb); + /* Capture current thread data */ OldThread = Prcb->CurrentThread; NewThread = Prcb->NextThread;

8 months

[reactos] 01/01: [NTOS:KE] Set IRQL to SYNCH_LEVEL when exiting from idle after the thread is ready for execution (#6386)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f72d6dd4c5071a7c16d0b… commit f72d6dd4c5071a7c16d0bd842d8ff7bd2549ea4a Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Sat Jan 20 15:55:20 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 20 15:55:20 2024 +0100 [NTOS:KE] Set IRQL to SYNCH_LEVEL when exiting from idle after the thread is ready for execution (#6386) CORE-1697 Raise IRQL to SYNCH_LEVEL when exiting from the idle thread in the idle loop, in case it is scheduled for execution. Then restore it back to DISPATCH_LEVEL, after this is done. This behaviour is a bit similar to the way it's done on x64. This IRQL raise is necessary only in SMP builds. Calls are placed in CONFIG_SMP ifdef: this avoids unnecessary IRQL changes on UP, since SYNCH_LEVEL and DISPATCH_LEVEL are identical there, unlike in MP, where SYNCH_LEVEL is IPI_LEVEL - 2 actually. This prevents bugcheck DRIVER_IRQL_NOT_LESS_OR_EQUAL when booting SMP x86 ReactOS, in KiTimerExpiration when calling it 2nd time. The BSOD happened due to IRQL levels mismatch. --- ntoskrnl/ke/amd64/stubs.c | 4 ++++ ntoskrnl/ke/arm/thrdini.c | 10 ++++++++++ ntoskrnl/ke/i386/thrdini.c | 10 ++++++++++ 3 files changed, 24 insertions(+) diff --git a/ntoskrnl/ke/amd64/stubs.c b/ntoskrnl/ke/amd64/stubs.c index cb2d4a37248..7326f7a2cd0 100644 --- a/ntoskrnl/ke/amd64/stubs.c +++ b/ntoskrnl/ke/amd64/stubs.c @@ -139,14 +139,18 @@ KiIdleLoop(VOID) /* The thread is now running */ NewThread->State = Running; +#ifdef CONFIG_SMP /* Do the swap at SYNCH_LEVEL */ KfRaiseIrql(SYNCH_LEVEL); +#endif /* Switch away from the idle thread */ KiSwapContext(APC_LEVEL, OldThread); +#ifdef CONFIG_SMP /* Go back to DISPATCH_LEVEL */ KeLowerIrql(DISPATCH_LEVEL); +#endif } else { diff --git a/ntoskrnl/ke/arm/thrdini.c b/ntoskrnl/ke/arm/thrdini.c index 89f1664608b..190b73f926c 100644 --- a/ntoskrnl/ke/arm/thrdini.c +++ b/ntoskrnl/ke/arm/thrdini.c @@ -193,8 +193,18 @@ KiIdleLoop(VOID) /* The thread is now running */ NewThread->State = Running; +#ifdef CONFIG_SMP + /* Do the swap at SYNCH_LEVEL */ + KfRaiseIrql(SYNCH_LEVEL); +#endif + /* Switch away from the idle thread */ KiSwapContext(APC_LEVEL, OldThread); + +#ifdef CONFIG_SMP + /* Go back to DISPATCH_LEVEL */ + KeLowerIrql(DISPATCH_LEVEL); +#endif } else { diff --git a/ntoskrnl/ke/i386/thrdini.c b/ntoskrnl/ke/i386/thrdini.c index cfc497bfc69..3214f560872 100644 --- a/ntoskrnl/ke/i386/thrdini.c +++ b/ntoskrnl/ke/i386/thrdini.c @@ -300,8 +300,18 @@ KiIdleLoop(VOID) /* The thread is now running */ NewThread->State = Running; +#ifdef CONFIG_SMP + /* Do the swap at SYNCH_LEVEL */ + KfRaiseIrql(SYNCH_LEVEL); +#endif + /* Switch away from the idle thread */ KiSwapContext(APC_LEVEL, OldThread); + +#ifdef CONFIG_SMP + /* Go back to DISPATCH_LEVEL */ + KeLowerIrql(DISPATCH_LEVEL); +#endif } else {

8 months

[reactos] 01/01: [HALX86] Fix SYNCH_LEVEL differences between UP and SMP in HAL (#5874)

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3306a16e846359b5712e1… commit 3306a16e846359b5712e15d0c9446ea4a6971ff4 Author: Justin Miller <justin.miller(a)reactos.org> AuthorDate: Sat Jan 20 06:26:59 2024 -0800 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 20 06:26:59 2024 -0800 [HALX86] Fix SYNCH_LEVEL differences between UP and SMP in HAL (#5874) First step to fixing the multiprocessor kernel when booting on a single core. --- hal/halx86/generic/buildtype.c | 8 +++++++- hal/halx86/include/halp.h | 8 ++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/hal/halx86/generic/buildtype.c b/hal/halx86/generic/buildtype.c index 2aad63360f9..49d7df8f226 100644 --- a/hal/halx86/generic/buildtype.c +++ b/hal/halx86/generic/buildtype.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Hardware Abstraction Layer * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) -* PURPOSE: Defines HalpBuildType for either UP or SMP +* PURPOSE: Defines differences for either UP or SMP * COPYRIGHT: Copyright 2021 Timo Kreuzer <timo.kreuzer(a)reactos.org> */ @@ -12,3 +12,9 @@ /* GLOBALS ******************************************************************/ const USHORT HalpBuildType = HAL_BUILD_TYPE; + +#ifdef CONFIG_SMP +KIRQL HalpIrqlSynchLevel = IPI_LEVEL - 2; +#else +KIRQL HalpIrqlSynchLevel = DISPATCH_LEVEL; +#endif diff --git a/hal/halx86/include/halp.h b/hal/halx86/include/halp.h index cc55c15b847..72e09fdb28f 100644 --- a/hal/halx86/include/halp.h +++ b/hal/halx86/include/halp.h @@ -10,6 +10,14 @@ #define HAL_BUILD_TYPE ((DBG ? PRCB_BUILD_DEBUG : 0) | PRCB_BUILD_UNIPROCESSOR) #endif +/* Don't include this in freeloader */ +#ifndef _BLDR_ +extern KIRQL HalpIrqlSynchLevel; + +#undef SYNCH_LEVEL +#define SYNCH_LEVEL HalpIrqlSynchLevel +#endif + typedef struct _HAL_BIOS_FRAME { ULONG SegSs;

8 months

[reactos] 01/01: [NTOS:KE] Fix initialization of node block for application processors

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c1cfe058706ff31dbcd3… commit 9c1cfe058706ff31dbcd3c7b53eec879f66c8030 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Dec 20 20:04:41 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 18 22:41:46 2024 +0100 [NTOS:KE] Fix initialization of node block for application processors - Initialize KeNodeBlock[0] statically - Update Prcb->ParentNode->ProcessorMask for all processors --- ntoskrnl/ke/amd64/krnlinit.c | 9 ++++----- ntoskrnl/ke/i386/kiinit.c | 11 +++++------ ntoskrnl/ke/krnlinit.c | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ntoskrnl/ke/amd64/krnlinit.c b/ntoskrnl/ke/amd64/krnlinit.c index 34d1a6621f6..d7aea4db738 100644 --- a/ntoskrnl/ke/amd64/krnlinit.c +++ b/ntoskrnl/ke/amd64/krnlinit.c @@ -147,6 +147,10 @@ KiSystemStartupBootStack(VOID) PKPROCESS Process = Thread->ApcState.Process; PVOID KernelStack = (PVOID)KeLoaderBlock->KernelStack; + /* Set Node Data */ + Prcb->ParentNode = KeNodeBlock[0]; + Prcb->ParentNode->ProcessorMask |= Prcb->SetMember; + /* Initialize the Power Management Support for this PRCB */ PoInitializePrcb(Prcb); @@ -228,11 +232,6 @@ KiInitializeKernel(IN PKPROCESS InitProcess, PVOID DpcStack; ULONG i; - /* Set Node Data */ - KeNodeBlock[0] = &KiNode0; - Prcb->ParentNode = KeNodeBlock[0]; - KeNodeBlock[0]->ProcessorMask = Prcb->SetMember; - /* Set boot-level flags */ KeFeatureBits = Prcb->FeatureBits; diff --git a/ntoskrnl/ke/i386/kiinit.c b/ntoskrnl/ke/i386/kiinit.c index 54d902add4b..2620885156a 100644 --- a/ntoskrnl/ke/i386/kiinit.c +++ b/ntoskrnl/ke/i386/kiinit.c @@ -413,7 +413,7 @@ KiVerifyCpuFeatures(PKPRCB Prcb) Cr0 &= ~(CR0_EM | CR0_MP); // Enable FPU exceptions. Cr0 |= CR0_NE; - + __writecr0(Cr0); // Check for Pentium FPU bug. @@ -492,14 +492,13 @@ KiInitializeKernel(IN PKPROCESS InitProcess, /* Initialize spinlocks and DPC data */ KiInitSpinLocks(Prcb, Number); + /* Set Node Data */ + Prcb->ParentNode = KeNodeBlock[0]; + Prcb->ParentNode->ProcessorMask |= Prcb->SetMember; + /* Check if this is the Boot CPU */ if (!Number) { - /* Set Node Data */ - KeNodeBlock[0] = &KiNode0; - Prcb->ParentNode = KeNodeBlock[0]; - KeNodeBlock[0]->ProcessorMask = Prcb->SetMember; - /* Set boot-level flags */ KeI386CpuType = Prcb->CpuType; KeI386CpuStep = Prcb->CpuStep; diff --git a/ntoskrnl/ke/krnlinit.c b/ntoskrnl/ke/krnlinit.c index cac3e1f8007..66299e3d57c 100644 --- a/ntoskrnl/ke/krnlinit.c +++ b/ntoskrnl/ke/krnlinit.c @@ -36,7 +36,7 @@ CCHAR KeNumberProcessors = 0; /* NUMA Node Support */ KNODE KiNode0; -PKNODE KeNodeBlock[1]; +PKNODE KeNodeBlock[1] = { &KiNode0 }; UCHAR KeNumberNodes = 1; UCHAR KeProcessNodeSeed;

8 months

[reactos] 01/01: [WS2_32_WINETEST] Patch ws2_32:sock wine test to run on ReactOS (#5609)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=619ff7c4291c9d562d817… commit 619ff7c4291c9d562d817a86bf221c8d391ffd6b Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Thu Jan 18 05:11:25 2024 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 18 12:11:25 2024 +0100 [WS2_32_WINETEST] Patch ws2_32:sock wine test to run on ReactOS (#5609) Disable ReactOS specific tests which are not implemented yet. ROSTESTS-385 - Bypass part of test that uses MEM_WRITE_WATCH. - Bypass three tests that are unimplemented: 1) WSPAcceptEx, 2) WSPConnectEx, and 3) WSPDisconnectEx --- modules/rostests/winetests/ws2_32/sock.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/modules/rostests/winetests/ws2_32/sock.c b/modules/rostests/winetests/ws2_32/sock.c index 48e08eee6f1..74ea920dd00 100644 --- a/modules/rostests/winetests/ws2_32/sock.c +++ b/modules/rostests/winetests/ws2_32/sock.c @@ -7010,6 +7010,15 @@ static void test_write_watch(void) base = VirtualAlloc( 0, size, MEM_RESERVE | MEM_COMMIT | MEM_WRITE_WATCH, PAGE_READWRITE ); ok( base != NULL, "VirtualAlloc failed %u\n", GetLastError() ); +#ifdef __REACTOS__ + if (!base) + { + skip("VirtualAlloc(MEM_WRITE_WATCH) is not supported yet on ReactOS\n"); + skip("Skipping tests due to hang. See ROSTESTS-385\n"); + return; + } +#endif + memset( base, 0, size ); count = 64; ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); @@ -11620,9 +11629,22 @@ START_TEST( sock ) test_GetAddrInfoW(); test_GetAddrInfoExW(); test_getaddrinfo(); + +#ifdef __REACTOS__ + if (!winetest_interactive) + { + skip("WSPAcceptEx(), WSPConnectEx() and WSPDisconnectEx() are UNIMPLEMENTED on ReactOS\n"); + skip("Skipping tests due to hang. See ROSTESTS-385\n"); + } + else + { +#endif test_AcceptEx(); test_ConnectEx(); test_DisconnectEx(); +#ifdef __REACTOS__ + } +#endif test_sioRoutingInterfaceQuery(); test_sioAddressListChange();

8 months

[reactos] 01/01: [SDK] cicuif.h: Add CUIFBalloonButton and CUIFBalloonWindow (#6384)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=73ba03add1ccf725b85c5… commit 73ba03add1ccf725b85c55b4d0532ed640993d6d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jan 18 19:25:46 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 18 19:25:46 2024 +0900 [SDK] cicuif.h: Add CUIFBalloonButton and CUIFBalloonWindow (#6384) Supporting TIPs... JIRA issue: CORE-19360 - Implement CUIFBalloonButton class. - Half-implement CUIFBalloonWindow class. --- sdk/include/reactos/cicero/cicuif.h | 700 +++++++++++++++++++++++++++++++++--- 1 file changed, 660 insertions(+), 40 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index c5f4bfcc845..fc05fb72f33 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -23,12 +23,15 @@ class CUIFTheme; class CUIFWindow; class CUIFToolTip; class CUIFShadow; + class CUIFBalloonWindow; + class CUIFButton; + class CUIFButton2; + class CUIFToolbarMenuButton; + class CUIFToolbarButtonElement; + class CUIFBalloonButton; class CUIFToolbarButton; - class CUIFButton; - class CUIFButton2; - class CUIFToolbarMenuButton; - class CUIFToolbarButtonElement; - class CUIFGripper; + class CUIFWndFrame; + class CUIFGripper; class CUIFObjectArray; class CUIFColorTable; class CUIFColorTableSys; @@ -203,7 +206,7 @@ protected: CUIFWindow *m_pWindow; CUIFScheme *m_pScheme; CUIFObjectArray m_ObjectArray; - DWORD m_dwUnknown3; //FIXME: name and type + DWORD m_nObjectID; DWORD m_style; RECT m_rc; BOOL m_bEnable; @@ -214,9 +217,10 @@ protected: DWORD m_dwUnknown4[2]; //FIXME: name and type friend class CUIFWindow; friend class CUIFToolTip; + friend class CUIFBalloonWindow; public: - CUIFObject(CUIFObject *pParent, DWORD dwUnknown3, LPCRECT prc, DWORD style); + CUIFObject(CUIFObject *pParent, DWORD nObjectID, LPCRECT prc, DWORD style); virtual ~CUIFObject(); void StartCapture(); @@ -544,7 +548,6 @@ protected: CUIFToolTip *m_pToolTip; CUIFShadow *m_pShadow; BOOL m_bShowShadow; - CUIFWindow *m_pShadowOrToolTipOwner; friend class CUIFObject; friend class CUIFShadow; friend class CUIFToolTip; @@ -574,7 +577,7 @@ public: static LRESULT CALLBACK WindowProcedure(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); STDMETHOD_(LPCTSTR, GetClassName)(); - STDMETHOD_(LPCTSTR, GetWndText)(); + STDMETHOD_(LPCTSTR, GetWndTitle)(); STDMETHOD_(DWORD, GetWndStyle)(); STDMETHOD_(DWORD, GetWndStyleEx)(); STDMETHOD_(HWND, CreateWnd)(HWND hwndParent); @@ -620,6 +623,7 @@ public: class CUIFToolTip : public CUIFWindow { protected: + CUIFWindow *m_pToolTipOwner; CUIFObject *m_pToolTipTarget; LPWSTR m_pszToolTipText; BOOL m_bShowToolTip; @@ -662,6 +666,7 @@ public: class CUIFShadow : public CUIFWindow { protected: + CUIFWindow *m_pShadowOwner; COLORREF m_rgbShadowColor; DWORD m_dwUnknown11[2]; INT m_xShadowDelta; @@ -722,7 +727,7 @@ protected: void DrawTextProc(HDC hDC, LPCRECT prc, BOOL bPressed); public: - CUIFButton(CUIFObject *pParent, DWORD dwUnknown3, LPCRECT prc, DWORD style); + CUIFButton(CUIFObject *pParent, DWORD nObjectID, LPCRECT prc, DWORD style); ~CUIFButton() override; void SetIcon(HICON hIcon); @@ -748,7 +753,7 @@ protected: SIZE m_BitmapSize; public: - CUIFButton2(CUIFObject *pParent, DWORD dwUnknown3, LPCRECT prc, DWORD style); + CUIFButton2(CUIFObject *pParent, DWORD nObjectID, LPCRECT prc, DWORD style); ~CUIFButton2() override; DWORD MakeDrawFlag(); @@ -763,7 +768,7 @@ class CUIFToolbarMenuButton : public CUIFButton2 public: CUIFToolbarButton *m_pToolbarButton; - CUIFToolbarMenuButton(CUIFToolbarButton *pParent, DWORD dwUnknown3, LPCRECT prc, DWORD style); + CUIFToolbarMenuButton(CUIFToolbarButton *pParent, DWORD nObjectID, LPCRECT prc, DWORD style); ~CUIFToolbarMenuButton() override; STDMETHOD_(void, OnLButtonUp)(LONG x, LONG y) override; @@ -777,7 +782,7 @@ class CUIFToolbarButtonElement : public CUIFButton2 public: CUIFToolbarButton *m_pToolbarButton; - CUIFToolbarButtonElement(CUIFToolbarButton *pParent, DWORD dwUnknown3, LPCRECT prc, DWORD style); + CUIFToolbarButtonElement(CUIFToolbarButton *pParent, DWORD nObjectID, LPCRECT prc, DWORD style); STDMETHOD_(LPCWSTR, GetToolTip)() override; STDMETHOD_(void, OnLButtonUp)(LONG x, LONG y) override; @@ -796,7 +801,7 @@ public: CUIFToolbarButton( CUIFObject *pParent, - DWORD dwUnknown3, + DWORD nObjectID, LPCRECT prc, DWORD style, DWORD dwToolbarButtonFlags, @@ -876,6 +881,88 @@ public: ///////////////////////////////////////////////////////////////////////////// +class CUIFBalloonButton : public CUIFButton +{ +protected: + UINT m_nCommandID; + friend class CUIFBalloonWindow; + +public: + CUIFBalloonButton(CUIFObject *pParent, DWORD nObjectID, LPCRECT prc, DWORD style); + + STDMETHOD_(void, OnPaint)(HDC hDC) override; + void DrawTextProc(HDC hDC, LPCRECT prc, BOOL bPressed); +}; + +///////////////////////////////////////////////////////////////////////////// + +// m_style flags for CUIFBalloonWindow +enum +{ + UIF_BALLOON_WINDOW_OK = 0x10000, + UIF_BALLOON_WINDOW_YESNO = 0x20000, + UIF_BALLOON_WINDOW_TYPE_MASK = 0xF0000, +}; + +class CUIFBalloonWindow : public CUIFWindow +{ +protected: + LPWSTR m_pszBalloonText; + HRGN m_hRgn; + RECT m_rcMargin; + DWORD m_dwUnknown6; + BOOL m_bHasBkColor; + BOOL m_bHasTextColor; + COLORREF m_rgbBkColor; + COLORREF m_rgbTextColor; + POINT m_ptTarget; + RECT m_rcExclude; + POINT m_ptBalloon; + DWORD m_dwUnknown7; + UINT m_nBalloonType; + DWORD m_dwUnknown8[2]; + UINT m_cButtons; + WPARAM m_nActionID; + HWND m_hwndNotif; + UINT m_uNotifMsg; + +public: + CUIFBalloonWindow(HINSTANCE hInst, DWORD style); + ~CUIFBalloonWindow() override; + + STDMETHOD_(void, Initialize)() override; + STDMETHOD_(LPCTSTR, GetClassName)() override; + STDMETHOD_(LPCTSTR, GetWndTitle)() override; + STDMETHOD_(void, OnCreate)(HWND hWnd) override; + STDMETHOD_(void, OnDestroy)(HWND hWnd) override; + STDMETHOD_(void, OnKeyDown)(HWND hWnd, WPARAM wParam, LPARAM lParam) override; + STDMETHOD_(LRESULT, OnObjectNotify)(CUIFObject *pObject, WPARAM wParam, LPARAM lParam) override; + STDMETHOD_(void, OnPaint)(HDC hDC) override; + + void AddButton(UINT nCommandId); + void AdjustPos(); + HRGN CreateRegion(LPCRECT prc); + void DoneWindowRegion(); + CUIFBalloonButton *FindButton(UINT nCommandID); + CUIFObject *FindUIObject(UINT nObjectID); + + COLORREF GetBalloonBkColor(); + COLORREF GetBalloonTextColor(); + void GetButtonSize(LPSIZE pSize); + void GetMargin(LPRECT prcMargin); + void SetExcludeRect(LPCRECT prcExclude); + void SetTargetPos(POINT ptTarget); + void SetText(LPCWSTR pszText); + + void InitWindowRegion(); + void LayoutObject(); + void PaintFrameProc(HDC hDC, LPCRECT prc); + void PaintMessageProc(HDC hDC, LPRECT prc, LPCWSTR pszText); + void SendNotification(WPARAM wParam); +}; + +///////////////////////////////////////////////////////////////////////////// + inline void cicInitUIFLib(void) { cicInitUIFSys(); @@ -1105,12 +1192,12 @@ CUIFTheme::SetActiveTheme(LPCWSTR pszClassList, INT iPartId, INT iStateId) /// @unimplemented inline -CUIFObject::CUIFObject(CUIFObject *pParent, DWORD dwUnknown3, LPCRECT prc, DWORD style) +CUIFObject::CUIFObject(CUIFObject *pParent, DWORD nObjectID, LPCRECT prc, DWORD style) { m_pszClassList = NULL; m_hTheme = NULL; m_pParent = pParent; - m_dwUnknown3 = dwUnknown3; //FIXME: name and type + m_nObjectID = nObjectID; m_style = style; if (prc) @@ -2500,7 +2587,7 @@ inline LPCTSTR CUIFWindow::GetClassName() return TEXT("CiceroUIWndFrame"); } -inline LPCTSTR CUIFWindow::GetWndText() +inline LPCTSTR CUIFWindow::GetWndTitle() { return TEXT("CiceroUIWndFrame"); } @@ -2541,7 +2628,7 @@ CUIFWindow::GetWndStyleEx() inline STDMETHODIMP_(HWND) CUIFWindow::CreateWnd(HWND hwndParent) { - HWND hWnd = CreateWindowEx(GetWndStyleEx(), GetClassName(), GetWndText(), GetWndStyle(), + HWND hWnd = CreateWindowEx(GetWndStyleEx(), GetClassName(), GetWndTitle(), GetWndStyle(), m_nLeft, m_nTop, m_nWidth, m_nHeight, hwndParent, NULL, m_hInst, this); if (m_pToolTip) @@ -3238,7 +3325,7 @@ CUIFWindow::OnAnimationStart() inline CUIFShadow::CUIFShadow(HINSTANCE hInst, DWORD style, CUIFWindow *pShadowOwner) : CUIFWindow(hInst, (style | UIF_WINDOW_TOOLWINDOW)) { - m_pShadowOrToolTipOwner = pShadowOwner; + m_pShadowOwner = pShadowOwner; m_rgbShadowColor = RGB(0, 0, 0); m_dwUnknown11[0] = 0; m_dwUnknown11[1] = 0; @@ -3248,8 +3335,8 @@ inline CUIFShadow::CUIFShadow(HINSTANCE hInst, DWORD style, CUIFWindow *pShadowO inline CUIFShadow::~CUIFShadow() { - if (m_pShadowOrToolTipOwner) - m_pShadowOrToolTipOwner->m_pShadow = NULL; + if (m_pShadowOwner) + m_pShadowOwner->m_pShadow = NULL; } /// @unimplemented @@ -3271,7 +3358,7 @@ inline void CUIFShadow::InitShadow() inline void CUIFShadow::AdjustWindowPos() { - HWND hwndOwner = *m_pShadowOrToolTipOwner; + HWND hwndOwner = *m_pShadowOwner; if (!::IsWindow(m_hWnd)) return; @@ -3324,7 +3411,7 @@ inline STDMETHODIMP_(LRESULT) CUIFShadow::OnWindowPosChanging(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { WINDOWPOS *wp = (WINDOWPOS *)lParam; - wp->hwndInsertAfter = *m_pShadowOrToolTipOwner; + wp->hwndInsertAfter = *m_pShadowOwner; return ::DefWindowProc(hWnd, Msg, wParam, lParam); } @@ -3369,7 +3456,7 @@ inline CUIFToolTip::CUIFToolTip(HINSTANCE hInst, DWORD style, CUIFWindow *pToolTipOwner) : CUIFWindow(hInst, style) { - m_pShadowOrToolTipOwner = pToolTipOwner; + m_pToolTipOwner = pToolTipOwner; m_rcToolTipMargin.left = 2; m_rcToolTipMargin.top = 2; m_rcToolTipMargin.right = 2; @@ -3390,8 +3477,8 @@ CUIFToolTip::CUIFToolTip(HINSTANCE hInst, DWORD style, CUIFWindow *pToolTipOwner inline CUIFToolTip::~CUIFToolTip() { - if (m_pShadowOrToolTipOwner) - m_pShadowOrToolTipOwner->m_pToolTip = NULL; + if (m_pToolTipOwner) + m_pToolTipOwner->m_pToolTip = NULL; if (m_pszToolTipText) delete[] m_pszToolTipText; } @@ -3455,8 +3542,8 @@ CUIFToolTip::GetTipTextColor() inline CUIFObject* CUIFToolTip::FindObject(HWND hWnd, POINT pt) { - if (hWnd == *m_pShadowOrToolTipOwner) - return m_pShadowOrToolTipOwner->ObjectFromPoint(pt); + if (hWnd == *m_pToolTipOwner) + return m_pToolTipOwner->ObjectFromPoint(pt); return NULL; } @@ -3733,9 +3820,9 @@ inline STDMETHODIMP_(void) CUIFToolTip::OnTimer(WPARAM wParam) inline CUIFButton::CUIFButton( CUIFObject *pParent, - DWORD dwUnknown3, + DWORD nObjectID, LPCRECT prc, - DWORD style) : CUIFObject(pParent, dwUnknown3, prc, style) + DWORD style) : CUIFObject(pParent, nObjectID, prc, style) { m_ButtonIcon.m_hIcon = NULL; m_ButtonIcon.m_hImageList = NULL; @@ -4128,9 +4215,9 @@ inline void CUIFButton::SetText(LPCWSTR pszText) inline CUIFButton2::CUIFButton2( CUIFObject *pParent, - DWORD dwUnknown3, + DWORD nObjectID, LPCRECT prc, - DWORD style) : CUIFButton(pParent, dwUnknown3, prc, style) + DWORD style) : CUIFButton(pParent, nObjectID, prc, style) { m_iStateId = 0; m_iPartId = BP_PUSHBUTTON; @@ -4422,9 +4509,9 @@ CUIFGripper::SetStyle(DWORD style) inline CUIFToolbarMenuButton::CUIFToolbarMenuButton( CUIFToolbarButton *pParent, - DWORD dwUnknown3, + DWORD nObjectID, LPCRECT prc, - DWORD style) : CUIFButton2(pParent, dwUnknown3, prc, style) + DWORD style) : CUIFButton2(pParent, nObjectID, prc, style) { m_pToolbarButton = pParent; @@ -4432,7 +4519,7 @@ CUIFToolbarMenuButton::CUIFToolbarMenuButton( OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, TEXT("Marlett")); SetFont(hFont); - SetText(L"u"); + SetText(L"u"); // downward triangle } inline @@ -4461,9 +4548,9 @@ CUIFToolbarMenuButton::OnSetCursor(UINT uMsg, LONG x, LONG y) inline CUIFToolbarButtonElement::CUIFToolbarButtonElement( CUIFToolbarButton *pParent, - DWORD dwUnknown3, + DWORD nObjectID, LPCRECT prc, - DWORD style) : CUIFButton2(pParent, dwUnknown3, prc, style) + DWORD style) : CUIFButton2(pParent, nObjectID, prc, style) { m_pToolbarButton = pParent; } @@ -4497,11 +4584,11 @@ CUIFToolbarButtonElement::OnRButtonUp(LONG x, LONG y) inline CUIFToolbarButton::CUIFToolbarButton( CUIFObject *pParent, - DWORD dwUnknown3, + DWORD nObjectID, LPCRECT prc, DWORD style, DWORD dwToolbarButtonFlags, - LPCWSTR pszUnknownText) : CUIFObject(pParent, dwUnknown3, prc, style) + LPCWSTR pszUnknownText) : CUIFObject(pParent, nObjectID, prc, style) { m_dwToolbarButtonFlags = dwToolbarButtonFlags; m_pszUnknownText = pszUnknownText; @@ -4523,7 +4610,7 @@ inline BOOL CUIFToolbarButton::Init() style |= 0x10; if (m_dwToolbarButtonFlags & 0x80000) style |= UIF_BUTTON_VERTICAL; - m_pToolbarButtonElement = new(cicNoThrow) CUIFToolbarButtonElement(this, m_dwUnknown3, &rc1, style); + m_pToolbarButtonElement = new(cicNoThrow) CUIFToolbarButtonElement(this, m_nObjectID, &rc1, style); if (!m_pToolbarButtonElement) return FALSE; @@ -4837,3 +4924,536 @@ CUIFWndFrame::OnSetCursor(UINT uMsg, LONG x, LONG y) ::SetCursor(hCursor); return TRUE; } + +///////////////////////////////////////////////////////////////////////////// + +inline +CUIFBalloonButton::CUIFBalloonButton( + CUIFObject *pParent, + DWORD nObjectID, + LPCRECT prc, + DWORD style) : CUIFButton(pParent, nObjectID, prc, style) +{ + m_nCommandID = 0; +} + +inline STDMETHODIMP_(void) +CUIFBalloonButton::OnPaint(HDC hDC) +{ + RECT rc = m_rc; + ::OffsetRect(&rc, -rc.left, -rc.top); + + HDC hMemDC = ::CreateCompatibleDC(hDC); + HBITMAP hbmMem = ::CreateCompatibleBitmap(hDC, rc.right, rc.bottom); + HGDIOBJ hbmOld = ::SelectObject(hMemDC, hbmMem); + + BOOL bPressed; + COLORREF rgbShadow, rgbBorder; + if (m_uButtonStatus == 1) + { + bPressed = TRUE; + rgbShadow = ::GetSysColor(COLOR_BTNSHADOW); + rgbBorder = ::GetSysColor(COLOR_BTNHIGHLIGHT); + } + else + { + bPressed = FALSE; + if (m_uButtonStatus < 4) + { + rgbShadow = ::GetSysColor(COLOR_BTNHIGHLIGHT); + rgbBorder = ::GetSysColor(COLOR_BTNSHADOW); + } + else + { + rgbShadow = ::GetSysColor(COLOR_INFOBK); + rgbBorder = ::GetSysColor(COLOR_INFOBK); + } + } + + COLORREF rgbInfoBk = ::GetSysColor(COLOR_INFOBK); + HBRUSH hbrBack = ::CreateSolidBrush(rgbInfoBk); + ::FillRect(hMemDC, &rc, hbrBack); + ::DeleteObject(hbrBack); + + DrawTextProc(hMemDC, &rc, bPressed); + + HBRUSH hNullBrush = (HBRUSH)::GetStockObject(NULL_BRUSH); + HGDIOBJ hbrOld = ::SelectObject(hMemDC, hNullBrush); + + HPEN hPen = ::CreatePen(PS_SOLID, 0, rgbShadow); + HGDIOBJ hPenOld = ::SelectObject(hMemDC, hPen); + ::RoundRect(hMemDC, rc.left, rc.top, rc.right - 1, rc.bottom - 1, 6, 6); + ::SelectObject(hMemDC, hPenOld); + ::DeleteObject(hPen); + + hPen = ::CreatePen(PS_SOLID, 0, rgbBorder); + hPenOld = ::SelectObject(hMemDC, hPen); + ::RoundRect(hMemDC, rc.left + 1, rc.top + 1, rc.right, rc.bottom, 6, 6); + ::SelectObject(hMemDC, hPenOld); + ::DeleteObject(hPen); + + hPen = ::CreatePen(PS_SOLID, 0, ::GetSysColor(COLOR_BTNFACE)); + hPenOld = ::SelectObject(hMemDC, hPen); + ::RoundRect(hMemDC, rc.left + 1, rc.top + 1, rc.right - 1, rc.bottom - 1, 6, 6); + ::SelectObject(hMemDC, hPenOld); + ::DeleteObject(hPen); + + ::SelectObject(hMemDC, hbrOld); + ::BitBlt(hDC, m_rc.left, m_rc.top, m_rc.right - m_rc.left, m_rc.bottom - m_rc.top, + hMemDC, rc.left, rc.top, SRCCOPY); + ::SelectObject(hMemDC, hbmOld); + ::DeleteObject(hbmMem); + ::DeleteDC(hMemDC); +} + +inline void +CUIFBalloonButton::DrawTextProc(HDC hDC, LPCRECT prc, BOOL bPressed) +{ + if (!m_pszButtonText) + return; + + UINT uFlags = DT_SINGLELINE; + + if ((m_style & UIF_BUTTON_H_ALIGN_MASK) == UIF_BUTTON_H_ALIGN_CENTER) + uFlags |= DT_CENTER; + else if ((m_style & UIF_BUTTON_H_ALIGN_MASK) == UIF_BUTTON_H_ALIGN_RIGHT) + uFlags |= DT_RIGHT; + + if ((m_style & UIF_BUTTON_V_ALIGN_MASK) == UIF_BUTTON_V_ALIGN_MIDDLE) + uFlags |= DT_VCENTER; + else if ((m_style & UIF_BUTTON_V_ALIGN_MASK) == UIF_BUTTON_V_ALIGN_BOTTOM) + uFlags |= DT_BOTTOM; + + COLORREF rgbOldColor = ::SetTextColor(hDC, ::GetSysColor(COLOR_BTNTEXT)); + INT nOldBkMode = ::SetBkMode(hDC, TRANSPARENT); + + RECT rc = *prc; + if (bPressed) + ::OffsetRect(&rc, 1, 1); + + HGDIOBJ hFontOld = ::SelectObject(hDC, m_hFont); + ::DrawTextW(hDC, m_pszButtonText, -1, &rc, uFlags); + ::SelectObject(hDC, hFontOld); + + ::SetBkMode(hDC, nOldBkMode); + ::SetTextColor(hDC, rgbOldColor); +} + +///////////////////////////////////////////////////////////////////////////// + +inline +CUIFBalloonWindow::CUIFBalloonWindow(HINSTANCE hInst, DWORD style) : CUIFWindow(hInst, style) +{ + m_dwUnknown6 = -1; + m_nActionID = -1; + m_hRgn = NULL; + m_pszBalloonText = NULL; + m_bHasBkColor = FALSE; + m_bHasTextColor = FALSE; + m_rgbBkColor = 0; + m_rgbTextColor = 0; + m_ptTarget.x = 0; + m_ptTarget.y = 0; + m_rcExclude.left = 0; + m_rcExclude.right = 0; + m_rcExclude.top = 0; + m_rcExclude.bottom = 0; + m_dwUnknown7 = 0; + m_nBalloonType = 0; + m_dwUnknown8[0] = 0; + m_dwUnknown8[1] = 0; + m_ptBalloon.x = 0; + m_ptBalloon.y = 0; + m_cButtons = 0; + m_hwndNotif = NULL; + m_uNotifMsg = 0; + m_rcMargin.left = 8; + m_rcMargin.top = 8; + m_rcMargin.right = 8; + m_rcMargin.bottom = 8; +} + +inline +CUIFBalloonWindow::~CUIFBalloonWindow() +{ + if (m_pszBalloonText) + { + delete[] m_pszBalloonText; + m_pszBalloonText = NULL; + } +} + +inline STDMETHODIMP_(void) +CUIFBalloonWindow::Initialize() +{ + CUIFWindow::Initialize(); + + if ((m_style & UIF_BALLOON_WINDOW_TYPE_MASK) == UIF_BALLOON_WINDOW_OK) + { + AddButton(IDOK); + } + else if ((m_style & UIF_BALLOON_WINDOW_TYPE_MASK) == UIF_BALLOON_WINDOW_YESNO) + { + AddButton(IDYES); + AddButton(IDNO); + } +} + +inline STDMETHODIMP_(LPCTSTR) +CUIFBalloonWindow::GetClassName() +{ + return TEXT("MSIME_PopupMessage"); +} + +inline STDMETHODIMP_(LPCTSTR) +CUIFBalloonWindow::GetWndTitle() +{ + return TEXT("MSIME_PopupMessage"); +} + +inline STDMETHODIMP_(void) +CUIFBalloonWindow::OnCreate(HWND hWnd) +{ + m_nActionID = -1; + AdjustPos(); +} + +inline STDMETHODIMP_(void) +CUIFBalloonWindow::OnDestroy(HWND hWnd) +{ + SendNotification(m_nActionID); + DoneWindowRegion(); +} + +inline STDMETHODIMP_(void) +CUIFBalloonWindow::OnKeyDown(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ + CUIFBalloonButton *pButton = NULL; + + switch (wParam) + { + case VK_RETURN: + pButton = (CUIFBalloonButton *)FindUIObject(0); + break; + case VK_ESCAPE: + m_nActionID = -1; + ::DestroyWindow(m_hWnd); + return; + case TEXT('Y'): + pButton = FindButton(IDYES); + break; + case TEXT('N'): + pButton = FindButton(IDNO); + break; + } + + if (!pButton) + return; + + m_nActionID = pButton->m_nCommandID; + ::DestroyWindow(m_hWnd); +} + +inline STDMETHODIMP_(LRESULT) +CUIFBalloonWindow::OnObjectNotify(CUIFObject *pObject, WPARAM wParam, LPARAM lParam) +{ + CUIFBalloonButton *pButton = (CUIFBalloonButton *)pObject; + m_nActionID = pButton->m_nCommandID; + ::DestroyWindow(m_hWnd); + return 0; +} + +inline STDMETHODIMP_(void) +CUIFBalloonWindow::OnPaint(HDC hDC) +{ + RECT rc; + GetRect(&rc); + PaintFrameProc(hDC, &rc); + + switch (m_nBalloonType) + { + case 1: + rc.top += 16; + break; + case 2: + rc.right -= 16; + break; + case 3: + rc.left += 16; + break; + default: + rc.bottom -= 16; + break; + } + + RECT rcMargin; + GetMargin(&rcMargin); + + rc.left += rcMargin.left; + rc.top += rcMargin.top; + rc.right -= rcMargin.right; + rc.bottom -= rcMargin.bottom; + + PaintMessageProc(hDC, &rc, m_pszBalloonText); +} + +inline void +CUIFBalloonWindow::AddButton(UINT nCommandId) +{ + RECT rc = { 0, 0, 0, 0 }; + if (!((IDOK <= nCommandId) && (nCommandId <= IDNO))) + return; + + CUIFBalloonButton *pButton = new(cicNoThrow) CUIFBalloonButton(this, m_cButtons, &rc, 5); + if (!pButton) + return; + + pButton->Initialize(); + pButton->m_nCommandID = nCommandId; + + LPCWSTR pszText; // FIXME: Use resource strings + switch (nCommandId) + { + case IDOK: + pszText = L"OK"; + break; + case IDCANCEL: + pszText = L"Cancel"; + break; + case IDABORT: + pszText = L"&Abort"; + break; + case IDRETRY: + pszText = L"&Retry"; + break; + case IDIGNORE: + pszText = L"&Ignore"; + break; + case IDYES: + pszText = L"&Yes"; + break; + default: + pszText = L"&No"; + break; + } + + pButton->SetText(pszText); + + AddUIObj(pButton); + ++m_cButtons; +} + +/// @unimplemented +inline void +CUIFBalloonWindow::AdjustPos() +{ + //FIXME +} + +/// @unimplemented +inline HRGN +CUIFBalloonWindow::CreateRegion(LPCRECT prc) +{ + //FIXME + return NULL; +} + +inline void +CUIFBalloonWindow::DoneWindowRegion() +{ + if (m_hRgn) + { + ::SetWindowRgn(m_hWnd, NULL, TRUE); + ::DeleteObject(m_hRgn); + m_hRgn = NULL; + } +} + +inline CUIFBalloonButton * +CUIFBalloonWindow::FindButton(UINT nCommandID) +{ + for (UINT iButton = 0; iButton < m_cButtons; ++iButton) + { + CUIFBalloonButton *pButton = (CUIFBalloonButton *)FindUIObject(iButton); + if (pButton && (pButton->m_nCommandID == nCommandID)) + return pButton; + } + return NULL; +} + +inline CUIFObject * +CUIFBalloonWindow::FindUIObject(UINT nObjectID) +{ + for (size_t iItem = 0; iItem < m_ObjectArray.size(); ++iItem) + { + CUIFObject *pObject = m_ObjectArray[iItem]; + if (pObject->m_nObjectID == nObjectID) + return pObject; + } + return NULL; +} + +inline COLORREF +CUIFBalloonWindow::GetBalloonBkColor() +{ + if (m_bHasBkColor ) + return m_rgbBkColor; + else + return ::GetSysColor(COLOR_INFOBK); +} + +inline COLORREF +CUIFBalloonWindow::GetBalloonTextColor() +{ + if (m_bHasTextColor) + return m_rgbTextColor; + else + return ::GetSysColor(COLOR_INFOTEXT); +} + +inline void +CUIFBalloonWindow::GetButtonSize(LPSIZE pSize) +{ + HDC hDisplayDC = ::CreateDC(TEXT("DISPLAY"), NULL, NULL, NULL); + + TEXTMETRIC tm; + HGDIOBJ hFontOld = ::SelectObject(hDisplayDC, m_hFont); + ::GetTextMetrics(hDisplayDC, &tm); + ::SelectObject(hDisplayDC, hFontOld); + ::DeleteDC(hDisplayDC); + + pSize->cx = 16 * tm.tmAveCharWidth; + pSize->cy = tm.tmHeight + 10; +} + +inline void +CUIFBalloonWindow::GetMargin(LPRECT prcMargin) +{ + if (prcMargin) + *prcMargin = m_rcMargin; +} + +inline void +CUIFBalloonWindow::SetExcludeRect(LPCRECT prcExclude) +{ + m_rcExclude = *prcExclude; + AdjustPos(); +} + +inline void +CUIFBalloonWindow::SetTargetPos(POINT ptTarget) +{ + m_ptTarget = ptTarget; + AdjustPos(); +} + +inline void +CUIFBalloonWindow::SetText(LPCWSTR pszText) +{ + if (m_pszBalloonText) + { + delete[] m_pszBalloonText; + m_pszBalloonText = NULL; + } + + if (pszText == NULL) + pszText = L""; + + size_t cch = wcslen(pszText); + m_pszBalloonText = new(cicNoThrow) WCHAR[cch + 1]; + if (m_pszBalloonText) + lstrcpynW(m_pszBalloonText, pszText, cch + 1); + + AdjustPos(); +} + +inline void +CUIFBalloonWindow::InitWindowRegion() +{ + RECT rc; + GetRect(&rc); + m_hRgn = CreateRegion(&rc); + if (m_hRgn) + ::SetWindowRgn(m_hWnd, m_hRgn, TRUE); +} + +inline void +CUIFBalloonWindow::LayoutObject() +{ + SIZE size; + GetButtonSize(&size); + + RECT rc; + GetRect(&rc); + + switch (m_nBalloonType) + { + case 1: + rc.top += 16; + break; + case 2: + rc.right -= 16; + break; + case 3: + rc.left += 16; + break; + default: + rc.bottom -= 16; + break; + } + + RECT rcMargin; + GetMargin(&rcMargin); + rc.left += rcMargin.left; + rc.top += rcMargin.top; + rc.right -= rcMargin.right; + rc.bottom -= rcMargin.bottom; + + LONG xLeft = (rc.left + rc.right - size.cx * (((m_cButtons - 1) / 2) - m_cButtons)) / 2; + for (UINT iButton = 0; iButton < m_cButtons; ++iButton) + { + CUIFObject *UIObject = FindUIObject(iButton); + if (!UIObject) + continue; + + rcMargin.left = xLeft + iButton * (size.cx * 3 / 2); + rcMargin.top = rc.bottom - size.cy; + rcMargin.right = rcMargin.left + size.cx; + rcMargin.bottom = rc.bottom; + + UIObject->SetRect(&rcMargin); + UIObject->Show(TRUE); + } +} + +inline void +CUIFBalloonWindow::PaintFrameProc(HDC hDC, LPCRECT prc) +{ + HRGN hRgn = CreateRegion(prc); + HBRUSH hbrBack = ::CreateSolidBrush(GetBalloonBkColor()); + HBRUSH hbrFrame = ::CreateSolidBrush(::GetSysColor(COLOR_WINDOWFRAME)); + ::FillRgn(hDC, hRgn, hbrBack); + ::FrameRgn(hDC, hRgn, hbrFrame, 1, 1); + ::DeleteObject(hbrBack); + ::DeleteObject(hbrFrame); + ::DeleteObject(hRgn); +} + +inline void +CUIFBalloonWindow::PaintMessageProc(HDC hDC, LPRECT prc, LPCWSTR pszText) +{ + HGDIOBJ hFontOld = ::SelectObject(hDC, m_hFont); + COLORREF rgbOldColor = ::SetTextColor(hDC, GetBalloonTextColor()); + INT nOldBkMode = ::SetBkMode(hDC, TRANSPARENT); + ::DrawTextW(hDC, pszText, -1, prc, DT_WORDBREAK); + ::SelectObject(hDC, hFontOld); + ::SetTextColor(hDC, rgbOldColor); + ::SetBkMode(hDC, nOldBkMode); +} + +inline void +CUIFBalloonWindow::SendNotification(WPARAM wParam) +{ + if (m_hwndNotif) + ::PostMessage(m_hwndNotif, m_uNotifMsg, wParam, 0); +}

8 months

[reactos] 03/03: [NTOS:CM][CMLIB] In PE mode, allow registry hives (except system ones) to use read/write access.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=feb67576ddf09b847c6ec… commit feb67576ddf09b847c6ecf7b8fd9675ccf74e11c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Dec 14 22:02:58 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jan 17 22:13:03 2024 +0100 [NTOS:CM][CMLIB] In PE mode, allow registry hives (except system ones) to use read/write access. + Improve related comments. Registry hives are opened in shared read access when NT is loaded in PE mode (MININT) or from network (the hives residing on a network share). This is true in particular for the main system hives (SYSTEM, SOFTWARE, DEFAULT, ...). However, in PE mode, we can allow other hives, e.g. those loaded by the user (with NtLoadKey) to be loaded with full read/write access, since we boot from a local computer. --- ntoskrnl/config/cmdata.c | 7 +++++-- ntoskrnl/config/cmlazy.c | 7 ++++++- ntoskrnl/config/cmsysini.c | 10 ++++------ sdk/lib/cmlib/hivewrt.c | 33 ++++++++------------------------- 4 files changed, 23 insertions(+), 34 deletions(-) diff --git a/ntoskrnl/config/cmdata.c b/ntoskrnl/config/cmdata.c index 80c91534b44..693c9ac7b26 100644 --- a/ntoskrnl/config/cmdata.c +++ b/ntoskrnl/config/cmdata.c @@ -54,11 +54,14 @@ UNICODE_STRING CmSymbolicLinkValueName = UNICODE_STRING CmpLoadOptions; +/* TRUE if the system hives must be loaded in shared mode */ BOOLEAN CmpShareSystemHives; -BOOLEAN CmSelfHeal = TRUE; -BOOLEAN CmpSelfHeal = TRUE; +/* TRUE when the registry is in PE mode */ BOOLEAN CmpMiniNTBoot; + ULONG CmpBootType; +BOOLEAN CmSelfHeal = TRUE; +BOOLEAN CmpSelfHeal = TRUE; USHORT CmpUnknownBusCount; ULONG CmpTypeCount[MaximumType + 1]; diff --git a/ntoskrnl/config/cmlazy.c b/ntoskrnl/config/cmlazy.c index 6c128cb3954..ebac8a20532 100644 --- a/ntoskrnl/config/cmlazy.c +++ b/ntoskrnl/config/cmlazy.c @@ -261,9 +261,14 @@ CmpCmdInit(IN BOOLEAN SetupBoot) /* Testing: Force Lazy Flushing */ CmpHoldLazyFlush = FALSE; - /* Setup the hive list if this is not a Setup boot */ + /* Setup the system hives list if this is not a Setup boot */ if (!SetupBoot) CmpInitializeHiveList(); + + /* Now that the system hives are loaded, if we are in PE mode, + * all other hives will be loaded with full access */ + if (CmpMiniNTBoot) + CmpShareSystemHives = FALSE; } NTSTATUS diff --git a/ntoskrnl/config/cmsysini.c b/ntoskrnl/config/cmsysini.c index 50283132745..d401c726e1b 100644 --- a/ntoskrnl/config/cmsysini.c +++ b/ntoskrnl/config/cmsysini.c @@ -332,7 +332,7 @@ CmpInitHiveFromFile(IN PCUNICODE_STRING HiveName, *New = FALSE; } - /* Check if we're sharing hives */ + /* Check if the system hives are opened in shared mode */ if (CmpShareSystemHives) { /* Then force using the primary hive */ @@ -928,11 +928,9 @@ CmpInitializeSystemHive(IN PLOADER_PARAMETER_BLOCK LoaderBlock) if (!RtlCreateUnicodeString(&SystemHive->FileFullPath, L"\\SystemRoot\\System32\\Config\\SYSTEM")) return FALSE; - /* Manually set the hive as volatile, if in Live CD mode */ + /* Load the system hive as volatile, if opened in shared mode */ if (HiveBase && CmpShareSystemHives) - { SystemHive->Hive.HiveFlags = HIVE_VOLATILE; - } /* Save the boot type */ CmpBootType = SystemHive->Hive.BaseBlock->BootType; @@ -1508,7 +1506,7 @@ CmpInitializeHiveList(VOID) /* Make sure the list is set up */ ASSERT(CmpMachineHiveList[i].Name != NULL); - /* Load the hive as volatile, if in LiveCD mode */ + /* Load this root hive as volatile, if opened in shared mode */ if (CmpShareSystemHives) CmpMachineHiveList[i].HHiveFlags |= HIVE_VOLATILE; @@ -1630,7 +1628,7 @@ CmInitSystem1(VOID) /* Check if this is PE-boot */ if (InitIsWinPEMode) { - /* Set registry to PE mode */ + /* Set the registry in PE mode and load the system hives in shared mode */ CmpMiniNTBoot = TRUE; CmpShareSystemHives = TRUE; } diff --git a/sdk/lib/cmlib/hivewrt.c b/sdk/lib/cmlib/hivewrt.c index eff699ac876..c4fe4d4059d 100644 --- a/sdk/lib/cmlib/hivewrt.c +++ b/sdk/lib/cmlib/hivewrt.c @@ -21,11 +21,7 @@ IoSetThreadHardErrorMode( _In_ BOOLEAN HardErrorEnabled); #endif -/* GLOBALS *****************************************************************/ - -#if !defined(CMLIB_HOST) && !defined(_BLDR_) -extern BOOLEAN CmpMiniNTBoot; -#endif +/* GLOBALS ******************************************************************/ /* PRIVATE FUNCTIONS ********************************************************/ @@ -477,6 +473,13 @@ HvSyncHive( ASSERT(!RegistryHive->ReadOnly); ASSERT(RegistryHive->Signature == HV_HHIVE_SIGNATURE); + /* Avoid any write operations on volatile hives */ + if (RegistryHive->HiveFlags & HIVE_VOLATILE) + { + DPRINT("Hive 0x%p is volatile\n", RegistryHive); + return TRUE; + } + /* * Check if there's any dirty data in the vector. * A space with clean blocks would be pointless for @@ -490,26 +493,6 @@ HvSyncHive( return TRUE; } - /* - * We are either in Live CD or we are sharing hives. - * In either of the cases, hives can only be read - * so don't do any writing operations on them. - */ -#if !defined(CMLIB_HOST) && !defined(_BLDR_) - if (CmpMiniNTBoot) - { - DPRINT("We are sharing hives or in Live CD mode, abort syncing\n"); - return TRUE; - } -#endif - - /* Avoid any writing operations on volatile hives */ - if (RegistryHive->HiveFlags & HIVE_VOLATILE) - { - DPRINT("The hive is volatile (hive 0x%p)\n", RegistryHive); - return TRUE; - } - #if !defined(CMLIB_HOST) && !defined(_BLDR_) /* Disable hard errors before syncing the hive */ HardErrors = IoSetThreadHardErrorMode(FALSE);

8 months

← Newer
1
2
3
4
5
6
7
8
9
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2024