Ros-diffs August 2010

ros-diffs@reactos.org

14 participants
282 discussions

[tkreuzer] 48582: [WIN32K] Use the object type index, not the shifted full object type to decide what to do with an object in NtGdiDeleteObjectApp. Fixes leaking derived types such as pens.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Aug 21 22:00:50 2010 New Revision: 48582 URL: http://svn.reactos.org/svn/reactos?rev=48582&view=rev Log: [WIN32K] Use the object type index, not the shifted full object type to decide what to do with an object in NtGdiDeleteObjectApp. Fixes leaking derived types such as pens. Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Sat Aug 21 22:00:50 2010 @@ -773,7 +773,7 @@ if (IsObjectDead((HGDIOBJ)DCHandle)) return TRUE; - ObjType = GDI_HANDLE_GET_TYPE(DCHandle) >> GDI_ENTRY_UPPER_SHIFT; + ObjType = GDI_OBJECT_GET_TYPE_INDEX((ULONG_PTR)DCHandle); if (GreGetObjectOwner( DCHandle, ObjType)) {

14 years, 4 months

[cgutman] 48581: [NTOSKRNL] - Don't overwrite the ACPI hardware key on every boot

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Aug 21 21:39:53 2010 New Revision: 48581 URL: http://svn.reactos.org/svn/reactos?rev=48581&view=rev Log: [NTOSKRNL] - Don't overwrite the ACPI hardware key on every boot 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sat Aug 21 21:39:53 2010 @@ -2621,6 +2621,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hEnum, hRoot, hHalAcpiDevice, hHalAcpiId, hLogConf; NTSTATUS Status; + ULONG Disposition; InitializeObjectAttributes(&ObjectAttributes, &EnumU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); Status = ZwCreateKey(&hEnum, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); @@ -2642,27 +2643,32 @@ if (IopIsAcpiComputer()) { InitializeObjectAttributes(&ObjectAttributes, &HalAcpiDevice, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hRoot, NULL); - Status = ZwCreateKey(&hHalAcpiDevice, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); + Status = ZwCreateKey(&hHalAcpiDevice, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, &Disposition); ZwClose(hRoot); if (!NT_SUCCESS(Status)) return Status; - InitializeObjectAttributes(&ObjectAttributes, &HalAcpiId, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hHalAcpiDevice, NULL); - Status = ZwCreateKey(&hHalAcpiId, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); + if (Disposition == REG_CREATED_NEW_KEY) + { + InitializeObjectAttributes(&ObjectAttributes, &HalAcpiId, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hHalAcpiDevice, NULL); + Status = ZwCreateKey(&hHalAcpiId, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); + ZwClose(hHalAcpiDevice); + if (!NT_SUCCESS(Status)) + return Status; + Status = ZwSetValueKey(hHalAcpiId, &DeviceDescU, 0, REG_SZ, HalAcpiDeviceDesc.Buffer, HalAcpiDeviceDesc.MaximumLength); + if (NT_SUCCESS(Status)) + Status = ZwSetValueKey(hHalAcpiId, &HardwareIDU, 0, REG_MULTI_SZ, HalAcpiHardwareID.Buffer, HalAcpiHardwareID.MaximumLength); + if (NT_SUCCESS(Status)) + { + InitializeObjectAttributes(&ObjectAttributes, &LogConfU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hHalAcpiId, NULL); + Status = ZwCreateKey(&hLogConf, 0, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); + if (NT_SUCCESS(Status)) + ZwClose(hLogConf); + } + ZwClose(hHalAcpiId); + return Status; + } ZwClose(hHalAcpiDevice); - if (!NT_SUCCESS(Status)) - return Status; - Status = ZwSetValueKey(hHalAcpiId, &DeviceDescU, 0, REG_SZ, HalAcpiDeviceDesc.Buffer, HalAcpiDeviceDesc.MaximumLength); - if (NT_SUCCESS(Status)) - Status = ZwSetValueKey(hHalAcpiId, &HardwareIDU, 0, REG_MULTI_SZ, HalAcpiHardwareID.Buffer, HalAcpiHardwareID.MaximumLength); - if (NT_SUCCESS(Status)) - { - InitializeObjectAttributes(&ObjectAttributes, &LogConfU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hHalAcpiId, NULL); - Status = ZwCreateKey(&hLogConf, 0, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); - if (NT_SUCCESS(Status)) - ZwClose(hLogConf); - } - ZwClose(hHalAcpiId); - return Status; + return STATUS_SUCCESS; } else {

14 years, 4 months

