Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[tfaber] 64952: [NTOS:IO] - Serialize device enumeration requests CORE-8697 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Oct 24 10:03:42 2014 New Revision: 64952 URL: http://svn.reactos.org/svn/reactos?rev=64952&view=rev Log: [NTOS:IO] - Serialize device enumeration requests CORE-8697 #resolve Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Fri Oct 24 10:03:42 2014 @@ -1277,6 +1277,8 @@ extern PVOID IopTriageDumpDataBlocks[64]; extern PIO_BUS_TYPE_GUID_LIST PnpBusTypeGuidList; extern PDRIVER_OBJECT IopRootDriverObject; +extern KSPIN_LOCK IopDeviceRelationsSpinLock; +extern LIST_ENTRY IopDeviceRelationsRequestList; // // Inlined Functions Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] Fri Oct 24 10:03:42 2014 @@ -385,6 +385,8 @@ /* Initialize locks and such */ KeInitializeSpinLock(&IopDeviceTreeLock); + KeInitializeSpinLock(&IopDeviceRelationsSpinLock); + InitializeListHead(&IopDeviceRelationsRequestList); /* Get the default interface */ PnpDefaultInterfaceType = IopDetermineDefaultInterfaceType(); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Fri Oct 24 10:03:42 2014 @@ -30,12 +30,16 @@ PDRIVER_OBJECT IopRootDriverObject; PIO_BUS_TYPE_GUID_LIST PnpBusTypeGuidList = NULL; +LIST_ENTRY IopDeviceRelationsRequestList; +WORK_QUEUE_ITEM IopDeviceRelationsWorkItem; +BOOLEAN IopDeviceRelationsRequestInProgress; +KSPIN_LOCK IopDeviceRelationsSpinLock; typedef struct _INVALIDATE_DEVICE_RELATION_DATA { + LIST_ENTRY RequestListEntry; PDEVICE_OBJECT DeviceObject; DEVICE_RELATION_TYPE Type; - PIO_WORKITEM WorkItem; } INVALIDATE_DEVICE_RELATION_DATA, *PINVALIDATE_DEVICE_RELATION_DATA; /* FUNCTIONS *****************************************************************/ @@ -890,20 +894,34 @@ return Status; } -static VOID NTAPI -IopAsynchronousInvalidateDeviceRelations( - IN PDEVICE_OBJECT DeviceObject, - IN PVOID InvalidateContext) -{ - PINVALIDATE_DEVICE_RELATION_DATA Data = InvalidateContext; - - IoSynchronousInvalidateDeviceRelations( - Data->DeviceObject, - Data->Type); - - ObDereferenceObject(Data->DeviceObject); - IoFreeWorkItem(Data->WorkItem); - ExFreePool(Data); +static +VOID +NTAPI +IopDeviceRelationsWorker( + _In_ PVOID Context) +{ + PLIST_ENTRY ListEntry; + PINVALIDATE_DEVICE_RELATION_DATA Data; + KIRQL OldIrql; + + KeAcquireSpinLock(&IopDeviceRelationsSpinLock, &OldIrql); + while (!IsListEmpty(&IopDeviceRelationsRequestList)) + { + ListEntry = RemoveHeadList(&IopDeviceRelationsRequestList); + KeReleaseSpinLock(&IopDeviceRelationsSpinLock, OldIrql); + Data = CONTAINING_RECORD(ListEntry, + INVALIDATE_DEVICE_RELATION_DATA, + RequestListEntry); + + IoSynchronousInvalidateDeviceRelations(Data->DeviceObject, + Data->Type); + + ObDereferenceObject(Data->DeviceObject); + ExFreePool(Data); + KeAcquireSpinLock(&IopDeviceRelationsSpinLock, &OldIrql); + } + IopDeviceRelationsRequestInProgress = FALSE; + KeReleaseSpinLock(&IopDeviceRelationsSpinLock, OldIrql); } NTSTATUS @@ -4670,29 +4688,32 @@ IN PDEVICE_OBJECT DeviceObject, IN DEVICE_RELATION_TYPE Type) { - PIO_WORKITEM WorkItem; PINVALIDATE_DEVICE_RELATION_DATA Data; + KIRQL OldIrql; Data = ExAllocatePool(NonPagedPool, sizeof(INVALIDATE_DEVICE_RELATION_DATA)); if (!Data) return; - WorkItem = IoAllocateWorkItem(DeviceObject); - if (!WorkItem) - { - ExFreePool(Data); - return; - } ObReferenceObject(DeviceObject); Data->DeviceObject = DeviceObject; Data->Type = Type; - Data->WorkItem = WorkItem; - - IoQueueWorkItem( - WorkItem, - IopAsynchronousInvalidateDeviceRelations, - DelayedWorkQueue, - Data); + + KeAcquireSpinLock(&IopDeviceRelationsSpinLock, &OldIrql); + InsertTailList(&IopDeviceRelationsRequestList, &Data->RequestListEntry); + if (IopDeviceRelationsRequestInProgress) + { + KeReleaseSpinLock(&IopDeviceRelationsSpinLock, OldIrql); + return; + } + IopDeviceRelationsRequestInProgress = TRUE; + KeReleaseSpinLock(&IopDeviceRelationsSpinLock, OldIrql); + + ExInitializeWorkItem(&IopDeviceRelationsWorkItem, + IopDeviceRelationsWorker, + NULL); + ExQueueWorkItem(&IopDeviceRelationsWorkItem, + DelayedWorkQueue); } /*

