Ros-diffs January 2018

ros-diffs@reactos.org

37 participants
372 discussions

01/01: [COMCTL32] toolbar: Use szBarPadding.cy as the default top margin

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c4b7b0747b49e4ee8bbd… commit 8c4b7b0747b49e4ee8bbd5fc27c964a41450d9f2 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Jan 29 17:51:06 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Jan 29 17:51:06 2018 +0200 [COMCTL32] toolbar: Use szBarPadding.cy as the default top margin --- dll/win32/comctl32/toolbar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/comctl32/toolbar.c b/dll/win32/comctl32/toolbar.c index c2befb228c..949eadb8d7 100644 --- a/dll/win32/comctl32/toolbar.c +++ b/dll/win32/comctl32/toolbar.c @@ -256,7 +256,7 @@ static inline int default_top_margin(const TOOLBAR_INFO *infoPtr) { #ifdef __REACTOS__ if (infoPtr->iVersion == 6) - return 0; + return infoPtr->szBarPadding.cy; #endif return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); }

6 years, 10 months

01/01: [EXPLORER] CNotifyToolbar: Set TBMETRICS::cxBarPad and TBMETRICS::cyBarPad MSDN says that these values are not used but apparently they are used as a padding around the buttons. This helps to center the buttons in the notification area.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22d1e1017f8ca89aae73c… commit 22d1e1017f8ca89aae73c2bb9131155cb20f96a2 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Jan 29 17:28:29 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Jan 29 17:30:44 2018 +0200 [EXPLORER] CNotifyToolbar: Set TBMETRICS::cxBarPad and TBMETRICS::cyBarPad MSDN says that these values are not used but apparently they are used as a padding around the buttons. This helps to center the buttons in the notification area. --- base/shell/explorer/syspager.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index 45f17023b9..4656d8f6fa 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -1189,6 +1189,8 @@ void CNotifyToolbar::Initialize(HWND hWndParent, CBalloonQueue * queue) tbm.dwMask = TBMF_BARPAD | TBMF_BUTTONSPACING | TBMF_PAD; tbm.cxPad = 1; tbm.cyPad = 1; + tbm.cxBarPad = 1; + tbm.cyBarPad = 1; tbm.cxButtonSpacing = 1; tbm.cyButtonSpacing = 1; SetMetrics(&tbm);

6 years, 10 months

01/01: [CONTRIBUTING] Update .gitmessage template

by Alexander Shaposhnikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19a67154c6bb612d324da… commit 19a67154c6bb612d324da5c1ca824c9a3ca1e6b7 Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Mon Jan 29 16:09:04 2018 +0200 Commit: Alexander Shaposhnikov <sanchaez(a)reactos.org> CommitDate: Mon Jan 29 16:09:04 2018 +0200 [CONTRIBUTING] Update .gitmessage template --- .gitmessage | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.gitmessage b/.gitmessage index ebf493f1c4..f0b7ea10e1 100644 --- a/.gitmessage +++ b/.gitmessage @@ -4,20 +4,17 @@ # CORE-XXXX CIDXXXXX -#--------------------------------------------------------------------^ -# 70^ # * [MODULE] should usually be the name of the CMake module, written # in all caps. # -# * Summary should be imperative (not past tense), 70 characters or -# less, and not end with a period. +# * Summary should be imperative (not past tense), and not end with +# a period. # -# * Description of commit should explain WHY a change was made and -# lines should be also wrapped to 70 characters. +# * Description of commit should explain WHY a change was made. # # * JIRA, Coverity ID references should be placed at the bottom and # preceded by the newline. # # * Pull request should always be referenced in the summary in parens -# unless it doesn't fit In this case it should be placed after bug +# unless it doesn't fit. In this case it should be placed after bug # IDs if any.

6 years, 10 months

01/01: [CONTRIBUTING] Add a commit template and a paragraph about it

by Alexander Shaposhnikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d70741fa20aff5ee9dc19… commit d70741fa20aff5ee9dc19b68dac6b7ef31475949 Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Sun Jan 28 00:51:48 2018 +0200 Commit: Alexander Shaposhnikov <sanchaez(a)reactos.org> CommitDate: Mon Jan 29 15:08:04 2018 +0200 [CONTRIBUTING] Add a commit template and a paragraph about it This template defines a general commit style, and will be most helpful for newcomers. I will be using it personally :) --- .gitmessage | 23 +++++++++++++++++++++++ CONTRIBUTING.md | 5 +++++ 2 files changed, 28 insertions(+) diff --git a/.gitmessage b/.gitmessage new file mode 100644 index 0000000000..ebf493f1c4 --- /dev/null +++ b/.gitmessage @@ -0,0 +1,23 @@ +# [MODULE] A short but descriptive summary (#pr-num) + +# A comprehensible description of WHY you did this work. + +# CORE-XXXX CIDXXXXX + +#--------------------------------------------------------------------^ +# 70^ +# * [MODULE] should usually be the name of the CMake module, written +# in all caps. +# +# * Summary should be imperative (not past tense), 70 characters or +# less, and not end with a period. +# +# * Description of commit should explain WHY a change was made and +# lines should be also wrapped to 70 characters. +# +# * JIRA, Coverity ID references should be placed at the bottom and +# preceded by the newline. +# +# * Pull request should always be referenced in the summary in parens +# unless it doesn't fit In this case it should be placed after bug +# IDs if any. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 028fe8bead..2d4b903b40 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -57,6 +57,10 @@ A __[patch]__ is a set of changes to existing source code. The changes in a patc See [Submitting Patches] for details. +### Commit style + +Our commit style is defined in a __[commit template]__. Use it as a reference or turn it on using `git config commit.template .gitmessage`. This will set this template as an initial commit message for the new commits in your local repository. + ### Rules and Recommendations - *Use your __real name__ and __real email__.* We do not accept anonymous contributions! @@ -96,3 +100,4 @@ Finding a good project to start with can be a challenge, because when starting o [README.FSD]: /media/doc/README.FSD [Coverity]: https://scan.coverity.com/projects/reactos [request-coverity]: https://scan.coverity.com/memberships/new?project_id=reactos + [commit template]: .gitmessage

6 years, 10 months

01/01: [EXPLORER] CTrayWindow: Draw the sizer only when the taskbar is not locked.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c54c5ebb5f320b6cfe8d3… commit c54c5ebb5f320b6cfe8d355eec9f27f7dee111c8 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Jan 29 00:27:45 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Jan 29 00:27:45 2018 +0200 [EXPLORER] CTrayWindow: Draw the sizer only when the taskbar is not locked. --- base/shell/explorer/traywnd.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index e0b5aba452..9ca7b25781 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -2168,6 +2168,10 @@ ChangePos: bHandled = FALSE; return 0; } + else if (g_TaskbarSettings.bLock) + { + return 0; + } return DrawSizerWithTheme((HRGN) wParam); }

6 years, 10 months

