Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 31472: Add #define VIDMEM_* * to make some older drv code happy
by greatlrd＠svn.reactos.org 28 Dec '07

28 Dec '07

Author: greatlrd Date: Fri Dec 28 16:56:03 2007 New Revision: 31472 URL: http://svn.reactos.org/svn/reactos?rev=31472&view=rev Log: Add #define VIDMEM_* * to make some older drv code happy Modified: trunk/reactos/include/ddk/ddrawint.h Modified: trunk/reactos/include/ddk/ddrawint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawint.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ddrawint.h (original) +++ trunk/reactos/include/ddk/ddrawint.h Fri Dec 28 16:56:03 2007 @@ -1451,6 +1451,16 @@ #define DDRAWI_VPORTGETCOLOR 0x0001 #define DDRAWI_VPORTSETCOLOR 0x0002 +#ifndef __DDRAWI_INCLUDED__ +#define VIDMEM_ISLINEAR 0x00000001 +#define VIDMEM_ISRECTANGULAR 0x00000002 +#define VIDMEM_ISHEAP 0x00000004 +#define VIDMEM_ISNONLOCAL 0x00000008 +#define VIDMEM_ISWC 0x00000010 +#define VIDMEM_ISDISABLED 0x00000020 +#endif + + #ifdef __cplusplus } /* extern "C" */ #endif

1 0

[hpoussin] 31471: Use the captured string instead of the original one Fix little bugs introduced in r31467
by hpoussin＠svn.reactos.org 27 Dec '07

27 Dec '07

Author: hpoussin Date: Fri Dec 28 00:21:36 2007 New Revision: 31471 URL: http://svn.reactos.org/svn/reactos?rev=31471&view=rev Log: Use the captured string instead of the original one Fix little bugs introduced in r31467 Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c (contents, props changed) trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Fri Dec 28 00:21:36 2007 @@ -371,7 +371,7 @@ } /* Get the device object */ - DeviceObject = IopGetDeviceObjectFromDeviceInstance(&PropertyData->DeviceInstance); + DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance); ExFreePool(DeviceInstance.Buffer); if (DeviceObject == NULL) { @@ -552,13 +552,11 @@ NTSTATUS Status = STATUS_SUCCESS; DPRINT("IopDeviceStatus() called\n"); - DPRINT("Device name: %wZ\n", &StatusData->DeviceInstance); Status = IopCaptureUnicodeString(&DeviceInstance, &StatusData->DeviceInstance); if (!NT_SUCCESS(Status)) - { - return Status; - } + return Status; + DPRINT("Device name: '%wZ'\n", &DeviceInstance); _SEH_TRY { @@ -577,15 +575,13 @@ if (!NT_SUCCESS(Status)) { - if (DeviceInstance.Buffer) - { - ExFreePool(DeviceInstance.Buffer); - } - return Status; + if (DeviceInstance.Buffer) + ExFreePool(DeviceInstance.Buffer); + return Status; } /* Get the device object */ - DeviceObject = IopGetDeviceObjectFromDeviceInstance(&StatusData->DeviceInstance); + DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance); ExFreePool(DeviceInstance.Buffer); if (DeviceObject == NULL) return STATUS_NO_SUCH_DEVICE; @@ -649,7 +645,7 @@ } /* Get the device object */ - DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DepthData->DeviceInstance); + DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance); ExFreePool(DeviceInstance.Buffer); if (DeviceObject == NULL) return STATUS_NO_SUCH_DEVICE; Propchange: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Fri Dec 28 00:21:36 2007 @@ -1653,6 +1653,8 @@ /* OK, value is correct ; prepare to return it */ KeyValue.Length = KeyValue.MaximumLength = (USHORT)ParentIdPrefixInformation->DataLength; KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data; + if (KeyValue.Length && KeyValue.Buffer[KeyValue.Length / sizeof(WCHAR) - 1] == UNICODE_NULL); + KeyValue.Length -= sizeof(WCHAR); } /* We're done */ @@ -2461,7 +2463,11 @@ * Make sure this device node is a direct child of the parent device node * that is given as an argument */ - ASSERT(DeviceNode->Parent == ParentDeviceNode); + if (DeviceNode->Parent != ParentDeviceNode) + { + DPRINT("Not a direct child\n"); + return STATUS_UNSUCCESSFUL; + } if (!IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED) && !IopDeviceNodeHasFlag(DeviceNode, DNF_ADDED) &&

1 0

[hpoussin] 31470: Add traces
by hpoussin＠svn.reactos.org 27 Dec '07

27 Dec '07

Author: hpoussin Date: Thu Dec 27 23:51:53 2007 New Revision: 31470 URL: http://svn.reactos.org/svn/reactos?rev=31470&view=rev Log: Add traces Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/dll/win32/newdev/newdev.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Thu Dec 27 23:51:53 2007 @@ -1494,6 +1494,8 @@ NTSTATUS Status; BOOL DeviceInstalled = FALSE; + DPRINT("InstallDevice(%S, %d)\n", DeviceInstance, ShowWizard); + RtlInitUnicodeString(&PlugPlayData.DeviceInstance, DeviceInstance); PlugPlayData.Operation = 0; /* Get status */ @@ -1503,25 +1505,40 @@ (PVOID)&PlugPlayData, sizeof(PLUGPLAY_CONTROL_STATUS_DATA)); if (!NT_SUCCESS(Status)) + { + DPRINT1("NtPlugPlayControl('%S') failed with status 0x%08lx\n", DeviceInstance, Status); return FALSE; + } if ((PlugPlayData.DeviceStatus & (DNF_STARTED | DNF_START_FAILED)) != 0) + { /* Device is already started, or disabled due to some problem. Don't install it */ + DPRINT("No need to install '%S'\n", DeviceInstance); return TRUE; + } /* Install device */ SetEnvironmentVariableW(L"USERPROFILE", L"."); /* FIXME: why is it needed? */ hNewDev = LoadLibraryW(L"newdev.dll"); if (!hNewDev) + { + DPRINT1("Unable to load newdev.dll\n"); goto cleanup; + } DevInstallW = (PDEV_INSTALL_W)GetProcAddress(hNewDev, (LPCSTR)"DevInstallW"); if (!DevInstallW) + { + DPRINT1("'DevInstallW' not found in newdev.dll\n"); goto cleanup; + } if (!DevInstallW(NULL, NULL, DeviceInstance, ShowWizard ? SW_SHOWNOACTIVATE : SW_HIDE)) + { + DPRINT1("DevInstallW('%S') failed\n", DeviceInstance); goto cleanup; + } DeviceInstalled = TRUE; @@ -1660,8 +1677,6 @@ UNREFERENCED_PARAMETER(lpParameter); showWizard = !SetupIsActive() && !IsConsoleBoot(); - - SetEnvironmentVariable(L"USERPROFILE", L"."); /* FIXME: why is it needed? */ while (TRUE) { Modified: trunk/reactos/dll/win32/newdev/newdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.c (original) +++ trunk/reactos/dll/win32/newdev/newdev.c Thu Dec 27 23:51:53 2007 @@ -643,6 +643,8 @@ DWORD config_flags; BOOL retval = FALSE; + TRACE("(%p, %p, %s, %d)\n", hWndParent, hInstance, debugstr_w(InstanceId), Show); + if (!IsUserAdmin()) { /* XP kills the process... */ @@ -731,6 +733,7 @@ if (config_flags & CONFIGFLAG_FAILEDINSTALL) { /* The device is disabled */ + TRACE("Device is disabled\n"); retval = TRUE; goto cleanup; } @@ -748,6 +751,7 @@ { /* Driver found ; install it */ retval = InstallCurrentDriver(DevInstData); + TRACE("InstallCurrentDriver() returned %d\n", retval); if (retval && Show != SW_HIDE) { /* Should we display the 'Need to reboot' page? */ @@ -759,7 +763,10 @@ &installParams)) { if (installParams.Flags & (DI_NEEDRESTART | DI_NEEDREBOOT)) + { + TRACE("Displaying 'Reboot' wizard page\n"); retval = DisplayWizard(DevInstData, hWndParent, IDD_NEEDREBOOT); + } } } goto cleanup; @@ -767,10 +774,12 @@ else if (Show == SW_HIDE) { /* We can't show the wizard. Fail the install */ + TRACE("No wizard\n"); goto cleanup; } /* Prepare the wizard, and display it */ + TRACE("Need to show install wizard\n"); retval = DisplayWizard(DevInstData, hWndParent, IDD_WELCOMEPAGE); cleanup:

