Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 69731: [WIN32K:NTUSER] - Window station handles are normally user handles. Treat them as such CORE-10207
by tfaber＠svn.reactos.org 28 Oct '15

28 Oct '15

Author: tfaber Date: Wed Oct 28 11:29:42 2015 New Revision: 69731 URL: http://svn.reactos.org/svn/reactos?rev=69731&view=rev Log: [WIN32K:NTUSER] - Window station handles are normally user handles. Treat them as such CORE-10207 Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c trunk/reactos/win32ss/user/ntuser/hook.c trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/winsta.c Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Wed Oct 28 11:29:42 2015 @@ -25,7 +25,7 @@ NTSTATUS Status; hWinSta = UserGetProcessWindowStation(); - Status = IntValidateWindowStationHandle(hWinSta, KernelMode, WINSTA_ACCESSCLIPBOARD, &pWinStaObj, 0); + Status = IntValidateWindowStationHandle(hWinSta, UserMode, WINSTA_ACCESSCLIPBOARD, &pWinStaObj, 0); if (!NT_SUCCESS(Status)) { ERR("Cannot open winsta\n"); Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Wed Oct 28 11:29:42 2015 @@ -1534,7 +1534,7 @@ } Status = IntValidateWindowStationHandle( PsGetCurrentProcess()->Win32WindowStation, - KernelMode, + UserMode, 0, &WinStaObj, 0); Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Wed Oct 28 11:29:42 2015 @@ -4776,7 +4776,7 @@ */ Status = IntValidateWindowStationHandle(CurrentProcess->Win32WindowStation, - KernelMode, + UserMode, 0, &WinStaObject, 0); Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Wed Oct 28 11:29:42 2015 @@ -3357,7 +3357,7 @@ HWND Ret; NTSTATUS Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, - KernelMode, + UserMode, 0, &WinStaObject, 0); @@ -3407,7 +3407,7 @@ } Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, - KernelMode, + UserMode, 0, &WinStaObject, 0); Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Wed Oct 28 11:29:42 2015 @@ -599,7 +599,7 @@ Status = IntValidateWindowStationHandle( hWinSta, - KernelMode, + UserMode, 0, &Object, 0); @@ -901,7 +901,7 @@ if(hWindowStation !=NULL) { Status = IntValidateWindowStationHandle( hWindowStation, - KernelMode, + UserMode, 0, &NewWinSta, &ObjectHandleInfo); @@ -1017,7 +1017,7 @@ Status = IntValidateWindowStationHandle( hWindowStation, - KernelMode, + UserMode, 0, &Object, 0); @@ -1063,7 +1063,7 @@ Status = IntValidateWindowStationHandle( hWindowStation, - KernelMode, + UserMode, 0, &Object, 0); @@ -1274,7 +1274,7 @@ UNICODE_STRING DesktopName; Status = IntValidateWindowStationHandle(hWindowStation, - KernelMode, + UserMode, 0, &WindowStation, 0); @@ -1461,7 +1461,7 @@ } Status = IntValidateWindowStationHandle(hWindowStation, - KernelMode, + UserMode, 0, &WindowStation, 0);

1 0

[tfaber] 69730: [NTOS:IO] - Add missing OBJ_KERNEL_HANDLE - Avoid INVALID_HANDLE_VALUE CORE-10207
by tfaber＠svn.reactos.org 28 Oct '15

28 Oct '15