01/01: [EXPLORER] CTrayNotifyWnd: Fix resizing when the clock is hidden

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=488477d10d554041e6a35… commit 488477d10d554041e6a357340d96c1daeb9ac70c Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Jan 28 22:38:48 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Jan 28 22:38:48 2018 +0200 [EXPLORER] CTrayNotifyWnd: Fix resizing when the clock is hidden --- base/shell/explorer/trayntfy.cpp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index 0a85685a6b..4326ca727e 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -218,28 +218,28 @@ public: szClock.cx, szClock.cy, SWP_NOZORDER); + } - POINT ptPager; - - if (IsHorizontal) - { - ptPager.x = ContentMargin.cxLeftWidth; - ptPager.y = (pszClient->cy - szTrayNotify.cy)/2; - } - else - { - ptPager.x = (pszClient->cx - szTrayNotify.cx)/2; - ptPager.y = ContentMargin.cyTopHeight; - } + POINT ptPager; - ::SetWindowPos(m_hwndPager, - NULL, - ptPager.x, - ptPager.y, - szTrayNotify.cx, - szTrayNotify.cy, - SWP_NOZORDER); + if (IsHorizontal) + { + ptPager.x = ContentMargin.cxLeftWidth; + ptPager.y = (pszClient->cy - szTrayNotify.cy)/2; } + else + { + ptPager.x = (pszClient->cx - szTrayNotify.cx)/2; + ptPager.y = ContentMargin.cyTopHeight; + } + + ::SetWindowPos(m_hwndPager, + NULL, + ptPager.x, + ptPager.y, + szTrayNotify.cx, + szTrayNotify.cy, + SWP_NOZORDER); } LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)

6 years, 10 months

01/01: [EXPLORER] CTrayNotifyWnd: Only update the requested dimension when handling TNWM_GETMINIMUMSIZE.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85d7dd4f838d37b95ff89… commit 85d7dd4f838d37b95ff89fb876ec4eec25538394 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Jan 28 22:04:34 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Jan 28 22:04:34 2018 +0200 [EXPLORER] CTrayNotifyWnd: Only update the requested dimension when handling TNWM_GETMINIMUMSIZE. --- base/shell/explorer/trayntfy.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index a5ce527b42..0a85685a6b 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -173,6 +173,7 @@ public: pSize->cx += TRAY_NOTIFY_WND_SPACING_X + szTrayClockMin.cx; pSize->cx += szTray.cx; + pSize->cx += ContentMargin.cxLeftWidth + ContentMargin.cxRightWidth; } else { @@ -182,11 +183,9 @@ public: pSize->cy += TRAY_NOTIFY_WND_SPACING_Y + szTrayClockMin.cy; pSize->cy += szTray.cy; + pSize->cy += ContentMargin.cyTopHeight + ContentMargin.cyBottomHeight; } - pSize->cy += ContentMargin.cyTopHeight + ContentMargin.cyBottomHeight; - pSize->cx += ContentMargin.cxLeftWidth + ContentMargin.cxRightWidth; - return TRUE; }

6 years, 10 months

01/01: [EXPLORER] CTaskSwitchWnd: Implement getting the setting for grouping tasks. This doesn't work yet but the setting does get stored in m_IsGroupingEnabled. TSWM_ENABLEGROUPING is not needed.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a1984c99853fa8e551f8… commit 5a1984c99853fa8e551f864e28c1673f9de732b5 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Jan 28 19:20:12 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Jan 28 20:24:02 2018 +0200 [EXPLORER] CTaskSwitchWnd: Implement getting the setting for grouping tasks. This doesn't work yet but the setting does get stored in m_IsGroupingEnabled. TSWM_ENABLEGROUPING is not needed. --- base/shell/explorer/precomp.h | 1 - base/shell/explorer/taskswnd.cpp | 22 ++++++---------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index 5c9676be30..228fc75c5f 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -349,7 +349,6 @@ HRESULT CSysPagerWnd_CreateInstance(HWND hwndParent, REFIID riid, void **ppv); * taskswnd.c */ -#define TSWM_ENABLEGROUPING (WM_USER + 1) #define TSWM_UPDATETASKBARPOS (WM_USER + 2) HRESULT CTaskSwitchWnd_CreateInstance(IN HWND hWndParent, IN OUT ITrayWindow *Tray, REFIID riid, void **ppv); diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index 18fa2c1e69..590dc4062d 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -1718,19 +1718,6 @@ public: return Ret; } - LRESULT OnEnableGrouping(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) - { - LRESULT Ret = m_IsGroupingEnabled; - if ((BOOL)wParam != m_IsGroupingEnabled) - { - m_IsGroupingEnabled = (BOOL)wParam; - - /* Collapse or expand groups if necessary */ - UpdateButtonsSize(FALSE); - } - return Ret; - } - LRESULT OnUpdateTaskbarPos(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { /* Update the button spacing */ @@ -1743,8 +1730,12 @@ public: TaskbarSettings* newSettings = (TaskbarSettings*)lParam; if (newSettings->bGroupButtons != g_TaskbarSettings.bGroupButtons) { - /* TODO: Toggle grouping */ g_TaskbarSettings.bGroupButtons = newSettings->bGroupButtons; + m_IsGroupingEnabled = g_TaskbarSettings.bGroupButtons; + + /* Collapse or expand groups if necessary */ + RefreshWindowList(); + UpdateButtonsSize(FALSE); } return 0; @@ -1833,7 +1824,7 @@ public: HRESULT Initialize(IN HWND hWndParent, IN OUT ITrayWindow *tray) { m_Tray = tray; - m_IsGroupingEnabled = TRUE; /* FIXME */ + m_IsGroupingEnabled = g_TaskbarSettings.bGroupButtons; Create(hWndParent, 0, szRunningApps, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP); if (!m_hWnd) return E_FAIL; @@ -1864,7 +1855,6 @@ public: MESSAGE_HANDLER(WM_NCHITTEST, OnNcHitTest) MESSAGE_HANDLER(WM_COMMAND, OnCommand) MESSAGE_HANDLER(WM_NOTIFY, OnNotify) - MESSAGE_HANDLER(TSWM_ENABLEGROUPING, OnEnableGrouping) MESSAGE_HANDLER(TSWM_UPDATETASKBARPOS, OnUpdateTaskbarPos) MESSAGE_HANDLER(TWM_SETTINGSCHANGED, OnTaskbarSettingsChanged) MESSAGE_HANDLER(WM_CONTEXTMENU, OnContextMenu)

6 years, 10 months