1 0

[greatlrd] 31469: documented : EngLockDirectDrawSurface small optimize of EngLockDirectDrawSurface, EngDxIoctl,
by greatlrd＠svn.reactos.org 27 Dec '07

27 Dec '07

Author: greatlrd Date: Thu Dec 27 22:24:22 2007 New Revision: 31469 URL: http://svn.reactos.org/svn/reactos?rev=31469&view=rev Log: documented : EngLockDirectDrawSurface small optimize of EngLockDirectDrawSurface, EngDxIoctl, Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c Thu Dec 27 22:24:22 2007 @@ -143,37 +143,49 @@ ULONG ulBufferSize) { PGD_ENGDXIOCTL pfnEngDxIoctl = (PGD_ENGDXIOCTL)gpDxFuncs[DXG_INDEX_DxDdIoctl].pfn; - - if (pfnEngDxIoctl == NULL) - { - DPRINT1("Warring no pfnEngDxIoctl"); - return DDERR_UNSUPPORTED; - } + DWORD retVal = DDERR_UNSUPPORTED; DPRINT1("Calling on dxg.sys pfnEngDxIoctl"); - return pfnEngDxIoctl(ulIoctl, pBuffer, ulBufferSize); -} - -/************************************************************************/ -/* EngLockDirectDrawSurface */ -/************************************************************************/ + + if (pfnEngDxIoctl != NULL) + { + retVal = pfnEngDxIoctl(ulIoctl, pBuffer, ulBufferSize); + } + + return retVal; +} + +/*++ +* @name EngLockDirectDrawSurface +* @implemented +* +* The function EngUnlockDirectDrawSurface locking the dx surface + +* @param HANDLE hSurface +* The handle of a surface +* +* @return +* This return vaild or NULL pointer to PDD_SURFACE_LOCAL object +* +* @remarks. +* None +* +*--*/ PDD_SURFACE_LOCAL STDCALL EngLockDirectDrawSurface(HANDLE hSurface) { - PGD_ENGLOCKDIRECTDRAWSURFACE pfnEngLockDirectDrawSurface = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdLockDirectDrawSurface, pfnEngLockDirectDrawSurface); - - if (pfnEngLockDirectDrawSurface == NULL) - { - DPRINT1("Warring no pfnEngLockDirectDrawSurface"); - return DDHAL_DRIVER_NOTHANDLED; - } + PGD_ENGLOCKDIRECTDRAWSURFACE pfnEngLockDirectDrawSurface = (PGD_ENGLOCKDIRECTDRAWSURFACE)gpDxFuncs[DXG_INDEX_DxDdLockDirectDrawSurface].pfn; + PDD_SURFACE_LOCAL retVal = NULL; DPRINT1("Calling on dxg.sys pfnEngLockDirectDrawSurface"); - return pfnEngLockDirectDrawSurface(hSurface); + + if (pfnEngLockDirectDrawSurface != NULL) + { + retVal = pfnEngLockDirectDrawSurface(hSurface); + } + + return retVal; }

1 0

[greatlrd] 31468: documented : EngUnlockDirectDrawSurface
by greatlrd＠svn.reactos.org 27 Dec '07

27 Dec '07

Author: greatlrd Date: Thu Dec 27 22:11:56 2007 New Revision: 31468 URL: http://svn.reactos.org/svn/reactos?rev=31468&view=rev Log: documented : EngUnlockDirectDrawSurface Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c Thu Dec 27 22:11:56 2007 @@ -116,7 +116,7 @@ * @name EngDxIoctl * @implemented * -* The function EngDxIoctl is the ioctl call to diffent dx functions +* The function EngDxIoctl is the ioctl call to diffent dx functions * to the driver dxg.sys * * @param ULONG ulIoctl @@ -128,7 +128,7 @@ * @param ULONG ulBufferSize * The buffer size in bytes * -* @return +* @return * always return DDERR_UNSUPPORTED * * @remarks. @@ -176,25 +176,37 @@ return pfnEngLockDirectDrawSurface(hSurface); } -/************************************************************************/ -/* EngUnlockDirectDrawSurface */ -/************************************************************************/ + +/*++ +* @name EngUnlockDirectDrawSurface +* @implemented +* +* The function EngUnlockDirectDrawSurface locking the dx surface + +* @param PDD_SURFACE_LOCAL pSurface +* The Surface we whant lock +* +* @return +* This return FALSE or TRUE, FALSE for fail, TRUE for success +* +* @remarks. +* None +* +*--*/ BOOL STDCALL EngUnlockDirectDrawSurface(PDD_SURFACE_LOCAL pSurface) { - PGD_ENGUNLOCKDIRECTDRAWSURFACE pfnEngUnlockDirectDrawSurface = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdUnlockDirectDrawSurface, pfnEngUnlockDirectDrawSurface); - - if (pfnEngUnlockDirectDrawSurface == NULL) - { - DPRINT1("Warring no pfnEngUnlockDirectDrawSurface"); - return DDHAL_DRIVER_NOTHANDLED; - } + PGD_ENGUNLOCKDIRECTDRAWSURFACE pfnEngUnlockDirectDrawSurface = (PGD_ENGUNLOCKDIRECTDRAWSURFACE)gpDxFuncs[DXG_INDEX_DxDdUnlockDirectDrawSurface].pfn; + BOOL retVal = FALSE; DPRINT1("Calling on dxg.sys pfnEngUnlockDirectDrawSurface"); - return pfnEngUnlockDirectDrawSurface(pSurface); -} - + + if (pfnEngUnlockDirectDrawSurface != NULL) + { + retVal = pfnEngUnlockDirectDrawSurface(pSurface); + } + + return retVal; +} +

