Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 46014: [NTIFS] - Group related definitions - Add several Rtl* function declarations (See diff for details) - Add MAX_UNICODE_STACK_BUFFER_LENGTH definition - RtlConvertSidToUnicodeString : DestinationString -> UnicodeString
by akhaldi＠svn.reactos.org 08 Mar '10

08 Mar '10

Author: akhaldi Date: Mon Mar 8 22:38:43 2010 New Revision: 46014 URL: http://svn.reactos.org/svn/reactos?rev=46014&view=rev Log: [NTIFS] - Group related definitions - Add several Rtl* function declarations (See diff for details) - Add MAX_UNICODE_STACK_BUFFER_LENGTH definition - RtlConvertSidToUnicodeString : DestinationString -> UnicodeString Modified: branches/header-work/include/ddk/ntifs.h Modified: branches/header-work/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntifs.h… ============================================================================== --- branches/header-work/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntifs.h [iso-8859-1] Mon Mar 8 22:38:43 2010 @@ -1406,6 +1406,84 @@ IN PSID_IDENTIFIER_AUTHORITY IdentifierAuthority, IN UCHAR SubAuthorityCount); +NTSYSAPI +PULONG +NTAPI +RtlSubAuthoritySid( + IN PSID Sid, + IN ULONG SubAuthority); + +NTSYSAPI +ULONG +NTAPI +RtlLengthSid( + IN PSID Sid); + +NTSYSAPI +NTSTATUS +NTAPI +RtlCopySid( + IN ULONG Length, + IN PSID Destination, + IN PSID Source); + +NTSYSAPI +NTSTATUS +NTAPI +RtlConvertSidToUnicodeString( + IN OUT PUNICODE_STRING UnicodeString, + IN PSID Sid, + IN BOOLEAN AllocateDestinationString); + +NTSYSAPI +VOID +NTAPI +RtlCopyLuid( + OUT PLUID DestinationLuid, + IN PLUID SourceLuid); + +NTSYSAPI +NTSTATUS +NTAPI +RtlCreateAcl( + OUT PACL Acl, + IN ULONG AclLength, + IN ULONG AclRevision); + +NTSYSAPI +NTSTATUS +NTAPI +RtlAddAce( + IN OUT PACL Acl, + IN ULONG AceRevision, + IN ULONG StartingAceIndex, + IN PVOID AceList, + IN ULONG AceListLength); + +NTSYSAPI +NTSTATUS +NTAPI +RtlDeleteAce( + IN OUT PACL Acl, + IN ULONG AceIndex); + +NTSYSAPI +NTSTATUS +NTAPI +RtlGetAce( + IN PACL Acl, + IN ULONG AceIndex, + OUT PVOID *Ace); + +NTSYSAPI +NTSTATUS +NTAPI +RtlAddAccessAllowedAce( + IN OUT PACL Acl, + IN ULONG AceRevision, + IN ACCESS_MASK AccessMask, + IN PSID Sid); + #endif #if (NTDDI_VERSION >= NTDDI_WINXP) @@ -1557,6 +1635,12 @@ PSID_IDENTIFIER_AUTHORITY NTAPI RtlIdentifierAuthoritySid( + IN PSID Sid); + +NTSYSAPI +PUCHAR +NTAPI +RtlSubAuthorityCountSid( IN PSID Sid); #endif @@ -1623,6 +1707,19 @@ #endif +#if (NTDDI_VERSION >= NTDDI_WS03SP1) + +NTSYSAPI +NTSTATUS +NTAPI +RtlGetSaclSecurityDescriptor( + IN PSECURITY_DESCRIPTOR SecurityDescriptor, + OUT PBOOLEAN SaclPresent, + OUT PACL *Sacl, + OUT PBOOLEAN SaclDefaulted); + +#endif + #if (NTDDI_VERSION >= NTDDI_VISTA) NTSYSAPI @@ -1674,6 +1771,14 @@ OUT PWSTR DestinationString, IN OUT PLONG DestinationStringLength); +NTSYSAPI +NTSTATUS +NTAPI +RtlCreateServiceSid( + IN PUNICODE_STRING ServiceName, + OUT PSID ServiceSid, + IN OUT PULONG ServiceSidLength); + #endif #if (NTDDI_VERSION >= NTDDI_WIN7) @@ -1697,6 +1802,24 @@ OUT PULONG UnicodeStringActualByteCount, IN PCCH UTF8StringSource, IN ULONG UTF8StringByteCount); + +NTSYSAPI +NTSTATUS +NTAPI +RtlReplaceSidInSd( + IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, + IN PSID OldSid, + IN PSID NewSid, + OUT ULONG *NumChanges); + +NTSYSAPI +NTSTATUS +NTAPI +RtlCreateVirtualAccountSid( + IN PCUNICODE_STRING Name, + IN ULONG BaseSubAuthority, + OUT PSID Sid, + IN OUT PULONG SidLength); #endif @@ -1860,6 +1983,8 @@ #define RtlOffsetToPointer(B,O) ((PCHAR)( ((PCHAR)(B)) + ((ULONG_PTR)(O)) )) #define RtlPointerToOffset(B,P) ((ULONG)( ((PCHAR)(P)) - ((PCHAR)(B)) )) + +#define MAX_UNICODE_STACK_BUFFER_LENGTH 256 #pragma pack(push,4) @@ -5983,24 +6108,6 @@ ); NTSYSAPI -NTSTATUS -NTAPI -RtlConvertSidToUnicodeString ( - OUT PUNICODE_STRING DestinationString, - IN PSID Sid, - IN BOOLEAN AllocateDestinationString -); - -NTSYSAPI -NTSTATUS -NTAPI -RtlCopySid ( - IN ULONG Length, - IN PSID Destination, - IN PSID Source -); - -NTSYSAPI VOID NTAPI RtlGenerate8dot3Name ( @@ -6041,13 +6148,6 @@ NTSYSAPI ULONG NTAPI -RtlLengthSid ( - IN PSID Sid -); - -NTSYSAPI -ULONG -NTAPI RtlNtStatusToDosError ( IN NTSTATUS Status ); @@ -6086,21 +6186,6 @@ IN BOOLEAN SaclPresent, IN PACL Sacl, IN BOOLEAN SaclDefaulted -); - -NTSYSAPI -PUCHAR -NTAPI -RtlSubAuthorityCountSid ( - IN PSID Sid -); - -NTSYSAPI -PULONG -NTAPI -RtlSubAuthoritySid ( - IN PSID Sid, - IN ULONG SubAuthority ); NTSYSAPI

1 0

[jimtabor] 46013: [User32] - David Hedberg Fix return value for EDIT_EM_Scroll and case where EM_SCROLL with page down results in trying to scroll up past the beginning. Sync to wine 1.1.40.
by jimtabor＠svn.reactos.org 08 Mar '10

08 Mar '10