Author: tfaber Date: Wed Oct 28 11:14:46 2015 New Revision: 69730 URL: http://svn.reactos.org/svn/reactos?rev=69730&view=rev Log: [NTOS:IO] - Add missing OBJ_KERNEL_HANDLE - Avoid INVALID_HANDLE_VALUE CORE-10207 Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Wed Oct 28 11:14:46 2015 @@ -63,9 +63,9 @@ else InstanceKeyRealP = &InstanceKeyReal; - *GuidKeyRealP = INVALID_HANDLE_VALUE; - *DeviceKeyRealP = INVALID_HANDLE_VALUE; - *InstanceKeyRealP = INVALID_HANDLE_VALUE; + *GuidKeyRealP = NULL; + *DeviceKeyRealP = NULL; + *InstanceKeyRealP = NULL; BaseKeyU.Buffer = PathBuffer; BaseKeyU.Length = 0; @@ -204,13 +204,13 @@ } else { - if (*GuidKeyRealP != INVALID_HANDLE_VALUE) + if (*GuidKeyRealP != NULL) ZwClose(*GuidKeyRealP); - if (*DeviceKeyRealP != INVALID_HANDLE_VALUE) + if (*DeviceKeyRealP != NULL) ZwClose(*DeviceKeyRealP); - if (*InstanceKeyRealP != INVALID_HANDLE_VALUE) + if (*InstanceKeyRealP != NULL) ZwClose(*InstanceKeyRealP); } @@ -261,7 +261,7 @@ InitializeObjectAttributes(&ObjectAttributes, &DeviceParametersU, - OBJ_CASE_INSENSITIVE | OBJ_OPENIF, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE | OBJ_OPENIF, InstanceKey, NULL); Status = ZwCreateKey(&DeviceParametersKey, @@ -339,7 +339,7 @@ UNICODE_STRING GuidString; UNICODE_STRING KeyName; OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE InterfaceKey = INVALID_HANDLE_VALUE; + HANDLE InterfaceKey = NULL; NTSTATUS Status; GuidString.Buffer = KeyName.Buffer = NULL; @@ -389,7 +389,7 @@ InitializeObjectAttributes( &ObjectAttributes, &KeyName, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); Status = ZwOpenKey( @@ -408,7 +408,7 @@ cleanup: if (!NT_SUCCESS(Status)) { - if (InterfaceKey != INVALID_HANDLE_VALUE) + if (InterfaceKey != NULL) ZwClose(InterfaceKey); } RtlFreeUnicodeString(&GuidString); @@ -462,10 +462,10 @@ { UNICODE_STRING Control = RTL_CONSTANT_STRING(L"Control"); UNICODE_STRING SymbolicLink = RTL_CONSTANT_STRING(L"SymbolicLink"); - HANDLE InterfaceKey = INVALID_HANDLE_VALUE; - HANDLE DeviceKey = INVALID_HANDLE_VALUE; - HANDLE ReferenceKey = INVALID_HANDLE_VALUE; - HANDLE ControlKey = INVALID_HANDLE_VALUE; + HANDLE InterfaceKey = NULL; + HANDLE DeviceKey = NULL; + HANDLE ReferenceKey = NULL; + HANDLE ControlKey = NULL; PKEY_BASIC_INFORMATION DeviceBi = NULL; PKEY_BASIC_INFORMATION ReferenceBi = NULL; PKEY_VALUE_PARTIAL_INFORMATION bip = NULL; @@ -557,7 +557,7 @@ InitializeObjectAttributes( &ObjectAttributes, &KeyName, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, InterfaceKey, NULL); Status = ZwOpenKey( @@ -670,7 +670,7 @@ InitializeObjectAttributes( &ObjectAttributes, &KeyName, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, DeviceKey, NULL); Status = ZwOpenKey( @@ -691,7 +691,7 @@ InitializeObjectAttributes( &ObjectAttributes, &Control, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, ReferenceKey, NULL); Status = ZwOpenKey( @@ -857,15 +857,15 @@ if (bip) ExFreePool(bip); bip = NULL; - if (ReferenceKey != INVALID_HANDLE_VALUE) + if (ReferenceKey != NULL) { ZwClose(ReferenceKey); - ReferenceKey = INVALID_HANDLE_VALUE; - } - if (ControlKey != INVALID_HANDLE_VALUE) + ReferenceKey = NULL; + } + if (ControlKey != NULL) { ZwClose(ControlKey); - ControlKey = INVALID_HANDLE_VALUE; + ControlKey = NULL; } } if (FoundRightPDO) @@ -877,7 +877,7 @@ ExFreePool(DeviceBi); DeviceBi = NULL; ZwClose(DeviceKey); - DeviceKey = INVALID_HANDLE_VALUE; + DeviceKey = NULL; } /* Add final NULL to ReturnBuffer */ @@ -907,13 +907,13 @@ cleanup: if (!NT_SUCCESS(Status) && ReturnBuffer.Buffer) ExFreePool(ReturnBuffer.Buffer); - if (InterfaceKey != INVALID_HANDLE_VALUE) + if (InterfaceKey != NULL) ZwClose(InterfaceKey); - if (DeviceKey != INVALID_HANDLE_VALUE) + if (DeviceKey != NULL) ZwClose(DeviceKey); - if (ReferenceKey != INVALID_HANDLE_VALUE) + if (ReferenceKey != NULL) ZwClose(ReferenceKey); - if (ControlKey != INVALID_HANDLE_VALUE) + if (ControlKey != NULL) ZwClose(ControlKey); if (DeviceBi) ExFreePool(DeviceBi);

1 0

[tfaber] 69729: [NTOS:IO] - Properly parse SymbolicLinkName (in particular, don't assume it's null-terminated) in IoSetDeviceInterface. Fixes IoDeviceInterface test failures and subsequent crashes ...
by tfaber＠svn.reactos.org 28 Oct '15

28 Oct '15