1 0

[hpoussin] 31467: Use UNICODE_STRING and Rtl functions instead of LPWSTR variables (can prevent some buffer overflows) Remove assumption that UNICODE_STRING buffers are always NULL terminated Remove some intermediate buffers Do not define multiple times PnP parent key
by hpoussin＠svn.reactos.org 27 Dec '07

27 Dec '07

Author: hpoussin Date: Thu Dec 27 22:02:32 2007 New Revision: 31467 URL: http://svn.reactos.org/svn/reactos?rev=31467&view=rev Log: Use UNICODE_STRING and Rtl functions instead of LPWSTR variables (can prevent some buffer overflows) Remove assumption that UNICODE_STRING buffers are always NULL terminated Remove some intermediate buffers Do not define multiple times PnP parent key Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Thu Dec 27 22:02:32 2007 @@ -18,6 +18,8 @@ //#define ENABLE_ACPI /* GLOBALS *******************************************************************/ + +#define ENUM_ROOT L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum" PDEVICE_NODE IopRootDeviceNode; KSPIN_LOCK IopDeviceTreeLock; @@ -403,12 +405,13 @@ case DevicePropertyLocationInformation: case DevicePropertyUINumber: { - LPWSTR RegistryPropertyName, KeyNameBuffer; - UNICODE_STRING KeyName, ValueName; + LPCWSTR RegistryPropertyName; + UNICODE_STRING EnumU = RTL_CONSTANT_STRING(ENUM_ROOT); + UNICODE_STRING ValueName; OBJECT_ATTRIBUTES ObjectAttributes; KEY_VALUE_PARTIAL_INFORMATION *ValueInformation; ULONG ValueInformationLength; - HANDLE KeyHandle; + HANDLE hEnum, KeyHandle; NTSTATUS Status; switch (DeviceProperty) @@ -434,62 +437,70 @@ case DevicePropertyUINumber: RegistryPropertyName = L"UINumber"; break; default: - RegistryPropertyName = NULL; break; + /* Should not happen */ + ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; } - KeyNameBuffer = ExAllocatePool(PagedPool, - (49 * sizeof(WCHAR)) + DeviceNode->InstancePath.Length); - - DPRINT("KeyNameBuffer: 0x%p, value %S\n", KeyNameBuffer, RegistryPropertyName); - - if (KeyNameBuffer == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - wcscpy(KeyNameBuffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); - wcscat(KeyNameBuffer, DeviceNode->InstancePath.Buffer); - RtlInitUnicodeString(&KeyName, KeyNameBuffer); - InitializeObjectAttributes(&ObjectAttributes, &KeyName, - OBJ_CASE_INSENSITIVE, NULL, NULL); - - Status = ZwOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes); - ExFreePool(KeyNameBuffer); - if (!NT_SUCCESS(Status)) - return Status; - - RtlInitUnicodeString(&ValueName, RegistryPropertyName); - ValueInformationLength = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, - Data[0]) + BufferLength; - ValueInformation = ExAllocatePool(PagedPool, ValueInformationLength); - if (ValueInformation == NULL) - { - ZwClose(KeyHandle); - return STATUS_INSUFFICIENT_RESOURCES; - } - - Status = ZwQueryValueKey(KeyHandle, &ValueName, - KeyValuePartialInformation, ValueInformation, - ValueInformationLength, - &ValueInformationLength); - *ResultLength = ValueInformation->DataLength; - ZwClose(KeyHandle); - - if (!NT_SUCCESS(Status)) - { - ExFreePool(ValueInformation); - if (Status == STATUS_BUFFER_OVERFLOW) - return STATUS_BUFFER_TOO_SMALL; - else - return Status; - } - - /* FIXME: Verify the value (NULL-terminated, correct format). */ - - RtlCopyMemory(PropertyBuffer, ValueInformation->Data, - ValueInformation->DataLength); - ExFreePool(ValueInformation); - - return STATUS_SUCCESS; - } + DPRINT("Registry property %S\n", RegistryPropertyName); + + /* Open Enum key */ + InitializeObjectAttributes(&ObjectAttributes, &EnumU, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); + Status = ZwOpenKey(&hEnum, 0, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + return Status; + + /* Open instance key */ + InitializeObjectAttributes(&ObjectAttributes, &DeviceNode->InstancePath, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, hEnum, NULL); + Status = ZwOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes); + ZwClose(hEnum); + if (!NT_SUCCESS(Status)) + 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); + + if (!NT_SUCCESS(Status)) + { + ExFreePool(ValueInformation); + if (Status == STATUS_BUFFER_OVERFLOW) + { + *ResultLength = ValueInformation->DataLength; + return STATUS_BUFFER_TOO_SMALL; + } + else + { + *ResultLength = 0; + return Status; + } + } + + /* Return data */ + *ResultLength = ValueInformation->DataLength; + /* FIXME: Verify the value (NULL-terminated, correct format). */ + RtlCopyMemory(PropertyBuffer, ValueInformation->Data, + ValueInformation->DataLength); + ExFreePool(ValueInformation); + + return STATUS_SUCCESS; + } case DevicePropertyBootConfiguration: Length = 0; @@ -510,43 +521,36 @@ Data = &DeviceNode->BootResources; break; - case DevicePropertyEnumeratorName: - Ptr = wcschr(DeviceNode->InstancePath.Buffer, L'\\'); - if (Ptr != NULL) - { - Length = (ULONG)((ULONG_PTR)Ptr - (ULONG_PTR)DeviceNode->InstancePath.Buffer) + sizeof(WCHAR); - Data = DeviceNode->InstancePath.Buffer; - } - else - { - Length = 0; - Data = NULL; - } - break; - - case DevicePropertyPhysicalDeviceObjectName: - Length = DeviceNode->InstancePath.Length + sizeof(WCHAR); - Data = DeviceNode->InstancePath.Buffer; - break; - - default: - return STATUS_INVALID_PARAMETER_2; - } - - *ResultLength = Length; - if (BufferLength < Length) - return STATUS_BUFFER_TOO_SMALL; - RtlCopyMemory(PropertyBuffer, Data, Length); - - /* Terminate the string */ - if (DeviceProperty == DevicePropertyEnumeratorName - || DeviceProperty == DevicePropertyPhysicalDeviceObjectName) - { - Ptr = (PWSTR)PropertyBuffer; - Ptr[(Length / sizeof(WCHAR)) - 1] = 0; - } - - return STATUS_SUCCESS; + 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 + 1) * sizeof(WCHAR); + Data = DeviceNode->InstancePath.Buffer; + break; + + case DevicePropertyPhysicalDeviceObjectName: + /* InstancePath buffer is NULL terminated, so we can do this */ + Length = DeviceNode->InstancePath.MaximumLength; + Data = DeviceNode->InstancePath.Buffer; + break; + + default: + return STATUS_INVALID_PARAMETER_2; + } + + /* Prepare returned values */ + *ResultLength = Length; + if (BufferLength < Length) + return STATUS_BUFFER_TOO_SMALL; + RtlCopyMemory(PropertyBuffer, Data, Length); + + /* NULL terminate the string (if required) */ + if (DeviceProperty == DevicePropertyEnumeratorName) + ((LPWSTR)PropertyBuffer)[Length / sizeof(WCHAR)] = UNICODE_NULL; + + return STATUS_SUCCESS; } /* @@ -1062,82 +1066,110 @@ } -static +/* + * IopCreateDeviceKeyPath + * + * Creates a registry key + * + * Parameters + * RegistryPath + * Name of the key to be created. + * Handle + * Handle to the newly created key + * + * Remarks + * This method can create nested trees, so parent of RegistryPath can + * be not existant, and will be created if needed. + */ NTSTATUS -IopCreateDeviceKeyPath(PWSTR Path, - PHANDLE Handle) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - WCHAR KeyBuffer[MAX_PATH]; - UNICODE_STRING KeyName; - HANDLE KeyHandle; - NTSTATUS Status; - PWCHAR Current; - PWCHAR Next; - - *Handle = NULL; - - if (_wcsnicmp(Path, L"\\Registry\\", 10) != 0) - { - return STATUS_INVALID_PARAMETER; - } - - wcsncpy (KeyBuffer, Path, MAX_PATH-1); - - /* Skip \\Registry\\ */ - Current = KeyBuffer; - Current = wcschr (Current, L'\\') + 1; - Current = wcschr (Current, L'\\') + 1; - - while (TRUE) - { - Next = wcschr (Current, L'\\'); - if (Next == NULL) - { - /* The end */ - } - else - { - *Next = 0; - } - - RtlInitUnicodeString (&KeyName, KeyBuffer); - InitializeObjectAttributes (&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - DPRINT("Create '%S'\n", KeyName.Buffer); - - Status = ZwCreateKey (&KeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - 0, - NULL); - if (!NT_SUCCESS (Status)) - { - DPRINT ("ZwCreateKey() failed with status %x\n", Status); - return Status; - } - - if (Next == NULL) - { - *Handle = KeyHandle; - return STATUS_SUCCESS; - } - else - { - ZwClose (KeyHandle); - *Next = L'\\'; - } - - Current = Next + 1; - } - - return STATUS_UNSUCCESSFUL; +NTAPI +IopCreateDeviceKeyPath(IN PCUNICODE_STRING RegistryPath, + OUT PHANDLE Handle) +{ + UNICODE_STRING EnumU = RTL_CONSTANT_STRING(ENUM_ROOT); + HANDLE hParent = NULL, hKey; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + LPCWSTR Current, Last; + ULONG dwLength; + NTSTATUS Status; + + /* Assume failure */ + *Handle = NULL; + + /* Open root key for device instances */ + InitializeObjectAttributes(&ObjectAttributes, + &EnumU, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey(&hParent, + KEY_CREATE_SUB_KEY, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwOpenKey('%wZ') failed with status 0x%08lx\n", &EnumU, Status); + return Status; + } + + Current = KeyName.Buffer = RegistryPath->Buffer; + Last = &RegistryPath->Buffer[RegistryPath->Length / sizeof(WCHAR)]; + + /* Go up to the end of the string */ + while (Current <= Last) + { + if (Current != Last && *Current != '\\') + { + /* Not the end of the string and not a separator */ + Current++; + continue; + } + + /* Prepare relative key name */ + dwLength = (ULONG_PTR)Current - (ULONG_PTR)KeyName.Buffer; + KeyName.MaximumLength = KeyName.Length = dwLength; + DPRINT("Create '%wZ'\n", &KeyName); + + /* Open key */ + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + hParent, + NULL); + Status = ZwCreateKey(&hKey, + Current == Last ? KEY_ALL_ACCESS : KEY_CREATE_SUB_KEY, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + + /* Close parent key handle, we don't need it anymore */ + if (hParent) + ZwClose(hParent); + + /* Key opening/creating failed? */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwCreateKey('%wZ') failed with status 0x%08lx\n", &KeyName, Status); + return Status; + } + + /* Check if it is the end of the string */ + if (Current == Last) + { + /* Yes, return success */ + *Handle = hKey; + return STATUS_SUCCESS; + } + + /* Start with this new parent key */ + hParent = hKey; + Current++; + KeyName.Buffer = (LPWSTR)Current; + } + + return STATUS_UNSUCCESSFUL; } @@ -1224,41 +1256,6 @@ &DefaultConfigFlags, sizeof(DefaultConfigFlags)); } - -#if 0 - if (DeviceNode->PhysicalDeviceObject != NULL) - { - /* Create the 'Control' key */ - RtlInitUnicodeString(&KeyName, - L"Control"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE | OBJ_OPENIF, - InstanceKey, - NULL); - Status = ZwCreateKey(&LogConfKey, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_VOLATILE, - NULL); - if (NT_SUCCESS(Status)) - { - ULONG Reference = (ULONG)DeviceNode->PhysicalDeviceObject; - RtlInitUnicodeString(&KeyName, - L"DeviceReference"); - Status = ZwSetValueKey(LogConfKey, - &KeyName, - 0, - REG_DWORD, - &Reference, - sizeof(PVOID)); - - ZwClose(LogConfKey); - } - } -#endif DPRINT("IopSetDeviceInstanceData() done\n"); @@ -1606,98 +1603,96 @@ IopGetParentIdPrefix(PDEVICE_NODE DeviceNode, PUNICODE_STRING ParentIdPrefix) { - ULONG KeyNameBufferLength; - PWSTR KeyNameBuffer = NULL; - PKEY_VALUE_PARTIAL_INFORMATION ParentIdPrefixInformation = NULL; - UNICODE_STRING KeyName; - UNICODE_STRING KeyValue; - UNICODE_STRING ValueName; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hKey = NULL; - ULONG crc32; - NTSTATUS Status; - - /* HACK: As long as some devices have a NULL device - * instance path, the following test is required :( - */ - if (DeviceNode->Parent->InstancePath.Length == 0) - { - DPRINT1("Parent of %wZ has NULL Instance path, please report!\n", - &DeviceNode->InstancePath); - return STATUS_UNSUCCESSFUL; - } - - /* 1. Try to retrieve ParentIdPrefix from registry */ - KeyNameBufferLength = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]) + MAX_PATH * sizeof(WCHAR); - ParentIdPrefixInformation = ExAllocatePool(PagedPool, KeyNameBufferLength + sizeof(WCHAR)); - if (!ParentIdPrefixInformation) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto cleanup; - } - KeyNameBuffer = ExAllocatePool(PagedPool, (49 * sizeof(WCHAR)) + DeviceNode->Parent->InstancePath.Length); - if (!KeyNameBuffer) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto cleanup; - } - wcscpy(KeyNameBuffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); - wcscat(KeyNameBuffer, DeviceNode->Parent->InstancePath.Buffer); - RtlInitUnicodeString(&KeyName, KeyNameBuffer); - InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); - Status = ZwOpenKey(&hKey, KEY_QUERY_VALUE | KEY_SET_VALUE, &ObjectAttributes); - if (!NT_SUCCESS(Status)) - goto cleanup; - RtlInitUnicodeString(&ValueName, L"ParentIdPrefix"); - Status = ZwQueryValueKey( - hKey, &ValueName, - KeyValuePartialInformation, ParentIdPrefixInformation, - KeyNameBufferLength, &KeyNameBufferLength); - if (NT_SUCCESS(Status)) - { - if (ParentIdPrefixInformation->Type != REG_SZ) - Status = STATUS_UNSUCCESSFUL; - else - { - KeyValue.Length = KeyValue.MaximumLength = (USHORT)ParentIdPrefixInformation->DataLength; - KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data; - } - goto cleanup; - } - if (Status != STATUS_OBJECT_NAME_NOT_FOUND) - { - KeyValue.Length = KeyValue.MaximumLength = (USHORT)ParentIdPrefixInformation->DataLength; - KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data; - goto cleanup; - } - - /* 2. Create the ParentIdPrefix value */ - crc32 = RtlComputeCrc32(0, - (PUCHAR)DeviceNode->Parent->InstancePath.Buffer, - DeviceNode->Parent->InstancePath.Length); - - swprintf((PWSTR)ParentIdPrefixInformation->Data, L"%lx&%lx", DeviceNode->Parent->Level, crc32); - RtlInitUnicodeString(&KeyValue, (PWSTR)ParentIdPrefixInformation->Data); - - /* 3. Try to write the ParentIdPrefix to registry */ - Status = ZwSetValueKey(hKey, - &ValueName, - 0, - REG_SZ, - (PVOID)KeyValue.Buffer, - (wcslen(KeyValue.Buffer) + 1) * sizeof(WCHAR)); + ULONG BufferLength; + UNICODE_STRING EnumU = RTL_CONSTANT_STRING(ENUM_ROOT); + PKEY_VALUE_PARTIAL_INFORMATION ParentIdPrefixInformation; + UNICODE_STRING KeyValue; + UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"ParentIdPrefix"); + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hEnum, hKey = NULL; + ULONG crc32; + NTSTATUS Status; + + /* Allocate a buffer big enough to read a MAX_PATH prefix */ + BufferLength = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]) + MAX_PATH * sizeof(WCHAR); + ParentIdPrefixInformation = ExAllocatePool(PagedPool, BufferLength + sizeof(WCHAR)); + + /* Check if allocation succeeded */ + if (!ParentIdPrefixInformation) + { + Status = STATUS_NO_MEMORY; + goto cleanup; + } + + /* Open enum key */ + InitializeObjectAttributes(&ObjectAttributes, &EnumU, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); + Status = ZwOpenKey(&hEnum, 0, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + goto cleanup; + + /* Open instance key */ + InitializeObjectAttributes(&ObjectAttributes, &DeviceNode->Parent->InstancePath, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, hEnum, NULL); + Status = ZwOpenKey(&hKey, KEY_QUERY_VALUE | KEY_SET_VALUE, &ObjectAttributes); + ZwClose(hEnum); + if (!NT_SUCCESS(Status)) + goto cleanup; + + /* Read the prefix */ + Status = ZwQueryValueKey( + hKey, &ValueName, + KeyValuePartialInformation, ParentIdPrefixInformation, + BufferLength, &BufferLength); + if (NT_SUCCESS(Status)) + { + /* Yes, we read something */ + if (ParentIdPrefixInformation->Type != REG_SZ) + /* Hm, it was of the wrong type. Fail */ + Status = STATUS_UNSUCCESSFUL; + else + { + /* OK, value is correct ; prepare to return it */ + KeyValue.Length = KeyValue.MaximumLength = (USHORT)ParentIdPrefixInformation->DataLength; + KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data; + } + + /* We're done */ + goto cleanup; + } + + /* Check if we failed due to value not calculated */ + if (Status != STATUS_OBJECT_NAME_NOT_FOUND) + /* Another reason, fail */ + goto cleanup; + + /* Compute the prefix string of the parent */ + crc32 = RtlComputeCrc32(0, + (PUCHAR)DeviceNode->Parent->InstancePath.Buffer, + DeviceNode->Parent->InstancePath.Length); + + /* Prepare the value to return */ + /* (yes, it's safe to reuse ParentIdPrefixInformation buffer, which is at least MAX_PATH WCHARs long */ + swprintf((PWSTR)ParentIdPrefixInformation, L"%lx&%lx", DeviceNode->Parent->Level, crc32); + RtlInitUnicodeString(&KeyValue, (PWSTR)ParentIdPrefixInformation); + + /* 3. Try to write the ParentIdPrefix to registry */ + Status = ZwSetValueKey(hKey, + &ValueName, + 0, + REG_SZ, + (PVOID)KeyValue.Buffer, + KeyValue.MaximumLength); cleanup: - if (NT_SUCCESS(Status)) - { - /* Duplicate the string to return it */ - Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &KeyValue, ParentIdPrefix); - } - ExFreePool(ParentIdPrefixInformation); - ExFreePool(KeyNameBuffer); - if (hKey != NULL) - ZwClose(hKey); - return Status; + if (NT_SUCCESS(Status)) + { + /* Duplicate the string to return it */ + Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &KeyValue, ParentIdPrefix); + } + /* General cleanup */ + ExFreePool(ParentIdPrefixInformation); + if (hKey != NULL) + ZwClose(hKey); + return Status; } @@ -1727,9 +1722,9 @@ IO_STATUS_BLOCK IoStatusBlock; PDEVICE_NODE ParentDeviceNode; WCHAR InstancePath[MAX_PATH]; + UNICODE_STRING InstancePathU = { 0, sizeof(InstancePath), InstancePath }; IO_STACK_LOCATION Stack; NTSTATUS Status; - PWSTR KeyBuffer; PWSTR Ptr; USHORT Length; USHORT TotalLength; @@ -1791,12 +1786,7 @@ if (NT_SUCCESS(Status)) { /* Copy the device id string */ - wcscpy(InstancePath, (PWSTR)IoStatusBlock.Information); - - /* - * FIXME: Check for valid characters, if there is invalid characters - * then bugcheck. - */ + RtlAppendUnicodeToString(&InstancePathU, (PWSTR)IoStatusBlock.Information); } else { @@ -1834,21 +1824,16 @@ if (NT_SUCCESS(Status)) { /* Append the instance id string */ - wcscat(InstancePath, L"\\"); + RtlAppendUnicodeToString(&InstancePathU, L"\\"); if (ParentIdPrefix.Length > 0) { /* Add information from parent bus device to InstancePath */ - wcscat(InstancePath, ParentIdPrefix.Buffer); + RtlAppendUnicodeStringToString(&InstancePathU, &ParentIdPrefix); if (IoStatusBlock.Information && *(PWSTR)IoStatusBlock.Information) - wcscat(InstancePath, L"&"); + RtlAppendUnicodeToString(&InstancePathU, L"&"); } if (IoStatusBlock.Information) - wcscat(InstancePath, (PWSTR)IoStatusBlock.Information); - - /* - * FIXME: Check for valid characters, if there is invalid characters - * then bugcheck - */ + RtlAppendUnicodeToString(&InstancePathU, (PWSTR)IoStatusBlock.Information); } else { @@ -1856,29 +1841,25 @@ } RtlFreeUnicodeString(&ParentIdPrefix); - if (!RtlCreateUnicodeString(&DeviceNode->InstancePath, InstancePath)) - { - DPRINT("No resources\n"); - /* FIXME: Cleanup and disable device */ - } - - DPRINT("InstancePath is %S\n", DeviceNode->InstancePath.Buffer); - - /* - * Create registry key for the instance id, if it doesn't exist yet - */ - KeyBuffer = ExAllocatePool( - PagedPool, - (49 * sizeof(WCHAR)) + DeviceNode->InstancePath.Length); - wcscpy(KeyBuffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); - wcscat(KeyBuffer, DeviceNode->InstancePath.Buffer); - Status = IopCreateDeviceKeyPath(KeyBuffer, &InstanceKey); - ExFreePool(KeyBuffer); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create the instance key! (Status %lx)\n", Status); - } - + /* + * FIXME: Check for valid characters, if there is invalid characters + * then bugcheck. + */ + + Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &InstancePathU, &DeviceNode->InstancePath); + if (!NT_SUCCESS(Status)) + { + DPRINT("No resources\n"); + /* FIXME: Cleanup and disable device */ + } + + DPRINT("InstancePath is %wZ\n", &DeviceNode->InstancePath); + + /* Create registry key for the instance id, if it doesn't exist yet */ + Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, &InstanceKey); + if (!NT_SUCCESS(Status)) + DPRINT1("IopCreateDeviceKeyPath('%wZ') failed (Status 0x%08lx)\n", &DeviceNode->InstancePath, Status); { /* Set 'Capabilities' value */ @@ -2329,102 +2310,106 @@ IopActionConfigureChildServices(PDEVICE_NODE DeviceNode, PVOID Context) { - RTL_QUERY_REGISTRY_TABLE QueryTable[3]; - PDEVICE_NODE ParentDeviceNode; - PUNICODE_STRING Service; - UNICODE_STRING ClassGUID; - NTSTATUS Status; - - DPRINT("IopActionConfigureChildServices(%p, %p)\n", DeviceNode, Context); - - ParentDeviceNode = (PDEVICE_NODE)Context; - - /* - * We are called for the parent too, but we don't need to do special - * handling for this node - */ - if (DeviceNode == ParentDeviceNode) - { - DPRINT("Success\n"); - return STATUS_SUCCESS; - } - - /* - * Make sure this device node is a direct child of the parent device node - * that is given as an argument - */ - if (DeviceNode->Parent != ParentDeviceNode) - { - /* Stop the traversal immediately and indicate successful operation */ - DPRINT("Stop\n"); - return STATUS_UNSUCCESSFUL; - } - - if (!IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED)) - { - WCHAR RegKeyBuffer[MAX_PATH]; - UNICODE_STRING RegKey; - - RegKey.Length = 0; - RegKey.MaximumLength = sizeof(RegKeyBuffer); - RegKey.Buffer = RegKeyBuffer; - - /* - * Retrieve configuration from Enum key - */ - - Service = &DeviceNode->ServiceName; - - RtlZeroMemory(QueryTable, sizeof(QueryTable)); - RtlInitUnicodeString(Service, NULL); - RtlInitUnicodeString(&ClassGUID, NULL); - - QueryTable[0].Name = L"Service"; - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[0].EntryContext = Service; - - QueryTable[1].Name = L"ClassGUID"; - QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[1].EntryContext = &ClassGUID; - QueryTable[1].DefaultType = REG_SZ; - QueryTable[1].DefaultData = L""; - QueryTable[1].DefaultLength = 0; - - RtlAppendUnicodeToString(&RegKey, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); - RtlAppendUnicodeStringToString(&RegKey, &DeviceNode->InstancePath); - - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - RegKey.Buffer, QueryTable, NULL, NULL); - - if (!NT_SUCCESS(Status)) - { - /* FIXME: Log the error */ - DPRINT("Could not retrieve configuration for device %wZ (Status 0x%08x)\n", - &DeviceNode->InstancePath, Status); - IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); - return STATUS_SUCCESS; - } - - if (Service->Buffer == NULL) - { - IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); - - if (ClassGUID.Length != 0) - { - /* Device has a ClassGUID value, but no Service value. - * Suppose it is using the NULL driver, so state the - * device is started */ - DPRINT1("%wZ is using NULL driver\n", &DeviceNode->InstancePath); - IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); - DeviceNode->Flags |= DN_STARTED; - } - return STATUS_SUCCESS; - } - - DPRINT("Got Service %S\n", Service->Buffer); - } - - return STATUS_SUCCESS; + RTL_QUERY_REGISTRY_TABLE QueryTable[4]; + PDEVICE_NODE ParentDeviceNode; + PUNICODE_STRING Service; + UNICODE_STRING ClassGUID; + NTSTATUS Status; + + DPRINT("IopActionConfigureChildServices(%p, %p)\n", DeviceNode, Context); + + ParentDeviceNode = (PDEVICE_NODE)Context; + + /* + * We are called for the parent too, but we don't need to do special + * handling for this node + */ + if (DeviceNode == ParentDeviceNode) + { + DPRINT("Success\n"); + return STATUS_SUCCESS; + } + + /* + * Make sure this device node is a direct child of the parent device node + * that is given as an argument + */ + ASSERT(DeviceNode->Parent == ParentDeviceNode); + + if (!IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED)) + { + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING EnumU = RTL_CONSTANT_STRING(ENUM_ROOT); + HANDLE hEnum; + + /* Open Enum key */ + InitializeObjectAttributes(&ObjectAttributes, &EnumU, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL) + Status = ZwOpenKey(&hEnum, 0, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + /* FIXME: Log the error */ + IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); + return Status; + } + + /* Prepare query table */ + RtlZeroMemory(QueryTable, sizeof(QueryTable)); + Service = &DeviceNode->ServiceName; + RtlInitUnicodeString(Service, NULL); + RtlInitUnicodeString(&ClassGUID, NULL); + + /* Hopefully, this string is always NULL terminated */ + QueryTable[0].Name = DeviceNode->InstancePath.Buffer; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_SUBKEY; + + QueryTable[1].Name = L"Service"; + QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[1].EntryContext = Service; + + QueryTable[2].Name = L"ClassGUID"; + QueryTable[2].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[2].EntryContext = &ClassGUID; + QueryTable[2].DefaultType = REG_SZ; + QueryTable[2].DefaultData = L""; + QueryTable[2].DefaultLength = 0; + + /* Read registry */ + Status = RtlQueryRegistryValues(RTL_REGISTRY_HANDLE, (PWSTR)hEnum, + QueryTable, NULL, NULL); + ZwClose(hEnum); + + /* Check for an error */ + if (!NT_SUCCESS(Status)) + { + /* FIXME: Log the error */ + DPRINT("Could not retrieve configuration for device %wZ (Status 0x%08x)\n", + &DeviceNode->InstancePath, Status); + IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); + return STATUS_SUCCESS; + } + + /* Check for a NULL service */ + if (Service->Length == 0) + { + IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); + + if (ClassGUID.Length != 0) + { + /* Device has a ClassGUID value, but no Service value. + * Suppose it is using the NULL driver, so state the + * device is started */ + DPRINT1("%wZ is using NULL driver\n", &DeviceNode->InstancePath); + IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); + DeviceNode->Flags |= DN_STARTED; + } + return STATUS_SUCCESS; + } + + DPRINT("Got Service %wZ\n", Service); + } + + return STATUS_SUCCESS; } /* @@ -2476,16 +2461,7 @@ * Make sure this device node is a direct child of the parent device node * that is given as an argument */ -#if 0 - if (DeviceNode->Parent != ParentDeviceNode) - { - /* - * Stop the traversal immediately and indicate unsuccessful operation - */ - DPRINT("Stop\n"); - return STATUS_UNSUCCESSFUL; - } -#endif + ASSERT(DeviceNode->Parent == ParentDeviceNode); if (!IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED) && !IopDeviceNodeHasFlag(DeviceNode, DNF_ADDED) && @@ -2563,8 +2539,8 @@ IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); IopDeviceNodeSetFlag(DeviceNode, DNF_START_FAILED); /* FIXME: Log the error (possibly in IopInitializeDeviceNodeService) */ - CPRINT("Initialization of service %S failed (Status %x)\n", - DeviceNode->ServiceName.Buffer, Status); + DPRINT("Initialization of service %wZ failed (Status %x)\n", + &DeviceNode->ServiceName, Status); } } }