Author: jimtabor Date: Mon Mar 8 22:24:47 2010 New Revision: 46013 URL: http://svn.reactos.org/svn/reactos?rev=46013&view=rev Log: [User32] - David Hedberg Fix return value for EDIT_EM_Scroll and case where EM_SCROLL with page down results in trying to scroll up past the beginning. Sync to wine 1.1.40. Modified: trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Mon Mar 8 22:24:47 2010 @@ -1648,13 +1648,16 @@ INT vlc = get_vertical_line_count(es); /* check if we are going to move too far */ if(es->y_offset + dy > es->line_count - vlc) - dy = es->line_count - vlc - es->y_offset; + dy = max(es->line_count - vlc, 0) - es->y_offset; /* Notification is done in EDIT_EM_LineScroll */ - if(dy) + if(dy) { EDIT_EM_LineScroll(es, 0, dy); - } - return MAKELONG((SHORT)dy, (BOOL)TRUE); + return MAKELONG((SHORT)dy, (BOOL)TRUE); + } + + } + return (LRESULT)FALSE; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Mar 8 22:24:47 2010 @@ -232,7 +232,7 @@ User32 - reactos/dll/win32/user32/controls/button.c # Synced to Wine-1_1_39 reactos/dll/win32/user32/controls/combo.c # Synced to Wine-1_1_39 - reactos/dll/win32/user32/controls/edit.c # Synced to Wine-1_1_39 + reactos/dll/win32/user32/controls/edit.c # Synced to Wine-1_1_40 reactos/dll/win32/user32/controls/icontitle.c # Synced to Wine-1_1_39 reactos/dll/win32/user32/controls/listbox.c # Synced to Wine-1_1_39 reactos/dll/win32/user32/controls/scrollbar.c # Forked

1 0

[jimtabor] 46012: - [User32_winetest] - Msg : Remove more tests from service. test_timers crashed on a callback which passed months ago. The rest are related to TrackMouseEvent and capture.
by jimtabor＠svn.reactos.org 08 Mar '10

08 Mar '10

Author: jimtabor Date: Mon Mar 8 22:20:18 2010 New Revision: 46012 URL: http://svn.reactos.org/svn/reactos?rev=46012&view=rev Log: - [User32_winetest] - Msg : Remove more tests from service. test_timers crashed on a callback which passed months ago. The rest are related to TrackMouseEvent and capture. Modified: trunk/rostests/winetests/user32/msg.c Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Mon Mar 8 22:20:18 2010 @@ -12424,7 +12424,7 @@ test_interthread_messages(); test_message_conversion(); test_accelerators(); - test_timers(); +// test_timers(); test_timers_no_wnd(); if (hCBT_hook) test_set_hook(); test_DestroyWindow(); @@ -12434,17 +12434,17 @@ test_quit_message(); test_SetActiveWindow(); - if (!pTrackMouseEvent) +// if (!pTrackMouseEvent) win_skip("TrackMouseEvent is not available\n"); - else - test_TrackMouseEvent(); +// else +// test_TrackMouseEvent(); test_SetWindowRgn(); test_sys_menu(); test_dialog_messages(); test_nullCallback(); test_dbcs_wm_char(); - test_menu_messages(); +// test_menu_messages(); test_paintingloop(); test_defwinproc(); test_clipboard_viewers();

1 0

[cgutman] 46011: [CMBATT] - Add initial cmbatt driver which mostly stubs - All it does right now is register a battery device with the battc driver [BATTC] - Add a nearly complete battc driver (the only stuff missing is WMI) - Tested with our stubbed cmbatt driver but testing on Windows would be nice too [BATTERY.INF] - Added battery.inf to install battery devices [MISC] - Add cmbatt.sys, battc.sys, and battery.inf to bootcd - We still need to implement compbatt.sys - PS: Janderwald, you stole m
by cgutman＠svn.reactos.org 08 Mar '10

08 Mar '10