Author: tfaber Date: Wed Oct 28 10:59:59 2015 New Revision: 69729 URL: http://svn.reactos.org/svn/reactos?rev=69729&view=rev Log: [NTOS:IO] - Properly parse SymbolicLinkName (in particular, don't assume it's null-terminated) in IoSetDeviceInterface. Fixes IoDeviceInterface test failures and subsequent crashes due to memory corruption CORE-9456 Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Wed Oct 28 10:59:59 2015 @@ -15,6 +15,11 @@ #define NDEBUG #include <debug.h> + +/* FIXME: This should be somewhere global instead of having 20 different versions */ +#define GUID_STRING_CHARS 38 +#define GUID_STRING_BYTES (GUID_STRING_CHARS * sizeof(WCHAR)) +C_ASSERT(sizeof(L"{01234567-89ab-cdef-0123-456789abcdef}") == GUID_STRING_BYTES + sizeof(UNICODE_NULL)); /* FUNCTIONS *****************************************************************/ @@ -1312,8 +1317,6 @@ { PDEVICE_OBJECT PhysicalDeviceObject; UNICODE_STRING GuidString; - PWCHAR StartPosition; - PWCHAR EndPosition; NTSTATUS Status; LPCGUID EventGuid; HANDLE InstanceHandle, ControlHandle; @@ -1321,25 +1324,64 @@ OBJECT_ATTRIBUTES ObjectAttributes; ULONG LinkedValue, Index; GUID DeviceGuid; - + UNICODE_STRING DosDevicesPrefix1 = RTL_CONSTANT_STRING(L"\\??\\"); + UNICODE_STRING DosDevicesPrefix2 = RTL_CONSTANT_STRING(L"\\\\?\\"); + UNICODE_STRING LinkNameNoPrefix; + USHORT i; + USHORT ReferenceStringOffset; if (SymbolicLinkName == NULL) - return STATUS_INVALID_PARAMETER_1; + { + return STATUS_INVALID_PARAMETER; + } DPRINT("IoSetDeviceInterfaceState('%wZ', %u)\n", SymbolicLinkName, Enable); /* Symbolic link name is \??\ACPI#PNP0501#1#{GUID}\ReferenceString */ - /* Get GUID from SymbolicLinkName */ - StartPosition = wcschr(SymbolicLinkName->Buffer, L'{'); - EndPosition = wcschr(SymbolicLinkName->Buffer, L'}'); - if (!StartPosition ||!EndPosition || StartPosition > EndPosition) - { - DPRINT1("IoSetDeviceInterfaceState() returning STATUS_INVALID_PARAMETER_1\n"); - return STATUS_INVALID_PARAMETER_1; - } - GuidString.Buffer = StartPosition; - GuidString.MaximumLength = GuidString.Length = (USHORT)((ULONG_PTR)(EndPosition + 1) - (ULONG_PTR)StartPosition); - + /* Make sure it starts with the expected prefix */ + if (!RtlPrefixUnicodeString(&DosDevicesPrefix1, SymbolicLinkName, FALSE) && + !RtlPrefixUnicodeString(&DosDevicesPrefix2, SymbolicLinkName, FALSE)) + { + DPRINT1("IoSetDeviceInterfaceState() invalid link name '%wZ'\n", SymbolicLinkName); + return STATUS_INVALID_PARAMETER; + } + + /* Make a version without the prefix for further processing */ + ASSERT(DosDevicesPrefix1.Length == DosDevicesPrefix2.Length); + ASSERT(SymbolicLinkName->Length >= DosDevicesPrefix1.Length); + LinkNameNoPrefix.Buffer = SymbolicLinkName->Buffer + DosDevicesPrefix1.Length / sizeof(WCHAR); + LinkNameNoPrefix.Length = SymbolicLinkName->Length - DosDevicesPrefix1.Length; + LinkNameNoPrefix.MaximumLength = LinkNameNoPrefix.Length; + + /* Find the reference string, if any */ + for (i = 0; i < LinkNameNoPrefix.Length / sizeof(WCHAR); i++) + { + if (LinkNameNoPrefix.Buffer[i] == L'\\') + { + break; + } + } + ReferenceStringOffset = i * sizeof(WCHAR); + + /* The GUID is before the reference string or at the end */ + ASSERT(LinkNameNoPrefix.Length >= ReferenceStringOffset); + if (ReferenceStringOffset < GUID_STRING_BYTES + sizeof(WCHAR)) + { + DPRINT1("IoSetDeviceInterfaceState() invalid link name '%wZ'\n", SymbolicLinkName); + return STATUS_INVALID_PARAMETER; + } + + GuidString.Buffer = LinkNameNoPrefix.Buffer + (ReferenceStringOffset - GUID_STRING_BYTES) / sizeof(WCHAR); + GuidString.Length = GUID_STRING_BYTES; + GuidString.MaximumLength = GuidString.Length; + Status = RtlGUIDFromString(&GuidString, &DeviceGuid); + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlGUIDFromString() invalid GUID '%wZ' in link name '%wZ'\n", &GuidString, SymbolicLinkName); + return Status; + } + + /* Open registry keys */ Status = OpenRegistryHandlesFromSymbolicLink(SymbolicLinkName, KEY_CREATE_SUB_KEY, NULL, @@ -1384,16 +1426,28 @@ return Status; } - DeviceInstance.Buffer = ExAllocatePool(PagedPool, (ULONG_PTR)StartPosition - (ULONG_PTR)SymbolicLinkName->Buffer); + ASSERT(GuidString.Buffer >= LinkNameNoPrefix.Buffer + 1); + DeviceInstance.Length = (GuidString.Buffer - LinkNameNoPrefix.Buffer - 1) * sizeof(WCHAR); + if (DeviceInstance.Length == 0) + { + DPRINT1("No device instance in link name '%wZ'\n", SymbolicLinkName); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + DeviceInstance.MaximumLength = DeviceInstance.Length; + DeviceInstance.Buffer = ExAllocatePoolWithTag(PagedPool, + DeviceInstance.MaximumLength, + TAG_IO); if (DeviceInstance.Buffer == NULL) { /* no memory */ return STATUS_INSUFFICIENT_RESOURCES; } - DeviceInstance.MaximumLength = DeviceInstance.Length = ((ULONG_PTR)StartPosition - (ULONG_PTR)SymbolicLinkName->Buffer) - 5 * sizeof(WCHAR); - RtlCopyMemory(DeviceInstance.Buffer, &SymbolicLinkName->Buffer[4], DeviceInstance.Length); - for(Index = 0; Index < DeviceInstance.Length / sizeof(WCHAR); Index++) + RtlCopyMemory(DeviceInstance.Buffer, + LinkNameNoPrefix.Buffer, + DeviceInstance.Length); + + for (Index = 0; Index < DeviceInstance.Length / sizeof(WCHAR); Index++) { if (DeviceInstance.Buffer[Index] == L'#') { @@ -1402,22 +1456,15 @@ } PhysicalDeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance); - + if (!PhysicalDeviceObject) { - DPRINT1("IopGetDeviceObjectFromDeviceInstance failed to find status %wZ\n", &DeviceInstance); - ExFreePool(DeviceInstance.Buffer); - return STATUS_NOT_FOUND; - } - - ExFreePool(DeviceInstance.Buffer); - Status = RtlGUIDFromString(&GuidString, &DeviceGuid); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlGUIDFromString() failed with status 0x%08lx\n", Status); - ObDereferenceObject(PhysicalDeviceObject); - return Status; - } + DPRINT1("IopGetDeviceObjectFromDeviceInstance failed to find device object for %wZ\n", &DeviceInstance); + ExFreePoolWithTag(DeviceInstance.Buffer, TAG_IO); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + + ExFreePoolWithTag(DeviceInstance.Buffer, TAG_IO); EventGuid = Enable ? &GUID_DEVICE_INTERFACE_ARRIVAL : &GUID_DEVICE_INTERFACE_REMOVAL; IopNotifyPlugPlayNotification(

1 0

[cgutman] 69728: [AFD] - Fix WSAEnumNetworkEvents failing if no event was supplied (uTorrent issue - CORE-6656)
by cgutman＠svn.reactos.org 28 Oct '15

28 Oct '15

Author: cgutman Date: Wed Oct 28 03:12:21 2015 New Revision: 69728 URL: http://svn.reactos.org/svn/reactos?rev=69728&view=rev Log: [AFD] - Fix WSAEnumNetworkEvents failing if no event was supplied (uTorrent issue - CORE-6656) Modified: trunk/reactos/drivers/network/afd/afd/select.c Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Wed Oct 28 03:12:21 2015 @@ -344,21 +344,25 @@ return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); } - Status = ObReferenceObjectByHandle(EnumReq->Event, - EVENT_ALL_ACCESS, - *ExEventObjectType, - UserMode, - (PVOID *)&UserEvent, - NULL); - if (!NT_SUCCESS(Status)) + /* An event may optionally be provided for us to clear */ + if (EnumReq->Event != NULL) { - AFD_DbgPrint(MIN_TRACE,("Unable to reference event %x\n", Status)); - return UnlockAndMaybeComplete(FCB, Status, Irp, 0); - } - - /* Clear the event */ - KeClearEvent(UserEvent); - ObDereferenceObject(UserEvent); + Status = ObReferenceObjectByHandle(EnumReq->Event, + EVENT_ALL_ACCESS, + *ExEventObjectType, + UserMode, + (PVOID *)&UserEvent, + NULL); + if (!NT_SUCCESS(Status)) + { + AFD_DbgPrint(MIN_TRACE,("Unable to reference event %x\n", Status)); + return UnlockAndMaybeComplete(FCB, Status, Irp, 0); + } + + /* Clear the event */ + KeClearEvent(UserEvent); + ObDereferenceObject(UserEvent); + } /* Copy the poll state, masking out disabled events */ EnumReq->PollEvents = (FCB->PollState & ~FCB->EventSelectDisabled);