[cgutman] 48580: [NTOSKRNL] - Append the DLL name and NULL terminate the string more nicely

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Aug 21 21:25:07 2010 New Revision: 48580 URL: http://svn.reactos.org/svn/reactos?rev=48580&view=rev Log: [NTOSKRNL] - Append the DLL name and NULL terminate the string more nicely Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Sat Aug 21 21:25:07 2010 @@ -1135,9 +1135,9 @@ ImageFileDirectory->Length); /* Now add the import name and null-terminate it */ - RtlAppendStringToString((PSTRING)&DllName, - (PSTRING)&NameString); - DllName.Buffer[(DllName.MaximumLength - 1) / sizeof(WCHAR)] = UNICODE_NULL; + RtlAppendUnicodeStringToString(&DllName, + &NameString); + DllName.Buffer[DllName.Length / sizeof(WCHAR)] = UNICODE_NULL; /* Load the image */ Status = MmLoadSystemImage(&DllName,

14 years, 4 months

[tkreuzer] 48579: [WIN32K] - Allocate the DCs prgnVis in DC_AllocDC, instead of "on demand" in GdiSelectVisRgn and properly handle failure case. This fixes a possible crash, when running out of gdi handles.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Aug 21 19:55:09 2010 New Revision: 48579 URL: http://svn.reactos.org/svn/reactos?rev=48579&view=rev Log: [WIN32K] - Allocate the DCs prgnVis in DC_AllocDC, instead of "on demand" in GdiSelectVisRgn and properly handle failure case. This fixes a possible crash, when running out of gdi handles. Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] Sat Aug 21 19:55:09 2010 @@ -107,11 +107,7 @@ dc->fs &= ~DC_FLAG_DIRTY_RAO; - if (dc->prgnVis == NULL) - { - dc->prgnVis = IntSysCreateRectpRgn(0, 0, 0, 0); - GDIOBJ_CopyOwnership(hdc, ((PROSRGNDATA)dc->prgnVis)->BaseObject.hHmgr); - } + ASSERT (dc->prgnVis != NULL); retval = NtGdiCombineRgn(((PROSRGNDATA)dc->prgnVis)->BaseObject.hHmgr, hrgn, 0, RGN_COPY); if ( retval != ERROR ) Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Sat Aug 21 19:55:09 2010 @@ -48,6 +48,18 @@ } hDC = NewDC->BaseObject.hHmgr; + + /* Allocate a Vis region */ + NewDC->prgnVis = IntSysCreateRectpRgn(0, 0, 1, 1); + if (!NewDC->prgnVis) + { + DPRINT1("IntSysCreateRectpRgn failed\n"); + if (!GDIOBJ_FreeObjByHandle(hDC, GDI_OBJECT_TYPE_DC)) + { + ASSERT(FALSE); + } + return NULL; + } NewDC->pdcattr = &NewDC->dcattr; DC_AllocateDcAttr(hDC); @@ -661,7 +673,6 @@ PDC pdcNew, pdcOld; PDC_ATTR pdcattrNew, pdcattrOld; HDC hdcNew, DisplayDC = NULL; - HRGN hVisRgn; UNICODE_STRING DriverName; DWORD Layout = 0; HSURF hsurf; @@ -742,12 +753,6 @@ NtGdiDeleteObjectApp(DisplayDC); } - hVisRgn = IntSysCreateRectRgn(0, 0, 1, 1); - if (hVisRgn) - { - GdiSelectVisRgn(hdcNew, hVisRgn); - REGION_FreeRgnByHandle(hVisRgn); - } if (Layout) NtGdiSetLayout(hdcNew, -1, Layout); DC_InitDC(hdcNew);

14 years, 4 months

[dreimer] 48578: Added way to change the ccache dir. define a _ROSBE_CCACHE_DIR Variable and it will be used instead of the default path

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat Aug 21 14:30:38 2010 New Revision: 48578 URL: http://svn.reactos.org/svn/reactos?rev=48578&view=rev Log: Added way to change the ccache dir. define a _ROSBE_CCACHE_DIR Variable and it will be used instead of the default path Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Sat Aug 21 14:30:38 2010 @@ -77,7 +77,12 @@ # To modify the number used, see the cpucount usage for getting to know about the possible options $global:_ROSBE_MAKEX_JOBS = (gwmi win32_processor).numberofcores + 1 -$ENV:CCACHE_DIR = "$ENV:APPDATA\RosBE\.ccache" +if ("$ENV:_ROSBE_CCACHE_DIR" -eq "") { + $ENV:CCACHE_DIR = "$ENV:APPDATA\RosBE\.ccache" +} else { + $ENV:CCACHE_DIR = "$_ROSBE_CCACHE_DIR" +} + $ENV:C_INCLUDE_PATH = $null $ENV:CPLUS_INCLUDE_PATH = $null $ENV:LIBRARY_PATH = $null Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Sat Aug 21 14:30:38 2010 @@ -55,7 +55,12 @@ :: To modify the number used, see the cpucount usage for getting to know about the possible options for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set _ROSBE_MAKEX_JOBS=%%i -set CCACHE_DIR=%APPDATA%\RosBE\.ccache +if "%_ROSBE_CCACHE_DIR%" == "" ( + set CCACHE_DIR=%APPDATA%\RosBE\.ccache +) else ( + set CCACHE_DIR=%_ROSBE_CCACHE_DIR% +) + set C_INCLUDE_PATH= set CPLUS_INCLUDE_PATH= set LIBRARY_PATH=

