Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 49259: [SERVICES] RControlService: Check the current state before sending a control request.
by ekohl＠svn.reactos.org 24 Oct '10

24 Oct '10

Author: ekohl Date: Sun Oct 24 13:48:11 2010 New Revision: 49259 URL: http://svn.reactos.org/svn/reactos?rev=49259&view=rev Log: [SERVICES] RControlService: Check the current state before sending a control request. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Oct 24 13:48:11 2010 @@ -553,6 +553,7 @@ DWORD pcbBytesNeeded = 0; DWORD dwServicesReturned = 0; DWORD dwControlsAccepted; + DWORD dwCurrentState; HKEY hServicesKey = NULL; DPRINT("RControlService() called\n"); @@ -655,8 +656,34 @@ else { dwControlsAccepted = lpService->Status.dwControlsAccepted; - - /* Check if the control code is acceptable */ + dwCurrentState = lpService->Status.dwCurrentState; + + /* Check the current state before sending a control request */ + switch (dwCurrentState) + { + case SERVICE_STOP_PENDING: + case SERVICE_STOPPED: + return ERROR_SERVICE_CANNOT_ACCEPT_CTRL; + + case SERVICE_START_PENDING: + switch (dwControl) + { + case SERVICE_CONTROL_STOP: + break; + + case SERVICE_CONTROL_INTERROGATE: + RtlCopyMemory(lpServiceStatus, + &lpService->Status, + sizeof(SERVICE_STATUS)); + return ERROR_SUCCESS; + + default: + return ERROR_SERVICE_CANNOT_ACCEPT_CTRL; + } + break; + } + + /* Check if the control code is acceptable to the service */ switch (dwControl) { case SERVICE_CONTROL_STOP:

1 0

[akhaldi] 49258: [CMAKE] - Add set_image_base macro. - Fix ks linking.
by akhaldi＠svn.reactos.org 24 Oct '10

24 Oct '10

Author: akhaldi Date: Sun Oct 24 12:44:36 2010 New Revision: 49258 URL: http://svn.reactos.org/svn/reactos?rev=49258&view=rev Log: [CMAKE] - Add set_image_base macro. - Fix ks linking. Modified: branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… ============================================================================== --- branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] Sun Oct 24 12:44:36 2010 @@ -26,9 +26,10 @@ kcom.c ks.rc) -set_target_properties(ks PROPERTIES LINK_FLAGS "-Wl,-entry,0 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") - -set_module_type(ks kernelmodedriver) +set_target_properties(ks PROPERTIES SUFFIX ".sys") +set_entrypoint(ks 0) +set_subsystem(ks native) +set_image_base(ks 0x00010000) target_link_libraries(ks ${CMAKE_CURRENT_SOURCE_DIR}/ks.def Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=492… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sun Oct 24 12:44:36 2010 @@ -56,6 +56,15 @@ set_target_properties(${MODULE} PROPERTIES LINK_FLAGS ${NEW_LINKER_FLAGS}) endmacro() +macro(set_image_base MODULE IMAGE_BASE) + set(NEW_LINKER_FLAGS "-Wl,--image-base,${IMAGE_BASE}") + get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS) + if(LINKER_FLAGS) + set(NEW_LINKER_FLAGS "${LINKER_FLAGS} ${NEW_LINKER_FLAGS}") + endif() + set_target_properties(${MODULE} PROPERTIES LINK_FLAGS ${NEW_LINKER_FLAGS}) +endmacro() + macro(add_importlibs MODULE) foreach(LIB ${ARGN}) target_link_libraries(${MODULE} ${LIB}.dll.a) @@ -106,9 +115,10 @@ set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") endif() if(${TYPE} MATCHES kernelmodedriver) - set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") + set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols" SUFFIX ".sys") set_entrypoint(${MODULE} DriverEntry@8) set_subsystem(${MODULE} native) + set_image_base(${MODULE} 0x00010000) add_dependencies(${MODULE} bugcodes) endif() endmacro()

1 0

[tkreuzer] 49257: [WIN32K] Fix possible NULL pointer free. Fixes solitaire.
by tkreuzer＠svn.reactos.org 24 Oct '10

24 Oct '10

