* Sync up to trunk head (r65120).

[reactos.git] / ntoskrnl / po / events.c

diff --git a/ntoskrnl/po/events.c b/ntoskrnl/po/events.c
index fb778ff..4e01ca1 100644 (file)
--- a/ntoskrnl/po/events.c
+++ b/ntoskrnl/po/events.c
@@ -64,9 +64,6 @@ PopGetSysButtonCompletion(
        PSYS_BUTTON_CONTEXT SysButtonContext = Context;
        ULONG SysButton;
 
-       if (Irp->PendingReturned)
-               IoMarkIrpPending(Irp);
-
        /* The DeviceObject can be NULL, so use the one we stored */
        DeviceObject = SysButtonContext->DeviceObject;
 
@@ -87,7 +84,6 @@ PopGetSysButtonCompletion(
             
             ZwShutdownSystem(ShutdownNoReboot);
         }
-            
        }
 
        /* Allocate a new workitem to send the next IOCTL_GET_SYS_BUTTON_EVENT */
@@ -175,9 +171,9 @@ PopAddRemoveSysCapsCallback(IN PVOID NotificationStructure,
                return STATUS_REVISION_MISMATCH;
        if (Notification->Size != sizeof(DEVICE_INTERFACE_CHANGE_NOTIFICATION))
                return STATUS_INVALID_PARAMETER;
-       if (RtlCompareMemory(&Notification->Event, &GUID_DEVICE_INTERFACE_ARRIVAL, sizeof(GUID) == sizeof(GUID)))
+       if (RtlCompareMemory(&Notification->Event, &GUID_DEVICE_INTERFACE_ARRIVAL, sizeof(GUID)) == sizeof(GUID))
                Arrival = TRUE;
-       else if (RtlCompareMemory(&Notification->Event, &GUID_DEVICE_INTERFACE_REMOVAL, sizeof(GUID) == sizeof(GUID)))
+       else if (RtlCompareMemory(&Notification->Event, &GUID_DEVICE_INTERFACE_REMOVAL, sizeof(GUID)) == sizeof(GUID))
                Arrival = FALSE;
        else
                return STATUS_INVALID_PARAMETER;
@@ -255,11 +251,11 @@ PopAddRemoveSysCapsCallback(IN PVOID NotificationStructure,
 
                /* FIXME: What do do with the capabilities? */
                {
-                       DPRINT1("Device capabilities: 0x%x (", Caps);
-                       if (Caps & SYS_BUTTON_POWER) DbgPrint(" POWER");
-                       if (Caps & SYS_BUTTON_SLEEP) DbgPrint(" SLEEP");
-                       if (Caps & SYS_BUTTON_LID) DbgPrint(" LID");
-                       DbgPrint(" )\n");
+                       DPRINT("Device capabilities: 0x%x (", Caps);
+                       if (Caps & SYS_BUTTON_POWER) DPRINT(" POWER");
+                       if (Caps & SYS_BUTTON_SLEEP) DPRINT(" SLEEP");
+                       if (Caps & SYS_BUTTON_LID) DPRINT(" LID");
+                       DPRINT(" )\n");
                }
 
                SysButtonContext = ExAllocatePool(NonPagedPool, sizeof(SYS_BUTTON_CONTEXT));