14 years, 4 months

[jroeloffzen] 48577: [user32] - Revert 48571 - Thou shall not fix wine where it ain't broken. Credits Gabriel Ilardi. - See bug 5303

by jroeloffzen＠svn.reactos.org

Author: jroeloffzen Date: Sat Aug 21 13:10:15 2010 New Revision: 48577 URL: http://svn.reactos.org/svn/reactos?rev=48577&view=rev Log: [user32] - Revert 48571 - Thou shall not fix wine where it ain't broken. Credits Gabriel Ilardi. - See bug 5303 Modified: branches/arwinss/reactos/dll/win32/user32/painting.c Modified: branches/arwinss/reactos/dll/win32/user32/painting.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/painting.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/painting.c [iso-8859-1] Sat Aug 21 13:10:15 2010 @@ -911,13 +911,10 @@ const DWORD user_flags = clip_flags | DCX_NORESETATTRS; /* flags that can be set by user */ struct dce *dce; BOOL bUpdateVisRgn = TRUE; - BOOL bWndVisible; HWND parent; - HWND desktop = GetDesktopWindow(); LONG window_style = GetWindowLongW( hwnd, GWL_STYLE ); - LONG parent_style; - - if (!hwnd) hwnd = desktop; + + if (!hwnd) hwnd = GetDesktopWindow(); else hwnd = WIN_GetFullHandle( hwnd ); TRACE("hwnd %p, hrgnClip %p, flags %08x\n", hwnd, hrgnClip, flags); @@ -945,18 +942,17 @@ if (flags & DCX_WINDOW) flags &= ~DCX_CLIPCHILDREN; - if ( !(parent = GetAncestor( hwnd, GA_PARENT)) ) parent = desktop; - if (parent == desktop) + parent = GetAncestor( hwnd, GA_PARENT ); + if (!parent || (parent == GetDesktopWindow())) flags = (flags & ~DCX_PARENTCLIP) | DCX_CLIPSIBLINGS; - parent_style = GetWindowLongW( parent, GWL_STYLE ); - bWndVisible = (window_style & WS_VISIBLE) && (parent_style & WS_VISIBLE); /* it seems parent clip is ignored when clipping siblings or children */ if (flags & (DCX_CLIPSIBLINGS | DCX_CLIPCHILDREN)) flags &= ~DCX_PARENTCLIP; if( flags & DCX_PARENTCLIP ) { - if (bWndVisible) + LONG parent_style = GetWindowLongW( parent, GWL_STYLE ); + if( (window_style & WS_VISIBLE) && (parent_style & WS_VISIBLE) ) { flags &= ~DCX_CLIPCHILDREN; if (parent_style & WS_CLIPSIBLINGS) flags |= DCX_CLIPSIBLINGS; @@ -1040,7 +1036,7 @@ if (SetHookFlags( dce->hdc, DCHF_VALIDATEVISRGN )) bUpdateVisRgn = TRUE; /* DC was dirty */ - if (bWndVisible && bUpdateVisRgn) update_visible_region( dce ); + if (bUpdateVisRgn) update_visible_region( dce ); TRACE("(%p,%p,0x%x): returning %p\n", hwnd, hrgnClip, flags, dce->hdc); return dce->hdc;

14 years, 4 months

