Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [EXPLORER] CTrayWindow: Draw the sizer only when the taskbar is not locked.
by Giannis Adamopoulos 28 Jan '18

28 Jan '18

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

1 0

01/01: [EXPLORER] CTrayNotifyWnd: Fix resizing when the clock is hidden
by Giannis Adamopoulos 28 Jan '18

28 Jan '18

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)

1 0

01/01: [EXPLORER] CTrayNotifyWnd: Only update the requested dimension when handling TNWM_GETMINIMUMSIZE.
by Giannis Adamopoulos 28 Jan '18

28 Jan '18

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

1 0

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 28 Jan '18

28 Jan '18

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)

1 0

01/01: [EXPLORER] CTrayClockWnd: Implement showing and hiding seconds or the whole clock from the properties window.
by Giannis Adamopoulos 28 Jan '18

28 Jan '18

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

1 0

01/01: [EXPLORER] -Make CSysPagerWnd, CTaskSwitchWnd, CTrayClockWnd and CTrayNotifyWnd proper com objects so that their lifetime is managed properly.
by Giannis Adamopoulos 28 Jan '18

28 Jan '18

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

1 0

01/01: [ROSLOAD]: Fix NX enabling
by Alex Ionescu 28 Jan '18

28 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=478348ead113ae5d5b5ea… commit 478348ead113ae5d5b5eaf579b540f65339bebbd Author: Alex Ionescu <aionescu(a)gmail.com> AuthorDate: Sun Jan 28 16:29:43 2018 +0100 Commit: Alex Ionescu <aionescu(a)gmail.com> CommitDate: Sun Jan 28 16:29:43 2018 +0100 [ROSLOAD]: Fix NX enabling [ROSLOAD]: The IA32_MISC_ENABLE MSR bit actually _disables_ NX, so diabling the bit _enables_ NX. [ROSLOAD]: The MSR_XD_ENABLE_MASK is for the _high_ DWORD of the MSR (bit 34), not the low. [ROSLOAD]: Fix printf. [ENVIRON/ROSLOAD]: Switch to CPU_INFO structure instead of blindly using INT[4]. Revealed a bug in the PAE detection which was reading out of bounds. --- boot/environ/app/rosload/rosload.c | 39 ++++++++++++++++++++------------------ boot/environ/include/bl.h | 2 +- boot/environ/lib/misc/util.c | 30 ++++++++++++++--------------- boot/environ/lib/mm/i386/mmx86.c | 6 +++--- 4 files changed, 40 insertions(+), 37 deletions(-) diff --git a/boot/environ/app/rosload/rosload.c b/boot/environ/app/rosload/rosload.c index 9120631a1f..3c51963251 100644 --- a/boot/environ/app/rosload/rosload.c +++ b/boot/environ/app/rosload/rosload.c @@ -9783,24 +9783,26 @@ OslpMain ( _Out_ PULONG ReturnFlags ) { - INT CpuInfo[4]; - BOOLEAN NxDisabled; + CPU_INFO CpuInfo; + BOOLEAN NxEnabled; NTSTATUS Status; BOOLEAN ExecuteJump; + LARGE_INTEGER miscMsr; /* Check if the CPU supports NX */ - BlArchCpuId(0x80000001, 0, CpuInfo); - if (!(CpuInfo[3] & 0x10000)) + BlArchCpuId(0x80000001, 0, &CpuInfo); + if (!(CpuInfo.Edx & 0x10000)) { /* It doesn't, check if this is Intel */ - EfiPrintf(L"NX disabled: %d\r\n"); + EfiPrintf(L"NX disabled: %lx\r\n", CpuInfo.Edx); if (BlArchGetCpuVendor() == CPU_INTEL) { - /* Then turn off the MSR feature for it */ - EfiPrintf(L"NX being turned off\r\n"); - __writemsr(MSR_IA32_MISC_ENABLE, - __readmsr(MSR_IA32_MISC_ENABLE) & MSR_XD_ENABLE_MASK); - NxDisabled = TRUE; + /* Then turn off the MSR disable feature for it, enabling NX */ + EfiPrintf(L"NX being turned on\r\n"); + miscMsr.QuadPart = __readmsr(MSR_IA32_MISC_ENABLE); + miscMsr.HighPart &= MSR_XD_ENABLE_MASK; + __writemsr(MSR_IA32_MISC_ENABLE, miscMsr.QuadPart); + NxEnabled = TRUE; } } @@ -9818,12 +9820,13 @@ OslpMain ( /* Retore NX support */ __writemsr(MSR_EFER, __readmsr(MSR_EFER) ^ MSR_NXE); - /* Did we disable NX? */ - if (NxDisabled) + /* Did we manually enable NX? */ + if (NxEnabled) { - /* Turn it back on */ - __writemsr(MSR_IA32_MISC_ENABLE, - __readmsr(MSR_IA32_MISC_ENABLE) | ~MSR_XD_ENABLE_MASK); + /* Turn it back off */ + miscMsr.QuadPart = __readmsr(MSR_IA32_MISC_ENABLE); + miscMsr.HighPart |= ~MSR_XD_ENABLE_MASK; + __writemsr(MSR_IA32_MISC_ENABLE, miscMsr.QuadPart); } /* Go back */ @@ -9853,7 +9856,7 @@ OslMain ( NTSTATUS Status; PBL_RETURN_ARGUMENTS ReturnArguments; PBL_APPLICATION_ENTRY AppEntry; - INT CpuInfo[4]; + CPU_INFO CpuInfo; ULONG Flags; #ifdef DRAW_LOGO EFI_GRAPHICS_OUTPUT_BLT_PIXEL* gopBlt; @@ -9887,10 +9890,10 @@ OslMain ( if (BlArchIsCpuIdFunctionSupported(1)) { /* Query CPU features */ - BlArchCpuId(1, 0, CpuInfo); + BlArchCpuId(1, 0, &CpuInfo); /* Check if PAE is supported */ - if (CpuInfo[4] & 0x40) + if (CpuInfo.Edx & 0x40) { EfiPrintf(L"PAE Supported, but won't be used\r\n"); } diff --git a/boot/environ/include/bl.h b/boot/environ/include/bl.h index 7fa6c9667e..023e676d75 100644 --- a/boot/environ/include/bl.h +++ b/boot/environ/include/bl.h @@ -1666,7 +1666,7 @@ VOID BlArchCpuId ( _In_ ULONG Function, _In_ ULONG SubFunction, - _Out_ INT* Result + _Out_ PCPU_INFO Result ); CPU_VENDORS diff --git a/boot/environ/lib/misc/util.c b/boot/environ/lib/misc/util.c index d6e5459882..18f21cc2e9 100644 --- a/boot/environ/lib/misc/util.c +++ b/boot/environ/lib/misc/util.c @@ -904,12 +904,12 @@ BlArchGetPerformanceCounter ( ) { #if defined(_M_IX86) || defined(_M_X64) - INT CpuInfo[4]; + CPU_INFO CpuInfo; /* Serialize with CPUID, if it exists */ if (Archx86IsCpuidSupported()) { - BlArchCpuId(0, 0, CpuInfo); + BlArchCpuId(0, 0, &CpuInfo); } /* Read the TSC */ @@ -924,12 +924,12 @@ VOID BlArchCpuId ( _In_ ULONG Function, _In_ ULONG SubFunction, - _Out_ INT* Result + _Out_ PCPU_INFO Result ) { #if defined(_M_IX86) || defined(_M_X64) /* Use the intrinsic */ - __cpuidex(Result, Function, SubFunction); + __cpuidex((INT*)Result->AsUINT32, Function, SubFunction); #endif } @@ -938,37 +938,37 @@ BlArchGetCpuVendor ( VOID ) { - INT CpuInfo[4]; + CPU_INFO CpuInfo; INT Temp; /* Get the CPU Vendor */ - BlArchCpuId(0, 0, CpuInfo); - Temp = CpuInfo[2]; - CpuInfo[2] = CpuInfo[3]; - CpuInfo[3] = Temp; + BlArchCpuId(0, 0, &CpuInfo); + Temp = CpuInfo.Ecx; + CpuInfo.Ecx = CpuInfo.Edx; + CpuInfo.Edx = Temp; /* Check against supported values */ - if (!strncmp((PCHAR)&CpuInfo[1], "GenuineIntel", 12)) + if (!strncmp((PCHAR)&CpuInfo.Ebx, "GenuineIntel", 12)) { return CPU_INTEL; } - if (!strncmp((PCHAR)&CpuInfo[1], "AuthenticAMD", 12)) + if (!strncmp((PCHAR)&CpuInfo.Ebx, "AuthenticAMD", 12)) { return CPU_AMD; } - if (!strncmp((PCHAR)&CpuInfo[1], "CentaurHauls", 12)) + if (!strncmp((PCHAR)&CpuInfo.Ebx, "CentaurHauls", 12)) { return CPU_VIA; } - if (!strncmp((PCHAR)&CpuInfo[1], "CyrixInstead", 12)) + if (!strncmp((PCHAR)&CpuInfo.Ebx, "CyrixInstead", 12)) { return CPU_CYRIX; } - if (!strncmp((PCHAR)&CpuInfo[1], "GenuineTMx86", 12)) + if (!strncmp((PCHAR)&CpuInfo.Ebx, "GenuineTMx86", 12)) { return CPU_TRANSMETA; } - if (!strncmp((PCHAR)&CpuInfo[1], "RiseRiseRise", 12)) + if (!strncmp((PCHAR)&CpuInfo.Ebx, "RiseRiseRise", 12)) { return CPU_RISE; } diff --git a/boot/environ/lib/mm/i386/mmx86.c b/boot/environ/lib/mm/i386/mmx86.c index 38e52df1fd..b72a8983ae 100644 --- a/boot/environ/lib/mm/i386/mmx86.c +++ b/boot/environ/lib/mm/i386/mmx86.c @@ -1101,7 +1101,7 @@ MmArchInitialize ( { NTSTATUS Status; ULONGLONG IncreaseUserVa, PerfCounter, CpuRandom; - INT CpuInfo[4]; + CPU_INFO CpuInfo; /* For phase 2, just map deferred regions */ if (Phase != 1) @@ -1157,10 +1157,10 @@ MmArchInitialize ( if (BlArchIsCpuIdFunctionSupported(1)) { /* Call it */ - BlArchCpuId(1, 0, CpuInfo); + BlArchCpuId(1, 0, &CpuInfo); /* Check if RDRAND is supported */ - if (CpuInfo[2] & 0x40000000) + if (CpuInfo.Ecx & 0x40000000) { EfiPrintf(L"Your CPU can do RDRAND! Good for you!\r\n"); CpuRandom = 0;

1 0

01/01: [ROSLOAD] Initial support for launching OS Loader Entrypoint and returning from it
by Alex Ionescu 28 Jan '18

28 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e836d0b56e9a83aececee… commit e836d0b56e9a83aececee51bfbc97fabc792d27d Author: Alex Ionescu <aionescu(a)gmail.com> AuthorDate: Sun Jan 28 13:24:20 2018 +0100 Commit: Alex Ionescu <aionescu(a)gmail.com> CommitDate: Sun Jan 28 13:24:20 2018 +0100 [ROSLOAD] Initial support for launching OS Loader Entrypoint and returning from it [ENVIRON]: Implement BlArchGetCpuVendor [ROSLOAD]: Stub OslPrepareTarget, OslExecuteTransition [ROSLOAD]: Implement OslpMain --- boot/environ/app/rosload/rosload.c | 169 +++++++++++++++++++++++++++++++------ boot/environ/include/bl.h | 5 ++ boot/environ/lib/misc/util.c | 44 ++++++++++ 3 files changed, 194 insertions(+), 24 deletions(-) diff --git a/boot/environ/app/rosload/rosload.c b/boot/environ/app/rosload/rosload.c index de97ecf115..9120631a1f 100644 --- a/boot/environ/app/rosload/rosload.c +++ b/boot/environ/app/rosload/rosload.c @@ -9761,6 +9761,75 @@ ConvertBmpToGopBlt ( return EFI_SUCCESS; } +NTSTATUS +OslPrepareTarget ( + _Out_ PULONG ReturnFlags, + _Out_ PBOOLEAN Jump + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +OslExecuteTransition ( + VOID + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +OslpMain ( + _Out_ PULONG ReturnFlags + ) +{ + INT CpuInfo[4]; + BOOLEAN NxDisabled; + NTSTATUS Status; + BOOLEAN ExecuteJump; + + /* Check if the CPU supports NX */ + BlArchCpuId(0x80000001, 0, CpuInfo); + if (!(CpuInfo[3] & 0x10000)) + { + /* It doesn't, check if this is Intel */ + EfiPrintf(L"NX disabled: %d\r\n"); + if (BlArchGetCpuVendor() == CPU_INTEL) + { + /* Then turn off the MSR feature for it */ + EfiPrintf(L"NX being turned off\r\n"); + __writemsr(MSR_IA32_MISC_ENABLE, + __readmsr(MSR_IA32_MISC_ENABLE) & MSR_XD_ENABLE_MASK); + NxDisabled = TRUE; + } + } + + /* Turn on NX support with the CPU-generic MSR */ + __writemsr(MSR_EFER, __readmsr(MSR_EFER) | MSR_NXE); + + /* Load the kernel */ + Status = OslPrepareTarget(ReturnFlags, &ExecuteJump); + if (NT_SUCCESS(Status) && (ExecuteJump)) + { + /* Jump to the kernel */ + Status = OslExecuteTransition(); + } + + /* Retore NX support */ + __writemsr(MSR_EFER, __readmsr(MSR_EFER) ^ MSR_NXE); + + /* Did we disable NX? */ + if (NxDisabled) + { + /* Turn it back on */ + __writemsr(MSR_IA32_MISC_ENABLE, + __readmsr(MSR_IA32_MISC_ENABLE) | ~MSR_XD_ENABLE_MASK); + } + + /* Go back */ + return Status; +} + /*++ * @name OslMain * @@ -9782,6 +9851,11 @@ OslMain ( { BL_LIBRARY_PARAMETERS LibraryParameters; NTSTATUS Status; + PBL_RETURN_ARGUMENTS ReturnArguments; + PBL_APPLICATION_ENTRY AppEntry; + INT CpuInfo[4]; + ULONG Flags; +#ifdef DRAW_LOGO EFI_GRAPHICS_OUTPUT_BLT_PIXEL* gopBlt; UINTN gopBltSize, bmpHeight, bmpWidth, CoordinateY, CoordinateX; PBL_GRAPHICS_CONSOLE GraphicsConsole; @@ -9790,6 +9864,37 @@ OslMain ( EFI_GRAPHICS_OUTPUT_PROTOCOL* GraphicsOutput; extern EFI_BOOT_SERVICES* EfiBS; extern EFI_SYSTEM_TABLE* EfiST; +#endif + + /* Get the return arguments structure, and set our version */ + ReturnArguments = (PBL_RETURN_ARGUMENTS)((ULONG_PTR)BootParameters + + BootParameters->ReturnArgumentsOffset); + ReturnArguments->Version = BL_RETURN_ARGUMENTS_VERSION; + + /* Get the application entry, and validate it */ + AppEntry = (PBL_APPLICATION_ENTRY)((ULONG_PTR)BootParameters + + BootParameters->AppEntryOffset); + if (!RtlEqualMemory(AppEntry->Signature, + BL_APP_ENTRY_SIGNATURE, + sizeof(AppEntry->Signature))) + { + /* Unrecognized, bail out */ + Status = STATUS_INVALID_PARAMETER_9; + goto Quickie; + } + + /* Check if CPUID 01h is supported */ + if (BlArchIsCpuIdFunctionSupported(1)) + { + /* Query CPU features */ + BlArchCpuId(1, 0, CpuInfo); + + /* Check if PAE is supported */ + if (CpuInfo[4] & 0x40) + { + EfiPrintf(L"PAE Supported, but won't be used\r\n"); + } + } /* Setup the boot library parameters for this application */ BlSetupDefaultParameters(&LibraryParameters); @@ -9801,34 +9906,50 @@ OslMain ( LibraryParameters.HeapAllocationAttributes = BlMemoryKernelRange; LibraryParameters.FontBaseDirectory = L"\\Reactos\\Boot\\Fonts"; LibraryParameters.DescriptorCount = 512; - Status = BlInitializeLibrary(BootParameters, &LibraryParameters); - Status = ConvertBmpToGopBlt(g_Logo, sizeof(g_Logo), (PVOID*)&gopBlt, &gopBltSize, &bmpHeight, &bmpWidth); - - GraphicsConsole = DspGraphicalConsole; - CoordinateX = (GraphicsConsole->DisplayMode.HRes / 2) - (bmpWidth / 2); - CoordinateY = (GraphicsConsole->DisplayMode.VRes / 2) - (bmpHeight / 2); + /* Initialize the boot library */ + Status = BlInitializeLibrary(BootParameters, &LibraryParameters); + if (NT_SUCCESS(Status)) + { +#ifdef DRAW_LOGO + /* Display ReactOS Logo */ + Status = ConvertBmpToGopBlt(g_Logo, sizeof(g_Logo), (PVOID*)&gopBlt, &gopBltSize, &bmpHeight, &bmpWidth); + GraphicsConsole = DspGraphicalConsole; + CoordinateX = (GraphicsConsole->DisplayMode.HRes / 2) - (bmpWidth / 2); + CoordinateY = (GraphicsConsole->DisplayMode.VRes / 2) - (bmpHeight / 2); + BlMmTranslateVirtualAddress(gopBlt, &gopBltPhys); + gopBlt = (PVOID)gopBltPhys.LowPart; + RtlFillMemory(GraphicsConsole->FrameBuffer, GraphicsConsole->FrameBufferSize, 0x00); + BlpArchSwitchContext(BlRealMode); + Status = EfiBS->HandleProtocol(EfiST->ConsoleOutHandle, &EfiGraphicsOutputProtocol, (VOID **)&GraphicsOutput); + GraphicsOutput->Blt(GraphicsOutput, + gopBlt, + EfiBltBufferToVideo, + 0, + 0, + CoordinateX, + CoordinateY, + bmpWidth, + bmpHeight, + bmpWidth * sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); + BlpArchSwitchContext(BlProtectedMode); - BlMmTranslateVirtualAddress(gopBlt, &gopBltPhys); - gopBlt = (PVOID)gopBltPhys.LowPart; - RtlFillMemory(GraphicsConsole->FrameBuffer, GraphicsConsole->FrameBufferSize, 0x00); + /* Display text below */ + EfiPrintf(L"\n\n\n\n\nReactOS UEFI OS Loader Initializing... %lx\r\n", Status); + EfiStall(1000000); + BlDisplayClearScreen(); +#endif + /* Call the main routine */ + Status = OslpMain(&Flags); - BlpArchSwitchContext(BlRealMode); - Status = EfiBS->HandleProtocol(EfiST->ConsoleOutHandle, &EfiGraphicsOutputProtocol, (VOID **) &GraphicsOutput); - GraphicsOutput->Blt(GraphicsOutput, - gopBlt, - EfiBltBufferToVideo, - 0, - 0, - CoordinateX, - CoordinateY, - bmpWidth, - bmpHeight, - bmpWidth * sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); - BlpArchSwitchContext(BlProtectedMode); + /* Return the flags, and destroy the boot library */ + ReturnArguments->Flags = Flags; + BlDestroyLibrary(); + } - EfiPrintf(L"\n\nReactOS UEFI OS Loader Initializing...\r\n"); - EfiStall(1000000); +Quickie: + /* Return back to boot manager */ + ReturnArguments->Status = Status; return Status; } diff --git a/boot/environ/include/bl.h b/boot/environ/include/bl.h index d41e706f9f..7fa6c9667e 100644 --- a/boot/environ/include/bl.h +++ b/boot/environ/include/bl.h @@ -1669,6 +1669,11 @@ BlArchCpuId ( _Out_ INT* Result ); +CPU_VENDORS +BlArchGetCpuVendor ( + VOID + ); + BOOLEAN BlArchIsCpuIdFunctionSupported ( _In_ ULONG Function diff --git a/boot/environ/lib/misc/util.c b/boot/environ/lib/misc/util.c index b3d1f4e6dd..d6e5459882 100644 --- a/boot/environ/lib/misc/util.c +++ b/boot/environ/lib/misc/util.c @@ -932,3 +932,47 @@ BlArchCpuId ( __cpuidex(Result, Function, SubFunction); #endif } + +CPU_VENDORS +BlArchGetCpuVendor ( + VOID + ) +{ + INT CpuInfo[4]; + INT Temp; + + /* Get the CPU Vendor */ + BlArchCpuId(0, 0, CpuInfo); + Temp = CpuInfo[2]; + CpuInfo[2] = CpuInfo[3]; + CpuInfo[3] = Temp; + + /* Check against supported values */ + if (!strncmp((PCHAR)&CpuInfo[1], "GenuineIntel", 12)) + { + return CPU_INTEL; + } + if (!strncmp((PCHAR)&CpuInfo[1], "AuthenticAMD", 12)) + { + return CPU_AMD; + } + if (!strncmp((PCHAR)&CpuInfo[1], "CentaurHauls", 12)) + { + return CPU_VIA; + } + if (!strncmp((PCHAR)&CpuInfo[1], "CyrixInstead", 12)) + { + return CPU_CYRIX; + } + if (!strncmp((PCHAR)&CpuInfo[1], "GenuineTMx86", 12)) + { + return CPU_TRANSMETA; + } + if (!strncmp((PCHAR)&CpuInfo[1], "RiseRiseRise", 12)) + { + return CPU_RISE; + } + + /* Other */ + return CPU_UNKNOWN; +}

1 0

01/01: [NTOSKRNL] Drop ROS_DEFERRED_WRITE_CONTEXT in favor of DEFERRED_WRITE that was introduced in d3e0eb2.
by Pierre Schweitzer 28 Jan '18

28 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b49a2d635663986915d16… commit b49a2d635663986915d16a92ca2092b4a98a2c9c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Jan 28 11:55:40 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jan 28 11:55:40 2018 +0100 [NTOSKRNL] Drop ROS_DEFERRED_WRITE_CONTEXT in favor of DEFERRED_WRITE that was introduced in d3e0eb2. CORE-14235 --- ntoskrnl/cc/copy.c | 12 +++++++----- ntoskrnl/cc/view.c | 9 +++++---- ntoskrnl/include/internal/cc.h | 13 ++----------- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index e194074d59..b9e8893b87 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -496,13 +496,13 @@ CcDeferWrite ( IN ULONG BytesToWrite, IN BOOLEAN Retrying) { - PROS_DEFERRED_WRITE_CONTEXT Context; + PDEFERRED_WRITE Context; CCTRACE(CC_API_DEBUG, "FileObject=%p PostRoutine=%p Context1=%p Context2=%p BytesToWrite=%lu Retrying=%d\n", FileObject, PostRoutine, Context1, Context2, BytesToWrite, Retrying); /* Try to allocate a context for queueing the write operation */ - Context = ExAllocatePoolWithTag(NonPagedPool, sizeof(ROS_DEFERRED_WRITE_CONTEXT), 'CcDw'); + Context = ExAllocatePoolWithTag(NonPagedPool, sizeof(DEFERRED_WRITE), 'CcDw'); /* If it failed, immediately execute the operation! */ if (Context == NULL) { @@ -511,26 +511,28 @@ CcDeferWrite ( } /* Otherwise, initialize the context */ + RtlZeroMemory(Context, sizeof(DEFERRED_WRITE)); + Context->NodeTypeCode = NODE_TYPE_DEFERRED_WRITE; + Context->NodeByteSize = sizeof(DEFERRED_WRITE); Context->FileObject = FileObject; Context->PostRoutine = PostRoutine; Context->Context1 = Context1; Context->Context2 = Context2; Context->BytesToWrite = BytesToWrite; - Context->Retrying = Retrying; /* And queue it */ if (Retrying) { /* To the top, if that's a retry */ ExInterlockedInsertHeadList(&CcDeferredWrites, - &Context->CcDeferredWritesEntry, + &Context->DeferredWriteLinks, &CcDeferredWriteSpinLock); } else { /* To the bottom, if that's a first time */ ExInterlockedInsertTailList(&CcDeferredWrites, - &Context->CcDeferredWritesEntry, + &Context->DeferredWriteLinks, &CcDeferredWriteSpinLock); } } diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index e846130c79..2520cab53d 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -362,13 +362,14 @@ CciLazyWriter(PVOID Unused) ListEntry = ExInterlockedRemoveHeadList(&CcDeferredWrites, &CcDeferredWriteSpinLock); if (ListEntry != NULL) { - PROS_DEFERRED_WRITE_CONTEXT Context; + PDEFERRED_WRITE Context; /* Extract the context */ - Context = CONTAINING_RECORD(ListEntry, ROS_DEFERRED_WRITE_CONTEXT, CcDeferredWritesEntry); + Context = CONTAINING_RECORD(ListEntry, DEFERRED_WRITE, DeferredWriteLinks); + ASSERT(Context->NodeTypeCode == NODE_TYPE_DEFERRED_WRITE); /* Can we write now? */ - if (CcCanIWrite(Context->FileObject, Context->BytesToWrite, FALSE, Context->Retrying)) + if (CcCanIWrite(Context->FileObject, Context->BytesToWrite, FALSE, TRUE)) { /* Yes! Do it, and destroy the associated context */ Context->PostRoutine(Context->Context1, Context->Context2); @@ -381,7 +382,7 @@ CciLazyWriter(PVOID Unused) * It's better than nothing! */ ExInterlockedInsertTailList(&CcDeferredWrites, - &Context->CcDeferredWritesEntry, + &Context->DeferredWriteLinks, &CcDeferredWriteSpinLock); } } diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index a85df9da61..949fe7d56b 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -200,17 +200,6 @@ typedef struct _ROS_VACB /* Pointer to the next VACB in a chain. */ } ROS_VACB, *PROS_VACB; -typedef struct _ROS_DEFERRED_WRITE_CONTEXT -{ - LIST_ENTRY CcDeferredWritesEntry; - PFILE_OBJECT FileObject; - PCC_POST_DEFERRED_WRITE PostRoutine; - PVOID Context1; - PVOID Context2; - ULONG BytesToWrite; - BOOLEAN Retrying; -} ROS_DEFERRED_WRITE_CONTEXT, *PROS_DEFERRED_WRITE_CONTEXT; - typedef struct _INTERNAL_BCB { /* Lock */ @@ -222,6 +211,8 @@ typedef struct _INTERNAL_BCB CSHORT RefCount; /* (At offset 0x34 on WinNT4) */ } INTERNAL_BCB, *PINTERNAL_BCB; +#define NODE_TYPE_DEFERRED_WRITE 0x02FC + VOID NTAPI CcPfInitializePrefetcher(

1 0

01/01: [NTOSKRNL] Misc fixes to Cc: - CcUnpinDataForThread() only release VACB when the last BCB reference is gone. This avoids having a valid BCB with an invalid VACB - CcRosMarkDirtyVacb() will only accept non-dirty VACB now. This avoids a major bug where a an already dirty VACB was over-dereferenced - Thanks to previous point, simplify CcRosUnmapVacb(), CcRosReleaseVacb() implementation - And only set VACB dirty once in CcSetDirtyPinnedData() - Add a few sanity checks
by Pierre Schweitzer 28 Jan '18

28 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=52287be9a9299ac065fdb… commit 52287be9a9299ac065fdb676abb99f94007aa5b9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Jan 28 11:09:21 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jan 28 11:14:15 2018 +0100 [NTOSKRNL] Misc fixes to Cc: - CcUnpinDataForThread() only release VACB when the last BCB reference is gone. This avoids having a valid BCB with an invalid VACB - CcRosMarkDirtyVacb() will only accept non-dirty VACB now. This avoids a major bug where a an already dirty VACB was over-dereferenced - Thanks to previous point, simplify CcRosUnmapVacb(), CcRosReleaseVacb() implementation - And only set VACB dirty once in CcSetDirtyPinnedData() - Add a few sanity checks With that I can again install ReactOS with 128MB RAM :-). CORE-14263 CORE-14268 --- ntoskrnl/cc/pin.c | 17 +++++++++------- ntoskrnl/cc/view.c | 57 ++++++++++++++---------------------------------------- 2 files changed, 25 insertions(+), 49 deletions(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index 393b206a0f..955bbd0ca7 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -247,7 +247,10 @@ CcSetDirtyPinnedData ( Bcb, Lsn); iBcb->Dirty = TRUE; - CcRosMarkDirtyVacb(iBcb->Vacb); + if (!iBcb->Vacb->Dirty) + { + CcRosMarkDirtyVacb(iBcb->Vacb); + } } @@ -284,14 +287,14 @@ CcUnpinDataForThread ( iBcb->Vacb->PinCount--; } - CcRosReleaseVacb(iBcb->Vacb->SharedCacheMap, - iBcb->Vacb, - TRUE, - iBcb->Dirty, - FALSE); - if (--iBcb->RefCount == 0) { + CcRosReleaseVacb(iBcb->Vacb->SharedCacheMap, + iBcb->Vacb, + TRUE, + iBcb->Dirty, + FALSE); + ExDeleteResourceLite(&iBcb->Lock); ExFreeToNPagedLookasideList(&iBcbLookasideList, iBcb); } diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 78167505fa..e846130c79 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -99,6 +99,7 @@ static void CcRosVacbIncRefCount_(PROS_VACB vacb, const char* file, int line) static void CcRosVacbDecRefCount_(PROS_VACB vacb, const char* file, int line) { --vacb->ReferenceCount; + ASSERT(!(vacb->ReferenceCount == 0 && vacb->Dirty)); if (vacb->SharedCacheMap->Trace) { DbgPrint("(%s:%i) VACB %p --RefCount=%lu, Dirty %u, PageOut %lu\n", @@ -518,8 +519,6 @@ CcRosReleaseVacb ( BOOLEAN Dirty, BOOLEAN Mapped) { - BOOLEAN WasDirty; - ASSERT(SharedCacheMap); DPRINT("CcRosReleaseVacb(SharedCacheMap 0x%p, Vacb 0x%p, Valid %u)\n", @@ -527,17 +526,9 @@ CcRosReleaseVacb ( Vacb->Valid = Valid; - WasDirty = FALSE; - if (Dirty) + if (Dirty && !Vacb->Dirty) { - if (!Vacb->Dirty) - { - CcRosMarkDirtyVacb(Vacb); - } - else - { - WasDirty = TRUE; - } + CcRosMarkDirtyVacb(Vacb); } if (Mapped) @@ -549,10 +540,6 @@ CcRosReleaseVacb ( { CcRosVacbIncRefCount(Vacb); } - if (!WasDirty && Vacb->Dirty) - { - CcRosVacbIncRefCount(Vacb); - } CcRosReleaseVacbLock(Vacb); @@ -618,16 +605,12 @@ CcRosMarkDirtyVacb ( KeAcquireGuardedMutex(&ViewLock); KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); - if (!Vacb->Dirty) - { - InsertTailList(&DirtyVacbListHead, &Vacb->DirtyVacbListEntry); - CcTotalDirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; - Vacb->SharedCacheMap->DirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; - } - else - { - CcRosVacbDecRefCount(Vacb); - } + ASSERT(!Vacb->Dirty); + + InsertTailList(&DirtyVacbListHead, &Vacb->DirtyVacbListEntry); + CcTotalDirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; + Vacb->SharedCacheMap->DirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; + CcRosVacbIncRefCount(Vacb); /* Move to the tail of the LRU list */ RemoveEntryList(&Vacb->VacbLruListEntry); @@ -658,7 +641,10 @@ CcRosMarkDirtyFile ( KeBugCheck(CACHE_MANAGER); } - CcRosMarkDirtyVacb(Vacb); + if (!Vacb->Dirty) + { + CcRosMarkDirtyVacb(Vacb); + } CcRosReleaseVacbLock(Vacb); @@ -673,7 +659,6 @@ CcRosUnmapVacb ( BOOLEAN NowDirty) { PROS_VACB Vacb; - BOOLEAN WasDirty; ASSERT(SharedCacheMap); @@ -686,26 +671,14 @@ CcRosUnmapVacb ( return STATUS_UNSUCCESSFUL; } - WasDirty = FALSE; - if (NowDirty) + if (NowDirty && !Vacb->Dirty) { - if (!Vacb->Dirty) - { - CcRosMarkDirtyVacb(Vacb); - } - else - { - WasDirty = TRUE; - } + CcRosMarkDirtyVacb(Vacb); } Vacb->MappedCount--; CcRosVacbDecRefCount(Vacb); - if (!WasDirty && NowDirty) - { - CcRosVacbIncRefCount(Vacb); - } if (Vacb->MappedCount == 0) { CcRosVacbDecRefCount(Vacb);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs