Ros-diffs March 2010

ros-diffs@reactos.org

19 participants
896 discussions

[cgutman] 46550: [NTOSKRNL] - Set the IRP_SYNCHRONOUS_API flag on IRPs created by IoBuildSynchronousFsdRequest
by cgutman＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: cgutman Date: Mon Mar 29 04:59:44 2010 New Revision: 46550 URL: http://svn.reactos.org/svn/reactos?rev=46550&view=rev Log: [NTOSKRNL] - Set the IRP_SYNCHRONOUS_API flag on IRPs created by IoBuildSynchronousFsdRequest Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Mon Mar 29 04:59:44 2010 @@ -966,8 +966,11 @@ IoStatusBlock ); if (!Irp) return NULL; - /* Set the Event which makes it Syncronous */ + /* Associate the caller's event object with this IRP */ Irp->UserEvent = Event; + + /* Set the synchronous flag */ + Irp->Flags |= IRP_SYNCHRONOUS_API; /* Sync IRPs are queued to requestor thread's irp cancel/cleanup list */ IoQueueThreadIrp(Irp);

1 0

[tkreuzer] 46549: fix build
by tkreuzer＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: tkreuzer Date: Mon Mar 29 04:51:02 2010 New Revision: 46549 URL: http://svn.reactos.org/svn/reactos?rev=46549&view=rev Log: fix build Modified: trunk/reactos/subsystems/win32/win32k/pch.h Modified: trunk/reactos/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/pc… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] Mon Mar 29 04:51:02 2010 @@ -13,11 +13,11 @@ #define _NO_COM /* DDK/NDK/SDK Headers */ -#include <ddk/ntddk.h> -#include <ddk/ntddmou.h> -#include <ddk/ntifs.h> -#include <ddk/tvout.h> -#include <ndk/ntndk.h> +#include <ntddk.h> +#include <ntddmou.h> +#include <ntifs.h> +#include <tvout.h> +#include <ntndk.h> /* Win32 Headers */ /* FIXME: Defines in winbase.h that we need... */

1 0

