Ros-diffs May 2010

ros-diffs@reactos.org

21 participants
438 discussions

[fireball] 47395: - Initialize (hide) mouse pointer right after creating the primary surface. Fixes a possible crash when the cursor was moved and only then cursor icon was set.

by fireball＠svn.reactos.org

Author: fireball Date: Sat May 29 10:24:25 2010 New Revision: 47395 URL: http://svn.reactos.org/svn/reactos?rev=47395&view=rev Log: - Initialize (hide) mouse pointer right after creating the primary surface. Fixes a possible crash when the cursor was moved and only then cursor icon was set. Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] Sat May 29 10:24:25 2010 @@ -543,6 +543,9 @@ /* attach monitor */ AttachMonitor(&PrimarySurface, PrimarySurface.DisplayNumber); + + /* Initialize mouse pointer */ + RosUserSetCursor(NULL); /* Put the pointer in the center of the screen */ RosUserSetCursorPos((SurfaceRect.right - SurfaceRect.left) / 2,

14 years, 5 months

[cwittich] 47394: [MSI] delete msi_ros.diff

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat May 29 10:01:25 2010 New Revision: 47394 URL: http://svn.reactos.org/svn/reactos?rev=47394&view=rev Log: [MSI] delete msi_ros.diff Removed: trunk/reactos/dll/win32/msi/msi_ros.diff [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/dll/win32/msi/msi_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_ros.diff…

14 years, 5 months

[mjmartin] 47393: [win32k] - The timer is created usingUserCreateObject. It may be a good idea to save the handle in the timer object so that it can be deleted later. - Dereference the object before attempting to delete it.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sat May 29 08:51:03 2010 New Revision: 47393 URL: http://svn.reactos.org/svn/reactos?rev=47393&view=rev Log: [win32k] - The timer is created usingUserCreateObject. It may be a good idea to save the handle in the timer object so that it can be deleted later. - Dereference the object before attempting to delete it. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Sat May 29 08:51:03 2010 @@ -50,13 +50,21 @@ if (!FirstpTmr) { FirstpTmr = UserCreateObject(gHandleTable, NULL, &Handle, otTimer, sizeof(TIMER)); - if (FirstpTmr) InitializeListHead(&FirstpTmr->ptmrList); + if (FirstpTmr) + { + FirstpTmr->head.h = Handle; + InitializeListHead(&FirstpTmr->ptmrList); + } Ret = FirstpTmr; } else { Ret = UserCreateObject(gHandleTable, NULL, &Handle, otTimer, sizeof(TIMER)); - if (Ret) InsertTailList(&FirstpTmr->ptmrList, &Ret->ptmrList); + if (Ret) + { + Ret->head.h = Handle; + InsertTailList(&FirstpTmr->ptmrList, &Ret->ptmrList); + } } return Ret; } @@ -66,14 +74,17 @@ FASTCALL RemoveTimer(PTIMER pTmr) { + BOOL Ret = FALSE; if (pTmr) { /* Set the flag, it will be removed when ready */ RemoveEntryList(&pTmr->ptmrList); - UserDeleteObject( UserHMGetHandle(pTmr), otTimer); - return TRUE; - } - return FALSE; + UserDereferenceObject(pTmr); + Ret = UserDeleteObject( UserHMGetHandle(pTmr), otTimer); + } + if (!Ret) DPRINT1("Warning unable to delete timer\n"); + + return Ret; } PTIMER @@ -528,9 +539,7 @@ { if ((pTmr) && (pTmr->pti == pti) && (pTmr->pWnd == Window)) { - RemoveEntryList(&pTmr->ptmrList); - UserDeleteObject( UserHMGetHandle(pTmr), otTimer); - TimersRemoved = TRUE; + TimersRemoved = RemoveTimer(pTmr); } pLE = pTmr->ptmrList.Flink; pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); @@ -557,9 +566,7 @@ { if ((pTmr) && (pTmr->pti == pti)) { - RemoveEntryList(&pTmr->ptmrList); - UserDeleteObject( UserHMGetHandle(pTmr), otTimer); - TimersRemoved = TRUE; + TimersRemoved = RemoveTimer(pTmr); } pLE = pTmr->ptmrList.Flink; pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList);

14 years, 5 months