Author: cgutman Date: Mon Mar 8 22:09:25 2010 New Revision: 46011 URL: http://svn.reactos.org/svn/reactos?rev=46011&view=rev Log: [CMBATT] - Add initial cmbatt driver which mostly stubs - All it does right now is register a battery device with the battc driver [BATTC] - Add a nearly complete battc driver (the only stuff missing is WMI) - Tested with our stubbed cmbatt driver but testing on Windows would be nice too [BATTERY.INF] - Added battery.inf to install battery devices [MISC] - Add cmbatt.sys, battc.sys, and battery.inf to bootcd - We still need to implement compbatt.sys - PS: Janderwald, you stole my commit number ;) Added: trunk/reactos/drivers/battery/ trunk/reactos/drivers/battery/battc/ trunk/reactos/drivers/battery/battc/battc.c (with props) trunk/reactos/drivers/battery/battc/battc.h (with props) trunk/reactos/drivers/battery/battc/battc.rbuild (with props) trunk/reactos/drivers/battery/battc/battc.rc (with props) trunk/reactos/drivers/battery/battc/battc.spec (with props) trunk/reactos/drivers/battery/cmbatt/ trunk/reactos/drivers/battery/cmbatt/cmbatt.c (with props) trunk/reactos/drivers/battery/cmbatt/cmbatt.h (with props) trunk/reactos/drivers/battery/cmbatt/cmbatt.rbuild (with props) trunk/reactos/drivers/battery/cmbatt/cmbatt.rc (with props) trunk/reactos/drivers/battery/cmbatt/miniclass.c (with props) trunk/reactos/drivers/battery/directory.rbuild (with props) trunk/reactos/media/inf/battery.inf Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/drivers/drivers.rbuild Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Mar 8 22:09:25 2010 @@ -482,6 +482,9 @@ drivers\base\null\null.sys 2 drivers\base\nmidebug\nmidebug.sys 2 +drivers\battery\cmbatt\cmbatt.sys 2 +drivers\battery\battc\battc.sys 2 + drivers\bus\isapnp\isapnp.sys 2 drivers\directx\dxapi\dxapi.sys 2 @@ -628,6 +631,7 @@ media\drivers\etc\services 5 media\inf\audio.inf 6 media\inf\acpi.inf 6 +media\inf\battery.inf 6 media\inf\cdrom.inf 6 media\inf\cpu.inf 6 media\inf\display.inf 6 Added: trunk/reactos/drivers/battery/battc/battc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/battc/batt… ============================================================================== --- trunk/reactos/drivers/battery/battc/battc.c (added) +++ trunk/reactos/drivers/battery/battc/battc.c [iso-8859-1] Mon Mar 8 22:09:25 2010 @@ -1,0 +1,373 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/battery/battc/battc.c + * PURPOSE: Battery Class Driver + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include <battc.h> + +#define NDEBUG +#include <debug.h> + +NTSTATUS +NTAPI +DriverEntry(PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +{ + DPRINT("Battery class driver initialized\n"); + + return STATUS_SUCCESS; +} + +BCLASSAPI +NTSTATUS +DDKAPI +BatteryClassUnload(PVOID ClassData) +{ + PBATTERY_CLASS_DATA BattClass = ClassData; + + DPRINT("Battery 0x%x is being unloaded\n"); + + if (BattClass->InterfaceName.Length != 0) + { + IoSetDeviceInterfaceState(&BattClass->InterfaceName, FALSE); + RtlFreeUnicodeString(&BattClass->InterfaceName); + } + + ExFreePoolWithTag(BattClass, + BATTERY_CLASS_DATA_TAG); + + return STATUS_SUCCESS; +} + +BCLASSAPI +NTSTATUS +DDKAPI +BatteryClassSystemControl(PVOID ClassData, + PWMILIB_CONTEXT WmiLibContext, + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PSYSCTL_IRP_DISPOSITION Disposition) +{ + NTSTATUS Status; + + UNIMPLEMENTED + + /* FIXME: Uncomment when WmiCompleteRequest is implemented */ +#if 0 + Status = STATUS_WMI_GUID_NOT_FOUND; + WmiCompleteRequest(DeviceObject, + Irp, + Status, + 0, + IO_NO_INCREMENT); +#else + Irp->IoStatus.Status = Status = STATUS_WMI_GUID_NOT_FOUND; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); +#endif + + return Status; +} + +BCLASSAPI +NTSTATUS +DDKAPI +BatteryClassQueryWmiDataBlock(PVOID ClassData, + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + ULONG GuidIndex, + PULONG InstanceLengthArray, + ULONG OutBufferSize, + PUCHAR Buffer) +{ + UNIMPLEMENTED + + return STATUS_WMI_GUID_NOT_FOUND; +} + +BCLASSAPI +NTSTATUS +DDKAPI +BatteryClassStatusNotify(PVOID ClassData) +{ + PBATTERY_CLASS_DATA BattClass = ClassData; + PBATTERY_WAIT_STATUS BattWait = BattClass->EventTriggerContext; + BATTERY_STATUS BattStatus; + NTSTATUS Status; + + DPRINT("Received battery status notification from 0x%x\n", ClassData); + + ExAcquireFastMutex(&BattClass->Mutex); + if (!BattClass->Waiting) + { + ExReleaseFastMutex(&BattClass->Mutex); + return STATUS_SUCCESS; + } + + switch (BattClass->EventTrigger) + { + case EVENT_BATTERY_TAG: + ExReleaseFastMutex(&BattClass->Mutex); + DPRINT1("Waiting for battery is UNIMPLEMENTED!\n"); + break; + + case EVENT_BATTERY_STATUS: + ExReleaseFastMutex(&BattClass->Mutex); + Status = BattClass->MiniportInfo.QueryStatus(BattClass->MiniportInfo.Context, + BattWait->BatteryTag, + &BattStatus); + if (!NT_SUCCESS(Status)) + return Status; + + ExAcquireFastMutex(&BattClass->Mutex); + + if (!(BattWait->PowerState & BattStatus.PowerState) || + (BattWait->HighCapacity > BattStatus.Capacity) || + (BattWait->LowCapacity < BattStatus.Capacity)) + { + KeSetEvent(&BattClass->WaitEvent, IO_NO_INCREMENT, FALSE); + } + + ExReleaseFastMutex(&BattClass->Mutex); + break; + + default: + ExReleaseFastMutex(&BattClass->Mutex); + ASSERT(FALSE); + break; + } + + return STATUS_SUCCESS; +} + +BCLASSAPI +NTSTATUS +DDKAPI +BatteryClassInitializeDevice(PBATTERY_MINIPORT_INFO MiniportInfo, + PVOID *ClassData) +{ + NTSTATUS Status; + PBATTERY_CLASS_DATA BattClass = ExAllocatePoolWithTag(NonPagedPool, + sizeof(BATTERY_CLASS_DATA), + BATTERY_CLASS_DATA_TAG); + + if (!BattClass) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlZeroMemory(BattClass, sizeof(BATTERY_CLASS_DATA)); + + RtlCopyMemory(&BattClass->MiniportInfo, + MiniportInfo, + sizeof(BattClass->MiniportInfo)); + + KeInitializeEvent(&BattClass->WaitEvent, SynchronizationEvent, FALSE); + + ExInitializeFastMutex(&BattClass->Mutex); + + Status = IoRegisterDeviceInterface(MiniportInfo->Pdo, + &GUID_DEVICE_BATTERY, + NULL, + &BattClass->InterfaceName); + if (NT_SUCCESS(Status)) + { + DPRINT("Initialized battery interface: %wZ\n", &BattClass->InterfaceName); + IoSetDeviceInterfaceState(&BattClass->InterfaceName, TRUE); + } + else + { + DPRINT1("IoRegisterDeviceInterface failed (0x%x)\n", Status); + } + + *ClassData = BattClass; + + return STATUS_SUCCESS; +} + +BCLASSAPI +NTSTATUS +DDKAPI +BatteryClassIoctl(PVOID ClassData, + PIRP Irp) +{ + PBATTERY_CLASS_DATA BattClass = ClassData; + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + NTSTATUS Status; + ULONG WaitTime; + PBATTERY_WAIT_STATUS BattWait; + PBATTERY_QUERY_INFORMATION BattQueryInfo; + PBATTERY_SET_INFORMATION BattSetInfo; + LARGE_INTEGER Timeout; + PBATTERY_STATUS BattStatus; + BATTERY_NOTIFY BattNotify; + + Irp->IoStatus.Information = 0; + + DPRINT("Received IOCTL %x for 0x%x\n", IrpSp->Parameters.DeviceIoControl.IoControlCode, + ClassData); + + switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_BATTERY_QUERY_TAG: + if (IrpSp->Parameters.DeviceIoControl.InputBufferLength < sizeof(ULONG) || + IrpSp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) + { + Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + WaitTime = *(PULONG)Irp->AssociatedIrp.SystemBuffer; + + Timeout.QuadPart = Int32x32To64(WaitTime, -1000); + + Status = BattClass->MiniportInfo.QueryTag(BattClass->MiniportInfo.Context, + (PULONG)Irp->AssociatedIrp.SystemBuffer); + if (!NT_SUCCESS(Status)) + { + ExAcquireFastMutex(&BattClass->Mutex); + BattClass->EventTrigger = EVENT_BATTERY_TAG; + BattClass->Waiting = TRUE; + ExReleaseFastMutex(&BattClass->Mutex); + + Status = KeWaitForSingleObject(&BattClass->WaitEvent, + Executive, + KernelMode, + FALSE, + WaitTime != -1 ? &Timeout : NULL); + + ExAcquireFastMutex(&BattClass->Mutex); + BattClass->Waiting = FALSE; + ExReleaseFastMutex(&BattClass->Mutex); + + if (Status == STATUS_SUCCESS) + { + Status = BattClass->MiniportInfo.QueryTag(BattClass->MiniportInfo.Context, + (PULONG)Irp->AssociatedIrp.SystemBuffer); + if (NT_SUCCESS(Status)) + Irp->IoStatus.Information = sizeof(ULONG); + } + else + { + Status = STATUS_NO_SUCH_DEVICE; + } + } + else + Irp->IoStatus.Information = sizeof(ULONG); + break; + + case IOCTL_BATTERY_QUERY_STATUS: + if (IrpSp->Parameters.DeviceIoControl.InputBufferLength < sizeof(*BattWait) || + IrpSp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(BATTERY_STATUS)) + { + Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + BattWait = Irp->AssociatedIrp.SystemBuffer; + + Timeout.QuadPart = Int32x32To64(BattWait->Timeout, -1000); + + Status = BattClass->MiniportInfo.QueryStatus(BattClass->MiniportInfo.Context, + BattWait->BatteryTag, + (PBATTERY_STATUS)Irp->AssociatedIrp.SystemBuffer); + + BattStatus = Irp->AssociatedIrp.SystemBuffer; + + if (!NT_SUCCESS(Status) || + ((BattWait->PowerState & BattStatus->PowerState) && + (BattWait->HighCapacity <= BattStatus->Capacity) && + (BattWait->LowCapacity >= BattStatus->Capacity))) + { + BattNotify.PowerState = BattWait->PowerState; + BattNotify.HighCapacity = BattWait->HighCapacity; + BattNotify.LowCapacity = BattWait->LowCapacity; + + BattClass->MiniportInfo.SetStatusNotify(BattClass->MiniportInfo.Context, + BattWait->BatteryTag, + &BattNotify); + + ExAcquireFastMutex(&BattClass->Mutex); + BattClass->EventTrigger = EVENT_BATTERY_STATUS; + BattClass->EventTriggerContext = BattWait; + BattClass->Waiting = TRUE; + ExReleaseFastMutex(&BattClass->Mutex); + + Status = KeWaitForSingleObject(&BattClass->WaitEvent, + Executive, + KernelMode, + FALSE, + BattWait->Timeout != -1 ? &Timeout : NULL); + + ExAcquireFastMutex(&BattClass->Mutex); + BattClass->Waiting = FALSE; + ExReleaseFastMutex(&BattClass->Mutex); + + BattClass->MiniportInfo.DisableStatusNotify(BattClass->MiniportInfo.Context); + + if (Status == STATUS_SUCCESS) + { + Status = BattClass->MiniportInfo.QueryStatus(BattClass->MiniportInfo.Context, + BattWait->BatteryTag, + (PBATTERY_STATUS)Irp->AssociatedIrp.SystemBuffer); + if (NT_SUCCESS(Status)) + Irp->IoStatus.Information = sizeof(ULONG); + } + else + { + Status = STATUS_NO_SUCH_DEVICE; + } + } + else + Irp->IoStatus.Information = sizeof(BATTERY_STATUS); + break; + + case IOCTL_BATTERY_QUERY_INFORMATION: + if (IrpSp->Parameters.DeviceIoControl.InputBufferLength < sizeof(*BattQueryInfo)) + { + Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + BattQueryInfo = Irp->AssociatedIrp.SystemBuffer; + + Status = BattClass->MiniportInfo.QueryInformation(BattClass->MiniportInfo.Context, + BattQueryInfo->BatteryTag, + BattQueryInfo->InformationLevel, + BattQueryInfo->AtRate, + Irp->AssociatedIrp.SystemBuffer, + IrpSp->Parameters.DeviceIoControl.OutputBufferLength, + &Irp->IoStatus.Information); + if (!NT_SUCCESS(Status)) + DPRINT1("QueryInformation failed (0x%x)\n", Status); + break; + case IOCTL_BATTERY_SET_INFORMATION: + if (IrpSp->Parameters.DeviceIoControl.InputBufferLength < sizeof(*BattSetInfo)) + { + Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + BattSetInfo = Irp->AssociatedIrp.SystemBuffer; + + Status = BattClass->MiniportInfo.SetInformation(BattClass->MiniportInfo.Context, + BattSetInfo->BatteryTag, + BattSetInfo->InformationLevel, + BattSetInfo->Buffer); + if (!NT_SUCCESS(Status)) + DPRINT1("SetInformation failed (0x%x)\n", Status); + break; + + default: + DPRINT1("Received unsupported IRP %x\n", IrpSp->Parameters.DeviceIoControl.IoControlCode); + /* Do NOT complete the irp */ + return STATUS_NOT_SUPPORTED; + } + + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} Propchange: trunk/reactos/drivers/battery/battc/battc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/battery/battc/battc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/battc/batt… ============================================================================== --- trunk/reactos/drivers/battery/battc/battc.h (added) +++ trunk/reactos/drivers/battery/battc/battc.h [iso-8859-1] Mon Mar 8 22:09:25 2010 @@ -1,0 +1,30 @@ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: drivers/battery/battc/battc.h +* PURPOSE: Battery Class Driver +* PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) +*/ + +#pragma once + +#include <ntddk.h> +#include <initguid.h> +#include <batclass.h> + +typedef struct _BATTERY_CLASS_DATA { + BATTERY_MINIPORT_INFO MiniportInfo; + KEVENT WaitEvent; + BOOLEAN Waiting; + FAST_MUTEX Mutex; + UCHAR EventTrigger; + PVOID EventTriggerContext; + UNICODE_STRING InterfaceName; +} BATTERY_CLASS_DATA, *PBATTERY_CLASS_DATA; + +/* Memory tags */ +#define BATTERY_CLASS_DATA_TAG 'CtaB' + +/* Event triggers */ +#define EVENT_BATTERY_TAG 0x01 +#define EVENT_BATTERY_STATUS 0x02 Propchange: trunk/reactos/drivers/battery/battc/battc.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/battery/battc/battc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/battc/batt… ============================================================================== --- trunk/reactos/drivers/battery/battc/battc.rbuild (added) +++ trunk/reactos/drivers/battery/battc/battc.rbuild [iso-8859-1] Mon Mar 8 22:09:25 2010 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="battc" type="kernelmodedriver" installbase="system32/drivers" installname="battc.sys"> + <library>ntoskrnl</library> + <library>hal</library> + <importlibrary definition="battc.spec"/> + <include base="battc">.</include> + <file>battc.c</file> + <file>battc.rc</file> +</module> Propchange: trunk/reactos/drivers/battery/battc/battc.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/battery/battc/battc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/battc/batt… ============================================================================== --- trunk/reactos/drivers/battery/battc/battc.rc (added) +++ trunk/reactos/drivers/battery/battc/battc.rc [iso-8859-1] Mon Mar 8 22:09:25 2010 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Battery Class Driver\0" +#define REACTOS_STR_INTERNAL_NAME "battc\0" +#define REACTOS_STR_ORIGINAL_FILENAME "battc.sys\0" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/battery/battc/battc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/battery/battc/battc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/battc/batt… ============================================================================== --- trunk/reactos/drivers/battery/battc/battc.spec (added) +++ trunk/reactos/drivers/battery/battc/battc.spec [iso-8859-1] Mon Mar 8 22:09:25 2010 @@ -1,0 +1,6 @@ +@ stdcall BatteryClassInitializeDevice(ptr ptr) +@ stdcall BatteryClassIoctl(ptr ptr) +@ stdcall BatteryClassQueryWmiDataBlock(ptr ptr ptr long ptr long ptr) +@ stdcall BatteryClassStatusNotify(ptr) +@ stdcall BatteryClassSystemControl(ptr ptr ptr ptr ptr) +@ stdcall BatteryClassUnload(ptr) Propchange: trunk/reactos/drivers/battery/battc/battc.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/battery/cmbatt/cmbatt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/cmbatt/cmb… ============================================================================== --- trunk/reactos/drivers/battery/cmbatt/cmbatt.c (added) +++ trunk/reactos/drivers/battery/cmbatt/cmbatt.c [iso-8859-1] Mon Mar 8 22:09:25 2010 @@ -1,0 +1,188 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/battery/cmbatt/cmbatt.c + * PURPOSE: Control Method Battery Miniclass Driver + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include <cmbatt.h> + +#define NDEBUG +#include <debug.h> + +LIST_ENTRY BatteryList; +KSPIN_LOCK BatteryListLock; + +VOID +NTAPI +CmBattUnload(PDRIVER_OBJECT DriverObject) +{ + DPRINT("Control method battery miniclass driver unloaded\n"); +} + +NTSTATUS +NTAPI +CmBattDeviceControl(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PCMBATT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + NTSTATUS Status; + + Status = BatteryClassIoctl(DeviceExtension->BattClassHandle, + Irp); + + if (Status == STATUS_NOT_SUPPORTED) + { + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + return Status; +} + +NTSTATUS +NTAPI +CmBattPnP(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PCMBATT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + + UNIMPLEMENTED + + IoSkipCurrentIrpStackLocation(Irp); + + return IoCallDriver(DeviceExtension->Ldo, Irp); +} + +NTSTATUS +NTAPI +CmBattSystemControl(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + UNIMPLEMENTED + + Irp->IoStatus.Status = STATUS_WMI_GUID_NOT_FOUND; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_WMI_GUID_NOT_FOUND; +} + +NTSTATUS +NTAPI +CmBattPower(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PCMBATT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + + UNIMPLEMENTED + + IoSkipCurrentIrpStackLocation(Irp); + + PoStartNextPowerIrp(Irp); + + return PoCallDriver(DeviceExtension->Ldo, Irp); +} + +NTSTATUS +NTAPI +CmBattCreateClose(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +CmBattAddDevice(PDRIVER_OBJECT DriverObject, + PDEVICE_OBJECT PhysicalDeviceObject) +{ + NTSTATUS Status; + PDEVICE_OBJECT DeviceObject; + PCMBATT_DEVICE_EXTENSION DeviceExtension; + BATTERY_MINIPORT_INFO BattInfo; + + Status = IoCreateDevice(DriverObject, + sizeof(CMBATT_DEVICE_EXTENSION), + NULL, + FILE_DEVICE_BATTERY, + 0, + FALSE, + &DeviceObject); + if (!NT_SUCCESS(Status)) + return Status; + + DeviceExtension = DeviceObject->DeviceExtension; + + DeviceExtension->Pdo = PhysicalDeviceObject; + DeviceExtension->Fdo = DeviceObject; + DeviceExtension->Ldo = IoAttachDeviceToDeviceStack(DeviceObject, + PhysicalDeviceObject); + + DeviceObject->Flags |= DO_BUFFERED_IO | DO_POWER_PAGABLE; + + /* We require an extra stack entry */ + DeviceObject->StackSize = PhysicalDeviceObject->StackSize + 2; + + BattInfo.MajorVersion = BATTERY_CLASS_MAJOR_VERSION; + BattInfo.MinorVersion = BATTERY_CLASS_MINOR_VERSION; + BattInfo.Context = DeviceExtension; + BattInfo.QueryTag = CmBattQueryTag; + BattInfo.QueryInformation = CmBattQueryInformation; + BattInfo.SetInformation = CmBattSetInformation; + BattInfo.QueryStatus = CmBattQueryStatus; + BattInfo.SetStatusNotify = CmBattSetStatusNotify; + BattInfo.DisableStatusNotify = CmBattDisableStatusNotify; + BattInfo.Pdo = PhysicalDeviceObject; + BattInfo.DeviceName = NULL; + + Status = BatteryClassInitializeDevice(&BattInfo, + &DeviceExtension->BattClassHandle); + if (!NT_SUCCESS(Status)) + { + IoDetachDevice(DeviceExtension->Ldo); + IoDeleteDevice(DeviceObject); + return Status; + } + + ExInterlockedInsertTailList(&BatteryList, + &DeviceExtension->ListEntry, + &BatteryListLock); + + DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + DPRINT("Successfully registered battery with battc (0x%x)\n", DeviceExtension->BattClassHandle); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +DriverEntry(PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +{ + DPRINT("Control method battery miniclass driver initialized\n"); + + DriverObject->DriverUnload = CmBattUnload; + DriverObject->DriverExtension->AddDevice = CmBattAddDevice; + DriverObject->MajorFunction[IRP_MJ_POWER] = CmBattPower; + DriverObject->MajorFunction[IRP_MJ_PNP] = CmBattPnP; + DriverObject->MajorFunction[IRP_MJ_CREATE] = CmBattCreateClose; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = CmBattCreateClose; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = CmBattDeviceControl; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = CmBattSystemControl; + + KeInitializeSpinLock(&BatteryListLock); + InitializeListHead(&BatteryList); + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/battery/cmbatt/cmbatt.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/battery/cmbatt/cmbatt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/cmbatt/cmb… ============================================================================== --- trunk/reactos/drivers/battery/cmbatt/cmbatt.h (added) +++ trunk/reactos/drivers/battery/cmbatt/cmbatt.h [iso-8859-1] Mon Mar 8 22:09:25 2010 @@ -1,0 +1,58 @@ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: drivers/battery/cmbatt/cmbatt.h +* PURPOSE: Control Method Battery Miniclass Driver +* PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) +*/ + +#pragma once + +#include <ntddk.h> +#include <batclass.h> + +typedef struct _CMBATT_DEVICE_EXTENSION { + PDEVICE_OBJECT Pdo; + PDEVICE_OBJECT Ldo; + PDEVICE_OBJECT Fdo; + PVOID BattClassHandle; + LIST_ENTRY ListEntry; +} CMBATT_DEVICE_EXTENSION, *PCMBATT_DEVICE_EXTENSION; + +NTSTATUS +NTAPI +CmBattQueryTag(PVOID Context, + PULONG BatteryTag); + +NTSTATUS +NTAPI +CmBattDisableStatusNotify(PVOID Context); + +NTSTATUS +NTAPI +CmBattSetStatusNotify(PVOID Context, + ULONG BatteryTag, + PBATTERY_NOTIFY BatteryNotify); + +NTSTATUS +NTAPI +CmBattQueryInformation(PVOID Context, + ULONG BatteryTag, + BATTERY_QUERY_INFORMATION_LEVEL Level, + OPTIONAL LONG AtRate, + PVOID Buffer, + ULONG BufferLength, + PULONG ReturnedLength); + +NTSTATUS +NTAPI +CmBattQueryStatus(PVOID Context, + ULONG BatteryTag, + PBATTERY_STATUS BatteryStatus); + +NTSTATUS +NTAPI +CmBattSetInformation(PVOID Context, + ULONG BatteryTag, + BATTERY_SET_INFORMATION_LEVEL Level, + OPTIONAL PVOID Buffer); Propchange: trunk/reactos/drivers/battery/cmbatt/cmbatt.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/battery/cmbatt/cmbatt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/cmbatt/cmb… ============================================================================== --- trunk/reactos/drivers/battery/cmbatt/cmbatt.rbuild (added) +++ trunk/reactos/drivers/battery/cmbatt/cmbatt.rbuild [iso-8859-1] Mon Mar 8 22:09:25 2010 @@ -1,0 +1,11 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="cmbatt" type="kernelmodedriver" installbase="system32/drivers" installname="cmbatt.sys"> + <library>ntoskrnl</library> + <library>hal</library> + <library>battc</library> + <include base="cmbatt">.</include> + <file>cmbatt.c</file> + <file>miniclass.c</file> + <file>cmbatt.rc</file> +</module> Propchange: trunk/reactos/drivers/battery/cmbatt/cmbatt.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/battery/cmbatt/cmbatt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/cmbatt/cmb… ============================================================================== --- trunk/reactos/drivers/battery/cmbatt/cmbatt.rc (added) +++ trunk/reactos/drivers/battery/cmbatt/cmbatt.rc [iso-8859-1] Mon Mar 8 22:09:25 2010 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Control Method Battery Miniclass Driver\0" +#define REACTOS_STR_INTERNAL_NAME "cmbatt\0" +#define REACTOS_STR_ORIGINAL_FILENAME "cmbatt.sys\0" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/battery/cmbatt/cmbatt.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/battery/cmbatt/miniclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/cmbatt/min… ============================================================================== --- trunk/reactos/drivers/battery/cmbatt/miniclass.c (added) +++ trunk/reactos/drivers/battery/cmbatt/miniclass.c [iso-8859-1] Mon Mar 8 22:09:25 2010 @@ -1,0 +1,82 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/battery/cmbatt/miniclass.c + * PURPOSE: Control Method Battery Miniclass Driver + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include <cmbatt.h> + +#define NDEBUG +#include <debug.h> + +NTSTATUS +NTAPI +CmBattQueryTag(PVOID Context, + PULONG BatteryTag) +{ + UNIMPLEMENTED + + *BatteryTag = 0; + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +CmBattDisableStatusNotify(PVOID Context) +{ + UNIMPLEMENTED + + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +CmBattSetStatusNotify(PVOID Context, + ULONG BatteryTag, + PBATTERY_NOTIFY BatteryNotify) +{ + UNIMPLEMENTED + + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +CmBattQueryInformation(PVOID Context, + ULONG BatteryTag, + BATTERY_QUERY_INFORMATION_LEVEL Level, + OPTIONAL LONG AtRate, + PVOID Buffer, + ULONG BufferLength, + PULONG ReturnedLength) +{ + UNIMPLEMENTED + + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +CmBattQueryStatus(PVOID Context, + ULONG BatteryTag, + PBATTERY_STATUS BatteryStatus) +{ + UNIMPLEMENTED + + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +CmBattSetInformation(PVOID Context, + ULONG BatteryTag, + BATTERY_SET_INFORMATION_LEVEL Level, + OPTIONAL PVOID Buffer) +{ + UNIMPLEMENTED + + return STATUS_NOT_SUPPORTED; +} Propchange: trunk/reactos/drivers/battery/cmbatt/miniclass.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/battery/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/directory.… ============================================================================== --- trunk/reactos/drivers/battery/directory.rbuild (added) +++ trunk/reactos/drivers/battery/directory.rbuild [iso-8859-1] Mon Mar 8 22:09:25 2010 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> +<directory name="battc"> + <xi:include href="battc/battc.rbuild" /> +</directory> +<directory name="cmbatt"> + <xi:include href="cmbatt/cmbatt.rbuild" /> +</directory> +</group> Propchange: trunk/reactos/drivers/battery/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/drivers.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/drivers.rbuild?rev… ============================================================================== --- trunk/reactos/drivers/drivers.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/drivers.rbuild [iso-8859-1] Mon Mar 8 22:09:25 2010 @@ -3,6 +3,9 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <directory name="base"> <xi:include href="base/directory.rbuild" /> +</directory> +<directory name="battery"> + <xi:include href="battery/directory.rbuild" /> </directory> <directory name="bus"> <xi:include href="bus/directory.rbuild" /> Added: trunk/reactos/media/inf/battery.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/battery.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/battery.inf (added) +++ trunk/reactos/media/inf/battery.inf [iso-8859-1] Mon Mar 8 22:09:25 2010 @@ -1,0 +1,52 @@ +; BATTERY.INF + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = Battery +ClassGUID = {72631E54-78A4-11D0-BCF7-00AA00B7B32A} +Provider = %ReactOS% +DriverVer = 02/28/2010,1.00 + +[DestinationDirs] +DefaultDestDir = 12 + +[ClassInstall32.NT] +AddReg = BatteryClass.NT.AddReg + +[BatteryClass.NT.AddReg] +HKR, , , 0, %BatteryClassName% +;FIXME: Add icon here + +[Manufacturer] +%GenericMfg% = GenericMfg + +[GenericMfg] +%ACPI\PNP0C0A.DeviceDesc% = CmBatt,ACPI\PNP0C0A +%ACPI\ACPI0003.DeviceDesc% = CmBatt,ACPI\ACPI0003 + +[CmBatt] +CopyFiles = CmBatt_CopyFiles + +[CmBatt_CopyFiles] +cmbatt.sys +battc.sys + +[CmBatt.Services] +AddService = cmbatt, 0x00000002, CmBatt_Service_Install + +[CmBatt_Service_Install] +ServiceType = 1 +StartType = 3 +ErrorControl = 1 +ServiceBinary = %12%\cmbatt.sys + +[Strings] +ReactOS = "ReactOS Team" +BatteryClassName = "Batteries" + +GenericMfg = "(Generic batteries)" +ACPI\PNP0C0A.DeviceDesc = "ACPI-compliant control method battery" +ACPI\ACPI0003.DeviceDesc = "AC adapter" +