Author: tkreuzer Date: Sun Oct 24 11:57:02 2010 New Revision: 49257 URL: http://svn.reactos.org/svn/reactos?rev=49257&view=rev Log: [WIN32K] Fix possible NULL pointer free. Fixes solitaire. Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sun Oct 24 11:57:02 2010 @@ -1264,7 +1264,7 @@ hcmXform); cleanup: - ExFreePoolWithTag(safeBits, TAG_DIB); + if (safeBits) ExFreePoolWithTag(safeBits, TAG_DIB); return hbmResult; }

1 0

[cgutman] 49256: [HAL] - Fix a broken loop that resulted in us registering the resources of multiple COM ports as our KD port - Fixes bug #5530
by cgutman＠svn.reactos.org 24 Oct '10

24 Oct '10

Author: cgutman Date: Sun Oct 24 10:48:10 2010 New Revision: 49256 URL: http://svn.reactos.org/svn/reactos?rev=49256&view=rev Log: [HAL] - Fix a broken loop that resulted in us registering the resources of multiple COM ports as our KD port - Fixes bug #5530 Modified: trunk/reactos/hal/halx86/generic/usage.c Modified: trunk/reactos/hal/halx86/generic/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/usage.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] Sun Oct 24 10:48:10 2010 @@ -235,8 +235,9 @@ if (!HalpGetInfoFromACPI) { /* No, so use our local table */ - Port = HalpComPortIrqMapping[0][0]; - for (i = 0; Port; i++) + for (i = 0, Port = HalpComPortIrqMapping[i][0]; + Port; + i++, Port = HalpComPortIrqMapping[i][0]) { /* Is this the port we want? */ if (Port == (ULONG_PTR)KdComPortInUse) @@ -248,9 +249,6 @@ PRIMARY_VECTOR_BASE, HIGH_LEVEL); } - - /* Next port */ - Port = HalpComPortIrqMapping[i][0]; } } }

1 0

[cgutman] 49255: [HAL] - HalpEnableInterruptHandler: Set the IDT_LATCHED flag if the caller requested a latched interrupt
by cgutman＠svn.reactos.org 24 Oct '10

24 Oct '10

Author: cgutman Date: Sun Oct 24 10:28:15 2010 New Revision: 49255 URL: http://svn.reactos.org/svn/reactos?rev=49255&view=rev Log: [HAL] - HalpEnableInterruptHandler: Set the IDT_LATCHED flag if the caller requested a latched interrupt Modified: trunk/reactos/hal/halx86/generic/usage.c Modified: trunk/reactos/hal/halx86/generic/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/usage.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] Sun Oct 24 10:28:15 2010 @@ -509,6 +509,9 @@ IN PVOID Handler, IN KINTERRUPT_MODE Mode) { + /* Set the IDT_LATCHED flag for latched interrupts */ + if (Mode == Latched) Flags |= IDT_LATCHED; + /* Register the vector */ HalpRegisterVector(Flags, BusVector, SystemVector, Irql);

1 0

[fireball] 49254: - Properly release all resources during thread and process termination.
by fireball＠svn.reactos.org 24 Oct '10

24 Oct '10

Author: fireball Date: Sun Oct 24 09:24:02 2010 New Revision: 49254 URL: http://svn.reactos.org/svn/reactos?rev=49254&view=rev Log: - Properly release all resources during thread and process termination. Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] Sun Oct 24 09:24:02 2010 @@ -90,6 +90,10 @@ /* Destroy its classes */ destroy_process_classes(Win32Process); + /* Free allocated user handles */ + free_process_user_handles(Win32Process); + + /* Destroy idle event if it exists */ if (Win32Process->idle_event) { ObDereferenceObject(Win32Process->idle_event); @@ -157,7 +161,7 @@ UserEnterExclusive(); cleanup_clipboard_thread(Win32Thread); destroy_thread_windows(Win32Thread); - //free_msg_queue(Win32Thread); // FIXME! + free_msg_queue(Win32Thread); close_thread_desktop(Win32Thread); UserLeave();

1 0

[ekohl] 49253: [SERVICES] - Use new handle check functions in RCloseServiceHandle(). - RControlService: Check if a control request is acceptable for a user mode service before sending it to the ser...
by ekohl＠svn.reactos.org 24 Oct '10

24 Oct '10