10 years, 7 months

[tfaber] 64951: [NTOS:IO] - Introduce IopDriverLoadResource to protect against concurrent driver loading CORE-8696 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Oct 24 10:02:14 2014 New Revision: 64951 URL: http://svn.reactos.org/svn/reactos?rev=64951&view=rev Log: [NTOS:IO] - Introduce IopDriverLoadResource to protect against concurrent driver loading CORE-8696 #resolve Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Fri Oct 24 10:02:14 2014 @@ -16,6 +16,8 @@ /* GLOBALS ********************************************************************/ +ERESOURCE IopDriverLoadResource; + LIST_ENTRY DriverReinitListHead; KSPIN_LOCK DriverReinitListLock; PLIST_ENTRY DriverReinitTailEntry; @@ -113,6 +115,7 @@ DPRINT("IopGetDriverObject(%p '%wZ' %x)\n", DriverObject, ServiceName, FileSystem); + ASSERT(ExIsResourceAcquiredExclusiveLite(&IopDriverLoadResource)); *DriverObject = NULL; /* Create ModuleName string */ @@ -313,6 +316,7 @@ HANDLE CCSKey, ServiceKey; PVOID BaseAddress; + ASSERT(ExIsResourceAcquiredExclusiveLite(&IopDriverLoadResource)); ASSERT(ServiceName->Length); DPRINT("IopLoadServiceModule(%wZ, 0x%p)\n", ServiceName, ModuleObject); @@ -567,6 +571,8 @@ ServiceName.MaximumLength = ServiceName.Length = (USHORT)wcslen(Filters) * sizeof(WCHAR); + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&IopDriverLoadResource, TRUE); Status = IopGetDriverObject(&DriverObject, &ServiceName, FALSE); @@ -575,7 +581,11 @@ /* Load and initialize the filter driver */ Status = IopLoadServiceModule(&ServiceName, &ModuleObject); if (!NT_SUCCESS(Status)) + { + ExReleaseResourceLite(&IopDriverLoadResource); + KeLeaveCriticalRegion(); return Status; + } Status = IopInitializeDriverModule(DeviceNode, ModuleObject, @@ -583,8 +593,15 @@ FALSE, &DriverObject); if (!NT_SUCCESS(Status)) + { + ExReleaseResourceLite(&IopDriverLoadResource); + KeLeaveCriticalRegion(); return Status; - } + } + } + + ExReleaseResourceLite(&IopDriverLoadResource); + KeLeaveCriticalRegion(); Status = IopInitializeDevice(DeviceNode, DriverObject); @@ -1971,6 +1988,8 @@ DPRINT("FullImagePath: '%wZ'\n", &ImagePath); DPRINT("Type: %lx\n", Type); + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&IopDriverLoadResource, TRUE); /* * Get existing DriverObject pointer (in case the driver * has already been loaded and initialized). @@ -1990,6 +2009,8 @@ if (!NT_SUCCESS(Status)) { DPRINT("MmLoadSystemImage() failed (Status %lx)\n", Status); + ExReleaseResourceLite(&IopDriverLoadResource); + KeLeaveCriticalRegion(); return Status; } @@ -2000,6 +2021,8 @@ if (!NT_SUCCESS(Status)) { DPRINT1("IopCreateDeviceNode() failed (Status %lx)\n", Status); + ExReleaseResourceLite(&IopDriverLoadResource); + KeLeaveCriticalRegion(); MmUnloadSystemImage(ModuleObject); return Status; } @@ -2015,9 +2038,14 @@ if (!NT_SUCCESS(Status)) { DPRINT1("IopInitializeDriverModule() failed (Status %lx)\n", Status); + ExReleaseResourceLite(&IopDriverLoadResource); + KeLeaveCriticalRegion(); MmUnloadSystemImage(ModuleObject); return Status; } + + ExReleaseResourceLite(&IopDriverLoadResource); + KeLeaveCriticalRegion(); /* Initialize and start device */ IopInitializeDevice(DeviceNode, *DriverObject); @@ -2025,6 +2053,9 @@ } else { + ExReleaseResourceLite(&IopDriverLoadResource); + KeLeaveCriticalRegion(); + DPRINT("DriverObject already exist in ObjectManager\n"); Status = STATUS_IMAGE_ALREADY_LOADED; Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Fri Oct 24 10:02:14 2014 @@ -54,6 +54,7 @@ extern POBJECT_TYPE IoAdapterObjectType; extern ERESOURCE IopDatabaseResource; ERESOURCE IopSecurityResource; +extern ERESOURCE IopDriverLoadResource; extern KGUARDED_MUTEX PnpNotifyListLock; extern LIST_ENTRY IopDiskFileSystemQueueHead; extern LIST_ENTRY IopCdRomFileSystemQueueHead; @@ -476,8 +477,9 @@ IopInitLookasideLists(); /* Initialize all locks and lists */ - ExInitializeResource(&IopDatabaseResource); - ExInitializeResource(&IopSecurityResource); + ExInitializeResourceLite(&IopDatabaseResource); + ExInitializeResourceLite(&IopSecurityResource); + ExInitializeResourceLite(&IopDriverLoadResource); KeInitializeGuardedMutex(&PnpNotifyListLock); InitializeListHead(&IopDiskFileSystemQueueHead); InitializeListHead(&IopCdRomFileSystemQueueHead); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Fri Oct 24 10:02:14 2014 @@ -21,6 +21,7 @@ KGUARDED_MUTEX PpDeviceReferenceTableLock; RTL_AVL_TABLE PpDeviceReferenceTable; +extern ERESOURCE IopDriverLoadResource; extern ULONG ExpInitializationPhase; extern BOOLEAN ExpInTextModeSetup; extern BOOLEAN PnpSystemInit; @@ -2611,6 +2612,8 @@ PLDR_DATA_TABLE_ENTRY ModuleObject; PDRIVER_OBJECT DriverObject; + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&IopDriverLoadResource, TRUE); /* Get existing DriverObject pointer (in case the driver has already been loaded and initialized) */ Status = IopGetDriverObject( @@ -2642,6 +2645,8 @@ if (!BootDrivers) DeviceNode->Problem = CM_PROB_DRIVER_FAILED_LOAD; } } + ExReleaseResourceLite(&IopDriverLoadResource); + KeLeaveCriticalRegion(); /* Driver is loaded and initialized at this point */ if (NT_SUCCESS(Status))