1 0

[dreimer] 46010: Polish translation update by Maciej Bialas.
by dreimer＠svn.reactos.org 08 Mar '10

08 Mar '10

Author: dreimer Date: Mon Mar 8 22:08:20 2010 New Revision: 46010 URL: http://svn.reactos.org/svn/reactos?rev=46010&view=rev Log: Polish translation update by Maciej Bialas. Modified: trunk/reactos/media/inf/keyboard.inf Modified: trunk/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev… ============================================================================== Binary files - no diff available.

1 0

[jimtabor] 46009: - Fix a crash in user32 winetest msg.
by jimtabor＠svn.reactos.org 08 Mar '10

08 Mar '10

Author: jimtabor Date: Mon Mar 8 22:04:00 2010 New Revision: 46009 URL: http://svn.reactos.org/svn/reactos?rev=46009&view=rev Log: - Fix a crash in user32 winetest msg. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Mon Mar 8 22:04:00 2010 @@ -502,7 +502,10 @@ for (WndObject = Window; WndObject != NULL; WndObject = WndObject->spwndParent) { Wnd = WndObject->Wnd; - if (!(Wnd->style & WS_VISIBLE) || + if ( Window->state & WINDOWSTATUS_DESTROYING || // state2 + Window->state & WINDOWSTATUS_DESTROYED || + !Wnd || + !(Wnd->style & WS_VISIBLE) || ((Wnd->style & WS_MINIMIZE) && (WndObject != Window))) { return FALSE;