1 0

[cgutman] 69727: [PCIX] - Fix typo in QueryInterface size field
by cgutman＠svn.reactos.org 28 Oct '15

28 Oct '15

Author: cgutman Date: Wed Oct 28 01:11:00 2015 New Revision: 69727 URL: http://svn.reactos.org/svn/reactos?rev=69727&view=rev Log: [PCIX] - Fix typo in QueryInterface size field Modified: trunk/reactos/drivers/bus/pcix/pci/config.c Modified: trunk/reactos/drivers/bus/pcix/pci/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/confi… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/config.c [iso-8859-1] Wed Oct 28 01:11:00 2015 @@ -173,7 +173,7 @@ ASSERT(IoStackLocation->MajorFunction == IRP_MJ_PNP); IoStackLocation->MinorFunction = IRP_MN_QUERY_INTERFACE; IoStackLocation->Parameters.QueryInterface.InterfaceType = &GUID_PCI_BUS_INTERFACE_STANDARD; - IoStackLocation->Parameters.QueryInterface.Size = sizeof(GUID_PCI_BUS_INTERFACE_STANDARD); + IoStackLocation->Parameters.QueryInterface.Size = sizeof(PCI_BUS_INTERFACE_STANDARD); IoStackLocation->Parameters.QueryInterface.Version = PCI_BUS_INTERFACE_STANDARD_VERSION; IoStackLocation->Parameters.QueryInterface.Interface = (PINTERFACE)PciInterface; IoStackLocation->Parameters.QueryInterface.InterfaceSpecificData = NULL;

1 0

[aandrejevic] 69726: [NTVDM] VGA Horizontal splitting should reset the address to 0 + panning, and not the start address + panning.
by aandrejevic＠svn.reactos.org 28 Oct '15

28 Oct '15

Author: aandrejevic Date: Wed Oct 28 00:39:29 2015 New Revision: 69726 URL: http://svn.reactos.org/svn/reactos?rev=69726&view=rev Log: [NTVDM] VGA Horizontal splitting should reset the address to 0 + panning, and not the start address + panning. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Wed Oct 28 00:39:29 2015 @@ -1247,9 +1247,7 @@ } /* Reset the address, but assume the preset row scan is 0 */ - Address = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG], - VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG]) - + BytePanning; + Address = BytePanning; } if ((VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_OE) && (i & 1))

1 0

[aandrejevic] 69725: [NTVDM] Implement VGA horizontal splitting.
by aandrejevic＠svn.reactos.org 27 Oct '15

27 Oct '15

Author: aandrejevic Date: Tue Oct 27 22:16:53 2015 New Revision: 69725 URL: http://svn.reactos.org/svn/reactos?rev=69725&view=rev Log: [NTVDM] Implement VGA horizontal splitting. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Tue Oct 27 22:16:53 2015 @@ -1185,10 +1185,14 @@ DWORD AddressSize = VgaGetAddressSize(); DWORD ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2; BYTE PresetRowScan = VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] & 0x1F; + BYTE BytePanning = (VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] >> 5) & 3; DWORD Address = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG], VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG]) + PresetRowScan * ScanlineSize - + ((VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] >> 5) & 3); + + BytePanning; + WORD LineCompare = VgaCrtcRegisters[VGA_CRTC_LINE_COMPARE_REG] + | ((VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_LC8) << 4); + BYTE PixelShift = VgaAcRegisters[VGA_AC_HORZ_PANNING_REG] & 0x0F; /* * If the console framebuffer is NULL, that means something @@ -1216,9 +1220,38 @@ InterlaceHighBit >>= 1; } + if (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & VGA_CRTC_MAXSCANLINE_DOUBLE) + { + /* Halve the line compare value */ + LineCompare >>= 1; + } + else + { + /* Divide the line compare value by the maximum scan line */ + LineCompare /= 1 + (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & 0x1F); + } + /* Loop through the scanlines */ for (i = 0; i < CurrResolution.Y; i++) { + if (i == LineCompare) + { + if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_PPM) + { + /* + * Disable the pixel shift count and byte panning + * for the rest of the display cycle + */ + PixelShift = 0; + BytePanning = 0; + } + + /* Reset the address, but assume the preset row scan is 0 */ + Address = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG], + VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG]) + + BytePanning; + } + if ((VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_OE) && (i & 1)) { /* Odd-numbered line in interlaced mode - set the high bit */ @@ -1233,11 +1266,11 @@ /* Apply horizontal pixel panning */ if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) { - X = j + ((VgaAcRegisters[VGA_AC_HORZ_PANNING_REG] & 0x0F) >> 1); + X = j + (PixelShift >> 1); } else { - X = j + (VgaAcRegisters[VGA_AC_HORZ_PANNING_REG] & 0x0F); + X = j + PixelShift; } /* Check the shifting mode */