1 0

[hpoussin] 31466: NULL terminate string before sending it
by hpoussin＠svn.reactos.org 27 Dec '07

27 Dec '07

Author: hpoussin Date: Thu Dec 27 21:53:24 2007 New Revision: 31466 URL: http://svn.reactos.org/svn/reactos?rev=31466&view=rev Log: NULL terminate string before sending it Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Thu Dec 27 21:53:24 2007 @@ -49,26 +49,36 @@ PUNICODE_STRING DeviceIds) { PPNP_EVENT_ENTRY EventEntry; + UNICODE_STRING Copy; ULONG TotalSize; - + NTSTATUS Status; + + ASSERT(DeviceIds); + + /* Allocate a big enough buffer */ + Copy.Length = 0; + Copy.MaximumLength = DeviceIds->Length + sizeof(UNICODE_NULL); TotalSize = FIELD_OFFSET(PLUGPLAY_EVENT_BLOCK, TargetDevice.DeviceIds) + - DeviceIds->MaximumLength; + Copy.MaximumLength; EventEntry = ExAllocatePool(NonPagedPool, TotalSize + FIELD_OFFSET(PNP_EVENT_ENTRY, Event)); - if (EventEntry == NULL) + if (!EventEntry) return STATUS_INSUFFICIENT_RESOURCES; - memcpy(&EventEntry->Event.EventGuid, - Guid, - sizeof(GUID)); + /* Fill the buffer with the event GUID */ + RtlCopyMemory(&EventEntry->Event.EventGuid, + Guid, + sizeof(GUID)); EventEntry->Event.EventCategory = TargetDeviceChangeEvent; EventEntry->Event.TotalSize = TotalSize; - memcpy(&EventEntry->Event.TargetDevice.DeviceIds, - DeviceIds->Buffer, - DeviceIds->MaximumLength); + /* Fill the device id */ + Copy.Buffer = EventEntry->Event.TargetDevice.DeviceIds; + Status = RtlAppendUnicodeStringToString(&Copy, DeviceIds); + if (!NT_SUCCESS(Status)) + return Status; InsertHeadList(&IopPnpEventQueueHead, &EventEntry->ListEntry);