1 0

[tkreuzer] 46008: Add some types and contants to ntpoapi.h
by tkreuzer＠svn.reactos.org 08 Mar '10

08 Mar '10

Author: tkreuzer Date: Mon Mar 8 22:00:56 2010 New Revision: 46008 URL: http://svn.reactos.org/svn/reactos?rev=46008&view=rev Log: Add some types and contants to ntpoapi.h Modified: branches/header-work/include/ddk/ntpoapi.h Modified: branches/header-work/include/ddk/ntpoapi.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntpoapi… ============================================================================== --- branches/header-work/include/ddk/ntpoapi.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntpoapi.h [iso-8859-1] Mon Mar 8 22:00:56 2010 @@ -270,6 +270,39 @@ ULONG CurrentIdleState; } PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION; +typedef struct _POWER_ACTION_POLICY { + POWER_ACTION Action; + ULONG Flags; + ULONG EventCode; +} POWER_ACTION_POLICY, *PPOWER_ACTION_POLICY; + +/* POWER_ACTION_POLICY.Flags constants */ +#define POWER_ACTION_QUERY_ALLOWED 0x00000001 +#define POWER_ACTION_UI_ALLOWED 0x00000002 +#define POWER_ACTION_OVERRIDE_APPS 0x00000004 +#define POWER_ACTION_LIGHTEST_FIRST 0x10000000 +#define POWER_ACTION_LOCK_CONSOLE 0x20000000 +#define POWER_ACTION_DISABLE_WAKES 0x40000000 +#define POWER_ACTION_CRITICAL 0x80000000 + +/* POWER_ACTION_POLICY.EventCode constants */ +#define POWER_LEVEL_USER_NOTIFY_TEXT 0x00000001 +#define POWER_LEVEL_USER_NOTIFY_SOUND 0x00000002 +#define POWER_LEVEL_USER_NOTIFY_EXEC 0x00000004 +#define POWER_USER_NOTIFY_BUTTON 0x00000008 +#define POWER_USER_NOTIFY_SHUTDOWN 0x00000010 +#define POWER_FORCE_TRIGGER_RESET 0x80000000 + +#define DISCHARGE_POLICY_CRITICAL 0 +#define DISCHARGE_POLICY_LOW 1 +#define NUM_DISCHARGE_POLICIES 4 + +#define PO_THROTTLE_NONE 0 +#define PO_THROTTLE_CONSTANT 1 +#define PO_THROTTLE_DEGRADE 2 +#define PO_THROTTLE_ADAPTIVE 3 +#define PO_THROTTLE_MAXIMUM 4 + #ifdef __cplusplus } #endif