Author: ekohl Date: Sun Oct 24 09:21:37 2010 New Revision: 49253 URL: http://svn.reactos.org/svn/reactos?rev=49253&view=rev Log: [SERVICES] - Use new handle check functions in RCloseServiceHandle(). - RControlService: Check if a control request is acceptable for a user mode service before sending it to the service. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Oct 24 09:21:37 2010 @@ -31,9 +31,6 @@ typedef struct _MANAGER_HANDLE { SCMGR_HANDLE Handle; - - /* FIXME: Insert more data here */ - WCHAR DatabaseName[1]; } MANAGER_HANDLE, *PMANAGER_HANDLE; @@ -41,11 +38,7 @@ typedef struct _SERVICE_HANDLE { SCMGR_HANDLE Handle; - PSERVICE ServiceEntry; - - /* FIXME: Insert more data here */ - } SERVICE_HANDLE, *PSERVICE_HANDLE; @@ -149,7 +142,7 @@ if (lpDatabaseName == NULL) lpDatabaseName = SERVICES_ACTIVE_DATABASEW; - if (_wcsicmp(lpDatabaseName,SERVICES_FAILED_DATABASEW)==0) + if (_wcsicmp(lpDatabaseName, SERVICES_FAILED_DATABASEW) == 0) { DPRINT("Database %S, does not exist\n",lpDatabaseName); return ERROR_DATABASE_DOES_NOT_EXIST; @@ -168,8 +161,6 @@ Ptr->Handle.Tag = MANAGER_TAG; - /* FIXME: initialize more data here */ - wcscpy(Ptr->DatabaseName, lpDatabaseName); *Handle = (SC_HANDLE)Ptr; @@ -192,7 +183,6 @@ Ptr->Handle.Tag = SERVICE_TAG; - /* FIXME: initialize more data here */ Ptr->ServiceEntry = lpServiceEntry; *Handle = (SC_HANDLE)Ptr; @@ -453,9 +443,10 @@ if (*hSCObject == 0) return ERROR_INVALID_HANDLE; - hManager = (PMANAGER_HANDLE)*hSCObject; - hService = (PSERVICE_HANDLE)*hSCObject; - if (hManager->Handle.Tag == MANAGER_TAG) + hManager = ScmGetServiceManagerFromHandle(*hSCObject); + hService = ScmGetServiceFromHandle(*hSCObject); + + if (hManager != NULL) { DPRINT("Found manager handle\n"); @@ -467,7 +458,7 @@ DPRINT("RCloseServiceHandle() done\n"); return ERROR_SUCCESS; } - else if (hService->Handle.Tag == SERVICE_TAG) + else if (hService != NULL) { DPRINT("Found service handle\n"); @@ -561,6 +552,7 @@ DWORD dwError = ERROR_SUCCESS; DWORD pcbBytesNeeded = 0; DWORD dwServicesReturned = 0; + DWORD dwControlsAccepted; HKEY hServicesKey = NULL; DPRINT("RControlService() called\n"); @@ -662,6 +654,23 @@ } else { + dwControlsAccepted = lpService->Status.dwControlsAccepted; + + /* Check if the control code is acceptable */ + switch (dwControl) + { + case SERVICE_CONTROL_STOP: + if ((dwControlsAccepted & SERVICE_ACCEPT_STOP) == 0) + return ERROR_INVALID_SERVICE_CONTROL; + break; + + case SERVICE_CONTROL_PAUSE: + case SERVICE_CONTROL_CONTINUE: + if ((dwControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE) == 0) + return ERROR_INVALID_SERVICE_CONTROL; + break; + } + /* Send control code to the service */ dwError = ScmControlService(lpService, dwControl);

1 0

[cgutman] 49252: [NTOSKRNL] - Fix a critical bug in the conflict detection code - Don't unconditionally skip conflict detection for shared resources, instead it should be done on a descriptor-by-de...
by cgutman＠svn.reactos.org 24 Oct '10

24 Oct '10

Author: cgutman Date: Sun Oct 24 09:05:17 2010 New Revision: 49252 URL: http://svn.reactos.org/svn/reactos?rev=49252&view=rev Log: [NTOSKRNL] - Fix a critical bug in the conflict detection code - Don't unconditionally skip conflict detection for shared resources, instead it should be done on a descriptor-by-descriptor basis (if both descriptors are shared) - This check wasn't removed when I initially wrote this code and added the proper check below Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Sun Oct 24 09:05:17 2010 @@ -329,9 +329,6 @@ { ULONG i, ii; BOOLEAN Result = FALSE; - - if (ResDesc->ShareDisposition == CmResourceShareShared) - return FALSE; for (i = 0; i < ResourceList->Count; i++) {