10 years, 7 months

[tfaber] 64950: [NTOS:IO] - Don't delete the device node for root enumerated device objects on failure. It's pointless, since IopEnumerateDevice will just recreate it, and more importantly it cause...

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Oct 24 09:39:15 2014 New Revision: 64950 URL: http://svn.reactos.org/svn/reactos?rev=64950&view=rev Log: [NTOS:IO] - Don't delete the device node for root enumerated device objects on failure. It's pointless, since IopEnumerateDevice will just recreate it, and more importantly it causes a use-after-free because IopFreeDeviceNode does not unset the DeviceNode member of the device object extension, so IopEnumerateDevice will try to access the freed node - Set the device object's DeviceNode pointer to NULL in IopFreeDeviceNode - Use consistent pool tagging for device nodes CORE-8671 #resolve Modified: trunk/reactos/ntoskrnl/include/internal/tag.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/include/internal/tag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] Fri Oct 24 09:39:15 2014 @@ -80,6 +80,9 @@ /* formerly located in io/mdl.c */ #define TAG_MDL ' LDM' + +/* formerly located in io/pnpmgr.c */ +#define TAG_IO_DEVNODE 'donD' /* formerly located in io/pnpnotify.c */ #define TAG_PNP_NOTIFY 'NPnP' Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Fri Oct 24 09:39:15 2014 @@ -930,7 +930,6 @@ if (!NT_SUCCESS(Status)) { - IopFreeDeviceNode(DeviceNode); return Status; } @@ -994,7 +993,6 @@ if (!NT_SUCCESS(Status)) { /* Fail */ - IopFreeDeviceNode(DeviceNode); return; } @@ -1003,7 +1001,6 @@ if (!NT_SUCCESS(Status)) { /* Fail */ - IopFreeDeviceNode(DeviceNode); ObDereferenceObject(DriverObject); return; } @@ -1013,7 +1010,6 @@ if (!NT_SUCCESS(Status)) { /* Fail */ - IopFreeDeviceNode(DeviceNode); ObDereferenceObject(DriverObject); return; } @@ -2020,7 +2016,6 @@ { DPRINT1("IopInitializeDriverModule() failed (Status %lx)\n", Status); MmUnloadSystemImage(ModuleObject); - IopFreeDeviceNode(DeviceNode); return Status; } Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Fri Oct 24 09:39:15 2014 @@ -1024,7 +1024,7 @@ DPRINT("ParentNode 0x%p PhysicalDeviceObject 0x%p ServiceName %wZ\n", ParentNode, PhysicalDeviceObject, ServiceName); - Node = (PDEVICE_NODE)ExAllocatePool(NonPagedPool, sizeof(DEVICE_NODE)); + Node = ExAllocatePoolWithTag(NonPagedPool, sizeof(DEVICE_NODE), TAG_IO_DEVNODE); if (!Node) { return STATUS_INSUFFICIENT_RESOURCES; @@ -1044,7 +1044,7 @@ FullServiceName.Buffer = ExAllocatePool(PagedPool, FullServiceName.MaximumLength); if (!FullServiceName.Buffer) { - ExFreePool(Node); + ExFreePoolWithTag(Node, TAG_IO_DEVNODE); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1055,7 +1055,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("PnpRootCreateDevice() failed with status 0x%08X\n", Status); - ExFreePool(Node); + ExFreePoolWithTag(Node, TAG_IO_DEVNODE); return Status; } @@ -1064,7 +1064,7 @@ if (!NT_SUCCESS(Status)) { ZwClose(InstanceHandle); - ExFreePool(Node); + ExFreePoolWithTag(Node, TAG_IO_DEVNODE); ExFreePool(FullServiceName.Buffer); return Status; } @@ -1073,7 +1073,7 @@ if (!Node->ServiceName.Buffer) { ZwClose(InstanceHandle); - ExFreePool(Node); + ExFreePoolWithTag(Node, TAG_IO_DEVNODE); ExFreePool(FullServiceName.Buffer); return Status; } @@ -1122,7 +1122,7 @@ if (!NT_SUCCESS(Status)) { - ExFreePool(Node); + ExFreePoolWithTag(Node, TAG_IO_DEVNODE); return Status; } @@ -1225,7 +1225,8 @@ ExFreePool(DeviceNode->BootResources); } - ExFreePool(DeviceNode); + ((PEXTENDED_DEVOBJ_EXTENSION)DeviceNode->PhysicalDeviceObject->DeviceObjectExtension)->DeviceNode = NULL; + ExFreePoolWithTag(DeviceNode, TAG_IO_DEVNODE); return STATUS_SUCCESS; } @@ -2560,7 +2561,7 @@ DPRINT("IopActionInitChildServices(%p, %p)\n", DeviceNode, Context); - ParentDeviceNode = (PDEVICE_NODE)Context; + ParentDeviceNode = Context; /* * We are called for the parent too, but we don't need to do special @@ -3545,7 +3546,7 @@ PAGED_CODE(); /* Allocate it */ - DeviceNode = ExAllocatePoolWithTag(NonPagedPool, sizeof(DEVICE_NODE), 'donD'); + DeviceNode = ExAllocatePoolWithTag(NonPagedPool, sizeof(DEVICE_NODE), TAG_IO_DEVNODE); if (!DeviceNode) return DeviceNode; /* Statistics */