1 0

[hbelusca] 69724: Shut up Mr. GCC.
by hbelusca＠svn.reactos.org 27 Oct '15

27 Oct '15

Author: hbelusca Date: Tue Oct 27 21:27:55 2015 New Revision: 69724 URL: http://svn.reactos.org/svn/reactos?rev=69724&view=rev Log: Shut up Mr. GCC. Modified: trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.h Modified: trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c [iso-8859-1] Tue Oct 27 21:27:55 2015 @@ -25,6 +25,7 @@ return TRUE; } +#if 0 static VOID CleanupUxTheme(VOID) { @@ -32,7 +33,7 @@ hUxTheme = NULL; // Initialized = FALSE; } - +#endif //////////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.h [iso-8859-1] Tue Oct 27 21:27:55 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Applications * LICENSE: LGPL - See COPYING in the top level directory - * FILE: base/applications/msconfig_new/comctl32ex/uxthemesupp.c + * FILE: base/applications/msconfig_new/comctl32ex/uxthemesupp.h * PURPOSE: UX Theming helpers. * COPYRIGHT: Copyright 2015 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> */

1 0

[hbelusca] 69723: [MSCONFIG_NEW] Enable Win7-like theming when applicable.
by hbelusca＠svn.reactos.org 27 Oct '15

27 Oct '15

