Ros-diffs

ros-diffs@reactos.org

11 participants
81012 discussions

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

11 months, 3 weeks

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

11 months, 3 weeks

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

11 months, 3 weeks

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

11 months, 4 weeks

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

11 months, 4 weeks

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

11 months, 4 weeks

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

11 months, 4 weeks

[reactos] 02/03: [NTOS:CM] Initially start the registry in read-only mode.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=793ee786cdc2a7e1a1985… commit 793ee786cdc2a7e1a19856e63659cffe84689f16 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Dec 14 22:15:58 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jan 17 22:09:45 2024 +0100 [NTOS:CM] Initially start the registry in read-only mode. Disable registry hive writes, until the IO subsystem is initialized and disk access is enabled (when the SM signals so after AUTOCHK). --- ntoskrnl/config/cmsysini.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/config/cmsysini.c b/ntoskrnl/config/cmsysini.c index 48bb2c1a3de..50283132745 100644 --- a/ntoskrnl/config/cmsysini.c +++ b/ntoskrnl/config/cmsysini.c @@ -24,7 +24,11 @@ PEPROCESS CmpSystemProcess; PVOID CmpRegistryLockCallerCaller, CmpRegistryLockCaller; BOOLEAN CmpFlushOnLockRelease; BOOLEAN CmpSpecialBootCondition; -BOOLEAN CmpNoWrite; + +/* Disable registry hive writes, until the IO subsystem is initialized + * and disk access is enabled (when the SM signals so after AUTOCHK) */ +BOOLEAN CmpNoWrite = TRUE; + BOOLEAN CmpWasSetupBoot; BOOLEAN CmpProfileLoaded; BOOLEAN CmpNoVolatileCreates; @@ -1469,9 +1473,10 @@ CmpInitializeHiveList(VOID) ULONG i; USHORT RegStart; PSECURITY_DESCRIPTOR SecurityDescriptor; + PAGED_CODE(); - /* Allow writing for now */ + /* Reenable hive writes now */ CmpNoWrite = FALSE; /* Build the file name and registry name strings */

11 months, 4 weeks

