Ros-diffs June 2020

ros-diffs@reactos.org

20 participants
95 discussions

[reactos] 02/07: [CMAKE] Mark host tools as byproducts. CORE-17109

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dadc59f1355424fd58623… commit dadc59f1355424fd58623bfae2b3d2080acd5c02 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Jun 6 22:57:11 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jun 20 15:25:27 2020 +0200 [CMAKE] Mark host tools as byproducts. CORE-17109 --- sdk/cmake/host-tools.cmake | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake index 04e58f7c7bb..c14827590d3 100644 --- a/sdk/cmake/host-tools.cmake +++ b/sdk/cmake/host-tools.cmake @@ -27,17 +27,23 @@ function(configure_host_tools HOST_TOOLS_DIR) set_property(SOURCE host_tools PROPERTY SYMBOLIC 1) + include(${HOST_TOOLS_DIR}/ImportExecutables.cmake) + include(${HOST_TOOLS_DIR}/TargetList.cmake) + + foreach(_target ${NATIVE_TARGETS}) + get_target_property(_target_location native-${_target} LOCATION) + list(APPEND _target_locations ${_target_location}) + endforeach() + # Make a host-tools target so it'll be built when needed # custom target + symbolic output prevents cmake from running # the command multiple times per build add_custom_command( COMMAND ${CMAKE_COMMAND} --build ${HOST_TOOLS_DIR} - OUTPUT host_tools) + OUTPUT host_tools + BYPRODUCTS ${_target_locations}) add_custom_target(build-host-tools ALL DEPENDS host_tools) - include(${HOST_TOOLS_DIR}/ImportExecutables.cmake) - include(${HOST_TOOLS_DIR}/TargetList.cmake) - foreach(_target ${NATIVE_TARGETS}) add_dependencies(native-${_target} build-host-tools) endforeach()

4 years, 2 months