10 years, 7 months

[tfaber] 64949: [USER32] - Zero-initialize result in SendMessageTimeout CORE-8699 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Oct 24 09:26:03 2014 New Revision: 64949 URL: http://svn.reactos.org/svn/reactos?rev=64949&view=rev Log: [USER32] - Zero-initialize result in SendMessageTimeout CORE-8699 #resolve Modified: trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Fri Oct 24 09:26:03 2014 @@ -2648,6 +2648,7 @@ dsm.uFlags = fuFlags; dsm.uTimeout = uTimeout; + dsm.Result = 0; AnsiMsg.hwnd = hWnd; AnsiMsg.message = Msg; @@ -2709,6 +2710,7 @@ dsm.uFlags = fuFlags; dsm.uTimeout = uTimeout; + dsm.Result = 0; Result = NtUserMessageCall( hWnd, Msg,

10 years, 7 months

[tfaber] 64948: [USER32_APITEST] - Add a test for SendMessageTimeout failure case - Remove a pointless (and broken) memset (Coverity) CORE-8699

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Oct 24 09:16:04 2014 New Revision: 64948 URL: http://svn.reactos.org/svn/reactos?rev=64948&view=rev Log: [USER32_APITEST] - Add a test for SendMessageTimeout failure case - Remove a pointless (and broken) memset (Coverity) CORE-8699 Added: trunk/rostests/apitests/user32/SendMessageTimeout.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/SetCursorPos.c trunk/rostests/apitests/user32/testlist.c Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Fri Oct 24 09:16:04 2014 @@ -19,6 +19,7 @@ RealGetWindowClass.c ScrollDC.c ScrollWindowEx.c + SendMessageTimeout.c SetActiveWindow.c SetCursorPos.c SystemParametersInfo.c Added: trunk/rostests/apitests/user32/SendMessageTimeout.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SendMessa… ============================================================================== --- trunk/rostests/apitests/user32/SendMessageTimeout.c (added) +++ trunk/rostests/apitests/user32/SendMessageTimeout.c [iso-8859-1] Fri Oct 24 09:16:04 2014 @@ -0,0 +1,40 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for SendMessageTimeout + * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> +#include <winuser.h> + +static +void +TestSendMessageTimeout(HWND hWnd, UINT Msg) +{ + LRESULT ret; + DWORD_PTR result; + + ret = SendMessageTimeoutW(hWnd, Msg, 0, 0, SMTO_NORMAL, 0, NULL); + ok(ret == 0, "ret = %Id\n", ret); + + result = 0x55555555; + ret = SendMessageTimeoutW(hWnd, Msg, 0, 0, SMTO_NORMAL, 0, &result); + ok(ret == 0, "ret = %Id\n", ret); + ok(result == 0, "result = %Iu\n", result); + + ret = SendMessageTimeoutA(hWnd, Msg, 0, 0, SMTO_NORMAL, 0, NULL); + ok(ret == 0, "ret = %Id\n", ret); + + result = 0x55555555; + ret = SendMessageTimeoutA(hWnd, Msg, 0, 0, SMTO_NORMAL, 0, &result); + ok(ret == 0, "ret = %Id\n", ret); + ok(result == 0, "result = %Iu\n", result); +} + +START_TEST(SendMessageTimeout) +{ + TestSendMessageTimeout(NULL, WM_USER); + TestSendMessageTimeout(NULL, WM_PAINT); + TestSendMessageTimeout(NULL, WM_GETICON); +} Propchange: trunk/rostests/apitests/user32/SendMessageTimeout.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/user32/SetCursorPos.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetCursor… ============================================================================== --- trunk/rostests/apitests/user32/SetCursorPos.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SetCursorPos.c [iso-8859-1] Fri Oct 24 09:16:04 2014 @@ -95,8 +95,6 @@ MSG msg; int i; - memset(results, sizeof(results), 0); - hMouseHookLL = SetWindowsHookEx(WH_MOUSE_LL, MouseLLHookProc, GetModuleHandleA( NULL ), 0); hMouseHook = SetWindowsHookExW(WH_MOUSE, MouseHookProc, GetModuleHandleW( NULL ), GetCurrentThreadId()); ok(hMouseHook!=NULL,"failed to set hook\n"); Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Fri Oct 24 09:16:04 2014 @@ -21,6 +21,7 @@ extern void func_RealGetWindowClass(void); extern void func_ScrollDC(void); extern void func_ScrollWindowEx(void); +extern void func_SendMessageTimeout(void); extern void func_SetActiveWindow(void); extern void func_SetCursorPos(void); extern void func_SystemParametersInfo(void); @@ -48,6 +49,7 @@ { "RealGetWindowClass", func_RealGetWindowClass }, { "ScrollDC", func_ScrollDC }, { "ScrollWindowEx", func_ScrollWindowEx }, + { "SendMessageTimeout", func_SendMessageTimeout }, { "SetActiveWindow", func_SetActiveWindow }, { "SetCursorPos", func_SetCursorPos }, { "SystemParametersInfo", func_SystemParametersInfo },

