[ros-diffs] [reactos] 02/02: [EXPLORER] Properly initialise tbBtn.iBitmap. CORE-14262.

[Andreas Maier]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d6c9e844c9b5e8a33344…

commit 8d6c9e844c9b5e8a33344c9768e0d2fa305445c5
Author:     Andreas Maier <staubim(a)quantentunnel.de>
AuthorDate: Tue Jun 18 22:40:27 2019 +0200
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Wed Jun 19 20:37:04 2019 +0200

    [EXPLORER] Properly initialise tbBtn.iBitmap. CORE-14262.
    
    In CNotifyToolbar::AddButton tbBtn.iBitmap (imagelist-index)
    was inialised with 0. Tigthvnc adds the icon wihtout NIF_ICON flag.
    So the wrong icon index was kept and later replaced.
---
 base/shell/explorer/syspager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp
index 2186933150..8d4f9145ce 100644
--- a/base/shell/explorer/syspager.cpp
+++ b/base/shell/explorer/syspager.cpp
@@ -742,6 +742,7 @@ BOOL CNotifyToolbar::AddButton(_In_ CONST NOTIFYICONDATA *iconData)
     tbBtn.dwData = (DWORD_PTR)notifyItem;
     tbBtn.iString = (INT_PTR) text;
     tbBtn.idCommand = GetButtonCount();
+    tbBtn.iBitmap = -1;
 
     if (iconData->uFlags & NIF_STATE)
     {