[reactos] 01/07: [BOOTDATA] Mark reactos.inf as a byproduct. CORE-17109

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b783349e4e2093467053d… commit b783349e4e2093467053dc8f1e45d9ac7f98c355 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Jun 6 22:56:49 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jun 20 15:25:16 2020 +0200 [BOOTDATA] Mark reactos.inf as a byproduct. CORE-17109 --- boot/bootdata/packages/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/bootdata/packages/CMakeLists.txt b/boot/bootdata/packages/CMakeLists.txt index a6199199f25..3f1cc6ff00c 100644 --- a/boot/bootdata/packages/CMakeLists.txt +++ b/boot/bootdata/packages/CMakeLists.txt @@ -40,7 +40,8 @@ add_custom_command( add_custom_target( reactos_cab_inf COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -L ${CMAKE_CURRENT_BINARY_DIR} -I -P ${REACTOS_SOURCE_DIR} - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff native-cabman) + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff native-cabman + BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf) add_cd_file( TARGET reactos_cab_inf

4 years, 2 months

[reactos] 01/01: [WINMM] Improve implementation of timeGetTime, timeBeginPeriod, timeEndPeriod (#2933)

by Thomas Brogan

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=88300ec3b3bbb2fc024f1… commit 88300ec3b3bbb2fc024f1d960d317dd802c4a3f6 Author: Thomas Brogan <brogan.tom.iii(a)gmail.com> AuthorDate: Sat Jun 20 13:28:25 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jun 20 13:28:25 2020 +0300 [WINMM] Improve implementation of timeGetTime, timeBeginPeriod, timeEndPeriod (#2933) Use QueryPerformanceCounter if a high-resolution timer is requested (<= 5ms) instead of the more inaccurate GetTickCount. --- dll/win32/winmm/time.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/dll/win32/winmm/time.c b/dll/win32/winmm/time.c index 5da3f2f0752..832a45ba4fa 100644 --- a/dll/win32/winmm/time.c +++ b/dll/win32/winmm/time.c @@ -47,6 +47,7 @@ static LPWINE_TIMERENTRY TIME_TimersList; static HANDLE TIME_hKillEvent; static HANDLE TIME_hWakeEvent; static BOOL TIME_TimeToDie = TRUE; +static LARGE_INTEGER TIME_qpcFreq; /* * Some observations on the behavior of winmm on Windows. @@ -422,7 +423,14 @@ MMRESULT WINAPI timeGetDevCaps(LPTIMECAPS lpCaps, UINT wSize) MMRESULT WINAPI timeBeginPeriod(UINT wPeriod) { if (wPeriod < MMSYSTIME_MININTERVAL || wPeriod > MMSYSTIME_MAXINTERVAL) - return TIMERR_NOCANDO; + return TIMERR_NOCANDO; + + /* High resolution timer requested, use QPC */ + if (wPeriod <= 5 && TIME_qpcFreq.QuadPart == 0) + { + if (QueryPerformanceFrequency(&TIME_qpcFreq)) + TIME_qpcFreq.QuadPart /= 1000; + } if (wPeriod > MMSYSTIME_MININTERVAL) { @@ -438,7 +446,11 @@ MMRESULT WINAPI timeBeginPeriod(UINT wPeriod) MMRESULT WINAPI timeEndPeriod(UINT wPeriod) { if (wPeriod < MMSYSTIME_MININTERVAL || wPeriod > MMSYSTIME_MAXINTERVAL) - return TIMERR_NOCANDO; + return TIMERR_NOCANDO; + + /* High resolution timer no longer requested, stop using QPC */ + if (wPeriod <= 5 && TIME_qpcFreq.QuadPart != 0) + TIME_qpcFreq.QuadPart = 0; if (wPeriod > MMSYSTIME_MININTERVAL) { @@ -453,6 +465,7 @@ MMRESULT WINAPI timeEndPeriod(UINT wPeriod) */ DWORD WINAPI timeGetTime(void) { + LARGE_INTEGER perfCount; #if defined(COMMENTOUTPRIORTODELETING) DWORD count; @@ -462,6 +475,12 @@ DWORD WINAPI timeGetTime(void) if (pFnReleaseThunkLock) pFnReleaseThunkLock(&count); if (pFnRestoreThunkLock) pFnRestoreThunkLock(count); #endif - + /* Use QPC if a high-resolution timer was requested (<= 5ms) */ + if (TIME_qpcFreq.QuadPart != 0) + { + QueryPerformanceCounter(&perfCount); + return (DWORD)(perfCount.QuadPart / TIME_qpcFreq.QuadPart); + } + /* Otherwise continue using GetTickCount */ return GetTickCount(); }

4 years, 2 months

[reactos] 02/02: [PCI] Fix PDO removal

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b9941e7cbdca2202871f… commit 2b9941e7cbdca2202871f8a71c9564f81392a11f Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Jun 18 18:18:13 2020 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Jun 20 08:16:24 2020 +0200 [PCI] Fix PDO removal We must not do anything on PDO removal, especially not deleting it. We are allowed to delete it, only once we successfully completed a IRP_MN_QUERY_DEVICE_RELATIONS without with PDO. --- drivers/bus/pci/pdo.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/drivers/bus/pci/pdo.c b/drivers/bus/pci/pdo.c index 1d6b8c54ecf..139aed69439 100644 --- a/drivers/bus/pci/pdo.c +++ b/drivers/bus/pci/pdo.c @@ -1577,34 +1577,11 @@ PdoPnpControl( case IRP_MN_STOP_DEVICE: case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_CANCEL_REMOVE_DEVICE: + case IRP_MN_REMOVE_DEVICE: case IRP_MN_SURPRISE_REMOVAL: Status = STATUS_SUCCESS; break; - case IRP_MN_REMOVE_DEVICE: - { - PPDO_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; - PFDO_DEVICE_EXTENSION FdoDeviceExtension = DeviceExtension->Fdo->DeviceExtension; - KIRQL OldIrql; - - /* Remove it from the device list */ - KeAcquireSpinLock(&FdoDeviceExtension->DeviceListLock, &OldIrql); - RemoveEntryList(&DeviceExtension->PciDevice->ListEntry); - FdoDeviceExtension->DeviceListCount--; - KeReleaseSpinLock(&FdoDeviceExtension->DeviceListLock, OldIrql); - - /* Free the device */ - ExFreePoolWithTag(DeviceExtension->PciDevice, TAG_PCI); - - /* Complete the IRP */ - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - /* Delete the DO */ - IoDeleteDevice(DeviceObject); - return STATUS_SUCCESS; - } - case IRP_MN_QUERY_INTERFACE: DPRINT("IRP_MN_QUERY_INTERFACE received\n"); Status = PdoQueryInterface(DeviceObject, Irp, IrpSp);

4 years, 2 months

[reactos] 01/02: [SETUPAPI] Add function names in traces

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea4af587a9294263efbbd… commit ea4af587a9294263efbbd45865d3965a73a6b6d7 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Jun 18 19:20:14 2020 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Jun 20 08:16:07 2020 +0200 [SETUPAPI] Add function names in traces --- dll/win32/setupapi/devinst.c | 112 +++++++++++++++++++++---------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/dll/win32/setupapi/devinst.c b/dll/win32/setupapi/devinst.c index de4080bcf20..fef929d6ef8 100644 --- a/dll/win32/setupapi/devinst.c +++ b/dll/win32/setupapi/devinst.c @@ -149,8 +149,8 @@ CheckSectionValid( static const WCHAR ExtensionArchitectureppc[] = {'p','p','c',0}; static const WCHAR ExtensionArchitecturex86[] = {'x','8','6',0}; - TRACE("%s %p 0x%x 0x%x\n", - debugstr_w(SectionName), PlatformInfo, ProductType, SuiteMask); + TRACE("%s(%s %p 0x%x 0x%x)\n", + __FUNCTION__, debugstr_w(SectionName), PlatformInfo, ProductType, SuiteMask); *ScorePlatform = *ScoreMajorVersion = *ScoreMinorVersion = *ScoreProductType = *ScoreSuiteMask = 0; @@ -422,7 +422,7 @@ SetupDiGetActualSectionToInstallExW( { BOOL ret = FALSE; - TRACE("%p %s %p %p %lu %p %p %p\n", InfHandle, debugstr_w(InfSectionName), + TRACE("%s(%p %s %p %p %lu %p %p %p)\n", __FUNCTION__, InfHandle, debugstr_w(InfSectionName), AlternatePlatformInfo, InfSectionWithExt, InfSectionWithExtSize, RequiredSize, Extension, Reserved); @@ -681,7 +681,7 @@ BOOL WINAPI SetupDiBuildClassInfoListExA( LPWSTR MachineNameW = NULL; BOOL bResult; - TRACE("0x%lx %p %lu %p %s %p\n", Flags, ClassGuidList, + TRACE("%s(0x%lx %p %lu %p %s %p)\n", __FUNCTION__, Flags, ClassGuidList, ClassGuidListSize, RequiredSize, debugstr_a(MachineName), Reserved); if (MachineName) @@ -733,7 +733,7 @@ BOOL WINAPI SetupDiBuildClassInfoListExW( LONG lError; DWORD dwGuidListIndex = 0; - TRACE("0x%lx %p %lu %p %s %p\n", Flags, ClassGuidList, + TRACE("%s(0x%lx %p %lu %p %s %p)\n", __FUNCTION__, Flags, ClassGuidList, ClassGuidListSize, RequiredSize, debugstr_w(MachineName), Reserved); if (!RequiredSize) @@ -900,7 +900,7 @@ BOOL WINAPI SetupDiClassGuidsFromNameExA( LPWSTR MachineNameW = NULL; BOOL bResult; - TRACE("%s %p %lu %p %s %p\n", debugstr_a(ClassName), ClassGuidList, + TRACE("%s(%s %p %lu %p %s %p)\n", __FUNCTION__, debugstr_a(ClassName), ClassGuidList, ClassGuidListSize, RequiredSize, debugstr_a(MachineName), Reserved); if (!ClassName) @@ -953,7 +953,7 @@ BOOL WINAPI SetupDiClassGuidsFromNameExW( LONG lError; DWORD dwGuidListIndex = 0; - TRACE("%s %p %lu %p %s %p\n", debugstr_w(ClassName), ClassGuidList, + TRACE("%s(%s %p %lu %p %s %p)\n", __FUNCTION__, debugstr_w(ClassName), ClassGuidList, ClassGuidListSize, RequiredSize, debugstr_w(MachineName), Reserved); if (!ClassName || !RequiredSize) @@ -1134,7 +1134,7 @@ BOOL WINAPI SetupDiClassNameFromGuidExW( LONG rc; PWSTR Buffer; - TRACE("%s %p %lu %p %s %p\n", debugstr_guid(ClassGuid), ClassName, + TRACE("%s(%s %p %lu %p %s %p)\n", __FUNCTION__, debugstr_guid(ClassGuid), ClassName, ClassNameSize, RequiredSize, debugstr_w(MachineName), Reserved); /* Make sure there's a GUID */ @@ -1229,7 +1229,7 @@ SetupDiCreateDeviceInfoListExA(const GUID *ClassGuid, LPWSTR MachineNameW = NULL; HDEVINFO hDevInfo; - TRACE("%s %p %s %p\n", debugstr_guid(ClassGuid), hwndParent, + TRACE("%s(%s %p %s %p)\n", __FUNCTION__, debugstr_guid(ClassGuid), hwndParent, debugstr_a(MachineName), Reserved); if (MachineName) @@ -1276,7 +1276,7 @@ SetupDiCreateDeviceInfoListExW(const GUID *ClassGuid, CONFIGRET cr; HDEVINFO ret = INVALID_HANDLE_VALUE; - TRACE("%s %p %s %p\n", debugstr_guid(ClassGuid), hwndParent, + TRACE("%s(%s %p %s %p)\n", __FUNCTION__, debugstr_guid(ClassGuid), hwndParent, debugstr_w(MachineName), Reserved); if (MachineName != NULL) @@ -1371,7 +1371,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyA( PWSTR InfSectionNameW = NULL; HKEY key; - TRACE("%p %p %d %d %d %p %s\n", DeviceInfoSet, DeviceInfoData, Scope, + TRACE("%s(%p %p %d %d %d %p %s)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData, Scope, HwProfile, KeyType, InfHandle, debugstr_a(InfSectionName)); if (InfHandle) @@ -1419,7 +1419,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( HKEY hKey = NULL; HKEY RootKey; - TRACE("%p %p %lu %lu %lu %p %s\n", DeviceInfoSet, DeviceInfoData, Scope, + TRACE("%s(%p %p %lu %lu %lu %p %s)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData, Scope, HwProfile, KeyType, InfHandle, debugstr_w(InfSectionName)); if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) @@ -1593,7 +1593,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW( DEVINST DevInst; WCHAR GenInstanceId[MAX_DEVICE_ID_LEN]; - TRACE("%p %s %s %s %p %x %p\n", DeviceInfoSet, debugstr_w(DeviceName), + TRACE("%s(%p %s %s %s %p %x %p)\n", __FUNCTION__, DeviceInfoSet, debugstr_w(DeviceName), debugstr_guid(ClassGuid), debugstr_w(DeviceDescription), hwndParent, CreationFlags, DeviceInfoData); @@ -1727,7 +1727,7 @@ BOOL WINAPI SetupDiRegisterDeviceInfo( CONFIGRET cr; DWORD dwError = ERROR_SUCCESS; - TRACE("%p %p %08x %p %p %p\n", DeviceInfoSet, DeviceInfoData, Flags, + TRACE("%s(%p %p %08x %p %p %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData, Flags, CompareProc, CompareContext, DupDeviceInfoData); if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) @@ -1796,7 +1796,7 @@ BOOL WINAPI SetupDiEnumDeviceInfo( { BOOL ret = FALSE; - TRACE("%p %d %p\n", devinfo, index, info); + TRACE("%s(%p %d %p)\n", __FUNCTION__, devinfo, index, info); if(info==NULL) { @@ -1851,7 +1851,7 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdA( DWORD size; PWSTR instanceId; - TRACE("%p %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstanceId, + TRACE("%s(%p %p %p %d %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); if (!DeviceInstanceId && DeviceInstanceIdSize > 0) @@ -1919,7 +1919,7 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdW( struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; struct DeviceInfo *devInfo; - TRACE("%p %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstanceId, + TRACE("%s(%p %p %p %d %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) @@ -2014,7 +2014,7 @@ SetupDiGetActualSectionToInstallExA( PWSTR ExtensionW; BOOL bResult = FALSE; - TRACE("\n"); + TRACE("%s()\n", __FUNCTION__); if (InfSectionName) { @@ -2100,7 +2100,7 @@ BOOL WINAPI SetupDiGetClassDescriptionExA( LPWSTR MachineNameW = NULL; BOOL ret = FALSE; - TRACE("%s %p %lu %p %s %p\n", debugstr_guid(ClassGuid), ClassDescription, + TRACE("%s(%s %p %lu %p %s %p)\n", __FUNCTION__, debugstr_guid(ClassGuid), ClassDescription, ClassDescriptionSize, RequiredSize, debugstr_a(MachineName), Reserved); if (ClassDescriptionSize > 0) @@ -2159,7 +2159,7 @@ BOOL WINAPI SetupDiGetClassDescriptionExW( LONG rc; PWSTR Buffer; - TRACE("%s %p %lu %p %s %p\n", debugstr_guid(ClassGuid), ClassDescription, + TRACE("%s(%s %p %lu %p %s %p)\n", __FUNCTION__, debugstr_guid(ClassGuid), ClassDescription, ClassDescriptionSize, RequiredSize, debugstr_w(MachineName), Reserved); /* Make sure there's a GUID */ @@ -2322,7 +2322,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW( LONG rc; HDEVINFO set = INVALID_HANDLE_VALUE; - TRACE("%s %s %p 0x%08x %p %s %p\n", debugstr_guid(class), + TRACE("%s(%s %s %p 0x%08x %p %s %p)\n", __FUNCTION__, debugstr_guid(class), debugstr_w(enumstr), parent, flags, deviceset, debugstr_w(machine), reserved); @@ -2431,7 +2431,7 @@ BOOL WINAPI SetupDiGetDeviceInfoListDetailA( { struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; - TRACE("%p %p\n", DeviceInfoSet, DevInfoData); + TRACE("%s(%p %p)\n", __FUNCTION__, DeviceInfoSet, DevInfoData); if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) { @@ -2472,7 +2472,7 @@ BOOL WINAPI SetupDiGetDeviceInfoListDetailW( { struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; - TRACE("%p %p\n", DeviceInfoSet, DevInfoData); + TRACE("%s(%p %p)\n", __FUNCTION__, DeviceInfoSet, DevInfoData); if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) { @@ -2514,7 +2514,7 @@ BOOL WINAPI SetupDiCreateDeviceInterfaceA( BOOL ret; LPWSTR ReferenceStringW = NULL; - TRACE("%p %p %s %s %08x %p\n", DeviceInfoSet, DeviceInfoData, + TRACE("%s(%p %p %s %s %08x %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData, debugstr_guid(InterfaceClassGuid), debugstr_a(ReferenceString), CreationFlags, DeviceInterfaceData); @@ -2545,7 +2545,7 @@ BOOL WINAPI SetupDiCreateDeviceInterfaceW( PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) { struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; - TRACE("%p %p %s %s %08x %p\n", DeviceInfoSet, DeviceInfoData, + TRACE("%s(%p %p %s %s %08x %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData, debugstr_guid(InterfaceClassGuid), debugstr_w(ReferenceString), CreationFlags, DeviceInterfaceData); @@ -2592,7 +2592,7 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyA( HKEY key; PWSTR InfSectionNameW = NULL; - TRACE("%p %p %d %08x %p %p\n", DeviceInfoSet, DeviceInterfaceData, Reserved, + TRACE("%s(%p %p %d %08x %p %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInterfaceData, Reserved, samDesired, InfHandle, InfSectionName); if (InfHandle) { @@ -2631,7 +2631,7 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW( struct DeviceInterface *DevItf; struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; - TRACE("%p %p %d %08x %p %p\n", DeviceInfoSet, DeviceInterfaceData, Reserved, + TRACE("%s(%p %p %d %08x %p %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInterfaceData, Reserved, samDesired, InfHandle, InfSectionName); if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE || @@ -2738,7 +2738,7 @@ BOOL WINAPI SetupDiDeleteDeviceInterfaceRegKey( struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; BOOL ret = FALSE; - TRACE("%p %p %d\n", DeviceInfoSet, DeviceInterfaceData, Reserved); + TRACE("%s(%p %p %d)\n", __FUNCTION__, DeviceInfoSet, DeviceInterfaceData, Reserved); if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE || set->magic != SETUP_DEVICE_INFO_SET_MAGIC) @@ -2792,7 +2792,7 @@ BOOL WINAPI SetupDiEnumDeviceInterfaces( struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; BOOL ret = FALSE; - TRACE("%p, %p, %s, %d, %p\n", DeviceInfoSet, DeviceInfoData, + TRACE("%s(%p, %p, %s, %d, %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData, debugstr_guid(InterfaceClassGuid), MemberIndex, DeviceInterfaceData); if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE || @@ -2899,7 +2899,7 @@ BOOL WINAPI SetupDiDestroyDeviceInfoList(HDEVINFO devinfo) { BOOL ret = FALSE; - TRACE("%p\n", devinfo); + TRACE("%s(%p)\n", __FUNCTION__, devinfo); if (devinfo && devinfo != INVALID_HANDLE_VALUE) { struct DeviceInfoSet *list = (struct DeviceInfoSet *)devinfo; @@ -2932,7 +2932,7 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA( DWORD sizeW = 0, bytesNeeded; BOOL ret = FALSE; - TRACE("(%p, %p, %p, %d, %p, %p)\n", DeviceInfoSet, + TRACE("%s(%p, %p, %p, %d, %p, %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInterfaceData, DeviceInterfaceDetailData, DeviceInterfaceDetailDataSize, RequiredSize, DeviceInfoData); @@ -3024,7 +3024,7 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW( struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; BOOL ret = FALSE; - TRACE("(%p, %p, %p, %d, %p, %p)\n", DeviceInfoSet, + TRACE("%s(%p, %p, %p, %d, %p, %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInterfaceData, DeviceInterfaceDetailData, DeviceInterfaceDetailDataSize, RequiredSize, DeviceInfoData); @@ -3157,7 +3157,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyA( DWORD PropertyBufferSizeW = 0; PBYTE PropertyBufferW = NULL; - TRACE("%p %p %d %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, + TRACE("%s(%p %p %d %p %p %d %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize); @@ -3241,7 +3241,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW( LONG lError = ERROR_SUCCESS; DWORD size; - TRACE("%p %p %d %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, + TRACE("%s(%p %p %d %p %p %d %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize); @@ -3372,7 +3372,7 @@ BOOL WINAPI IntSetupDiSetDeviceRegistryPropertyAW( struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; struct DeviceInfo *deviceInfo; - TRACE("%p %p %d %p %d\n", DeviceInfoSet, DeviceInfoData, Property, + TRACE("%s(%p %p %d %p %d)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData, Property, PropertyBuffer, PropertyBufferSize); if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) @@ -3642,7 +3642,7 @@ HKEY WINAPI SetupDiOpenClassRegKeyExA( PWSTR MachineNameW = NULL; HKEY hKey; - TRACE("%s 0x%lx 0x%lx %s %p\n", debugstr_guid(ClassGuid), samDesired, + TRACE("%s(%s 0x%lx 0x%lx %s %p)\n", __FUNCTION__, debugstr_guid(ClassGuid), samDesired, Flags, debugstr_a(MachineName), Reserved); if (MachineName) @@ -3677,7 +3677,7 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW( LPCWSTR lpKeyName; LONG l; - TRACE("%s 0x%lx 0x%lx %s %p\n", debugstr_guid(ClassGuid), samDesired, + TRACE("%s(%s 0x%lx 0x%lx %s %p)\n", __FUNCTION__, debugstr_guid(ClassGuid), samDesired, Flags, debugstr_w(MachineName), Reserved); if (MachineName != NULL) @@ -3783,7 +3783,7 @@ BOOL WINAPI SetupDiOpenDeviceInterfaceW( PLIST_ENTRY ItemList; PLIST_ENTRY InterfaceListEntry; - TRACE("%p %s %08x %p\n", + TRACE("%s(%p %s %08x %p)\n", __FUNCTION__, DeviceInfoSet, debugstr_w(DevicePath), OpenFlags, DeviceInterfaceData); @@ -3987,7 +3987,7 @@ BOOL WINAPI SetupDiOpenDeviceInterfaceA( LPWSTR DevicePathW = NULL; BOOL bResult; - TRACE("%p %s %08lx %p\n", DeviceInfoSet, debugstr_a(DevicePath), OpenFlags, DeviceInterfaceData); + TRACE("%s(%p %s %08lx %p)\n", __FUNCTION__, DeviceInfoSet, debugstr_a(DevicePath), OpenFlags, DeviceInterfaceData); DevicePathW = pSetupMultiByteToUnicode(DevicePath, CP_ACP); if (DevicePathW == NULL) @@ -4033,7 +4033,7 @@ BOOL WINAPI SetupDiCallClassInstaller( { BOOL ret = FALSE; - TRACE("%u %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData); + TRACE("%s(%u %p %p)\n", __FUNCTION__, InstallFunction, DeviceInfoSet, DeviceInfoData); if (!DeviceInfoSet) SetLastError(ERROR_INVALID_PARAMETER); @@ -4388,7 +4388,7 @@ BOOL WINAPI SetupDiGetDeviceInstallParamsA( SP_DEVINSTALL_PARAMS_W deviceInstallParamsW; BOOL ret = FALSE; - TRACE("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + TRACE("%s(%p %p %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData, DeviceInstallParams); if (DeviceInstallParams == NULL) SetLastError(ERROR_INVALID_PARAMETER); @@ -4430,7 +4430,7 @@ SetupDiGetDeviceInfoListClass( struct DeviceInfoSet *list; BOOL ret = FALSE; - TRACE("%p %p\n", DeviceInfoSet, ClassGuid); + TRACE("%s(%p %p)\n", __FUNCTION__, DeviceInfoSet, ClassGuid); if (!DeviceInfoSet) SetLastError(ERROR_INVALID_HANDLE); @@ -4461,7 +4461,7 @@ SetupDiGetDeviceInstallParamsW( struct DeviceInfoSet *list; BOOL ret = FALSE; - TRACE("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + TRACE("%s(%p %p %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData, DeviceInstallParams); if (!DeviceInfoSet) SetLastError(ERROR_INVALID_HANDLE); @@ -4568,7 +4568,7 @@ SetupDiSetDeviceInstallParamsW( struct DeviceInfoSet *list; BOOL ret = FALSE; - TRACE("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + TRACE("%s(%p %p %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData, DeviceInstallParams); if (!DeviceInfoSet) SetLastError(ERROR_INVALID_HANDLE); @@ -4609,7 +4609,7 @@ SetupDiSetDeviceInstallParamsA( int len = 0; BOOL ret = FALSE; - TRACE("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + TRACE("%s(%p %p %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData, DeviceInstallParams); if (DeviceInstallParams == NULL) SetLastError(ERROR_INVALID_PARAMETER); @@ -4722,7 +4722,7 @@ SetupDiDeleteDeviceInfo( struct DeviceInfo *deviceInfo = (struct DeviceInfo *)DeviceInfoData; BOOL ret = FALSE; - TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); + TRACE("%s(%p %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData); if (!DeviceInfoSet) SetLastError(ERROR_INVALID_HANDLE); @@ -4757,7 +4757,7 @@ SetupDiOpenDeviceInfoA( LPWSTR DeviceInstanceIdW = NULL; BOOL bResult; - TRACE("%p %s %p %lx %p\n", DeviceInfoSet, DeviceInstanceId, hwndParent, OpenFlags, DeviceInfoData); + TRACE("%s(%p %s %p %lx %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInstanceId, hwndParent, OpenFlags, DeviceInfoData); DeviceInstanceIdW = pSetupMultiByteToUnicode(DeviceInstanceId, CP_ACP); if (DeviceInstanceIdW == NULL) @@ -4788,7 +4788,7 @@ SetupDiOpenDeviceInfoW( DWORD rc, dwSize; BOOL ret = FALSE; - TRACE("%p %s %p %lx %p\n", + TRACE("%s(%p %s %p %lx %p)\n", __FUNCTION__, DeviceInfoSet, debugstr_w(DeviceInstanceId), hwndParent, OpenFlags, DeviceInfoData); @@ -4912,7 +4912,7 @@ SetupDiGetSelectedDevice( struct DeviceInfoSet *list; BOOL ret = FALSE; - TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); + TRACE("%s(%p %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData); if (!DeviceInfoSet) SetLastError(ERROR_INVALID_HANDLE); @@ -4950,7 +4950,7 @@ SetupDiSetSelectedDevice( struct DeviceInfoSet *list; BOOL ret = FALSE; - TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); + TRACE("%s(%p %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData); if (!DeviceInfoSet) SetLastError(ERROR_INVALID_HANDLE); @@ -5086,7 +5086,7 @@ SetupDiChangeState( LONG rc; BOOL ret = FALSE; - TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); + TRACE("%s(%p %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData); if (!DeviceInfoData) PropChange = ((struct DeviceInfoSet *)DeviceInfoSet)->ClassInstallParams.PropChangeParams; @@ -5221,7 +5221,7 @@ SetupDiRegisterCoDeviceInstallers( struct DeviceInfo *deviceInfo; BOOL ret = FALSE; /* Return value */ - TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); + TRACE("%s(%p %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData); if (!DeviceInfoSet) SetLastError(ERROR_INVALID_PARAMETER); @@ -5394,7 +5394,7 @@ SetupDiInstallDevice( PVOID Context = NULL; BOOL ret = FALSE; /* Return value */ - TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); + TRACE("%s(%p %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData); if (!DeviceInfoSet) SetLastError(ERROR_INVALID_PARAMETER); @@ -5945,7 +5945,7 @@ HKEY WINAPI SetupDiOpenDevRegKey( HKEY key = INVALID_HANDLE_VALUE; HKEY RootKey; - TRACE("%p %p %d %d %d %x\n", DeviceInfoSet, DeviceInfoData, + TRACE("%s(%p %p %d %d %d %x)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData, Scope, HwProfile, KeyType, samDesired); if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) @@ -6043,7 +6043,7 @@ BOOL WINAPI SetupDiDeleteDevRegKey( BOOL ret = FALSE; HKEY RootKey; - TRACE("%p %p %d %d %d\n", DeviceInfoSet, DeviceInfoData, Scope, HwProfile, + TRACE("%s(%p %p %d %d %d)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData, Scope, HwProfile, KeyType); if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) @@ -6120,7 +6120,7 @@ SetupDiRestartDevices( struct DeviceInfo *devInfo; CONFIGRET cr; - TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); + TRACE("%s(%p %p)\n", __FUNCTION__, DeviceInfoSet, DeviceInfoData); if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) {

4 years, 2 months

[reactos] 01/01: [NtUser] Fix MSVC_x64 Build

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6d2b34ad00cf5b3c359c… commit f6d2b34ad00cf5b3c359cd9029432fec9e2c3131 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Thu Jun 18 11:55:13 2020 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Thu Jun 18 11:55:13 2020 -0500 [NtUser] Fix MSVC_x64 Build Attempt to fix. --- win32ss/user/ntuser/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/misc.c b/win32ss/user/ntuser/misc.c index 196ea416e79..c0e332b369e 100644 --- a/win32ss/user/ntuser/misc.c +++ b/win32ss/user/ntuser/misc.c @@ -402,7 +402,7 @@ NtUserGetGUIThreadInfo( pti = PsGetCurrentThreadWin32Thread(); // Validate Tread ID - W32Thread = IntTID2PTI((HANDLE)idThread); + W32Thread = IntTID2PTI((HANDLE)(DWORD_PTR)idThread); if ( !W32Thread ) {

4 years, 3 months

[reactos] 01/01: [NtUser] Fix Crash in Win32k

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06e01c8968fe7ca25d044… commit 06e01c8968fe7ca25d0449b0021d7ed055f6082c Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Thu Jun 18 11:06:31 2020 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Thu Jun 18 11:06:31 2020 -0500 [NtUser] Fix Crash in Win32k Use strict thread and desktop verifying. See CORE-15092 and CORE-17133. --- win32ss/user/ntuser/misc.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/win32ss/user/ntuser/misc.c b/win32ss/user/ntuser/misc.c index 72706fa7f84..196ea416e79 100644 --- a/win32ss/user/ntuser/misc.c +++ b/win32ss/user/ntuser/misc.c @@ -377,8 +377,7 @@ NtUserGetGUIThreadInfo( GUITHREADINFO SafeGui; PDESKTOP Desktop; PUSER_MESSAGE_QUEUE MsgQueue; - PTHREADINFO W32Thread; - PETHREAD Thread = NULL; + PTHREADINFO W32Thread, pti; DECLARE_RETURN(BOOLEAN); @@ -400,23 +399,26 @@ NtUserGetGUIThreadInfo( if (idThread) { - Status = PsLookupThreadByThreadId((HANDLE)(DWORD_PTR)idThread, &Thread); - if(!NT_SUCCESS(Status)) + pti = PsGetCurrentThreadWin32Thread(); + + // Validate Tread ID + W32Thread = IntTID2PTI((HANDLE)idThread); + + if ( !W32Thread ) { - EngSetLastError(ERROR_ACCESS_DENIED); - RETURN( FALSE); + EngSetLastError(ERROR_ACCESS_DENIED); + RETURN( FALSE); } - W32Thread = (PTHREADINFO)Thread->Tcb.Win32Thread; + Desktop = W32Thread->rpdesk; - if (!Thread || !Desktop ) + // Check Desktop and it must be the same as current. + if ( !Desktop || Desktop != pti->rpdesk ) { - if(Thread) - ObDereferenceObject(Thread); - EngSetLastError(ERROR_ACCESS_DENIED); - RETURN( FALSE); + EngSetLastError(ERROR_ACCESS_DENIED); + RETURN( FALSE); } - + if ( W32Thread->MessageQueue ) MsgQueue = W32Thread->MessageQueue; else @@ -480,9 +482,6 @@ NtUserGetGUIThreadInfo( SafeGui.rcCaret.right = SafeGui.rcCaret.left + CaretInfo->Size.cx; SafeGui.rcCaret.bottom = SafeGui.rcCaret.top + CaretInfo->Size.cy; - if (idThread) - ObDereferenceObject(Thread); - Status = MmCopyToCaller(lpgui, &SafeGui, sizeof(GUITHREADINFO)); if(!NT_SUCCESS(Status)) {

4 years, 3 months

[reactos] 01/01: [GDI32] MirrorRgnByWidth(): Fix 'phrgn' parameter handling

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f076e5558f585eb8428a… commit 5f076e5558f585eb8428aa2b323eb2ed4d10bf00 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Tue Jun 9 02:52:17 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Jun 18 10:33:35 2020 +0200 [GDI32] MirrorRgnByWidth(): Fix 'phrgn' parameter handling Detected by Cppcheck: uselessAssignmentPtrArg. Addendum to 794e7aa (r31523) and e647530 (r65893). --- win32ss/gdi/gdi32/objects/region.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/win32ss/gdi/gdi32/objects/region.c b/win32ss/gdi/gdi32/objects/region.c index 5ba168d9fdb..d7d2c330f73 100644 --- a/win32ss/gdi/gdi32/objects/region.c +++ b/win32ss/gdi/gdi32/objects/region.c @@ -85,7 +85,7 @@ FASTCALL MirrorRgnByWidth( _In_ HRGN hrgn, _In_ INT Width, - _In_ HRGN *phrgn) + _Out_opt_ HRGN *phrgn) { INT cRgnDSize, Ret = 0; PRGNDATA pRgnData; @@ -118,7 +118,10 @@ MirrorRgnByWidth( hRgnex = ExtCreateRegion(NULL, cRgnDSize , pRgnData); if (hRgnex) { - if (phrgn) phrgn = (HRGN *)hRgnex; + if (phrgn) + { + *phrgn = hRgnex; + } else { CombineRgn(hrgn, hRgnex, 0, RGN_COPY); @@ -138,7 +141,7 @@ WINAPI MirrorRgnDC( _In_ HDC hdc, _In_ HRGN hrgn, - _In_ HRGN *phrn) + _Out_opt_ HRGN *phrn) { if (!GdiValidateHandle((HGDIOBJ) hdc) || (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC))

4 years, 3 months

[reactos] 01/01: [VIDEOPRT] IntVideoPortCreateAdapterDeviceObject(): 1+1 trivial fixes

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb023adf5a7b8761776e5… commit fb023adf5a7b8761776e5a1e0813da6454ed9ca4 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon Jun 8 22:45:45 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Jun 18 10:31:27 2020 +0200 [VIDEOPRT] IntVideoPortCreateAdapterDeviceObject(): 1+1 trivial fixes Detected by Cppcheck: funcArgOrderDifferent, redundantAssignment. --- win32ss/drivers/videoprt/videoprt.c | 9 ++++----- win32ss/drivers/videoprt/videoprt.h | 8 ++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/win32ss/drivers/videoprt/videoprt.c b/win32ss/drivers/videoprt/videoprt.c index d040652b4ec..a59d0442017 100644 --- a/win32ss/drivers/videoprt/videoprt.c +++ b/win32ss/drivers/videoprt/videoprt.c @@ -90,10 +90,10 @@ IntVideoPortDeferredRoutine( NTSTATUS NTAPI IntVideoPortCreateAdapterDeviceObject( - IN PDRIVER_OBJECT DriverObject, - IN PVIDEO_PORT_DRIVER_EXTENSION DriverExtension, - IN PDEVICE_OBJECT PhysicalDeviceObject, - OUT PDEVICE_OBJECT *DeviceObject OPTIONAL) + _In_ PDRIVER_OBJECT DriverObject, + _In_ PVIDEO_PORT_DRIVER_EXTENSION DriverExtension, + _In_opt_ PDEVICE_OBJECT PhysicalDeviceObject, + _Out_opt_ PDEVICE_OBJECT *DeviceObject) { PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; ULONG DeviceNumber; @@ -1046,7 +1046,6 @@ VideoPortScanRom( StringLength = strlen((PCHAR)String); Found = FALSE; - SearchLocation = RomBase; for (SearchLocation = RomBase; !Found && SearchLocation < RomBase + RomLength - StringLength; SearchLocation++) diff --git a/win32ss/drivers/videoprt/videoprt.h b/win32ss/drivers/videoprt/videoprt.h index 8035278e349..7c559def846 100644 --- a/win32ss/drivers/videoprt/videoprt.h +++ b/win32ss/drivers/videoprt/videoprt.h @@ -257,10 +257,10 @@ IntDetachFromCSRSS(PKPROCESS *CallingProcess, PKAPC_STATE ApcState); NTSTATUS NTAPI IntVideoPortCreateAdapterDeviceObject( - IN PDRIVER_OBJECT DriverObject, - IN PVIDEO_PORT_DRIVER_EXTENSION DriverExtension, - IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL, - OUT PDEVICE_OBJECT *DeviceObject OPTIONAL); + _In_ PDRIVER_OBJECT DriverObject, + _In_ PVIDEO_PORT_DRIVER_EXTENSION DriverExtension, + _In_opt_ PDEVICE_OBJECT PhysicalDeviceObject, + _Out_opt_ PDEVICE_OBJECT *DeviceObject); NTSTATUS NTAPI IntVideoPortFindAdapter(

4 years, 3 months

[reactos] 01/01: [KMTESTS:OB] ObTypes: Support latest NT5.2 results

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cac13bcd7f1de45889d10… commit cac13bcd7f1de45889d102918b812b03f8b8f5a5 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon Dec 16 04:28:29 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Jun 18 10:09:37 2020 +0200 [KMTESTS:OB] ObTypes: Support latest NT5.2 results Update Port and WaitablePort values. --- modules/rostests/kmtests/ntos_ob/ObTypes.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/rostests/kmtests/ntos_ob/ObTypes.c b/modules/rostests/kmtests/ntos_ob/ObTypes.c index 70d6e8e7e20..2e46b0e90b8 100644 --- a/modules/rostests/kmtests/ntos_ob/ObTypes.c +++ b/modules/rostests/kmtests/ntos_ob/ObTypes.c @@ -215,8 +215,10 @@ TestObjectTypes(VOID) CheckObjectType(Section, MmSectionObjectType, OBT_PAGED_POOL, 0x100, 0x020005, 0x020002, 0x020008, 0x0f001f, 0x1f001f); CheckObjectType(Key, CmpKeyObjectType, OBT_CUSTOM_SECURITY_PROC | OBT_SECURITY_REQUIRED | OBT_PAGED_POOL, 0x030, 0x020019, 0x020006, 0x020019, 0x0f003f, 0x1f003f); - CheckObjectType(Port, LpcPortObjectType, OBT_PAGED_POOL, 0x7b2, 0x020001, 0x010001, 0x000000, 0x1f0001, 0x1f0001); - CheckObjectType(WaitablePort, LpcWaitablePortObjectType, OBT_NO_DEFAULT, 0x7b2, 0x020001, 0x010001, 0x000000, 0x1f0001, 0x1f0001); + // 0x7b2 is used for Server 2003 SP2 RTM, it seems it was changed to 0xfb2 in some patch level. + CheckObjectType(Port, LpcPortObjectType, OBT_PAGED_POOL, 0xfb2, 0x020001, 0x010001, 0x000000, 0x1f0001, 0x1f0001); + // 0x7b2 is used for Server 2003 SP2 RTM, it seems it was changed to 0xfb2 in some patch level. + CheckObjectType(WaitablePort, LpcWaitablePortObjectType, OBT_NO_DEFAULT, 0xfb2, 0x020001, 0x010001, 0x000000, 0x1f0001, 0x1f0001); CheckObjectType(Adapter, IoAdapterObjectType, 0, 0x100, 0x120089, 0x120116, 0x1200a0, 0x1f01ff, 0x1f01ff); CheckObjectType(Controller, IoControllerObjectType, 0, 0x100, 0x120089, 0x120116, 0x1200a0, 0x1f01ff, 0x1f01ff); CheckObjectType(Device, IoDeviceObjectType, OBT_CUSTOM_SECURITY_PROC | OBT_CASE_INSENSITIVE,

4 years, 3 months

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2020