Ros-diffs

ros-diffs@reactos.org

81390 discussions

02/05: [NTOSKRNL] When marking a BCB dirty, also mark the underlying VACB dirty. Experiment and MSDN tend to show that a dirty BCB is queued for lazy write. This will do the job here!
by Pierre Schweitzer 23 Jan '18

23 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07e6e9c9c1415385edf7f… commit 07e6e9c9c1415385edf7fb6ad5f503b88db8b047 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Jan 23 21:48:29 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Jan 23 23:25:26 2018 +0100 [NTOSKRNL] When marking a BCB dirty, also mark the underlying VACB dirty. Experiment and MSDN tend to show that a dirty BCB is queued for lazy write. This will do the job here! Also, renamed CcRosMarkDirtyFile() which is more accurate, and added a new function CcRosMarkDirtyVacb() which just takes a VACB as arg (expected locked) and marks it dirty (using previous implementation). Make CcRosMarkDirtyFile() use it. CORE-14235 --- ntoskrnl/cc/pin.c | 1 + ntoskrnl/cc/view.c | 42 ++++++++++++++++++++++++++++-------------- ntoskrnl/include/internal/cc.h | 7 ++++++- ntoskrnl/mm/section.c | 4 ++-- 4 files changed, 37 insertions(+), 17 deletions(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index 0241927f95..393b206a0f 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -247,6 +247,7 @@ CcSetDirtyPinnedData ( Bcb, Lsn); iBcb->Dirty = TRUE; + CcRosMarkDirtyVacb(iBcb->Vacb); } diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 0d1822c696..465fffa595 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -565,25 +565,15 @@ CcRosLookupVacb ( return NULL; } -NTSTATUS +VOID NTAPI CcRosMarkDirtyVacb ( - PROS_SHARED_CACHE_MAP SharedCacheMap, - LONGLONG FileOffset) + PROS_VACB Vacb) { - PROS_VACB Vacb; KIRQL oldIrql; + PROS_SHARED_CACHE_MAP SharedCacheMap; - ASSERT(SharedCacheMap); - - DPRINT("CcRosMarkDirtyVacb(SharedCacheMap 0x%p, FileOffset %I64u)\n", - SharedCacheMap, FileOffset); - - Vacb = CcRosLookupVacb(SharedCacheMap, FileOffset); - if (Vacb == NULL) - { - KeBugCheck(CACHE_MANAGER); - } + SharedCacheMap = Vacb->SharedCacheMap; KeAcquireGuardedMutex(&ViewLock); KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); @@ -606,6 +596,30 @@ CcRosMarkDirtyVacb ( KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); +} + +NTSTATUS +NTAPI +CcRosMarkDirtyFile ( + PROS_SHARED_CACHE_MAP SharedCacheMap, + LONGLONG FileOffset) +{ + PROS_VACB Vacb; + + ASSERT(SharedCacheMap); + + DPRINT("CcRosMarkDirtyVacb(SharedCacheMap 0x%p, FileOffset %I64u)\n", + SharedCacheMap, FileOffset); + + Vacb = CcRosLookupVacb(SharedCacheMap, FileOffset); + if (Vacb == NULL) + { + KeBugCheck(CACHE_MANAGER); + } + + CcRosMarkDirtyVacb(Vacb); + + CcRosReleaseVacbLock(Vacb); return STATUS_SUCCESS; diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index b1bb1ab165..cc62381aad 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -281,11 +281,16 @@ CcInitCacheZeroPage(VOID); NTSTATUS NTAPI -CcRosMarkDirtyVacb( +CcRosMarkDirtyFile( PROS_SHARED_CACHE_MAP SharedCacheMap, LONGLONG FileOffset ); +VOID +NTAPI +CcRosMarkDirtyVacb( + PROS_VACB Vacb); + NTSTATUS NTAPI CcRosFlushDirtyPages( diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 66fa6d2245..5c954395a9 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -2374,7 +2374,7 @@ MmWritePageSectionView(PMMSUPPORT AddressSpace, ASSERT(SwapEntry == 0); //SOffset.QuadPart = Offset.QuadPart + Segment->Image.FileOffset; #ifndef NEWCC - CcRosMarkDirtyVacb(SharedCacheMap, Offset.QuadPart); + CcRosMarkDirtyFile(SharedCacheMap, Offset.QuadPart); #endif MmLockSectionSegment(Segment); MmSetPageEntrySectionSegment(Segment, &Offset, PageEntry); @@ -4006,7 +4006,7 @@ MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, #ifndef NEWCC FileObject = MemoryArea->Data.SectionData.Section->FileObject; SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; - CcRosMarkDirtyVacb(SharedCacheMap, Offset.QuadPart + Segment->Image.FileOffset); + CcRosMarkDirtyFile(SharedCacheMap, Offset.QuadPart + Segment->Image.FileOffset); #endif ASSERT(SwapEntry == 0); }

1 0

01/05: [NTOSKRNL] Bug fix: lazy write more often. CcDirtyPageThreshold is not here to compute when you have to write, but to know where you have to deny writes. More commits to come in that direction!
by Pierre Schweitzer 23 Jan '18

23 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ba67b8152def148a87fd… commit 6ba67b8152def148a87fdd6049e65956fb4656a9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Jan 23 21:36:19 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Jan 23 23:25:26 2018 +0100 [NTOSKRNL] Bug fix: lazy write more often. CcDirtyPageThreshold is not here to compute when you have to write, but to know where you have to deny writes. More commits to come in that direction! CORE-14235 --- ntoskrnl/cc/view.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 8fb7f5333c..0d1822c696 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -326,23 +326,18 @@ CciLazyWriter(PVOID Unused) /* We're not sleeping anymore */ KeClearEvent(&iLazyWriterNotify); - /* Only start operations if above threshold */ - DPRINT("TS: %lu, Count: %lu\n", CcDirtyPageThreshold, CcTotalDirtyPages); - if (CcTotalDirtyPages > CcDirtyPageThreshold) + /* Our target is one-eighth of the dirty pages */ + Target = CcTotalDirtyPages / 8; + if (Target != 0) { - /* Our target is one-eighth of the dirty pages */ - Target = CcTotalDirtyPages / 8; - if (Target != 0) - { - /* Flush! */ - DPRINT("Lazy writer starting (%d)\n", Target); - CcRosFlushDirtyPages(Target, &Count, FALSE, TRUE); - - /* And update stats */ - CcLazyWritePages += Count; - ++CcLazyWriteIos; - DPRINT("Lazy writer done (%d)\n", Count); - } + /* Flush! */ + DPRINT("Lazy writer starting (%d)\n", Target); + CcRosFlushDirtyPages(Target, &Count, FALSE, TRUE); + + /* And update stats */ + CcLazyWritePages += Count; + ++CcLazyWriteIos; + DPRINT("Lazy writer done (%d)\n", Count); } /* Inform people waiting on us that we're done */

1 0

01/01: [EXPLORER] Workaround for something that may or may not be an "unintended feature" of the comctl toolbar. Apparently the indices provided in NMTBGETINFOTIP (TBN_GETINFOTIP data struct), are not reliable, but since the lParam values are, and it saves us a lookup, we will be using those instead. Win-Win!
by David Quintana 23 Jan '18

23 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ec441a867dee5ffde551… commit 5ec441a867dee5ffde551d40f71961baf7f671fd Author: David Quintana <gigaherz(a)gmail.com> AuthorDate: Tue Jan 23 23:10:44 2018 +0100 Commit: David Quintana <gigaherz(a)gmail.com> CommitDate: Tue Jan 23 23:10:44 2018 +0100 [EXPLORER] Workaround for something that may or may not be an "unintended feature" of the comctl toolbar. Apparently the indices provided in NMTBGETINFOTIP (TBN_GETINFOTIP data struct), are not reliable, but since the lParam values are, and it saves us a lookup, we will be using those instead. Win-Win! --- base/shell/explorer/trayntfy.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index f61e1f6bb4..1b05b501a7 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -853,14 +853,17 @@ public: } - VOID GetTooltipText(int index, LPTSTR szTip, DWORD cchTip) + VOID GetTooltipText(LPARAM data, LPTSTR szTip, DWORD cchTip) { - InternalIconData * notifyItem = GetItemData(index); - + InternalIconData * notifyItem = reinterpret_cast<InternalIconData *>(data); if (notifyItem) { StringCchCopy(szTip, cchTip, notifyItem->szTip); } + else + { + StringCchCopy(szTip, cchTip, L""); + } } VOID ResizeImagelist() @@ -1240,7 +1243,7 @@ public: LRESULT OnGetInfoTip(INT uCode, LPNMHDR hdr, BOOL& bHandled) { NMTBGETINFOTIPW * nmtip = (NMTBGETINFOTIPW *) hdr; - Toolbar.GetTooltipText(nmtip->iItem, nmtip->pszText, nmtip->cchTextMax); + Toolbar.GetTooltipText(nmtip->lParam, nmtip->pszText, nmtip->cchTextMax); return TRUE; }

1 0

02/02: [EXPLORER] Implement balloon queueing.
by David Quintana 23 Jan '18

23 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc43733e4842f4bcc5ea2… commit bc43733e4842f4bcc5ea2d87fa9f69b442a3fcba Author: David Quintana <gigaherz(a)gmail.com> AuthorDate: Mon Jan 22 20:27:32 2018 +0100 Commit: David Quintana <gigaherz(a)gmail.com> CommitDate: Tue Jan 23 22:13:01 2018 +0100 [EXPLORER] Implement balloon queueing. --- base/shell/explorer/trayntfy.cpp | 313 ++++++++++++++++++++++++++++----------- 1 file changed, 226 insertions(+), 87 deletions(-) diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index 7e13d9f131..f61e1f6bb4 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -40,7 +40,6 @@ struct InternalIconData : NOTIFYICONDATA UINT uVersionCopy; }; - struct IconWatcherData { HANDLE hProcess; @@ -314,6 +313,203 @@ private: } }; +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() : + m_hwndParent(NULL), + m_tooltips(NULL), + m_toolbar(NULL), + m_current(NULL), + m_currentClosed(false), + m_timer(-1) + { + } + + void Init(HWND hwndParent, CToolbar<InternalIconData> * toolbar, CTooltips * balloons) + { + m_hwndParent = hwndParent; + m_toolbar = toolbar; + m_tooltips = balloons; + } + + void Deinit() + { + if (m_timer >= 0) + { + ::KillTimer(m_hwndParent, m_timer); + } + } + + bool OnTimer(int timerId) + { + if (timerId != m_timer) + return false; + + ::KillTimer(m_hwndParent, m_timer); + m_timer = -1; + + if (m_current && !m_currentClosed) + { + Close(m_current); + } + else + { + m_current = NULL; + m_currentClosed = false; + if (!m_queue.IsEmpty()) + { + Info info = m_queue.RemoveHead(); + Show(info); + } + } + + return true; + } + + void UpdateInfo(InternalIconData * notifyItem) + { + size_t len = 0; + HRESULT hr = StringCchLength(notifyItem->szInfo, _countof(notifyItem->szInfo), &len); + if (SUCCEEDED(hr) && len > 0) + { + Info info(notifyItem); + + // If m_current == notifyItem, we want to replace the previous balloon even if there is a queue. + if (m_current != notifyItem && (m_current != NULL || !m_queue.IsEmpty())) + { + m_queue.AddTail(info); + } + else + { + Show(info); + } + } + else + { + Close(notifyItem); + } + } + + void RemoveInfo(InternalIconData * notifyItem) + { + Close(notifyItem); + + POSITION position = m_queue.GetHeadPosition(); + while(position != NULL) + { + Info& info = m_queue.GetNext(position); + if (info.pSource == notifyItem) + { + m_queue.RemoveAt(position); + } + } + } + + void CloseCurrent() + { + if (m_current != NULL) + Close(m_current); + } + +private: + + int IndexOf(InternalIconData * pdata) + { + int count = m_toolbar->GetButtonCount(); + for (int i = 0; i < count; i++) + { + if (m_toolbar->GetItemData(i) == pdata) + return i; + } + return -1; + } + + void SetTimer(int length) + { + m_timer = ::SetTimer(m_hwndParent, BalloonsTimerId, length, NULL); + } + + void Show(Info& info) + { + TRACE("ShowBalloonTip called for flags=%x text=%ws; title=%ws\n", info.uIcon, info.szInfo, info.szInfoTitle); + + // TODO: NIF_REALTIME, NIIF_NOSOUND, other Vista+ flags + + const int index = IndexOf(info.pSource); + RECT rc; + m_toolbar->GetItemRect(index, &rc); + m_toolbar->ClientToScreen(&rc); + const WORD x = (rc.left + rc.right) / 2; + const WORD y = (rc.top + rc.bottom) / 2; + + m_tooltips->SetTitle(info.szInfoTitle, info.uIcon); + m_tooltips->TrackPosition(x, y); + m_tooltips->UpdateTipText(m_hwndParent, reinterpret_cast<LPARAM>(m_toolbar->m_hWnd), info.szInfo); + m_tooltips->TrackActivate(m_hwndParent, reinterpret_cast<LPARAM>(m_toolbar->m_hWnd)); + + m_current = info.pSource; + int timeout = info.uTimeout; + if (timeout < MinTimeout) timeout = MinTimeout; + if (timeout > MaxTimeout) timeout = MaxTimeout; + + SetTimer(timeout); + } + + void Close(IN OUT InternalIconData * notifyItem) + { + TRACE("HideBalloonTip called\n"); + + if (m_current == notifyItem && !m_currentClosed) + { + // Prevent Re-entry + m_currentClosed = true; + m_tooltips->TrackDeactivate(); + SetTimer(CooldownBetweenBalloons); + } + } +}; class CNotifyToolbar : public CWindowImplBaseT< CToolbar<InternalIconData>, CControlWinTraits > @@ -321,17 +517,13 @@ class CNotifyToolbar : HIMAGELIST m_ImageList; int m_VisibleButtonCount; - HWND m_BalloonsParent; - CTooltips * m_Balloons; - InternalIconData * m_currentTooltip; + CBalloonQueue * m_BalloonQueue; public: CNotifyToolbar() : m_ImageList(NULL), m_VisibleButtonCount(0), - m_BalloonsParent(NULL), - m_Balloons(NULL), - m_currentTooltip(NULL) + m_BalloonQueue(NULL) { } @@ -455,14 +647,15 @@ public: StrNCpy(notifyItem->szInfoTitle, iconData->szInfoTitle, _countof(notifyItem->szInfo)); notifyItem->dwInfoFlags = iconData->dwInfoFlags; notifyItem->uTimeout = iconData->uTimeout; - } - m_VisibleButtonCount++; if (notifyItem->dwState & NIS_HIDDEN) { tbBtn.fsState |= TBSTATE_HIDDEN; - m_VisibleButtonCount--; + } + else + { + m_VisibleButtonCount++; } /* TODO: support VERSION_4 (NIF_GUID, NIF_REALTIME, NIF_SHOWTIP) */ @@ -472,7 +665,7 @@ public: if (iconData->uFlags & NIF_INFO) { - UpdateBalloonTip(notifyItem); + m_BalloonQueue->UpdateInfo(notifyItem); } return TRUE; @@ -600,7 +793,7 @@ public: if (iconData->uFlags & NIF_INFO) { - UpdateBalloonTip(notifyItem); + m_BalloonQueue->UpdateInfo(notifyItem); } return TRUE; @@ -650,7 +843,7 @@ public: } } - HideBalloonTip(notifyItem); + m_BalloonQueue->RemoveInfo(notifyItem); DeleteButton(index); @@ -659,73 +852,6 @@ public: return TRUE; } - void UpdateBalloonTip(InternalIconData* notifyItem) - { - size_t len = 0; - if (SUCCEEDED(StringCchLength(notifyItem->szInfo, _countof(notifyItem->szInfo), &len)) && len > 0) - { - ShowBalloonTip(notifyItem); - } - else - { - HideBalloonTip(notifyItem); - } - } - - static WPARAM GetTitleIcon(DWORD dwFlags, HICON hIcon) - { - if (dwFlags & NIIF_USER) - return reinterpret_cast<WPARAM>(hIcon); - - return dwFlags & 3; - } - - BOOL ShowBalloonTip(IN OUT InternalIconData *notifyItem) - { - DbgPrint("ShowBalloonTip called for flags=%x text=%ws; title=%ws", notifyItem->dwInfoFlags, notifyItem->szInfo, notifyItem->szInfoTitle); - - // TODO: Queueing -> NIF_REALTIME? (Vista+) - // TODO: NIIF_NOSOUND, Vista+ flags - - const WPARAM icon = GetTitleIcon(notifyItem->dwInfoFlags, notifyItem->hIcon); - BOOL ret = m_Balloons->SetTitle(notifyItem->szInfoTitle, icon); - if (!ret) - DbgPrint("SetTitle failed, GetLastError=%d", GetLastError()); - - const int index = FindItem(notifyItem->hWnd, notifyItem->uID, NULL); - RECT rc; - GetItemRect(index, &rc); - ClientToScreen(&rc); // I have no idea why this is needed! >_< - WORD x = (rc.left + rc.right) / 2; - WORD y = (rc.top + rc.bottom) / 2; - DbgPrint("ClientToScreen returned (%d, %d, %d, %d) x=%d, y=%d", - rc.left, rc.top, - rc.right, rc.bottom, x, y); - m_Balloons->TrackPosition(x, y); - m_Balloons->UpdateTipText(m_BalloonsParent, reinterpret_cast<LPARAM>(m_hWnd), notifyItem->szInfo); - m_Balloons->TrackActivate(m_BalloonsParent, reinterpret_cast<LPARAM>(m_hWnd)); - m_currentTooltip = notifyItem; - - return TRUE; - } - - VOID HideBalloonTip(IN OUT InternalIconData *notifyItem) - { - DbgPrint("HideBalloonTip called"); - - if (m_currentTooltip == notifyItem) - { - // Prevent Re-entry - m_currentTooltip = NULL; - m_Balloons->TrackDeactivate(); - } - } - - VOID HideCurrentBalloon() - { - if (m_currentTooltip != NULL) - HideBalloonTip(m_currentTooltip); - } VOID GetTooltipText(int index, LPTSTR szTip, DWORD cchTip) { @@ -909,10 +1035,9 @@ public: NOTIFY_CODE_HANDLER(TTN_SHOW, OnTooltipShow) END_MSG_MAP() - void Initialize(HWND hWndParent, CTooltips * tooltips) + void Initialize(HWND hWndParent, CBalloonQueue * queue) { - m_BalloonsParent = hWndParent; - m_Balloons = tooltips; + m_BalloonQueue = queue; DWORD styles = WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | @@ -951,8 +1076,8 @@ class CSysPagerWnd : public CIconWatcher { CNotifyToolbar Toolbar; - CTooltips m_Balloons; + CBalloonQueue m_BalloonQueue; public: CSysPagerWnd() {} @@ -983,7 +1108,7 @@ public: LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - Toolbar.Initialize(m_hWnd, &m_Balloons); + Toolbar.Initialize(m_hWnd, &m_BalloonQueue); CIconWatcher::Initialize(m_hWnd); HWND hWndTop = GetAncestor(m_hWnd, GA_ROOT); @@ -1001,9 +1126,11 @@ public: BOOL ret = m_Balloons.AddTool(&ti); if (!ret) { - DbgPrint("AddTool failed, LastError=%d (probably meaningless unless non-zero)", GetLastError()); + WARN("AddTool failed, LastError=%d (probably meaningless unless non-zero)\n", GetLastError()); } + m_BalloonQueue.Init(m_hWnd, &Toolbar, &m_Balloons); + // Explicitly request running applications to re-register their systray icons ::SendNotifyMessageW(HWND_BROADCAST, RegisterWindowMessageW(L"TaskbarCreated"), @@ -1014,6 +1141,7 @@ public: LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + m_BalloonQueue.Deinit(); CIconWatcher::Uninitialize(); return TRUE; } @@ -1165,11 +1293,21 @@ public: LRESULT OnBalloonPop(UINT uCode, LPNMHDR hdr , BOOL& bHandled) { - Toolbar.HideCurrentBalloon(); + m_BalloonQueue.CloseCurrent(); bHandled = TRUE; return 0; } + LRESULT OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + if (m_BalloonQueue.OnTimer(wParam)) + { + bHandled = TRUE; + } + + return 0; + } + void ResizeImagelist() { Toolbar.ResizeImagelist(); @@ -1183,6 +1321,7 @@ public: MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_CONTEXTMENU, OnCtxMenu) + MESSAGE_HANDLER(WM_TIMER, OnTimer) NOTIFY_CODE_HANDLER(TTN_POP, OnBalloonPop) NOTIFY_CODE_HANDLER(TBN_GETINFOTIPW, OnGetInfoTip) NOTIFY_CODE_HANDLER(NM_CUSTOMDRAW, OnCustomDraw)

1 0

01/02: [EXPLORER] Implement rudimentary uVersion management, and notification balloons. - uVersion will only be truly useful when Vista+'s V4 style notification icons are implemented. - Balloon notifications do not yet support queuing and auto-closing. - Force the notification icon tooltips to always show even if the taskbar isn't foreground. [ROSCTRLS.H] Implement CTooltips class which manages a comctl32 tooltips window.
by David Quintana 23 Jan '18

23 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bbca71c4a5604f4919d79… commit bbca71c4a5604f4919d792c4b414ae84a05c4594 Author: David Quintana <gigaherz(a)gmail.com> AuthorDate: Fri Jan 19 16:39:46 2018 +0100 Commit: David Quintana <gigaherz(a)gmail.com> CommitDate: Tue Jan 23 22:13:01 2018 +0100 [EXPLORER] Implement rudimentary uVersion management, and notification balloons. - uVersion will only be truly useful when Vista+'s V4 style notification icons are implemented. - Balloon notifications do not yet support queuing and auto-closing. - Force the notification icon tooltips to always show even if the taskbar isn't foreground. [ROSCTRLS.H] Implement CTooltips class which manages a comctl32 tooltips window. --- base/shell/explorer/trayntfy.cpp | 217 +++++++++++++++++++++++++++++++++---- sdk/include/reactos/rosctrls.h | 225 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 421 insertions(+), 21 deletions(-) diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index 1864e33e96..7e13d9f131 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -34,6 +34,12 @@ 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 { @@ -310,15 +316,22 @@ private: class CNotifyToolbar : - public CWindowImplBaseT< CToolbar<NOTIFYICONDATA>, CControlWinTraits > + public CWindowImplBaseT< CToolbar<InternalIconData>, CControlWinTraits > { HIMAGELIST m_ImageList; int m_VisibleButtonCount; + HWND m_BalloonsParent; + CTooltips * m_Balloons; + InternalIconData * m_currentTooltip; + public: CNotifyToolbar() : m_ImageList(NULL), - m_VisibleButtonCount(0) + m_VisibleButtonCount(0), + m_BalloonsParent(NULL), + m_Balloons(NULL), + m_currentTooltip(NULL) { } @@ -331,15 +344,13 @@ public: return m_VisibleButtonCount; } - int FindItem(IN HWND hWnd, IN UINT uID, NOTIFYICONDATA ** pdata) + int FindItem(IN HWND hWnd, IN UINT uID, InternalIconData ** pdata) { int count = GetButtonCount(); for (int i = 0; i < count; i++) { - NOTIFYICONDATA * data; - - data = GetItemData(i); + InternalIconData * data = GetItemData(i); if (data->hWnd == hWnd && data->uID == uID) @@ -358,7 +369,7 @@ public: int count = GetButtonCount(); for (int i = 0; i < count; i++) { - NOTIFYICONDATA * data = GetItemData(i); + InternalIconData * data = GetItemData(i); if (data->hIcon == handle) { TBBUTTON btn; @@ -373,7 +384,7 @@ public: BOOL AddButton(IN CONST NOTIFYICONDATA *iconData) { TBBUTTON tbBtn; - NOTIFYICONDATA * notifyItem; + InternalIconData * notifyItem; WCHAR text[] = L""; TRACE("Adding icon %d from hWnd %08x flags%s%s state%s%s", @@ -390,7 +401,7 @@ public: return FALSE; } - notifyItem = new NOTIFYICONDATA(); + notifyItem = new InternalIconData(); ZeroMemory(notifyItem, sizeof(*notifyItem)); notifyItem->hWnd = iconData->hWnd; @@ -437,6 +448,16 @@ public: StringCchCopy(notifyItem->szTip, _countof(notifyItem->szTip), iconData->szTip); } + if (iconData->uFlags & NIF_INFO) + { + // NOTE: In Vista+, the uTimeout value is disregarded, and the accessibility settings are used always. + StrNCpy(notifyItem->szInfo, iconData->szInfo, _countof(notifyItem->szInfo)); + StrNCpy(notifyItem->szInfoTitle, iconData->szInfoTitle, _countof(notifyItem->szInfo)); + notifyItem->dwInfoFlags = iconData->dwInfoFlags; + notifyItem->uTimeout = iconData->uTimeout; + + } + m_VisibleButtonCount++; if (notifyItem->dwState & NIS_HIDDEN) { @@ -444,17 +465,45 @@ public: m_VisibleButtonCount--; } - /* TODO: support NIF_INFO, NIF_GUID, NIF_REALTIME, NIF_SHOWTIP */ + /* TODO: support VERSION_4 (NIF_GUID, NIF_REALTIME, NIF_SHOWTIP) */ CToolbar::AddButton(&tbBtn); SetButtonSize(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON)); + if (iconData->uFlags & NIF_INFO) + { + UpdateBalloonTip(notifyItem); + } + + return TRUE; + } + + BOOL SwitchVersion(IN CONST NOTIFYICONDATA *iconData) + { + InternalIconData * notifyItem; + int index = FindItem(iconData->hWnd, iconData->uID, &notifyItem); + if (index < 0) + { + WARN("Icon %d from hWnd %08x DOES NOT EXIST!", iconData->uID, iconData->hWnd); + return FALSE; + } + + if (iconData->uVersion != 0 && iconData->uVersion != NOTIFYICON_VERSION) + { + WARN("Tried to set the version of icon %d from hWnd %08x, to an unknown value %d. Vista+ program?", iconData->uID, iconData->hWnd, iconData->uVersion); + return FALSE; + } + + // We can not store the version in the uVersion field, because it's union'd with uTimeout, + // which we also need to keep track of. + notifyItem->uVersionCopy = iconData->uVersion; + return TRUE; } BOOL UpdateButton(IN CONST NOTIFYICONDATA *iconData) { - NOTIFYICONDATA * notifyItem; + InternalIconData * notifyItem; TBBUTTONINFO tbbi = { 0 }; TRACE("Updating icon %d from hWnd %08x flags%s%s state%s%s", @@ -536,16 +585,30 @@ public: StringCchCopy(notifyItem->szTip, _countof(notifyItem->szTip), iconData->szTip); } - /* TODO: support NIF_INFO, NIF_GUID, NIF_REALTIME, NIF_SHOWTIP */ + if (iconData->uFlags & NIF_INFO) + { + // NOTE: In Vista+, the uTimeout value is disregarded, and the accessibility settings are used always. + StrNCpy(notifyItem->szInfo, iconData->szInfo, _countof(notifyItem->szInfo)); + StrNCpy(notifyItem->szInfoTitle, iconData->szInfoTitle, _countof(notifyItem->szInfo)); + notifyItem->dwInfoFlags = iconData->dwInfoFlags; + notifyItem->uTimeout = iconData->uTimeout; + } + + /* TODO: support VERSION_4 (NIF_GUID, NIF_REALTIME, NIF_SHOWTIP) */ SetButtonInfo(index, &tbbi); + if (iconData->uFlags & NIF_INFO) + { + UpdateBalloonTip(notifyItem); + } + return TRUE; } BOOL RemoveButton(IN CONST NOTIFYICONDATA *iconData) { - NOTIFYICONDATA * notifyItem; + InternalIconData * notifyItem; TRACE("Removing icon %d from hWnd %08x", iconData->uID, iconData->hWnd); @@ -587,16 +650,86 @@ public: } } - delete notifyItem; + HideBalloonTip(notifyItem); + DeleteButton(index); + delete notifyItem; + return TRUE; } + void UpdateBalloonTip(InternalIconData* notifyItem) + { + size_t len = 0; + if (SUCCEEDED(StringCchLength(notifyItem->szInfo, _countof(notifyItem->szInfo), &len)) && len > 0) + { + ShowBalloonTip(notifyItem); + } + else + { + HideBalloonTip(notifyItem); + } + } + + static WPARAM GetTitleIcon(DWORD dwFlags, HICON hIcon) + { + if (dwFlags & NIIF_USER) + return reinterpret_cast<WPARAM>(hIcon); + + return dwFlags & 3; + } + + BOOL ShowBalloonTip(IN OUT InternalIconData *notifyItem) + { + DbgPrint("ShowBalloonTip called for flags=%x text=%ws; title=%ws", notifyItem->dwInfoFlags, notifyItem->szInfo, notifyItem->szInfoTitle); + + // TODO: Queueing -> NIF_REALTIME? (Vista+) + // TODO: NIIF_NOSOUND, Vista+ flags + + const WPARAM icon = GetTitleIcon(notifyItem->dwInfoFlags, notifyItem->hIcon); + BOOL ret = m_Balloons->SetTitle(notifyItem->szInfoTitle, icon); + if (!ret) + DbgPrint("SetTitle failed, GetLastError=%d", GetLastError()); + + const int index = FindItem(notifyItem->hWnd, notifyItem->uID, NULL); + RECT rc; + GetItemRect(index, &rc); + ClientToScreen(&rc); // I have no idea why this is needed! >_< + WORD x = (rc.left + rc.right) / 2; + WORD y = (rc.top + rc.bottom) / 2; + DbgPrint("ClientToScreen returned (%d, %d, %d, %d) x=%d, y=%d", + rc.left, rc.top, + rc.right, rc.bottom, x, y); + m_Balloons->TrackPosition(x, y); + m_Balloons->UpdateTipText(m_BalloonsParent, reinterpret_cast<LPARAM>(m_hWnd), notifyItem->szInfo); + m_Balloons->TrackActivate(m_BalloonsParent, reinterpret_cast<LPARAM>(m_hWnd)); + m_currentTooltip = notifyItem; + + return TRUE; + } + + VOID HideBalloonTip(IN OUT InternalIconData *notifyItem) + { + DbgPrint("HideBalloonTip called"); + + if (m_currentTooltip == notifyItem) + { + // Prevent Re-entry + m_currentTooltip = NULL; + m_Balloons->TrackDeactivate(); + } + } + + VOID HideCurrentBalloon() + { + if (m_currentTooltip != NULL) + HideBalloonTip(m_currentTooltip); + } + VOID GetTooltipText(int index, LPTSTR szTip, DWORD cchTip) { - NOTIFYICONDATA * notifyItem; - notifyItem = GetItemData(index); + InternalIconData * notifyItem = GetItemData(index); if (notifyItem) { @@ -626,7 +759,7 @@ public: int count = GetButtonCount(); for (int i = 0; i < count; i++) { - NOTIFYICONDATA * data = GetItemData(i); + InternalIconData * data = GetItemData(i); BOOL hasSharedIcon = data->dwState & NIS_SHAREDICON; INT iIcon = hasSharedIcon ? FindExistingSharedIcon(data->hIcon) : -1; if (iIcon < 0) @@ -659,7 +792,7 @@ private: L"WM_XBUTTONDBLCLK" }; - NOTIFYICONDATA * notifyItem = GetItemData(wIndex); + InternalIconData * notifyItem = GetItemData(wIndex); if (!::IsWindow(notifyItem->hWnd)) { @@ -770,15 +903,17 @@ private: return 0; } - 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) + void Initialize(HWND hWndParent, CTooltips * tooltips) { + m_BalloonsParent = hWndParent; + m_Balloons = tooltips; + DWORD styles = WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | TBSTYLE_WRAPABLE | TBSTYLE_TRANSPARENT | @@ -786,6 +921,13 @@ public: SubclassWindow(CToolbar::Create(hWndParent, styles)); + // Force the toolbar tooltips window to always show tooltips even if not foreground + HWND tooltipsWnd = (HWND)SendMessageW(TB_GETTOOLTIPS); + if (tooltipsWnd) + { + ::SetWindowLong(tooltipsWnd, GWL_STYLE, ::GetWindowLong(tooltipsWnd, GWL_STYLE) | TTS_ALWAYSTIP); + } + SetWindowTheme(m_hWnd, L"TrayNotify", NULL); m_ImageList = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 0, 1000); @@ -810,6 +952,8 @@ class CSysPagerWnd : { CNotifyToolbar Toolbar; + CTooltips m_Balloons; + public: CSysPagerWnd() {} virtual ~CSysPagerWnd() {} @@ -839,9 +983,27 @@ public: LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - Toolbar.Initialize(m_hWnd); + Toolbar.Initialize(m_hWnd, &m_Balloons); CIconWatcher::Initialize(m_hWnd); + HWND hWndTop = GetAncestor(m_hWnd, GA_ROOT); + + m_Balloons.Create(hWndTop, TTS_NOPREFIX | TTS_BALLOON | TTS_CLOSE); + + TOOLINFOW ti = { 0 }; + ti.cbSize = TTTOOLINFOW_V1_SIZE; + ti.uFlags = TTF_TRACK | TTF_IDISHWND; + ti.uId = reinterpret_cast<UINT_PTR>(Toolbar.m_hWnd); + ti.hwnd = m_hWnd; + ti.lpszText = NULL; + ti.lParam = NULL; + + BOOL ret = m_Balloons.AddTool(&ti); + if (!ret) + { + DbgPrint("AddTool failed, LastError=%d (probably meaningless unless non-zero)", GetLastError()); + } + // Explicitly request running applications to re-register their systray icons ::SendNotifyMessageW(HWND_BROADCAST, RegisterWindowMessageW(L"TaskbarCreated"), @@ -890,6 +1052,11 @@ public: (void)RemoveIconFromWatcher(iconData); } break; + case NIM_SETFOCUS: + Toolbar.SetFocus(); + ret = TRUE; + case NIM_SETVERSION: + ret = Toolbar.SwitchVersion(iconData); default: TRACE("NotifyIconCmd received with unknown code %d.\n", data->notify_code); return FALSE; @@ -996,6 +1163,13 @@ public: return 0; } + LRESULT OnBalloonPop(UINT uCode, LPNMHDR hdr , BOOL& bHandled) + { + Toolbar.HideCurrentBalloon(); + bHandled = TRUE; + return 0; + } + void ResizeImagelist() { Toolbar.ResizeImagelist(); @@ -1009,6 +1183,7 @@ public: MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_CONTEXTMENU, OnCtxMenu) + NOTIFY_CODE_HANDLER(TTN_POP, OnBalloonPop) NOTIFY_CODE_HANDLER(TBN_GETINFOTIPW, OnGetInfoTip) NOTIFY_CODE_HANDLER(NM_CUSTOMDRAW, OnCustomDraw) END_MSG_MAP() diff --git a/sdk/include/reactos/rosctrls.h b/sdk/include/reactos/rosctrls.h index a5976416d8..f332aca915 100644 --- a/sdk/include/reactos/rosctrls.h +++ b/sdk/include/reactos/rosctrls.h @@ -581,3 +581,228 @@ public: } }; + +class CTooltips : + public CWindow +{ +public: // Configuration methods + + HWND Create(HWND hWndParent, DWORD dwStyles = WS_POPUP | TTS_NOPREFIX, DWORD dwExStyles = WS_EX_TOPMOST) + { + RECT r = { 0 }; + return CWindow::Create(TOOLTIPS_CLASS, hWndParent, r, L"", dwStyles, dwExStyles); + } + +public: // Relay event + + // Win7+: Can use GetMessageExtraInfo to provide the WPARAM value. + VOID RelayEvent(MSG * pMsg, WPARAM extraInfo = 0) + { + SendMessageW(TTM_RELAYEVENT, extraInfo, reinterpret_cast<LPARAM>(pMsg)); + } + +public: // Helpers + + INT GetToolCount() + { + return SendMessageW(TTM_GETTOOLCOUNT, 0, 0); + } + + BOOL AddTool(IN CONST TTTOOLINFOW * pInfo) + { + return SendMessageW(TTM_ADDTOOL, 0, reinterpret_cast<LPARAM>(pInfo)); + } + + VOID DelTool(IN HWND hwndToolOwner, IN UINT uId) + { + TTTOOLINFOW info = { sizeof(TTTOOLINFOW), 0 }; + info.hwnd = hwndToolOwner; + info.uId = uId; + SendMessageW(TTM_DELTOOL, 0, reinterpret_cast<LPARAM>(&info)); + } + + VOID NewToolRect(IN HWND hwndToolOwner, IN UINT uId, IN RECT rect) + { + TTTOOLINFOW info = { sizeof(TTTOOLINFOW), 0 }; + info.hwnd = hwndToolOwner; + info.uId = uId; + info.rect = rect; + SendMessageW(TTM_NEWTOOLRECT, 0, reinterpret_cast<LPARAM>(&info)); + } + + BOOL GetToolInfo(IN HWND hwndToolOwner, IN UINT uId, IN OUT TTTOOLINFOW * pInfo) + { + pInfo->hwnd = hwndToolOwner; + pInfo->uId = uId; + return SendMessageW(TTM_GETTOOLINFO, 0, reinterpret_cast<LPARAM>(pInfo)); + } + + VOID SetToolInfo(IN CONST TTTOOLINFOW * pInfo) + { + SendMessageW(TTM_SETTOOLINFO, 0, reinterpret_cast<LPARAM>(pInfo)); + } + + BOOL HitTest(IN CONST TTHITTESTINFOW * pInfo) + { + return SendMessageW(TTM_HITTEST, 0, reinterpret_cast<LPARAM>(pInfo)); + } + + VOID GetText(IN HWND hwndToolOwner, IN UINT uId, OUT PWSTR pBuffer, IN DWORD cchBuffer) + { + TTTOOLINFOW info = { sizeof(TTTOOLINFOW), 0 }; + info.hwnd = hwndToolOwner; + info.uId = uId; + info.lpszText = pBuffer; + SendMessageW(TTM_GETTEXT, cchBuffer, reinterpret_cast<LPARAM>(&info)); + } + + VOID UpdateTipText(IN HWND hwndToolOwner, IN UINT uId, IN PCWSTR szText, IN HINSTANCE hinstResourceOwner = NULL) + { + TTTOOLINFOW info = { sizeof(TTTOOLINFOW), 0 }; + info.hwnd = hwndToolOwner; + info.uId = uId; + info.lpszText = const_cast<PWSTR>(szText); + info.hinst = hinstResourceOwner; + SendMessageW(TTM_UPDATETIPTEXT, 0, reinterpret_cast<LPARAM>(&info)); + } + + BOOL EnumTools(IN CONST TTTOOLINFOW * pInfo) + { + return SendMessageW(TTM_ENUMTOOLS, 0, reinterpret_cast<LPARAM>(pInfo)); + } + + BOOL GetCurrentTool(OUT OPTIONAL TTTOOLINFOW * pInfo = NULL) + { + return SendMessageW(TTM_GETCURRENTTOOL, 0, reinterpret_cast<LPARAM>(pInfo)); + } + + VOID GetTitle(TTGETTITLE * pTitleInfo) + { + SendMessageW(TTM_GETTITLE, 0, reinterpret_cast<LPARAM>(pTitleInfo)); + } + + BOOL SetTitle(PCWSTR szTitleText, WPARAM icon = 0) + { + return SendMessageW(TTM_SETTITLE, icon, reinterpret_cast<LPARAM>(szTitleText)); + } + + VOID TrackActivate(IN HWND hwndToolOwner, IN UINT uId) + { + TTTOOLINFOW info = { sizeof(TTTOOLINFOW), 0 }; + info.hwnd = hwndToolOwner; + info.uId = uId; + SendMessageW(TTM_TRACKACTIVATE, TRUE, reinterpret_cast<LPARAM>(&info)); + } + + VOID TrackDeactivate() + { + SendMessageW(TTM_TRACKACTIVATE, FALSE, NULL); + } + + VOID TrackPosition(IN WORD x, IN WORD y) + { + SendMessageW(TTM_TRACKPOSITION, 0, MAKELPARAM(x, y)); + } + + // Opens the tooltip + VOID Popup() + { + SendMessageW(TTM_POPUP); + } + + // Closes the tooltip - Pressing the [X] for a TTF_CLOSE balloon is equivalent to calling this + VOID Pop() + { + SendMessageW(TTM_POP); + } + + // Delay times for AUTOMATIC tooltips (they don't affect balloons) + INT GetDelayTime(UINT which) + { + return SendMessageW(TTM_GETDELAYTIME, which); + } + + VOID SetDelayTime(UINT which, WORD time) + { + SendMessageW(TTM_SETDELAYTIME, which, MAKELPARAM(time, 0)); + } + + // Activates or deactivates the automatic tooltip display when hovering a control + VOID Activate(IN BOOL bActivate = TRUE) + { + SendMessageW(TTM_ACTIVATE, bActivate); + } + + // Adjusts the position of a tooltip when used to display trimmed text + VOID AdjustRect(IN BOOL bTextToWindow, IN OUT RECT * pRect) + { + SendMessageW(TTM_ADJUSTRECT, bTextToWindow, reinterpret_cast<LPARAM>(pRect)); + } + + // Useful for TTF_ABSOLUTE|TTF_TRACK tooltip positioning + SIZE GetBubbleSize(IN TTTOOLINFOW * pInfo) + { + DWORD ret = SendMessageW(TTM_GETBUBBLESIZE, 0, reinterpret_cast<LPARAM>(pInfo)); + const SIZE sz = { LOWORD(ret), HIWORD(ret) }; + return sz; + } + + // Fills the RECT with the margin size previously set. Default is 0 margins. + VOID GetMargin(OUT RECT * pRect) + { + SendMessageW(TTM_GETMARGIN, 0, reinterpret_cast<LPARAM>(pRect)); + } + + VOID SetMargin(IN RECT * pRect) + { + SendMessageW(TTM_SETMARGIN, 0, reinterpret_cast<LPARAM>(pRect)); + } + + // Gets a previously established max width. Returns -1 if no limit is set + INT GetMaxTipWidth() + { + return SendMessageW(TTM_GETMAXTIPWIDTH); + } + + INT SetMaxTipWidth(IN OPTIONAL INT width = -1) + { + return SendMessageW(TTM_SETMAXTIPWIDTH, 0, width); + } + + // Get the color of the tooltip text + COLORREF GetTipTextColor() + { + return SendMessageW(TTM_GETTIPTEXTCOLOR); + } + + VOID SetTipTextColor(IN COLORREF textColor) + { + SendMessageW(TTM_SETTIPTEXTCOLOR, textColor); + } + + COLORREF GetTipBkColor() + { + return SendMessageW(TTM_GETTIPBKCOLOR); + } + + VOID SetTipBkColor(IN COLORREF textColor) + { + SendMessageW(TTM_SETTIPBKCOLOR, textColor); + } + + VOID SetWindowTheme(IN PCWSTR szThemeName) + { + SendMessageW(TTM_SETWINDOWTHEME, 0, reinterpret_cast<LPARAM>(szThemeName)); + } + + // Forces redraw + VOID Update() + { + SendMessageW(TTM_UPDATE); + } + + HWND WindowFromPoint(IN POINT * pPoint) + { + return reinterpret_cast<HWND>(SendMessageW(TTM_WINDOWFROMPOINT, 0, reinterpret_cast<LPARAM>(pPoint))); + } +};

1 0

01/01: [NTOSKRNL] Reimplement the lazy writer in Cc and remove the "basic" one in Mm. This removes the "modified page writer" thread in Mm that was regularly blindly attempting to flush dirty pages to the disk. Instead, this commit introduces a lazy writer that will monitor dirty pages count and will flush them to disk when this count is above a threshold. The threshold is computed on Cc init. Compared to what was done previously, this lazy writer will only write down files that are not marked a
by Pierre Schweitzer 23 Jan '18

23 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c7ad200f8bc1b40c6ed94… commit c7ad200f8bc1b40c6ed942176eb43d0a04bfaf8a Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Jan 23 19:07:25 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Jan 23 19:33:59 2018 +0100 [NTOSKRNL] Reimplement the lazy writer in Cc and remove the "basic" one in Mm. This removes the "modified page writer" thread in Mm that was regularly blindly attempting to flush dirty pages to the disk. Instead, this commit introduces a lazy writer that will monitor dirty pages count and will flush them to disk when this count is above a threshold. The threshold is computed on Cc init. Compared to what was done previously, this lazy writer will only write down files that are not marked as temporary. The mechanisms involved in this lazy writer worker are well described in Windows Internals 4th editions (constants are coming from it ;-)). Also fixed a bad (and old!) bug in CcRosFlushDirtyPages() where target count could be overflow and the function would spin forever while holding the VACBs lock. This is mandatory as now lazy writer will call it with "random" values. This also allows implementing CcWaitForCurrentLazyWriterActivity() :-). Also renamed DirtyPageCount to its MS equivalent. CORE-14235 --- ntoskrnl/cache/newcc.h | 2 +- ntoskrnl/cc/cacheman.c | 11 ++- ntoskrnl/cc/copy.c | 18 ++++- ntoskrnl/cc/fs.c | 4 +- ntoskrnl/cc/view.c | 173 ++++++++++++++++++++++++++++++++++++++--- ntoskrnl/include/internal/cc.h | 13 +++- ntoskrnl/mm/mminit.c | 78 ------------------- ntoskrnl/po/poshtdwn.c | 3 +- ntoskrnl/po/power.c | 3 +- 9 files changed, 205 insertions(+), 100 deletions(-) diff --git a/ntoskrnl/cache/newcc.h b/ntoskrnl/cache/newcc.h index adbf1c5d92..63f4841229 100644 --- a/ntoskrnl/cache/newcc.h +++ b/ntoskrnl/cache/newcc.h @@ -53,7 +53,7 @@ CcMdlWriteComplete2(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN PMDL MdlChain); -VOID +BOOLEAN NTAPI CcInitView(VOID); diff --git a/ntoskrnl/cc/cacheman.c b/ntoskrnl/cc/cacheman.c index 4d62314ccd..2c2c2238c9 100644 --- a/ntoskrnl/cc/cacheman.c +++ b/ntoskrnl/cc/cacheman.c @@ -41,8 +41,15 @@ NTAPI INIT_FUNCTION CcInitializeCacheManager(VOID) { - CcInitView(); - return TRUE; + return CcInitView(); +} + +VOID +NTAPI +CcShutdownSystem(VOID) +{ + /* Inform the lazy writer it has to stop activity */ + CcShutdownLazyWriter(); } /* diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index 15c6ceb81b..dadae020c7 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -34,6 +34,8 @@ ULONG CcFastReadWait; ULONG CcFastReadNoWait; ULONG CcFastReadResourceMiss; +extern KEVENT iLazyWriterNotify; + /* FUNCTIONS *****************************************************************/ VOID @@ -516,14 +518,26 @@ CcFastCopyWrite ( } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI CcWaitForCurrentLazyWriterActivity ( VOID) { - UNIMPLEMENTED; + NTSTATUS Status; + + /* Lazy writer is done when its event is set */ + Status = KeWaitForSingleObject(&iLazyWriterNotify, + Executive, + KernelMode, + FALSE, + NULL); + if (!NT_SUCCESS(Status)) + { + return Status; + } + return STATUS_SUCCESS; } diff --git a/ntoskrnl/cc/fs.c b/ntoskrnl/cc/fs.c index 4958478f3f..76a073af1b 100644 --- a/ntoskrnl/cc/fs.c +++ b/ntoskrnl/cc/fs.c @@ -20,7 +20,7 @@ /* GLOBALS *****************************************************************/ extern KGUARDED_MUTEX ViewLock; -extern ULONG DirtyPageCount; +extern ULONG CcTotalDirtyPages; NTSTATUS CcRosInternalFreeVacb(PROS_VACB Vacb); @@ -239,7 +239,7 @@ CcPurgeCacheSection ( if (Vacb->Dirty) { RemoveEntryList(&Vacb->DirtyVacbListEntry); - DirtyPageCount -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; + CcTotalDirtyPages -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; } RemoveEntryList(&Vacb->CacheMapVacbListEntry); InsertHeadList(&FreeList, &Vacb->CacheMapVacbListEntry); diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 0e37b77efc..8fb7f5333c 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -43,7 +43,6 @@ LIST_ENTRY DirtyVacbListHead; static LIST_ENTRY VacbLruListHead; -ULONG DirtyPageCount = 0; KGUARDED_MUTEX ViewLock; @@ -51,6 +50,27 @@ NPAGED_LOOKASIDE_LIST iBcbLookasideList; static NPAGED_LOOKASIDE_LIST SharedCacheMapLookasideList; static NPAGED_LOOKASIDE_LIST VacbLookasideList; +/* Counters: + * - Amount of pages flushed by lazy writer + * - Number of times lazy writer ran + */ +ULONG CcLazyWritePages = 0; +ULONG CcLazyWriteIos = 0; + +/* Internal vars (MS): + * - Threshold above which lazy writer will start action + * - Amount of dirty pages + */ +ULONG CcDirtyPageThreshold = 0; +ULONG CcTotalDirtyPages = 0; + +/* Internal vars (ROS): + * - Event to notify lazy writer to shutdown + * - Event to inform watchers lazy writer is done for this loop + */ +KEVENT iLazyWriterShutdown; +KEVENT iLazyWriterNotify; + #if DBG static void CcRosVacbIncRefCount_(PROS_VACB vacb, const char* file, int line) { @@ -145,7 +165,7 @@ CcRosFlushVacb ( Vacb->Dirty = FALSE; RemoveEntryList(&Vacb->DirtyVacbListEntry); - DirtyPageCount -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; + CcTotalDirtyPages -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; CcRosVacbDecRefCount(Vacb); KeReleaseSpinLock(&Vacb->SharedCacheMap->CacheMapLock, oldIrql); @@ -160,7 +180,8 @@ NTAPI CcRosFlushDirtyPages ( ULONG Target, PULONG Count, - BOOLEAN Wait) + BOOLEAN Wait, + BOOLEAN CalledFromLazy) { PLIST_ENTRY current_entry; PROS_VACB current; @@ -191,6 +212,14 @@ CcRosFlushDirtyPages ( CcRosVacbIncRefCount(current); + /* When performing lazy write, don't handle temporary files */ + if (CalledFromLazy && + BooleanFlagOn(current->SharedCacheMap->FileObject->Flags, FO_TEMPORARY_FILE)) + { + CcRosVacbDecRefCount(current); + continue; + } + Locked = current->SharedCacheMap->Callbacks->AcquireForLazyWrite( current->SharedCacheMap->LazyWriteContext, Wait); if (!Locked) @@ -239,8 +268,22 @@ CcRosFlushDirtyPages ( } else { - (*Count) += VACB_MAPPING_GRANULARITY / PAGE_SIZE; - Target -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; + ULONG PagesFreed; + + /* How many pages did we free? */ + PagesFreed = VACB_MAPPING_GRANULARITY / PAGE_SIZE; + (*Count) += PagesFreed; + + /* Make sure we don't overflow target! */ + if (Target < PagesFreed) + { + /* If we would have, jump to zero directly */ + Target = 0; + } + else + { + Target -= PagesFreed; + } } current_entry = DirtyVacbListHead.Flink; @@ -253,6 +296,60 @@ CcRosFlushDirtyPages ( return STATUS_SUCCESS; } +/* FIXME: Someday this could somewhat implement write-behind/read-ahead */ +VOID +NTAPI +CciLazyWriter(PVOID Unused) +{ + LARGE_INTEGER OneSecond; + + OneSecond.QuadPart = (LONGLONG)-1*1000*1000*10; + + while (TRUE) + { + NTSTATUS Status; + ULONG Target, Count = 0; + + /* One per second or until we have to stop */ + Status = KeWaitForSingleObject(&iLazyWriterShutdown, + Executive, + KernelMode, + FALSE, + &OneSecond); + + /* If we succeeed, we've to stop running! */ + if (Status == STATUS_SUCCESS) + { + break; + } + + /* We're not sleeping anymore */ + KeClearEvent(&iLazyWriterNotify); + + /* Only start operations if above threshold */ + DPRINT("TS: %lu, Count: %lu\n", CcDirtyPageThreshold, CcTotalDirtyPages); + if (CcTotalDirtyPages > CcDirtyPageThreshold) + { + /* Our target is one-eighth of the dirty pages */ + Target = CcTotalDirtyPages / 8; + if (Target != 0) + { + /* Flush! */ + DPRINT("Lazy writer starting (%d)\n", Target); + CcRosFlushDirtyPages(Target, &Count, FALSE, TRUE); + + /* And update stats */ + CcLazyWritePages += Count; + ++CcLazyWriteIos; + DPRINT("Lazy writer done (%d)\n", Count); + } + } + + /* Inform people waiting on us that we're done */ + KeSetEvent(&iLazyWriterNotify, IO_DISK_INCREMENT, FALSE); + } +} + NTSTATUS CcRosTrimCache ( ULONG Target, @@ -346,7 +443,7 @@ retry: if ((Target > 0) && !FlushedPages) { /* Flush dirty pages to disk */ - CcRosFlushDirtyPages(Target, &PagesFreed, FALSE); + CcRosFlushDirtyPages(Target, &PagesFreed, FALSE, FALSE); FlushedPages = TRUE; /* We can only swap as many pages as we flushed */ @@ -403,7 +500,7 @@ CcRosReleaseVacb ( if (!WasDirty && Vacb->Dirty) { InsertTailList(&DirtyVacbListHead, &Vacb->DirtyVacbListEntry); - DirtyPageCount += VACB_MAPPING_GRANULARITY / PAGE_SIZE; + CcTotalDirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; } if (Mapped) @@ -499,7 +596,7 @@ CcRosMarkDirtyVacb ( if (!Vacb->Dirty) { InsertTailList(&DirtyVacbListHead, &Vacb->DirtyVacbListEntry); - DirtyPageCount += VACB_MAPPING_GRANULARITY / PAGE_SIZE; + CcTotalDirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; } else { @@ -552,7 +649,7 @@ CcRosUnmapVacb ( if (!WasDirty && NowDirty) { InsertTailList(&DirtyVacbListHead, &Vacb->DirtyVacbListEntry); - DirtyPageCount += VACB_MAPPING_GRANULARITY / PAGE_SIZE; + CcTotalDirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; } CcRosVacbDecRefCount(Vacb); @@ -1014,7 +1111,7 @@ CcRosDeleteFileCache ( if (current->Dirty) { RemoveEntryList(&current->DirtyVacbListEntry); - DirtyPageCount -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; + CcTotalDirtyPages -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; DPRINT1("Freeing dirty VACB\n"); } InsertHeadList(&FreeList, &current->CacheMapVacbListEntry); @@ -1230,11 +1327,24 @@ CcGetFileObjectFromSectionPtrs ( } VOID +NTAPI +CcShutdownLazyWriter ( + VOID) +{ + /* Simply set the event, lazy writer will stop when it's done */ + KeSetEvent(&iLazyWriterShutdown, IO_DISK_INCREMENT, FALSE); +} + +BOOLEAN INIT_FUNCTION NTAPI CcInitView ( VOID) { + HANDLE LazyWriter; + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + DPRINT("CcInitView()\n"); InitializeListHead(&DirtyVacbListHead); @@ -1264,7 +1374,50 @@ CcInitView ( MmInitializeMemoryConsumer(MC_CACHE, CcRosTrimCache); + /* Initialize lazy writer events */ + KeInitializeEvent(&iLazyWriterShutdown, SynchronizationEvent, FALSE); + KeInitializeEvent(&iLazyWriterNotify, NotificationEvent, FALSE); + + /* Define lazy writer threshold, depending on system type */ + switch (MmQuerySystemSize()) + { + case MmSmallSystem: + CcDirtyPageThreshold = MmNumberOfPhysicalPages / 8; + break; + + case MmMediumSystem: + CcDirtyPageThreshold = MmNumberOfPhysicalPages / 4; + break; + + case MmLargeSystem: + CcDirtyPageThreshold = MmNumberOfPhysicalPages / 8 + MmNumberOfPhysicalPages / 4; + break; + } + + /* Start the lazy writer thread */ + InitializeObjectAttributes(&ObjectAttributes, + NULL, + OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = PsCreateSystemThread(&LazyWriter, + THREAD_ALL_ACCESS, + &ObjectAttributes, + NULL, + NULL, + CciLazyWriter, + NULL); + if (!NT_SUCCESS(Status)) + { + return FALSE; + } + + /* Handle is not needed */ + ObCloseHandle(LazyWriter, KernelMode); + CcInitCacheZeroPage(); + + return TRUE; } /* EOF */ diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index 58d2b15a50..b1bb1ab165 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -240,10 +240,14 @@ CcRosGetVacb( PROS_VACB *Vacb ); -VOID +BOOLEAN NTAPI CcInitView(VOID); +VOID +NTAPI +CcShutdownLazyWriter(VOID); + NTSTATUS NTAPI CcReadVirtualAddress(PROS_VACB Vacb); @@ -287,7 +291,8 @@ NTAPI CcRosFlushDirtyPages( ULONG Target, PULONG Count, - BOOLEAN Wait + BOOLEAN Wait, + BOOLEAN CalledFromLazy ); VOID @@ -342,6 +347,10 @@ NTSTATUS NTAPI CcTryToInitializeFileCache(PFILE_OBJECT FileObject); +VOID +NTAPI +CcShutdownSystem(VOID); + FORCEINLINE NTSTATUS CcRosAcquireVacbLock( diff --git a/ntoskrnl/mm/mminit.c b/ntoskrnl/mm/mminit.c index 3fff72b771..7f756cb778 100644 --- a/ntoskrnl/mm/mminit.c +++ b/ntoskrnl/mm/mminit.c @@ -19,9 +19,6 @@ VOID NTAPI MiInitializeUserPfnBitmap(VOID); -HANDLE MpwThreadHandle; -KEVENT MpwThreadEvent; - BOOLEAN Mm64BitPhysicalAddress = FALSE; ULONG MmReadClusterSize; // @@ -169,76 +166,6 @@ MiDbgDumpAddressSpace(VOID) "Non Paged Pool Expansion PTE Space"); } -VOID -NTAPI -MmMpwThreadMain(PVOID Parameter) -{ - NTSTATUS Status; -#ifndef NEWCC - ULONG PagesWritten; -#endif - LARGE_INTEGER Timeout; - - UNREFERENCED_PARAMETER(Parameter); - - Timeout.QuadPart = -50000000; - - for(;;) - { - Status = KeWaitForSingleObject(&MpwThreadEvent, - 0, - KernelMode, - FALSE, - &Timeout); - if (!NT_SUCCESS(Status)) - { - DbgPrint("MpwThread: Wait failed\n"); - KeBugCheck(MEMORY_MANAGEMENT); - return; - } - -#ifndef NEWCC - PagesWritten = 0; - - // XXX arty -- we flush when evicting pages or destorying cache - // sections. - CcRosFlushDirtyPages(128, &PagesWritten, FALSE); -#endif - } -} - -NTSTATUS -NTAPI -INIT_FUNCTION -MmInitMpwThread(VOID) -{ - KPRIORITY Priority; - NTSTATUS Status; - CLIENT_ID MpwThreadId; - - KeInitializeEvent(&MpwThreadEvent, SynchronizationEvent, FALSE); - - Status = PsCreateSystemThread(&MpwThreadHandle, - THREAD_ALL_ACCESS, - NULL, - NULL, - &MpwThreadId, - MmMpwThreadMain, - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - Priority = 27; - NtSetInformationThread(MpwThreadHandle, - ThreadPriority, - &Priority, - sizeof(Priority)); - - return(STATUS_SUCCESS); -} - NTSTATUS NTAPI INIT_FUNCTION @@ -338,11 +265,6 @@ MmInitSystem(IN ULONG Phase, */ MiInitBalancerThread(); - /* - * Initialise the modified page writer. - */ - MmInitMpwThread(); - /* Initialize the balance set manager */ MmInitBsmThread(); diff --git a/ntoskrnl/po/poshtdwn.c b/ntoskrnl/po/poshtdwn.c index 3ebf899bd5..04618c9f54 100644 --- a/ntoskrnl/po/poshtdwn.c +++ b/ntoskrnl/po/poshtdwn.c @@ -279,11 +279,10 @@ PopGracefulShutdown(IN PVOID Context) CmShutdownSystem(); /* Note that modified pages should be written here (MiShutdownSystem) */ -#ifdef NEWCC + /* Flush all user files before we start shutting down IO */ /* This is where modified pages are written back by the IO manager */ CcShutdownSystem(); -#endif /* In this step, the I/O manager does last-chance shutdown notification */ DPRINT("I/O manager shutting down in phase 1\n"); diff --git a/ntoskrnl/po/power.c b/ntoskrnl/po/power.c index 9b96b6016e..2dee988b34 100644 --- a/ntoskrnl/po/power.c +++ b/ntoskrnl/po/power.c @@ -952,7 +952,8 @@ NtSetSystemPowerState(IN POWER_ACTION SystemAction, #ifndef NEWCC /* Flush dirty cache pages */ - CcRosFlushDirtyPages(-1, &Dummy, FALSE); //HACK: We really should wait here! + /* XXX: Is that still mandatory? As now we'll wait on lazy writer to complete? */ + CcRosFlushDirtyPages(-1, &Dummy, FALSE, FALSE); //HACK: We really should wait here! #else Dummy = 0; #endif

1 0

01/01: [DESK.CPL] Update de-DE.rc for flat menus option
by Joachim Henze 23 Jan '18

23 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2382435e884e117577e89… commit 2382435e884e117577e899374c9f38d9312e085e Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Jan 23 19:29:28 2018 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Jan 23 19:29:28 2018 +0100 [DESK.CPL] Update de-DE.rc for flat menus option --- dll/cpl/desk/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/desk/lang/de-DE.rc b/dll/cpl/desk/lang/de-DE.rc index f555dfe55b..9b9a325ff1 100644 --- a/dll/cpl/desk/lang/de-DE.rc +++ b/dll/cpl/desk/lang/de-DE.rc @@ -109,7 +109,7 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "Ver&stecke Unterstrich der Tastaturnavigation bis zum Druck der Alt-Taste", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 - CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + CONTROL "Ver&wende flache Menüs", IDC_EFFAPPEARANCE_FLATMENUS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Abbrechen", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14

1 0

01/01: [UXTHEME] Add missing THEME_BUTTON_STATES
by Stanislav Motylkov 23 Jan '18

23 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=25564cda9d2389595ddf3… commit 25564cda9d2389595ddf3fc65214824b380d5d46 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Jan 23 14:05:09 2018 +0300 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Tue Jan 23 14:46:57 2018 +0200 [UXTHEME] Add missing THEME_BUTTON_STATES CORE-14245 #resolve --- dll/win32/uxtheme/nonclient.c | 12 +++++------- dll/win32/uxtheme/uxthemep.h | 5 ++++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dll/win32/uxtheme/nonclient.c b/dll/win32/uxtheme/nonclient.c index fb40624fcb..b777d02e41 100644 --- a/dll/win32/uxtheme/nonclient.c +++ b/dll/win32/uxtheme/nonclient.c @@ -289,7 +289,7 @@ ThemeDrawCaptionButton(PDRAW_CONTEXT pcontext, if (!(pcontext->wi.dwStyle & WS_MINIMIZEBOX)) return; else - iStateId = BUTTON_DISABLED; + iStateId = (pcontext->Active ? BUTTON_DISABLED : BUTTON_INACTIVE_DISABLED); } iPartId = pcontext->wi.dwStyle & WS_MAXIMIZE ? WP_RESTOREBUTTON : WP_MAXBUTTON; @@ -301,7 +301,7 @@ ThemeDrawCaptionButton(PDRAW_CONTEXT pcontext, if (!(pcontext->wi.dwStyle & WS_MAXIMIZEBOX)) return; else - iStateId = BUTTON_DISABLED; + iStateId = (pcontext->Active ? BUTTON_DISABLED : BUTTON_INACTIVE_DISABLED); } iPartId = pcontext->wi.dwStyle & WS_MINIMIZE ? WP_RESTOREBUTTON : WP_MINBUTTON; @@ -322,13 +322,11 @@ static DWORD ThemeGetButtonState(DWORD htCurrect, DWORD htHot, DWORD htDown, BOOL Active) { if (htHot == htCurrect) - return BUTTON_HOT; - if (!Active) - return BUTTON_INACTIVE; + return (Active ? BUTTON_HOT : BUTTON_INACTIVE_HOT); if (htDown == htCurrect) - return BUTTON_PRESSED; + return (Active ? BUTTON_PRESSED : BUTTON_INACTIVE_PRESSED); - return BUTTON_NORMAL; + return (Active ? BUTTON_NORMAL : BUTTON_INACTIVE); } /* Used only from mouse event handlers */ diff --git a/dll/win32/uxtheme/uxthemep.h b/dll/win32/uxtheme/uxthemep.h index 2708cdd48f..31e50566b9 100644 --- a/dll/win32/uxtheme/uxthemep.h +++ b/dll/win32/uxtheme/uxthemep.h @@ -205,7 +205,10 @@ typedef enum { BUTTON_HOT , BUTTON_PRESSED , BUTTON_DISABLED , - BUTTON_INACTIVE + BUTTON_INACTIVE , + BUTTON_INACTIVE_HOT , + BUTTON_INACTIVE_PRESSED , + BUTTON_INACTIVE_DISABLED } THEME_BUTTON_STATES; #define HT_ISBUTTON(ht) ((ht) == HTMINBUTTON || (ht) == HTMAXBUTTON || (ht) == HTCLOSE || (ht) == HTHELP)

1 0

01/01: [SHLWAPI] Partly revert SHLWAPI Wine 3.0 sync b725032 .
by Hermès Bélusca-Maïto 22 Jan '18

22 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9e07da5ccb84b5aad5d3c… commit 9e07da5ccb84b5aad5d3ca1dee82af5efaffdd30 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 22 20:54:31 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jan 22 21:07:21 2018 +0100 [SHLWAPI] Partly revert SHLWAPI Wine 3.0 sync b725032 . This Wine sync (that was not done against WineStaging) erased code that had been submitted to WineStaging by the ReactOS team (clist.c fixes, see r73565 a05881c and r73976 7b6b597) or added in r68042 9a78054. To that aim I add explicit #if(n)def __REACTOS__ guards around the code. --- dll/win32/shlwapi/assoc.c | 234 ++++++++++++++++++++++++++++++++++++++++++++++ dll/win32/shlwapi/clist.c | 32 ++++++- 2 files changed, 265 insertions(+), 1 deletion(-) diff --git a/dll/win32/shlwapi/assoc.c b/dll/win32/shlwapi/assoc.c index b34c272455..a6d03a1a4b 100644 --- a/dll/win32/shlwapi/assoc.c +++ b/dll/win32/shlwapi/assoc.c @@ -89,6 +89,177 @@ HRESULT WINAPI AssocCreate(CLSID clsid, REFIID refiid, void **lpInterface) return SHCoCreateInstance( NULL, &clsid, NULL, refiid, lpInterface ); } +#ifdef __REACTOS__ + +struct AssocPerceivedInfo +{ + PCWSTR Type; + PERCEIVED Perceived; + INT FlagHardcoded; + INT FlagSoftcoded; + PCWSTR Extensions; +}; + +static const WCHAR unspecified_exts[] = { + '.','l','n','k',0, + '.','s','e','a','r','c','h','-','m','s',0, + 0 +}; + +static const WCHAR image_exts[] = { + '.','b','m','p',0, + '.','d','i','b',0, + '.','e','m','f',0, + '.','g','i','f',0, + '.','i','c','o',0, + '.','j','f','i','f',0, + '.','j','p','e',0, + '.','j','p','e','g',0, + '.','j','p','g',0, + '.','p','n','g',0, + '.','r','l','e',0, + '.','t','i','f',0, + '.','t','i','f','f',0, + '.','w','m','f',0, + 0 +}; + +static const WCHAR audio_exts[] = { + '.','a','i','f',0, + '.','a','i','f','c',0, + '.','a','i','f','f',0, + '.','a','u',0, + '.','m','3','u',0, + '.','m','i','d',0, + '.','m','i','d','i',0, +#if _WIN32_WINNT > 0x602 + '.','m','p','2',0, +#endif + '.','m','p','3',0, + '.','r','m','i',0, + '.','s','n','d',0, + '.','w','a','v',0, + '.','w','a','x',0, + '.','w','m','a',0, + 0 +}; + +static const WCHAR video_exts[] = { + '.','a','s','f',0, + '.','a','s','x',0, + '.','a','v','i',0, + '.','d','v','r','-','m','s',0, + '.','I','V','F',0, + '.','m','1','v',0, +#if _WIN32_WINNT <= 0x602 + '.','m','p','2',0, +#endif + '.','m','p','2','v',0, + '.','m','p','a',0, + '.','m','p','e',0, + '.','m','p','e','g',0, + '.','m','p','g',0, + '.','m','p','v','2',0, + '.','w','m',0, + '.','w','m','v',0, + '.','w','m','x',0, + '.','w','v','x',0, + 0 +}; + +static const WCHAR compressed_exts[] = { + '.','z','i','p',0, + 0 +}; + +static const WCHAR document_exts[] = { +#if _WIN32_WINNT >= 0x600 + '.','h','t','m',0, + '.','h','t','m','l',0, +#endif + '.','m','h','t',0, + 0 +}; + +static const WCHAR system_exts[] = { + '.','c','p','l',0, + 0 +}; + +static const WCHAR application_exts[] = { + '.','b','a','s',0, + '.','b','a','t',0, + '.','c','m','d',0, + '.','c','o','m',0, + '.','e','x','e',0, + '.','h','t','a',0, + '.','m','s','i',0, + '.','p','i','f',0, + '.','r','e','g',0, + '.','s','c','r',0, + '.','v','b',0, + 0 +}; + +const WCHAR type_text[] = {'t','e','x','t',0}; +const WCHAR type_image[] = {'i','m','a','g','e',0}; +const WCHAR type_audio[] = {'a','u','d','i','o',0}; +const WCHAR type_video[] = {'v','i','d','e','o',0}; +const WCHAR type_compressed[] = {'c','o','m','p','r','e','s','s','e','d',0}; +const WCHAR type_document[] = {'d','o','c','u','m','e','n','t',0}; +const WCHAR type_system[] = {'s','y','s','t','e','m',0}; +const WCHAR type_application[] = {'a','p','p','l','i','c','a','t','i','o','n',0}; + +#define HARDCODED_NATIVE_WMSDK (PERCEIVEDFLAG_HARDCODED | PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_WMSDK) +#define HARDCODED_NATIVE_GDIPLUS (PERCEIVEDFLAG_HARDCODED | PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_GDIPLUS) +#define HARDCODED_NATIVE_ZIPFLDR (PERCEIVEDFLAG_HARDCODED | PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_ZIPFOLDER) +#define SOFTCODED_NATIVESUPPORT (PERCEIVEDFLAG_SOFTCODED | PERCEIVEDFLAG_NATIVESUPPORT) + +static const struct AssocPerceivedInfo known_types[] = { + { NULL, PERCEIVED_TYPE_UNSPECIFIED, PERCEIVEDFLAG_HARDCODED, PERCEIVEDFLAG_SOFTCODED, unspecified_exts }, + { type_text, PERCEIVED_TYPE_TEXT, PERCEIVEDFLAG_HARDCODED, SOFTCODED_NATIVESUPPORT, NULL }, + { type_image, PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, PERCEIVEDFLAG_SOFTCODED, image_exts }, + { type_audio, PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, PERCEIVEDFLAG_SOFTCODED, audio_exts }, + { type_video, PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, PERCEIVEDFLAG_SOFTCODED, video_exts }, + { type_compressed, PERCEIVED_TYPE_COMPRESSED, HARDCODED_NATIVE_ZIPFLDR, PERCEIVEDFLAG_SOFTCODED, compressed_exts }, + { type_document, PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_HARDCODED, PERCEIVEDFLAG_SOFTCODED, document_exts }, + { type_system, PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_HARDCODED, PERCEIVEDFLAG_SOFTCODED, system_exts }, + { type_application, PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, PERCEIVEDFLAG_SOFTCODED, application_exts }, +}; + +static const struct AssocPerceivedInfo* AssocFindByBuiltinExtension(LPCWSTR pszExt) +{ + UINT n; + for (n = 0; n < sizeof(known_types) / sizeof(known_types[0]); ++n) + { + PCWSTR Ext = known_types[n].Extensions; + while (Ext && *Ext) + { + if (!StrCmpIW(Ext, pszExt)) + return &known_types[n]; + Ext += (strlenW(Ext) + 1); + } + } + return NULL; +} + +static const struct AssocPerceivedInfo* AssocFindByType(LPCWSTR pszType) +{ + UINT n; + for (n = 0; n < sizeof(known_types) / sizeof(known_types[0]); ++n) + { + if (known_types[n].Type) + { + if (!StrCmpIW(known_types[n].Type, pszType)) + return &known_types[n]; + } + } + return NULL; +} + +#endif + + /************************************************************************* * AssocGetPerceivedType [SHLWAPI.@] * @@ -111,18 +282,81 @@ HRESULT WINAPI AssocCreate(CLSID clsid, REFIID refiid, void **lpInterface) * if lpType or lpFlag are NULL, the function will crash. * if lpszExt is NULL, an error is returned. * +#ifndef __REACTOS__ * BUGS * Unimplemented. +#endif */ HRESULT WINAPI AssocGetPerceivedType(LPCWSTR lpszExt, PERCEIVED *lpType, INT *lpFlag, LPWSTR *lppszType) { +#ifndef __REACTOS__ + FIXME("(%s, %p, %p, %p) not supported\n", debugstr_w(lpszExt), lpType, lpFlag, lppszType); if (lpszExt == NULL) return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); return E_NOTIMPL; + +#else + + static const WCHAR PerceivedTypeKey[] = {'P','e','r','c','e','i','v','e','d','T','y','p','e',0}; + static const WCHAR SystemFileAssociationsKey[] = {'S','y','s','t','e','m','F','i','l','e', + 'A','s','s','o','c','i','a','t','i','o','n','s','\\','%','s',0}; + const struct AssocPerceivedInfo *Info; + + TRACE("(%s,%p,%p,%p)\n", debugstr_w(lpszExt), lpType, lpFlag, lppszType); + + Info = AssocFindByBuiltinExtension(lpszExt); + if (Info) + { + *lpType = Info->Perceived; + *lpFlag = Info->FlagHardcoded; + } + else + { + WCHAR Buffer[100] = { 0 }; + DWORD Size = sizeof(Buffer); + if (RegGetValueW(HKEY_CLASSES_ROOT, lpszExt, PerceivedTypeKey, + RRF_RT_REG_SZ, NULL, Buffer, &Size) == ERROR_SUCCESS) + { + Info = AssocFindByType(Buffer); + } + if (!Info) + { + WCHAR KeyName[MAX_PATH] = { 0 }; + snprintfW(KeyName, MAX_PATH, SystemFileAssociationsKey, lpszExt); + Size = sizeof(Buffer); + if (RegGetValueW(HKEY_CLASSES_ROOT, KeyName, PerceivedTypeKey, + RRF_RT_REG_SZ, NULL, Buffer, &Size) == ERROR_SUCCESS) + { + Info = AssocFindByType(Buffer); + } + } + if (Info) + { + *lpType = Info->Perceived; + *lpFlag = Info->FlagSoftcoded; + } + } + + if (Info) + { + if (lppszType && Info->Type) + { + return SHStrDupW(Info->Type, lppszType); + } + return Info->Type ? S_OK : E_FAIL; + } + else + { + *lpType = PERCEIVED_TYPE_UNSPECIFIED; + *lpFlag = 0; + } + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + +#endif } /************************************************************************* diff --git a/dll/win32/shlwapi/clist.c b/dll/win32/shlwapi/clist.c index 763a40e349..52c5f6107f 100644 --- a/dll/win32/shlwapi/clist.c +++ b/dll/win32/shlwapi/clist.c @@ -45,8 +45,13 @@ static inline LPDATABLOCK_HEADER NextItem(LPDBLIST lpList) * lpNewItem [I] The new item to add to the list * * RETURNS +#ifndef __REACTOS__ * Success: S_OK. The item is added to the list. * Failure: An HRESULT error code. +#else + * Success: TRUE. The item is added to the list. + * Failure: FALSE. +#endif * * NOTES * If the size of the element to be inserted is less than the size of a @@ -54,7 +59,12 @@ static inline LPDATABLOCK_HEADER NextItem(LPDBLIST lpList) * the call returns S_OK but does not actually add the element. * See SHWriteDataBlockList. */ -HRESULT WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewItem) +#ifndef __REACTOS__ +HRESULT +#else +BOOL +#endif +WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewItem) { LPDATABLOCK_HEADER lpInsertAt = NULL; ULONG ulSize; @@ -62,11 +72,19 @@ HRESULT WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewIt TRACE("(%p,%p)\n", lppList, lpNewItem); if(!lppList || !lpNewItem ) +#ifndef __REACTOS__ return E_INVALIDARG; +#else + return FALSE; +#endif if (lpNewItem->cbSize < sizeof(DATABLOCK_HEADER) || lpNewItem->dwSignature == CLIST_ID_CONTAINER) +#ifndef __REACTOS__ return S_OK; +#else + return FALSE; +#endif ulSize = lpNewItem->cbSize; @@ -123,9 +141,17 @@ HRESULT WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewIt lpInsertAt = NextItem(lpInsertAt); lpInsertAt->cbSize = 0; +#ifndef __REACTOS__ return lpNewItem->cbSize; +#else + return TRUE; +#endif } +#ifndef __REACTOS__ return S_OK; +#else + return FALSE; +#endif } /************************************************************************* @@ -343,7 +369,11 @@ VOID WINAPI SHFreeDataBlockList(LPDBLIST lpList) */ BOOL WINAPI SHRemoveDataBlock(LPDBLIST* lppList, DWORD dwSignature) { +#ifndef __REACTOS__ LPDATABLOCK_HEADER lpList = 0; +#else + LPDATABLOCK_HEADER lpList = NULL; +#endif LPDATABLOCK_HEADER lpItem = NULL; LPDATABLOCK_HEADER lpNext; ULONG ulNewSize;

1 0

01/01: [WIN32K:NTUSER] Fix color indices for themes
by Stanislav Motylkov 22 Jan '18

22 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c22c6e3ba349c4db4b5d7… commit c22c6e3ba349c4db4b5d7dda2dbe28636da0dabb Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Jan 22 00:09:16 2018 +0300 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Jan 22 21:45:50 2018 +0200 [WIN32K:NTUSER] Fix color indices for themes CORE-14231 #resolve --- win32ss/user/ntuser/menu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 1407ef1d0a..4de96e892a 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -2511,11 +2511,11 @@ static void FASTCALL MENU_DrawMenuItem(PWND Wnd, PMENU Menu, PWND WndOwner, HDC if (!(lpitem->fState & MF_HILITE) ) { ++rect.left; ++rect.top; ++rect.right; ++rect.bottom; - IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_HIGHLIGHTTEXT)); + IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_BTNHIGHLIGHT)); DrawTextW( hdc, Text, i, &rect, uFormat ); --rect.left; --rect.top; --rect.right; --rect.bottom; } - IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_GRAYTEXT)); + IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_BTNSHADOW)); } DrawTextW( hdc, Text, i, &rect, uFormat); @@ -2538,11 +2538,11 @@ static void FASTCALL MENU_DrawMenuItem(PWND Wnd, PMENU Menu, PWND WndOwner, HDC if (!(lpitem->fState & MF_HILITE) ) { ++rect.left; ++rect.top; ++rect.right; ++rect.bottom; - IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_HIGHLIGHTTEXT)); + IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_BTNHIGHLIGHT)); DrawTextW( hdc, Text + i + 1, -1, &rect, uFormat); --rect.left; --rect.top; --rect.right; --rect.bottom; } - IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_GRAYTEXT)); + IntGdiSetTextColor(hdc, IntGetSysColor(COLOR_BTNSHADOW)); } DrawTextW( hdc, Text + i + 1, -1, &rect, uFormat ); }

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