[akhaldi] 47392: [XDK] - Add some missing definitions. [DDK] - Update ntddk.h to reflect recent XDK changes.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat May 29 02:30:18 2010 New Revision: 47392 URL: http://svn.reactos.org/svn/reactos?rev=47392&view=rev Log: [XDK] - Add some missing definitions. [DDK] - Update ntddk.h to reflect recent XDK changes. Modified: branches/header-work/include/ddk/ntddk.h branches/header-work/include/xdk/iotypes.h Modified: branches/header-work/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntddk.h… ============================================================================== --- branches/header-work/include/ddk/ntddk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntddk.h [iso-8859-1] Sat May 29 02:30:18 2010 @@ -1226,6 +1226,128 @@ SgiInternalConfiguration, MaximumBusDataType } BUS_DATA_TYPE, *PBUS_DATA_TYPE; + +/* Some Server 2003 DDK definitions */ +#define PCI_INT_ROUTE_INTRF_STANDARD_VER 1 + +typedef NTSTATUS +(NTAPI *PLEGACY_DEVICE_DETECTION_HANDLER)( + IN PVOID Context, + IN INTERFACE_TYPE LegacyBusType, + IN ULONG BusNumber, + IN ULONG SlotNumber, + OUT PDEVICE_OBJECT *PhysicalDeviceObject); + +typedef struct _ROUTING_TOKEN { + PVOID LinkNode; + ULONG StaticVector; + UCHAR Flags; +} ROUTING_TOKEN, *PROUTING_TOKEN; + +typedef NTSTATUS +(NTAPI *PGET_INTERRUPT_ROUTING)( + IN PDEVICE_OBJECT Pdo, + OUT ULONG *Bus, + OUT ULONG *PciSlot, + OUT UCHAR *InterruptLine, + OUT UCHAR *InterruptPin, + OUT UCHAR *ClassCode, + OUT UCHAR *SubClassCode, + OUT PDEVICE_OBJECT *ParentPdo, + OUT ROUTING_TOKEN *RoutingToken, + OUT UCHAR *Flags); + +typedef NTSTATUS +(NTAPI *PSET_INTERRUPT_ROUTING_TOKEN)( + IN PDEVICE_OBJECT Pdo, + IN PROUTING_TOKEN RoutingToken); + +typedef VOID +(NTAPI *PUPDATE_INTERRUPT_LINE)( + IN PDEVICE_OBJECT Pdo, + IN UCHAR LineRegister); + +typedef struct _INT_ROUTE_INTERFACE_STANDARD { + USHORT Size; + USHORT Version; + PVOID Context; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + PGET_INTERRUPT_ROUTING GetInterruptRouting; + PSET_INTERRUPT_ROUTING_TOKEN SetInterruptRoutingToken; + PUPDATE_INTERRUPT_LINE UpdateInterruptLine; +} INT_ROUTE_INTERFACE_STANDARD, *PINT_ROUTE_INTERFACE_STANDARD; + +typedef struct _LEGACY_DEVICE_DETECTION_INTERFACE { + USHORT Size; + USHORT Version; + PVOID Context; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + PLEGACY_DEVICE_DETECTION_HANDLER LegacyDeviceDetection; +} LEGACY_DEVICE_DETECTION_INTERFACE, *PLEGACY_DEVICE_DETECTION_INTERFACE; + +/* FIXME : These definitions don't exist in public headers */ + +#define PCI_CB_INTRF_VERSION 1 +#define PCI_PME_INTRF_STANDARD_VER 1 +#define PNP_LOCATION_INTERFACE_VERSION 1 + +DEFINE_GUID(GUID_PCI_CARDBUS_INTERFACE_PRIVATE, 0xcca82f31, 0x54d6, 0x11d1, 0x82, 0x24, 0x00, 0xa0, 0xc9, 0x32, 0x43, 0x85); +DEFINE_GUID(GUID_PCI_PME_INTERFACE, 0xaac7e6ac, 0xbb0b, 0x11d2, 0xb4, 0x84, 0x00, 0xc0, 0x4f, 0x72, 0xde, 0x8b); + +typedef NTSTATUS +(NTAPI *PCARDBUSADD)( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PVOID *DeviceContext); + +typedef NTSTATUS +(NTAPI *PCARDBUSDELETE)( + IN PVOID DeviceContext); + +typedef NTSTATUS +(NTAPI *PCARDBUSPCIDISPATCH)( + IN PVOID DeviceContext, + IN PIRP Irp); + +typedef VOID +(NTAPI *PPME_SET_PME_ENABLE)( + IN PDEVICE_OBJECT Pdo, + IN BOOLEAN PmeEnable); + +typedef VOID +(NTAPI *PPME_CLEAR_PME_STATUS)( + IN PDEVICE_OBJECT Pdo); + +typedef VOID +(NTAPI *PPME_GET_INFORMATION)( + IN PDEVICE_OBJECT Pdo, + OUT PBOOLEAN PmeCapable, + OUT PBOOLEAN PmeStatus, + OUT PBOOLEAN PmeEnable); + +typedef struct _PCI_CARDBUS_INTERFACE_PRIVATE { + USHORT Size; + USHORT Version; + PVOID Context; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + PDRIVER_OBJECT DriverObject; + PCARDBUSADD AddCardBus; + PCARDBUSDELETE DeleteCardBus; + PCARDBUSPCIDISPATCH DispatchPnp; +} PCI_CARDBUS_INTERFACE_PRIVATE, *PPCI_CARDBUS_INTERFACE_PRIVATE; + +typedef struct _PCI_PME_INTERFACE { + USHORT Size; + USHORT Version; + PVOID Context; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + PPME_GET_INFORMATION GetPmeInformation; + PPME_CLEAR_PME_STATUS ClearPmeStatus; + PPME_SET_PME_ENABLE UpdateEnable; +} PCI_PME_INTERFACE, *PPCI_PME_INTERFACE; /* Hardware Abstraction Layer Types */ @@ -3289,11 +3411,13 @@ #define RESULT_POSITIVE 2 #endif +#if defined(_X86_) || defined(_IA64_) || defined(_M_AMD64) && !defined(RC_INVOKED) && !defined(MIDL_PASS) typedef enum _INTERLOCKED_RESULT { ResultNegative = RESULT_NEGATIVE, ResultZero = RESULT_ZERO, ResultPositive = RESULT_POSITIVE } INTERLOCKED_RESULT; +#endif #ifdef _X86_ Modified: branches/header-work/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/iotypes… ============================================================================== --- branches/header-work/include/xdk/iotypes.h [iso-8859-1] (original) +++ branches/header-work/include/xdk/iotypes.h [iso-8859-1] Sat May 29 02:30:18 2010 @@ -4863,6 +4863,128 @@ MaximumBusDataType } BUS_DATA_TYPE, *PBUS_DATA_TYPE; +/* Some Server 2003 DDK definitions */ +#define PCI_INT_ROUTE_INTRF_STANDARD_VER 1 + +typedef NTSTATUS +(NTAPI *PLEGACY_DEVICE_DETECTION_HANDLER)( + IN PVOID Context, + IN INTERFACE_TYPE LegacyBusType, + IN ULONG BusNumber, + IN ULONG SlotNumber, + OUT PDEVICE_OBJECT *PhysicalDeviceObject); + +typedef struct _ROUTING_TOKEN { + PVOID LinkNode; + ULONG StaticVector; + UCHAR Flags; +} ROUTING_TOKEN, *PROUTING_TOKEN; + +typedef NTSTATUS +(NTAPI *PGET_INTERRUPT_ROUTING)( + IN PDEVICE_OBJECT Pdo, + OUT ULONG *Bus, + OUT ULONG *PciSlot, + OUT UCHAR *InterruptLine, + OUT UCHAR *InterruptPin, + OUT UCHAR *ClassCode, + OUT UCHAR *SubClassCode, + OUT PDEVICE_OBJECT *ParentPdo, + OUT ROUTING_TOKEN *RoutingToken, + OUT UCHAR *Flags); + +typedef NTSTATUS +(NTAPI *PSET_INTERRUPT_ROUTING_TOKEN)( + IN PDEVICE_OBJECT Pdo, + IN PROUTING_TOKEN RoutingToken); + +typedef VOID +(NTAPI *PUPDATE_INTERRUPT_LINE)( + IN PDEVICE_OBJECT Pdo, + IN UCHAR LineRegister); + +typedef struct _INT_ROUTE_INTERFACE_STANDARD { + USHORT Size; + USHORT Version; + PVOID Context; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + PGET_INTERRUPT_ROUTING GetInterruptRouting; + PSET_INTERRUPT_ROUTING_TOKEN SetInterruptRoutingToken; + PUPDATE_INTERRUPT_LINE UpdateInterruptLine; +} INT_ROUTE_INTERFACE_STANDARD, *PINT_ROUTE_INTERFACE_STANDARD; + +typedef struct _LEGACY_DEVICE_DETECTION_INTERFACE { + USHORT Size; + USHORT Version; + PVOID Context; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + PLEGACY_DEVICE_DETECTION_HANDLER LegacyDeviceDetection; +} LEGACY_DEVICE_DETECTION_INTERFACE, *PLEGACY_DEVICE_DETECTION_INTERFACE; + +/* FIXME : These definitions don't exist in public headers */ + +#define PCI_CB_INTRF_VERSION 1 +#define PCI_PME_INTRF_STANDARD_VER 1 +#define PNP_LOCATION_INTERFACE_VERSION 1 + +DEFINE_GUID(GUID_PCI_CARDBUS_INTERFACE_PRIVATE, 0xcca82f31, 0x54d6, 0x11d1, 0x82, 0x24, 0x00, 0xa0, 0xc9, 0x32, 0x43, 0x85); +DEFINE_GUID(GUID_PCI_PME_INTERFACE, 0xaac7e6ac, 0xbb0b, 0x11d2, 0xb4, 0x84, 0x00, 0xc0, 0x4f, 0x72, 0xde, 0x8b); + +typedef NTSTATUS +(NTAPI *PCARDBUSADD)( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PVOID *DeviceContext); + +typedef NTSTATUS +(NTAPI *PCARDBUSDELETE)( + IN PVOID DeviceContext); + +typedef NTSTATUS +(NTAPI *PCARDBUSPCIDISPATCH)( + IN PVOID DeviceContext, + IN PIRP Irp); + +typedef VOID +(NTAPI *PPME_SET_PME_ENABLE)( + IN PDEVICE_OBJECT Pdo, + IN BOOLEAN PmeEnable); + +typedef VOID +(NTAPI *PPME_CLEAR_PME_STATUS)( + IN PDEVICE_OBJECT Pdo); + +typedef VOID +(NTAPI *PPME_GET_INFORMATION)( + IN PDEVICE_OBJECT Pdo, + OUT PBOOLEAN PmeCapable, + OUT PBOOLEAN PmeStatus, + OUT PBOOLEAN PmeEnable); + +typedef struct _PCI_CARDBUS_INTERFACE_PRIVATE { + USHORT Size; + USHORT Version; + PVOID Context; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + PDRIVER_OBJECT DriverObject; + PCARDBUSADD AddCardBus; + PCARDBUSDELETE DeleteCardBus; + PCARDBUSPCIDISPATCH DispatchPnp; +} PCI_CARDBUS_INTERFACE_PRIVATE, *PPCI_CARDBUS_INTERFACE_PRIVATE; + +typedef struct _PCI_PME_INTERFACE { + USHORT Size; + USHORT Version; + PVOID Context; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + PPME_GET_INFORMATION GetPmeInformation; + PPME_CLEAR_PME_STATUS ClearPmeStatus; + PPME_SET_PME_ENABLE UpdateEnable; +} PCI_PME_INTERFACE, *PPCI_PME_INTERFACE; + $endif (_NTDDK_) $if (_NTIFS_)