Author: hbelusca Date: Tue Oct 27 21:22:17 2015 New Revision: 69723 URL: http://svn.reactos.org/svn/reactos?rev=69723&view=rev Log: [MSCONFIG_NEW] Enable Win7-like theming when applicable. Added: trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c (with props) trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.h (with props) Modified: trunk/reactos/base/applications/msconfig_new/CMakeLists.txt trunk/reactos/base/applications/msconfig_new/msconfig.c trunk/reactos/base/applications/msconfig_new/srvpage.cpp trunk/reactos/base/applications/msconfig_new/toolspage.cpp Modified: trunk/reactos/base/applications/msconfig_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/CMakeLists.txt [iso-8859-1] Tue Oct 27 21:22:17 2015 @@ -11,6 +11,7 @@ list(APPEND C_SOURCE comctl32ex/listviewfuncs.c + comctl32ex/uxthemesupp.c fileextractdialog.c fileutils.c freeldrpage.c Added: trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c (added) +++ trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c [iso-8859-1] Tue Oct 27 21:22:17 2015 @@ -0,0 +1,84 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: base/applications/msconfig_new/comctl32ex/uxthemesupp.c + * PURPOSE: UX Theming helpers. + * COPYRIGHT: Copyright 2015 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> + */ + +#include "precomp.h" +#include "uxthemesupp.h" + +static HMODULE hUxTheme = NULL; + +static BOOL +InitUxTheme(VOID) +{ + static BOOL Initialized = FALSE; + + if (Initialized) return TRUE; + + hUxTheme = LoadLibraryW(L"uxtheme.dll"); + if (hUxTheme == NULL) return FALSE; + + Initialized = TRUE; + return TRUE; +} + +static VOID +CleanupUxTheme(VOID) +{ + FreeLibrary(hUxTheme); + hUxTheme = NULL; + // Initialized = FALSE; +} + + + +//////////////////////////////////////////////////////////////////////////////// +// Taken from WinSpy++ 1.7 +// http://www.catch22.net/software/winspy +// Copyright (c) 2002 by J Brown +// + +typedef HRESULT (WINAPI* ETDTProc)(HWND, DWORD); + +HRESULT +WINAPI +EnableThemeDialogTexture(_In_ HWND hwnd, + _In_ DWORD dwFlags) +{ + ETDTProc fnEnableThemeDialogTexture; + + if (!InitUxTheme()) + return HRESULT_FROM_WIN32(GetLastError()); + + fnEnableThemeDialogTexture = + (ETDTProc)GetProcAddress(hUxTheme, "EnableThemeDialogTexture"); + if (!fnEnableThemeDialogTexture) + return HRESULT_FROM_WIN32(GetLastError()); + + return fnEnableThemeDialogTexture(hwnd, dwFlags); +} + + +typedef HRESULT (WINAPI* SWTProc)(HWND, LPCWSTR, LPCWSTR); + +HRESULT +WINAPI +SetWindowTheme(_In_ HWND hwnd, + _In_ LPCWSTR pszSubAppName, + _In_ LPCWSTR pszSubIdList) +{ + SWTProc fnSetWindowTheme; + + if (!InitUxTheme()) + return HRESULT_FROM_WIN32(GetLastError()); + + fnSetWindowTheme = + (SWTProc)GetProcAddress(hUxTheme, "SetWindowTheme"); + if (!fnSetWindowTheme) + return HRESULT_FROM_WIN32(GetLastError()); + + return fnSetWindowTheme(hwnd, pszSubAppName, pszSubIdList); +} Propchange: trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.h (added) +++ trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.h [iso-8859-1] Tue Oct 27 21:22:17 2015 @@ -0,0 +1,48 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: base/applications/msconfig_new/comctl32ex/uxthemesupp.c + * PURPOSE: UX Theming helpers. + * COPYRIGHT: Copyright 2015 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> + */ + +#ifndef _UXTHEMESUPP_H_ +#define _UXTHEMESUPP_H_ + +#pragma once + +#if defined(_UXTHEME_H) || defined(_UXTHEME_H_) // First one is our headers from Wine/MinGW, second one is MS PSDK +#warning "PSDK header uxtheme.h is already included, you might think about using it instead!" +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +// +// Copied from uxtheme.h +// If you have this new header, then delete these and +// #include <uxtheme.h> instead! +// + +#define ETDT_DISABLE 0x00000001 +#define ETDT_ENABLE 0x00000002 +#define ETDT_USETABTEXTURE 0x00000004 +#define ETDT_ENABLETAB (ETDT_ENABLE | ETDT_USETABTEXTURE) + +HRESULT +WINAPI +EnableThemeDialogTexture(_In_ HWND hwnd, + _In_ DWORD dwFlags); + +HRESULT +WINAPI +SetWindowTheme(_In_ HWND hwnd, + _In_ LPCWSTR pszSubAppName, + _In_ LPCWSTR pszSubIdList); + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // _UXTHEMESUPP_H_ Propchange: trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/msconfig_new/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/msconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/msconfig.c [iso-8859-1] Tue Oct 27 21:22:17 2015 @@ -45,61 +45,6 @@ HICON hIcon = NULL; WNDPROC wpOrigEditProc = NULL; - -//////////////////////////////////////////////////////////////////////////////// -// Taken from WinSpy++ 1.7 -// http://www.catch22.net/software/winspy -// Copyright (c) 2002 by J Brown -// - -// -// Copied from uxtheme.h -// If you have this new header, then delete these and -// #include <uxtheme.h> instead! -// -#define ETDT_DISABLE 0x00000001 -#define ETDT_ENABLE 0x00000002 -#define ETDT_USETABTEXTURE 0x00000004 -#define ETDT_ENABLETAB (ETDT_ENABLE | ETDT_USETABTEXTURE) - -// -typedef HRESULT (WINAPI * ETDTProc) (HWND, DWORD); - -// -// Try to call EnableThemeDialogTexture, if uxtheme.dll is present -// -BOOL EnableDialogTheme(HWND hwnd) -{ - HMODULE hUXTheme; - ETDTProc fnEnableThemeDialogTexture; - - hUXTheme = LoadLibrary(_T("uxtheme.dll")); - - if(hUXTheme) - { - fnEnableThemeDialogTexture = - (ETDTProc)GetProcAddress(hUXTheme, "EnableThemeDialogTexture"); - - if(fnEnableThemeDialogTexture) - { - fnEnableThemeDialogTexture(hwnd, ETDT_ENABLETAB); - - FreeLibrary(hUXTheme); - return TRUE; - } - else - { - // Failed to locate API! - FreeLibrary(hUXTheme); - return FALSE; - } - } - else - { - // Not running under XP? Just fail gracefully - return FALSE; - } -} /* About Box dialog */ INT_PTR CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) Modified: trunk/reactos/base/applications/msconfig_new/srvpage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/srvpage.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/srvpage.cpp [iso-8859-1] Tue Oct 27 21:22:17 2015 @@ -10,10 +10,11 @@ #include "precomp.h" #include "utils.h" -#include "listviewfuncs.h" #include "regutils.h" #include "stringutils.h" // #include "CmdLineParser.h" +#include "listviewfuncs.h" +#include "uxthemesupp.h" #include <winsvc.h> @@ -666,7 +667,7 @@ // DWORD dwStyle = ListView_GetExtendedListViewStyle(hServicesListCtrl); ListView_SetExtendedListViewStyle(hServicesListCtrl, dwStyle | LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES); - /** SetWindowTheme(hServicesListCtrl, _T("Explorer"), NULL); // TODO: activate this only if Windows >= XP **/ + SetWindowTheme(hServicesListCtrl, L"Explorer", NULL); // // Initialize the application page's controls. Modified: trunk/reactos/base/applications/msconfig_new/toolspage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/toolspage.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/toolspage.cpp [iso-8859-1] Tue Oct 27 21:22:17 2015 @@ -11,6 +11,7 @@ #include "xmldomparser.hpp" #include "utils.h" #include "listviewfuncs.h" +#include "uxthemesupp.h" static HWND hToolsPage = NULL; static HWND hToolsListCtrl = NULL; @@ -330,7 +331,7 @@ // DWORD dwStyle = ListView_GetExtendedListViewStyle(hToolsListCtrl); ListView_SetExtendedListViewStyle(hToolsListCtrl, dwStyle | LVS_EX_FULLROWSELECT); - /** SetWindowTheme(hToolsListCtrl, _T("Explorer"), NULL); // TODO: activate this only if Windows >= XP **/ + SetWindowTheme(hToolsListCtrl, L"Explorer", NULL); // // Initialize the application page's controls.