[tkreuzer] 48576: [WIN32K] - co_IntTranslateMouseMessage: properly initialize *HitTest and only send WM_NCHITTEST when the message is going to be removed - co_IntPeekMessage: Prevent possible use of uninitialized HitTest by ProcessMouseMessage() - Patch by Jan Roeloffzen [jroeloffzen at hotmail dot com] - Fixes bug 2139

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 20 19:24:48 2010 New Revision: 48576 URL: http://svn.reactos.org/svn/reactos?rev=48576&view=rev Log: [WIN32K] - co_IntTranslateMouseMessage: properly initialize *HitTest and only send WM_NCHITTEST when the message is going to be removed - co_IntPeekMessage: Prevent possible use of uninitialized HitTest by ProcessMouseMessage() - Patch by Jan Roeloffzen [jroeloffzen at hotmail dot com] - Fixes bug 2139 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Fri Aug 20 19:24:48 2010 @@ -579,14 +579,20 @@ return TRUE; } + *HitTest = HTCLIENT; + UserRefObjectCo(Window, &Ref); if ( ThreadQueue == Window->pti->MessageQueue && ThreadQueue->CaptureWindow != Window->hSelf) { /* only send WM_NCHITTEST messages if we're not capturing the window! */ - *HitTest = co_IntSendMessage(Window->hSelf, WM_NCHITTEST, 0, - MAKELONG(Msg->pt.x, Msg->pt.y)); + if (Remove ) + { + *HitTest = co_IntSendMessage(Window->hSelf, WM_NCHITTEST, 0, + MAKELONG(Msg->pt.x, Msg->pt.y)); + } + /* else we are going to see this message again, but then with Remove == TRUE */ if (*HitTest == (USHORT)HTTRANSPARENT) { @@ -625,10 +631,6 @@ UserDerefObjectCo(DesktopWindow); } } - } - else - { - *HitTest = HTCLIENT; } if ( gspv.bMouseClickLock && @@ -800,6 +802,8 @@ * WM_TIMER messages */ CheckMessages: + + HitTest = HTNOWHERE; Present = FALSE;

14 years, 4 months

[cgutman] 48574: [NTOSKRNL] - The trailing NULL is NOT included in the string length - IopNotifyPlugPlayNotification needs a pointer to an actual GUID not a UNICODE_STRING - The Power Manager can now see ACPI power devices again - ROS will now do a graceful shutdown and power off if the power button is pressed and ACPI is enabled

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 20 04:45:25 2010 New Revision: 48574 URL: http://svn.reactos.org/svn/reactos?rev=48574&view=rev Log: [NTOSKRNL] - The trailing NULL is NOT included in the string length - IopNotifyPlugPlayNotification needs a pointer to an actual GUID not a UNICODE_STRING - The Power Manager can now see ACPI power devices again - ROS will now do a graceful shutdown and power off if the power button is pressed and ACPI is enabled Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Fri Aug 20 04:45:25 2010 @@ -731,11 +731,6 @@ } KeyName.Length = KeyName.MaximumLength = (USHORT)bip->DataLength - 4 * sizeof(WCHAR); KeyName.Buffer = &((PWSTR)bip->Data)[4]; - if (KeyName.Length && KeyName.Buffer[KeyName.Length / sizeof(WCHAR)] == UNICODE_NULL) - { - /* Remove trailing NULL */ - KeyName.Length -= sizeof(WCHAR); - } /* Add new symbolic link to symbolic link list */ if (ReturnBuffer.Length + KeyName.Length + sizeof(WCHAR) > ReturnBuffer.MaximumLength) @@ -1232,6 +1227,7 @@ UNICODE_STRING KeyName; OBJECT_ATTRIBUTES ObjectAttributes; ULONG LinkedValue; + GUID DeviceGuid; if (SymbolicLinkName == NULL) return STATUS_INVALID_PARAMETER_1; @@ -1309,13 +1305,20 @@ DPRINT1("IoGetDeviceObjectPointer() failed with status 0x%08lx\n", Status); return Status; } + + Status = RtlGUIDFromString(&GuidString, &DeviceGuid); + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlGUIDFromString() failed with status 0x%08lx\n", Status); + return Status; + } EventGuid = Enable ? &GUID_DEVICE_INTERFACE_ARRIVAL : &GUID_DEVICE_INTERFACE_REMOVAL; IopNotifyPlugPlayNotification( PhysicalDeviceObject, EventCategoryDeviceInterfaceChange, EventGuid, - &GuidString, + &DeviceGuid, (PVOID)SymbolicLinkName); ObDereferenceObject(FileObject);

14 years, 4 months