[tkreuzer] 46548: Reintegrate header branch part 4/x - don't prepend ddk/ before the header includes - move atsmedia.h to psdk - add mce.h, devpropdef.h, evntprov.h, ntiologc.h to psdk - replace ntstatus.h
by tkreuzer＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: tkreuzer Date: Mon Mar 29 04:48:28 2010 New Revision: 46548 URL: http://svn.reactos.org/svn/reactos?rev=46548&view=rev Log: Reintegrate header branch part 4/x - don't prepend ddk/ before the header includes - move atsmedia.h to psdk - add mce.h, devpropdef.h, evntprov.h, ntiologc.h to psdk - replace ntstatus.h Added: trunk/reactos/include/ddk/mce.h - copied unchanged from r46492, trunk/reactos/include/ddk/mce.h trunk/reactos/include/psdk/atsmedia.h - copied unchanged from r46492, trunk/reactos/include/psdk/atsmedia.h trunk/reactos/include/psdk/devpropdef.h - copied unchanged from r46492, trunk/reactos/include/psdk/devpropdef.h trunk/reactos/include/psdk/evntprov.h - copied unchanged from r46492, trunk/reactos/include/psdk/evntprov.h trunk/reactos/include/psdk/ntiologc.h - copied unchanged from r46492, trunk/reactos/include/psdk/ntiologc.h trunk/reactos/include/psdk/ntstatus.h - copied unchanged from r46492, trunk/reactos/include/psdk/ntstatus.h trunk/reactos/include/psdk/tvout.h - copied unchanged from r46492, trunk/reactos/include/psdk/tvout.h Removed: trunk/reactos/include/ddk/atsmedia.h trunk/reactos/include/ddk/tvout.h Modified: trunk/reactos/drivers/directx/dxapi/dxapi_driver.h trunk/reactos/drivers/directx/dxg/dxg_int.h Modified: trunk/reactos/drivers/directx/dxapi/dxapi_driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxapi/dxap… ============================================================================== --- trunk/reactos/drivers/directx/dxapi/dxapi_driver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxapi/dxapi_driver.h [iso-8859-1] Mon Mar 29 04:48:28 2010 @@ -1,10 +1,10 @@ /* DDK/NDK/SDK Headers */ -#include <ddk/ntddk.h> -#include <ddk/ntddmou.h> -#include <ddk/ntifs.h> -#include <ddk/tvout.h> -#include <ndk/ntndk.h> +#include <ntddk.h> +#include <ntddmou.h> +#include <ntifs.h> +#include <tvout.h> +#include <ntndk.h> #include <stdarg.h> #include <windef.h> @@ -16,7 +16,7 @@ #include <dde.h> -#include <ddk/ddkmapi.h> +#include <ddkmapi.h> /* Prototypes */ VOID DxGetVersionNumber(PVOID lpvInBuffer, LPDDGETVERSIONNUMBER lpvOutBuffer); Modified: trunk/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/dxg_in… ============================================================================== --- trunk/reactos/drivers/directx/dxg/dxg_int.h [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/dxg_int.h [iso-8859-1] Mon Mar 29 04:48:28 2010 @@ -1,9 +1,9 @@ /* DDK/NDK/SDK Headers */ -#include <ddk/ntddk.h> -#include <ddk/ntddmou.h> -#include <ddk/ntifs.h> -#include <ddk/tvout.h> -#include <ndk/ntndk.h> +#include <ntddk.h> +#include <ntddmou.h> +#include <ntifs.h> +#include <tvout.h> +#include <ntndk.h> /* Win32 Headers */ #define WINBASEAPI Removed: trunk/reactos/include/ddk/atsmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/atsmedia.h?rev… ============================================================================== --- trunk/reactos/include/ddk/atsmedia.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/atsmedia.h (removed) @@ -1,17 +1,0 @@ - -/* $Id: $ - * - * COPYRIGHT: This file is in the public domain. - * PROJECT: ReactOS kernel - * FILE: - * PURPOSE: headers - * PROGRAMMER: Magnus Olsen (greatlrd) - * - */ - -#if !defined(_ATSCMEDIA_) -#define _ATSCMEDIA_ -#define BDANETWORKTYPE_ATSC DEFINE_GUIDNAMED(BDANETWORKTYPE_ATSC) -#define STATIC_BDANETWORKTYPE_ATSC 0x71985F51, 0x1CA1, 0x11D3, 0x9C, 0xC8, 0x0, 0xC0, 0x4F, 0x79, 0x71, 0xE0 -DEFINE_GUIDSTRUCT("71985F51-1CA1-11D3-9CC8-00C04F7971E0", BDANETWORKTYPE_ATSC); -#endif Removed: trunk/reactos/include/ddk/tvout.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/tvout.h?rev=46… ============================================================================== --- trunk/reactos/include/ddk/tvout.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/tvout.h (removed) @@ -1,113 +1,0 @@ -/* - * tvout.h - * - * Definitions for TV-out support - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef __TVOUT_H -#define __TVOUT_H - - -#if _MSC_VER > 1000 -#pragma once -#endif - - -#ifndef GUID_DEFINED -#include <guiddef.h> -#endif - -/* VIDEOPARAMETERS.dwCommand constants */ -#define VP_COMMAND_GET 0x00000001 -#define VP_COMMAND_SET 0x00000002 - -/* VIDEOPARAMETERS.dwFlags constants */ -#define VP_FLAGS_TV_MODE 0x00000001 -#define VP_FLAGS_TV_STANDARD 0x00000002 -#define VP_FLAGS_FLICKER 0x00000004 -#define VP_FLAGS_OVERSCAN 0x00000008 -#define VP_FLAGS_MAX_UNSCALED 0x00000010 -#define VP_FLAGS_POSITION 0x00000020 -#define VP_FLAGS_BRIGHTNESS 0x00000040 -#define VP_FLAGS_CONTRAST 0x00000080 -#define VP_FLAGS_COPYPROTECT 0x00000100 - -/* VIDEOPARAMETERS.dwMode constants */ -#define VP_MODE_WIN_GRAPHICS 0x00000001 -#define VP_MODE_TV_PLAYBACK 0x00000002 - -/* VIDEOPARAMETERS.dwTVStandard/dwAvailableTVStandard constants */ -#define VP_TV_STANDARD_NTSC_M 0x00000001 -#define VP_TV_STANDARD_NTSC_M_J 0x00000002 -#define VP_TV_STANDARD_PAL_B 0x00000004 -#define VP_TV_STANDARD_PAL_D 0x00000008 -#define VP_TV_STANDARD_PAL_H 0x00000010 -#define VP_TV_STANDARD_PAL_I 0x00000020 -#define VP_TV_STANDARD_PAL_M 0x00000040 -#define VP_TV_STANDARD_PAL_N 0x00000080 -#define VP_TV_STANDARD_SECAM_B 0x00000100 -#define VP_TV_STANDARD_SECAM_D 0x00000200 -#define VP_TV_STANDARD_SECAM_G 0x00000400 -#define VP_TV_STANDARD_SECAM_H 0x00000800 -#define VP_TV_STANDARD_SECAM_K 0x00001000 -#define VP_TV_STANDARD_SECAM_K1 0x00002000 -#define VP_TV_STANDARD_SECAM_L 0x00004000 -#define VP_TV_STANDARD_WIN_VGA 0x00008000 -#define VP_TV_STANDARD_NTSC_433 0x00010000 -#define VP_TV_STANDARD_PAL_G 0x00020000 -#define VP_TV_STANDARD_PAL_60 0x00040000 -#define VP_TV_STANDARD_SECAM_L1 0x00080000 - -/* VIDEOPARAMETERS.dwMode constants */ -#define VP_CP_TYPE_APS_TRIGGER 0x00000001 -#define VP_CP_TYPE_MACROVISION 0x00000002 - -/* VIDEOPARAMETERS.dwCPCommand constants */ -#define VP_CP_CMD_ACTIVATE 0x00000001 -#define VP_CP_CMD_DEACTIVATE 0x00000002 -#define VP_CP_CMD_CHANGE 0x00000004 - -typedef struct _VIDEOPARAMETERS { - GUID Guid; - ULONG dwOffset; - ULONG dwCommand; - ULONG dwFlags; - ULONG dwMode; - ULONG dwTVStandard; - ULONG dwAvailableModes; - ULONG dwAvailableTVStandard; - ULONG dwFlickerFilter; - ULONG dwOverScanX; - ULONG dwOverScanY; - ULONG dwMaxUnscaledX; - ULONG dwMaxUnscaledY; - ULONG dwPositionX; - ULONG dwPositionY; - ULONG dwBrightness; - ULONG dwContrast; - ULONG dwCPType; - ULONG dwCPCommand; - ULONG dwCPStandard; - ULONG dwCPKey; - ULONG bCP_APSTriggerBits; - UCHAR bOEMCopyProtection[256]; -} VIDEOPARAMETERS, *PVIDEOPARAMETERS, FAR *LPVIDEOPARAMETERS; - - -#endif /* __TVOUT_H */