1 0

[tfaber] 69722: [KMTESTS:IO] - Add some basic parameter tests for IoSetDeviceInterfaceState CORE-9456
by tfaber＠svn.reactos.org 27 Oct '15

27 Oct '15

Author: tfaber Date: Tue Oct 27 12:14:10 2015 New Revision: 69722 URL: http://svn.reactos.org/svn/reactos?rev=69722&view=rev Log: [KMTESTS:IO] - Add some basic parameter tests for IoSetDeviceInterfaceState CORE-9456 Modified: trunk/rostests/kmtests/ntos_io/IoDeviceInterface.c Modified: trunk/rostests/kmtests/ntos_io/IoDeviceInterface.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoDeviceI… ============================================================================== --- trunk/rostests/kmtests/ntos_io/IoDeviceInterface.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_io/IoDeviceInterface.c [iso-8859-1] Tue Oct 27 12:14:10 2015 @@ -181,9 +181,112 @@ } } +static +VOID +Test_IoSetDeviceInterface(VOID) +{ + NTSTATUS Status; + UNICODE_STRING SymbolicLinkName; + PWCHAR Buffer; + ULONG BufferSize; + + /* Invalid prefix or GUID */ + KmtStartSeh() + Status = IoSetDeviceInterfaceState(NULL, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + + RtlInitEmptyUnicodeString(&SymbolicLinkName, NULL, 0); + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + + RtlInitUnicodeString(&SymbolicLinkName, L"\\??"); + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + + RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\"); + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + + RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\\\"); + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + + RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\{aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}"); + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + + /* Valid prefix & GUID, invalid device node */ + RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\X{aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}"); + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_OBJECT_NAME_NOT_FOUND); + + RtlInitUnicodeString(&SymbolicLinkName, L"\\\\?\\X{aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}"); + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_OBJECT_NAME_NOT_FOUND); + + RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\X{aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}\\"); + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_OBJECT_NAME_NOT_FOUND); + + RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\#{aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}"); + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_OBJECT_NAME_NOT_FOUND); + + /* Must not read past the buffer */ + RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\#{aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}"); + BufferSize = SymbolicLinkName.Length; + Buffer = KmtAllocateGuarded(BufferSize); + if (!skip(Buffer != NULL, "Failed to allocate %lu bytes\n", BufferSize)) + { + RtlCopyMemory(Buffer, SymbolicLinkName.Buffer, BufferSize); + SymbolicLinkName.Buffer = Buffer; + SymbolicLinkName.MaximumLength = BufferSize; + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_OBJECT_NAME_NOT_FOUND); + KmtFreeGuarded(Buffer); + } + + RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\#aaaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}"); + BufferSize = SymbolicLinkName.Length; + Buffer = KmtAllocateGuarded(BufferSize); + if (!skip(Buffer != NULL, "Failed to allocate %lu bytes\n", BufferSize)) + { + RtlCopyMemory(Buffer, SymbolicLinkName.Buffer, BufferSize); + SymbolicLinkName.Buffer = Buffer; + SymbolicLinkName.MaximumLength = BufferSize; + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + KmtFreeGuarded(Buffer); + } +} + START_TEST(IoDeviceInterface) { // FIXME: This test crashes in Windows (void)Test_IoRegisterDeviceInterface; Test_IoRegisterPlugPlayNotification(); + Test_IoSetDeviceInterface(); }

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