14 years, 5 months

[cgutman] 47391: [NTOSKRNL] - Set the Status variable to STATUS_SUCCESS in PIP_RETURN_DATA - Fixes testbot

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat May 29 02:29:12 2010 New Revision: 47391 URL: http://svn.reactos.org/svn/reactos?rev=47391&view=rev Log: [NTOSKRNL] - Set the Status variable to STATUS_SUCCESS in PIP_RETURN_DATA - Fixes testbot Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sat May 29 02:29:12 2010 @@ -3234,7 +3234,7 @@ return Status; } -#define PIP_RETURN_DATA(x, y) {ReturnLength = x; Data = y; break;} +#define PIP_RETURN_DATA(x, y) {ReturnLength = x; Data = y; Status = STATUS_SUCCESS; break;} #define PIP_REGISTRY_DATA(x, y) {ValueName = x; ValueType = y; break;} #define PIP_UNIMPLEMENTED() {UNIMPLEMENTED; while(TRUE); break;}

14 years, 5 months

[cgutman] 47390: [NTOSKRNL] - Use PnpDetermineResourceListSize to determine the resource list size and remove the broken IopCalculateResourceListSize function

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat May 29 01:17:59 2010 New Revision: 47390 URL: http://svn.reactos.org/svn/reactos?rev=47390&view=rev Log: [NTOSKRNL] - Use PnpDetermineResourceListSize to determine the resource list size and remove the broken IopCalculateResourceListSize function Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Sat May 29 01:17:59 2010 @@ -496,9 +496,7 @@ // ULONG NTAPI -IopCalculateResourceListSize( - IN PCM_RESOURCE_LIST ResourceList -); +PnpDetermineResourceListSize(IN PCM_RESOURCE_LIST ResourceList); NTSTATUS NTAPI Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sat May 29 01:17:59 2010 @@ -948,7 +948,7 @@ 0, REG_RESOURCE_LIST, DeviceNode->BootResources, - IopCalculateResourceListSize(DeviceNode->BootResources)); + PnpDetermineResourceListSize(DeviceNode->BootResources)); } } Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Sat May 29 01:17:59 2010 @@ -17,30 +17,6 @@ IN PCM_RESOURCE_LIST ResourceList, IN BOOLEAN Silent, OUT OPTIONAL PCM_PARTIAL_RESOURCE_DESCRIPTOR ConflictingDescriptor); - -ULONG -NTAPI -IopCalculateResourceListSize( - IN PCM_RESOURCE_LIST ResourceList) -{ - ULONG Size, i, j; - PCM_PARTIAL_RESOURCE_LIST pPartialResourceList; - - Size = FIELD_OFFSET(CM_RESOURCE_LIST, List); - for (i = 0; i < ResourceList->Count; i++) - { - pPartialResourceList = &ResourceList->List[i].PartialResourceList; - Size += FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList.PartialDescriptors) + - pPartialResourceList->Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - for (j = 0; j < pPartialResourceList->Count; j++) - { - if (pPartialResourceList->PartialDescriptors[j].Type == CmResourceTypeDeviceSpecific) - Size += pPartialResourceList->PartialDescriptors[j].u.DeviceSpecificData.DataSize; - } - } - - return Size; -} static BOOLEAN @@ -533,7 +509,7 @@ 0, REG_RESOURCE_LIST, DeviceNode->ResourceList, - IopCalculateResourceListSize(DeviceNode->ResourceList)); + PnpDetermineResourceListSize(DeviceNode->ResourceList)); ZwClose(ControlKey); if (!NT_SUCCESS(Status)) @@ -674,7 +650,7 @@ 0, REG_RESOURCE_LIST, DeviceNode->ResourceList, - IopCalculateResourceListSize(DeviceNode->ResourceList)); + PnpDetermineResourceListSize(DeviceNode->ResourceList)); if (!NT_SUCCESS(Status)) { ZwClose(PnpMgrLevel2); @@ -692,7 +668,7 @@ 0, REG_RESOURCE_LIST, DeviceNode->ResourceListTranslated, - IopCalculateResourceListSize(DeviceNode->ResourceListTranslated)); + PnpDetermineResourceListSize(DeviceNode->ResourceListTranslated)); ZwClose(PnpMgrLevel2); ASSERT(DeviceName); ExFreePool(DeviceName); @@ -732,7 +708,7 @@ /* That's easy to translate a resource list. Just copy the * untranslated one and change few fields in the copy */ - ListSize = IopCalculateResourceListSize(DeviceNode->ResourceList); + ListSize = PnpDetermineResourceListSize(DeviceNode->ResourceList); DeviceNode->ResourceListTranslated = ExAllocatePool(PagedPool, ListSize); if (!DeviceNode->ResourceListTranslated) @@ -852,7 +828,7 @@ if (DeviceNode->BootResources) { - ListSize = IopCalculateResourceListSize(DeviceNode->BootResources); + ListSize = PnpDetermineResourceListSize(DeviceNode->BootResources); DeviceNode->ResourceList = ExAllocatePool(PagedPool, ListSize); if (!DeviceNode->ResourceList)

14 years, 5 months

[sir_richard] 47389: [NTOS]: Root Bus PDO should not override Status with STATUS_NOT_IMPLEMENTED and instead use the current IRP status (which drivers/PnP will typically set to STATUS_NOT_SUPPORTED). Found by testing the new PCIx driver (probably fixes other bus drivers too).

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sat May 29 01:08:41 2010 New Revision: 47389 URL: http://svn.reactos.org/svn/reactos?rev=47389&view=rev Log: [NTOS]: Root Bus PDO should not override Status with STATUS_NOT_IMPLEMENTED and instead use the current IRP status (which drivers/PnP will typically set to STATUS_NOT_SUPPORTED). Found by testing the new PCIx driver (probably fixes other bus drivers too). Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Sat May 29 01:08:41 2010 @@ -1085,7 +1085,6 @@ default: DPRINT1("IRP_MJ_PNP / Unknown minor function 0x%lx\n", IrpSp->MinorFunction); - Status = STATUS_NOT_IMPLEMENTED; break; }