[cgutman] 48573: [ACPI] - Do all of the work inside the DPC so we don't have IRQL issues when entering the memory manager - This is a slight hack but we can be assured that data won't be over 24 bits unless somebody wants to push the power/sleep button over 16 million times

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 20 03:08:50 2010 New Revision: 48573 URL: http://svn.reactos.org/svn/reactos?rev=48573&view=rev Log: [ACPI] - Do all of the work inside the DPC so we don't have IRQL issues when entering the memory manager - This is a slight hack but we can be assured that data won't be over 24 bits unless somebody wants to push the power/sleep button over 16 million times Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] Fri Aug 20 03:08:50 2010 @@ -463,8 +463,19 @@ PVOID SystemArgument1, PVOID SystemArgument2) { - struct acpi_bus_event *event = SystemArgument1; + struct acpi_bus_event *event; + struct acpi_device *device = SystemArgument1; + ULONG_PTR TypeData = (ULONG_PTR)SystemArgument2; KIRQL OldIrql; + + event = ExAllocatePool(NonPagedPool,sizeof(struct acpi_bus_event)); + if (!event) + return; + + sprintf(event->device_class, "%s", device->pnp.device_class); + sprintf(event->bus_id, "%s", device->pnp.bus_id); + event->type = (TypeData & 0xFF000000) >> 24; + event->data = (TypeData & 0x00FFFFFF); KeAcquireSpinLock(&acpi_bus_event_lock, &OldIrql); list_add_tail(&event->node, &acpi_bus_event_list); @@ -479,7 +490,7 @@ UINT8 type, int data) { - struct acpi_bus_event *event = NULL; + ULONG_PTR TypeData = 0; DPRINT("acpi_bus_generate_event"); @@ -489,18 +500,14 @@ /* drop event on the floor if no one's listening */ if (!event_is_open) return_VALUE(0); - - event = ExAllocatePool(NonPagedPool,sizeof(struct acpi_bus_event)); - if (!event) - return_VALUE(-4); - - sprintf(event->device_class, "%s", device->pnp.device_class); - sprintf(event->bus_id, "%s", device->pnp.bus_id); - event->type = type; - event->data = data; - - if (!KeInsertQueueDpc(&event_dpc, event, NULL)) - ExFreePool(event); + + /* Data shouldn't even get near 24 bits */ + ASSERT(!(data & 0xFF000000)); + + TypeData = data; + TypeData |= type << 24; + + KeInsertQueueDpc(&event_dpc, device, (PVOID)TypeData); return_VALUE(0); }

14 years, 4 months

[cgutman] 48572: [NTOSKRNL] - Shutdown the system if we receive a SYS_BUTTON_POWER event - Register for GUID_DEVICE_LID arrival events so we can receive lid events

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 20 02:27:05 2010 New Revision: 48572 URL: http://svn.reactos.org/svn/reactos?rev=48572&view=rev Log: [NTOSKRNL] - Shutdown the system if we receive a SYS_BUTTON_POWER event - Register for GUID_DEVICE_LID arrival events so we can receive lid events Modified: trunk/reactos/ntoskrnl/include/internal/po.h trunk/reactos/ntoskrnl/po/events.c trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/include/internal/po.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/po.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/po.h [iso-8859-1] Fri Aug 20 02:27:05 2010 @@ -6,6 +6,7 @@ * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ +#include "initguid.h" #include <poclass.h> // Modified: trunk/reactos/ntoskrnl/po/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/events.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/po/events.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/events.c [iso-8859-1] Fri Aug 20 02:27:05 2010 @@ -79,6 +79,15 @@ if (SysButton & SYS_BUTTON_LID) DbgPrint(" LID"); if (SysButton == 0) DbgPrint(" WAKE"); DbgPrint(" )\n"); + + if (SysButton & SYS_BUTTON_POWER) + { + /* FIXME: Read registry for the action we should perform here */ + DPRINT1("Initiating shutdown after power button event\n"); + + ZwShutdownSystem(ShutdownNoReboot); + } + } /* Allocate a new workitem to send the next IOCTL_GET_SYS_BUTTON_EVENT */ Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=48… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Fri Aug 20 02:27:05 2010 @@ -136,10 +136,20 @@ /* Check if this is phase 1 init */ if (BootPhase == 1) { - /* Registry power button notification */ + /* Register power button notification */ IoRegisterPlugPlayNotification(EventCategoryDeviceInterfaceChange, PNPNOTIFY_DEVICE_INTERFACE_INCLUDE_EXISTING_INTERFACES, (PVOID)&GUID_DEVICE_SYS_BUTTON, + IopRootDeviceNode-> + PhysicalDeviceObject->DriverObject, + PopAddRemoveSysCapsCallback, + NULL, + &NotificationEntry); + + /* Register lid notification */ + IoRegisterPlugPlayNotification(EventCategoryDeviceInterfaceChange, + PNPNOTIFY_DEVICE_INTERFACE_INCLUDE_EXISTING_INTERFACES, + (PVOID)&GUID_DEVICE_LID, IopRootDeviceNode-> PhysicalDeviceObject->DriverObject, PopAddRemoveSysCapsCallback,

14 years, 4 months

← Newer
1
...
7
8
9
10
11
12
13
...
29
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 August 2010