1 0

[tkreuzer] 46547: Reintegrate header-branch 3/x - Add XDK
by tkreuzer＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: tkreuzer Date: Mon Mar 29 04:38:12 2010 New Revision: 46547 URL: http://svn.reactos.org/svn/reactos?rev=46547&view=rev Log: Reintegrate header-branch 3/x - Add XDK Added: trunk/reactos/include/xdk/ (props changed) - copied from r46492, trunk/reactos/include/xdk/ Modified: trunk/reactos/include/xdk/amd64/ (props changed) trunk/reactos/include/xdk/arm/ (props changed) trunk/reactos/include/xdk/ia64/ (props changed) trunk/reactos/include/xdk/mips/ (props changed) trunk/reactos/include/xdk/ppc/ (props changed) trunk/reactos/include/xdk/x86/ (props changed) Propchange: trunk/reactos/include/xdk/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Mar 29 04:38:12 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/include/xdk/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/include/xdk/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/include/xdk/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[sir_richard] 46546: [COMPBATT]: More miniclass driver interface work: CompBattQueryInformation and CompBattGetBatteryGranularity.
by sir_richard＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: sir_richard Date: Mon Mar 29 04:27:41 2010 New Revision: 46546 URL: http://svn.reactos.org/svn/reactos?rev=46546&view=rev Log: [COMPBATT]: More miniclass driver interface work: CompBattQueryInformation and CompBattGetBatteryGranularity. Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c [iso-8859-1] Mon Mar 29 04:27:41 2010 @@ -394,22 +394,99 @@ CompBattGetBatteryGranularity(OUT PBATTERY_REPORTING_SCALE ReportingScale, IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { + NTSTATUS Status = STATUS_SUCCESS; + BATTERY_QUERY_INFORMATION InputBuffer; + PCOMPBATT_BATTERY_DATA BatteryData; + BATTERY_REPORTING_SCALE BatteryScale[4]; + PLIST_ENTRY ListHead, NextEntry; + ULONG i; + if (CompBattDebug & 1) DbgPrint("CompBatt: ENTERING GetBatteryGranularity\n"); + + /* Set defaults */ + ReportingScale[0].Granularity = -1; + ReportingScale[1].Granularity = -1; + ReportingScale[2].Granularity = -1; + ReportingScale[3].Granularity = -1; + + /* Loop the battery list */ + ExAcquireFastMutex(&DeviceExtension->Lock); + ListHead = &DeviceExtension->BatteryList; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Try to acquire the remove lock */ + BatteryData = CONTAINING_RECORD(NextEntry, COMPBATT_BATTERY_DATA, BatteryLink); + if (NT_SUCCESS(IoAcquireRemoveLock(&BatteryData->RemoveLock, 0))) + { + /* Now release the device lock since the battery can't go away */ + ExReleaseFastMutex(&DeviceExtension->Lock); + + /* Build the query */ + InputBuffer.BatteryTag = BatteryData->Tag; + InputBuffer.InformationLevel = BatteryGranularityInformation; + + /* Make sure the battery has a tag */ + if (BatteryData->Tag) + { + /* Send the IOCTL to query the information */ + RtlZeroMemory(&BatteryData->BatteryInformation, + sizeof(BatteryData->BatteryInformation)); + Status = BatteryIoctl(IOCTL_BATTERY_QUERY_INFORMATION, + BatteryData->DeviceObject, + &InputBuffer, + sizeof(InputBuffer), + &BatteryScale, + sizeof(BatteryScale), + 0); + if (!NT_SUCCESS(Status)) + { + /* Fail if the query had a problem */ + ExAcquireFastMutex(&DeviceExtension->Lock); + IoReleaseRemoveLock(&BatteryData->RemoveLock, 0); + break; + } + + /* Loop all 4 scales */ + for (i = 0; i < 4; i++) + { + /* Check for valid granularity */ + if (BatteryScale[i].Granularity) + { + /* If it's smaller, use it instead */ + ReportingScale[i].Granularity = min(BatteryScale[i].Granularity, + ReportingScale[i].Granularity); + } + + } + } + + /* Re-acquire the device extension lock and release the remove lock */ + ExAcquireFastMutex(&DeviceExtension->Lock); + IoReleaseRemoveLock(&BatteryData->RemoveLock, 0); + } + + /* Next entry */ + NextEntry = NextEntry->Flink; + } + + /* All done */ + ExReleaseFastMutex(&DeviceExtension->Lock); + if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING GetBatteryGranularity\n"); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +CompBattGetEstimatedTime(OUT PULONG Time, + IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +{ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } - -NTSTATUS -NTAPI -CompBattGetEstimatedTime(OUT PULONG Time, - IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -CompBattQueryInformation(IN PCOMPBATT_DEVICE_EXTENSION FdoExtension, + +NTSTATUS +NTAPI +CompBattQueryInformation(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, IN ULONG Tag, IN BATTERY_QUERY_INFORMATION_LEVEL InfoLevel, IN OPTIONAL LONG AtRate, @@ -417,8 +494,109 @@ IN ULONG BufferLength, OUT PULONG ReturnedLength) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + BATTERY_INFORMATION BatteryInfo; + BATTERY_REPORTING_SCALE BatteryGranularity[4]; + PWCHAR BatteryName = L"Composite Battery"; + BATTERY_MANUFACTURE_DATE Date; + ULONG Dummy, Time; + PVOID QueryData = NULL; + ULONG QueryLength = 0; + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + if (CompBattDebug & 1) DbgPrint("CompBatt: ENTERING QueryInformation\n"); + + /* Check for valid/correct tag */ + if ((Tag != DeviceExtension->Tag) || + (!(DeviceExtension->Flags & COMPBATT_TAG_ASSIGNED))) + { + /* Not right, so fail */ + return STATUS_NO_SUCH_DEVICE; + } + + /* Check what caller wants */ + switch (InfoLevel) + { + case BatteryInformation: + + /* Query combined battery information */ + RtlZeroMemory(&BatteryInfo, sizeof(BatteryInfo)); + Status = CompBattGetBatteryInformation(&BatteryInfo, DeviceExtension); + if (NT_SUCCESS(Status)) + { + /* Return the data if successful */ + QueryData = &BatteryInfo; + QueryLength = sizeof(BatteryInfo); + } + break; + + case BatteryGranularityInformation: + + /* Query combined granularity information */ + RtlZeroMemory(&BatteryGranularity, sizeof(BatteryGranularity)); + Status = CompBattGetBatteryGranularity(BatteryGranularity, DeviceExtension); + if (NT_SUCCESS(Status)) + { + /* Return the data if successful */ + QueryLength = sizeof(BatteryGranularity); + QueryData = &BatteryGranularity; + } + break; + + case BatteryEstimatedTime: + + /* Query combined time estimate information */ + RtlZeroMemory(&Time, sizeof(Time)); + Status = CompBattGetEstimatedTime(&Time, DeviceExtension); + if (NT_SUCCESS(Status)) + { + /* Return the data if successful */ + QueryLength = sizeof(Time); + QueryData = &Time; + } + break; + + case BatteryManufactureName: + case BatteryDeviceName: + + /* Return the static buffer */ + QueryData = BatteryName; + QueryLength = sizeof(L"Composite Battery"); + break; + + case BatteryManufactureDate: + + /* Static data */ + Date.Day = 26; + Date.Month = 06; + Date.Year = 1997; + break; + + case BatteryTemperature: + case BatteryUniqueID: + + /* Return zero */ + Dummy = 0; + QueryData = &Dummy; + QueryLength = sizeof(Dummy); + break; + + default: + + /* Everything else is unknown */ + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* Return the required length and check if the caller supplied enough */ + *ReturnedLength = QueryLength; + if (BufferLength < QueryLength) Status = STATUS_BUFFER_TOO_SMALL; + + /* Copy the data if there's enough space and it exists */ + if ((NT_SUCCESS(Status)) && (QueryData)) RtlCopyMemory(Buffer, QueryData, QueryLength); + + /* Return function result */ + if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING QueryInformation\n"); + return Status; } NTSTATUS