10 years, 7 months

[tkreuzer] 64947: [NTOSKRNL] Do not try to dereference Irp->UserIosb if it is NULL, to avoid unnecessary exceptions (inside SEH).

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Oct 24 07:16:44 2014 New Revision: 64947 URL: http://svn.reactos.org/svn/reactos?rev=64947&view=rev Log: [NTOSKRNL] Do not try to dereference Irp->UserIosb if it is NULL, to avoid unnecessary exceptions (inside SEH). Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Fri Oct 24 07:16:44 2014 @@ -324,17 +324,21 @@ Key = FileObject->CompletionContext->Key; } - /* Use SEH to make sure we don't write somewhere invalid */ - _SEH2_TRY - { - /* Save the IOSB Information */ - *Irp->UserIosb = Irp->IoStatus; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Ignore any error */ - } - _SEH2_END; + /* Check for UserIos */ + if (Irp->UserIosb != NULL) + { + /* Use SEH to make sure we don't write somewhere invalid */ + _SEH2_TRY + { + /* Save the IOSB Information */ + *Irp->UserIosb = Irp->IoStatus; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Ignore any error */ + } + _SEH2_END; + } /* Check if we have an event or a file object */ if (Irp->UserEvent)

10 years, 7 months

[tfaber] 64946: [NTOS:IO] - Normalize, er.. simplify IopNormalizeImagePath a bit and use pool tagging

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Oct 23 22:05:56 2014 New Revision: 64946 URL: http://svn.reactos.org/svn/reactos?rev=64946&view=rev Log: [NTOS:IO] - Normalize, er.. simplify IopNormalizeImagePath a bit and use pool tagging Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Thu Oct 23 22:05:56 2014 @@ -239,39 +239,44 @@ PUNICODE_STRING ImagePath, _In_ PUNICODE_STRING ServiceName) { + UNICODE_STRING SystemRootString = RTL_CONSTANT_STRING(L"\\SystemRoot\\"); + UNICODE_STRING DriversPathString = RTL_CONSTANT_STRING(L"\\SystemRoot\\system32\\drivers\\"); + UNICODE_STRING DotSysString = RTL_CONSTANT_STRING(L".sys"); UNICODE_STRING InputImagePath; DPRINT("Normalizing image path '%wZ' for service '%wZ'\n", ImagePath, ServiceName); - RtlCopyMemory(&InputImagePath, - ImagePath, - sizeof(UNICODE_STRING)); - + InputImagePath = *ImagePath; if (InputImagePath.Length == 0) { ImagePath->Length = 0; - ImagePath->MaximumLength = - (33 * sizeof(WCHAR)) + ServiceName->Length + sizeof(UNICODE_NULL); - ImagePath->Buffer = ExAllocatePool(NonPagedPool, - ImagePath->MaximumLength); + ImagePath->MaximumLength = DriversPathString.Length + + ServiceName->Length + + DotSysString.Length + + sizeof(UNICODE_NULL); + ImagePath->Buffer = ExAllocatePoolWithTag(NonPagedPool, + ImagePath->MaximumLength, + TAG_IO); if (ImagePath->Buffer == NULL) return STATUS_NO_MEMORY; - RtlAppendUnicodeToString(ImagePath, L"\\SystemRoot\\system32\\drivers\\"); + RtlCopyUnicodeString(ImagePath, &DriversPathString); RtlAppendUnicodeStringToString(ImagePath, ServiceName); - RtlAppendUnicodeToString(ImagePath, L".sys"); + RtlAppendUnicodeStringToString(ImagePath, &DotSysString); } else if (InputImagePath.Buffer[0] != L'\\') { ImagePath->Length = 0; - ImagePath->MaximumLength = - 12 * sizeof(WCHAR) + InputImagePath.Length + sizeof(UNICODE_NULL); - ImagePath->Buffer = ExAllocatePool(NonPagedPool, - ImagePath->MaximumLength); + ImagePath->MaximumLength = SystemRootString.Length + + InputImagePath.Length + + sizeof(UNICODE_NULL); + ImagePath->Buffer = ExAllocatePoolWithTag(NonPagedPool, + ImagePath->MaximumLength, + TAG_IO); if (ImagePath->Buffer == NULL) return STATUS_NO_MEMORY; - RtlAppendUnicodeToString(ImagePath, L"\\SystemRoot\\"); + RtlCopyUnicodeString(ImagePath, &SystemRootString); RtlAppendUnicodeStringToString(ImagePath, &InputImagePath); /* Free caller's string */ @@ -319,8 +324,7 @@ ServiceStart = 0; /* IopNormalizeImagePath will do all of the work for us if we give it an empty string */ - ServiceImagePath.Length = ServiceImagePath.MaximumLength = 0; - ServiceImagePath.Buffer = NULL; + RtlInitEmptyUnicodeString(&ServiceImagePath, NULL, 0); } else {