1 0

[greatlrd] 31465: implement DxEngGetDeviceGammaRamp implement DxEngSetDeviceGammaRamp
by greatlrd＠svn.reactos.org 27 Dec '07

27 Dec '07

Author: greatlrd Date: Thu Dec 27 21:51:27 2007 New Revision: 31465 URL: http://svn.reactos.org/svn/reactos?rev=31465&view=rev Log: implement DxEngGetDeviceGammaRamp implement DxEngSetDeviceGammaRamp Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/subsystems/win32/win32k/include/intddraw.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Thu Dec 27 21:51:27 2007 @@ -441,7 +441,7 @@ DX_WINDBG_trace(); - // EnterCriticalSection(&ddcs); + EnterCriticalSection(&ddcs); *ppSurf = NULL; _SEH_TRY @@ -464,8 +464,8 @@ ret = DDERR_INVALIDPARAMS; } _SEH_END; - // LeaveCriticalSection(&ddcs); - return ret; + LeaveCriticalSection(&ddcs); + return ret; } @@ -476,7 +476,8 @@ { HRESULT ret; DX_WINDBG_trace(); - // EnterCriticalSection(&ddcs); + + EnterCriticalSection(&ddcs); *ppSurf = NULL; _SEH_TRY @@ -489,7 +490,7 @@ } _SEH_END; - // LeaveCriticalSection(&ddcs); + LeaveCriticalSection(&ddcs); return ret; } Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/dxeng.h (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h Thu Dec 27 21:51:27 2007 @@ -67,7 +67,7 @@ /* Notes : same protypes NtGdiEngGetDeviceGammaRamp, diffent is we skipp the user mode checks and seh */ BOOL -DxEngGetDeviceGammaRamp(HDC hDC, LPVOID lpRamp); +DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); /* Notes : Lock the hDC */ PDC DxEngLockDC(HDC hDC); @@ -75,7 +75,8 @@ /* Notes : Unlock the hDC */ BOOL DxEngUnlockDC(PDC pDC); - +/* Notes : Set Gamma ramp */ +BOOL DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Unuse); /* prototypes are not done yet, I need gather all my notes * to make them correct @@ -89,7 +90,6 @@ DWORD DxEngReferenceHdev(DWORD x1); DWORD DxEngIsHdevLockedByCurrentThread(DWORD x1); DWORD DxEngUnreferenceHdev(DWORD x1); -DWORD DxEngSetDeviceGammaRamp(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngSpSpritesVisible(DWORD x1); Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/intddraw.h Thu Dec 27 21:51:27 2007 @@ -121,5 +121,8 @@ } \ } +/* Gammaramp internal prototype */ +BOOL FASTCALL IntGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); +BOOL FASTCALL IntSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); #endif /* _INT_W32k_DDRAW */ Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Thu Dec 27 21:51:27 2007 @@ -123,16 +123,29 @@ return FALSE; } -/************************************************************************/ -/* DxEngGetDeviceGammaRamp */ -/************************************************************************/ -/* same protypes NtGdiEngGetDeviceGammaRamp, diffent is we skipp the user mode checks and seh */ +/*++ +* @name DxEngGetDeviceGammaRamp +* @implemented +* +* The function DxEngSetDeviceGammaRamp Set Gamma ramp from from dxg.sys + +* @param HDEV hPDev +* The hdev +* +* @param PGAMMARAMP Ramp +* to fill in our gama ramp +* +* @return +* This return FALSE or TRUE, FALSE for fail, TRUE for success +* +* @remarks. +* ReactOS does not loop it, only set the gamma once. +* +*--*/ BOOL -DxEngGetDeviceGammaRamp(HDC hDC, LPVOID lpRamp) -{ - /* FIXME redirect it to NtGdiEngGetDeviceGammaRamp internal call */ - UNIMPLEMENTED; - return FALSE; +DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp) +{ + return IntGetDeviceGammaRamp(hPDev, Ramp); } @@ -140,12 +153,12 @@ * @name DxEngLockDC * @implemented * -* The function DxEngLockDC lock a hdc from dxg.sys +* The function DxEngLockDC lock a hdc from dxg.sys * * @param HDC hDC * The handle we need want lock * -* @return +* @return * This api return PDC or NULL depns if it sussess lock the hdc or not * * @remarks. @@ -163,13 +176,13 @@ * @name DxEngUnlockDC * @implemented * -* The function DxEngUnlockDC Unlock a pDC (hdc) from dxg.sys +* The function DxEngUnlockDC Unlock a pDC (hdc) from dxg.sys * @param PDC pDC * The handle we need unlock * -* @return -* This api always return TRUE if it sussess or not +* @return +* This api always return TRUE if it sussess or not * * @remarks. * none @@ -265,13 +278,34 @@ return FALSE; } -/************************************************************************/ -/* DxEngSetDeviceGammaRamp */ -/************************************************************************/ -DWORD DxEngSetDeviceGammaRamp(DWORD x1, DWORD x2, DWORD x3) -{ - UNIMPLEMENTED; - return FALSE; + +/*++ +* @name DxEngSetDeviceGammaRamp +* @implemented +* +* The function DxEngSetDeviceGammaRamp Set Gamma ramp from from dxg.sys + +* @param HDEV hPDev +* The hdev +* +* @param PGAMMARAMP Ramp +* to set in our gama ramp +* +* @param BOOL Unuse +* Info on this are avail at request. at moment ReactOS does not +* does not use it. and problare never need it. +* +* @return +* This return FALSE or TRUE, FALSE for fail, TRUE for success +* +* @remarks. +* ReactOS does not loop it, only set the gamma once. +* +*--*/ +BOOL +DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Unuse) +{ + return IntSetDeviceGammaRamp(hPDev, Ramp); } /************************************************************************/

