Ros-diffs March 2020

ros-diffs@reactos.org

25 participants
156 discussions

by jimtabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10d1afea18db0ef069422… commit 10d1afea18db0ef06942239867cbc090e2330b90 Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Sat Mar 21 19:13:55 2020 -0500 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Sat Mar 21 19:13:55 2020 -0500 [Explorer|Shell32] Fix SHAppBarMessage (not perfect) by adapting wine code. See CORE-14439. More work is required. Kept the original code for reference. Example : SetWindowPos should be called via Post Message. Code commit is to wake up other developers. --- base/shell/explorer/CMakeLists.txt | 1 + base/shell/explorer/appbar.cpp | 268 ++++++++++++++++++++++++++++++++++ base/shell/explorer/syspager.cpp | 14 +- dll/win32/shell32/CMakeLists.txt | 1 + dll/win32/shell32/systray.cpp | 2 +- dll/win32/shell32/wine/appbar.c | 167 +++++++++++++++++++++ dll/win32/shell32/wine/shell32_main.c | 2 +- 7 files changed, 451 insertions(+), 4 deletions(-) diff --git a/base/shell/explorer/CMakeLists.txt b/base/shell/explorer/CMakeLists.txt index b3f2982fda6..18562492378 100644 --- a/base/shell/explorer/CMakeLists.txt +++ b/base/shell/explorer/CMakeLists.txt @@ -5,6 +5,7 @@ add_definitions(-D_ATL_NO_EXCEPTIONS) include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) list(APPEND SOURCE + appbar.cpp desktop.cpp explorer.cpp notifyiconscust.cpp diff --git a/base/shell/explorer/appbar.cpp b/base/shell/explorer/appbar.cpp new file mode 100644 index 00000000000..f3a3e880692 --- /dev/null +++ b/base/shell/explorer/appbar.cpp @@ -0,0 +1,268 @@ +/* + * SHAppBarMessage implementation + * + * Copyright 2008 Vincent Povirk for CodeWeavers + * + * 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 St, Fifth Floor, Boston, MA 02110-1301, USA + * + * TODO: freedesktop _NET_WM_STRUT integration + * + * TODO: find when a fullscreen app is in the foreground and send FULLSCREENAPP + * notifications + * + * TODO: detect changes in the screen size and send ABN_POSCHANGED ? + * + * TODO: multiple monitor support + */ + +// +// Adapted from Wine appbar.c . +// + +#include "precomp.h" + +#include <wine/list.h> + +struct appbar_cmd +{ + DWORD dwMsg; + ULONG return_map; + DWORD return_process; + struct _AppBarData abd; +}; + +struct appbar_response +{ + ULONGLONG result; + struct _AppBarData abd; +}; + +struct appbar_data +{ + struct list entry; + HWND hwnd; + UINT callback_msg; + UINT edge; + RECT rc; + BOOL space_reserved; + /* BOOL autohide; */ +}; + +static struct list appbars = LIST_INIT(appbars); + +static struct appbar_data* get_appbar(HWND hwnd) +{ + struct appbar_data* data; + + LIST_FOR_EACH_ENTRY(data, &appbars, struct appbar_data, entry) + { + if (data->hwnd == hwnd) + return data; + } + + return NULL; +} + +/* send_poschanged: send ABN_POSCHANGED to every appbar except one */ +static void send_poschanged(HWND hwnd) +{ + struct appbar_data* data; + LIST_FOR_EACH_ENTRY(data, &appbars, struct appbar_data, entry) + { + if (data->hwnd != hwnd) + { + PostMessageW(data->hwnd, data->callback_msg, ABN_POSCHANGED, 0); + } + } +} + +/* appbar_cliprect: cut out parts of the rectangle that interfere with existing appbars */ +static void appbar_cliprect( HWND hwnd, RECT *rect ) +{ + struct appbar_data* data; + LIST_FOR_EACH_ENTRY(data, &appbars, struct appbar_data, entry) + { + if (data->hwnd == hwnd) + { + /* we only care about appbars that were added before this one */ + return; + } + if (data->space_reserved) + { + /* move in the side that corresponds to the other appbar's edge */ + switch (data->edge) + { + case ABE_BOTTOM: + rect->bottom = min(rect->bottom, data->rc.top); + break; + case ABE_LEFT: + rect->left = max(rect->left, data->rc.right); + break; + case ABE_RIGHT: + rect->right = min(rect->right, data->rc.left); + break; + case ABE_TOP: + rect->top = max(rect->top, data->rc.bottom); + break; + } + } + } +} + +static UINT_PTR handle_appbarmessage(DWORD msg, _AppBarData *abd) +{ + struct appbar_data* data; + HWND hwnd = abd->hWnd; + + switch (msg) + { + case ABM_NEW: + if (get_appbar(hwnd)) + { + /* fail when adding an hwnd the second time */ + return FALSE; + } + + data = (struct appbar_data*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct appbar_data)); + if (!data) + { + ERR("out of memory\n"); + return FALSE; + } + data->hwnd = hwnd; + data->callback_msg = abd->uCallbackMessage; + + list_add_tail(&appbars, &data->entry); + + return TRUE; + case ABM_REMOVE: + if ((data = get_appbar(hwnd))) + { + list_remove(&data->entry); + + send_poschanged(hwnd); + + HeapFree(GetProcessHeap(), 0, data); + } + else + WARN("removing hwnd %p not on the list\n", hwnd); + return TRUE; + case ABM_QUERYPOS: + if (abd->uEdge > ABE_BOTTOM) + WARN("invalid edge %i for %p\n", abd->uEdge, hwnd); + appbar_cliprect( hwnd, &abd->rc ); + return TRUE; + case ABM_SETPOS: + if (abd->uEdge > ABE_BOTTOM) + { + WARN("invalid edge %i for %p\n", abd->uEdge, hwnd); + return TRUE; + } + if ((data = get_appbar(hwnd))) + { + /* calculate acceptable space */ + appbar_cliprect( hwnd, &abd->rc ); + + if (!EqualRect(&abd->rc, &data->rc)) + send_poschanged(hwnd); + + /* reserve that space for this appbar */ + data->edge = abd->uEdge; + data->rc = abd->rc; + data->space_reserved = TRUE; + } + else + { + WARN("app sent ABM_SETPOS message for %p without ABM_ADD\n", hwnd); + } + return TRUE; + case ABM_GETSTATE: + FIXME("SHAppBarMessage(ABM_GETSTATE): stub\n"); + return ABS_ALWAYSONTOP | ABS_AUTOHIDE; + case ABM_GETTASKBARPOS: + FIXME("SHAppBarMessage(ABM_GETTASKBARPOS, hwnd=%p): stub\n", hwnd); + /* Report the taskbar is at the bottom of the screen. */ + abd->rc.left = 0; + abd->rc.right = GetSystemMetrics(SM_CXSCREEN); + abd->rc.bottom = GetSystemMetrics(SM_CYSCREEN); + abd->rc.top = abd->rc.bottom-1; + abd->uEdge = ABE_BOTTOM; + return TRUE; + case ABM_ACTIVATE: + return TRUE; + case ABM_GETAUTOHIDEBAR: + FIXME("SHAppBarMessage(ABM_GETAUTOHIDEBAR, hwnd=%p, edge=%x): stub\n", hwnd, abd->uEdge); + return 0; + case ABM_SETAUTOHIDEBAR: + FIXME("SHAppBarMessage(ABM_SETAUTOHIDEBAR, hwnd=%p, edge=%x, lparam=%s): stub\n", + hwnd, abd->uEdge, wine_dbgstr_longlong(abd->lParam)); + return TRUE; + case ABM_WINDOWPOSCHANGED: + return TRUE; + default: + FIXME("SHAppBarMessage(%x) unimplemented\n", msg); + return FALSE; + } +} + +LRESULT appbar_message ( COPYDATASTRUCT* cds ) +{ + struct appbar_cmd cmd; + UINT_PTR result; + HANDLE return_hproc; + HANDLE return_map; + LPVOID return_view; + struct appbar_response* response; + + if (cds->cbData != sizeof(struct appbar_cmd)) + return TRUE; + + RtlCopyMemory(&cmd, cds->lpData, cds->cbData); + + result = handle_appbarmessage(cmd.dwMsg, &cmd.abd); + + return_hproc = OpenProcess(PROCESS_DUP_HANDLE, FALSE, cmd.return_process); + if (return_hproc == NULL) + { + ERR("couldn't open calling process\n"); + return TRUE; + } + + if (!DuplicateHandle(return_hproc, UlongToHandle(cmd.return_map), GetCurrentProcess(), &return_map, 0, FALSE, DUPLICATE_SAME_ACCESS)) + { + ERR("couldn't duplicate handle\n"); + CloseHandle(return_hproc); + return TRUE; + } + CloseHandle(return_hproc); + + return_view = MapViewOfFile(return_map, FILE_MAP_WRITE, 0, 0, sizeof(struct appbar_response)); + + if (return_view) + { + response = (struct appbar_response*)return_view; + response->result = result; + response->abd = cmd.abd; + + UnmapViewOfFile(return_view); + } + else + { + ERR("couldn't map view of file\n"); + } + + CloseHandle(return_map); + return TRUE; +} diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index 8d4f9145ce5..8d507c5be60 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -1531,17 +1531,27 @@ LRESULT CSysPagerWnd::OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa return 0; } +LRESULT appbar_message( COPYDATASTRUCT* cds ); + LRESULT CSysPagerWnd::OnCopyData(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { PCOPYDATASTRUCT cpData = (PCOPYDATASTRUCT)lParam; - if (cpData->dwData == 1) + if (cpData->dwData == TABDMC_NOTIFY) { /* A taskbar NotifyIcon notification */ PTRAYNOTIFYDATAW pData = (PTRAYNOTIFYDATAW)cpData->lpData; if (pData->dwSignature == NI_NOTIFY_SIG) return NotifyIcon(pData->dwMessage, &pData->nid); } - // TODO: Handle other types of taskbar notifications + else if (cpData->dwData == TABDMC_APPBAR) + { + FIXME("Taskbar Tray Application Bar\n"); + return appbar_message( cpData ); + } + else if (cpData->dwData == TABDMC_LOADINPROC) + { + FIXME("Taskbar Load In Proc\n"); + } return FALSE; } diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt index fb850fceafa..ef7d87c5811 100644 --- a/dll/win32/shell32/CMakeLists.txt +++ b/dll/win32/shell32/CMakeLists.txt @@ -94,6 +94,7 @@ add_rc_deps(shell32.rc ${shell32_rc_deps}) add_library(shell32 MODULE ${SOURCE} + wine/appbar.c wine/brsfolder.c wine/changenotify.c wine/classes.c diff --git a/dll/win32/shell32/systray.cpp b/dll/win32/shell32/systray.cpp index a64d68950c6..0d4f21456ab 100644 --- a/dll/win32/shell32/systray.cpp +++ b/dll/win32/shell32/systray.cpp @@ -197,7 +197,7 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW pnid) } /* Send the data */ - data.dwData = 1; + data.dwData = TABDMC_NOTIFY; data.cbData = sizeof(tnid); data.lpData = &tnid; if (SendMessageW(hShellTrayWnd, WM_COPYDATA, (WPARAM)pnid->hWnd, (LPARAM)&data)) diff --git a/dll/win32/shell32/wine/appbar.c b/dll/win32/shell32/wine/appbar.c new file mode 100644 index 00000000000..78ca967b238 --- /dev/null +++ b/dll/win32/shell32/wine/appbar.c @@ -0,0 +1,167 @@ +/* + * SHAppBarMessage implementation + * + * Copyright 2008 Vincent Povirk for CodeWeavers + * + * 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 St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +// +// Adapted from Wine appbar.c . +// + +#include <wine/config.h> + +#include <stdlib.h> +#include <string.h> +#include <stdarg.h> +#include <stdio.h> + +#include <windef.h> +#include <winbase.h> +#include <winerror.h> +#include <shellapi.h> +#include <winuser.h> +#include <shlobj.h> +#include <shlwapi.h> + +#include "undocshell.h" + +#include <wine/debug.h> +#include <wine/unicode.h> + +WINE_DEFAULT_DEBUG_CHANNEL(appbar); + +struct appbar_cmd +{ + DWORD dwMsg; + ULONG return_map; + DWORD return_process; + struct _AppBarData abd; +}; + +struct appbar_response +{ + ULONGLONG result; + struct _AppBarData abd; +}; + +/************************************************************************* + * SHAppBarMessage [SHELL32.@] + */ +UINT_PTR WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data) +{ + struct appbar_cmd command; + struct appbar_response* response; + HANDLE return_map; + LPVOID return_view; + HWND appbarmsg_window; + COPYDATASTRUCT cds; + + UINT_PTR ret = 0; + + TRACE("msg=%d, data={cb=%d, hwnd=%p}\n", msg, data->cbSize, data->hWnd); + + /* These members are message dependent */ + switch(msg) + { + case ABM_NEW: + TRACE("callback: %x\n", data->uCallbackMessage); + break; + + case ABM_GETAUTOHIDEBAR: + TRACE("edge: %d\n", data->uEdge); + break; + + case ABM_QUERYPOS: + case ABM_SETPOS: + TRACE("edge: %d, rc: %s\n", data->uEdge, wine_dbgstr_rect(&data->rc)); + break; + + case ABM_GETTASKBARPOS: + TRACE("rc: %s\n", wine_dbgstr_rect(&data->rc)); + break; + + case ABM_SETAUTOHIDEBAR: + TRACE("edge: %d, lParam: %lx\n", data->uEdge, data->lParam); + break; + + default: + FIXME("unknown msg: %d\n", msg); + break; + } + + if (data->cbSize < sizeof(APPBARDATA)) + { + WARN("data at %p is too small\n", data); + return FALSE; + } + + command.dwMsg = msg; + command.abd.hWnd = data->hWnd; + command.abd.uCallbackMessage = data->uCallbackMessage; + command.abd.uEdge = data->uEdge; + command.abd.rc = data->rc; + command.abd.lParam = data->lParam; + + return_map = CreateFileMappingW(INVALID_HANDLE_VALUE, 0, PAGE_READWRITE, 0, sizeof(struct appbar_response), NULL); + if (return_map == NULL) + { + ERR("couldn't create file mapping\n"); + return 0; + } + command.return_map = HandleToUlong( return_map ); + + command.return_process = GetCurrentProcessId(); + + appbarmsg_window = FindWindowW(L"Shell_TrayWnd", NULL); + if (appbarmsg_window == NULL) + { + ERR("couldn't find appbar window\n"); + CloseHandle(return_map); + return 0; + } + + cds.dwData = TABDMC_APPBAR; + cds.cbData = sizeof(command); + cds.lpData = &command; + + SendMessageW(appbarmsg_window, WM_COPYDATA, (WPARAM)data->hWnd, (LPARAM)&cds); + + return_view = MapViewOfFile(return_map, FILE_MAP_READ, 0, 0, sizeof(struct appbar_response)); + if (return_view == NULL) + { + ERR("MapViewOfFile failed\n"); + CloseHandle(return_map); + return 0; + } + + response = return_view; + + ret = response->result; + if (ret) + { + data->hWnd = response->abd.hWnd; + data->uCallbackMessage = response->abd.uCallbackMessage; + data->uEdge = response->abd.uEdge; + data->rc = response->abd.rc; + data->lParam = response->abd.lParam; + } + UnmapViewOfFile(return_view); + + CloseHandle(return_map); + + return ret; +} diff --git a/dll/win32/shell32/wine/shell32_main.c b/dll/win32/shell32/wine/shell32_main.c index ae44ee22a5d..fdd02477b2a 100644 --- a/dll/win32/shell32/wine/shell32_main.c +++ b/dll/win32/shell32/wine/shell32_main.c @@ -977,7 +977,7 @@ typedef struct /************************************************************************* * SHAppBarMessage [SHELL32.@] */ -UINT_PTR WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data) +UINT_PTR WINAPI OLD_SHAppBarMessage(DWORD msg, PAPPBARDATA data) { int width=data->rc.right - data->rc.left; int height=data->rc.bottom - data->rc.top;

4 years, 9 months

[reactos] 01/01: [STDOBJECT] Show the hotplug icon when a USB-Stick is inserted

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fc999e18af4e57f66cde7… commit fc999e18af4e57f66cde7845cfbac7692e13384d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Mar 21 23:46:24 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Mar 21 23:46:24 2020 +0100 [STDOBJECT] Show the hotplug icon when a USB-Stick is inserted - Enable the hotplug service by default - Start a timer on WM_DEVICECHANGE:DBT_DEVNODES_CHANGED to trigger the removable device detection. --- dll/shellext/stobject/csystray.cpp | 4 ++-- dll/shellext/stobject/hotplug.cpp | 47 ++++++++++++++++++++++++++++---------- dll/shellext/stobject/precomp.h | 1 + 3 files changed, 38 insertions(+), 14 deletions(-) diff --git a/dll/shellext/stobject/csystray.cpp b/dll/shellext/stobject/csystray.cpp index 136927896bf..14f9c213a9f 100644 --- a/dll/shellext/stobject/csystray.cpp +++ b/dll/shellext/stobject/csystray.cpp @@ -27,8 +27,8 @@ VOID CSysTray::GetServicesEnabled() HKEY hKey; DWORD dwSize; - /* Enable power and volume by default */ - this->dwServicesEnabled = POWER_SERVICE_FLAG | VOLUME_SERVICE_FLAG; + /* Enable power, volume and hotplug by default */ + this->dwServicesEnabled = POWER_SERVICE_FLAG | VOLUME_SERVICE_FLAG | HOTPLUG_SERVICE_FLAG; if (RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\SysTray", diff --git a/dll/shellext/stobject/hotplug.cpp b/dll/shellext/stobject/hotplug.cpp index b2202c99d44..5df143d8454 100644 --- a/dll/shellext/stobject/hotplug.cpp +++ b/dll/shellext/stobject/hotplug.cpp @@ -128,28 +128,32 @@ HRESULT NotifyBalloon(CSysTray* pSysTray, LPCWSTR szTitle = NULL, LPCWSTR szInfo } HRESULT STDMETHODCALLTYPE Hotplug_Init(_In_ CSysTray * pSysTray) -{ +{ TRACE("Hotplug_Init\n"); + g_hIconHotplug = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_HOTPLUG_OK)); + EnumHotpluggedDevices(g_devList); - return pSysTray->NotifyIcon(NIM_ADD, ID_ICON_HOTPLUG, g_hIconHotplug, g_strTooltip, NIS_HIDDEN); + if (g_devList.GetSize() > 0) + return pSysTray->NotifyIcon(NIM_ADD, ID_ICON_HOTPLUG, g_hIconHotplug, g_strTooltip); + else + return pSysTray->NotifyIcon(NIM_ADD, ID_ICON_HOTPLUG, g_hIconHotplug, g_strTooltip, NIS_HIDDEN); } HRESULT STDMETHODCALLTYPE Hotplug_Update(_In_ CSysTray * pSysTray) { TRACE("Hotplug_Update\n"); - - if(g_devList.GetSize() || g_IsRemoving) - return pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_HOTPLUG, g_hIconHotplug, g_strTooltip); - else - return pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_HOTPLUG, g_hIconHotplug, g_strTooltip, NIS_HIDDEN); + return S_OK; } HRESULT STDMETHODCALLTYPE Hotplug_Shutdown(_In_ CSysTray * pSysTray) { TRACE("Hotplug_Shutdown\n"); + DestroyIcon(g_hIconHotplug); + g_hIconHotplug = NULL; + return pSysTray->NotifyIcon(NIM_DELETE, ID_ICON_HOTPLUG, NULL, NULL); } @@ -239,9 +243,24 @@ static void _ShowContextMenuR(CSysTray * pSysTray) DestroyMenu(hPopup); } + +VOID +HotplugDeviceTimer( + _In_ CSysTray *pSysTray) +{ + TRACE("HotplugDeviceTimer()\n"); + + EnumHotpluggedDevices(g_devList); + + if (g_devList.GetSize() > 0) + pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_HOTPLUG, g_hIconHotplug, g_strTooltip); + else + pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_HOTPLUG, g_hIconHotplug, g_strTooltip, NIS_HIDDEN); +} + + HRESULT STDMETHODCALLTYPE Hotplug_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult) { - HRESULT hr = E_FAIL; TRACE("Hotplug_Message uMsg=%d, wParam=%x, lParam=%x\n", uMsg, wParam, lParam); switch (uMsg) @@ -294,6 +313,11 @@ HRESULT STDMETHODCALLTYPE Hotplug_Message(_In_ CSysTray * pSysTray, UINT uMsg, W KillTimer(pSysTray->GetHWnd(), HOTPLUG_TIMER_ID); _ShowContextMenu(pSysTray); } + else if (wParam == HOTPLUG_DEVICE_TIMER_ID) + { + KillTimer(pSysTray->GetHWnd(), HOTPLUG_DEVICE_TIMER_ID); + HotplugDeviceTimer(pSysTray); + } break; case ID_ICON_HOTPLUG: @@ -332,12 +356,11 @@ HRESULT STDMETHODCALLTYPE Hotplug_Message(_In_ CSysTray * pSysTray, UINT uMsg, W switch (wParam) { case DBT_DEVNODES_CHANGED: - hr = EnumHotpluggedDevices(g_devList); - if (FAILED(hr)) - return hr; - + TRACE("WM_DEVICECHANGE : DBT_DEVNODES_CHANGED\n"); + SetTimer(pSysTray->GetHWnd(), HOTPLUG_DEVICE_TIMER_ID, 100, NULL); lResult = true; break; + case DBT_DEVICEARRIVAL: break; case DBT_DEVICEQUERYREMOVE: diff --git a/dll/shellext/stobject/precomp.h b/dll/shellext/stobject/precomp.h index 87747a90b49..e60b0a265b8 100644 --- a/dll/shellext/stobject/precomp.h +++ b/dll/shellext/stobject/precomp.h @@ -77,5 +77,6 @@ extern HRESULT STDMETHODCALLTYPE Power_Message(_In_ CSysTray * pSysTray, UINT uM #define POWER_TIMER_ID 2 #define VOLUME_TIMER_ID 3 #define HOTPLUG_TIMER_ID 4 +#define HOTPLUG_DEVICE_TIMER_ID 5 #endif /* _STOBJECT_PRECOMP_H_ */

4 years, 9 months

[reactos] 01/01: [NTOS:IO] Fix indentation. No code changes!

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93e72ed3d6198f836bacd… commit 93e72ed3d6198f836bacd338e1b19ded5d061c5d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Mar 21 14:32:18 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Mar 21 14:32:18 2020 +0100 [NTOS:IO] Fix indentation. No code changes! --- ntoskrnl/io/iomgr/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/io/iomgr/device.c b/ntoskrnl/io/iomgr/device.c index 56a4bd7e3ed..096fa772862 100644 --- a/ntoskrnl/io/iomgr/device.c +++ b/ntoskrnl/io/iomgr/device.c @@ -914,9 +914,9 @@ IoAttachDevice(PDEVICE_OBJECT SourceDevice, PUNICODE_STRING TargetDeviceName, PDEVICE_OBJECT *AttachedDevice) { - NTSTATUS Status; - PFILE_OBJECT FileObject = NULL; - PDEVICE_OBJECT TargetDevice = NULL; + NTSTATUS Status; + PFILE_OBJECT FileObject = NULL; + PDEVICE_OBJECT TargetDevice = NULL; /* Call the helper routine for an attach operation */ Status = IopGetDeviceObjectPointer(TargetDeviceName,

4 years, 9 months

[reactos] 03/03: [NTOS:PNP] Fix indentation. No code changes!

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=52d22630f535519b5f1aa… commit 52d22630f535519b5f1aa070a2aa2efbc03edc8f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Mar 21 13:22:09 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Mar 21 13:23:23 2020 +0100 [NTOS:PNP] Fix indentation. No code changes! --- ntoskrnl/io/pnpmgr/pnpmgr.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index 320d57d2798..48890364bf9 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -896,7 +896,7 @@ IopStartAndEnumerateDevice(IN PDEVICE_NODE DeviceNode) NTSTATUS IopStopDevice( - PDEVICE_NODE DeviceNode) + PDEVICE_NODE DeviceNode) { NTSTATUS Status; @@ -918,7 +918,7 @@ IopStopDevice( NTSTATUS IopStartDevice( - PDEVICE_NODE DeviceNode) + PDEVICE_NODE DeviceNode) { NTSTATUS Status; HANDLE InstanceHandle = NULL, ControlHandle = NULL; @@ -958,12 +958,12 @@ IopStartDevice( if (!NT_SUCCESS(Status)) goto ByeBye; - RtlInitUnicodeString(&KeyName, L"ActiveService"); - ValueString = DeviceNode->ServiceName; - if (!ValueString.Buffer) - RtlInitUnicodeString(&ValueString, L""); - Status = ZwSetValueKey(ControlHandle, &KeyName, 0, REG_SZ, ValueString.Buffer, ValueString.Length + sizeof(UNICODE_NULL)); - // } + RtlInitUnicodeString(&KeyName, L"ActiveService"); + ValueString = DeviceNode->ServiceName; + if (!ValueString.Buffer) + RtlInitUnicodeString(&ValueString, L""); + Status = ZwSetValueKey(ControlHandle, &KeyName, 0, REG_SZ, ValueString.Buffer, ValueString.Length + sizeof(UNICODE_NULL)); + // } ByeBye: if (ControlHandle != NULL)

4 years, 9 months

[reactos] 02/03: [NTOS:PNP] Map device capabilities to capability flags

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8846037e173b48e48718… commit a8846037e173b48e48718d3d0cd106200f0da70c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Mar 21 13:20:36 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Mar 21 13:23:22 2020 +0100 [NTOS:PNP] Map device capabilities to capability flags This fixes a devices Capabilities value in the registry. --- ntoskrnl/io/pnpmgr/pnpmgr.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index 476e8f78fef..320d57d2798 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -1011,7 +1011,37 @@ IopQueryDeviceCapabilities(PDEVICE_NODE DeviceNode, return Status; } - DeviceNode->CapabilityFlags = *(PULONG)((ULONG_PTR)&DeviceCaps->Version + sizeof(DeviceCaps->Version)); + /* Map device capabilities to capability flags */ + DeviceNode->CapabilityFlags = 0; + if (DeviceCaps->LockSupported) + DeviceNode->CapabilityFlags |= 0x00000001; // CM_DEVCAP_LOCKSUPPORTED + + if (DeviceCaps->EjectSupported) + DeviceNode->CapabilityFlags |= 0x00000002; // CM_DEVCAP_EJECTSUPPORTED + + if (DeviceCaps->Removable) + DeviceNode->CapabilityFlags |= 0x00000004; // CM_DEVCAP_REMOVABLE + + if (DeviceCaps->DockDevice) + DeviceNode->CapabilityFlags |= 0x00000008; // CM_DEVCAP_DOCKDEVICE + + if (DeviceCaps->UniqueID) + DeviceNode->CapabilityFlags |= 0x00000010; // CM_DEVCAP_UNIQUEID + + if (DeviceCaps->SilentInstall) + DeviceNode->CapabilityFlags |= 0x00000020; // CM_DEVCAP_SILENTINSTALL + + if (DeviceCaps->RawDeviceOK) + DeviceNode->CapabilityFlags |= 0x00000040; // CM_DEVCAP_RAWDEVICEOK + + if (DeviceCaps->SurpriseRemovalOK) + DeviceNode->CapabilityFlags |= 0x00000080; // CM_DEVCAP_SURPRISEREMOVALOK + + if (DeviceCaps->HardwareDisabled) + DeviceNode->CapabilityFlags |= 0x00000100; // CM_DEVCAP_HARDWAREDISABLED + + if (DeviceCaps->NonDynamic) + DeviceNode->CapabilityFlags |= 0x00000200; // CM_DEVCAP_NONDYNAMIC if (DeviceCaps->NoDisplayInUI) DeviceNode->UserFlags |= DNUF_DONT_SHOW_IN_UI;

4 years, 9 months

[reactos] 01/03: [USBHUB] Set the Removable flag for all ports of a USB hub

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bac4e185fb69e01104913… commit bac4e185fb69e011049132ff9a2165f45e54eec3 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Mar 21 13:12:53 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Mar 21 13:23:21 2020 +0100 [USBHUB] Set the Removable flag for all ports of a USB hub --- drivers/usb/usbhub/pnp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/usb/usbhub/pnp.c b/drivers/usb/usbhub/pnp.c index 5607faa0db1..e7203027cf0 100644 --- a/drivers/usb/usbhub/pnp.c +++ b/drivers/usb/usbhub/pnp.c @@ -2704,6 +2704,9 @@ USBH_PdoPnP(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension, DeviceCapabilities->Size = Size; DeviceCapabilities->Version = Version; + /* All devices connected to a hub are removable */ + DeviceCapabilities->Removable = 1; + Status = STATUS_SUCCESS; break;

4 years, 9 months

[reactos] 01/01: [ISAPNP] Fix some warnings

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b1e28e7243ab6f76f3c0… commit 7b1e28e7243ab6f76f3c032a2b6a95f373b36348 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Mar 21 08:29:15 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Mar 21 08:29:15 2020 +0100 [ISAPNP] Fix some warnings --- drivers/bus/isapnp/isapnp.c | 6 +++--- drivers/bus/isapnp/pdo.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index 7f2731b7ce4..69fbcbb9f3a 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -84,7 +84,7 @@ IsaFdoCreateDeviceIDs( LogDev->ProdId); if (!NT_SUCCESS(Status)) return Status; - TempString.Length = (End - TempString.Buffer) * sizeof(WCHAR); + TempString.Length = (USHORT)((End - TempString.Buffer) * sizeof(WCHAR)); Status = IsaPnpDuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &TempString, @@ -105,7 +105,7 @@ IsaFdoCreateDeviceIDs( LogDev->ProdId); if (!NT_SUCCESS(Status)) return Status; - TempString.Length = (End - TempString.Buffer) * sizeof(WCHAR); + TempString.Length = (USHORT)((End - TempString.Buffer) * sizeof(WCHAR)); Status = IsaPnpDuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &TempString, @@ -125,7 +125,7 @@ IsaFdoCreateDeviceIDs( LogDev->SerialNumber); if (!NT_SUCCESS(Status)) return Status; - TempString.Length = (End - TempString.Buffer) * sizeof(WCHAR); + TempString.Length = (USHORT)((End - TempString.Buffer) * sizeof(WCHAR)); Status = IsaPnpDuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &TempString, diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index 82dc98cf1a9..917ab4d626d 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -252,7 +252,7 @@ IsaPdoStartReadPort( PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[i]; if (PartialDescriptor->Type == CmResourceTypePort) { - PUCHAR ReadDataPort = (PUCHAR)PartialDescriptor->u.Port.Start.u.LowPart + 3; + PUCHAR ReadDataPort = ULongToPtr(PartialDescriptor->u.Port.Start.u.LowPart + 3); if (PartialDescriptor->u.Port.Length > 1 && !FdoExt->ReadDataPort && NT_SUCCESS(IsaHwTryReadDataPort(ReadDataPort))) { FdoExt->ReadDataPort = ReadDataPort;

4 years, 9 months

[reactos] 01/01: [INF] Do not require a device for the ISAPNP read data port

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b915dce420005b146a909… commit b915dce420005b146a909121451af35a4d1dcb6c Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Fri Mar 20 22:42:36 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri Mar 20 22:42:57 2020 +0100 [INF] Do not require a device for the ISAPNP read data port --- media/inf/machine.inf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/media/inf/machine.inf b/media/inf/machine.inf index bed48883dee..69ac0b92b25 100644 --- a/media/inf/machine.inf +++ b/media/inf/machine.inf @@ -50,6 +50,7 @@ HKR, , Icon, 0, "-27" %SWENUM.DeviceDesc% = SWENUM_Inst, ROOT\SWENUM %ACPI\FixedButton.DeviceDesc% = NO_DRV,ACPI\FixedButton +%ISAPNP\ReadDataPort.DeviceDesc% = NO_DRV,ISAPNP\ReadDataPort %PCI\CC_0500.DeviceDesc% = NO_DRV,PCI\CC_0500 %PCI\CC_0600.DeviceDesc% = NO_DRV,PCI\CC_0600 %PCI\CC_0601.DeviceDesc% = PCI_ISA_Inst,PCI\CC_0601 @@ -172,6 +173,7 @@ GenericMfg = "(Generic system devices)" *PNP0C0F.DeviceDesc = "PCI interrupt link device" *PNP0C15.DeviceDesc = "Docking Station" ACPI\FixedButton.DeviceDesc = "ACPI fixed feature button" +ISAPNP\ReadDataPort.DeviceDesc = "ISAPNP read data port" PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Standard CPU to PCI bridge" PCI\CC_0601.DeviceDesc = "Standard PCI to ISA bridge"

4 years, 9 months

[reactos] 10/10: [ISAPNP] Implement some more IRP_MJ_PNP/IRP_MN_* requests

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2abd853b37d15801effd8… commit 2abd853b37d15801effd898fe898aa822e751a23 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Mar 17 23:51:53 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri Mar 20 22:40:11 2020 +0100 [ISAPNP] Implement some more IRP_MJ_PNP/IRP_MN_* requests We either succeed them, or we pass them down to the ISAPNP FDO. --- drivers/bus/isapnp/pdo.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index a75b4d32ed7..82dc98cf1a9 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -270,6 +270,64 @@ IsaPdoStartReadPort( return Status; } +static +NTSTATUS +NTAPI +IsaPdoOnRepeaterComplete( + IN PDEVICE_OBJECT Tdo, + IN PIRP SubIrp, + PVOID NeedsVote) +{ + PIO_STACK_LOCATION SubStack = IoGetCurrentIrpStackLocation(SubIrp); + PIRP Irp = (PIRP)SubStack->Parameters.Others.Argument1; + ObDereferenceObject(Tdo); + + if (SubIrp->IoStatus.Status == STATUS_NOT_SUPPORTED) + { + if (NeedsVote) + { + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + } + } + else + { + Irp->IoStatus = SubIrp->IoStatus; + } + + IoFreeIrp(SubIrp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +NTAPI +IsaPdoRepeatRequest( + IN PISAPNP_PDO_EXTENSION PdoExt, + IN PIRP Irp, + IN BOOLEAN NeedsVote) +{ + PDEVICE_OBJECT Fdo = PdoExt->FdoExt->Common.Self; + PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); + + PDEVICE_OBJECT Tdo = IoGetAttachedDeviceReference(Fdo); + PIRP SubIrp = IoAllocateIrp(Tdo->StackSize + 1, FALSE); + PIO_STACK_LOCATION SubStack = IoGetNextIrpStackLocation(SubIrp); + + SubStack->DeviceObject = Tdo; + SubStack->Parameters.Others.Argument1 = (PVOID)Irp; + + IoSetNextIrpStackLocation(SubIrp); + SubStack = IoGetNextIrpStackLocation(SubIrp); + RtlCopyMemory(SubStack, Stack, FIELD_OFFSET(IO_STACK_LOCATION, CompletionRoutine)); + SubStack->Control = 0; + IoSetCompletionRoutine(SubIrp, IsaPdoOnRepeaterComplete, (PVOID)(ULONG_PTR)NeedsVote, TRUE, TRUE, TRUE); + + SubIrp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoMarkIrpPending(Irp); + IoCallDriver(Tdo, SubIrp); + return STATUS_PENDING; +} + NTSTATUS NTAPI IsaPdoPnp( @@ -332,6 +390,25 @@ IsaPdoPnp( Status = IsaPdoQueryId(PdoExt, Irp, IrpSp); break; + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_REMOVE_DEVICE: + case IRP_MN_CANCEL_REMOVE_DEVICE: + case IRP_MN_QUERY_STOP_DEVICE: + case IRP_MN_CANCEL_STOP_DEVICE: + case IRP_MN_QUERY_DEVICE_TEXT: + case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: + case IRP_MN_SURPRISE_REMOVAL: + Status = STATUS_SUCCESS; + break; + + case IRP_MN_READ_CONFIG: + case IRP_MN_WRITE_CONFIG: + case IRP_MN_EJECT: + case IRP_MN_SET_LOCK: + case IRP_MN_QUERY_BUS_INFORMATION: + case IRP_MN_DEVICE_USAGE_NOTIFICATION: + return IsaPdoRepeatRequest(PdoExt, Irp, TRUE); + default: DPRINT1("Unknown PnP code: %x\n", IrpSp->MinorFunction); break;

4 years, 9 months

[reactos] 09/10: [ISAPNP] Implement IRP_MN_QUERY_PNP_DEVICE_STATE for ReadDataPort

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8b53ed1d9b45649469d66… commit 8b53ed1d9b45649469d6662c27520088091910ca Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Mar 17 23:50:39 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri Mar 20 22:40:11 2020 +0100 [ISAPNP] Implement IRP_MN_QUERY_PNP_DEVICE_STATE for ReadDataPort --- drivers/bus/isapnp/pdo.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index f0481119758..a75b4d32ed7 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -75,6 +75,17 @@ IsaPdoQueryCapabilities( return STATUS_SUCCESS; } +NTSTATUS +NTAPI +IsaPdoQueryPnpDeviceState( + IN PISAPNP_PDO_EXTENSION PdoExt, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp) +{ + Irp->IoStatus.Information |= PNP_DEVICE_NOT_DISABLEABLE; + return STATUS_SUCCESS; +} + NTSTATUS NTAPI IsaPdoQueryId( @@ -298,6 +309,11 @@ IsaPdoPnp( Status = IsaPdoQueryCapabilities(PdoExt, Irp, IrpSp); break; + case IRP_MN_QUERY_PNP_DEVICE_STATE: + if (PdoExt->Common.Self == PdoExt->FdoExt->DataPortPdo) + Status = IsaPdoQueryPnpDeviceState(PdoExt, Irp, IrpSp); + break; + case IRP_MN_QUERY_RESOURCES: if (PdoExt->Common.Self == PdoExt->FdoExt->DataPortPdo) Status = IsaPdoQueryResources(PdoExt, Irp, IrpSp);

4 years, 9 months

← Newer
1
...
5
6
7
8
9
10
11
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2020