10 years, 7 months

[tkreuzer] 64945: [FREELDR] Move the BIOS call buffer to physical address 0x4000, making another page available at the top, moving the margin down to 0x9E000. Should fix boot with machines that hav...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Oct 23 21:52:39 2014 New Revision: 64945 URL: http://svn.reactos.org/svn/reactos?rev=64945&view=rev Log: [FREELDR] Move the BIOS call buffer to physical address 0x4000, making another page available at the top, moving the margin down to 0x9E000. Should fix boot with machines that have a large EBDA. CORE-8692 #comment please retest. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c [iso-8859-1] Thu Oct 23 21:52:39 2014 @@ -108,8 +108,7 @@ i386_ScreenPosX = 0; i386_ScreenPosY = 0; - PrintText("An error occured in FreeLoader\n" - VERSION"\n" + PrintText("An error occured in " VERSION "\n" "Report this error to the ReactOS Development mailing list <ros-dev(a)reactos.org>\n\n" "0x%02lx: %s\n", TrapIndex, i386ExceptionDescriptionText[TrapIndex]); #ifdef _M_IX86 Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] Thu Oct 23 21:52:39 2014 @@ -32,7 +32,6 @@ #define STACK_BASE_PAGE (STACKLOW / PAGE_SIZE) #define FREELDR_BASE_PAGE (FREELDR_BASE / PAGE_SIZE) #define DISKBUF_BASE_PAGE (DISKREADBUFFER / PAGE_SIZE) -#define BIOSBUF_BASE_PAGE (BIOSCALLBUFFER / PAGE_SIZE) #define STACK_PAGE_COUNT (FREELDR_BASE_PAGE - STACK_BASE_PAGE) #define FREELDR_PAGE_COUNT (DISKBUF_BASE_PAGE - FREELDR_BASE_PAGE) @@ -45,11 +44,10 @@ FREELDR_MEMORY_DESCRIPTOR PcMemoryMap[MAX_BIOS_DESCRIPTORS + 1] = { { LoaderFirmwarePermanent, 0x00, 1 }, // realmode int vectors - { LoaderFirmwareTemporary, 0x01, STACK_BASE_PAGE - 1 }, // freeldr stack + cmdline + { LoaderFirmwareTemporary, 0x01, STACK_BASE_PAGE - 1 }, // freeldr stack, cmdline, BIOS call buffer { LoaderOsloaderStack, STACK_BASE_PAGE, FREELDR_BASE_PAGE - STACK_BASE_PAGE }, // prot mode stack. { LoaderLoadedProgram, FREELDR_BASE_PAGE, FREELDR_PAGE_COUNT }, // freeldr image { LoaderFirmwareTemporary, DISKBUF_BASE_PAGE, DISKBUF_PAGE_COUNT }, // Disk read buffer for int 13h. DISKREADBUFFER - { LoaderFirmwareTemporary, BIOSBUF_BASE_PAGE, BIOSBUF_PAGE_COUNT }, // BIOSCALLBUFFER { LoaderFirmwarePermanent, 0x9F, 0x1 }, // EBDA { LoaderFirmwarePermanent, 0xA0, 0x50 }, // ROM / Video { LoaderSpecialMemory, 0xF0, 0x10 }, // ROM / Video @@ -203,13 +201,14 @@ bit value at address 0x413 inside the BDA, which gives us the usable size in KB */ Size = (*(PUSHORT)(ULONG_PTR)0x413) * 1024; - if (Size < 0x9F000) + if (Size < MEMORY_MARGIN) { FrLdrBugCheckWithMessage( MEMORY_INIT_FAILURE, __FILE__, __LINE__, - "The BIOS reported a usable memory range up to 0x%x, which is too small!\n", + "The BIOS reported a usable memory range up to 0x%x, which is too small!\n\n" + "If you see this, please report to the ReactOS team!", Size); } @@ -230,13 +229,13 @@ { /* Check if this is high enough */ ULONG EbdaBase = (ULONG)Regs.w.es << 4; - if (EbdaBase < 0x9F000) + if (EbdaBase < MEMORY_MARGIN) { FrLdrBugCheckWithMessage( MEMORY_INIT_FAILURE, __FILE__, __LINE__, - "The location of your EBDA is 0x%lx, which is too low!\n" + "The location of your EBDA is 0x%lx, which is too low!\n\n" "If you see this, please report to the ReactOS team!", EbdaBase); } Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] Thu Oct 23 21:52:39 2014 @@ -9,6 +9,7 @@ #define PDP_ADDRESS HEX(2000) /* One page PDP page table */ #define PD_ADDRESS HEX(3000) /* One page PD page table */ //#endif +#define BIOSCALLBUFFER HEX(4000) /* Buffer to store temporary data for any Int386() call */ #define STACK16ADDR HEX(6F00) /* The 16-bit stack top will be at 0000:6F00 */ #define BSS_START HEX(6F00) #define STACKLOW HEX(7000) @@ -16,7 +17,7 @@ #define FREELDR_BASE HEX(F800) #define FREELDR_PE_BASE HEX(10000) #define DISKREADBUFFER HEX(8E000) /* Buffer to store data read in from the disk via the BIOS */ -#define BIOSCALLBUFFER HEX(9E000) /* Buffer to store temporary data for any Int386() call */ +#define MEMORY_MARGIN HEX(9E000) /* Highest usable address */ /* 9F000- 9FFFF is reserved for the EBDA */ #define DISKREADBUFFER_SIZE HEX(10000)