1 0

[tkreuzer] 46545: Fix build
by tkreuzer＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: tkreuzer Date: Mon Mar 29 04:15:21 2010 New Revision: 46545 URL: http://svn.reactos.org/svn/reactos?rev=46545&view=rev Log: Fix build Modified: trunk/reactos/include/reactos/idl/pnp.idl Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] Mon Mar 29 04:15:21 2010 @@ -16,6 +16,13 @@ cpp_quote("#ifndef _CFGMGR32_H_") typedef unsigned long RESOURCEID; + +typedef struct _HWPROFILEINFO { + DWORD HWPI_ulHWProfile; + WCHAR HWPI_szFriendlyName[80]; + DWORD HWPI_dwFlags; +} HWPROFILEINFO; + cpp_quote("#endif") typedef unsigned long DEVPROPTYPE; typedef [range(0, PNP_MAX_PROP_SIZE)] unsigned long PNP_PROP_SIZE; @@ -242,12 +249,6 @@ DWORD pid; } DEVPROPKEY; -typedef struct _HWPROFILEINFO { - DWORD HWPI_ulHWProfile; - WCHAR HWPI_szFriendlyName[80]; - DWORD HWPI_dwFlags; -} HWPROFILEINFO; - [ uuid (809F4e40-A03D-11CE-8F69-08003E30051B), version(1.0),

1 0

[tkreuzer] 46544: Reintegrate header-branch 2/x - PCVOID -> LPCVOID / CONST VOID * - move cfgmgr32.h and cfg.h to psdk - remove wine/cfgmgr32.h make setupapi use the proper header
by tkreuzer＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: tkreuzer Date: Mon Mar 29 04:03:41 2010 New Revision: 46544 URL: http://svn.reactos.org/svn/reactos?rev=46544&view=rev Log: Reintegrate header-branch 2/x - PCVOID -> LPCVOID / CONST VOID * - move cfgmgr32.h and cfg.h to psdk - remove wine/cfgmgr32.h make setupapi use the proper header Added: trunk/reactos/include/psdk/cfg.h - copied unchanged from r46492, trunk/reactos/include/psdk/cfg.h trunk/reactos/include/psdk/cfgmgr32.h - copied unchanged from r46492, trunk/reactos/include/psdk/cfgmgr32.h Removed: trunk/reactos/include/ddk/cfg.h trunk/reactos/include/ddk/cfgmgr32.h trunk/reactos/include/reactos/wine/cfgmgr32.h Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c trunk/reactos/dll/win32/hid/precomp.h trunk/reactos/dll/win32/setupapi/setupapi.rbuild trunk/reactos/dll/win32/setupapi/setupapi_private.h trunk/reactos/include/ndk/amd64/ (props changed) trunk/reactos/include/ndk/amd64/asmmacro.S (props changed) trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/wincon.h trunk/reactos/include/psdk/windef.h trunk/reactos/include/psdk/wingdi.h trunk/reactos/include/psdk/winuser.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… Modified: trunk/reactos/dll/win32/hid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/precomp.h?re… Modified: trunk/reactos/dll/win32/setupapi/setupapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… Removed: trunk/reactos/include/ddk/cfg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/cfg.h?rev=4654… Removed: trunk/reactos/include/ddk/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/cfgmgr32.h?rev… Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… Modified: trunk/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=… Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… Removed: trunk/reactos/include/reactos/wine/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/cfgmg…

