Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[greatlrd] 27416: add a missuing DPRINT1 in a unpimplement function
by greatlrd＠svn.reactos.org 06 Jul '07

06 Jul '07

Author: greatlrd Date: Fri Jul 6 12:24:55 2007 New Revision: 27416 URL: http://svn.reactos.org/svn/reactos?rev=27416&view=rev Log: add a missuing DPRINT1 in a unpimplement function Modified: trunk/reactos/drivers/video/videoprt/videoprt.c Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c Fri Jul 6 12:24:55 2007 @@ -1397,6 +1397,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PVOID Data) { + DPRINT1("unimplemented VpNotifyEaData\n"); } /*

1 0

[greatlrd] 27415: write out the bus name we say is not pnp, instead using number
by greatlrd＠svn.reactos.org 06 Jul '07

06 Jul '07

Author: greatlrd Date: Fri Jul 6 12:19:09 2007 New Revision: 27415 URL: http://svn.reactos.org/svn/reactos?rev=27415&view=rev Log: write out the bus name we say is not pnp, instead using number Modified: trunk/reactos/drivers/video/videoprt/videoprt.c Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c Fri Jul 6 12:19:09 2007 @@ -21,6 +21,7 @@ * $Id$ */ + #include "videoprt.h" #include <wdmguid.h> @@ -714,8 +715,9 @@ } /* add no PNP bus here, add more bus type if it needed */ - if ( (HwInitializationData->AdapterInterfaceType == 0) || - (HwInitializationData->AdapterInterfaceType == -1) ) + + if ( (HwInitializationData->AdapterInterfaceType == InterfaceTypeUndefined) || + (HwInitializationData->AdapterInterfaceType == Internal) ) { DPRINT1("No PNP Videocard .\n");

1 0

[cwittich] 27414: fix some typos in the comments
by cwittich＠svn.reactos.org 05 Jul '07

05 Jul '07

Author: cwittich Date: Fri Jul 6 03:29:54 2007 New Revision: 27414 URL: http://svn.reactos.org/svn/reactos?rev=27414&view=rev Log: fix some typos in the comments Modified: trunk/reactos/drivers/video/videoprt/videoprt.c Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c Fri Jul 6 03:29:54 2007 @@ -713,7 +713,7 @@ return STATUS_UNSUCCESSFUL; } - /* add no PNP bus here, add more bus type if it need it */ + /* add no PNP bus here, add more bus type if it needed */ if ( (HwInitializationData->AdapterInterfaceType == 0) || (HwInitializationData->AdapterInterfaceType == -1) ) @@ -739,7 +739,7 @@ if (HwInitializationData->HwInitDataSize != SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA) { - /* power manger */ + /* power management */ DriverObject->MajorFunction[IRP_MJ_POWER] = IntVideoPortDispatchPower; } Status = IntVideoPortCreateAdapterDeviceObject(DriverObject, DriverExtension,

1 0

[greatlrd] 27413: Do not hack video driver, VBE driver works in windows xp ---------------------------------------------------------------- Fixed to detect few legazy bus types, fill the list for no PnP bus type in videprt/videoprt.c functions VideoPortInitialize
by greatlrd＠svn.reactos.org 05 Jul '07

05 Jul '07