1 0

[cgutman] 49251: [PNPMGR] - Check that we got a valid vector back from HAL when translating an interrupt resource - Add some debugging messages for failure paths in device resource handling code
by cgutman＠svn.reactos.org 24 Oct '10

24 Oct '10

Author: cgutman Date: Sun Oct 24 06:16:35 2010 New Revision: 49251 URL: http://svn.reactos.org/svn/reactos?rev=49251&view=rev Log: [PNPMGR] - Check that we got a valid vector back from HAL when translating an interrupt resource - Add some debugging messages for failure paths in device resource handling code Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Sun Oct 24 06:16:35 2010 @@ -733,7 +733,7 @@ DeviceNode->ResourceListTranslated = ExAllocatePool(PagedPool, ListSize); if (!DeviceNode->ResourceListTranslated) { - Status =STATUS_NO_MEMORY; + Status = STATUS_NO_MEMORY; goto cleanup; } RtlCopyMemory(DeviceNode->ResourceListTranslated, DeviceNode->ResourceList, ListSize); @@ -758,6 +758,7 @@ &DescriptorTranslated->u.Port.Start)) { Status = STATUS_UNSUCCESSFUL; + DPRINT1("Failed to translate port resource (Start: 0xI64x)\n", DescriptorRaw->u.Port.Start.QuadPart); goto cleanup; } break; @@ -771,6 +772,14 @@ DescriptorRaw->u.Interrupt.Vector, (PKIRQL)&DescriptorTranslated->u.Interrupt.Level, &DescriptorTranslated->u.Interrupt.Affinity); + + if (!DescriptorTranslated->u.Interrupt.Vector) + { + Status = STATUS_UNSUCCESSFUL; + DPRINT1("Failed to translate interrupt resource (Vector: 0x%x | Level: 0x%x)\n", DescriptorRaw->u.Interrupt.Vector, + DescriptorRaw->u.Interrupt.Level); + goto cleanup; + } break; } case CmResourceTypeMemory: @@ -784,6 +793,7 @@ &DescriptorTranslated->u.Memory.Start)) { Status = STATUS_UNSUCCESSFUL; + DPRINT1("Failed to translate memory resource (Start: 0xI64x)\n", DescriptorRaw->u.Memory.Start.QuadPart); goto cleanup; } } @@ -879,16 +889,21 @@ Status = IopCreateResourceListFromRequirements(DeviceNode->ResourceRequirements, &DeviceNode->ResourceList); if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create a resource list from supplied resources for %wZ\n", &DeviceNode->InstancePath); goto ByeBye; - - Status = IopDetectResourceConflict(DeviceNode->ResourceList, FALSE, NULL); - if (!NT_SUCCESS(Status)) - goto ByeBye; + } + + /* IopCreateResourceListFromRequirements should NEVER succeed with a conflicting list */ + ASSERT(IopDetectResourceConflict(DeviceNode->ResourceList, FALSE, NULL) != STATUS_CONFLICTING_ADDRESSES); Finish: Status = IopTranslateDeviceResources(DeviceNode); if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to translate resources for %wZ\n", &DeviceNode->InstancePath); goto ByeBye; + } Status = IopUpdateResourceMapForPnPDevice(DeviceNode); if (!NT_SUCCESS(Status))

1 0

[jimtabor] 49250: [Win32k] - Fix an exception when set condition * first always is used then moving the mouse. There seems to be an initialization issue (The Init Bug) and not setting a desktop.
by jimtabor＠svn.reactos.org 24 Oct '10

24 Oct '10

Author: jimtabor Date: Sun Oct 24 04:36:45 2010 New Revision: 49250 URL: http://svn.reactos.org/svn/reactos?rev=49250&view=rev Log: [Win32k] - Fix an exception when set condition * first always is used then moving the mouse. There seems to be an initialization issue (The Init Bug) and not setting a desktop. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Sun Oct 24 04:36:45 2010 @@ -873,8 +873,7 @@ ASSERT(WH_MINHOOK <= HookId && HookId <= WH_MAXHOOK); - pti = GetW32ThreadInfo(); // Need to call this! - + pti = PsGetCurrentThreadWin32Thread(); if (!pti || !pti->pDeskInfo) goto Exit; // Must have a desktop running for hooks.

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