1 0

[sir_richard] 46543: [COMPBATT]: Mini-class driver interface work: CompBattDisableStatusNotify, CompBattQueryTag, CompBattRecalculateTag, CompBattGetBatteryInformation.
by sir_richard＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: sir_richard Date: Mon Mar 29 04:02:07 2010 New Revision: 46543 URL: http://svn.reactos.org/svn/reactos?rev=46543&view=rev Log: [COMPBATT]: Mini-class driver interface work: CompBattDisableStatusNotify, CompBattQueryTag, CompBattRecalculateTag, CompBattGetBatteryInformation. Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c [iso-8859-1] Mon Mar 29 04:02:07 2010 @@ -81,12 +81,41 @@ return STATUS_NOT_IMPLEMENTED; } -NTSTATUS +VOID NTAPI CompBattRecalculateTag(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PCOMPBATT_BATTERY_DATA BatteryData; + ULONG Tag; + PLIST_ENTRY ListHead, NextEntry; + if (CompBattDebug & 0x100) DbgPrint("CompBatt: ENTERING CompBattRecalculateTag\n"); + + /* Loop the battery list */ + ExAcquireFastMutex(&DeviceExtension->Lock); + ListHead = &DeviceExtension->BatteryList; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the battery information and check if it has a tag */ + BatteryData = CONTAINING_RECORD(NextEntry, COMPBATT_BATTERY_DATA, BatteryLink); + if (BatteryData->Flags & COMPBATT_TAG_ASSIGNED) + { + /* Generate the next tag and exit */ + Tag = DeviceExtension->NextTag; + DeviceExtension->Flags |= COMPBATT_TAG_ASSIGNED; + DeviceExtension->Tag = Tag; + DeviceExtension->NextTag = Tag + 1; + break; + } + + /* No tag for this device extension, clear it */ + DeviceExtension->Tag = 0; + NextEntry = NextEntry->Flink; + } + + /* We're done */ + ExReleaseFastMutex(&DeviceExtension->Lock); + if (CompBattDebug & 0x100) DbgPrint("CompBatt: EXITING CompBattRecalculateTag\n"); } NTSTATUS @@ -118,16 +147,61 @@ CompBattQueryTag(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, OUT PULONG Tag) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + PAGED_CODE(); + if (CompBattDebug & 0x100) DbgPrint("CompBatt: ENTERING QueryTag\n"); + + /* Was a tag assigned? */ + if (!(DeviceExtension->Flags & COMPBATT_TAG_ASSIGNED)) + { + /* Assign one */ + CompBattRecalculateTag(DeviceExtension); + } + + /* Do we have a tag now? */ + if ((DeviceExtension->Flags & COMPBATT_TAG_ASSIGNED) && (DeviceExtension->Tag)) + { + /* Return the tag */ + *Tag = DeviceExtension->Tag; + Status = STATUS_SUCCESS; + } + else + { + /* No tag */ + *Tag = 0; + Status = STATUS_NO_SUCH_DEVICE; + } + + /* Return status */ + if (CompBattDebug & 0x100) DbgPrint("CompBatt: EXITING QueryTag\n"); + return Status; } NTSTATUS NTAPI CompBattDisableStatusNotify(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PCOMPBATT_BATTERY_DATA BatteryData; + PLIST_ENTRY ListHead, NextEntry; + if (CompBattDebug & 0x100) DbgPrint("CompBatt: ENTERING DisableStatusNotify\n"); + + /* Loop the battery list */ + ExAcquireFastMutex(&DeviceExtension->Lock); + ListHead = &DeviceExtension->BatteryList; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the battery information and clear capacity data */ + BatteryData = CONTAINING_RECORD(NextEntry, COMPBATT_BATTERY_DATA, BatteryLink); + BatteryData->WaitStatus.LowCapacity = 0; + BatteryData->WaitStatus.HighCapacity = 0x7FFFFFFF; + NextEntry = NextEntry->Flink; + } + + /* Done */ + ExReleaseFastMutex(&DeviceExtension->Lock); + if (CompBattDebug & 0x100) DbgPrint("CompBatt: EXITING DisableStatusNotify\n"); + return STATUS_SUCCESS; } NTSTATUS @@ -161,11 +235,158 @@ NTSTATUS NTAPI -CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInformation, +CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInfo, IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status = STATUS_SUCCESS; + BATTERY_QUERY_INFORMATION InputBuffer; + PCOMPBATT_BATTERY_DATA BatteryData; + PLIST_ENTRY ListHead, NextEntry; + if (CompBattDebug & 1) DbgPrint("CompBatt: ENTERING GetBatteryInformation\n"); + + /* Set defaults */ + BatteryInfo->DefaultAlert1 = 0; + BatteryInfo->DefaultAlert2 = 0; + BatteryInfo->CriticalBias = 0; + + /* Loop the battery list */ + ExAcquireFastMutex(&DeviceExtension->Lock); + ListHead = &DeviceExtension->BatteryList; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Try to acquire the remove lock */ + BatteryData = CONTAINING_RECORD(NextEntry, COMPBATT_BATTERY_DATA, BatteryLink); + if (NT_SUCCESS(IoAcquireRemoveLock(&BatteryData->RemoveLock, 0))) + { + /* Now release the device lock since the battery can't go away */ + ExReleaseFastMutex(&DeviceExtension->Lock); + + /* Build the query */ + InputBuffer.BatteryTag = BatteryData->Tag; + InputBuffer.InformationLevel = BatteryInformation; + InputBuffer.AtRate = 0; + + /* Make sure the battery has a tag */ + if (BatteryData->Tag) + { + /* Do we already have the data? */ + if (!(BatteryData->Flags & COMPBATT_BATTERY_INFORMATION_PRESENT)) + { + /* Send the IOCTL to query the information */ + RtlZeroMemory(&BatteryData->BatteryInformation, + sizeof(BatteryData->BatteryInformation)); + Status = BatteryIoctl(IOCTL_BATTERY_QUERY_INFORMATION, + BatteryData->DeviceObject, + &InputBuffer, + sizeof(InputBuffer), + &BatteryData->BatteryInformation, + sizeof(BatteryData->BatteryInformation), + 0); + if (!NT_SUCCESS(Status)) + { + /* Fail if the query had a problem */ + if (Status == STATUS_DEVICE_REMOVED) Status = STATUS_NO_SUCH_DEVICE; + ExAcquireFastMutex(&DeviceExtension->Lock); + IoReleaseRemoveLock(&BatteryData->RemoveLock, 0); + break; + } + + /* Next time we can use the static copy */ + BatteryData->Flags |= COMPBATT_BATTERY_INFORMATION_PRESENT; + if (CompBattDebug & 2) + DbgPrint("CompBattGetBatteryInformation: Read individual BATTERY_INFORMATION\n" + "-------- Capabilities = %x\n-------- Technology = %x\n" + "-------- Chemistry[4] = %x\n-------- DesignedCapacity = %x\n" + "-------- FullChargedCapacity = %x\n-------- DefaultAlert1 = %x\n" + "-------- DefaultAlert2 = %x\n-------- CriticalBias = %x\n" + "-------- CycleCount = %x\n", + BatteryData->BatteryInformation.Capabilities, + BatteryData->BatteryInformation.Technology, + BatteryData->BatteryInformation.Chemistry, + BatteryData->BatteryInformation.DesignedCapacity, + BatteryData->BatteryInformation.FullChargedCapacity, + BatteryData->BatteryInformation.DefaultAlert1, + BatteryData->BatteryInformation.DefaultAlert2, + BatteryData->BatteryInformation.CriticalBias, + BatteryData->BatteryInformation.CycleCount); + } + + /* Combine capabilities */ + BatteryInfo->Capabilities |= BatteryData->BatteryInformation.Capabilities; + + /* Add-on capacity */ + if (BatteryData->BatteryInformation.DesignedCapacity != BATTERY_UNKNOWN_CAPACITY) + { + BatteryInfo->DesignedCapacity += BatteryData->BatteryInformation.DesignedCapacity; + } + + /* Add on fully charged capacity */ + if (BatteryData->BatteryInformation.FullChargedCapacity != BATTERY_UNKNOWN_CAPACITY) + { + BatteryInfo->FullChargedCapacity += BatteryData->BatteryInformation.FullChargedCapacity; + } + + /* Choose the highest alert */ + BatteryInfo->DefaultAlert1 = max(BatteryInfo->DefaultAlert1, + BatteryData->BatteryInformation.DefaultAlert1); + + /* Choose the highest alert */ + BatteryInfo->DefaultAlert2 = max(BatteryInfo->DefaultAlert2, + BatteryData->BatteryInformation.DefaultAlert2); + + /* Choose the highest critical bias */ + BatteryInfo->CriticalBias = max(BatteryInfo->CriticalBias, + BatteryData->BatteryInformation.CriticalBias); + } + + /* Re-acquire the device extension lock and release the remove lock */ + ExAcquireFastMutex(&DeviceExtension->Lock); + IoReleaseRemoveLock(&BatteryData->RemoveLock, 0); + } + + /* Next entry */ + NextEntry = NextEntry->Flink; + } + + /* We are done with the list, check if the information was queried okay */ + ExReleaseFastMutex(&DeviceExtension->Lock); + if (NT_SUCCESS(Status)) + { + /* If there's no fully charged capacity, use the design capacity */ + if (!BatteryInfo->FullChargedCapacity) + { + BatteryInfo->FullChargedCapacity = BatteryInfo->DesignedCapacity; + } + + /* Print out final combined data */ + if (CompBattDebug & 2) + DbgPrint("CompBattGetBatteryInformation: Returning BATTERY_INFORMATION\n" + "-------- Capabilities = %x\n-------- Technology = %x\n" + "-------- Chemistry[4] = %x\n-------- DesignedCapacity = %x\n" + "-------- FullChargedCapacity = %x\n-------- DefaultAlert1 = %x\n" + "-------- DefaultAlert2 = %x\n-------- CriticalBias = %x\n" + "-------- CycleCount = %x\n", + BatteryInfo->Capabilities, + BatteryInfo->Technology, + BatteryInfo->Chemistry, + BatteryInfo->DesignedCapacity, + BatteryInfo->FullChargedCapacity, + BatteryInfo->DefaultAlert1, + BatteryInfo->DefaultAlert2, + BatteryInfo->CriticalBias, + BatteryInfo->CycleCount); + + /* Copy the data into the device extension */ + RtlCopyMemory(&DeviceExtension->BatteryInformation, + BatteryInfo, + sizeof(DeviceExtension->BatteryInformation)); + DeviceExtension->Flags |= COMPBATT_BATTERY_INFORMATION_PRESENT; + } + + /* We are done */ + if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING GetBatteryInformation\n"); + return Status; } NTSTATUS @@ -209,13 +430,12 @@ DriverObject->DriverExtension->AddDevice = CompBattAddDevice; /* Register other handlers */ - DriverObject->MajorFunction[0] = CompBattOpenClose; - DriverObject->MajorFunction[2] = CompBattOpenClose; - DriverObject->MajorFunction[14] = CompBattIoctl; - DriverObject->MajorFunction[22] = CompBattPowerDispatch; - DriverObject->MajorFunction[23] = CompBattSystemControl; - DriverObject->MajorFunction[27] = CompBattPnpDispatch; - + DriverObject->MajorFunction[IRP_MJ_CREATE] = CompBattOpenClose; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = CompBattOpenClose; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = CompBattIoctl; + DriverObject->MajorFunction[IRP_MJ_POWER] = CompBattPowerDispatch; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = CompBattSystemControl; + DriverObject->MajorFunction[IRP_MJ_PNP] = CompBattPnpDispatch; return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h [iso-8859-1] Mon Mar 29 04:02:07 2010 @@ -11,6 +11,9 @@ #include <batclass.h> #include <debug.h> #include <wdmguid.h> + +#define COMPBATT_BATTERY_INFORMATION_PRESENT 0x04 +#define COMPBATT_TAG_ASSIGNED 0x80 typedef struct _COMPBATT_BATTERY_DATA { @@ -137,6 +140,18 @@ OUT PFILE_OBJECT *FileObject, OUT PDEVICE_OBJECT *DeviceObject ); + +NTSTATUS +NTAPI +BatteryIoctl( + IN ULONG IoControlCode, + IN PDEVICE_OBJECT DeviceObject, + IN PVOID InputBuffer, + IN ULONG InputBufferLength, + IN PVOID OutputBuffer, + IN ULONG OutputBufferLength, + IN BOOLEAN InternalDeviceIoControl +); extern ULONG CompBattDebug; Modified: trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] Mon Mar 29 04:02:07 2010 @@ -59,6 +59,9 @@ ExReleaseFastMutex(&DeviceExtension->Lock); return BatteryData; } + + /* Next */ + NextEntry = NextEntry->Flink; } /* Done */ @@ -92,6 +95,9 @@ Found = TRUE; break; } + + /* Next */ + NextEntry = NextEntry->Flink; } /* Release the lock and return search status */