10 years, 7 months

[zguo] 64944: [WIN32SS] Cherrypick fix for OffByOne browser where parent desktop handle is null for 0.3.17. CORE-8665

by zguo＠svn.reactos.org

Author: zguo Date: Thu Oct 23 20:52:25 2014 New Revision: 64944 URL: http://svn.reactos.org/svn/reactos?rev=64944&view=rev Log: [WIN32SS] Cherrypick fix for OffByOne browser where parent desktop handle is null for 0.3.17. CORE-8665 Modified: branches/0.3.17/reactos/ (props changed) branches/0.3.17/reactos/win32ss/user/ntuser/callproc.c Propchange: branches/0.3.17/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 23 20:52:25 2014 @@ -18,4 +18,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:64752-64754,64765,64769,64771,64776,64793,64800,64825,64829,64832-64833,64909 +/trunk/reactos:64752-64754,64765,64769,64771,64776,64793,64800,64825,64829,64832-64833,64859,64909 Modified: branches/0.3.17/reactos/win32ss/user/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/win32ss/user/ntu… ============================================================================== --- branches/0.3.17/reactos/win32ss/user/ntuser/callproc.c [iso-8859-1] (original) +++ branches/0.3.17/reactos/win32ss/user/ntuser/callproc.c [iso-8859-1] Thu Oct 23 20:52:25 2014 @@ -7,6 +7,7 @@ */ #include <win32k.h> +DBG_DEFAULT_CHANNEL(UserClass); /* CALLPROC ******************************************************************/ @@ -110,6 +111,7 @@ { PCLS pCls; PWND pWnd; + PDESKTOP pDesk; PCALLPROCDATA CallProc = NULL; PTHREADINFO pti; @@ -131,7 +133,14 @@ // No luck, create a new one for the requested proc. if (!CallProc) { - CallProc = CreateCallProc( pCls->rpdeskParent, + if (!pCls->rpdeskParent) + { + TRACE("Null DESKTOP Atom %d\n",pCls->atomClassName); + pDesk = pti->rpdesk; + } + else + pDesk = pCls->rpdeskParent; + CallProc = CreateCallProc( pDesk, (WNDPROC)ProcIn, !!(Flags & UserGetCPDA2U), pti->ppi);

