29 Nov
2023
29 Nov
'23
10:03 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=01a8288d2819b0ed92f13…
commit 01a8288d2819b0ed92f13d1aec7a962bcdcdc079
Author: Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Wed Nov 29 23:03:00 2023 +0100
Commit: Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Wed Nov 29 23:03:00 2023 +0100
[UMPNPMGR] Move the pnp event thread to a separate file
---
base/services/umpnpmgr/CMakeLists.txt | 1 +
base/services/umpnpmgr/event.c | 194 ++++++++++++++++++++++++++++++++++
base/services/umpnpmgr/precomp.h | 10 ++
base/services/umpnpmgr/umpnpmgr.c | 157 ---------------------------
4 files changed, 205 insertions(+), 157 deletions(-)
diff --git a/base/services/umpnpmgr/CMakeLists.txt
b/base/services/umpnpmgr/CMakeLists.txt
index 7c344f9914c..bf1142ca173 100644
--- a/base/services/umpnpmgr/CMakeLists.txt
+++ b/base/services/umpnpmgr/CMakeLists.txt
@@ -4,6 +4,7 @@ add_rpc_files(server
${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/pnp.idl)
spec2def(umpnpmgr.dll umpnpmgr.spec ADD_IMPORTLIB)
add_library(umpnpmgr MODULE
+ event.c
install.c
rpcserver.c
umpnpmgr.c
diff --git a/base/services/umpnpmgr/event.c b/base/services/umpnpmgr/event.c
new file mode 100644
index 00000000000..678022de61b
--- /dev/null
+++ b/base/services/umpnpmgr/event.c
@@ -0,0 +1,194 @@
+/*
+ * ReactOS kernel
+ * Copyright (C) 2005 ReactOS Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ * COPYRIGHT: See COPYING in the top level directory
+ * PROJECT: ReactOS kernel
+ * FILE: base/services/umpnpmgr/event.c
+ * PURPOSE: PNP Event thread
+ * PROGRAMMER: Eric Kohl (eric.kohl(a)reactos.org)
+ * Hervé Poussineau (hpoussin(a)reactos.org)
+ * Colin Finck (colin(a)reactos.org)
+ */
+
+/* INCLUDES *****************************************************************/
+
+#include "precomp.h"
+
+#define NDEBUG
+#include <debug.h>
+
+/* FUNCTIONS *****************************************************************/
+
+DWORD WINAPI
+PnpEventThread(LPVOID lpParameter)
+{
+ PLUGPLAY_CONTROL_USER_RESPONSE_DATA ResponseData = {0, 0, 0, 0};
+ DWORD dwRet = ERROR_SUCCESS;
+ NTSTATUS Status;
+ RPC_STATUS RpcStatus;
+ PPLUGPLAY_EVENT_BLOCK PnpEvent, NewPnpEvent;
+ ULONG PnpEventSize;
+
+ UNREFERENCED_PARAMETER(lpParameter);
+
+ PnpEventSize = 0x1000;
+ PnpEvent = HeapAlloc(GetProcessHeap(), 0, PnpEventSize);
+ if (PnpEvent == NULL)
+ return ERROR_OUTOFMEMORY;
+
+ for (;;)
+ {
+ DPRINT("Calling NtGetPlugPlayEvent()\n");
+
+ /* Wait for the next PnP event */
+ Status = NtGetPlugPlayEvent(0, 0, PnpEvent, PnpEventSize);
+
+ /* Resize the buffer for the PnP event if it's too small */
+ if (Status == STATUS_BUFFER_TOO_SMALL)
+ {
+ PnpEventSize += 0x400;
+ NewPnpEvent = HeapReAlloc(GetProcessHeap(), 0, PnpEvent, PnpEventSize);
+ if (NewPnpEvent == NULL)
+ {
+ dwRet = ERROR_OUTOFMEMORY;
+ break;
+ }
+ PnpEvent = NewPnpEvent;
+ continue;
+ }
+
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("NtGetPlugPlayEvent() failed (Status 0x%08lx)\n",
Status);
+ break;
+ }
+
+ /* Process the PnP event */
+ DPRINT("Received PnP Event\n");
+ if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ENUMERATED,
&RpcStatus))
+ {
+ DeviceInstallParams* Params;
+ DWORD len;
+ DWORD DeviceIdLength;
+
+ DPRINT("Device enumerated: %S\n",
PnpEvent->TargetDevice.DeviceIds);
+
+ DeviceIdLength = lstrlenW(PnpEvent->TargetDevice.DeviceIds);
+ if (DeviceIdLength)
+ {
+ /* Allocate a new device-install event */
+ len = FIELD_OFFSET(DeviceInstallParams, DeviceIds) + (DeviceIdLength + 1)
* sizeof(WCHAR);
+ Params = HeapAlloc(GetProcessHeap(), 0, len);
+ if (Params)
+ {
+ wcscpy(Params->DeviceIds, PnpEvent->TargetDevice.DeviceIds);
+
+ /* Queue the event (will be dequeued by DeviceInstallThread) */
+ WaitForSingleObject(hDeviceInstallListMutex, INFINITE);
+ InsertTailList(&DeviceInstallListHead,
&Params->ListEntry);
+ ReleaseMutex(hDeviceInstallListMutex);
+
+ SetEvent(hDeviceInstallListNotEmpty);
+ }
+ }
+ }
+ else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL,
&RpcStatus))
+ {
+// DWORD dwRecipient;
+
+ DPRINT("Device arrival: %S\n",
PnpEvent->TargetDevice.DeviceIds);
+
+// dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS;
+// BroadcastSystemMessageW(BSF_POSTMESSAGE,
+// &dwRecipient,
+// WM_DEVICECHANGE,
+// DBT_DEVNODES_CHANGED,
+// 0);
+ SendMessageW(HWND_BROADCAST, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0);
+ }
+ else if (UuidEqual(&PnpEvent->EventGuid,
(UUID*)&GUID_DEVICE_EJECT_VETOED, &RpcStatus))
+ {
+ DPRINT1("Eject vetoed: %S\n",
PnpEvent->TargetDevice.DeviceIds);
+ }
+ else if (UuidEqual(&PnpEvent->EventGuid,
(UUID*)&GUID_DEVICE_KERNEL_INITIATED_EJECT, &RpcStatus))
+ {
+ DPRINT1("Kernel initiated eject: %S\n",
PnpEvent->TargetDevice.DeviceIds);
+ }
+ else if (UuidEqual(&PnpEvent->EventGuid,
(UUID*)&GUID_DEVICE_SAFE_REMOVAL, &RpcStatus))
+ {
+// DWORD dwRecipient;
+
+ DPRINT1("Safe removal: %S\n",
PnpEvent->TargetDevice.DeviceIds);
+
+// dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS;
+// BroadcastSystemMessageW(BSF_POSTMESSAGE,
+// &dwRecipient,
+// WM_DEVICECHANGE,
+// DBT_DEVNODES_CHANGED,
+// 0);
+ SendMessageW(HWND_BROADCAST, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0);
+ }
+ else if (UuidEqual(&PnpEvent->EventGuid,
(UUID*)&GUID_DEVICE_SURPRISE_REMOVAL, &RpcStatus))
+ {
+// DWORD dwRecipient;
+
+ DPRINT1("Surprise removal: %S\n",
PnpEvent->TargetDevice.DeviceIds);
+
+// dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS;
+// BroadcastSystemMessageW(BSF_POSTMESSAGE,
+// &dwRecipient,
+// WM_DEVICECHANGE,
+// DBT_DEVNODES_CHANGED,
+// 0);
+ SendMessageW(HWND_BROADCAST, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0);
+ }
+ else if (UuidEqual(&PnpEvent->EventGuid,
(UUID*)&GUID_DEVICE_REMOVAL_VETOED, &RpcStatus))
+ {
+ DPRINT1("Removal vetoed: %S\n",
PnpEvent->TargetDevice.DeviceIds);
+ }
+ else if (UuidEqual(&PnpEvent->EventGuid,
(UUID*)&GUID_DEVICE_REMOVE_PENDING, &RpcStatus))
+ {
+ DPRINT1("Removal pending: %S\n",
PnpEvent->TargetDevice.DeviceIds);
+ }
+ else
+ {
+ DPRINT1("Unknown event, GUID
{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}\n",
+ PnpEvent->EventGuid.Data1, PnpEvent->EventGuid.Data2,
PnpEvent->EventGuid.Data3,
+ PnpEvent->EventGuid.Data4[0], PnpEvent->EventGuid.Data4[1],
PnpEvent->EventGuid.Data4[2],
+ PnpEvent->EventGuid.Data4[3], PnpEvent->EventGuid.Data4[4],
PnpEvent->EventGuid.Data4[5],
+ PnpEvent->EventGuid.Data4[6], PnpEvent->EventGuid.Data4[7]);
+ }
+
+ /* Dequeue the current PnP event and signal the next one */
+ Status = NtPlugPlayControl(PlugPlayControlUserResponse,
+ &ResponseData,
+ sizeof(ResponseData));
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("NtPlugPlayControl(PlugPlayControlUserResponse) failed (Status
0x%08lx)\n", Status);
+ break;
+ }
+ }
+
+ HeapFree(GetProcessHeap(), 0, PnpEvent);
+
+ return dwRet;
+}
+
+/* EOF */
diff --git a/base/services/umpnpmgr/precomp.h b/base/services/umpnpmgr/precomp.h
index 7977db7b568..0720b177c87 100644
--- a/base/services/umpnpmgr/precomp.h
+++ b/base/services/umpnpmgr/precomp.h
@@ -45,6 +45,14 @@ typedef struct
PWSTR pszName;
} NOTIFY_ENTRY, *PNOTIFY_ENTRY;
+/* event.c */
+
+DWORD
+WINAPI
+PnpEventThread(
+ LPVOID lpParameter);
+
+
/* install.c */
extern HANDLE hUserToken;
@@ -67,6 +75,8 @@ DeviceInstallThread(
/* rpcserver.c */
+extern LIST_ENTRY NotificationListHead;
+
DWORD
WINAPI
RpcServerThread(
diff --git a/base/services/umpnpmgr/umpnpmgr.c b/base/services/umpnpmgr/umpnpmgr.c
index 67ba42fe82d..14b7c1a9e6f 100644
--- a/base/services/umpnpmgr/umpnpmgr.c
+++ b/base/services/umpnpmgr/umpnpmgr.c
@@ -47,163 +47,6 @@ BOOL g_IsUISuppressed = FALSE;
/* FUNCTIONS *****************************************************************/
-static DWORD WINAPI
-PnpEventThread(LPVOID lpParameter)
-{
- PLUGPLAY_CONTROL_USER_RESPONSE_DATA ResponseData = {0, 0, 0, 0};
- DWORD dwRet = ERROR_SUCCESS;
- NTSTATUS Status;
- RPC_STATUS RpcStatus;
- PPLUGPLAY_EVENT_BLOCK PnpEvent, NewPnpEvent;
- ULONG PnpEventSize;
-
- UNREFERENCED_PARAMETER(lpParameter);
-
- PnpEventSize = 0x1000;
- PnpEvent = HeapAlloc(GetProcessHeap(), 0, PnpEventSize);
- if (PnpEvent == NULL)
- return ERROR_OUTOFMEMORY;
-
- for (;;)
- {
- DPRINT("Calling NtGetPlugPlayEvent()\n");
-
- /* Wait for the next PnP event */
- Status = NtGetPlugPlayEvent(0, 0, PnpEvent, PnpEventSize);
-
- /* Resize the buffer for the PnP event if it's too small */
- if (Status == STATUS_BUFFER_TOO_SMALL)
- {
- PnpEventSize += 0x400;
- NewPnpEvent = HeapReAlloc(GetProcessHeap(), 0, PnpEvent, PnpEventSize);
- if (NewPnpEvent == NULL)
- {
- dwRet = ERROR_OUTOFMEMORY;
- break;
- }
- PnpEvent = NewPnpEvent;
- continue;
- }
-
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("NtGetPlugPlayEvent() failed (Status 0x%08lx)\n",
Status);
- break;
- }
-
- /* Process the PnP event */
- DPRINT("Received PnP Event\n");
- if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ENUMERATED,
&RpcStatus))
- {
- DeviceInstallParams* Params;
- DWORD len;
- DWORD DeviceIdLength;
-
- DPRINT("Device enumerated: %S\n",
PnpEvent->TargetDevice.DeviceIds);
-
- DeviceIdLength = lstrlenW(PnpEvent->TargetDevice.DeviceIds);
- if (DeviceIdLength)
- {
- /* Allocate a new device-install event */
- len = FIELD_OFFSET(DeviceInstallParams, DeviceIds) + (DeviceIdLength + 1)
* sizeof(WCHAR);
- Params = HeapAlloc(GetProcessHeap(), 0, len);
- if (Params)
- {
- wcscpy(Params->DeviceIds, PnpEvent->TargetDevice.DeviceIds);
-
- /* Queue the event (will be dequeued by DeviceInstallThread) */
- WaitForSingleObject(hDeviceInstallListMutex, INFINITE);
- InsertTailList(&DeviceInstallListHead,
&Params->ListEntry);
- ReleaseMutex(hDeviceInstallListMutex);
-
- SetEvent(hDeviceInstallListNotEmpty);
- }
- }
- }
- else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL,
&RpcStatus))
- {
-// DWORD dwRecipient;
-
- DPRINT("Device arrival: %S\n",
PnpEvent->TargetDevice.DeviceIds);
-
-// dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS;
-// BroadcastSystemMessageW(BSF_POSTMESSAGE,
-// &dwRecipient,
-// WM_DEVICECHANGE,
-// DBT_DEVNODES_CHANGED,
-// 0);
- SendMessageW(HWND_BROADCAST, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0);
- }
- else if (UuidEqual(&PnpEvent->EventGuid,
(UUID*)&GUID_DEVICE_EJECT_VETOED, &RpcStatus))
- {
- DPRINT1("Eject vetoed: %S\n",
PnpEvent->TargetDevice.DeviceIds);
- }
- else if (UuidEqual(&PnpEvent->EventGuid,
(UUID*)&GUID_DEVICE_KERNEL_INITIATED_EJECT, &RpcStatus))
- {
- DPRINT1("Kernel initiated eject: %S\n",
PnpEvent->TargetDevice.DeviceIds);
- }
- else if (UuidEqual(&PnpEvent->EventGuid,
(UUID*)&GUID_DEVICE_SAFE_REMOVAL, &RpcStatus))
- {
-// DWORD dwRecipient;
-
- DPRINT1("Safe removal: %S\n",
PnpEvent->TargetDevice.DeviceIds);
-
-// dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS;
-// BroadcastSystemMessageW(BSF_POSTMESSAGE,
-// &dwRecipient,
-// WM_DEVICECHANGE,
-// DBT_DEVNODES_CHANGED,
-// 0);
- SendMessageW(HWND_BROADCAST, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0);
- }
- else if (UuidEqual(&PnpEvent->EventGuid,
(UUID*)&GUID_DEVICE_SURPRISE_REMOVAL, &RpcStatus))
- {
-// DWORD dwRecipient;
-
- DPRINT1("Surprise removal: %S\n",
PnpEvent->TargetDevice.DeviceIds);
-
-// dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS;
-// BroadcastSystemMessageW(BSF_POSTMESSAGE,
-// &dwRecipient,
-// WM_DEVICECHANGE,
-// DBT_DEVNODES_CHANGED,
-// 0);
- SendMessageW(HWND_BROADCAST, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0);
- }
- else if (UuidEqual(&PnpEvent->EventGuid,
(UUID*)&GUID_DEVICE_REMOVAL_VETOED, &RpcStatus))
- {
- DPRINT1("Removal vetoed: %S\n",
PnpEvent->TargetDevice.DeviceIds);
- }
- else if (UuidEqual(&PnpEvent->EventGuid,
(UUID*)&GUID_DEVICE_REMOVE_PENDING, &RpcStatus))
- {
- DPRINT1("Removal pending: %S\n",
PnpEvent->TargetDevice.DeviceIds);
- }
- else
- {
- DPRINT1("Unknown event, GUID
{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}\n",
- PnpEvent->EventGuid.Data1, PnpEvent->EventGuid.Data2,
PnpEvent->EventGuid.Data3,
- PnpEvent->EventGuid.Data4[0], PnpEvent->EventGuid.Data4[1],
PnpEvent->EventGuid.Data4[2],
- PnpEvent->EventGuid.Data4[3], PnpEvent->EventGuid.Data4[4],
PnpEvent->EventGuid.Data4[5],
- PnpEvent->EventGuid.Data4[6], PnpEvent->EventGuid.Data4[7]);
- }
-
- /* Dequeue the current PnP event and signal the next one */
- Status = NtPlugPlayControl(PlugPlayControlUserResponse,
- &ResponseData,
- sizeof(ResponseData));
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("NtPlugPlayControl(PlugPlayControlUserResponse) failed (Status
0x%08lx)\n", Status);
- break;
- }
- }
-
- HeapFree(GetProcessHeap(), 0, PnpEvent);
-
- return dwRet;
-}
-
-
static VOID
UpdateServiceStatus(
_In_ DWORD dwState,
391
days inactive
391
days old
0 comments
1 participants
participants (1)
-
Eric Kohl