1 0

[greatlrd] 31464: TAG video buffer memory at alloc
by greatlrd＠svn.reactos.org 27 Dec '07

27 Dec '07

Author: greatlrd Date: Thu Dec 27 21:30:36 2007 New Revision: 31464 URL: http://svn.reactos.org/svn/reactos?rev=31464&view=rev Log: TAG video buffer memory at alloc Modified: trunk/reactos/drivers/video/videoprt/resource.c trunk/reactos/drivers/video/videoprt/videoprt.h Modified: trunk/reactos/drivers/video/videoprt/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/res… ============================================================================== --- trunk/reactos/drivers/video/videoprt/resource.c (original) +++ trunk/reactos/drivers/video/videoprt/resource.c Thu Dec 27 21:30:36 2007 @@ -709,7 +709,7 @@ OUT PVOID *Buffer) { DPRINT("VideoPortAllocateBuffer\n"); - *Buffer = ExAllocatePool(PagedPool, Size); + *Buffer = ExAllocatePoolWithTag ( PagedPool, Size, TAG_VIDEO_PORT_BUFFER ) ; return *Buffer == NULL ? ERROR_NOT_ENOUGH_MEMORY : NO_ERROR; } Modified: trunk/reactos/drivers/video/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.h (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.h Thu Dec 27 21:30:36 2007 @@ -37,6 +37,7 @@ #include <debug.h> #define TAG_VIDEO_PORT TAG('V', 'I', 'D', 'P') +#define TAG_VIDEO_PORT_BUFFER TAG('V', 'p', 'm', '\0' ) #define DPFLTR_IHVVIDEO_ID 80 /* FIXME */