Author: greatlrd Date: Fri Jul 6 02:06:47 2007 New Revision: 27413 URL: http://svn.reactos.org/svn/reactos?rev=27413&view=rev Log: Do not hack video driver, VBE driver works in windows xp ---------------------------------------------------------------- Fixed to detect few legazy bus types, fill the list for no PnP bus type in videprt/videoprt.c functions VideoPortInitialize Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c trunk/reactos/drivers/video/miniport/vga/vgamp.c trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c trunk/reactos/drivers/video/videoprt/videoprt.c Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c Fri Jul 6 02:06:47 2007 @@ -37,7 +37,7 @@ VIDEO_HW_INITIALIZATION_DATA InitData; VideoPortZeroMemory(&InitData, sizeof(InitData)); - InitData.HwInitDataSize = SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA; + InitData.HwInitDataSize = sizeof(VIDEO_HW_INITIALIZATION_DATA); InitData.HwFindAdapter = VBEFindAdapter; InitData.HwInitialize = VBEInitialize; InitData.HwStartIO = VBEStartIO; Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… ============================================================================== --- trunk/reactos/drivers/video/miniport/vga/vgamp.c (original) +++ trunk/reactos/drivers/video/miniport/vga/vgamp.c Fri Jul 6 02:06:47 2007 @@ -31,7 +31,7 @@ VideoPortZeroMemory(&InitData, sizeof InitData); - InitData.HwInitDataSize = SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA; + InitData.HwInitDataSize = sizeof(InitData); /* FIXME: Fill in InitData members */ InitData.StartingDeviceNumber = 0; Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/xbo… ============================================================================== --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c (original) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c Fri Jul 6 02:06:47 2007 @@ -42,7 +42,7 @@ VideoPortZeroMemory(&InitData, sizeof(InitData)); InitData.AdapterInterfaceType = PCIBus; - InitData.HwInitDataSize = SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA; + InitData.HwInitDataSize = sizeof(VIDEO_HW_INITIALIZATION_DATA); InitData.HwFindAdapter = XboxVmpFindAdapter; InitData.HwInitialize = XboxVmpInitialize; InitData.HwStartIO = XboxVmpStartIO; Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c Fri Jul 6 02:06:47 2007 @@ -713,6 +713,15 @@ return STATUS_UNSUCCESSFUL; } + /* add no PNP bus here, add more bus type if it need it */ + if ( (HwInitializationData->AdapterInterfaceType == 0) || + (HwInitializationData->AdapterInterfaceType == -1) ) + + { + DPRINT1("No PNP Videocard .\n"); + LegacyDetection = TRUE; + } + DriverObject->MajorFunction[IRP_MJ_CREATE] = IntVideoPortDispatchOpen; DriverObject->MajorFunction[IRP_MJ_CLOSE] = IntVideoPortDispatchClose; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = IntVideoPortDispatchDeviceControl; @@ -727,6 +736,12 @@ if (LegacyDetection) { PDEVICE_OBJECT DeviceObject; + + if (HwInitializationData->HwInitDataSize != SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA) + { + /* power manger */ + DriverObject->MajorFunction[IRP_MJ_POWER] = IntVideoPortDispatchPower; + } Status = IntVideoPortCreateAdapterDeviceObject(DriverObject, DriverExtension, NULL, &DeviceObject); DPRINT("IntVideoPortCreateAdapterDeviceObject returned 0x%x\n", Status);

1 0

[hpoussin] 27412: Never call driver AddDevice routine with a NULL PDO
by hpoussin＠svn.reactos.org 05 Jul '07

05 Jul '07

Author: hpoussin Date: Fri Jul 6 00:08:28 2007 New Revision: 27412 URL: http://svn.reactos.org/svn/reactos?rev=27412&view=rev Log: Never call driver AddDevice routine with a NULL PDO Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Fri Jul 6 00:08:28 2007 @@ -80,57 +80,60 @@ { PDEVICE_OBJECT Fdo; NTSTATUS Status; - BOOLEAN IsPnpDriver = FALSE; - - if (DriverObject->DriverExtension->AddDevice) - { - /* This is a Plug and Play driver */ - DPRINT("Plug and Play driver found\n"); - - ASSERT(DeviceNode->PhysicalDeviceObject); - - DPRINT("Calling driver AddDevice entrypoint at %08lx\n", - DriverObject->DriverExtension->AddDevice); - - IsPnpDriver = !IopDeviceNodeHasFlag(DeviceNode, DNF_LEGACY_DRIVER); - Status = DriverObject->DriverExtension->AddDevice( - DriverObject, IsPnpDriver ? DeviceNode->PhysicalDeviceObject : NULL); - - if (!NT_SUCCESS(Status)) - { - return Status; - } - - if (IsPnpDriver) - { - Fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); - - if (Fdo == DeviceNode->PhysicalDeviceObject) - { - /* FIXME: What do we do? Unload the driver or just disable the device? */ - DbgPrint("An FDO was not attached\n"); - IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); - return STATUS_UNSUCCESSFUL; - } - - if (Fdo->DeviceType == FILE_DEVICE_ACPI) - { - static BOOLEAN SystemPowerDeviceNodeCreated = FALSE; - - /* There can be only one system power device */ - if (!SystemPowerDeviceNodeCreated) - { - PopSystemPowerDeviceNode = DeviceNode; - SystemPowerDeviceNodeCreated = TRUE; - } - } - - ObDereferenceObject(Fdo); - } - + + if (!DriverObject->DriverExtension->AddDevice) + return STATUS_SUCCESS; + + /* This is a Plug and Play driver */ + DPRINT("Plug and Play driver found\n"); + ASSERT(DeviceNode->PhysicalDeviceObject); + + /* Check if this plug-and-play driver is used as a legacy one for this device node */ + if (IopDeviceNodeHasFlag(DeviceNode, DNF_LEGACY_DRIVER)) + { IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED); - IopDeviceNodeSetFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY); - } + return STATUS_SUCCESS; + } + + DPRINT("Calling %wZ->AddDevice(%wZ)\n", + &DriverObject->DriverName, + &DeviceNode->InstancePath); + Status = DriverObject->DriverExtension->AddDevice( + DriverObject, DeviceNode->PhysicalDeviceObject); + if (!NT_SUCCESS(Status)) + { + IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); + return Status; + } + + /* Check if driver added a FDO above the PDO */ + Fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); + if (Fdo == DeviceNode->PhysicalDeviceObject) + { + /* FIXME: What do we do? Unload the driver or just disable the device? */ + DPRINT1("An FDO was not attached\n"); + IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); + return STATUS_UNSUCCESSFUL; + } + + /* Check if we have a ACPI device (needed for power management) */ + if (Fdo->DeviceType == FILE_DEVICE_ACPI) + { + static BOOLEAN SystemPowerDeviceNodeCreated = FALSE; + + /* There can be only one system power device */ + if (!SystemPowerDeviceNodeCreated) + { + PopSystemPowerDeviceNode = DeviceNode; + ObReferenceObject(PopSystemPowerDeviceNode); + SystemPowerDeviceNodeCreated = TRUE; + } + } + + ObDereferenceObject(Fdo); + + IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED); + IopDeviceNodeSetFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY); return STATUS_SUCCESS; }

1 0

[hpoussin] 27411: Do not rely on a call to AddDevice with a NULL PDO to start to use a legacy video miniport
by hpoussin＠svn.reactos.org 05 Jul '07

05 Jul '07

Author: hpoussin Date: Fri Jul 6 00:03:22 2007 New Revision: 27411 URL: http://svn.reactos.org/svn/reactos?rev=27411&view=rev Log: Do not rely on a call to AddDevice with a NULL PDO to start to use a legacy video miniport Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c trunk/reactos/drivers/video/miniport/vga/vgamp.c trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c trunk/reactos/drivers/video/videoprt/dispatch.c Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c Fri Jul 6 00:03:22 2007 @@ -37,7 +37,7 @@ VIDEO_HW_INITIALIZATION_DATA InitData; VideoPortZeroMemory(&InitData, sizeof(InitData)); - InitData.HwInitDataSize = sizeof(VIDEO_HW_INITIALIZATION_DATA); + InitData.HwInitDataSize = SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA; InitData.HwFindAdapter = VBEFindAdapter; InitData.HwInitialize = VBEInitialize; InitData.HwStartIO = VBEStartIO; Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… ============================================================================== --- trunk/reactos/drivers/video/miniport/vga/vgamp.c (original) +++ trunk/reactos/drivers/video/miniport/vga/vgamp.c Fri Jul 6 00:03:22 2007 @@ -31,7 +31,7 @@ VideoPortZeroMemory(&InitData, sizeof InitData); - InitData.HwInitDataSize = sizeof(InitData); + InitData.HwInitDataSize = SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA; /* FIXME: Fill in InitData members */ InitData.StartingDeviceNumber = 0; Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/xbo… ============================================================================== --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c (original) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c Fri Jul 6 00:03:22 2007 @@ -42,7 +42,7 @@ VideoPortZeroMemory(&InitData, sizeof(InitData)); InitData.AdapterInterfaceType = PCIBus; - InitData.HwInitDataSize = sizeof(VIDEO_HW_INITIALIZATION_DATA); + InitData.HwInitDataSize = SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA; InitData.HwFindAdapter = XboxVmpFindAdapter; InitData.HwInitialize = XboxVmpInitialize; InitData.HwStartIO = XboxVmpStartIO; Modified: trunk/reactos/drivers/video/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dis… ============================================================================== --- trunk/reactos/drivers/video/videoprt/dispatch.c (original) +++ trunk/reactos/drivers/video/videoprt/dispatch.c Fri Jul 6 00:03:22 2007 @@ -81,14 +81,7 @@ DriverExtension, PhysicalDeviceObject, &DeviceObject); - if (!NT_SUCCESS(Status)) - return Status; - - if (PhysicalDeviceObject == NULL) - { - /* We will never have a IRP_MJ_PNP/IRP_MN_START_DEVICE Irp */ - Status = IntVideoPortFindAdapter(DriverObject, DriverExtension, DeviceObject); - } + return Status; }

1 0

[dreimer] 27410: - "Simplify" my work in SVN.cmd by replacing it by RT|Chatzilla's. Thx for the easier to underrstand Version. :-) - Update Sign in RosBE.cmd to newest GCC
by dreimer＠svn.reactos.org 05 Jul '07

05 Jul '07

Author: dreimer Date: Thu Jul 5 21:53:07 2007 New Revision: 27410 URL: http://svn.reactos.org/svn/reactos?rev=27410&view=rev Log: - "Simplify" my work in SVN.cmd by replacing it by RT|Chatzilla's. Thx for the easier to underrstand Version. :-) - Update Sign in RosBE.cmd to newest GCC Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/SVN.cmd Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Thu Jul 5 21:53:07 2007 @@ -81,7 +81,7 @@ echo ******************************************************************************* echo * * - echo * ReactOS Build Environment 0.3.7-4.1.3-20070405-prerelease-patched * + echo * ReactOS Build Environment 0.3.7-4.1.3-200707XX (prerelease) * echo * * echo ******************************************************************************* echo. Modified: trunk/tools/RosBE-Windows/Root/SVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/SVN.cmd?r… ============================================================================== --- trunk/tools/RosBE-Windows/Root/SVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/SVN.cmd Thu Jul 5 21:53:07 2007 @@ -39,7 +39,12 @@ echo Folder already cotains a Reposority. Exiting goto :ExitSVN ) - dir /b | find /v "0471391E-C911-11D9-8BDE-F66BFD1E3F3A" >nul && (echo Folder is not empty. Continuing is dangerous and can cause errors. ABORTED) || (%ROSBEBASEDIR%\Tools\svn.exe checkout svn://svn.reactos.org/reactos/trunk/reactos %_ROSSOURCEDIR%) + dir /b %_ROSSOURCEDIR% 2>nul|"%ROSBEBASEDIR%\Tools\grep.exe" -e ".*" >nul + if errorlevel 1 ( + %ROSBEBASEDIR%\Tools\svn.exe checkout svn://svn.reactos.org/reactos/trunk/reactos %_ROSSOURCEDIR% + ) else ( + echo Folder is not empty. Continuing is dangerous and can cause errors. ABORTED + ) goto :ExitSVN ) if "%1" == "status" (

1 0

[hpoussin] 27409: ReactOS now supports ACLs... (fix SeAccessCheck to sometimes deny access)
by hpoussin＠svn.reactos.org 05 Jul '07

05 Jul '07

Author: hpoussin Date: Thu Jul 5 21:01:02 2007 New Revision: 27409 URL: http://svn.reactos.org/svn/reactos?rev=27409&view=rev Log: ReactOS now supports ACLs... (fix SeAccessCheck to sometimes deny access) Modified: trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=27… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c (original) +++ trunk/reactos/ntoskrnl/se/semgr.c Thu Jul 5 21:01:02 2007 @@ -33,9 +33,6 @@ NTAPI SepInitializationPhase0(VOID) { - DPRINT1("FIXME: SeAccessCheck has been HACKED to always grant access!\n"); - DPRINT1("FIXME: Please fix all the code that doesn't get proper rights!\n"); - SepInitLuid(); if (!SepInitSecurityIDs()) return FALSE; if (!SepInitDACLs()) return FALSE; @@ -1155,17 +1152,10 @@ } else { -#if 1 - *AccessStatus = STATUS_SUCCESS; - DPRINT1("FIX caller rights (granted 0x%lx, desired 0x%lx, generic mapping %p)!\n", - *GrantedAccess, DesiredAccess, GenericMapping); - return TRUE; -#else DPRINT1("Denying access for caller: granted 0x%lx, desired 0x%lx (generic mapping %p)\n", *GrantedAccess, DesiredAccess, GenericMapping); *AccessStatus = STATUS_ACCESS_DENIED; return FALSE; -#endif } }

1 0

[hpoussin] 27408: Let admins modify the token
by hpoussin＠svn.reactos.org 05 Jul '07

05 Jul '07