14 years, 5 months

[sir_richard] 47388: [NTOS]: Re-implement IoGetDeviceProperty. Main changes are usage of existing (and new) helper functions for registry/IRP access, much better factored code, correct implementation of DevicePropertyPhysicalDeviceObjectName, fixed implementation of DevicePropertyBootConfigurationTranslated and DevicePropertyBootConfiguration (do not crash the system anymore), and support for more device properties. [NTOS]: Fix caller of IoGetDeviceProperty in pnpres.c to work with new function

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sat May 29 01:03:27 2010 New Revision: 47388 URL: http://svn.reactos.org/svn/reactos?rev=47388&view=rev Log: [NTOS]: Re-implement IoGetDeviceProperty. Main changes are usage of existing (and new) helper functions for registry/IRP access, much better factored code, correct implementation of DevicePropertyPhysicalDeviceObjectName, fixed implementation of DevicePropertyBootConfigurationTranslated and DevicePropertyBootConfiguration (do not crash the system anymore), and support for more device properties. [NTOS]: Fix caller of IoGetDeviceProperty in pnpres.c to work with new function behavior (which matches WDK documentation and test cases). [NTOS]: Implement helper function PnpBusTypeGuidGet, should be used later in other PnP code, but now used only for this patch. [NTOS]: Implement helper function PnpDetermineResourceListSize, ditto. N.B. Current IopCalculateResourceListSize function is broken and callers should use this one instead. [NTOS]: Implement helper function PpIrpQueryCapabilities, should be used later in device node code, but now only used for this patch. [NTOS]: Implement helper function PnpDeviceObjectToDeviceInstance, ditto. Main purpose of this patch is to unblock the new PCIx driver. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sat May 29 01:03:27 2010 @@ -3003,6 +3003,241 @@ /* PUBLIC FUNCTIONS **********************************************************/ +NTSTATUS +NTAPI +PnpBusTypeGuidGet(IN USHORT Index, + IN LPGUID BusTypeGuid) +{ + NTSTATUS Status = STATUS_SUCCESS; + + /* Acquire the lock */ + ExAcquireFastMutex(&PnpBusTypeGuidList->Lock); + + /* Validate size */ + if (Index < PnpBusTypeGuidList->GuidCount) + { + /* Copy the data */ + RtlCopyMemory(BusTypeGuid, &PnpBusTypeGuidList->Guids[Index], sizeof(GUID)); + } + else + { + /* Failure path */ + Status = STATUS_OBJECT_NAME_NOT_FOUND; + } + + /* Release lock and return status */ + ExReleaseFastMutex(&PnpBusTypeGuidList->Lock); + return Index; +} + +NTSTATUS +NTAPI +PpIrpQueryCapabilities(IN PDEVICE_OBJECT DeviceObject, + OUT PDEVICE_CAPABILITIES DeviceCaps) +{ + PAGED_CODE(); + PVOID Dummy; + IO_STACK_LOCATION Stack; + + /* Set up the Header */ + RtlZeroMemory(DeviceCaps, sizeof(DEVICE_CAPABILITIES)); + DeviceCaps->Size = sizeof(DEVICE_CAPABILITIES); + DeviceCaps->Version = 1; + DeviceCaps->Address = -1; + DeviceCaps->UINumber = -1; + + /* Set up the Stack */ + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); + Stack.MajorFunction = IRP_MJ_PNP; + Stack.MinorFunction = IRP_MN_QUERY_CAPABILITIES; + Stack.Parameters.DeviceCapabilities.Capabilities = DeviceCaps; + + /* Send the IRP */ + return IopSynchronousCall(DeviceObject, &Stack, &Dummy); +} + +NTSTATUS +NTAPI +PnpDeviceObjectToDeviceInstance(IN PDEVICE_OBJECT DeviceObject, + IN PHANDLE DeviceInstanceHandle, + IN ACCESS_MASK DesiredAccess) +{ + NTSTATUS Status; + HANDLE KeyHandle; + PDEVICE_NODE DeviceNode; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CURRENTCONTROLSET\\ENUM"); + PAGED_CODE(); + + /* Open the enum key */ + Status = IopOpenRegistryKeyEx(&KeyHandle, + NULL, + &KeyName, + KEY_READ); + if (!NT_SUCCESS(Status)) return Status; + + /* Make sure we have an instance path */ + DeviceNode = IopGetDeviceNode(DeviceObject); + if ((DeviceNode) && (DeviceNode->InstancePath.Length)) + { + /* Get the instance key */ + Status = IopOpenRegistryKeyEx(DeviceInstanceHandle, + KeyHandle, + &DeviceNode->InstancePath, + DesiredAccess); + } + else + { + /* Fail */ + Status = STATUS_INVALID_DEVICE_REQUEST; + } + + /* Close the handle and return status */ + ZwClose(KeyHandle); + return Status; +} + +ULONG +NTAPI +PnpDetermineResourceListSize(IN PCM_RESOURCE_LIST ResourceList) +{ + ULONG FinalSize, PartialSize, EntrySize, i, j; + PCM_FULL_RESOURCE_DESCRIPTOR FullDescriptor; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; + + /* If we don't have one, that's easy */ + if (!ResourceList) return 0; + + /* Start with the minimum size possible */ + FinalSize = FIELD_OFFSET(CM_RESOURCE_LIST, List); + + /* Loop each full descriptor */ + FullDescriptor = ResourceList->List; + for (i = 0; i < ResourceList->Count; i++) + { + /* Start with the minimum size possible */ + PartialSize = FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList) + + FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, PartialDescriptors); + + /* Loop each partial descriptor */ + PartialDescriptor = FullDescriptor->PartialResourceList.PartialDescriptors; + for (j = 0; j < FullDescriptor->PartialResourceList.Count; j++) + { + /* Start with the minimum size possible */ + EntrySize = sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + + /* Check if there is extra data */ + if (PartialDescriptor->Type == CmResourceTypeDeviceSpecific) + { + /* Add that data */ + EntrySize += PartialDescriptor->u.DeviceSpecificData.DataSize; + } + + /* The size of partial descriptors is bigger */ + PartialSize += EntrySize; + + /* Go to the next partial descriptor */ + PartialDescriptor = (PVOID)((ULONG_PTR)PartialDescriptor + EntrySize); + } + + /* The size of full descriptors is bigger */ + FinalSize += PartialSize; + + /* Go to the next full descriptor */ + FullDescriptor = (PVOID)((ULONG_PTR)FullDescriptor + PartialSize); + } + + /* Return the final size */ + return FinalSize; +} + +NTSTATUS +NTAPI +PiGetDeviceRegistryProperty(IN PDEVICE_OBJECT DeviceObject, + IN ULONG ValueType, + IN PWSTR ValueName, + IN PWSTR KeyName, + OUT PVOID Buffer, + IN PULONG BufferLength) +{ + NTSTATUS Status; + HANDLE KeyHandle, SubHandle; + UNICODE_STRING KeyString; + PKEY_VALUE_FULL_INFORMATION KeyValueInfo = NULL; + ULONG Length; + PAGED_CODE(); + + /* Find the instance key */ + Status = PnpDeviceObjectToDeviceInstance(DeviceObject, &KeyHandle, KEY_READ); + if (NT_SUCCESS(Status)) + { + /* Check for name given by caller */ + if (KeyName) + { + /* Open this key */ + RtlInitUnicodeString(&KeyString, KeyName); + Status = IopOpenRegistryKeyEx(&SubHandle, + KeyHandle, + &KeyString, + KEY_READ); + if (NT_SUCCESS(Status)) + { + /* And use this handle instead */ + ZwClose(KeyHandle); + KeyHandle = SubHandle; + } + } + + /* Check if sub-key handle succeeded (or no-op if no key name given) */ + if (NT_SUCCESS(Status)) + { + /* Now get the size of the property */ + Status = IopGetRegistryValue(KeyHandle, + ValueName, + &KeyValueInfo); + } + + /* Close the key */ + ZwClose(KeyHandle); + } + + /* Fail if any of the registry operations failed */ + if (!NT_SUCCESS(Status)) return Status; + + /* Check how much data we have to copy */ + Length = KeyValueInfo->DataLength; + if (*BufferLength >= Length) + { + /* Check for a match in the value type */ + if (KeyValueInfo->Type == ValueType) + { + /* Copy the data */ + RtlCopyMemory(Buffer, + (PVOID)((ULONG_PTR)KeyValueInfo + + KeyValueInfo->DataOffset), + Length); + } + else + { + /* Invalid registry property type, fail */ + Status = STATUS_INVALID_PARAMETER_2; + } + } + else + { + /* Buffer is too small to hold data */ + Status = STATUS_BUFFER_TOO_SMALL; + } + + /* Return the required buffer length, free the buffer, and return status */ + *BufferLength = Length; + ExFreePool(KeyValueInfo); + return Status; +} + +#define PIP_RETURN_DATA(x, y) {ReturnLength = x; Data = y; break;} +#define PIP_REGISTRY_DATA(x, y) {ValueName = x; ValueType = y; break;} +#define PIP_UNIMPLEMENTED() {UNIMPLEMENTED; while(TRUE); break;} + /* * @implemented */ @@ -3016,281 +3251,205 @@ { PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject); DEVICE_CAPABILITIES DeviceCaps; - ULONG Length; + ULONG ReturnLength = 0, Length = 0, ValueType; + PWCHAR ValueName = NULL, EnumeratorNameEnd, DeviceInstanceName; PVOID Data = NULL; - PWSTR Ptr; - NTSTATUS Status; + NTSTATUS Status = STATUS_BUFFER_TOO_SMALL; + GUID BusTypeGuid; POBJECT_NAME_INFORMATION ObjectNameInfo = NULL; - ULONG RequiredLength, ObjectNameInfoLength; - DPRINT("IoGetDeviceProperty(0x%p %d)\n", DeviceObject, DeviceProperty); + /* Assume failure */ *ResultLength = 0; - if (DeviceNode == NULL) - return STATUS_INVALID_DEVICE_REQUEST; - + /* Only PDOs can call this */ + if (!DeviceNode) return STATUS_INVALID_DEVICE_REQUEST; + + /* Handle all properties */ switch (DeviceProperty) { - case DevicePropertyBusNumber: - Length = sizeof(ULONG); - Data = &DeviceNode->ChildBusNumber; - break; - - /* Complete, untested */ - case DevicePropertyBusTypeGuid: - /* Sanity check */ - if ((DeviceNode->ChildBusTypeIndex != 0xFFFF) && - (DeviceNode->ChildBusTypeIndex < PnpBusTypeGuidList->GuidCount)) + case DevicePropertyBusTypeGuid: + + /* Get the GUID from the internal cache */ + Status = PnpBusTypeGuidGet(DeviceNode->ChildBusTypeIndex, &BusTypeGuid); + if (!NT_SUCCESS(Status)) return Status; + + /* This is the format of the returned data */ + PIP_RETURN_DATA(sizeof(GUID), &BusTypeGuid); + + case DevicePropertyLegacyBusType: + + /* Validate correct interface type */ + if (DeviceNode->ChildInterfaceType == InterfaceTypeUndefined) + return STATUS_OBJECT_NAME_NOT_FOUND; + + /* This is the format of the returned data */ + PIP_RETURN_DATA(sizeof(INTERFACE_TYPE), &DeviceNode->ChildInterfaceType); + + case DevicePropertyBusNumber: + + /* Validate correct bus number */ + if ((DeviceNode->ChildBusNumber & 0x80000000) == 0x80000000) + return STATUS_OBJECT_NAME_NOT_FOUND; + + /* This is the format of the returned data */ + PIP_RETURN_DATA(sizeof(ULONG), &DeviceNode->ChildBusNumber); + + case DevicePropertyEnumeratorName: + + /* Get the instance path */ + DeviceInstanceName = DeviceNode->InstancePath.Buffer; + + /* Sanity checks */ + ASSERT((BufferLength & 1) == 0); + ASSERT(DeviceInstanceName != NULL); + + /* Get the name from the path */ + EnumeratorNameEnd = wcschr(DeviceInstanceName, OBJ_NAME_PATH_SEPARATOR); + ASSERT(EnumeratorNameEnd); + + /* This is the format of the returned data */ + PIP_RETURN_DATA((EnumeratorNameEnd - DeviceInstanceName) * 2, + &DeviceNode->ChildBusNumber); + + case DevicePropertyAddress: + + /* Query the device caps */ + Status = PpIrpQueryCapabilities(DeviceObject, &DeviceCaps); + if (!NT_SUCCESS(Status) || (DeviceCaps.Address == MAXULONG)) + return STATUS_OBJECT_NAME_NOT_FOUND; + + /* This is the format of the returned data */ + PIP_RETURN_DATA(sizeof(ULONG), &DeviceCaps.Address); + + case DevicePropertyBootConfigurationTranslated: + + /* Validate we have resources */ + if (!DeviceNode->BootResources) +// if (!DeviceNode->BootResourcesTranslated) // FIXFIX: Need this field + { + /* No resources will still fake success, but with 0 bytes */ + *ResultLength = 0; + return STATUS_SUCCESS; + } + + /* This is the format of the returned data */ + PIP_RETURN_DATA(PnpDetermineResourceListSize(DeviceNode->BootResources), // FIXFIX: Should use BootResourcesTranslated + DeviceNode->BootResources); // FIXFIX: Should use BootResourcesTranslated + + case DevicePropertyPhysicalDeviceObjectName: + + /* Sanity check for Unicode-sized string */ + ASSERT((BufferLength & 1) == 0); + + /* Allocate name buffer */ + Length = BufferLength + sizeof(OBJECT_NAME_INFORMATION); + ObjectNameInfo = ExAllocatePool(PagedPool, Length); + if (!ObjectNameInfo) return STATUS_INSUFFICIENT_RESOURCES; + + /* Query the PDO name */ + Status = ObQueryNameString(DeviceObject, + ObjectNameInfo, + Length, + ResultLength); + if (Status == STATUS_INFO_LENGTH_MISMATCH) + { + /* It's up to the caller to try again */ + Status = STATUS_BUFFER_TOO_SMALL; + } + + /* Return if successful */ + if (NT_SUCCESS(Status)) PIP_RETURN_DATA(ObjectNameInfo->Name.Length, + ObjectNameInfo->Name.Buffer); + + /* Let the caller know how big the name is */ + *ResultLength -= sizeof(OBJECT_NAME_INFORMATION); + break; + + /* Handle the registry-based properties */ + case DevicePropertyUINumber: + PIP_REGISTRY_DATA(REGSTR_VAL_UI_NUMBER, REG_DWORD); + case DevicePropertyLocationInformation: + PIP_REGISTRY_DATA(REGSTR_VAL_LOCATION_INFORMATION, REG_SZ); + case DevicePropertyDeviceDescription: + PIP_REGISTRY_DATA(REGSTR_VAL_DEVDESC, REG_SZ); + case DevicePropertyHardwareID: + PIP_REGISTRY_DATA(REGSTR_VAL_HARDWAREID, REG_MULTI_SZ); + case DevicePropertyCompatibleIDs: + PIP_REGISTRY_DATA(REGSTR_VAL_COMPATIBLEIDS, REG_MULTI_SZ); + case DevicePropertyBootConfiguration: + PIP_REGISTRY_DATA(REGSTR_VAL_BOOTCONFIG, REG_RESOURCE_LIST); + case DevicePropertyClassName: + PIP_REGISTRY_DATA(REGSTR_VAL_CLASS, REG_SZ); + case DevicePropertyClassGuid: + PIP_REGISTRY_DATA(REGSTR_VAL_CLASSGUID, REG_SZ); + case DevicePropertyDriverKeyName: + PIP_REGISTRY_DATA(REGSTR_VAL_DRIVER, REG_SZ); + case DevicePropertyManufacturer: + PIP_REGISTRY_DATA(REGSTR_VAL_MFG, REG_SZ); + case DevicePropertyFriendlyName: + PIP_REGISTRY_DATA(REGSTR_VAL_FRIENDLYNAME, REG_SZ); + case DevicePropertyContainerID: + //PIP_REGISTRY_DATA(REGSTR_VAL_CONTAINERID, REG_SZ); // Win7 + PIP_UNIMPLEMENTED(); + case DevicePropertyRemovalPolicy: + PIP_UNIMPLEMENTED(); + case DevicePropertyInstallState: + PIP_UNIMPLEMENTED(); + case DevicePropertyResourceRequirements: + PIP_UNIMPLEMENTED(); + case DevicePropertyAllocatedResources: + PIP_UNIMPLEMENTED(); + default: + return STATUS_INVALID_PARAMETER_2; + } + + /* Having a registry value name implies registry data */ + if (ValueName) + { + /* We know up-front how much data to expect */ + *ResultLength = BufferLength; + + /* Go get the data, use the LogConf subkey if necessary */ + Status = PiGetDeviceRegistryProperty(DeviceObject, + ValueType, + ValueName, + (DeviceProperty == + DevicePropertyBootConfiguration) ? + L"LogConf": NULL, + PropertyBuffer, + ResultLength); + } + else if (NT_SUCCESS(Status)) + { + /* We know up-front how much data to expect, check the caller's buffer */ + *ResultLength = ReturnLength; + if (ReturnLength <= BufferLength) { - /* Return the GUID */ - *ResultLength = sizeof(GUID); - - /* Check if the buffer given was large enough */ - if (BufferLength < *ResultLength) + /* Buffer is all good, copy the data */ + RtlCopyMemory(PropertyBuffer, Data, ReturnLength); + + /* Check for properties that require a null-terminated string */ + if ((DeviceProperty == DevicePropertyEnumeratorName) || + (DeviceProperty == DevicePropertyPhysicalDeviceObjectName)) { - return STATUS_BUFFER_TOO_SMALL; + /* Terminate the string */ + ((PWCHAR)PropertyBuffer)[ReturnLength / sizeof(WCHAR)] = UNICODE_NULL; } - - /* Copy the GUID */ - RtlCopyMemory(PropertyBuffer, - &(PnpBusTypeGuidList->Guids[DeviceNode->ChildBusTypeIndex]), - sizeof(GUID)); - return STATUS_SUCCESS; + + /* This is the success path */ + Status = STATUS_SUCCESS; } else { - return STATUS_OBJECT_NAME_NOT_FOUND; + /* Failure path */ + Status = STATUS_BUFFER_TOO_SMALL; } - break; - - case DevicePropertyLegacyBusType: - Length = sizeof(INTERFACE_TYPE); - Data = &DeviceNode->ChildInterfaceType; - break; - - case DevicePropertyAddress: - /* Query the device caps */ - Status = IopQueryDeviceCapabilities(DeviceNode, &DeviceCaps); - if (NT_SUCCESS(Status) && (DeviceCaps.Address != MAXULONG)) - { - /* Return length */ - *ResultLength = sizeof(ULONG); - - /* Check if the buffer given was large enough */ - if (BufferLength < *ResultLength) - { - return STATUS_BUFFER_TOO_SMALL; - } - - /* Return address */ - *(PULONG)PropertyBuffer = DeviceCaps.Address; - return STATUS_SUCCESS; - } - else - { - return STATUS_OBJECT_NAME_NOT_FOUND; - } - break; - -// case DevicePropertyUINumber: -// if (DeviceNode->CapabilityFlags == NULL) -// return STATUS_INVALID_DEVICE_REQUEST; -// Length = sizeof(ULONG); -// Data = &DeviceNode->CapabilityFlags->UINumber; -// break; - - case DevicePropertyClassName: - case DevicePropertyClassGuid: - case DevicePropertyDriverKeyName: - case DevicePropertyManufacturer: - case DevicePropertyFriendlyName: - case DevicePropertyHardwareID: - case DevicePropertyCompatibleIDs: - case DevicePropertyDeviceDescription: - case DevicePropertyLocationInformation: - case DevicePropertyUINumber: - { - LPCWSTR RegistryPropertyName; - UNICODE_STRING EnumRoot = RTL_CONSTANT_STRING(ENUM_ROOT); - UNICODE_STRING ValueName; - KEY_VALUE_PARTIAL_INFORMATION *ValueInformation; - ULONG ValueInformationLength; - HANDLE KeyHandle, EnumRootHandle; - NTSTATUS Status; - - switch (DeviceProperty) - { - case DevicePropertyClassName: - RegistryPropertyName = L"Class"; break; - case DevicePropertyClassGuid: - RegistryPropertyName = L"ClassGuid"; break; - case DevicePropertyDriverKeyName: - RegistryPropertyName = L"Driver"; break; - case DevicePropertyManufacturer: - RegistryPropertyName = L"Mfg"; break; - case DevicePropertyFriendlyName: - RegistryPropertyName = L"FriendlyName"; break; - case DevicePropertyHardwareID: - RegistryPropertyName = L"HardwareID"; break; - case DevicePropertyCompatibleIDs: - RegistryPropertyName = L"CompatibleIDs"; break; - case DevicePropertyDeviceDescription: - RegistryPropertyName = L"DeviceDesc"; break; - case DevicePropertyLocationInformation: - RegistryPropertyName = L"LocationInformation"; break; - case DevicePropertyUINumber: - RegistryPropertyName = L"UINumber"; break; - default: - /* Should not happen */ - ASSERT(FALSE); - return STATUS_UNSUCCESSFUL; - } - - DPRINT("Registry property %S\n", RegistryPropertyName); - - /* Open Enum key */ - Status = IopOpenRegistryKeyEx(&EnumRootHandle, NULL, - &EnumRoot, KEY_READ); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Error opening ENUM_ROOT, Status=0x%08x\n", Status); - return Status; - } - - /* Open instance key */ - Status = IopOpenRegistryKeyEx(&KeyHandle, EnumRootHandle, - &DeviceNode->InstancePath, KEY_READ); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Error opening InstancePath, Status=0x%08x\n", Status); - ZwClose(EnumRootHandle); - return Status; - } - - /* Allocate buffer to read as much data as required by the caller */ - ValueInformationLength = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, - Data[0]) + BufferLength; - ValueInformation = ExAllocatePool(PagedPool, ValueInformationLength); - if (!ValueInformation) - { - ZwClose(KeyHandle); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Read the value */ - RtlInitUnicodeString(&ValueName, RegistryPropertyName); - Status = ZwQueryValueKey(KeyHandle, &ValueName, - KeyValuePartialInformation, ValueInformation, - ValueInformationLength, - &ValueInformationLength); - ZwClose(KeyHandle); - - /* Return data */ - *ResultLength = ValueInformation->DataLength; - - if (!NT_SUCCESS(Status)) - { - ExFreePool(ValueInformation); - if (Status == STATUS_BUFFER_OVERFLOW) - return STATUS_BUFFER_TOO_SMALL; - DPRINT1("Problem: Status=0x%08x, ResultLength = %d\n", Status, *ResultLength); - return Status; - } - - /* FIXME: Verify the value (NULL-terminated, correct format). */ - RtlCopyMemory(PropertyBuffer, ValueInformation->Data, - ValueInformation->DataLength); - ExFreePool(ValueInformation); - - return STATUS_SUCCESS; - } - - case DevicePropertyBootConfiguration: - Length = 0; - if (DeviceNode->BootResources->Count != 0) - { - Length = IopCalculateResourceListSize(DeviceNode->BootResources); - } - Data = DeviceNode->BootResources; - break; - - /* FIXME: use a translated boot configuration instead */ - case DevicePropertyBootConfigurationTranslated: - Length = 0; - if (DeviceNode->BootResources->Count != 0) - { - Length = IopCalculateResourceListSize(DeviceNode->BootResources); - } - Data = DeviceNode->BootResources; - break; - - case DevicePropertyEnumeratorName: - /* A buffer overflow can't happen here, since InstancePath - * always contains the enumerator name followed by \\ */ - Ptr = wcschr(DeviceNode->InstancePath.Buffer, L'\\'); - ASSERT(Ptr); - Length = (Ptr - DeviceNode->InstancePath.Buffer) * sizeof(WCHAR); - Data = DeviceNode->InstancePath.Buffer; - break; - - case DevicePropertyPhysicalDeviceObjectName: - Status = ObQueryNameString(DeviceNode->PhysicalDeviceObject, - NULL, - 0, - &RequiredLength); - if (Status == STATUS_SUCCESS) - { - Length = 0; - Data = L""; - } - else if (Status == STATUS_INFO_LENGTH_MISMATCH) - { - ObjectNameInfoLength = RequiredLength; - ObjectNameInfo = ExAllocatePool(PagedPool, ObjectNameInfoLength); - if (!ObjectNameInfo) - return STATUS_INSUFFICIENT_RESOURCES; - - Status = ObQueryNameString(DeviceNode->PhysicalDeviceObject, - ObjectNameInfo, - ObjectNameInfoLength, - &RequiredLength); - if (NT_SUCCESS(Status)) - { - Length = ObjectNameInfo->Name.Length; - Data = ObjectNameInfo->Name.Buffer; - } - else - return Status; - } - else - return Status; - break; - - default: - return STATUS_INVALID_PARAMETER_2; - } - - /* Prepare returned values */ - *ResultLength = Length; - if (BufferLength < Length) - { - if (ObjectNameInfo != NULL) - ExFreePool(ObjectNameInfo); - - return STATUS_BUFFER_TOO_SMALL; - } - RtlCopyMemory(PropertyBuffer, Data, Length); - - /* NULL terminate the string (if required) */ - if (DeviceProperty == DevicePropertyEnumeratorName || - DeviceProperty == DevicePropertyPhysicalDeviceObjectName) - ((LPWSTR)PropertyBuffer)[Length / sizeof(WCHAR)] = UNICODE_NULL; - - if (ObjectNameInfo != NULL) - ExFreePool(ObjectNameInfo); - - return STATUS_SUCCESS; + } + + /* Free any allocation we may have made, and return the status code */ + if (ObjectNameInfo) ExFreePool(ObjectNameInfo); + return Status; } /* Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Sat May 29 01:03:27 2010 @@ -634,25 +634,37 @@ if (DeviceNode->ResourceList) { - WCHAR NameBuff[256]; + PWCHAR DeviceName = NULL; UNICODE_STRING NameU; UNICODE_STRING Suffix; - ULONG OldLength; + ULONG OldLength = 0; ASSERT(DeviceNode->ResourceListTranslated); - - NameU.Buffer = NameBuff; - NameU.Length = 0; - NameU.MaximumLength = 256 * sizeof(WCHAR); Status = IoGetDeviceProperty(DeviceNode->PhysicalDeviceObject, DevicePropertyPhysicalDeviceObjectName, - NameU.MaximumLength, - NameU.Buffer, + 0, + NULL, &OldLength); - ASSERT(Status == STATUS_SUCCESS); - - NameU.Length = (USHORT)OldLength; + if ((OldLength != 0) && (Status == STATUS_BUFFER_TOO_SMALL)) + { + DeviceName = ExAllocatePool(NonPagedPool, OldLength); + ASSERT(DeviceName); + + IoGetDeviceProperty(DeviceNode->PhysicalDeviceObject, + DevicePropertyPhysicalDeviceObjectName, + OldLength, + DeviceName, + &OldLength); + + RtlInitUnicodeString(&NameU, DeviceName); + } + else + { + /* Some failure */ + ASSERT(!NT_SUCCESS(Status)); + return Status; + } RtlInitUnicodeString(&Suffix, L".Raw"); RtlAppendUnicodeStringToString(&NameU, &Suffix); @@ -682,6 +694,8 @@ DeviceNode->ResourceListTranslated, IopCalculateResourceListSize(DeviceNode->ResourceListTranslated)); ZwClose(PnpMgrLevel2); + ASSERT(DeviceName); + ExFreePool(DeviceName); if (!NT_SUCCESS(Status)) return Status; }