1 0

[tkreuzer] 46542: Reintegrate header branch part 1/x DDKAPI -> NTAPI
by tkreuzer＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: tkreuzer Date: Mon Mar 29 03:51:11 2010 New Revision: 46542 URL: http://svn.reactos.org/svn/reactos?rev=46542&view=rev Log: Reintegrate header branch part 1/x DDKAPI -> NTAPI Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c trunk/reactos/drivers/battery/battc/battc.c trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/config.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/srb.h trunk/reactos/drivers/storage/scsiport/stubs.c trunk/reactos/drivers/video/displays/vga/vgaddi.h trunk/reactos/include/ddk/afilter.h trunk/reactos/include/ddk/hidclass.h trunk/reactos/include/ddk/hidpi.h trunk/reactos/include/ddk/mcd.h trunk/reactos/include/ddk/miniport.h trunk/reactos/include/ddk/minitape.h trunk/reactos/include/ddk/ndis.h trunk/reactos/include/ddk/ntagp.h trunk/reactos/include/ddk/ntdd8042.h trunk/reactos/include/ddk/ntpoapi.h trunk/reactos/include/ddk/parallel.h trunk/reactos/include/ddk/scsiwmi.h trunk/reactos/include/ddk/smbus.h trunk/reactos/include/ddk/srb.h trunk/reactos/include/ddk/storport.h trunk/reactos/include/ddk/tdikrnl.h trunk/reactos/include/ddk/upssvc.h trunk/reactos/include/ddk/video.h trunk/reactos/include/ddk/videoagp.h trunk/reactos/include/psdk/batclass.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… Modified: trunk/reactos/drivers/battery/battc/battc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/battc/batt… Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/scsiport/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/include/ddk/afilter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/afilter.h?rev=… Modified: trunk/reactos/include/ddk/hidclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/hidclass.h?rev… Modified: trunk/reactos/include/ddk/hidpi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/hidpi.h?rev=46… Modified: trunk/reactos/include/ddk/mcd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/mcd.h?rev=4654… Modified: trunk/reactos/include/ddk/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/miniport.h?rev… Modified: trunk/reactos/include/ddk/minitape.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/minitape.h?rev… Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=465… Modified: trunk/reactos/include/ddk/ntagp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntagp.h?rev=46… Modified: trunk/reactos/include/ddk/ntdd8042.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdd8042.h?rev… Modified: trunk/reactos/include/ddk/ntpoapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntpoapi.h?rev=… Modified: trunk/reactos/include/ddk/parallel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/parallel.h?rev… Modified: trunk/reactos/include/ddk/scsiwmi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/scsiwmi.h?rev=… Modified: trunk/reactos/include/ddk/smbus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/smbus.h?rev=46… Modified: trunk/reactos/include/ddk/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/srb.h?rev=4654… Modified: trunk/reactos/include/ddk/storport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/storport.h?rev… Modified: trunk/reactos/include/ddk/tdikrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/tdikrnl.h?rev=… Modified: trunk/reactos/include/ddk/upssvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/upssvc.h?rev=4… Modified: trunk/reactos/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/video.h?rev=46… Modified: trunk/reactos/include/ddk/videoagp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/videoagp.h?rev… Modified: trunk/reactos/include/psdk/batclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/batclass.h?re…