[reactos] 01/03: [NTOS:CM][CMLIB] Minor code styling

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76f1da5631489642fe1c8… commit 76f1da5631489642fe1c8201ce2bd6afc8f32fb0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Dec 20 20:28:13 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jan 17 22:09:37 2024 +0100 [NTOS:CM][CMLIB] Minor code styling In particular remove some extra-parentheses around single code tokens, and replace few "DPRINT1 + while (TRUE);" by UNIMPLEMENTED_DBGBREAK. + Improve some comments. --- ntoskrnl/config/cmapi.c | 33 ++++++++++++++--------------- ntoskrnl/config/cmcontrl.c | 3 +-- ntoskrnl/config/cminit.c | 22 ++++++++++---------- ntoskrnl/config/cmkcbncb.c | 18 ++++++++-------- ntoskrnl/config/cmlazy.c | 12 +++++------ ntoskrnl/config/cmparse.c | 14 ++++++------- ntoskrnl/config/cmse.c | 2 +- ntoskrnl/config/cmsysini.c | 20 +++++++++--------- ntoskrnl/config/cmvalche.c | 20 +++++++++--------- ntoskrnl/config/ntapi.c | 14 ++++++------- sdk/lib/cmlib/hivewrt.c | 52 ++++++++++++++++++++++------------------------ 11 files changed, 103 insertions(+), 107 deletions(-) diff --git a/ntoskrnl/config/cmapi.c b/ntoskrnl/config/cmapi.c index 8e3e3edd69a..4d4edfde77a 100644 --- a/ntoskrnl/config/cmapi.c +++ b/ntoskrnl/config/cmapi.c @@ -67,8 +67,7 @@ CmpIsHiveAlreadyLoaded(IN HANDLE KeyHandle, if (Hive->Frozen) { /* FIXME: TODO */ - DPRINT1("ERROR: Hive is frozen\n"); - while (TRUE); + UNIMPLEMENTED_DBGBREAK("ERROR: Hive is frozen\n"); } } @@ -105,22 +104,22 @@ CmpDoFlushAll(IN BOOLEAN ForceFlush) CmpLockHiveFlusherExclusive(Hive); /* Check for illegal state */ - if ((ForceFlush) && (Hive->UseCount)) + if (ForceFlush && Hive->UseCount) { /* Registry needs to be locked down */ CMP_ASSERT_EXCLUSIVE_REGISTRY_LOCK(); - DPRINT1("FIXME: Hive is damaged and needs fixup\n"); - while (TRUE); + UNIMPLEMENTED_DBGBREAK("FIXME: Hive is damaged and needs fixup\n"); } /* Only sync if we are forced to or if it won't cause a hive shrink */ - if ((ForceFlush) || (!HvHiveWillShrink(&Hive->Hive))) + if (ForceFlush || !HvHiveWillShrink(&Hive->Hive)) { /* Do the sync */ Status = HvSyncHive(&Hive->Hive); /* If something failed - set the flag and continue looping */ - if (!NT_SUCCESS(Status)) Result = FALSE; + if (!NT_SUCCESS(Status)) + Result = FALSE; } else { @@ -708,8 +707,8 @@ DoAgain: } /* We need the exclusive KCB lock now */ - if (!(CmpIsKcbLockedExclusive(Kcb)) && - !(CmpTryToConvertKcbSharedToExclusive(Kcb))) + if (!CmpIsKcbLockedExclusive(Kcb) && + !CmpTryToConvertKcbSharedToExclusive(Kcb)) { /* Acquire exclusive lock */ CmpConvertKcbSharedToExclusive(Kcb); @@ -873,7 +872,7 @@ DoAgain: Kcb->KcbLastWriteTime = Parent->LastWriteTime; /* Check if the cell is cached */ - if ((Found) && (CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList))) + if (Found && CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList)) { /* Shouldn't happen */ ASSERT(FALSE); @@ -884,7 +883,7 @@ DoAgain: CmpCleanUpKcbValueCache(Kcb); /* Sanity checks */ - ASSERT(!(CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList))); + ASSERT(!CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList)); ASSERT(!(Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND)); /* Set the value cache */ @@ -901,8 +900,8 @@ DoAgain: /* Release the cells */ Quickie: - if ((ParentCell != HCELL_NIL) && (Hive)) HvReleaseCell(Hive, ParentCell); - if ((ChildCell != HCELL_NIL) && (Hive)) HvReleaseCell(Hive, ChildCell); + if ((ParentCell != HCELL_NIL) && Hive) HvReleaseCell(Hive, ParentCell); + if ((ChildCell != HCELL_NIL) && Hive) HvReleaseCell(Hive, ChildCell); /* Release the locks */ if (FlusherLocked) CmpUnlockHiveFlusher((PCMHIVE)Hive); @@ -972,9 +971,9 @@ CmDeleteValueKey(IN PCM_KEY_CONTROL_BLOCK Kcb, if (ChildCell == HCELL_NIL) goto Quickie; /* We found the value, mark all relevant cells dirty */ - if (!((HvMarkCellDirty(Hive, Cell, FALSE)) && - (HvMarkCellDirty(Hive, Parent->ValueList.List, FALSE)) && - (HvMarkCellDirty(Hive, ChildCell, FALSE)))) + if (!(HvMarkCellDirty(Hive, Cell, FALSE) && + HvMarkCellDirty(Hive, Parent->ValueList.List, FALSE) && + HvMarkCellDirty(Hive, ChildCell, FALSE))) { /* Not enough log space, fail */ Status = STATUS_NO_LOG_SPACE; @@ -1037,7 +1036,7 @@ CmDeleteValueKey(IN PCM_KEY_CONTROL_BLOCK Kcb, CmpCleanUpKcbValueCache(Kcb); /* Sanity checks */ - ASSERT(!(CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList))); + ASSERT(!CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList)); ASSERT(!(Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND)); /* Set the value cache */ diff --git a/ntoskrnl/config/cmcontrl.c b/ntoskrnl/config/cmcontrl.c index fdce4c9ab6d..07f65dcea97 100644 --- a/ntoskrnl/config/cmcontrl.c +++ b/ntoskrnl/config/cmcontrl.c @@ -208,8 +208,7 @@ CmGetSystemControlValues(IN PVOID SystemHiveData, } /* Sanity check if this is a small key */ - ASSERT((IsSmallKey ? - (Length <= CM_KEY_VALUE_SMALL) : TRUE)); + ASSERT(IsSmallKey ? (Length <= CM_KEY_VALUE_SMALL) : TRUE); /* Copy the data in the buffer */ RtlCopyMemory(ControlVector->Buffer, Buffer, Length); diff --git a/ntoskrnl/config/cminit.c b/ntoskrnl/config/cminit.c index 15dc4f0d77c..5bee7e5a526 100644 --- a/ntoskrnl/config/cminit.c +++ b/ntoskrnl/config/cminit.c @@ -49,14 +49,14 @@ CmpInitializeHive( * - An alternate hive that is not linked to a correct file type. * - A lonely alternate hive not backed up with its corresponding primary hive. */ - if (((External) && ((Primary) || (Log))) || - ((Log) && !(Primary)) || - (!(CmpShareSystemHives) && (HiveFlags & HIVE_VOLATILE) && - ((Primary) || (External) || (Log))) || - ((OperationType == HINIT_MEMORY) && (!HiveData)) || - ((Log) && (FileType != HFILE_TYPE_LOG)) || - ((Alternate) && (FileType != HFILE_TYPE_ALTERNATE)) || - ((Alternate) && !(Primary))) + if ((External && (Primary || Log)) || + (Log && !Primary) || + (!CmpShareSystemHives && (HiveFlags & HIVE_VOLATILE) && + (Primary || External || Log)) || + ((OperationType == HINIT_MEMORY) && !HiveData) || + (Log && (FileType != HFILE_TYPE_LOG)) || + (Alternate && (FileType != HFILE_TYPE_ALTERNATE)) || + (Alternate && !Primary)) { /* Fail the request */ return STATUS_INVALID_PARAMETER; @@ -338,7 +338,7 @@ CmpOpenHiveFiles(IN PCUNICODE_STRING BaseName, NULL); /* Check if we can create the hive */ - if ((CreateAllowed) && !(CmpShareSystemHives)) + if (CreateAllowed && !CmpShareSystemHives) { /* Open only or create */ CreateDisposition = FILE_OPEN_IF; @@ -357,7 +357,7 @@ CmpOpenHiveFiles(IN PCUNICODE_STRING BaseName, (NoBuffering ? FILE_NO_INTERMEDIATE_BUFFERING : 0); /* Set share and access modes */ - if ((CmpMiniNTBoot) && (CmpShareSystemHives)) + if (CmpMiniNTBoot && CmpShareSystemHives) { /* We're on Live CD or otherwise sharing */ DesiredAccess = FILE_READ_DATA; @@ -568,7 +568,7 @@ CmpOpenHiveFiles(IN PCUNICODE_STRING BaseName, FILE_SYNCHRONOUS_IO_NONALERT | IoFlags, NULL, 0); - if ((NT_SUCCESS(Status)) && (MarkAsSystemHive)) + if (NT_SUCCESS(Status) && MarkAsSystemHive) { /* We opened it, mark it as a system hive */ Status = ZwFsControlFile(*Log, diff --git a/ntoskrnl/config/cmkcbncb.c b/ntoskrnl/config/cmkcbncb.c index b7b7b0ef9cb..4f70ad91778 100644 --- a/ntoskrnl/config/cmkcbncb.c +++ b/ntoskrnl/config/cmkcbncb.c @@ -619,11 +619,11 @@ CmpDereferenceKeyControlBlockWithLock(IN PCM_KEY_CONTROL_BLOCK Kcb, CMP_ASSERT_KCB_LOCK(Kcb); /* Check if we should do a direct delete */ - if (((CmpHoldLazyFlush) && + if ((CmpHoldLazyFlush && !(Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND) && !(Kcb->Flags & KEY_SYM_LINK)) || (Kcb->ExtFlags & CM_KCB_NO_DELAY_CLOSE) || - (Kcb->Delete)) + Kcb->Delete) { /* Clean up the KCB*/ CmpCleanUpKcbCacheWithLock(Kcb, LockHeldExclusively); @@ -683,7 +683,7 @@ CmpCreateKeyControlBlock(IN PHHIVE Hive, NodeName = *KeyName; /* Remove leading slash */ - while ((NodeName.Length) && (*NodeName.Buffer == OBJ_NAME_PATH_SEPARATOR)) + while (NodeName.Length && (*NodeName.Buffer == OBJ_NAME_PATH_SEPARATOR)) { /* Move the buffer by one */ NodeName.Buffer++; @@ -764,7 +764,7 @@ CmpCreateKeyControlBlock(IN PHHIVE Hive, else { /* Check if we're not creating a fake one, but it used to be fake */ - if ((Kcb->ExtFlags & CM_KCB_KEY_NON_EXIST) && !(IsFake)) + if ((Kcb->ExtFlags & CM_KCB_KEY_NON_EXIST) && !IsFake) { /* Set the hive and cell */ Kcb->KeyHive = Hive; @@ -801,7 +801,7 @@ CmpCreateKeyControlBlock(IN PHHIVE Hive, { /* Reference the parent */ if (((Parent->TotalLevels + 1) < 512) && - (CmpReferenceKeyControlBlock(Parent))) + CmpReferenceKeyControlBlock(Parent)) { /* Link it */ Kcb->ParentKcb = Parent; @@ -863,14 +863,14 @@ CmpCreateKeyControlBlock(IN PHHIVE Hive, } /* Check if this is a KCB inside a frozen hive */ - if ((Kcb) && (((PCMHIVE)Hive)->Frozen) && (!(Kcb->Flags & KEY_SYM_LINK))) + if (Kcb && ((PCMHIVE)Hive)->Frozen && !(Kcb->Flags & KEY_SYM_LINK)) { /* Don't add these to the delay close */ Kcb->ExtFlags |= CM_KCB_NO_DELAY_CLOSE; } /* Sanity check */ - ASSERT((!Kcb) || (Kcb->Delete == FALSE)); + ASSERT(!Kcb || !Kcb->Delete); /* Check if we had locked the hashes */ if (!HashLock) @@ -950,7 +950,7 @@ CmpConstructName(IN PCM_KEY_CONTROL_BLOCK Kcb) /* Sanity checks for deleted and fake keys */ if ((!MyKcb->KeyCell && !MyKcb->Delete) || !MyKcb->KeyHive || - MyKcb->ExtFlags & CM_KCB_KEY_NON_EXIST) + (MyKcb->ExtFlags & CM_KCB_KEY_NON_EXIST)) { /* Failure */ CmpFree(KeyName, 0); @@ -1109,7 +1109,7 @@ DelistKeyBodyFromKCB(IN PCM_KEY_BODY KeyBody, for (i = 0; i < 4; i++) { /* Add it into the list */ - if (InterlockedCompareExchangePointer((VOID*)&KeyBody->KeyControlBlock-> + if (InterlockedCompareExchangePointer((PVOID*)&KeyBody->KeyControlBlock-> KeyBodyArray[i], NULL, KeyBody) == KeyBody) diff --git a/ntoskrnl/config/cmlazy.c b/ntoskrnl/config/cmlazy.c index ed03247a8c7..6c128cb3954 100644 --- a/ntoskrnl/config/cmlazy.c +++ b/ntoskrnl/config/cmlazy.c @@ -92,9 +92,9 @@ CmpDoFlushNextHive(_In_ BOOLEAN ForceFlush, CmHive->FlushCount = CmpLazyFlushCount; } } - else if ((CmHive->Hive.DirtyCount) && - (!(CmHive->Hive.HiveFlags & HIVE_VOLATILE)) && - (!(CmHive->Hive.HiveFlags & HIVE_NOLAZYFLUSH))) + else if (CmHive->Hive.DirtyCount && + !(CmHive->Hive.HiveFlags & HIVE_VOLATILE) && + !(CmHive->Hive.HiveFlags & HIVE_NOLAZYFLUSH)) { /* Use another lazy flusher for this hive */ ASSERT(CmHive->FlushCount == CmpLazyFlushCount); @@ -145,7 +145,7 @@ CmpLazyFlushDpcRoutine(IN PKDPC Dpc, { /* Check if we should queue the lazy flush worker */ DPRINT("Flush pending: %s, Holding lazy flush: %s.\n", CmpLazyFlushPending ? "yes" : "no", CmpHoldLazyFlush ? "yes" : "no"); - if ((!CmpLazyFlushPending) && (!CmpHoldLazyFlush)) + if (!CmpLazyFlushPending && !CmpHoldLazyFlush) { CmpLazyFlushPending = TRUE; ExQueueWorkItem(&CmpLazyWorkItem, DelayedWorkQueue); @@ -160,7 +160,7 @@ CmpLazyFlush(VOID) PAGED_CODE(); /* Check if we should set the lazy flush timer */ - if ((!CmpNoWrite) && (!CmpHoldLazyFlush)) + if (!CmpNoWrite && !CmpHoldLazyFlush) { /* Do it */ DueTime.QuadPart = Int32x32To64(CmpLazyFlushIntervalInSeconds, @@ -400,7 +400,7 @@ CmpCmdHiveOpen(IN POBJECT_ATTRIBUTES FileAttributes, (Status == STATUS_ACCOUNT_EXPIRED) || (Status == STATUS_ACCOUNT_DISABLED) || (Status == STATUS_ACCOUNT_RESTRICTION)) && - (ImpersonationContext)) + ImpersonationContext) { /* We failed due to an account/security error, impersonate SYSTEM */ Status = SeImpersonateClientEx(ImpersonationContext, NULL); diff --git a/ntoskrnl/config/cmparse.c b/ntoskrnl/config/cmparse.c index b9bc5c7e596..db2ec0e9705 100644 --- a/ntoskrnl/config/cmparse.c +++ b/ntoskrnl/config/cmparse.c @@ -39,7 +39,7 @@ CmpGetNextName(IN OUT PUNICODE_STRING RemainingName, } /* Check if we have a path separator */ - while ((RemainingName->Length) && + while (RemainingName->Length && (*RemainingName->Buffer == OBJ_NAME_PATH_SEPARATOR)) { /* Skip it */ @@ -50,7 +50,7 @@ CmpGetNextName(IN OUT PUNICODE_STRING RemainingName, /* Start loop at where the current buffer is */ NextName->Buffer = RemainingName->Buffer; - while ((RemainingName->Length) && + while (RemainingName->Length && (*RemainingName->Buffer != OBJ_NAME_PATH_SEPARATOR)) { /* Move to the next character */ @@ -1873,7 +1873,7 @@ CmpParseKey(IN PVOID ParseObject, PAGED_CODE(); /* Loop path separators at the end */ - while ((RemainingName->Length) && + while (RemainingName->Length && (RemainingName->Buffer[(RemainingName->Length / sizeof(WCHAR)) - 1] == OBJ_NAME_PATH_SEPARATOR)) { @@ -1888,7 +1888,7 @@ CmpParseKey(IN PVOID ParseObject, Current = *RemainingName; /* Check if this is a create */ - if (!(ParseContext) || !(ParseContext->CreateOperation)) + if (!ParseContext || !ParseContext->CreateOperation) { /* It isn't, so no context */ ParseContext = NULL; @@ -2043,7 +2043,7 @@ CmpParseKey(IN PVOID ParseObject, { /* Get the next component */ Result = CmpGetNextName(&Current, &NextName, &Last); - if ((Result) && (NextName.Length)) + if (Result && NextName.Length) { /* See if this is a sym link */ if (!(Kcb->Flags & KEY_SYM_LINK)) @@ -2150,7 +2150,7 @@ KeyCachedOpenNow: else { /* Check if this was the last key for a create */ - if ((Last) && (ParseContext)) + if (Last && ParseContext) { /* Check if we're doing a link node */ if (ParseContext->CreateLink) @@ -2246,7 +2246,7 @@ KeyCachedOpenNow: break; } } - else if ((Result) && (Last)) + else if (Result && Last) { /* Opening the root. Is this an exit node? */ if (Node->Flags & KEY_HIVE_EXIT) diff --git a/ntoskrnl/config/cmse.c b/ntoskrnl/config/cmse.c index 6c8c55472b8..add246cebe2 100644 --- a/ntoskrnl/config/cmse.c +++ b/ntoskrnl/config/cmse.c @@ -40,7 +40,7 @@ CmpHiveRootSecurityDescriptor(VOID) Sid[3] = ExAllocatePoolWithTag(PagedPool, SidLength, TAG_CMSD); /* Make sure all SIDs were allocated */ - if (!(Sid[0]) || !(Sid[1]) || !(Sid[2]) || !(Sid[3])) + if (!Sid[0] || !Sid[1] || !Sid[2] || !Sid[3]) { /* Bugcheck */ KeBugCheckEx(REGISTRY_ERROR, 11, 1, 0, 0); diff --git a/ntoskrnl/config/cmsysini.c b/ntoskrnl/config/cmsysini.c index d28a5b5d20d..48bb2c1a3de 100644 --- a/ntoskrnl/config/cmsysini.c +++ b/ntoskrnl/config/cmsysini.c @@ -228,7 +228,7 @@ CmpQueryKeyName(IN PVOID ObjectBody, /* Check if the provided buffer is too small to fit even anything */ if ((Length <= sizeof(OBJECT_NAME_INFORMATION)) || - ((Length < (*ReturnLength)) && (BytesToCopy < sizeof(WCHAR)))) + ((Length < *ReturnLength) && (BytesToCopy < sizeof(WCHAR)))) { /* Free the buffer allocated by CmpConstructName */ ExFreePoolWithTag(KeyName, TAG_CM); @@ -238,7 +238,7 @@ CmpQueryKeyName(IN PVOID ObjectBody, } /* Check if the provided buffer can be partially written */ - if (Length < (*ReturnLength)) + if (Length < *ReturnLength) { /* Yes, indicate so in the return status */ Status = STATUS_INFO_LENGTH_MISMATCH; @@ -687,7 +687,7 @@ CmpCreateControlSet(IN PLOADER_PARAMETER_BLOCK LoaderBlock) ValueInfo = (PKEY_VALUE_FULL_INFORMATION)ValueInfoBuffer; /* Check if we failed or got a non DWORD-value */ - if (!(NT_SUCCESS(Status)) || (ValueInfo->Type != REG_DWORD)) + if (!NT_SUCCESS(Status) || (ValueInfo->Type != REG_DWORD)) { Status = STATUS_SUCCESS; goto Cleanup; @@ -728,7 +728,7 @@ CmpCreateControlSet(IN PLOADER_PARAMETER_BLOCK LoaderBlock) Status = NtOpenKey(&ProfileHandle, KEY_READ | KEY_WRITE, &ObjectAttributes); - if (!NT_SUCCESS (Status)) + if (!NT_SUCCESS(Status)) { /* Cleanup and exit */ Status = STATUS_SUCCESS; @@ -1319,8 +1319,8 @@ CmpLoadHiveThread(IN PVOID StartContext) &CmHive, &CmpMachineHiveList[i].Allocate, CM_CHECK_REGISTRY_PURGE_VOLATILES); - if (!(NT_SUCCESS(Status)) || - (!(CmpShareSystemHives) && !(CmHive->FileHandles[HFILE_TYPE_LOG]))) + if (!NT_SUCCESS(Status) || + (!CmpShareSystemHives && !CmHive->FileHandles[HFILE_TYPE_LOG])) { /* * We failed, or could not get a log file (unless @@ -1356,7 +1356,7 @@ CmpLoadHiveThread(IN PVOID StartContext) TRUE, FALSE, &ClusterSize); - if (!(NT_SUCCESS(Status)) || !(AlternateHandle)) + if (!NT_SUCCESS(Status) || !AlternateHandle) { /* Couldn't open the hive or its alternate file, raise a hard error */ ErrorParameters = &FileName; @@ -2111,14 +2111,14 @@ CmpReleaseTwoKcbLockByKey(IN ULONG ConvKey1, Index1 = GET_HASH_INDEX(ConvKey1); Index2 = GET_HASH_INDEX(ConvKey2); ASSERT((GET_HASH_ENTRY(CmpCacheTable, ConvKey2)->Owner == KeGetCurrentThread()) || - (CmpTestRegistryLockExclusive())); + CmpTestRegistryLockExclusive()); /* See which one is highest */ if (Index1 < Index2) { /* Grab them in the proper order */ ASSERT((GET_HASH_ENTRY(CmpCacheTable, ConvKey1)->Owner == KeGetCurrentThread()) || - (CmpTestRegistryLockExclusive())); + CmpTestRegistryLockExclusive()); CmpReleaseKcbLockByKey(ConvKey2); CmpReleaseKcbLockByKey(ConvKey1); } @@ -2128,7 +2128,7 @@ CmpReleaseTwoKcbLockByKey(IN ULONG ConvKey1, if (Index1 != Index2) { ASSERT((GET_HASH_ENTRY(CmpCacheTable, ConvKey1)->Owner == KeGetCurrentThread()) || - (CmpTestRegistryLockExclusive())); + CmpTestRegistryLockExclusive()); CmpReleaseKcbLockByKey(ConvKey1); } CmpReleaseKcbLockByKey(ConvKey2); diff --git a/ntoskrnl/config/cmvalche.c b/ntoskrnl/config/cmvalche.c index fe82bea8163..c63e03b4c51 100644 --- a/ntoskrnl/config/cmvalche.c +++ b/ntoskrnl/config/cmvalche.c @@ -69,8 +69,8 @@ CmpGetValueListFromCache(IN PCM_KEY_CONTROL_BLOCK Kcb, else { /* Make sure the KCB is locked exclusive */ - if (!(CmpIsKcbLockedExclusive(Kcb)) && - !(CmpTryToConvertKcbSharedToExclusive(Kcb))) + if (!CmpIsKcbLockedExclusive(Kcb) && + !CmpTryToConvertKcbSharedToExclusive(Kcb)) { /* We need the exclusive lock */ return SearchNeedExclusiveLock; @@ -79,7 +79,7 @@ CmpGetValueListFromCache(IN PCM_KEY_CONTROL_BLOCK Kcb, /* Select the value list as our cell, and get the actual list array */ CellToRelease = ChildList->ValueList; *CellData = (PCELL_DATA)HvGetCell(Hive, CellToRelease); - if (!(*CellData)) return SearchFail; + if (!*CellData) return SearchFail; /* FIXME: Here we would cache the value */ @@ -229,7 +229,7 @@ CmpFindValueByNameFromCache(IN PCM_KEY_CONTROL_BLOCK Kcb, if (SearchResult != SearchSuccess) { /* We either failed or need the exclusive lock */ - ASSERT((SearchResult == SearchFail) || !(CmpIsKcbLockedExclusive(Kcb))); + ASSERT((SearchResult == SearchFail) || !CmpIsKcbLockedExclusive(Kcb)); ASSERT(Cell == HCELL_NIL); return SearchResult; } @@ -260,7 +260,7 @@ CmpFindValueByNameFromCache(IN PCM_KEY_CONTROL_BLOCK Kcb, if (SearchResult != SearchSuccess) { /* We either failed or need the exclusive lock */ - ASSERT((SearchResult == SearchFail) || !(CmpIsKcbLockedExclusive(Kcb))); + ASSERT((SearchResult == SearchFail) || !CmpIsKcbLockedExclusive(Kcb)); ASSERT(Cell == HCELL_NIL); return SearchResult; } @@ -552,7 +552,7 @@ CmpQueryKeyValueData(IN PCM_KEY_CONTROL_BLOCK Kcb, } /* Sanity check */ - ASSERT((IsSmall ? (Size <= CM_KEY_VALUE_SMALL) : TRUE)); + ASSERT(IsSmall ? (Size <= CM_KEY_VALUE_SMALL) : TRUE); /* Make sure we have a valid buffer */ if (Buffer) @@ -658,7 +658,7 @@ CmpQueryKeyValueData(IN PCM_KEY_CONTROL_BLOCK Kcb, } /* Sanity check */ - ASSERT((IsSmall ? (Size <= CM_KEY_VALUE_SMALL) : TRUE)); + ASSERT(IsSmall ? (Size <= CM_KEY_VALUE_SMALL) : TRUE); /* Make sure we have a valid buffer */ if (Buffer) @@ -719,8 +719,8 @@ CmpCompareNewValueDataAgainstKCBCache(IN PCM_KEY_CONTROL_BLOCK Kcb, if (Kcb->Flags & KEY_SYM_LINK) { /* We need the exclusive lock */ - if (!(CmpIsKcbLockedExclusive(Kcb)) && - !(CmpTryToConvertKcbSharedToExclusive(Kcb))) + if (!CmpIsKcbLockedExclusive(Kcb) && + !CmpTryToConvertKcbSharedToExclusive(Kcb)) { /* We need the exclusive lock */ return SearchNeedExclusiveLock; @@ -734,7 +734,7 @@ CmpCompareNewValueDataAgainstKCBCache(IN PCM_KEY_CONTROL_BLOCK Kcb, CmpCleanUpKcbValueCache(Kcb); /* Sanity checks */ - ASSERT(!(CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList))); + ASSERT(!CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList)); ASSERT(!(Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND)); /* Set the value cache */ diff --git a/ntoskrnl/config/ntapi.c b/ntoskrnl/config/ntapi.c index 5e8f356a229..5bf9ec5af0b 100644 --- a/ntoskrnl/config/ntapi.c +++ b/ntoskrnl/config/ntapi.c @@ -805,7 +805,7 @@ NtQueryValueKey(IN HANDLE KeyHandle, goto Quit; /* Make sure the name is aligned properly */ - if ((ValueNameCopy.Length & (sizeof(WCHAR) - 1))) + if (ValueNameCopy.Length & (sizeof(WCHAR) - 1)) { /* It isn't, so we'll fail */ Status = STATUS_INVALID_PARAMETER; @@ -813,7 +813,7 @@ NtQueryValueKey(IN HANDLE KeyHandle, } /* Ignore any null characters at the end */ - while ((ValueNameCopy.Length) && + while (ValueNameCopy.Length && !(ValueNameCopy.Buffer[ValueNameCopy.Length / sizeof(WCHAR) - 1])) { /* Skip it */ @@ -947,9 +947,9 @@ NtSetValueKey(IN HANDLE KeyHandle, KeyHandle, &ValueNameCopy, TitleIndex, Type, DataSize); /* Make sure the name is aligned, not too long, and the data under 4GB */ - if ( (ValueNameCopy.Length > 32767) || - ((ValueNameCopy.Length & (sizeof(WCHAR) - 1))) || - (DataSize > 0x80000000)) + if ((ValueNameCopy.Length > 32767) || + (ValueNameCopy.Length & (sizeof(WCHAR) - 1)) || + (DataSize > 0x80000000)) { /* Fail */ Status = STATUS_INVALID_PARAMETER; @@ -957,7 +957,7 @@ NtSetValueKey(IN HANDLE KeyHandle, } /* Ignore any null characters at the end */ - while ((ValueNameCopy.Length) && + while (ValueNameCopy.Length && !(ValueNameCopy.Buffer[ValueNameCopy.Length / sizeof(WCHAR) - 1])) { /* Skip it */ @@ -1039,7 +1039,7 @@ NtDeleteValueKey(IN HANDLE KeyHandle, goto Quit; /* Make sure the name is aligned properly */ - if ((ValueNameCopy.Length & (sizeof(WCHAR) - 1))) + if (ValueNameCopy.Length & (sizeof(WCHAR) - 1)) { /* It isn't, so we'll fail */ Status = STATUS_INVALID_PARAMETER; diff --git a/sdk/lib/cmlib/hivewrt.c b/sdk/lib/cmlib/hivewrt.c index d95e8559196..eff699ac876 100644 --- a/sdk/lib/cmlib/hivewrt.c +++ b/sdk/lib/cmlib/hivewrt.c @@ -101,7 +101,7 @@ HvpWriteLog( * The hive log we are going to write data into * has to be writable and with a sane storage. */ - ASSERT(RegistryHive->ReadOnly == FALSE); + ASSERT(!RegistryHive->ReadOnly); ASSERT(RegistryHive->BaseBlock->Length == RegistryHive->Storage[Stable].Length * HBLOCK_SIZE); @@ -109,12 +109,11 @@ HvpWriteLog( HvpValidateBaseHeader(RegistryHive); /* - * The sequences can diverge in an occurrence of forced - * shutdown of the system such as during a power failure, - * the hardware crapping itself or during a system crash - * when one of the sequences have been modified during - * writing into the log or hive. In such cases the hive - * needs a repair. + * The sequences can diverge during a forced system shutdown + * occurrence, such as during a power failure, a hardware + * failure or during a system crash, and when one of the + * sequences have been modified during writing into the log + * or hive. In such cases the hive needs a repair. */ if (RegistryHive->BaseBlock->Sequence1 != RegistryHive->BaseBlock->Sequence2) @@ -324,7 +323,7 @@ HvpWriteHive( ULONG LastIndex; PVOID Block; - ASSERT(RegistryHive->ReadOnly == FALSE); + ASSERT(!RegistryHive->ReadOnly); ASSERT(RegistryHive->BaseBlock->Length == RegistryHive->Storage[Stable].Length * HBLOCK_SIZE); ASSERT(RegistryHive->BaseBlock->RootCell != HCELL_NIL); @@ -333,12 +332,11 @@ HvpWriteHive( HvpValidateBaseHeader(RegistryHive); /* - * The sequences can diverge in an occurrence of forced - * shutdown of the system such as during a power failure, - * the hardware crapping itself or during a system crash - * when one of the sequences have been modified during - * writing into the log or hive. In such cases the hive - * needs a repair. + * The sequences can diverge during a forced system shutdown + * occurrence, such as during a power failure, a hardware + * failure or during a system crash, and when one of the + * sequences have been modified during writing into the log + * or hive. In such cases the hive needs a repair. */ if (RegistryHive->BaseBlock->Sequence1 != RegistryHive->BaseBlock->Sequence2) @@ -372,11 +370,11 @@ HvpWriteHive( while (BlockIndex < RegistryHive->Storage[Stable].Length) { /* - * If we have to syncrhonize the registry hive we + * If we have to synchronize the registry hive we * want to look for dirty blocks to reflect the new * updates done to the hive. Otherwise just write * all the blocks as if we were doing a regular - * writing of the hive. + * hive write. */ if (OnlyDirty) { @@ -420,9 +418,9 @@ HvpWriteHive( /* * Increment the secondary sequence number and - * update the checksum. A successful transaction - * writing of hive is both of sequences are the - * same indicating the writing operation didn't + * update the checksum. A successful hive write + * transaction is when both of sequences are the + * same, indicating the write operation didn't * fail. */ RegistryHive->BaseBlock->Sequence2++; @@ -476,7 +474,7 @@ HvSyncHive( BOOLEAN HardErrors; #endif - ASSERT(RegistryHive->ReadOnly == FALSE); + ASSERT(!RegistryHive->ReadOnly); ASSERT(RegistryHive->Signature == HV_HHIVE_SIGNATURE); /* @@ -522,8 +520,8 @@ HvSyncHive( KeQuerySystemTime(&RegistryHive->BaseBlock->TimeStamp); #endif - /* Update the log file of hive if present */ - if (RegistryHive->Log == TRUE) + /* Update the hive log file if present */ + if (RegistryHive->Log) { if (!HvpWriteLog(RegistryHive)) { @@ -546,7 +544,7 @@ HvSyncHive( } /* Update the alternate hive file if present */ - if (RegistryHive->Alternate == TRUE) + if (RegistryHive->Alternate) { if (!HvpWriteHive(RegistryHive, TRUE, HFILE_TYPE_ALTERNATE)) { @@ -615,7 +613,7 @@ CMAPI HvWriteHive( _In_ PHHIVE RegistryHive) { - ASSERT(RegistryHive->ReadOnly == FALSE); + ASSERT(!RegistryHive->ReadOnly); ASSERT(RegistryHive->Signature == HV_HHIVE_SIGNATURE); #if !defined(_BLDR_) @@ -653,9 +651,9 @@ CMAPI HvWriteAlternateHive( _In_ PHHIVE RegistryHive) { - ASSERT(RegistryHive->ReadOnly == FALSE); + ASSERT(!RegistryHive->ReadOnly); ASSERT(RegistryHive->Signature == HV_HHIVE_SIGNATURE); - ASSERT(RegistryHive->Alternate == TRUE); + ASSERT(RegistryHive->Alternate); #if !defined(_BLDR_) /* Update hive header modification time */ @@ -691,7 +689,7 @@ CMAPI HvSyncHiveFromRecover( _In_ PHHIVE RegistryHive) { - ASSERT(RegistryHive->ReadOnly == FALSE); + ASSERT(!RegistryHive->ReadOnly); ASSERT(RegistryHive->Signature == HV_HHIVE_SIGNATURE); /* Call the private API call to do the deed for us */

11 months, 4 weeks

[reactos] 01/01: [SHELL32][CONTROL] Added basic IOpenControlPanel support (#6248)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d41dec2e07f919235406c… commit d41dec2e07f919235406ca3a4d47e8b6ae1aa588 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Wed Jan 17 17:07:21 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 17 17:07:21 2024 +0100 [SHELL32][CONTROL] Added basic IOpenControlPanel support (#6248) Add a basic IOpenControlPanel implementation that supports Vista canonical registry names. Implements `control.exe /name company.name [/page id]` and `IOpenControlPanel` handling of Vista-style canonical registry names. The documented `Microsoft.*` names don't work because they are simply not in our registry but "[Executable Control Panel Items](https://learn.microsoft.com/en-us/windows/win32/shell/how-to-registe…" registered by 3rd-party ISVs will function correctly in control.exe and the COM API. Notes: - `IOpenControlPanel` is implemented in CControlPanelFolder.cpp because it is supposed to have tighter integration with that shell folder than it does in this PR. - `IOpenControlPanel` is also supposed to handle .cpl files with canonical names registered under [`Extended Properties`](https://learn.microsoft.com/en-us/windows/win32/shell/how-to-r… but the control panel folder does not implement `IShellFolder2::GetDetailsEx` yet, so it will have to wait. - These "Executable Control Panel Items" are also supposed to be displayed in the control panel itself but this PR does not address that. The `ITEMIDLIST` format for those needs investigation... - The Wow64 handling is perhaps not correct but it does not matter, `ShellExecuteEx` gets to deal with whatever is in the `...\shell\open\command` key. `CControlPanelFolder` would have to take more care when it starts reading those keys so it knows when to append "(32-bit)" to the display name. - `%s%s` because .cpl canonical names don't have the `::` prefix according to Geoff Chappell. - Always returns `CPVIEW_CLASSIC` because our `CControlPanelFolder` does not support the category view. --- base/applications/control/CMakeLists.txt | 2 + base/applications/control/control.c | 63 +++++++++- dll/win32/shell32/folders/CControlPanelFolder.cpp | 141 ++++++++++++++++++++++ dll/win32/shell32/folders/CControlPanelFolder.h | 21 ++++ dll/win32/shell32/res/rgs/controlpanel.rgs | 22 ++++ dll/win32/shell32/shell32.cpp | 1 + sdk/include/psdk/shlguid.h | 1 + sdk/include/psdk/shobjidl.idl | 31 +++++ 8 files changed, 281 insertions(+), 1 deletion(-) diff --git a/base/applications/control/CMakeLists.txt b/base/applications/control/CMakeLists.txt index 06e49c19229..827d6fa4be3 100644 --- a/base/applications/control/CMakeLists.txt +++ b/base/applications/control/CMakeLists.txt @@ -2,5 +2,7 @@ add_rc_deps(control.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/config.ico) add_executable(control control.c control.rc) set_module_type(control win32gui UNICODE) +add_delay_importlibs(control ole32) +target_link_libraries(control uuid) add_importlibs(control advapi32 shell32 user32 msvcrt kernel32) add_cd_file(TARGET control DESTINATION reactos/system32 FOR all) diff --git a/base/applications/control/control.c b/base/applications/control/control.c index a13000c1153..3a39694d1c9 100644 --- a/base/applications/control/control.c +++ b/base/applications/control/control.c @@ -4,12 +4,14 @@ * PURPOSE: ReactOS System Control Panel * COPYRIGHT: Copyright 2004 Gero Kuehn (reactos.filter(a)gkware.com) * Copyright 2008 Colin Finck (colin(a)reactos.org) - * Copyright 2014 Herm�s B�lusca-Ma�to (hermes.belusca-maito(a)reactos.org) + * Copyright 2014 Hermès Bélusca-Maïto (hermes.belusca-maito(a)reactos.org) */ #include <stdio.h> #define WIN32_NO_STATUS +#define COBJMACROS + #include <windef.h> #include <winbase.h> @@ -17,6 +19,9 @@ #include <winreg.h> #include <shellapi.h> #include <strsafe.h> +#include <objbase.h> +#include <shobjidl.h> +#include <shlguid.h> #include "resource.h" @@ -34,6 +39,35 @@ VOID WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow); +static BOOL +IsSwitch(LPCWSTR Switch, LPCWSTR Arg) +{ + if (*Arg == '/' || *Arg == '-') + { + return !lstrcmpiW(Arg+1, Switch); + } + return FALSE; +} + +static HRESULT +OpenControlPanelItem(LPCWSTR Name, LPCWSTR Page) +{ + HRESULT hr = CoInitialize(0); + if (SUCCEEDED(hr)) + { + IOpenControlPanel *pOCP; + hr = CoCreateInstance(&CLSID_OpenControlPanel, NULL, CLSCTX_INPROC_SERVER, + &IID_IOpenControlPanel, (void**)&pOCP); + if (SUCCEEDED(hr)) + { + hr = IOpenControlPanel_Open(pOCP, Name, Page, NULL); + IOpenControlPanel_Release(pOCP); + } + CoUninitialize(); + } + return hr; +} + static INT OpenShellFolder(LPWSTR lpFolderCLSID) { @@ -73,11 +107,16 @@ wWinMain(HINSTANCE hInstance, INT nCmdShow) { HKEY hKey; + LPWSTR *argv; + int argc; /* Show the control panel window if no argument or "panel" was passed */ if (*lpCmdLine == 0 || !_wcsicmp(lpCmdLine, L"panel")) return OpenShellFolder(L""); + /* Map legacy control panels */ + if (!_wcsicmp(lpCmdLine, L"sticpl.cpl")) lpCmdLine = (LPWSTR) L"scannercamera"; + /* Check one of the built-in control panel handlers */ if (!_wcsicmp(lpCmdLine, L"admintools")) return OpenShellFolder(L"\\::{D20EA4E1-3957-11d2-A40B-0C5020524153}"); else if (!_wcsicmp(lpCmdLine, L"color")) return RunControlPanel(L"desk.cpl,,2"); @@ -99,6 +138,28 @@ wWinMain(HINSTANCE hInstance, else if (!_wcsicmp(lpCmdLine, L"userpasswords")) return RunControlPanel(L"nusrmgr.cpl"); /* Graphical User Account Manager */ else if (!_wcsicmp(lpCmdLine, L"userpasswords2")) return RUNDLL(L"netplwiz.dll,UsersRunDll"); /* Dialog based advanced User Account Manager */ + /* https://learn.microsoft.com/en-us/windows/win32/shell/executing-control-pan… */ + argv = CommandLineToArgvW(lpCmdLine, &argc); + if (argv) + { + UINT argi = 0; + HRESULT hr = -1; + if (argc >= 2 && IsSwitch(L"name", argv[argi + 0])) + { + LPCWSTR pszPage = NULL; + if (argc >= 4 && IsSwitch(L"page", argv[argi + 2])) + { + pszPage = argv[argi + 3]; + } + hr = OpenControlPanelItem(argv[argi + 1], pszPage); + } + LocalFree(argv); + if (hr != -1) + { + return SUCCEEDED(hr); + } + } + /* It is none of them, so look for a handler in the registry */ if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls", diff --git a/dll/win32/shell32/folders/CControlPanelFolder.cpp b/dll/win32/shell32/folders/CControlPanelFolder.cpp index be71cc8f714..085b074ee18 100644 --- a/dll/win32/shell32/folders/CControlPanelFolder.cpp +++ b/dll/win32/shell32/folders/CControlPanelFolder.cpp @@ -773,3 +773,144 @@ HRESULT WINAPI CCPLItemMenu::HandleMenuMsg( return E_NOTIMPL; } + +/************************************************************************** +* COpenControlPanel +*/ + +static HRESULT GetParsingName(PCIDLIST_ABSOLUTE pidl, PWSTR*Name) +{ + PIDLIST_ABSOLUTE pidlFree = NULL; + if (IS_INTRESOURCE(pidl)) + { + HRESULT hr = SHGetSpecialFolderLocation(NULL, (UINT)(SIZE_T)pidl, &pidlFree); + if (FAILED(hr)) + return hr; + pidl = pidlFree; + } + HRESULT hr = SHGetNameFromIDList(pidl, SIGDN_DESKTOPABSOLUTEPARSING, Name); + ILFree(pidlFree); + return hr; +} + +static HRESULT CreateCplAbsoluteParsingPath(LPCWSTR Prefix, LPCWSTR InFolderParse, PWSTR Buf, UINT cchBuf) +{ + PWSTR cpfolder; + HRESULT hr = GetParsingName((PCIDLIST_ABSOLUTE)CSIDL_CONTROLS, &cpfolder); + if (SUCCEEDED(hr)) + { + hr = StringCchPrintfW(Buf, cchBuf, L"%s\\%s%s", cpfolder, Prefix, InFolderParse); + SHFree(cpfolder); + } + return hr; +} + +static HRESULT FindExeCplClass(LPCWSTR Canonical, HKEY hKey, BOOL Wow64, LPWSTR clsid) +{ + HRESULT hr = HRESULT_FROM_WIN32(ERROR_NOT_FOUND); + HKEY hNSKey; + WCHAR key[MAX_PATH], buf[MAX_PATH]; + wsprintfW(key, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\%s\\NameSpace", + Wow64 ? L"ControlPanelWOW64" : L"ControlPanel"); + LSTATUS error = RegOpenKeyExW(hKey, key, 0, KEY_READ, &hNSKey); + if (error) + return HRESULT_FROM_WIN32(error); + for (DWORD i = 0; RegEnumKeyW(hNSKey, i, key, _countof(key)) == ERROR_SUCCESS; ++i) + { + IID validate; + if (SUCCEEDED(IIDFromString(key, &validate))) + { + wsprintfW(buf, L"CLSID\\%s", key); + DWORD cb = sizeof(buf); + if (RegGetValueW(HKEY_CLASSES_ROOT, buf, L"System.ApplicationName", + RRF_RT_REG_SZ, NULL, buf, &cb) == ERROR_SUCCESS) + { + if (!lstrcmpiW(buf, Canonical)) + { + lstrcpyW(clsid, key); + hr = S_OK; + } + } + } + } + RegCloseKey(hNSKey); + return hr; +} + +static HRESULT FindExeCplClass(LPCWSTR Canonical, LPWSTR clsid) +{ + HRESULT hr = E_FAIL; + if (FAILED(hr)) + hr = FindExeCplClass(Canonical, HKEY_CURRENT_USER, FALSE, clsid); + if (FAILED(hr)) + hr = FindExeCplClass(Canonical, HKEY_CURRENT_USER, TRUE, clsid); + if (FAILED(hr)) + hr = FindExeCplClass(Canonical, HKEY_LOCAL_MACHINE, FALSE, clsid); + if (FAILED(hr)) + hr = FindExeCplClass(Canonical, HKEY_LOCAL_MACHINE, TRUE, clsid); + return hr; +} + +HRESULT WINAPI COpenControlPanel::Open(LPCWSTR pszName, LPCWSTR pszPage, IUnknown *punkSite) +{ + WCHAR path[MAX_PATH], clspath[MAX_PATH]; + HRESULT hr = S_OK; + SHELLEXECUTEINFOW sei = { sizeof(sei), SEE_MASK_FLAG_DDEWAIT }; + sei.lpFile = path; + sei.nShow = SW_SHOW; + if (!pszName) + { + GetSystemDirectoryW(path, _countof(path)); + PathAppendW(path, L"control.exe"); + } + else + { + LPWSTR clsid = clspath + wsprintfW(clspath, L"CLSID\\"); + if (SUCCEEDED(hr = FindExeCplClass(pszName, clsid))) + { + if (SUCCEEDED(hr = CreateCplAbsoluteParsingPath(L"::", clsid, path, _countof(path)))) + { + // NT6 will execute "::{26EE0668-A00A-44D7-9371-BEB064C98683}\0\::{clsid}[\pszPage]" + // but we don't support parsing that so we force the class instead. + sei.fMask |= SEE_MASK_CLASSNAME; + sei.lpClass = clspath; + } + } + } + + if (SUCCEEDED(hr)) + { + DWORD error = ShellExecuteExW(&sei) ? ERROR_SUCCESS : GetLastError(); + hr = HRESULT_FROM_WIN32(error); + } + return hr; +} + +HRESULT WINAPI COpenControlPanel::GetPath(LPCWSTR pszName, LPWSTR pszPath, UINT cchPath) +{ + HRESULT hr; + if (!pszName) + { + PWSTR cpfolder; + if (SUCCEEDED(hr = GetParsingName((PCIDLIST_ABSOLUTE)CSIDL_CONTROLS, &cpfolder))) + { + hr = StringCchCopyW(pszPath, cchPath, cpfolder); + SHFree(cpfolder); + } + } + else + { + WCHAR clsid[38 + 1]; + if (SUCCEEDED(hr = FindExeCplClass(pszName, clsid))) + { + hr = CreateCplAbsoluteParsingPath(L"::", clsid, pszPath, cchPath); + } + } + return hr; +} + +HRESULT WINAPI COpenControlPanel::GetCurrentView(CPVIEW *pView) +{ + *pView = CPVIEW_CLASSIC; + return S_OK; +} diff --git a/dll/win32/shell32/folders/CControlPanelFolder.h b/dll/win32/shell32/folders/CControlPanelFolder.h index 1fa7969aff4..deb29a5f2e1 100644 --- a/dll/win32/shell32/folders/CControlPanelFolder.h +++ b/dll/win32/shell32/folders/CControlPanelFolder.h @@ -111,4 +111,25 @@ public: END_COM_MAP() }; +class COpenControlPanel : + public CComCoClass<COpenControlPanel, &CLSID_OpenControlPanel>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IOpenControlPanel +{ + public: + // IOpenControlPanel + virtual HRESULT WINAPI Open(LPCWSTR pszName, LPCWSTR pszPage, IUnknown *punkSite); + virtual HRESULT WINAPI GetPath(LPCWSTR pszName, LPWSTR pszPath, UINT cchPath); + virtual HRESULT WINAPI GetCurrentView(CPVIEW *pView); + + static HRESULT WINAPI UpdateRegistry(BOOL bRegister) { return S_OK; } // CControlPanelFolder does it for us + DECLARE_NOT_AGGREGATABLE(COpenControlPanel) + + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(COpenControlPanel) + COM_INTERFACE_ENTRY_IID(IID_IOpenControlPanel, IOpenControlPanel) + END_COM_MAP() +}; + #endif /* _SHFLDR_CPANEL_H_ */ diff --git a/dll/win32/shell32/res/rgs/controlpanel.rgs b/dll/win32/shell32/res/rgs/controlpanel.rgs index 79a1794d573..d53211d1799 100644 --- a/dll/win32/shell32/res/rgs/controlpanel.rgs +++ b/dll/win32/shell32/res/rgs/controlpanel.rgs @@ -51,3 +51,25 @@ HKLM } } } + +HKCR +{ + NoRemove CLSID + { + ForceRemove {06622D85-6856-4460-8DE1-A81921B41C4B} = s 'COpenControlPanel' + { + val AppID = s '{06622D85-6856-4460-8DE1-A81921B41C4B}' + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + } + } + NoRemove AppID + { + ForceRemove {06622D85-6856-4460-8DE1-A81921B41C4B} = s 'COpenControlPanel' + { + val DllSurrogate = s '' + } + } +} diff --git a/dll/win32/shell32/shell32.cpp b/dll/win32/shell32/shell32.cpp index 011d5b2980b..91e5ed22c84 100644 --- a/dll/win32/shell32/shell32.cpp +++ b/dll/win32/shell32/shell32.cpp @@ -280,6 +280,7 @@ BEGIN_OBJECT_MAP(ObjectMap) OBJECT_ENTRY(CLSID_Shell, CShellDispatch) OBJECT_ENTRY(CLSID_DragDropHelper, CDropTargetHelper) OBJECT_ENTRY(CLSID_ControlPanel, CControlPanelFolder) + OBJECT_ENTRY(CLSID_OpenControlPanel, COpenControlPanel) OBJECT_ENTRY(CLSID_MyDocuments, CMyDocsFolder) OBJECT_ENTRY(CLSID_NetworkPlaces, CNetFolder) OBJECT_ENTRY(CLSID_FontsFolderShortcut, CFontsFolder) diff --git a/sdk/include/psdk/shlguid.h b/sdk/include/psdk/shlguid.h index 132f2963fdc..adada9427cd 100644 --- a/sdk/include/psdk/shlguid.h +++ b/sdk/include/psdk/shlguid.h @@ -231,6 +231,7 @@ DEFINE_GUID(CLSID_NewMenu, 0xd969A300, 0xe7FF, 0x11D0, 0xA9, 0x3B, DEFINE_GUID(IID_IShellFolderViewCB, 0x2047E320, 0xF2A9, 0x11CE, 0xAE, 0x65, 0x8, 0x00, 0x2B, 0x2E, 0x12, 0x62); DEFINE_GUID(CLSID_InternetButtons, 0x1E796980, 0x9CC5, 0x11D1, 0xA8, 0x3F, 0x0, 0xC0, 0x4F, 0xC9, 0x9D, 0x61); DEFINE_GUID(CLSID_MenuDeskBar, 0xECD4FC4F, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); +DEFINE_GUID(CLSID_OpenControlPanel, 0x06622D85, 0x6856, 0x4460, 0x8D, 0xE1, 0xA8, 0x19, 0x21, 0xB4, 0x1C, 0x4B); DEFINE_GUID(SID_SMenuBandChild, 0xed9cc020, 0x08b9, 0x11d1, 0x98, 0x23, 0x0, 0xc0, 0x4f, 0xd9, 0x19, 0x72); DEFINE_GUID(SID_SMenuBandParent, 0x8c278eec, 0x3eab, 0x11d1, 0x8c, 0xb0, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); diff --git a/sdk/include/psdk/shobjidl.idl b/sdk/include/psdk/shobjidl.idl index ef9e51d16e1..7a75dff0f09 100644 --- a/sdk/include/psdk/shobjidl.idl +++ b/sdk/include/psdk/shobjidl.idl @@ -2360,6 +2360,37 @@ interface IExplorerCommandProvider : IUnknown [out, iid_is(riid)] void **ppv); }; + +/***************************************************************************** + * IOpenControlPanel interface (Vista+) + */ +[ + object, + uuid(D11AD862-66DE-4DF4-BF6C-1F5621996AF1), + pointer_default(unique) +] +interface IOpenControlPanel : IUnknown +{ + typedef [v1_enum] enum CPVIEW + { + CPVIEW_CLASSIC = 0, + CPVIEW_CATEGORY = 1, + CPVIEW_ALLITEMS = CPVIEW_CLASSIC, + CPVIEW_HOME = CPVIEW_CATEGORY + } CPVIEW; + + HRESULT Open( + [in, optional] LPCWSTR pszName, + [in, optional] LPCWSTR pszPage, + [in, optional] IUnknown *punkSite); + HRESULT GetPath( + [in, optional] LPCWSTR pszName, + [out, string, size_is(cchPath)] LPWSTR pszPath, + [in] UINT cchPath); + HRESULT GetCurrentView( + [out] CPVIEW *pView); +} + #endif // __REACTOS__ /*****************************************************************************

12 months

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