14 years, 5 months

[cgutman] 47387: [FREELOADER] - Fix DoOptionsMenu and implement AppendBootOptions to support F8 boot options - Fixes bug 5363

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat May 29 00:54:27 2010 New Revision: 47387 URL: http://svn.reactos.org/svn/reactos?rev=47387&view=rev Log: [FREELOADER] - Fix DoOptionsMenu and implement AppendBootOptions to support F8 boot options - Fixes bug 5363 Modified: trunk/reactos/boot/freeldr/freeldr/include/options.h trunk/reactos/boot/freeldr/freeldr/options.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/include/options.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/options.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/options.h [iso-8859-1] Sat May 29 00:54:27 2010 @@ -20,3 +20,4 @@ #pragma once VOID DoOptionsMenu(VOID); +VOID AppendBootTimeOptions(PCHAR BootOptions); Modified: trunk/reactos/boot/freeldr/freeldr/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/optio… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/options.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/options.c [iso-8859-1] Sat May 29 00:54:27 2010 @@ -69,6 +69,15 @@ ULONG OptionsMenuItemCount = sizeof(OptionsMenuList) / sizeof(OptionsMenuList[0]); +BOOLEAN SafeMode = FALSE; +BOOLEAN SafeModeWithNetworking = FALSE; +BOOLEAN SafeModeWithCommandPrompt = FALSE; +BOOLEAN BootLogging = FALSE; +BOOLEAN VgaMode = FALSE; +BOOLEAN LastKnownGoodConfiguration = FALSE; +BOOLEAN DirectoryServicesRepairMode = FALSE; +BOOLEAN DebuggingMode = FALSE; + VOID DoOptionsMenu(VOID) { ULONG SelectedMenuItem; @@ -85,22 +94,33 @@ switch (SelectedMenuItem) { case SAFE_MODE: + SafeMode = TRUE; + BootLogging = TRUE; break; case SAFE_MODE_WITH_NETWORKING: + SafeModeWithNetworking = TRUE; + BootLogging = TRUE; break; case SAFE_MODE_WITH_COMMAND_PROMPT: + SafeModeWithCommandPrompt = TRUE; + BootLogging = TRUE; break; //case SEPARATOR1: // break; case ENABLE_BOOT_LOGGING: + BootLogging = TRUE; break; case ENABLE_VGA_MODE: + VgaMode = TRUE; break; case LAST_KNOWN_GOOD_CONFIGURATION: + LastKnownGoodConfiguration = TRUE; break; case DIRECTORY_SERVICES_RESTORE_MODE: + DirectoryServicesRepairMode = TRUE; break; case DEBUGGING_MODE: + DebuggingMode = TRUE; break; //case SEPARATOR2: // break; @@ -117,3 +137,29 @@ } } +VOID AppendBootTimeOptions(PCHAR BootOptions) +{ + if (SafeMode) + strcat(BootOptions, " /SAFEBOOT:MINIMAL /SOS"); //FIXME: NOGUIBOOT should also be specified + + if (SafeModeWithNetworking) + strcat(BootOptions, " /SAFEBOOT:NETWORK /SOS"); //FIXME: NOGUIBOOT should also be specified + + if (SafeModeWithCommandPrompt) + strcat(BootOptions, " /SAFEBOOT:MINIMAL(ALTERNATESHELL) /SOS"); //FIXME: NOGUIBOOT should also be specified + + if (BootLogging) + strcat(BootOptions, " /BOOTLOG"); + + if (VgaMode) + strcat(BootOptions, " /BASEVIDEO"); + + if (LastKnownGoodConfiguration) + DbgPrint("Last known good configuration is not supported yet!\n"); + + if (DirectoryServicesRepairMode) + strcat(BootOptions, " /SAFEBOOT:DSREPAIR /SOS"); + + if (DebuggingMode) + strcat(BootOptions, " /DEBUG"); +} Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Sat May 29 00:54:27 2010 @@ -606,6 +606,11 @@ // if (IniReadSettingByName(SectionId, "Options", value, sizeof(value))) { + // + // Append boot-time options + // + AppendBootTimeOptions(value); + // // Check if a ramdisk file was given // Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Sat May 29 00:54:27 2010 @@ -475,6 +475,9 @@ DPRINTM(DPRINT_WINDOWS,"BootOptions: '%s'\n", BootOptions); } + /* Append boot-time options */ + AppendBootTimeOptions(BootOptions); + // // Check if a ramdisk file was given //