1 0

[sir_richard] 46541: [COMPBATT]: Helper code, CompBattGetDeviceObjectPointer and BatteryIoctl.
by sir_richard＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: sir_richard Date: Mon Mar 29 02:10:56 2010 New Revision: 46541 URL: http://svn.reactos.org/svn/reactos?rev=46541&view=rev Log: [COMPBATT]: Helper code, CompBattGetDeviceObjectPointer and BatteryIoctl. Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h trunk/reactos/drivers/bus/acpi/compbatt/compmisc.c trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h [iso-8859-1] Mon Mar 29 02:10:56 2010 @@ -132,7 +132,7 @@ NTSTATUS NTAPI CompBattGetDeviceObjectPointer( - IN PCUNICODE_STRING DeviceName, + IN PUNICODE_STRING DeviceName, IN ACCESS_MASK DesiredAccess, OUT PFILE_OBJECT *FileObject, OUT PDEVICE_OBJECT *DeviceObject Modified: trunk/reactos/drivers/bus/acpi/compbatt/compmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/compmisc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/compmisc.c [iso-8859-1] Mon Mar 29 02:10:56 2010 @@ -22,19 +22,102 @@ IN ULONG OutputBufferLength, IN BOOLEAN InternalDeviceIoControl) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + IO_STATUS_BLOCK IoStatusBlock; + KEVENT Event; + NTSTATUS Status; + PIRP Irp; + PAGED_CODE(); + if (CompBattDebug & 0x100) DbgPrint("CompBatt: ENTERING BatteryIoctl\n"); + + /* Initialize the event and IRP */ + KeInitializeEvent(&Event, SynchronizationEvent, 0); + Irp = IoBuildDeviceIoControlRequest(IoControlCode, + DeviceObject, + InputBuffer, + InputBufferLength, + OutputBuffer, + OutputBufferLength, + InternalDeviceIoControl, + &Event, + &IoStatusBlock); + if (Irp) + { + /* Call the class driver miniport */ + Status = IofCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait for result */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatusBlock.Status; + } + + /* Print failure */ + if (!(NT_SUCCESS(Status)) && (CompBattDebug & 8)) + DbgPrint("BatteryIoctl: Irp failed - %x\n", Status); + + /* Done */ + if (CompBattDebug & 0x100) DbgPrint("CompBatt: EXITING BatteryIoctl\n"); + } + else + { + /* Out of memory */ + if (CompBattDebug & 8) DbgPrint("BatteryIoctl: couldn't create Irp\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + } + + /* Return status */ + return Status; } NTSTATUS NTAPI -CompBattGetDeviceObjectPointer(IN PCUNICODE_STRING DeviceName, +CompBattGetDeviceObjectPointer(IN PUNICODE_STRING DeviceName, IN ACCESS_MASK DesiredAccess, OUT PFILE_OBJECT *FileObject, OUT PDEVICE_OBJECT *DeviceObject) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + PFILE_OBJECT LocalFileObject; + HANDLE DeviceHandle; + PAGED_CODE(); + + /* Open a file object handle to the device */ + InitializeObjectAttributes(&ObjectAttributes, DeviceName, 0, NULL, NULL); + Status = ZwCreateFile(&DeviceHandle, + DesiredAccess, + &ObjectAttributes, + &IoStatusBlock, + NULL, + 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN, + 0, + NULL, + 0); + if (NT_SUCCESS(Status)) + { + /* Reference the file object */ + Status = ObReferenceObjectByHandle(DeviceHandle, + 0, + IoFileObjectType, + KernelMode, + (PVOID)&LocalFileObject, + NULL); + if (NT_SUCCESS(Status)) + { + /* Return the FO and the associated DO */ + *FileObject = LocalFileObject; + *DeviceObject = IoGetRelatedDeviceObject(LocalFileObject); + } + + /* Close the handle */ + ZwClose(DeviceHandle); + } + + /* Return status */ + return Status; } /* EOF */ Modified: trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] Mon Mar 29 02:10:56 2010 @@ -102,7 +102,7 @@ NTSTATUS NTAPI -CompBattAddNewBattery(IN PCUNICODE_STRING BatteryName, +CompBattAddNewBattery(IN PUNICODE_STRING BatteryName, IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { NTSTATUS Status = STATUS_SUCCESS;

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2010