01/01: [EXPLORER] CTrayClockWnd: Implement showing and hiding seconds or the whole clock from the properties window.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c073e9539f5035527571… commit 6c073e9539f50355275710902ecca6f752414179 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Jan 28 18:59:18 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Jan 28 18:59:18 2018 +0200 [EXPLORER] CTrayClockWnd: Implement showing and hiding seconds or the whole clock from the properties window. --- base/shell/explorer/trayclock.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/base/shell/explorer/trayclock.cpp b/base/shell/explorer/trayclock.cpp index b2efa36689..fe1b199cc3 100644 --- a/base/shell/explorer/trayclock.cpp +++ b/base/shell/explorer/trayclock.cpp @@ -47,7 +47,6 @@ class CTrayClockWnd : public CWindowImpl < CTrayClockWnd, CWindow, CControlWinTraits >, public IOleWindow { - HWND hWndNotify; HFONT hFont; COLORREF textColor; RECT rcText; @@ -659,19 +658,29 @@ LRESULT CTrayClockWnd::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa LRESULT CTrayClockWnd::OnTaskbarSettingsChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + BOOL bRealign = FALSE; + TaskbarSettings* newSettings = (TaskbarSettings*)lParam; if (newSettings->bShowSeconds != g_TaskbarSettings.bShowSeconds) { g_TaskbarSettings.bShowSeconds = newSettings->bShowSeconds; - /* TODO: Toggle showing seconds */ + bRealign = TRUE; } if (newSettings->sr.HideClock != g_TaskbarSettings.sr.HideClock) { g_TaskbarSettings.sr.HideClock = newSettings->sr.HideClock; - /* TODO: Toggle hiding the clock */ + ShowWindow(g_TaskbarSettings.sr.HideClock ? SW_HIDE : SW_SHOW); + bRealign = TRUE; } + if (bRealign) + { + /* Ask the parent to resize */ + NMHDR nmh = {GetParent(), 0, NTNWM_REALIGN}; + GetParent().SendMessage(WM_NOTIFY, 0, (LPARAM) &nmh); + Update(); + } return 0; } @@ -679,6 +688,7 @@ LRESULT CTrayClockWnd::OnNcLButtonDblClick(UINT uMsg, WPARAM wParam, LPARAM lPar { if (IsWindowVisible()) { + /* We get all WM_NCLBUTTONDBLCLK for the taskbar so we need to check if it is on the clock*/ RECT rcClock; if (GetWindowRect(&rcClock)) {

6 years, 11 months

01/01: [EXPLORER] -Make CSysPagerWnd, CTaskSwitchWnd, CTrayClockWnd and CTrayNotifyWnd proper com objects so that their lifetime is managed properly.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=455bce68b505b89dd19ca… commit 455bce68b505b89dd19ca994b67f671ee1dfa407 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Jan 28 14:21:45 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Jan 28 18:35:16 2018 +0200 [EXPLORER] -Make CSysPagerWnd, CTaskSwitchWnd, CTrayClockWnd and CTrayNotifyWnd proper com objects so that their lifetime is managed properly. --- base/shell/explorer/precomp.h | 24 +--- base/shell/explorer/syspager.cpp | 253 ++++++++++++++++++++++++++++++++++++-- base/shell/explorer/syspager.h | 207 ------------------------------- base/shell/explorer/taskband.cpp | 20 ++- base/shell/explorer/taskswnd.cpp | 50 +++++--- base/shell/explorer/trayclock.cpp | 131 +++++++++++++++++++- base/shell/explorer/trayclock.h | 94 -------------- base/shell/explorer/trayntfy.cpp | 86 +++++++++---- base/shell/explorer/traywnd.cpp | 15 ++- 9 files changed, 490 insertions(+), 390 deletions(-) diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index 2473096233..5c9676be30 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -332,19 +332,18 @@ CreateStartMenuSite(IN OUT ITrayWindow *Tray, const IID & riid, PVOID * ppv); */ /* TrayClockWnd */ -#define TCWM_GETMINIMUMSIZE (WM_USER + 0x100) -#define TCWM_UPDATETIME (WM_USER + 0x101) +HRESULT CTrayClockWnd_CreateInstance(HWND hwndParent, REFIID riid, void **ppv); /* TrayNotifyWnd */ #define TNWM_GETMINIMUMSIZE (WM_USER + 0x100) -#define TNWM_SHOWTRAY (WM_USER + 0x103) #define TNWM_CHANGETRAYPOS (WM_USER + 0x104) #define NTNWM_REALIGN (0x1) -class CTrayNotifyWnd; +HRESULT CTrayNotifyWnd_CreateInstance(HWND hwndParent, REFIID riid, void **ppv); -HWND CreateTrayNotifyWnd(IN HWND hwndParent, CTrayNotifyWnd** ppinstance); +/* SysPagerWnd */ +HRESULT CSysPagerWnd_CreateInstance(HWND hwndParent, REFIID riid, void **ppv); /* * taskswnd.c @@ -353,8 +352,7 @@ HWND CreateTrayNotifyWnd(IN HWND hwndParent, CTrayNotifyWnd** ppinstance); #define TSWM_ENABLEGROUPING (WM_USER + 1) #define TSWM_UPDATETASKBARPOS (WM_USER + 2) -HWND -CreateTaskSwitchWnd(IN HWND hWndParent, IN OUT ITrayWindow *Tray); +HRESULT CTaskSwitchWnd_CreateInstance(IN HWND hWndParent, IN OUT ITrayWindow *Tray, REFIID riid, void **ppv); HRESULT Tray_OnStartMenuDismissed(ITrayWindow* Tray); @@ -362,16 +360,4 @@ Tray_OnStartMenuDismissed(ITrayWindow* Tray); HRESULT IsSameObject(IN IUnknown *punk1, IN IUnknown *punk2); -/* -* syspager.c -*/ - -#include "syspager.h" - -/* -* trayclock.c -*/ - -#include "trayclock.h" - #endif /* _EXPLORER_PRECOMP__H_ */ diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index c404d3a57f..45f17023b9 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -29,6 +29,236 @@ typedef struct _SYS_PAGER_COPY_DATA NOTIFYICONDATA nicon_data; } SYS_PAGER_COPY_DATA, *PSYS_PAGER_COPY_DATA; +struct InternalIconData : NOTIFYICONDATA +{ + // Must keep a separate copy since the original is unioned with uTimeout. + UINT uVersionCopy; +}; + +struct IconWatcherData +{ + HANDLE hProcess; + DWORD ProcessId; + NOTIFYICONDATA IconData; + + IconWatcherData(CONST NOTIFYICONDATA *iconData) : + hProcess(NULL), ProcessId(0) + { + IconData.cbSize = sizeof(NOTIFYICONDATA); + IconData.hWnd = iconData->hWnd; + IconData.uID = iconData->uID; + IconData.guidItem = iconData->guidItem; + } + + ~IconWatcherData() + { + if (hProcess) + { + CloseHandle(hProcess); + } + } +}; + +class CIconWatcher +{ + CAtlList<IconWatcherData *> m_WatcherList; + CRITICAL_SECTION m_ListLock; + HANDLE m_hWatcherThread; + HANDLE m_WakeUpEvent; + HWND m_hwndSysTray; + bool m_Loop; + +public: + CIconWatcher(); + + virtual ~CIconWatcher(); + + bool Initialize(_In_ HWND hWndParent); + void Uninitialize(); + + bool AddIconToWatcher(_In_ CONST NOTIFYICONDATA *iconData); + bool RemoveIconFromWatcher(_In_ CONST NOTIFYICONDATA *iconData); + + IconWatcherData* GetListEntry(_In_opt_ CONST NOTIFYICONDATA *iconData, _In_opt_ HANDLE hProcess, _In_ bool Remove); + +private: + + static UINT WINAPI WatcherThread(_In_opt_ LPVOID lpParam); +}; + +class CBalloonQueue +{ +public: + static const int TimerInterval = 2000; + static const int BalloonsTimerId = 1; + static const int MinTimeout = 10000; + static const int MaxTimeout = 30000; + static const int CooldownBetweenBalloons = 2000; + +private: + struct Info + { + InternalIconData * pSource; + WCHAR szInfo[256]; + WCHAR szInfoTitle[64]; + WPARAM uIcon; + UINT uTimeout; + + Info(InternalIconData * source) + { + pSource = source; + StrNCpy(szInfo, source->szInfo, _countof(szInfo)); + StrNCpy(szInfoTitle, source->szInfoTitle, _countof(szInfoTitle)); + uIcon = source->dwInfoFlags & NIIF_ICON_MASK; + if (source->dwInfoFlags == NIIF_USER) + uIcon = reinterpret_cast<WPARAM>(source->hIcon); + uTimeout = source->uTimeout; + } + }; + + HWND m_hwndParent; + + CTooltips * m_tooltips; + + CAtlList<Info> m_queue; + + CToolbar<InternalIconData> * m_toolbar; + + InternalIconData * m_current; + bool m_currentClosed; + + int m_timer; + +public: + CBalloonQueue(); + + void Init(HWND hwndParent, CToolbar<InternalIconData> * toolbar, CTooltips * balloons); + void Deinit(); + + bool OnTimer(int timerId); + void UpdateInfo(InternalIconData * notifyItem); + void RemoveInfo(InternalIconData * notifyItem); + void CloseCurrent(); + +private: + + int IndexOf(InternalIconData * pdata); + void SetTimer(int length); + void Show(Info& info); + void Close(IN OUT InternalIconData * notifyItem); +}; + +class CNotifyToolbar : + public CWindowImplBaseT< CToolbar<InternalIconData>, CControlWinTraits > +{ + HIMAGELIST m_ImageList; + int m_VisibleButtonCount; + + CBalloonQueue * m_BalloonQueue; + +public: + CNotifyToolbar(); + virtual ~CNotifyToolbar(); + + int GetVisibleButtonCount(); + int FindItem(IN HWND hWnd, IN UINT uID, InternalIconData ** pdata); + int FindExistingSharedIcon(HICON handle); + BOOL AddButton(IN CONST NOTIFYICONDATA *iconData); + BOOL SwitchVersion(IN CONST NOTIFYICONDATA *iconData); + BOOL UpdateButton(IN CONST NOTIFYICONDATA *iconData); + BOOL RemoveButton(IN CONST NOTIFYICONDATA *iconData); + VOID ResizeImagelist(); + +private: + VOID SendMouseEvent(IN WORD wIndex, IN UINT uMsg, IN WPARAM wParam); + LRESULT OnMouseEvent(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnTooltipShow(INT uCode, LPNMHDR hdr, BOOL& bHandled); + +public: + BEGIN_MSG_MAP(CNotifyToolbar) + MESSAGE_RANGE_HANDLER(WM_MOUSEFIRST, WM_MOUSELAST, OnMouseEvent) + NOTIFY_CODE_HANDLER(TTN_SHOW, OnTooltipShow) + END_MSG_MAP() + + void Initialize(HWND hWndParent, CBalloonQueue * queue); +}; + +extern const WCHAR szSysPagerWndClass[]; + +class CSysPagerWnd : + public CComCoClass<CSysPagerWnd>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public CWindowImpl < CSysPagerWnd, CWindow, CControlWinTraits >, + public IOleWindow, + public CIconWatcher +{ + CNotifyToolbar Toolbar; + CTooltips m_Balloons; + CBalloonQueue m_BalloonQueue; + +public: + CSysPagerWnd(); + virtual ~CSysPagerWnd(); + + LRESULT DrawBackground(HDC hdc); + LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnGetInfoTip(INT uCode, LPNMHDR hdr, BOOL& bHandled); + LRESULT OnCustomDraw(INT uCode, LPNMHDR hdr, BOOL& bHandled); + LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnCtxMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnBalloonPop(UINT uCode, LPNMHDR hdr, BOOL& bHandled); + LRESULT OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnCopyData(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnSettingChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnGetMinimumSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + +public: + + HRESULT WINAPI GetWindow(HWND* phwnd) + { + if (!phwnd) + return E_INVALIDARG; + *phwnd = m_hWnd; + return S_OK; + } + + HRESULT WINAPI ContextSensitiveHelp(BOOL fEnterMode) + { + return E_NOTIMPL; + } + + DECLARE_NOT_AGGREGATABLE(CSysPagerWnd) + + DECLARE_PROTECT_FINAL_CONSTRUCT() + BEGIN_COM_MAP(CSysPagerWnd) + COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) + END_COM_MAP() + + BOOL NotifyIcon(DWORD notify_code, _In_ CONST NOTIFYICONDATA *iconData); + void GetSize(IN BOOL IsHorizontal, IN PSIZE size); + + DECLARE_WND_CLASS_EX(szSysPagerWndClass, CS_DBLCLKS, COLOR_3DFACE) + + BEGIN_MSG_MAP(CSysPagerWnd) + MESSAGE_HANDLER(WM_CREATE, OnCreate) + MESSAGE_HANDLER(WM_DESTROY, OnDestroy) + MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) + MESSAGE_HANDLER(WM_SIZE, OnSize) + MESSAGE_HANDLER(WM_CONTEXTMENU, OnCtxMenu) + MESSAGE_HANDLER(WM_TIMER, OnTimer) + MESSAGE_HANDLER(WM_COPYDATA, OnCopyData) + MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChanged) + MESSAGE_HANDLER(TNWM_GETMINIMUMSIZE, OnGetMinimumSize) + NOTIFY_CODE_HANDLER(TTN_POP, OnBalloonPop) + NOTIFY_CODE_HANDLER(TBN_GETINFOTIPW, OnGetInfoTip) + NOTIFY_CODE_HANDLER(NM_CUSTOMDRAW, OnCustomDraw) + END_MSG_MAP() + + HRESULT Initialize(IN HWND hWndParent); +}; + CIconWatcher::CIconWatcher() : m_hWatcherThread(NULL), m_WakeUpEvent(NULL), @@ -1204,22 +1434,27 @@ LRESULT CSysPagerWnd::OnSettingChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, return 0; } -HWND CSysPagerWnd::_Init(IN HWND hWndParent) +LRESULT CSysPagerWnd::OnGetMinimumSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - DWORD dwStyle; + GetSize((BOOL)wParam, (PSIZE)lParam); + return 0; +} +HRESULT CSysPagerWnd::Initialize(IN HWND hWndParent) +{ /* Create the window. The tray window is going to move it to the correct position and resize it as needed. */ - dwStyle = WS_CHILD | WS_CLIPSIBLINGS | WS_VISIBLE; - + DWORD dwStyle = WS_CHILD | WS_CLIPSIBLINGS | WS_VISIBLE; Create(hWndParent, 0, NULL, dwStyle); - if (!m_hWnd) - { - return NULL; - } + return E_FAIL; SetWindowTheme(m_hWnd, L"TrayNotify", NULL); - return m_hWnd; + return S_OK; +} + +HRESULT CSysPagerWnd_CreateInstance(HWND hwndParent, REFIID riid, void **ppv) +{ + return ShellObjectCreatorInit<CSysPagerWnd>(hwndParent, riid, ppv); } diff --git a/base/shell/explorer/syspager.h b/base/shell/explorer/syspager.h deleted file mode 100644 index 1df0798ebd..0000000000 --- a/base/shell/explorer/syspager.h +++ /dev/null @@ -1,207 +0,0 @@ -#pragma once - -struct InternalIconData : NOTIFYICONDATA -{ - // Must keep a separate copy since the original is unioned with uTimeout. - UINT uVersionCopy; -}; - -struct IconWatcherData -{ - HANDLE hProcess; - DWORD ProcessId; - NOTIFYICONDATA IconData; - - IconWatcherData(CONST NOTIFYICONDATA *iconData) : - hProcess(NULL), ProcessId(0) - { - IconData.cbSize = sizeof(NOTIFYICONDATA); - IconData.hWnd = iconData->hWnd; - IconData.uID = iconData->uID; - IconData.guidItem = iconData->guidItem; - } - - ~IconWatcherData() - { - if (hProcess) - { - CloseHandle(hProcess); - } - } -}; - -class CIconWatcher -{ - CAtlList<IconWatcherData *> m_WatcherList; - CRITICAL_SECTION m_ListLock; - HANDLE m_hWatcherThread; - HANDLE m_WakeUpEvent; - HWND m_hwndSysTray; - bool m_Loop; - -public: - CIconWatcher(); - - virtual ~CIconWatcher(); - - bool Initialize(_In_ HWND hWndParent); - void Uninitialize(); - - bool AddIconToWatcher(_In_ CONST NOTIFYICONDATA *iconData); - bool RemoveIconFromWatcher(_In_ CONST NOTIFYICONDATA *iconData); - - IconWatcherData* GetListEntry(_In_opt_ CONST NOTIFYICONDATA *iconData, _In_opt_ HANDLE hProcess, _In_ bool Remove); - -private: - - static UINT WINAPI WatcherThread(_In_opt_ LPVOID lpParam); -}; - -class CBalloonQueue -{ -public: - static const int TimerInterval = 2000; - static const int BalloonsTimerId = 1; - static const int MinTimeout = 10000; - static const int MaxTimeout = 30000; - static const int CooldownBetweenBalloons = 2000; - -private: - struct Info - { - InternalIconData * pSource; - WCHAR szInfo[256]; - WCHAR szInfoTitle[64]; - WPARAM uIcon; - UINT uTimeout; - - Info(InternalIconData * source) - { - pSource = source; - StrNCpy(szInfo, source->szInfo, _countof(szInfo)); - StrNCpy(szInfoTitle, source->szInfoTitle, _countof(szInfoTitle)); - uIcon = source->dwInfoFlags & NIIF_ICON_MASK; - if (source->dwInfoFlags == NIIF_USER) - uIcon = reinterpret_cast<WPARAM>(source->hIcon); - uTimeout = source->uTimeout; - } - }; - - HWND m_hwndParent; - - CTooltips * m_tooltips; - - CAtlList<Info> m_queue; - - CToolbar<InternalIconData> * m_toolbar; - - InternalIconData * m_current; - bool m_currentClosed; - - int m_timer; - -public: - CBalloonQueue(); - - void Init(HWND hwndParent, CToolbar<InternalIconData> * toolbar, CTooltips * balloons); - void Deinit(); - - bool OnTimer(int timerId); - void UpdateInfo(InternalIconData * notifyItem); - void RemoveInfo(InternalIconData * notifyItem); - void CloseCurrent(); - -private: - - int IndexOf(InternalIconData * pdata); - void SetTimer(int length); - void Show(Info& info); - void Close(IN OUT InternalIconData * notifyItem); -}; - -class CNotifyToolbar : - public CWindowImplBaseT< CToolbar<InternalIconData>, CControlWinTraits > -{ - HIMAGELIST m_ImageList; - int m_VisibleButtonCount; - - CBalloonQueue * m_BalloonQueue; - -public: - CNotifyToolbar(); - virtual ~CNotifyToolbar(); - - int GetVisibleButtonCount(); - int FindItem(IN HWND hWnd, IN UINT uID, InternalIconData ** pdata); - int FindExistingSharedIcon(HICON handle); - BOOL AddButton(IN CONST NOTIFYICONDATA *iconData); - BOOL SwitchVersion(IN CONST NOTIFYICONDATA *iconData); - BOOL UpdateButton(IN CONST NOTIFYICONDATA *iconData); - BOOL RemoveButton(IN CONST NOTIFYICONDATA *iconData); - VOID ResizeImagelist(); - -private: - VOID SendMouseEvent(IN WORD wIndex, IN UINT uMsg, IN WPARAM wParam); - LRESULT OnMouseEvent(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnTooltipShow(INT uCode, LPNMHDR hdr, BOOL& bHandled); - -public: - BEGIN_MSG_MAP(CNotifyToolbar) - MESSAGE_RANGE_HANDLER(WM_MOUSEFIRST, WM_MOUSELAST, OnMouseEvent) - NOTIFY_CODE_HANDLER(TTN_SHOW, OnTooltipShow) - END_MSG_MAP() - - void Initialize(HWND hWndParent, CBalloonQueue * queue); -}; - -extern const WCHAR szSysPagerWndClass[]; - -class CSysPagerWnd : - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public CWindowImpl < CSysPagerWnd, CWindow, CControlWinTraits >, - public CIconWatcher -{ - CNotifyToolbar Toolbar; - CTooltips m_Balloons; - CBalloonQueue m_BalloonQueue; - -public: - CSysPagerWnd(); - virtual ~CSysPagerWnd(); - - LRESULT DrawBackground(HDC hdc); - LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnGetInfoTip(INT uCode, LPNMHDR hdr, BOOL& bHandled); - LRESULT OnCustomDraw(INT uCode, LPNMHDR hdr, BOOL& bHandled); - LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnCtxMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnBalloonPop(UINT uCode, LPNMHDR hdr, BOOL& bHandled); - LRESULT OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnCopyData(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnSettingChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - -public: - - BOOL NotifyIcon(DWORD notify_code, _In_ CONST NOTIFYICONDATA *iconData); - void GetSize(IN BOOL IsHorizontal, IN PSIZE size); - - DECLARE_WND_CLASS_EX(szSysPagerWndClass, CS_DBLCLKS, COLOR_3DFACE) - - BEGIN_MSG_MAP(CSysPagerWnd) - MESSAGE_HANDLER(WM_CREATE, OnCreate) - MESSAGE_HANDLER(WM_DESTROY, OnDestroy) - MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) - MESSAGE_HANDLER(WM_SIZE, OnSize) - MESSAGE_HANDLER(WM_CONTEXTMENU, OnCtxMenu) - MESSAGE_HANDLER(WM_TIMER, OnTimer) - MESSAGE_HANDLER(WM_COPYDATA, OnCopyData) - MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChanged) - NOTIFY_CODE_HANDLER(TTN_POP, OnBalloonPop) - NOTIFY_CODE_HANDLER(TBN_GETINFOTIPW, OnGetInfoTip) - NOTIFY_CODE_HANDLER(NM_CUSTOMDRAW, OnCustomDraw) - END_MSG_MAP() - - HWND _Init(IN HWND hWndParent); -}; diff --git a/base/shell/explorer/taskband.cpp b/base/shell/explorer/taskband.cpp index 6dd4d9e80d..d1c6ecd73c 100644 --- a/base/shell/explorer/taskband.cpp +++ b/base/shell/explorer/taskband.cpp @@ -38,6 +38,7 @@ class CTaskBand : { CComPtr<ITrayWindow> m_Tray; CComPtr<IUnknown> m_Site; + CComPtr<IUnknown> m_TasksWnd; HWND m_hWnd; @@ -250,23 +251,20 @@ public: TRACE("CTaskBand::SetSite(0x%p)\n", pUnkSite); hRet = IUnknown_GetWindow(pUnkSite, &hwndSite); - if (FAILED(hRet)) - { - TRACE("Querying site window failed: 0x%x\n", hRet); + if (FAILED_UNEXPECTEDLY(hRet)) return hRet; - } TRACE("CreateTaskSwitchWnd(Parent: 0x%p)\n", hwndSite); - HWND hwndTaskSwitch = CreateTaskSwitchWnd(hwndSite, m_Tray); - if (!hwndTaskSwitch) - { - ERR("CreateTaskSwitchWnd failed"); - return E_FAIL; - } + hRet = CTaskSwitchWnd_CreateInstance(hwndSite, m_Tray, IID_PPV_ARG(IUnknown, &m_TasksWnd)); + if (FAILED_UNEXPECTEDLY(hRet)) + return hRet; + + hRet = IUnknown_GetWindow(m_TasksWnd, &m_hWnd); + if (FAILED_UNEXPECTEDLY(hRet)) + return hRet; m_Site = pUnkSite; - m_hWnd = hwndTaskSwitch; return S_OK; } diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index 44d0e3e215..18fa2c1e69 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -193,7 +193,10 @@ public: }; class CTaskSwitchWnd : - public CWindowImpl < CTaskSwitchWnd, CWindow, CControlWinTraits > + public CComCoClass<CTaskSwitchWnd>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public CWindowImpl < CTaskSwitchWnd, CWindow, CControlWinTraits >, + public IOleWindow { CTaskToolbar m_TaskBar; @@ -1827,6 +1830,29 @@ public: return 0; } + HRESULT Initialize(IN HWND hWndParent, IN OUT ITrayWindow *tray) + { + m_Tray = tray; + m_IsGroupingEnabled = TRUE; /* FIXME */ + Create(hWndParent, 0, szRunningApps, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP); + if (!m_hWnd) + return E_FAIL; + return S_OK; + } + + HRESULT WINAPI GetWindow(HWND* phwnd) + { + if (!phwnd) + return E_INVALIDARG; + *phwnd = m_hWnd; + return S_OK; + } + + HRESULT WINAPI ContextSensitiveHelp(BOOL fEnterMode) + { + return E_NOTIMPL; + } + DECLARE_WND_CLASS_EX(szTaskSwitchWndClass, CS_DBLCLKS, COLOR_3DFACE) BEGIN_MSG_MAP(CTaskSwitchWnd) @@ -1850,21 +1876,15 @@ public: MESSAGE_HANDLER(WM_KLUDGEMINRECT, OnKludgeItemRect) END_MSG_MAP() - HWND _Init(IN HWND hWndParent, IN OUT ITrayWindow *tray) - { - m_Tray = tray; - m_IsGroupingEnabled = TRUE; /* FIXME */ - return Create(hWndParent, 0, szRunningApps, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP); - } + DECLARE_NOT_AGGREGATABLE(CTaskSwitchWnd) + + DECLARE_PROTECT_FINAL_CONSTRUCT() + BEGIN_COM_MAP(CTaskSwitchWnd) + COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) + END_COM_MAP() }; -HWND -CreateTaskSwitchWnd(IN HWND hWndParent, IN OUT ITrayWindow *Tray) +HRESULT CTaskSwitchWnd_CreateInstance(IN HWND hWndParent, IN OUT ITrayWindow *Tray, REFIID riid, void **ppv) { - CTaskSwitchWnd * instance; - - // TODO: Destroy after the window is destroyed - instance = new CTaskSwitchWnd(); - - return instance->_Init(hWndParent, Tray); + return ShellObjectCreatorInit<CTaskSwitchWnd>(hWndParent, Tray, riid, ppv); } diff --git a/base/shell/explorer/trayclock.cpp b/base/shell/explorer/trayclock.cpp index 1042214731..b2efa36689 100644 --- a/base/shell/explorer/trayclock.cpp +++ b/base/shell/explorer/trayclock.cpp @@ -25,6 +25,123 @@ * TrayClockWnd */ +const struct +{ + BOOL IsTime; + DWORD dwFormatFlags; + LPCWSTR lpFormat; +} ClockWndFormats[] = { + { TRUE, 0, NULL }, + { FALSE, 0, L"dddd" }, + { FALSE, DATE_SHORTDATE, NULL } +}; +const UINT ClockWndFormatsCount = _ARRAYSIZE(ClockWndFormats); + +#define CLOCKWND_FORMAT_COUNT ClockWndFormatsCount + +extern const WCHAR szTrayClockWndClass[]; + +class CTrayClockWnd : + public CComCoClass<CTrayClockWnd>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public CWindowImpl < CTrayClockWnd, CWindow, CControlWinTraits >, + public IOleWindow +{ + HWND hWndNotify; + HFONT hFont; + COLORREF textColor; + RECT rcText; + SYSTEMTIME LocalTime; + + union + { + DWORD dwFlags; + struct + { + DWORD IsTimerEnabled : 1; + DWORD IsInitTimerEnabled : 1; + DWORD LinesMeasured : 1; + DWORD IsHorizontal : 1; + }; + }; + DWORD LineSpacing; + SIZE CurrentSize; + WORD VisibleLines; + SIZE LineSizes[CLOCKWND_FORMAT_COUNT]; + WCHAR szLines[CLOCKWND_FORMAT_COUNT][48]; + +public: + CTrayClockWnd(); + virtual ~CTrayClockWnd(); + +private: + LRESULT OnThemeChanged(); + LRESULT OnThemeChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + + BOOL MeasureLines(); + WORD GetMinimumSize(IN BOOL Horizontal, IN OUT PSIZE pSize); + VOID UpdateWnd(); + VOID Update(); + UINT CalculateDueTime(); + BOOL ResetTime(); + VOID CalibrateTimer(); + LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + VOID SetFont(IN HFONT hNewFont, IN BOOL bRedraw); + LRESULT DrawBackground(HDC hdc); + LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnGetMinimumSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnSetFont(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnTaskbarSettingsChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnNcLButtonDblClick(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + +public: + + HRESULT WINAPI GetWindow(HWND* phwnd) + { + if (!phwnd) + return E_INVALIDARG; + *phwnd = m_hWnd; + return S_OK; + } + + HRESULT WINAPI ContextSensitiveHelp(BOOL fEnterMode) + { + return E_NOTIMPL; + } + + DECLARE_NOT_AGGREGATABLE(CTrayClockWnd) + + DECLARE_PROTECT_FINAL_CONSTRUCT() + BEGIN_COM_MAP(CTrayClockWnd) + COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) + END_COM_MAP() + + DECLARE_WND_CLASS_EX(szTrayClockWndClass, CS_DBLCLKS, COLOR_3DFACE) + + BEGIN_MSG_MAP(CTrayClockWnd) + MESSAGE_HANDLER(WM_CREATE, OnCreate) + MESSAGE_HANDLER(WM_DESTROY, OnDestroy) + MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) + MESSAGE_HANDLER(WM_SIZE, OnSize) + MESSAGE_HANDLER(WM_PAINT, OnPaint) + MESSAGE_HANDLER(WM_PRINTCLIENT, OnPaint) + MESSAGE_HANDLER(WM_THEMECHANGED, OnThemeChanged) + MESSAGE_HANDLER(WM_TIMER, OnTimer) + MESSAGE_HANDLER(WM_NCHITTEST, OnNcHitTest) + MESSAGE_HANDLER(WM_SETFONT, OnSetFont) + MESSAGE_HANDLER(TNWM_GETMINIMUMSIZE, OnGetMinimumSize) + MESSAGE_HANDLER(TWM_SETTINGSCHANGED, OnTaskbarSettingsChanged) + MESSAGE_HANDLER(WM_NCLBUTTONDBLCLK, OnNcLButtonDblClick) + END_MSG_MAP() + + HRESULT Initialize(IN HWND hWndParent); +}; + const WCHAR szTrayClockWndClass[] = L"TrayClockWClass"; #define ID_TRAYCLOCK_TIMER 0 @@ -578,7 +695,7 @@ LRESULT CTrayClockWnd::OnNcLButtonDblClick(UINT uMsg, WPARAM wParam, LPARAM lPar return TRUE; } -HWND CTrayClockWnd::_Init(IN HWND hWndParent) +HRESULT CTrayClockWnd::Initialize(IN HWND hWndParent) { IsHorizontal = TRUE; @@ -589,10 +706,16 @@ HWND CTrayClockWnd::_Init(IN HWND hWndParent) dwStyle |= WS_VISIBLE; Create(hWndParent, 0, NULL, dwStyle); + if (!m_hWnd) + return E_FAIL; - if (m_hWnd != NULL) - SetWindowTheme(m_hWnd, L"TrayNotify", NULL); + SetWindowTheme(m_hWnd, L"TrayNotify", NULL); - return m_hWnd; + return S_OK; }; + +HRESULT CTrayClockWnd_CreateInstance(HWND hwndParent, REFIID riid, void **ppv) +{ + return ShellObjectCreatorInit<CTrayClockWnd>(hwndParent, riid, ppv); +} diff --git a/base/shell/explorer/trayclock.h b/base/shell/explorer/trayclock.h deleted file mode 100644 index 4c152098cd..0000000000 --- a/base/shell/explorer/trayclock.h +++ /dev/null @@ -1,94 +0,0 @@ -#pragma once - -const struct -{ - BOOL IsTime; - DWORD dwFormatFlags; - LPCWSTR lpFormat; -} ClockWndFormats[] = { - { TRUE, 0, NULL }, - { FALSE, 0, L"dddd" }, - { FALSE, DATE_SHORTDATE, NULL } -}; -const UINT ClockWndFormatsCount = _ARRAYSIZE(ClockWndFormats); - -#define CLOCKWND_FORMAT_COUNT ClockWndFormatsCount - -extern const WCHAR szTrayClockWndClass[]; -class CTrayClockWnd : - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public CWindowImpl < CTrayClockWnd, CWindow, CControlWinTraits > -{ - HWND hWndNotify; - HFONT hFont; - COLORREF textColor; - RECT rcText; - SYSTEMTIME LocalTime; - - union - { - DWORD dwFlags; - struct - { - DWORD IsTimerEnabled : 1; - DWORD IsInitTimerEnabled : 1; - DWORD LinesMeasured : 1; - DWORD IsHorizontal : 1; - }; - }; - DWORD LineSpacing; - SIZE CurrentSize; - WORD VisibleLines; - SIZE LineSizes[CLOCKWND_FORMAT_COUNT]; - WCHAR szLines[CLOCKWND_FORMAT_COUNT][48]; - -public: - CTrayClockWnd(); - virtual ~CTrayClockWnd(); - -private: - LRESULT OnThemeChanged(); - LRESULT OnThemeChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - - BOOL MeasureLines(); - WORD GetMinimumSize(IN BOOL Horizontal, IN OUT PSIZE pSize); - VOID UpdateWnd(); - VOID Update(); - UINT CalculateDueTime(); - BOOL ResetTime(); - VOID CalibrateTimer(); - LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - VOID SetFont(IN HFONT hNewFont, IN BOOL bRedraw); - LRESULT DrawBackground(HDC hdc); - LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnGetMinimumSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnSetFont(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnTaskbarSettingsChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnNcLButtonDblClick(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - -public: - DECLARE_WND_CLASS_EX(szTrayClockWndClass, CS_DBLCLKS, COLOR_3DFACE) - - BEGIN_MSG_MAP(CTrayClockWnd) - MESSAGE_HANDLER(WM_CREATE, OnCreate) - MESSAGE_HANDLER(WM_DESTROY, OnDestroy) - MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) - MESSAGE_HANDLER(WM_SIZE, OnSize) - MESSAGE_HANDLER(WM_PAINT, OnPaint) - MESSAGE_HANDLER(WM_PRINTCLIENT, OnPaint) - MESSAGE_HANDLER(WM_THEMECHANGED, OnThemeChanged) - MESSAGE_HANDLER(WM_TIMER, OnTimer) - MESSAGE_HANDLER(WM_NCHITTEST, OnNcHitTest) - MESSAGE_HANDLER(WM_SETFONT, OnSetFont) - MESSAGE_HANDLER(TCWM_GETMINIMUMSIZE, OnGetMinimumSize) - MESSAGE_HANDLER(TWM_SETTINGSCHANGED, OnTaskbarSettingsChanged) - MESSAGE_HANDLER(WM_NCLBUTTONDBLCLK, OnNcLButtonDblClick) - END_MSG_MAP() - - HWND _Init(IN HWND hWndParent); -}; \ No newline at end of file diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index 4004184a94..a5ce527b42 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -31,11 +31,16 @@ static const WCHAR szTrayNotifyWndClass [] = TEXT("TrayNotifyWnd"); #define TRAY_NOTIFY_WND_SPACING_Y 1 class CTrayNotifyWnd : + public CComCoClass<CTrayNotifyWnd>, public CComObjectRootEx<CComMultiThreadModelNoCS>, - public CWindowImpl < CTrayNotifyWnd, CWindow, CControlWinTraits > + public CWindowImpl < CTrayNotifyWnd, CWindow, CControlWinTraits >, + public IOleWindow { - CSysPagerWnd * m_pager; - CTrayClockWnd * m_clock; + CComPtr<IUnknown> m_clock; + CComPtr<IUnknown> m_pager; + + HWND m_hwndClock; + HWND m_hwndPager; HTHEME TrayTheme; SIZE szTrayClockMin; @@ -45,8 +50,8 @@ class CTrayNotifyWnd : public: CTrayNotifyWnd() : - m_pager(NULL), - m_clock(NULL), + m_hwndClock(NULL), + m_hwndPager(NULL), TrayTheme(NULL), IsHorizontal(FALSE) { @@ -98,11 +103,23 @@ public: LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - m_clock = new CTrayClockWnd(); - m_clock->_Init(m_hWnd); + HRESULT hr; + + hr = CTrayClockWnd_CreateInstance(m_hWnd, IID_PPV_ARG(IUnknown, &m_clock)); + if (FAILED_UNEXPECTEDLY(hr)) + return FALSE; + + hr = IUnknown_GetWindow(m_clock, &m_hwndClock); + if (FAILED_UNEXPECTEDLY(hr)) + return FALSE; + + hr = CSysPagerWnd_CreateInstance(m_hWnd, IID_PPV_ARG(IUnknown, &m_pager)); + if (FAILED_UNEXPECTEDLY(hr)) + return FALSE; - m_pager = new CSysPagerWnd(); - m_pager->_Init(m_hWnd); + hr = IUnknown_GetWindow(m_pager, &m_hwndPager); + if (FAILED_UNEXPECTEDLY(hr)) + return FALSE; return TRUE; } @@ -127,7 +144,7 @@ public: goto NoClock; } - m_clock->SendMessage(TCWM_GETMINIMUMSIZE, (WPARAM) IsHorizontal, (LPARAM) &szClock); + ::SendMessage(m_hwndClock, TNWM_GETMINIMUMSIZE, (WPARAM) IsHorizontal, (LPARAM) &szClock); szTrayClockMin = szClock; } @@ -144,7 +161,7 @@ public: szTray.cx = pSize->cx - 2 * TRAY_NOTIFY_WND_SPACING_X; } - m_pager->GetSize(IsHorizontal, &szTray); + ::SendMessage(m_hwndPager, TNWM_GETMINIMUMSIZE, (WPARAM) IsHorizontal, (LPARAM) &szTray); szTrayNotify = szTray; @@ -195,7 +212,7 @@ public: szClock.cy = szTrayClockMin.cy; } - m_clock->SetWindowPos( + ::SetWindowPos(m_hwndClock, NULL, ptClock.x, ptClock.y, @@ -216,7 +233,7 @@ public: ptPager.y = ContentMargin.cyTopHeight; } - m_pager->SetWindowPos( + ::SetWindowPos(m_hwndPager, NULL, ptPager.x, ptPager.y, @@ -287,16 +304,12 @@ public: LRESULT OnClockMessage(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (m_clock != NULL) - return m_clock->SendMessageW(uMsg, wParam, lParam); - return TRUE; + return SendMessageW(m_hwndClock, uMsg, wParam, lParam); } LRESULT OnPagerMessage(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (m_pager) - return m_pager->SendMessage(uMsg, wParam, lParam); - return TRUE; + return SendMessageW(m_hwndPager, uMsg, wParam, lParam); } LRESULT OnRealign(INT uCode, LPNMHDR hdr, BOOL& bHandled) @@ -305,6 +318,26 @@ public: return GetParent().SendMessage(WM_NOTIFY, 0, (LPARAM)hdr); } + HRESULT WINAPI GetWindow(HWND* phwnd) + { + if (!phwnd) + return E_INVALIDARG; + *phwnd = m_hWnd; + return S_OK; + } + + HRESULT WINAPI ContextSensitiveHelp(BOOL fEnterMode) + { + return E_NOTIMPL; + } + + DECLARE_NOT_AGGREGATABLE(CTrayNotifyWnd) + + DECLARE_PROTECT_FINAL_CONSTRUCT() + BEGIN_COM_MAP(CTrayNotifyWnd) + COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) + END_COM_MAP() + DECLARE_WND_CLASS_EX(szTrayNotifyWndClass, CS_DBLCLKS, COLOR_3DFACE) BEGIN_MSG_MAP(CTrayNotifyWnd) @@ -323,18 +356,17 @@ public: MESSAGE_HANDLER(TNWM_GETMINIMUMSIZE, OnGetMinimumSize) END_MSG_MAP() - HWND _Init(IN HWND hwndParent) + HRESULT Initialize(IN HWND hwndParent) { DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; - return Create(hwndParent, 0, NULL, dwStyle, WS_EX_STATICEDGE); + Create(hwndParent, 0, NULL, dwStyle, WS_EX_STATICEDGE); + if (!m_hWnd) + return E_FAIL; + return S_OK; } }; -HWND CreateTrayNotifyWnd(IN HWND hwndParent, CTrayNotifyWnd** ppinstance) +HRESULT CTrayNotifyWnd_CreateInstance(HWND hwndParent, REFIID riid, void **ppv) { - CTrayNotifyWnd * pTrayNotify = new CTrayNotifyWnd(); - // TODO: Destroy after the window is destroyed - *ppinstance = pTrayNotify; - - return pTrayNotify->_Init(hwndParent); + return ShellObjectCreatorInit<CTrayNotifyWnd>(hwndParent, riid, ppv); } diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index ac449131b5..e0b5aba452 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -209,7 +209,7 @@ class CTrayWindow : HWND m_TaskSwitch; HWND m_TrayNotify; - CTrayNotifyWnd* m_TrayNotifyInstance; + CComPtr<IUnknown> m_TrayNotifyInstance; DWORD m_Position; HMONITOR m_Monitor; @@ -2048,6 +2048,11 @@ ChangePos: if (FAILED_UNEXPECTEDLY(hRet)) return FALSE; + /* Create the tray notification window */ + hRet = CTrayNotifyWnd_CreateInstance(m_hWnd, IID_PPV_ARG(IUnknown, &m_TrayNotifyInstance)); + if (FAILED_UNEXPECTEDLY(hRet)) + return FALSE; + /* Get the hwnd of the rebar */ hRet = IUnknown_GetWindow(m_TrayBandSite, &m_Rebar); if (FAILED_UNEXPECTEDLY(hRet)) @@ -2058,10 +2063,12 @@ ChangePos: if (FAILED_UNEXPECTEDLY(hRet)) return FALSE; - SetWindowTheme(m_Rebar, L"TaskBar", NULL); + /* Get the hwnd of the tray notification window */ + hRet = IUnknown_GetWindow(m_TrayNotifyInstance, &m_TrayNotify); + if (FAILED_UNEXPECTEDLY(hRet)) + return FALSE; - /* Create the tray notification window */ - m_TrayNotify = CreateTrayNotifyWnd(m_hWnd, &m_TrayNotifyInstance); + SetWindowTheme(m_Rebar, L"TaskBar", NULL); UpdateFonts();

6 years, 11 months

← Newer
1
2
3
4
5
6
7
...
38
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 2018