Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [I8042PRT] Apply a workaround for Dell Latitude D610 CORE-14324
by Doug Lyons 15 Feb '18

15 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ea42001d92bff2039801… commit 8ea42001d92bff20398015db04556a4115e03f6a Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Thu Feb 15 22:48:01 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Feb 15 22:49:39 2018 +0100 [I8042PRT] Apply a workaround for Dell Latitude D610 CORE-14324 --- drivers/input/i8042prt/hwhacks.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/input/i8042prt/hwhacks.c b/drivers/input/i8042prt/hwhacks.c index 386a601073..c7915e16fd 100644 --- a/drivers/input/i8042prt/hwhacks.c +++ b/drivers/input/i8042prt/hwhacks.c @@ -64,6 +64,7 @@ const HARDWARE_TABLE i8042HardwareTable[] = { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D530 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D531 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D600 "}}, FL_INITHACK }, + { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D610 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D620 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D630 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D810 "}}, FL_INITHACK },

1 0

04/04: [SHELL32_APITEST] Add a test for the CUserNotification implementation. CORE-13177
by Hermès Bélusca-Maïto 15 Feb '18

15 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02d17df0315c663a5374b… commit 02d17df0315c663a5374bdc941ec3ac07881292c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Feb 15 01:17:32 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Feb 15 22:38:38 2018 +0100 [SHELL32_APITEST] Add a test for the CUserNotification implementation. CORE-13177 --- modules/rostests/apitests/shell32/CMakeLists.txt | 1 + .../apitests/shell32/CUserNotification.cpp | 179 +++++++++++++++++++++ modules/rostests/apitests/shell32/testlist.c | 2 + 3 files changed, 182 insertions(+) diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index a30f8db886..e2c5e0c663 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -12,6 +12,7 @@ list(APPEND SOURCE CMyComputer.cpp CShellDesktop.cpp CShellLink.cpp + CUserNotification.cpp menu.cpp PathResolve.cpp SHCreateFileExtractIconW.cpp diff --git a/modules/rostests/apitests/shell32/CUserNotification.cpp b/modules/rostests/apitests/shell32/CUserNotification.cpp new file mode 100644 index 0000000000..b10185cee9 --- /dev/null +++ b/modules/rostests/apitests/shell32/CUserNotification.cpp @@ -0,0 +1,179 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test for CUserNotification + * COPYRIGHT: Copyright 2018 Hermes Belusca-Maito + */ + +#include "shelltest.h" + +#define NDEBUG +#include <debug.h> + +#define ok_hr(status, expected) ok_hex(status, expected) + +#define HRESULT_CANCELLED HRESULT_FROM_WIN32(ERROR_CANCELLED) + + +/* An implementation of the IQueryContinue interface */ +class CQueryContinue : public IQueryContinue +{ +private: + HRESULT m_hContinue; + +public: + CQueryContinue(HRESULT hContinue = S_OK) : m_hContinue(hContinue) {} + ~CQueryContinue() {} + + CQueryContinue& operator=(const CQueryContinue& qc) + { + if (this != &qc) + m_hContinue = qc.m_hContinue; + return *this; + } + + CQueryContinue& operator=(HRESULT hContinue) + { + m_hContinue = hContinue; + return *this; + } + + operator HRESULT() + { + return m_hContinue; + } + +public: + // IUnknown + virtual ULONG STDMETHODCALLTYPE AddRef() + { + return 1; + } + + virtual ULONG STDMETHODCALLTYPE Release() + { + return 0; + } + + virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject) + { + return S_OK; + } + + // IQueryContinue + virtual HRESULT STDMETHODCALLTYPE QueryContinue(void) + { + // TRACE("IQueryContinue::QueryContinue() returning 0x%lx\n", m_hContinue); + return m_hContinue; + } +}; + + +static void +TestNotification(void) +{ + HRESULT hr; + CComPtr<IUserNotification> pUserNotif; + CQueryContinue queryContinue(S_OK); + + // hr = pUserNotif.CoCreateInstance(CLSID_UserNotification); + hr = ::CoCreateInstance(CLSID_UserNotification, NULL, CLSCTX_ALL, + /*IID_PPV_ARG(IUserNotification, &pUserNotif)*/ + IID_IUserNotification, (void**)&pUserNotif); + ok(hr == S_OK, "CoCreateInstance, hr = 0x%lx\n", hr); + if (FAILED(hr)) + { + skip("Could not instantiate IUserNotification\n"); + return; + } + + /* Set an invalid icon for the notification icon */ + hr = pUserNotif->SetIconInfo((HICON)0xdeadbeef, L"Tooltip text"); + ok_hr(hr, S_OK); + +#if 0 + /* Seting an invalid string would crash the application */ + hr = pUserNotif->SetIconInfo(NULL, (LPCWSTR)0xdeadbeef); + ok_hr(hr, S_OK); +#endif + + /* Set a default icon for the notification icon */ + hr = pUserNotif->SetIconInfo(NULL, L"Tooltip text"); + ok_hr(hr, S_OK); + + /* + * Since just displaying a notification icon without balloon hangs (expected), + * for making this test automatable we instead just test balloon functionality + * where timeouts can be programmed. + */ + + /* Set up a balloon associated to the notification icon */ + hr = pUserNotif->SetBalloonInfo(L"Balloon title", L"Balloon text", NIIF_ERROR); + ok_hr(hr, S_OK); + + /* + * Try to display twice the balloon if the user cancels it. + * Without setting balloon retry, we would wait for a very long time... + */ + hr = pUserNotif->SetBalloonRetry(2000, 1000, 2); + ok_hr(hr, S_OK); + + /* Display the balloon and also the tooltip if one points on the icon */ + hr = pUserNotif->Show(NULL, 0); + ok_hr(hr, HRESULT_CANCELLED); + + /* + * Setting icon information *after* having enabled balloon info, + * allows to automatically set the notification icon according + * to the dwInfoFlags passed to SetBalloonInfo() and by giving + * NULL to the hIcon parameter of SetIconInfo(). + */ + hr = pUserNotif->SetIconInfo(NULL, NULL); + ok_hr(hr, S_OK); + + /* Display the balloon and also the tooltip if one points on the icon */ + hr = pUserNotif->Show(NULL, 0); + ok_hr(hr, HRESULT_CANCELLED); + + /* + * This line shows the balloon, but without title nor icon in it. + * Note that the balloon icon is not displayed when not setting any title. + */ + hr = pUserNotif->SetBalloonInfo(NULL, L"Balloon text", NIIF_WARNING); + ok_hr(hr, S_OK); + + hr = pUserNotif->Show(NULL, 0); + ok_hr(hr, HRESULT_CANCELLED); + + + /* Test support of the IQueryContinue interface */ + + hr = pUserNotif->SetBalloonInfo(L"Balloon title", L"Balloon text", NIIF_WARNING); + ok_hr(hr, S_OK); + + hr = pUserNotif->Show(&queryContinue, 2000); /* Timeout of 2 seconds */ + ok_hr(hr, HRESULT_CANCELLED); + +#if 0 // Commented because this test (the Show() call) is unreliable. + /* Try to hide the balloon by setting an empty string (can use either NULL or L"") */ + hr = pUserNotif->SetBalloonInfo(L"Balloon title", NULL, NIIF_WARNING); + ok_hr(hr, S_OK); + + hr = pUserNotif->Show(&queryContinue, 2000); /* Timeout of 2 seconds */ + ok_hr(hr, HRESULT_CANCELLED); +#endif + + hr = pUserNotif->SetBalloonInfo(L"Balloon title", L"Balloon text", NIIF_WARNING); + ok_hr(hr, S_OK); + + queryContinue = S_FALSE; + hr = pUserNotif->Show(&queryContinue, 2000); /* Timeout of 2 seconds */ + ok_hr(hr, S_FALSE); +} + +START_TEST(CUserNotification) +{ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + TestNotification(); + CoUninitialize(); +} diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index b0a8638046..792bf49503 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -9,6 +9,7 @@ extern void func_CFSFolder(void); extern void func_CMyComputer(void); extern void func_CShellDesktop(void); extern void func_CShellLink(void); +extern void func_CUserNotification(void); extern void func_menu(void); extern void func_PathResolve(void); extern void func_SHCreateFileExtractIconW(void); @@ -23,6 +24,7 @@ const struct test winetest_testlist[] = { "CMyComputer", func_CMyComputer }, { "CShellDesktop", func_CShellDesktop }, { "CShellLink", func_CShellLink }, + { "CUserNotification", func_CUserNotification }, { "menu", func_menu }, { "PathResolve", func_PathResolve }, { "SHCreateFileExtractIconW", func_SHCreateFileExtractIconW },

1 0

03/04: [SHELL32] Implement the CUserNotification class, which implements the IUserNotification interface. CORE-13177
by Hermès Bélusca-Maïto 15 Feb '18

15 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe4704fa64eab91615913… commit fe4704fa64eab916159131a5ec3bc8074958b9f2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Feb 7 02:20:26 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Feb 15 22:38:22 2018 +0100 [SHELL32] Implement the CUserNotification class, which implements the IUserNotification interface. CORE-13177 --- dll/win32/shell32/CMakeLists.txt | 1 + dll/win32/shell32/CUserNotification.cpp | 478 +++++++++++++++++++++++++ dll/win32/shell32/CUserNotification.h | 111 ++++++ dll/win32/shell32/precomp.h | 1 + dll/win32/shell32/res/rgs/usernotification.rgs | 43 +++ dll/win32/shell32/rgs_res.rc | 1 + dll/win32/shell32/shell32.cpp | 5 +- dll/win32/shell32/shresdef.h | 3 +- dll/win32/shell32/systray.cpp | 2 +- 9 files changed, 641 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt index 8bdf3ee56f..76ebf226e3 100644 --- a/dll/win32/shell32/CMakeLists.txt +++ b/dll/win32/shell32/CMakeLists.txt @@ -67,6 +67,7 @@ list(APPEND SOURCE CDefViewBckgrndMenu.cpp stubs.cpp systray.cpp + CUserNotification.cpp CDefaultContextMenu.cpp COpenWithMenu.cpp CNewMenu.cpp diff --git a/dll/win32/shell32/CUserNotification.cpp b/dll/win32/shell32/CUserNotification.cpp new file mode 100644 index 0000000000..c76bd0b10f --- /dev/null +++ b/dll/win32/shell32/CUserNotification.cpp @@ -0,0 +1,478 @@ +/* + * Copyright 2018 Hermes Belusca-Maito + * + * Pass on icon notification messages to the systray implementation + * in the currently running shell. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "precomp.h" + +#include <mmsystem.h> +#undef PlaySound + +WINE_DEFAULT_DEBUG_CHANNEL(shell_notify); + + +/* Use Windows-compatible window callback message */ +#define WM_TRAYNOTIFY (WM_USER + 100) + +/* Notification icon ID */ +#define ID_NOTIFY_ICON 0 + +/* Balloon timers */ +#define ID_BALLOON_TIMEOUT 1 +#define ID_BALLOON_DELAYREMOVE 2 +#define ID_BALLOON_QUERYCONT 3 +#define ID_BALLOON_SHOWTIME 4 + +#define BALLOON_DELAYREMOVE_TIMEOUT 250 // milliseconds + + +CUserNotification::CUserNotification() : + m_hWorkerWnd(NULL), + m_hIcon(NULL), + m_dwInfoFlags(0), + m_uShowTime(15000), + m_uInterval(10000), + m_cRetryCount(-1), + m_uContinuePoolInterval(0), + m_bIsShown(FALSE), + m_hRes(S_OK), + m_pqc(NULL) +{ +} + +CUserNotification::~CUserNotification() +{ + /* If we have a notification window... */ + if (m_hWorkerWnd) + { + /* ... remove the notification icon and destroy the window */ + RemoveIcon(); + ::DestroyWindow(m_hWorkerWnd); + m_hWorkerWnd = NULL; + } + + /* Destroy our local icon copy */ + if (m_hIcon) + ::DestroyIcon(m_hIcon); +} + +VOID CUserNotification::RemoveIcon() +{ + NOTIFYICONDATAW nid = {0}; + + nid.cbSize = NOTIFYICONDATAW_V3_SIZE; // sizeof(nid); + nid.hWnd = m_hWorkerWnd; + nid.uID = ID_NOTIFY_ICON; + + /* Remove the notification icon */ + ::Shell_NotifyIconW(NIM_DELETE, &nid); +} + +VOID CUserNotification::DelayRemoveIcon(IN HRESULT hRes) +{ + /* Set the return value for CUserNotification::Show() and defer icon removal */ + m_hRes = hRes; + ::SetTimer(m_hWorkerWnd, ID_BALLOON_DELAYREMOVE, + BALLOON_DELAYREMOVE_TIMEOUT, NULL); +} + +VOID CUserNotification::TimeoutIcon() +{ + /* + * The balloon timed out, we need to wait before showing it again. + * If we retried too many times, delete the notification icon. + */ + if (m_cRetryCount > 0) + { + /* Decrement the retry count */ + --m_cRetryCount; + + /* Set the timeout interval timer */ + ::SetTimer(m_hWorkerWnd, ID_BALLOON_TIMEOUT, m_uInterval, NULL); + } + else + { + /* No other retry: delete the notification icon */ + DelayRemoveIcon(HRESULT_FROM_WIN32(ERROR_CANCELLED)); + } +} + +VOID CUserNotification::SetUpNotifyData( + IN UINT uFlags, + IN OUT PNOTIFYICONDATAW pnid) +{ + pnid->cbSize = NOTIFYICONDATAW_V3_SIZE; // sizeof(nid); + pnid->hWnd = m_hWorkerWnd; + pnid->uID = ID_NOTIFY_ICON; + // pnid->uVersion = NOTIFYICON_VERSION; + + if (uFlags & NIF_MESSAGE) + { + pnid->uFlags |= NIF_MESSAGE; + pnid->uCallbackMessage = WM_TRAYNOTIFY; + } + + if (uFlags & NIF_ICON) + { + pnid->uFlags |= NIF_ICON; + /* Use a default icon if we do not have one already */ + pnid->hIcon = (m_hIcon ? m_hIcon : LoadIcon(NULL, IDI_WINLOGO)); + } + + if (uFlags & NIF_TIP) + { + pnid->uFlags |= NIF_TIP; + ::StringCchCopyW(pnid->szTip, _countof(pnid->szTip), m_szTip); + } + + if (uFlags & NIF_INFO) + { + pnid->uFlags |= NIF_INFO; + + // pnid->uTimeout = m_uShowTime; // NOTE: Deprecated + pnid->dwInfoFlags = m_dwInfoFlags; + + ::StringCchCopyW(pnid->szInfo, _countof(pnid->szInfo), m_szInfo); + ::StringCchCopyW(pnid->szInfoTitle, _countof(pnid->szInfoTitle), m_szInfoTitle); + } +} + + +/* IUserNotification Implementation */ + +HRESULT STDMETHODCALLTYPE +CUserNotification::SetBalloonInfo( + IN LPCWSTR pszTitle, + IN LPCWSTR pszText, + IN DWORD dwInfoFlags) +{ + NOTIFYICONDATAW nid = {0}; + + m_szInfo = pszText; + m_szInfoTitle = pszTitle; + m_dwInfoFlags = dwInfoFlags; + + /* Update the notification icon if we have one */ + if (!m_hWorkerWnd) + return S_OK; + + /* Modify the notification icon */ + SetUpNotifyData(NIF_INFO, &nid); + if (::Shell_NotifyIconW(NIM_MODIFY, &nid)) + return S_OK; + else + return E_FAIL; +} + +HRESULT STDMETHODCALLTYPE +CUserNotification::SetBalloonRetry( + IN DWORD dwShowTime, // Time intervals in milliseconds + IN DWORD dwInterval, + IN UINT cRetryCount) +{ + m_uShowTime = dwShowTime; + m_uInterval = dwInterval; + m_cRetryCount = cRetryCount; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE +CUserNotification::SetIconInfo( + IN HICON hIcon, + IN LPCWSTR pszToolTip) +{ + NOTIFYICONDATAW nid = {0}; + + /* Destroy our local icon copy */ + if (m_hIcon) + ::DestroyIcon(m_hIcon); + + if (hIcon) + { + /* Copy the icon from the user */ + m_hIcon = ::CopyIcon(hIcon); + } + else + { + /* Use the same icon as the one for the balloon if specified */ + UINT uIcon = (m_dwInfoFlags & NIIF_ICON_MASK); + LPCWSTR pIcon = NULL; + + if (uIcon == NIIF_INFO) + pIcon = IDI_INFORMATION; + else if (uIcon == NIIF_WARNING) + pIcon = IDI_WARNING; + else if (uIcon == NIIF_ERROR) + pIcon = IDI_ERROR; + else if (uIcon == NIIF_USER) + pIcon = NULL; + + m_hIcon = (pIcon ? ::LoadIconW(NULL, pIcon) : NULL); + } + + m_szTip = pszToolTip; + + /* Update the notification icon if we have one */ + if (!m_hWorkerWnd) + return S_OK; + + /* Modify the notification icon */ + SetUpNotifyData(NIF_ICON | NIF_TIP, &nid); + if (::Shell_NotifyIconW(NIM_MODIFY, &nid)) + return S_OK; + else + return E_FAIL; +} + + +LRESULT CALLBACK +CUserNotification::WorkerWndProc( + IN HWND hWnd, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + /* Retrieve the current user notification object stored in the window extra bits */ + CUserNotification* pThis = reinterpret_cast<CUserNotification*>(::GetWindowLongPtrW(hWnd, 0)); + ASSERT(pThis); + ASSERT(hWnd == pThis->m_hWorkerWnd); + + TRACE("Msg = 0x%x\n", uMsg); + switch (uMsg) + { + /* + * We do not receive any WM_(NC)CREATE message since worker windows + * are first created using the default window procedure DefWindowProcW. + * The window procedure is changed only subsequently to the user one. + * We however receive WM_(NC)DESTROY messages. + */ + case WM_DESTROY: + { + /* Post a WM_QUIT message only if the Show() method's message loop is running */ + if (pThis->m_bIsShown) + ::PostQuitMessage(0); + return 0; + } + + case WM_NCDESTROY: + { + ::SetWindowLongPtrW(hWnd, 0, (LONG_PTR)NULL); + pThis->m_hWorkerWnd = NULL; + return 0; + } + + case WM_QUERYENDSESSION: + { + /* + * User session is ending or a shutdown is occurring: perform cleanup. + * Set the return value for CUserNotification::Show() and remove the notification. + */ + pThis->m_hRes = HRESULT_FROM_WIN32(ERROR_CANCELLED); + pThis->RemoveIcon(); + ::DestroyWindow(pThis->m_hWorkerWnd); + return TRUE; + } + + case WM_TIMER: + { + TRACE("WM_TIMER(0x%lx)\n", wParam); + + /* Destroy the associated timer */ + ::KillTimer(hWnd, (UINT_PTR)wParam); + + if (wParam == ID_BALLOON_TIMEOUT) + { + /* Timeout interval timer expired: display the balloon again */ + NOTIFYICONDATAW nid = {0}; + pThis->SetUpNotifyData(NIF_INFO, &nid); + ::Shell_NotifyIconW(NIM_MODIFY, &nid); + } + else if (wParam == ID_BALLOON_DELAYREMOVE) + { + /* Delay-remove timer expired: remove the notification */ + pThis->RemoveIcon(); + ::DestroyWindow(pThis->m_hWorkerWnd); + } + else if (wParam == ID_BALLOON_QUERYCONT) + { + /* + * Query-continue timer expired: ask the user whether the + * notification should continue to be displayed or not. + */ + if (pThis->m_pqc && pThis->m_pqc->QueryContinue() == S_OK) + { + /* The notification can be displayed */ + ::SetTimer(hWnd, ID_BALLOON_QUERYCONT, pThis->m_uContinuePoolInterval, NULL); + } + else + { + /* The notification should be removed */ + pThis->DelayRemoveIcon(S_FALSE); + } + } + else if (wParam == ID_BALLOON_SHOWTIME) + { + /* Show-time timer expired: wait before showing the balloon again */ + pThis->TimeoutIcon(); + } + return 0; + } + + /* + * Shell User Notification message. + * We use NOTIFYICON_VERSION == 0 or 3 callback version, with: + * wParam == identifier of the taskbar icon in which the event occurred; + * lParam == holds the mouse or keyboard message associated with the event. + */ + case WM_TRAYNOTIFY: + { + TRACE("WM_TRAYNOTIFY - wParam = 0x%lx ; lParam = 0x%lx\n", wParam, lParam); + ASSERT(wParam == ID_NOTIFY_ICON); + + switch (lParam) + { + case NIN_BALLOONSHOW: + TRACE("NIN_BALLOONSHOW\n"); + break; + + case NIN_BALLOONHIDE: + TRACE("NIN_BALLOONHIDE\n"); + break; + + /* The balloon timed out, or the user closed it by clicking on the 'X' button */ + case NIN_BALLOONTIMEOUT: + { + TRACE("NIN_BALLOONTIMEOUT\n"); + pThis->TimeoutIcon(); + break; + } + + /* The user clicked on the balloon: delete the notification icon */ + case NIN_BALLOONUSERCLICK: + TRACE("NIN_BALLOONUSERCLICK\n"); + /* Fall back to icon click behaviour */ + + /* The user clicked on the notification icon: delete it */ + case WM_LBUTTONDOWN: + case WM_RBUTTONDOWN: + { + pThis->DelayRemoveIcon(S_OK); + break; + } + + default: + break; + } + + return 0; + } + } + + return ::DefWindowProcW(hWnd, uMsg, wParam, lParam); +} + + +// Blocks until the notification times out. +HRESULT STDMETHODCALLTYPE +CUserNotification::Show( + IN IQueryContinue* pqc, + IN DWORD dwContinuePollInterval) +{ + NOTIFYICONDATAW nid = {0}; + MSG msg; + + /* Create the hidden notification message worker window if we do not have one already */ + if (!m_hWorkerWnd) + { + m_hWorkerWnd = ::SHCreateWorkerWindowW(CUserNotification::WorkerWndProc, + NULL, 0, 0, NULL, (LONG_PTR)this); + if (!m_hWorkerWnd) + { + FAILED_UNEXPECTEDLY(E_FAIL); + return E_FAIL; + } + + /* Add and display the notification icon */ + SetUpNotifyData(NIF_MESSAGE | NIF_ICON | NIF_TIP | NIF_INFO, &nid); + if (!::Shell_NotifyIconW(NIM_ADD, &nid)) + { + ::DestroyWindow(m_hWorkerWnd); + m_hWorkerWnd = NULL; + return E_FAIL; + } + } + + m_hRes = S_OK; + + /* Set up the user-continue callback mechanism */ + m_pqc = pqc; + if (pqc) + { + m_uContinuePoolInterval = dwContinuePollInterval; + ::SetTimer(m_hWorkerWnd, ID_BALLOON_QUERYCONT, m_uContinuePoolInterval, NULL); + } + + /* Control how long the balloon notification is displayed */ + if ((nid.uFlags & NIF_INFO) && !*nid.szInfo /* && !*nid.szInfoTitle */) + ::SetTimer(m_hWorkerWnd, ID_BALLOON_SHOWTIME, m_uShowTime, NULL); + + /* Dispatch messsages to the worker window */ + m_bIsShown = TRUE; + while (::GetMessageW(&msg, NULL, 0, 0)) + { + ::TranslateMessage(&msg); + ::DispatchMessageW(&msg); + } + m_bIsShown = FALSE; + + /* Reset the user-continue callback mechanism */ + if (pqc) + { + ::KillTimer(m_hWorkerWnd, ID_BALLOON_QUERYCONT); + m_uContinuePoolInterval = 0; + } + m_pqc = NULL; + + /* Return the notification error code */ + return m_hRes; +} + +#if 0 // IUserNotification2 +// Blocks until the notification times out. +HRESULT STDMETHODCALLTYPE +CUserNotification::Show( + IN IQueryContinue* pqc, + IN DWORD dwContinuePollInterval, + IN IUserNotificationCallback* pSink) +{ + return S_OK; +} +#endif + +HRESULT STDMETHODCALLTYPE +CUserNotification::PlaySound( + IN LPCWSTR pszSoundName) +{ + /* Call the Win32 API - Ignore the PlaySoundW() return value as on Windows */ + ::PlaySoundW(pszSoundName, + NULL, + SND_ALIAS | SND_APPLICATION | + SND_NOSTOP | SND_NODEFAULT | SND_ASYNC); + return S_OK; +} diff --git a/dll/win32/shell32/CUserNotification.h b/dll/win32/shell32/CUserNotification.h new file mode 100644 index 0000000000..4f01e0c9be --- /dev/null +++ b/dll/win32/shell32/CUserNotification.h @@ -0,0 +1,111 @@ +/* + * Copyright 2018 Hermes Belusca-Maito + * + * Pass on icon notification messages to the systray implementation + * in the currently running shell. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _USERNOTIFICATION_H_ +#define _USERNOTIFICATION_H_ + +#undef PlaySound + +class CUserNotification : + public CComCoClass<CUserNotification, &CLSID_UserNotification>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IUserNotification +// public IUserNotification2 // On Vista+ +{ +private: + HWND m_hWorkerWnd; + HICON m_hIcon; + DWORD m_dwInfoFlags; + UINT m_uShowTime; + UINT m_uInterval; + UINT m_cRetryCount; + UINT m_uContinuePoolInterval; + BOOL m_bIsShown; + HRESULT m_hRes; + IQueryContinue* m_pqc; + CStringW m_szTip; + CStringW m_szInfo; + CStringW m_szInfoTitle; + +private: + VOID RemoveIcon(); + VOID DelayRemoveIcon(IN HRESULT hRes); + VOID TimeoutIcon(); + + VOID SetUpNotifyData( + IN UINT uFlags, + IN OUT PNOTIFYICONDATAW pnid); + + static LRESULT CALLBACK + WorkerWndProc( + IN HWND hWnd, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam); + +public: + CUserNotification(); + ~CUserNotification(); + + // IUserNotification + virtual HRESULT STDMETHODCALLTYPE SetBalloonInfo( + IN LPCWSTR pszTitle, + IN LPCWSTR pszText, + IN DWORD dwInfoFlags); + + virtual HRESULT STDMETHODCALLTYPE SetBalloonRetry( + IN DWORD dwShowTime, // Time intervals in milliseconds + IN DWORD dwInterval, + IN UINT cRetryCount); + + virtual HRESULT STDMETHODCALLTYPE SetIconInfo( + IN HICON hIcon, + IN LPCWSTR pszToolTip); + + // Blocks until the notification times out. + virtual HRESULT STDMETHODCALLTYPE Show( + IN IQueryContinue* pqc, + IN DWORD dwContinuePollInterval); + + virtual HRESULT STDMETHODCALLTYPE PlaySound( + IN LPCWSTR pszSoundName); + +#if 0 + // IUserNotification2 + // Blocks until the notification times out. + virtual HRESULT STDMETHODCALLTYPE Show( + IN IQueryContinue* pqc, + IN DWORD dwContinuePollInterval, + IN IUserNotificationCallback* pSink); +#endif + + DECLARE_REGISTRY_RESOURCEID(IDR_USERNOTIFICATION) + DECLARE_NOT_AGGREGATABLE(CUserNotification) + + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CUserNotification) + COM_INTERFACE_ENTRY_IID(IID_IUserNotification , IUserNotification ) + // COM_INTERFACE_ENTRY_IID(IID_IUserNotification2, IUserNotification2) + END_COM_MAP() +}; + +#endif /* _USERNOTIFICATION_H_ */ diff --git a/dll/win32/shell32/precomp.h b/dll/win32/shell32/precomp.h index f059e5b0b9..f85423ea85 100644 --- a/dll/win32/shell32/precomp.h +++ b/dll/win32/shell32/precomp.h @@ -84,6 +84,7 @@ #include "shellmenu/CMenuSite.h" #include "shellmenu/CMergedFolder.h" #include "shellmenu/shellmenu.h" +#include "CUserNotification.h" #include <wine/debug.h> #include <wine/unicode.h> diff --git a/dll/win32/shell32/res/rgs/usernotification.rgs b/dll/win32/shell32/res/rgs/usernotification.rgs new file mode 100644 index 0000000000..61c585f432 --- /dev/null +++ b/dll/win32/shell32/res/rgs/usernotification.rgs @@ -0,0 +1,43 @@ +HKCR +{ + NoRemove AppID + { + {0010890E-8789-413C-ADBC-48F5B511B3AF} + { + val DllSurrogate = s '' + val RunAs = s 'Interactive User' + } + } + NoRemove CLSID + { + ForceRemove {0010890E-8789-413C-ADBC-48F5B511B3AF} = s 'User Notification' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + val AppID = s '{0010890E-8789-413C-ADBC-48F5B511B3AF}' + } + NoRemove Interface + { + ForceRemove {7307055C-B24A-486B-9F25-163E597A28A9} = s 'IQueryContinue' + { + NumMethods = s '4' + { + } + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + { + } + } + ForceRemove {BA9711BA-5893-4787-A7E1-41277151550B} = s 'IUserNotification' + { + NumMethods = s '8' + { + } + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + { + } + } + } + } +} diff --git a/dll/win32/shell32/rgs_res.rc b/dll/win32/shell32/rgs_res.rc index 118eb51e01..67e072d530 100644 --- a/dll/win32/shell32/rgs_res.rc +++ b/dll/win32/shell32/rgs_res.rc @@ -26,4 +26,5 @@ IDR_DRVDEFEXT REGISTRY "res/rgs/shelldrvdefext.rgs" IDR_EXEDROPHANDLER REGISTRY "res/rgs/exedrophandler.rgs" IDR_MERGEDFOLDER REGISTRY "res/rgs/mergedfolder.rgs" IDR_REBARBANDSITE REGISTRY "res/rgs/rebarbandsite.rgs" +IDR_USERNOTIFICATION REGISTRY "res/rgs/usernotification.rgs" IDR_SHELL REGISTRY "res/rgs/shell.rgs" diff --git a/dll/win32/shell32/shell32.cpp b/dll/win32/shell32/shell32.cpp index 12c5a1e24d..ac0a3bd08c 100644 --- a/dll/win32/shell32/shell32.cpp +++ b/dll/win32/shell32/shell32.cpp @@ -253,9 +253,10 @@ BEGIN_OBJECT_MAP(ObjectMap) OBJECT_ENTRY(CLSID_MergedFolder, CMergedFolder) OBJECT_ENTRY(CLSID_ExeDropHandler, CExeDropHandler) OBJECT_ENTRY(CLSID_QueryAssociations, CQueryAssociations) + OBJECT_ENTRY(CLSID_UserNotification, CUserNotification) END_OBJECT_MAP() -CShell32Module gModule; +CShell32Module gModule; /*********************************************************************** @@ -311,7 +312,7 @@ STDAPI DllGetVersion(DLLVERSIONINFO *pdvi) * all are once per process * */ -HINSTANCE shell32_hInstance; +HINSTANCE shell32_hInstance; /************************************************************************* * SHELL32 DllMain diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 5b607a6943..53e4896713 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -689,4 +689,5 @@ #define IDR_QUERYASSOCIATIONS 152 #define IDR_MERGEDFOLDER 153 #define IDR_REBARBANDSITE 154 -#define IDR_SHELL 155 +#define IDR_USERNOTIFICATION 155 +#define IDR_SHELL 156 diff --git a/dll/win32/shell32/systray.cpp b/dll/win32/shell32/systray.cpp index 482abf0e1b..a64d68950c 100644 --- a/dll/win32/shell32/systray.cpp +++ b/dll/win32/shell32/systray.cpp @@ -22,7 +22,7 @@ #include "precomp.h" -WINE_DEFAULT_DEBUG_CHANNEL(shell); +WINE_DEFAULT_DEBUG_CHANNEL(shell_notify); /************************************************************************* * Shell_NotifyIcon [SHELL32.296]

1 0

02/04: [COM_APITEST] Add tests for IUserNotification. CORE-13177
by Hermès Bélusca-Maïto 15 Feb '18

15 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=70bbdca202b1c2eac59f4… commit 70bbdca202b1c2eac59f4660128ed4036c99f50c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Feb 7 02:14:07 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Feb 15 22:37:32 2018 +0100 [COM_APITEST] Add tests for IUserNotification. CORE-13177 --- modules/rostests/apitests/com/com_apitest.c | 5 +++++ modules/rostests/apitests/com/shell32.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/modules/rostests/apitests/com/com_apitest.c b/modules/rostests/apitests/com/com_apitest.c index 1627084a3d..f9aac66049 100644 --- a/modules/rostests/apitests/com/com_apitest.c +++ b/modules/rostests/apitests/com/com_apitest.c @@ -411,6 +411,11 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(CLSID_ShellDesktop), TRUE }, + { ID_NAME(IID_IQueryContinue) }, + { ID_NAME(IID_IUserNotification) }, +// { ID_NAME(IID_IUserNotificationCallback) }, // On Vista+ +// { ID_NAME(IID_IUserNotification2) }, // On Vista+ + { ID_NAME(IID_IAggregateFilterCondition), TRUE }, { ID_NAME(IID_IAliasRegistrationCallback), TRUE }, { ID_NAME(IID_IAssociationArrayInitialize), TRUE }, diff --git a/modules/rostests/apitests/com/shell32.c b/modules/rostests/apitests/com/shell32.c index 0b6e63c1a3..c7bae24ba2 100644 --- a/modules/rostests/apitests/com/shell32.c +++ b/modules/rostests/apitests/com/shell32.c @@ -613,6 +613,14 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0xc, &IID_IServiceProvider }, } }, + { + ID_NAME(CLSID_UserNotification), + { + { 0x0, &IID_IUserNotification }, + { 0x0, &IID_IUnknown }, +// { 0x4, &IID_IUserNotification2 }, // On Vista+ + } + }, }; static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces);

1 0

01/04: [PSDK] Add definitions for IUserNotification, IQueryContinue, and IUserNotification2 and IUserNotificationCallback (Vista+). CORE-13177
by Hermès Bélusca-Maïto 15 Feb '18

15 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd83ed1ac51de4b8522f6… commit cd83ed1ac51de4b8522f61411cbf9fa10d7d2a56 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Feb 7 02:15:41 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Feb 15 22:36:50 2018 +0100 [PSDK] Add definitions for IUserNotification, IQueryContinue, and IUserNotification2 and IUserNotificationCallback (Vista+). CORE-13177 --- sdk/include/psdk/shobjidl.idl | 121 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/sdk/include/psdk/shobjidl.idl b/sdk/include/psdk/shobjidl.idl index a7bbf3d756..cd5374357c 100644 --- a/sdk/include/psdk/shobjidl.idl +++ b/sdk/include/psdk/shobjidl.idl @@ -36,6 +36,10 @@ import "objectarray.idl"; cpp_quote("/* FIXME: #include <sherrors.h> */") +cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") +cpp_quote("#undef PlaySound") +cpp_quote("#endif") + /***************************************************************************** * IPersistFolder interface @@ -4432,6 +4436,17 @@ library ShellObjects { interface IApplicationActivationManager; } + +#ifdef __REACTOS__ + [ + uuid(0010890e-8789-413c-adbc-48f5b511b3af) + ] + coclass UserNotification + { + interface IUserNotification; + } +#endif // __REACTOS__ + } enum _OPPROGDLGF @@ -4625,3 +4640,109 @@ interface IFolderBandPriv : IUnknown HRESULT SetNoText([in] BOOL fNoText); } + + +#ifdef __REACTOS__ +/***************************************************************************** + * IQueryContinue interface + */ + +[ + uuid(7307055c-b24a-486b-9f25-163e597a28a9), + object, + pointer_default(unique) +] +interface IQueryContinue : IUnknown +{ + // Returns S_OK if the operation should continue, and S_FALSE if not. + HRESULT QueryContinue(); +} + + +/***************************************************************************** + * IUserNotification interface + */ + +[ + uuid(ba9711ba-5893-4787-a7e1-41277151550b), + object, + pointer_default(unique) +] +interface IUserNotification : IUnknown +{ + HRESULT SetBalloonInfo( + [in, unique, string] LPCWSTR pszTitle, + [in, unique, string] LPCWSTR pszText, + [in] DWORD dwInfoFlags); + + HRESULT SetBalloonRetry( + [in] DWORD dwShowTime, // Time intervals in milliseconds + [in] DWORD dwInterval, + [in] UINT cRetryCount); + + HRESULT SetIconInfo( + [in, unique] HICON hIcon, + [in, unique, string] LPCWSTR pszToolTip); + + // Blocks until the notification times out. + HRESULT Show( + [in, unique] IQueryContinue *pqc, + [in] DWORD dwContinuePollInterval); + + HRESULT PlaySound( + [in, string] LPCWSTR pszSoundName); +}; + + +/***************************************************************************** + * IUserNotificationCallback interface (Vista+) + */ + +[ + uuid(19108294-0441-4aff-8013-fa0a730b0bea), + object +] +interface IUserNotificationCallback : IUnknown +{ + HRESULT OnBalloonUserClick([in] POINT * pt); + HRESULT OnLeftClick([in] POINT * pt); + HRESULT OnContextMenu([in] POINT * pt); +}; + + +/***************************************************************************** + * IUserNotification2 interface (Vista+) + */ + +[ + uuid(215913cc-57eb-4fab-ab5a-e5fa7bea2a6c), + object, + pointer_default(unique) +] +interface IUserNotification2 : IUnknown +{ + HRESULT SetBalloonInfo( + [in, unique, string] LPCWSTR pszTitle, + [in, unique, string] LPCWSTR pszText, + [in] DWORD dwInfoFlags); + + HRESULT SetBalloonRetry( + [in] DWORD dwShowTime, // Time intervals in milliseconds + [in] DWORD dwInterval, + [in] UINT cRetryCount); + + HRESULT SetIconInfo( + [in, unique] HICON hIcon, + [in, unique, string] LPCWSTR pszToolTip); + + // Blocks until the notification times out. + HRESULT Show( + [in, unique] IQueryContinue *pqc, + [in] DWORD dwContinuePollInterval, + [in, unique] IUserNotificationCallback *pSink); + + HRESULT PlaySound( + [in, string] LPCWSTR pszSoundName); +}; + +#endif // __REACTOS__

1 0

01/01: [SC] Disable debug messages on user interface (#382)
by Serge Gautherie 15 Feb '18

15 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46f96733bd176b5cf8438… commit 46f96733bd176b5cf84381fba1e7792143946c28 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Feb 15 14:58:17 2018 +0100 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Thu Feb 15 13:58:17 2018 +0000 [SC] Disable debug messages on user interface (#382) --- base/applications/sc/sc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/base/applications/sc/sc.h b/base/applications/sc/sc.h index 3357475d43..3dbacee0c8 100644 --- a/base/applications/sc/sc.h +++ b/base/applications/sc/sc.h @@ -14,7 +14,8 @@ #include <ndk/setypes.h> -#define SCDBG +// Uncomment to enable debug messages on user interface. +// #define SCDBG typedef struct {

1 0

01/01: [HAL] Implement APIC-based profiling for x64.
by Ivan Labutin 15 Feb '18

15 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ae27504672373728aa5a… commit 5ae27504672373728aa5a0ba9b10b16ce9a4d900 Author: Ivan Labutin <linuxrf(a)gmail.com> AuthorDate: Mon Nov 6 21:40:21 2017 +0300 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Feb 15 12:45:29 2018 +0100 [HAL] Implement APIC-based profiling for x64. --- hal/halx86/apic/apic.h | 4 +++ hal/halx86/apic/apictimer.c | 79 +++++++++++++++++++++++++++++++++++++++--- hal/halx86/apic/halinit_apic.c | 3 ++ hal/halx86/include/halp.h | 4 +++ 4 files changed, 85 insertions(+), 5 deletions(-) diff --git a/hal/halx86/apic/apic.h b/hal/halx86/apic/apic.h index 5de22834be..edabaa3b9d 100644 --- a/hal/halx86/apic/apic.h +++ b/hal/halx86/apic/apic.h @@ -278,5 +278,9 @@ VOID NTAPI ApicInitializeTimer(ULONG Cpu); +VOID +NTAPI +HalInitializeProfiling(VOID); + VOID __cdecl ApicSpuriousService(VOID); diff --git a/hal/halx86/apic/apictimer.c b/hal/halx86/apic/apictimer.c index cc0231623f..5fe9305660 100644 --- a/hal/halx86/apic/apictimer.c +++ b/hal/halx86/apic/apictimer.c @@ -16,6 +16,12 @@ extern LARGE_INTEGER HalpCpuClockFrequency; +/* HAL profiling variables */ +BOOLEAN HalIsProfiling = FALSE; +ULONGLONG HalCurProfileInterval = 10000000; +ULONGLONG HalMinProfileInterval = 1000; +ULONGLONG HalMaxProfileInterval = 10000000; + /* TIMER FUNCTIONS ************************************************************/ VOID @@ -59,26 +65,89 @@ ApicInitializeTimer(ULONG Cpu) /* PUBLIC FUNCTIONS ***********************************************************/ +VOID +NTAPI +HalInitializeProfiling(VOID) +{ + KeGetPcr()->HalReserved[HAL_PROFILING_INTERVAL] = HalCurProfileInterval; + KeGetPcr()->HalReserved[HAL_PROFILING_MULTIPLIER] = 1; /* TODO: HACK */ +} + VOID NTAPI HalStartProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { - UNIMPLEMENTED; - return; + LVT_REGISTER LvtEntry; + + /* Only handle ProfileTime */ + if (ProfileSource == ProfileTime) + { + /* OK, we are profiling now */ + HalIsProfiling = TRUE; + + /* Set interrupt interval */ + ApicWrite(APIC_TICR, KeGetPcr()->HalReserved[HAL_PROFILING_INTERVAL]); + + /* Unmask it */ + LvtEntry.Long = 0; + LvtEntry.TimerMode = 1; + LvtEntry.Vector = APIC_PROFILE_VECTOR; + LvtEntry.Mask = 0; + ApicWrite(APIC_TMRLVTR, LvtEntry.Long); + } } VOID NTAPI HalStopProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { - UNIMPLEMENTED; - return; + LVT_REGISTER LvtEntry; + + /* Only handle ProfileTime */ + if (ProfileSource == ProfileTime) + { + /* We are not profiling */ + HalIsProfiling = FALSE; + + /* Mask interrupt */ + LvtEntry.Long = 0; + LvtEntry.TimerMode = 1; + LvtEntry.Vector = APIC_PROFILE_VECTOR; + LvtEntry.Mask = 1; + ApicWrite(APIC_TMRLVTR, LvtEntry.Long); + } } ULONG_PTR NTAPI HalSetProfileInterval(IN ULONG_PTR Interval) { - UNIMPLEMENTED; + ULONGLONG TimerInterval; + ULONGLONG FixedInterval; + + FixedInterval = (ULONGLONG)Interval; + + /* Check bounds */ + if (FixedInterval < HalMinProfileInterval) + { + FixedInterval = HalMinProfileInterval; + } + else if (FixedInterval > HalMaxProfileInterval) + { + FixedInterval = HalMaxProfileInterval; + } + + /* Remember interval */ + HalCurProfileInterval = FixedInterval; + + /* Recalculate interval for APIC */ + TimerInterval = FixedInterval * KeGetPcr()->HalReserved[HAL_PROFILING_MULTIPLIER] / HalMaxProfileInterval; + + /* Remember recalculated interval in PCR */ + KeGetPcr()->HalReserved[HAL_PROFILING_INTERVAL] = (ULONG)TimerInterval; + + /* And set it */ + ApicWrite(APIC_TICR, (ULONG)TimerInterval); + return Interval; } diff --git a/hal/halx86/apic/halinit_apic.c b/hal/halx86/apic/halinit_apic.c index 0ac23c5c2f..cd5e0daf9d 100644 --- a/hal/halx86/apic/halinit_apic.c +++ b/hal/halx86/apic/halinit_apic.c @@ -32,6 +32,9 @@ HalpInitProcessor( /* Initialize the local APIC for this cpu */ ApicInitializeLocalApic(ProcessorNumber); + /* Initialize profiling data (but don't start it) */ + HalInitializeProfiling(); + /* Initialize the timer */ //ApicInitializeTimer(ProcessorNumber); diff --git a/hal/halx86/include/halp.h b/hal/halx86/include/halp.h index 315282f809..079b1adb6d 100644 --- a/hal/halx86/include/halp.h +++ b/hal/halx86/include/halp.h @@ -49,6 +49,10 @@ VOID #define HAL_APC_REQUEST 0 #define HAL_DPC_REQUEST 1 +/* HAL profiling offsets in KeGetPcr()->HalReserved[] */ +#define HAL_PROFILING_INTERVAL 0 +#define HAL_PROFILING_MULTIPLIER 1 + /* CMOS Registers and Ports */ #define CMOS_CONTROL_PORT (PUCHAR)0x70 #define CMOS_DATA_PORT (PUCHAR)0x71

1 0

01/01: [IP] Silence "TCP operation failed" debug spam.
by Thomas Faber 15 Feb '18

15 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad68422a7bbdcf5214128… commit ad68422a7bbdcf52141288c73bcdb52a39586ac4 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu Feb 15 12:19:57 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Feb 15 12:26:35 2018 +0100 [IP] Silence "TCP operation failed" debug spam. --- sdk/lib/drivers/ip/transport/tcp/tcp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/lib/drivers/ip/transport/tcp/tcp.c b/sdk/lib/drivers/ip/transport/tcp/tcp.c index 399d954c95..69a2f42366 100644 --- a/sdk/lib/drivers/ip/transport/tcp/tcp.c +++ b/sdk/lib/drivers/ip/transport/tcp/tcp.c @@ -267,8 +267,8 @@ NTSTATUS TCPTranslateError(const err_t err) Status = STATUS_UNSUCCESSFUL; break; } - - DbgPrint("TCP operation failed: 0x%x (%d)\n", Status, err); + + TI_DbgPrint(DEBUG_TCP,("TCP operation failed: 0x%x (%d)\n", Status, err)); return Status; } @@ -367,7 +367,7 @@ NTSTATUS TCPConnect Bucket->Request.RequestNotifyObject = (PVOID)Complete; Bucket->Request.RequestContext = Context; - + InsertTailList( &Connection->ConnectRequest, &Bucket->Entry ); Status = TCPTranslateError(LibTCPConnect(Connection,

1 0

01/01: [SHELL32] CNewMenu: Don't use CWM_GETISHELLBROWSER. CDefaultContextMenu: Set the site for context menu extensions CNewMenu: Get SID_IFolderView service of the site to get the IShellView
by Giannis Adamopoulos 14 Feb '18

14 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=67f99833cdb861a11720a… commit 67f99833cdb861a11720ad03685b439b599e3233 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Thu Feb 15 00:58:22 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Thu Feb 15 00:58:22 2018 +0200 [SHELL32] CNewMenu: Don't use CWM_GETISHELLBROWSER. CDefaultContextMenu: Set the site for context menu extensions CNewMenu: Get SID_IFolderView service of the site to get the IShellView --- dll/win32/shell32/CDefaultContextMenu.cpp | 3 +++ dll/win32/shell32/CNewMenu.cpp | 21 +++++++++------------ dll/win32/shell32/CNewMenu.h | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index dcb754bd96..0834995abd 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -376,6 +376,9 @@ CDefaultContextMenu::LoadDynamicContextMenuHandler(HKEY hKey, const CLSID *pclsi return hr; } + if (m_site) + IUnknown_SetSite(pcm, m_site); + PDynamicShellEntry pEntry = (DynamicShellEntry *)HeapAlloc(GetProcessHeap(), 0, sizeof(DynamicShellEntry)); if (!pEntry) return E_OUTOFMEMORY; diff --git a/dll/win32/shell32/CNewMenu.cpp b/dll/win32/shell32/CNewMenu.cpp index 8dd1d86f74..4a17e9b58b 100644 --- a/dll/win32/shell32/CNewMenu.cpp +++ b/dll/win32/shell32/CNewMenu.cpp @@ -404,7 +404,7 @@ CNewMenu::SHELLNEW_ITEM *CNewMenu::FindItemFromIdOffset(UINT IdOffset) return pItem; } -HRESULT CNewMenu::SelectNewItem(LPCMINVOKECOMMANDINFO lpici, LONG wEventId, UINT uFlags, LPWSTR pszName) +HRESULT CNewMenu::SelectNewItem(LONG wEventId, UINT uFlags, LPWSTR pszName) { CComPtr<IShellBrowser> lpSB; CComPtr<IShellView> lpSV; @@ -415,16 +415,13 @@ HRESULT CNewMenu::SelectNewItem(LPCMINVOKECOMMANDINFO lpici, LONG wEventId, UINT /* Notify the view object about the new item */ SHChangeNotify(wEventId, uFlags, (LPCVOID) pszName, NULL); - /* FIXME: I think that this can be implemented using callbacks to the shell folder */ + if (!m_pSite) + return S_OK; - /* Note: CWM_GETISHELLBROWSER returns shell browser without adding reference */ - lpSB = (LPSHELLBROWSER)SendMessageA(lpici->hwnd, CWM_GETISHELLBROWSER, 0, 0); - if (!lpSB) - return E_FAIL; - - hr = lpSB->QueryActiveShellView(&lpSV); - if (FAILED(hr)) - return hr; + /* Get a pointer to the shell view */ + hr = IUnknown_QueryService(m_pSite, SID_IFolderView, IID_PPV_ARG(IShellView, &lpSV)); + if (FAILED_UNEXPECTEDLY(hr)) + return S_OK; /* Attempt to get the pidl of the new item */ hr = SHILCreateFromPathW(pszName, &pidl, NULL); @@ -466,7 +463,7 @@ HRESULT CNewMenu::CreateNewFolder(LPCMINVOKECOMMANDINFO lpici) return E_FAIL; /* Show and select the new item in the def view */ - SelectNewItem(lpici, SHCNE_MKDIR, SHCNF_PATHW, wszName); + SelectNewItem(SHCNE_MKDIR, SHCNF_PATHW, wszName); return S_OK; } @@ -572,7 +569,7 @@ HRESULT CNewMenu::CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcm if (bSuccess) { TRACE("Notifying fs %s\n", debugstr_w(wszName)); - SelectNewItem(lpcmi, SHCNE_CREATE, SHCNF_PATHW, wszName); + SelectNewItem(SHCNE_CREATE, SHCNF_PATHW, wszName); } else { diff --git a/dll/win32/shell32/CNewMenu.h b/dll/win32/shell32/CNewMenu.h index 2d2c52a355..2475e725a9 100644 --- a/dll/win32/shell32/CNewMenu.h +++ b/dll/win32/shell32/CNewMenu.h @@ -71,7 +71,7 @@ private: SHELLNEW_ITEM *FindItemFromIdOffset(UINT IdOffset); HRESULT CreateNewFolder(LPCMINVOKECOMMANDINFO lpici); HRESULT CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcmi); - HRESULT SelectNewItem(LPCMINVOKECOMMANDINFO lpici, LONG wEventId, UINT uFlags, LPWSTR pszName); + HRESULT SelectNewItem(LONG wEventId, UINT uFlags, LPWSTR pszName); public: CNewMenu();

1 0

01/01: [SHELL32] Fix the toolbar buttons in the file open dialog CDefView: Make GetItemObject return an IContectMenu after setting itself as the site. CDefViewBckgrndMenu: Make the inner context menu use the same site. Implement handling CMDSTR_VIEWLISTA and CMDSTR_VIEWDETAILSA. CDefaultContextMenu: CMDSTR_VIEWLISTA and CMDSTR_VIEWDETAILSA shouldn't be handled in this class. Fixes CORE-14327 and the two buttons that change the view mode
by Giannis Adamopoulos 14 Feb '18

14 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b97886ea9f17c62a84963… commit b97886ea9f17c62a849634053ef3dd0521a00848 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Thu Feb 15 00:23:18 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Thu Feb 15 00:23:18 2018 +0200 [SHELL32] Fix the toolbar buttons in the file open dialog CDefView: Make GetItemObject return an IContectMenu after setting itself as the site. CDefViewBckgrndMenu: Make the inner context menu use the same site. Implement handling CMDSTR_VIEWLISTA and CMDSTR_VIEWDETAILSA. CDefaultContextMenu: CMDSTR_VIEWLISTA and CMDSTR_VIEWDETAILSA shouldn't be handled in this class. Fixes CORE-14327 and the two buttons that change the view mode --- dll/win32/shell32/CDefView.cpp | 13 +++++-------- dll/win32/shell32/CDefViewBckgrndMenu.cpp | 23 +++++++++++++++++++---- dll/win32/shell32/CDefaultContextMenu.cpp | 4 +--- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 9863205273..c3d37e5c0e 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1110,8 +1110,6 @@ HRESULT CDefView::FillFileMenu() if (FAILED_UNEXPECTEDLY(hr)) return hr; - IUnknown_SetSite(m_pCM, (IShellView *)this); - HMENU hmenu = CreatePopupMenu(); hr = m_pCM->QueryContextMenu(hmenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, 0); @@ -1274,8 +1272,6 @@ HRESULT CDefView::OpenSelectedItems() if (FAILED_UNEXPECTEDLY(hResult)) goto cleanup; - IUnknown_SetSite(m_pCM, (IShellView *)this); - hResult = m_pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_DEFAULTONLY); if (FAILED_UNEXPECTEDLY(hResult)) goto cleanup; @@ -1327,8 +1323,6 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b if (FAILED_UNEXPECTEDLY(hResult)) goto cleanup; - IUnknown_SetSite(m_pCM, (IShellView *)this); - /* Use 1 as the first id as we want 0 the mean that the user canceled the menu */ hResult = m_pCM->QueryContextMenu(m_hContextMenu, 0, CONTEXT_MENU_BASE_ID, FCIDM_SHVIEWLAST, CMF_NORMAL); if (FAILED_UNEXPECTEDLY(hResult)) @@ -1374,8 +1368,6 @@ LRESULT CDefView::OnExplorerCommand(UINT uCommand, BOOL bUseSelection) if (FAILED_UNEXPECTEDLY( hResult)) goto cleanup; - IUnknown_SetSite(m_pCM, (IShellView *)this); - hResult = m_pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); if (FAILED_UNEXPECTEDLY( hResult)) goto cleanup; @@ -2287,6 +2279,7 @@ HRESULT WINAPI CDefView::GetItemObject(UINT uItem, REFIID riid, LPVOID *ppvOut) if (FAILED_UNEXPECTEDLY(hr)) return hr; + IUnknown_SetSite(*((IUnknown**)ppvOut), (IShellView *)this); } else if (IsEqualIID(riid, IID_IDispatch)) { @@ -2305,6 +2298,10 @@ HRESULT WINAPI CDefView::GetItemObject(UINT uItem, REFIID riid, LPVOID *ppvOut) hr = m_pSFParent->GetUIObjectOf(m_hWnd, m_cidl, m_apidl, riid, 0, ppvOut); if (FAILED_UNEXPECTEDLY(hr)) return hr; + + if (IsEqualIID(riid, IID_IContextMenu)) + IUnknown_SetSite(*((IUnknown**)ppvOut), (IShellView *)this); + break; } diff --git a/dll/win32/shell32/CDefViewBckgrndMenu.cpp b/dll/win32/shell32/CDefViewBckgrndMenu.cpp index 3815019894..5636cdf548 100644 --- a/dll/win32/shell32/CDefViewBckgrndMenu.cpp +++ b/dll/win32/shell32/CDefViewBckgrndMenu.cpp @@ -126,6 +126,10 @@ WINAPI CDefViewBckgrndMenu::SetSite(IUnknown *pUnkSite) { m_site = pUnkSite; + + if(m_folderCM) + IUnknown_SetSite(m_folderCM, pUnkSite); + return S_OK; } @@ -212,7 +216,16 @@ WINAPI CDefViewBckgrndMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) { UINT idCmd = LOWORD(lpcmi->lpVerb); - if(HIWORD(lpcmi->lpVerb) != 0 || idCmd < m_LastFolderCMId) + + if (HIWORD(lpcmi->lpVerb) && !strcmp(lpcmi->lpVerb, CMDSTR_VIEWLISTA)) + { + idCmd = FCIDM_SHVIEW_LISTVIEW; + } + else if (HIWORD(lpcmi->lpVerb) && !strcmp(lpcmi->lpVerb, CMDSTR_VIEWDETAILSA)) + { + idCmd = FCIDM_SHVIEW_REPORTVIEW; + } + else if(HIWORD(lpcmi->lpVerb) != 0 || idCmd < m_LastFolderCMId) { if (m_folderCM) { @@ -221,9 +234,11 @@ CDefViewBckgrndMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) WARN("m_folderCM is NULL!\n"); return E_NOTIMPL; } - - /* The default part of the background menu doesn't have shifted ids so we need to convert the id offset to the real id */ - idCmd += m_idCmdFirst; + else + { + /* The default part of the background menu doesn't have shifted ids so we need to convert the id offset to the real id */ + idCmd += m_idCmdFirst; + } /* The commands that are handled by the def view are forwarded to it */ switch (idCmd) diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index 13d084ffbb..dcb754bd96 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -47,9 +47,7 @@ struct _StaticInvokeCommandMap_ { "Print", 0 }, // Unimplemented { "Preview", 0 }, // Unimplemented { "Open", FCIDM_SHVIEW_OPEN }, - { CMDSTR_NEWFOLDERA, FCIDM_SHVIEW_NEWFOLDER }, - { CMDSTR_VIEWLISTA, FCIDM_SHVIEW_LISTVIEW }, - { CMDSTR_VIEWDETAILSA, FCIDM_SHVIEW_REPORTVIEW } + { CMDSTR_NEWFOLDERA, FCIDM_SHVIEW_NEWFOLDER } };

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