1 0

[jimtabor] 31463: Support NtGdiGetDhpdev.
by jimtabor＠svn.reactos.org 27 Dec '07

27 Dec '07

Author: jimtabor Date: Thu Dec 27 20:56:31 2007 New Revision: 31463 URL: http://svn.reactos.org/svn/reactos?rev=31463&view=rev Log: Support NtGdiGetDhpdev. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Thu Dec 27 20:56:31 2007 @@ -49,13 +49,14 @@ ULONG Status; } GDIPOINTER, *PGDIPOINTER; -typedef struct +typedef struct _GDIDEVICE { HANDLE Handle; // HSURF PVOID pvEntry; ULONG lucExcLock; ULONG Tid; + struct _GDIDEVICE *ppdevNext; FLONG flFlags; PERESOURCE hsemDevLock; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Thu Dec 27 20:56:31 2007 @@ -543,7 +543,7 @@ PrimarySurface.DisplayNumber = DisplayNumber; PrimarySurface.flFlags = PDEV_DISPLAY; // Hard set,, add more flags. PrimarySurface.hsemDevLock = (PERESOURCE)EngCreateSemaphore(); - + PrimarySurface.ppdevNext = NULL; // Fixme! We need to support more than display drvs. ret = TRUE; goto cleanup; } @@ -3353,22 +3353,19 @@ NtGdiGetDhpdev( IN HDEV hdev) { - PGDIDEVICE pGdiDevice = (PGDIDEVICE) hdev; + PGDIDEVICE pPDev, pGdiDevice = (PGDIDEVICE) hdev; if (!pGdiDevice) return NULL; - // ATM we have one, so this cheesie test - if (pGdiDevice != &PrimarySurface) return NULL; -// -// if ( pGdiDevice < MmSystemRangeStart) return NULL; -// pPDev = &PrimarySurface; -// KeEnterCriticalRegion(); -// do -// { -// if (pGdiDevice == pPDev) break; -// else -// pPDev = pPDev->ppdevNext; -// } while (pPDev != NULL); -// KeLeaveCriticalRegion(); -// if (!pPDev) return NULL; + if ( pGdiDevice < (PGDIDEVICE)MmSystemRangeStart) return NULL; + pPDev = &PrimarySurface; + KeEnterCriticalRegion(); + do + { + if (pGdiDevice == pPDev) break; + else + pPDev = pPDev->ppdevNext; + } while (pPDev != NULL); + KeLeaveCriticalRegion(); + if (!pPDev) return NULL; return pGdiDevice->PDev; }

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