1 0

[jimtabor] 46007: [User32] - Andrew Nguyen : Ensure That WM_INITDIALOG passes the first tabstop control handle to the dialog procedure. - Henri Verbeet : Also show dialogs right after a WM_TIMER message.
by jimtabor＠svn.reactos.org 08 Mar '10

08 Mar '10

Author: jimtabor Date: Mon Mar 8 21:57:24 2010 New Revision: 46007 URL: http://svn.reactos.org/svn/reactos?rev=46007&view=rev Log: [User32] - Andrew Nguyen : Ensure That WM_INITDIALOG passes the first tabstop control handle to the dialog procedure. - Henri Verbeet : Also show dialogs right after a WM_TIMER message. Modified: trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Mon Mar 8 21:57:24 2010 @@ -560,6 +560,12 @@ DispatchMessageW( &msg ); } if (dlgInfo->flags & DF_END) break; + + if (bFirstEmpty && msg.message == WM_TIMER) + { + ShowWindow( hwnd, SW_SHOWNORMAL ); + bFirstEmpty = FALSE; + } } } if (dlgInfo->flags & DF_OWNERENABLED) DIALOG_EnableOwner( owner ); @@ -968,10 +974,13 @@ if (dlgProc) { - if (SendMessageW( hwnd, WM_INITDIALOG, (WPARAM)dlgInfo->hwndFocus, param ) && + HWND focus = GetNextDlgTabItem( hwnd, 0, FALSE ); + if (SendMessageW( hwnd, WM_INITDIALOG, (WPARAM)focus, param ) && ((~template.style & DS_CONTROL) || (template.style & WS_VISIBLE))) { - /* By returning TRUE, app has requested a default focus assignment */ + /* By returning TRUE, app has requested a default focus assignment. + * WM_INITDIALOG may have changed the tab order, so find the first + * tabstop control again. */ dlgInfo->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE); if( dlgInfo->hwndFocus ) SetFocus( dlgInfo->hwndFocus );