14 years, 5 months

[jgardou] 47386: [USER32] - Change ChangeDisplaySettingsExA to look more like wine's one [WIN32K] - Return correct value if buffer is to small in UserChangeDisplaySettings (wine tests) - Do not set an invalid size to the devmode we're passing ti UserChangeDisplaySettings, we might access garbage Now all ChangeDisplaySettings related wine tests pass.

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri May 28 23:58:33 2010 New Revision: 47386 URL: http://svn.reactos.org/svn/reactos?rev=47386&view=rev Log: [USER32] - Change ChangeDisplaySettingsExA to look more like wine's one [WIN32K] - Return correct value if buffer is to small in UserChangeDisplaySettings (wine tests) - Do not set an invalid size to the devmode we're passing ti UserChangeDisplaySettings, we might access garbage Now all ChangeDisplaySettings related wine tests pass. Modified: branches/reactos-yarotows/dll/win32/user32/misc/display.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c Modified: branches/reactos-yarotows/dll/win32/user32/misc/display.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… ============================================================================== --- branches/reactos-yarotows/dll/win32/user32/misc/display.c [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/user32/misc/display.c [iso-8859-1] Fri May 28 23:58:33 2010 @@ -457,7 +457,6 @@ LONG rc; UNICODE_STRING DeviceName; PUNICODE_STRING pDeviceName = &DeviceName; - LPDEVMODEW pDevModeW; if (lpszDeviceName != NULL) { @@ -471,14 +470,19 @@ pDeviceName = NULL; if (lpDevMode != NULL) + { + LPDEVMODEW pDevModeW; pDevModeW = GdiConvertToDevmodeW(lpDevMode); + if(pDevModeW) + { + rc = NtUserChangeDisplaySettings ( pDeviceName, pDevModeW, hwnd, dwflags, lParam ); + RtlFreeHeap(GetProcessHeap(), 0, pDevModeW); + } + else + rc = DISP_CHANGE_SUCCESSFUL; + } else - pDevModeW = NULL; - - rc = NtUserChangeDisplaySettings ( pDeviceName, pDevModeW, hwnd, dwflags, lParam ); - - if (pDevModeW != NULL) - RtlFreeHeap(GetProcessHeap(), 0, pDevModeW); + rc = NtUserChangeDisplaySettings ( pDeviceName, NULL, hwnd, dwflags, lParam ); if (lpszDeviceName != NULL) RtlFreeUnicodeString ( &DeviceName ); @@ -539,6 +543,6 @@ DWORD dwflags) { if(lpDevMode) - lpDevMode->dmDriverExtra = 0; + lpDevMode->dmDriverExtra = 0; return ChangeDisplaySettingsExW ( NULL, lpDevMode, NULL, dwflags, 0 ); } Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Fri May 28 23:58:33 2010 @@ -708,7 +708,7 @@ } } else if (pdm->dmSize < FIELD_OFFSET(DEVMODEW, dmFields)) - return DISP_CHANGE_FAILED; + return DISP_CHANGE_BADMODE; /* This is what winXP SP3 returns */ else dm = *pdm; @@ -899,7 +899,6 @@ /* Probe and copy the full DEVMODE */ ProbeForRead(lpDevMode, dmLocal.dmSize, 1); RtlCopyMemory(&dmLocal, lpDevMode, dmLocal.dmSize); - dmLocal.dmSize = sizeof(dmLocal); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

14 years, 5 months

← Newer
1
...
9
10
11
12
13
14
15
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2010