Author: hpoussin Date: Thu Jul 5 20:59:27 2007 New Revision: 27408 URL: http://svn.reactos.org/svn/reactos?rev=27408&view=rev Log: Let admins modify the token Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=27… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c (original) +++ trunk/reactos/ntoskrnl/se/token.c Thu Jul 5 20:59:27 2007 @@ -2099,7 +2099,7 @@ if ( NT_SUCCESS(Status) ) { - Status = RtlAddAccessAllowedAce(AccessToken->DefaultDacl, ACL_REVISION, GENERIC_READ|GENERIC_EXECUTE|READ_CONTROL, SeAliasAdminsSid); + Status = RtlAddAccessAllowedAce(AccessToken->DefaultDacl, ACL_REVISION, GENERIC_READ|GENERIC_WRITE|GENERIC_EXECUTE|READ_CONTROL, SeAliasAdminsSid); } if ( ! NT_SUCCESS(Status) )

1 0

[hpoussin] 27407: Better support of GUID_DEVICE_SYS_BUTTON interface. Now, the kernel can receive power events from the keyboard, but only reacts by displaying a message
by hpoussin＠svn.reactos.org 05 Jul '07

05 Jul '07

Author: hpoussin Date: Thu Jul 5 18:23:16 2007 New Revision: 27407 URL: http://svn.reactos.org/svn/reactos?rev=27407&view=rev Log: Better support of GUID_DEVICE_SYS_BUTTON interface. Now, the kernel can receive power events from the keyboard, but only reacts by displaying a message Modified: trunk/reactos/ntoskrnl/po/events.c Modified: trunk/reactos/ntoskrnl/po/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/events.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/po/events.c (original) +++ trunk/reactos/ntoskrnl/po/events.c Thu Jul 5 18:23:16 2007 @@ -8,11 +8,17 @@ */ #include <ntoskrnl.h> -//#define NDEBUG +#define NDEBUG #include <internal/debug.h> PKWIN32_POWEREVENT_CALLOUT PopEventCallout; extern PCALLBACK_OBJECT SetSystemTimeCallback; + +static VOID +NTAPI +PopGetSysButton( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context); VOID NTAPI @@ -34,6 +40,101 @@ } } +typedef struct _SYS_BUTTON_CONTEXT +{ + PDEVICE_OBJECT DeviceObject; + PIO_WORKITEM WorkItem; + KEVENT Event; + IO_STATUS_BLOCK IoStatusBlock; + ULONG SysButton; +} SYS_BUTTON_CONTEXT, *PSYS_BUTTON_CONTEXT; + +static NTSTATUS +NTAPI +PopGetSysButtonCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + 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; + + /* FIXME: What do do with the sys button event? */ + SysButton = *(PULONG)Irp->AssociatedIrp.SystemBuffer; + { + DPRINT1("A device reported the event 0x%x (", SysButton); + if (SysButton & SYS_BUTTON_POWER) DbgPrint(" POWER"); + if (SysButton & SYS_BUTTON_SLEEP) DbgPrint(" SLEEP"); + if (SysButton & SYS_BUTTON_LID) DbgPrint(" LID"); + if (SysButton == 0) DbgPrint(" WAKE"); + DbgPrint(" )\n"); + } + + /* Allocate a new workitem to send the next IOCTL_GET_SYS_BUTTON_EVENT */ + SysButtonContext->WorkItem = IoAllocateWorkItem(DeviceObject); + if (!SysButtonContext->WorkItem) + { + DPRINT("IoAllocateWorkItem() failed\n"); + ExFreePool(SysButtonContext); + return STATUS_SUCCESS; + } + IoQueueWorkItem( + SysButtonContext->WorkItem, + PopGetSysButton, + DelayedWorkQueue, + SysButtonContext); + + return STATUS_SUCCESS /* STATUS_CONTINUE_COMPLETION */; +} + +static VOID +NTAPI +PopGetSysButton( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context) +{ + PSYS_BUTTON_CONTEXT SysButtonContext = Context; + PIO_WORKITEM CurrentWorkItem = SysButtonContext->WorkItem;; + PIRP Irp; + + /* Get button pressed (IOCTL_GET_SYS_BUTTON_EVENT) */ + KeInitializeEvent(&SysButtonContext->Event, NotificationEvent, FALSE); + Irp = IoBuildDeviceIoControlRequest( + IOCTL_GET_SYS_BUTTON_EVENT, + DeviceObject, + NULL, + 0, + &SysButtonContext->SysButton, + sizeof(SysButtonContext->SysButton), + FALSE, + &SysButtonContext->Event, + &SysButtonContext->IoStatusBlock); + if (Irp) + { + IoSetCompletionRoutine( + Irp, + PopGetSysButtonCompletion, + SysButtonContext, + TRUE, + FALSE, + FALSE); + IoCallDriver(DeviceObject, Irp); + } + else + { + DPRINT1("IoBuildDeviceIoControlRequest() failed\n"); + ExFreePool(SysButtonContext); + } + + IoFreeWorkItem(CurrentWorkItem); +} + NTSTATUS NTAPI PopAddRemoveSysCapsCallback( @@ -41,9 +142,14 @@ IN PVOID Context) { PDEVICE_INTERFACE_CHANGE_NOTIFICATION Notification; + PSYS_BUTTON_CONTEXT SysButtonContext; OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE DeviceHandle; + HANDLE FileHandle; + PDEVICE_OBJECT DeviceObject; + PFILE_OBJECT FileObject; + PIRP Irp; IO_STATUS_BLOCK IoStatusBlock; + KEVENT Event; BOOLEAN Arrival; ULONG Caps; NTSTATUS Status; @@ -67,7 +173,7 @@ { DPRINT("Arrival of %wZ\n", Notification->SymbolicLinkName); - /* Open device */ + /* Open the device */ InitializeObjectAttributes( &ObjectAttributes, Notification->SymbolicLinkName, @@ -75,7 +181,7 @@ NULL, NULL); Status = ZwOpenFile( - &DeviceHandle, + &FileHandle, FILE_READ_DATA, &ObjectAttributes, &IoStatusBlock, @@ -86,32 +192,89 @@ DPRINT("ZwOpenFile() failed with status 0x%08lx\n", Status); return Status; } - - /* Send IOCTL_GET_SYS_BUTTON_CAPS to get new caps */ - Status = ZwDeviceIoControlFile( - DeviceHandle, - NULL, - NULL, - NULL, - &IoStatusBlock, + Status = ObReferenceObjectByHandle( + FileHandle, + FILE_READ_DATA, + IoFileObjectType, + ExGetPreviousMode(), + (PVOID*)&FileObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with status 0x%08lx\n", Status); + ZwClose(FileHandle); + return Status; + } + DeviceObject = IoGetRelatedDeviceObject(FileObject); + ObDereferenceObject(FileObject); + + /* Get capabilities (IOCTL_GET_SYS_BUTTON_CAPS) */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoBuildDeviceIoControlRequest( IOCTL_GET_SYS_BUTTON_CAPS, + DeviceObject, NULL, 0, &Caps, - sizeof(Caps)); + sizeof(Caps), + FALSE, + &Event, + &IoStatusBlock); + if (!Irp) + { + DPRINT("IoBuildDeviceIoControlRequest() failed\n"); + ZwClose(FileHandle); + return STATUS_INSUFFICIENT_RESOURCES; + } + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + DPRINT("IOCTL_GET_SYS_BUTTON_CAPS pending\n"); + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + Status = IoStatusBlock.Status; + } if (!NT_SUCCESS(Status)) { - DPRINT("ZwDeviceIoControlFile(IOCTL_GET_SYS_BUTTON_CAPS) failed with status 0x%08lx\n", Status); - ZwClose(DeviceHandle); - return Status; - } - /* FIXME: What do do with this? */ - DPRINT1("Device capabilities: 0x%lx\n", Caps); - - /* Send IOCTL_GET_SYS_BUTTON_CAPS to get current caps */ - /* FIXME: Set a IO completion routine on it to be able to send a new one */ - DPRINT1("Send a IOCTL_GET_SYS_BUTTON_EVENT\n"); - return ZwClose(DeviceHandle); + DPRINT("Sending IOCTL_GET_SYS_BUTTON_CAPS failed with status 0x%08x\n", Status); + ZwClose(FileHandle); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* 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"); + } + + SysButtonContext = ExAllocatePool(NonPagedPool, sizeof(SYS_BUTTON_CONTEXT)); + if (!SysButtonContext) + { + DPRINT("ExAllocatePool() failed\n"); + ZwClose(FileHandle); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Queue a work item to get sys button event */ + SysButtonContext->WorkItem = IoAllocateWorkItem(DeviceObject); + SysButtonContext->DeviceObject = DeviceObject; + if (!SysButtonContext->WorkItem) + { + DPRINT("IoAllocateWorkItem() failed\n"); + ZwClose(FileHandle); + ExFreePool(SysButtonContext); + return STATUS_INSUFFICIENT_RESOURCES; + } + IoQueueWorkItem( + SysButtonContext->WorkItem, + PopGetSysButton, + DelayedWorkQueue, + SysButtonContext); + + ZwClose(FileHandle); + return STATUS_SUCCESS; } else {

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
71
Older →

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 July 2007