10 years, 7 months

[dquintana] 64943: Sync up to trunk HEAD (r64942).

by dquintana＠svn.reactos.org

Author: dquintana Date: Thu Oct 23 20:48:15 2014 New Revision: 64943 URL: http://svn.reactos.org/svn/reactos?rev=64943&view=rev Log: Sync up to trunk HEAD (r64942). Modified: branches/shell-experiments/ (props changed) branches/shell-experiments/win32ss/user/ntuser/hook.c Propchange: branches/shell-experiments/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 23 20:48:15 2014 @@ -18,4 +18,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:61927-64939 +/trunk/reactos:61927-64942 Modified: branches/shell-experiments/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… ============================================================================== --- branches/shell-experiments/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/ntuser/hook.c [iso-8859-1] Thu Oct 23 20:48:15 2014 @@ -1402,7 +1402,7 @@ BOOL Ansi) { PWINSTATION_OBJECT WinStaObj; - PHOOK Hook; + PHOOK Hook = NULL; UNICODE_STRING ModuleName; NTSTATUS Status; HHOOK Handle; @@ -1634,6 +1634,8 @@ RETURN( Handle); CLEANUP: + if (Hook) + UserDereferenceObject(Hook); TRACE("Leave NtUserSetWindowsHookEx, ret=%p\n", _ret_); UserLeave(); END_CLEANUP;

10 years, 7 months

← Newer
1
...
19
20
21
22
23
24
25
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014