1 0

[jimtabor] 46006: - [User32_winetest] - Win : Remove test_capture from service. This is related to TrackMouseEvent issues which use SetCapture.
by jimtabor＠svn.reactos.org 08 Mar '10

08 Mar '10

Author: jimtabor Date: Mon Mar 8 21:52:04 2010 New Revision: 46006 URL: http://svn.reactos.org/svn/reactos?rev=46006&view=rev Log: - [User32_winetest] - Win : Remove test_capture from service. This is related to TrackMouseEvent issues which use SetCapture. Modified: trunk/rostests/winetests/user32/win.c Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re… ============================================================================== --- trunk/rostests/winetests/user32/win.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/win.c [iso-8859-1] Mon Mar 8 21:52:04 2010 @@ -5979,7 +5979,7 @@ test_capture_1(); test_capture_2(); test_capture_3(hwndMain, hwndMain2); - test_capture_4(); +// test_capture_4(); test_CreateWindow(); test_parent_owner();

1 0

[fireball] 46005: [PSDK] - Update all IDLs to Wine-1.1.40. If you feel some of your change was lost, it wasn't needed for building. Please recommit if you still think it's of a high value.
by fireball＠svn.reactos.org 08 Mar '10

08 Mar '10

Author: fireball Date: Mon Mar 8 21:51:33 2010 New Revision: 46005 URL: http://svn.reactos.org/svn/reactos?rev=46005&view=rev Log: [PSDK] - Update all IDLs to Wine-1.1.40. If you feel some of your change was lost, it wasn't needed for building. Please recommit if you still think it's of a high value. Added: trunk/reactos/include/psdk/access.idl trunk/reactos/include/psdk/asynot.idl trunk/reactos/include/psdk/asysta.idl trunk/reactos/include/psdk/binres.idl trunk/reactos/include/psdk/cmdbas.idl trunk/reactos/include/psdk/cmdtxt.idl trunk/reactos/include/psdk/crtrow.idl trunk/reactos/include/psdk/dbccmd.idl trunk/reactos/include/psdk/dbcses.idl trunk/reactos/include/psdk/dbdsad.idl trunk/reactos/include/psdk/opnrst.idl trunk/reactos/include/psdk/row.idl trunk/reactos/include/psdk/rowchg.idl trunk/reactos/include/psdk/rstbas.idl trunk/reactos/include/psdk/rstinf.idl trunk/reactos/include/psdk/rstloc.idl trunk/reactos/include/psdk/sesprp.idl Modified: trunk/reactos/dll/win32/msi/msiserver.idl trunk/reactos/dll/win32/shell32/dataobject.c trunk/reactos/dll/win32/shell32/pidl.c trunk/reactos/dll/win32/shell32/she_ocmenu.c trunk/reactos/dll/win32/shell32/shelllink.c trunk/reactos/dll/win32/shell32/shfldr_fs.c trunk/reactos/dll/win32/shell32/shlfolder.c trunk/reactos/dll/win32/shell32/shlview.c trunk/reactos/dll/win32/shell32/shv_def_cmenu.c trunk/reactos/dll/win32/shell32/stubs.c trunk/reactos/include/dxsdk/axextend.idl trunk/reactos/include/psdk/bits.idl trunk/reactos/include/psdk/control.idl trunk/reactos/include/psdk/dbprop.idl trunk/reactos/include/psdk/dbs.idl trunk/reactos/include/psdk/dimm.idl trunk/reactos/include/psdk/dispex.idl trunk/reactos/include/psdk/hlink.idl trunk/reactos/include/psdk/mlang.idl trunk/reactos/include/psdk/mscoree.idl trunk/reactos/include/psdk/msctf.idl trunk/reactos/include/psdk/objidl.idl trunk/reactos/include/psdk/oledb.idl trunk/reactos/include/psdk/propidl.idl trunk/reactos/include/psdk/sensevts.idl trunk/reactos/include/psdk/shlobj.h trunk/reactos/include/psdk/shobjidl.idl trunk/reactos/include/psdk/shtypes.idl trunk/reactos/include/psdk/tom.idl trunk/reactos/include/psdk/wtypes.idl trunk/reactos/include/reactos/wine/wined3d.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msi/msiserver.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiserver.id… Modified: trunk/reactos/dll/win32/shell32/dataobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dataobje… Modified: trunk/reactos/dll/win32/shell32/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r… Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… Modified: trunk/reactos/dll/win32/shell32/shfldr_fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… Modified: trunk/reactos/dll/win32/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_def_… Modified: trunk/reactos/dll/win32/shell32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/stubs.c?… Modified: trunk/reactos/include/dxsdk/axextend.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/axextend.idl… Added: trunk/reactos/include/psdk/access.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/access.idl?re… Added: trunk/reactos/include/psdk/asynot.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/asynot.idl?re… Added: trunk/reactos/include/psdk/asysta.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/asysta.idl?re… Added: trunk/reactos/include/psdk/binres.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/binres.idl?re… Modified: trunk/reactos/include/psdk/bits.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/bits.idl?rev=… Added: trunk/reactos/include/psdk/cmdbas.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/cmdbas.idl?re… Added: trunk/reactos/include/psdk/cmdtxt.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/cmdtxt.idl?re… Modified: trunk/reactos/include/psdk/control.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/control.idl?r… Added: trunk/reactos/include/psdk/crtrow.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/crtrow.idl?re… Added: trunk/reactos/include/psdk/dbccmd.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbccmd.idl?re… Added: trunk/reactos/include/psdk/dbcses.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbcses.idl?re… Added: trunk/reactos/include/psdk/dbdsad.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbdsad.idl?re… Modified: trunk/reactos/include/psdk/dbprop.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbprop.idl?re… Modified: trunk/reactos/include/psdk/dbs.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbs.idl?rev=4… Modified: trunk/reactos/include/psdk/dimm.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dimm.idl?rev=… Modified: trunk/reactos/include/psdk/dispex.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dispex.idl?re… Modified: trunk/reactos/include/psdk/hlink.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/hlink.idl?rev… Modified: trunk/reactos/include/psdk/mlang.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mlang.idl?rev… Modified: trunk/reactos/include/psdk/mscoree.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mscoree.idl?r… Modified: trunk/reactos/include/psdk/msctf.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msctf.idl?rev… Modified: trunk/reactos/include/psdk/objidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objidl.idl?re… Modified: trunk/reactos/include/psdk/oledb.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/oledb.idl?rev… Added: trunk/reactos/include/psdk/opnrst.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/opnrst.idl?re… Modified: trunk/reactos/include/psdk/propidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/propidl.idl?r… Added: trunk/reactos/include/psdk/row.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/row.idl?rev=4… Added: trunk/reactos/include/psdk/rowchg.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rowchg.idl?re… Added: trunk/reactos/include/psdk/rstbas.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rstbas.idl?re… Added: trunk/reactos/include/psdk/rstinf.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rstinf.idl?re… Added: trunk/reactos/include/psdk/rstloc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rstloc.idl?re… Modified: trunk/reactos/include/psdk/sensevts.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sensevts.idl?… Added: trunk/reactos/include/psdk/sesprp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sesprp.idl?re… Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… Modified: trunk/reactos/include/psdk/shtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shtypes.idl?r… Modified: trunk/reactos/include/psdk/tom.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/tom.idl?rev=4… Modified: trunk/reactos/include/psdk/wtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wtypes.idl?re… Modified: trunk/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined…

1 0

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