Changeset 3105 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib

Timestamp:

Jun 14, 2007 11:18:15 AM (18 years ago)

Author:

vboxsync

Message:

Removed workaround for allocating the event structure in non-paged memory. Not necessary and only hides the real problem.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp

@@ -143 +143 @@
     IO_STATUS_BLOCK ioStatusBlock;
 
-    KEVENT *pEvent;
-#ifdef KEVENT_STACK_ALLOC
-    KEVENT eventAlloc;
-    pEvent = &eventAlloc;
-#else
-    pEvent = (KEVENT *)ExAllocatePool (NonPagedPool, sizeof (KEVENT));
-    if (!pEvent) return VERR_NO_MEMORY;
-#endif /* KEVENT_STACK_ALLOC */
-    KeInitializeEvent (pEvent, NotificationEvent, FALSE);
+    KEVENT Event;
+    KeInitializeEvent (&Event, NotificationEvent, FALSE);
 
     PIRP irp = IoBuildDeviceIoControlRequest (u32Function,
@@ -159 +152 @@
                                               pvData,
                                               cbData,
-                                              FALSE,
-                                              pEvent,
+                                              FALSE, /* external */
+                                              &Event,
                                               &ioStatusBlock);
     if (irp == NULL)
     {
         Log(("vbglDriverIOCtl: IoBuildDeviceIoControlRequest failed\n"));
-#ifndef KEVENT_STACK_ALLOC
-        ExFreePool (pEvent);
-#endif /* KEVENT_STACK_ALLOC */
         return VERR_NO_MEMORY;
     }
@@ -176 +166 @@
     {
         Log(("vbglDriverIOCtl: STATUS_PENDING\n"));
-        rc = KeWaitForSingleObject(pEvent,
+        rc = KeWaitForSingleObject(&Event,
                                    Executive,
                                    KernelMode,
@@ -187 +177 @@
     if (!NT_SUCCESS(rc))
         Log(("vbglDriverIOCtl: IoCallDriver failed with ntstatus=%x\n", rc));
-
-#ifndef KEVENT_STACK_ALLOC
-    ExFreePool (pEvent);
-#endif /* KEVENT_STACK_ALLOC */
 
     return NT_SUCCESS(rc)? VINF_SUCCESS: VERR_VBGL_IOCTL_FAILED;