Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[tkreuzer] 35775: revert changes to def file from 35655, they break x86 build
by tkreuzer＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: tkreuzer Date: Fri Aug 29 19:00:44 2008 New Revision: 35775 URL: http://svn.reactos.org/svn/reactos?rev=35775&view=rev Log: revert changes to def file from 35655, they break x86 build Modified: branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt.def Modified: branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] Fri Aug 29 19:00:44 2008 @@ -120,7 +120,7 @@ __fpecode @115 __getmainargs @116 __initenv @117 - __iob_func @118 +; __iob_func @118 __isascii @119 __iscsym @120 __iscsymf @121 @@ -271,10 +271,10 @@ _fileno @265 _findclose @266 _findfirst @267 - _findfirst64 @268 +; _findfirst64 @268 _findfirsti64 @269 _findnext @270 - _findnext64 @271 +; _findnext64 @271 _findnexti64 @272 _finite @273 _flsbuf @274 @@ -316,7 +316,7 @@ ; _getwche @310 _getws @311 _global_unwind2 @312 - _gmtime64 @313 +; _gmtime64 @313 _heapadd @314 _heapchk @315 _heapmin @316 @@ -372,7 +372,7 @@ _lfind @366 _loaddll @367 _local_unwind2 @368 - _localtime64 @369 +; _localtime64 @369 _lock @370 _locking @371 _logb @372 @@ -538,7 +538,7 @@ _tell @532 _telli64 @533 _tempnam @534 - _time64 @535 +; _time64 @535 _timezone @536 DATA _tolower @537 _toupper @538

1 0

[tkreuzer] 35774: fix crtdll build
by tkreuzer＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: tkreuzer Date: Fri Aug 29 18:43:06 2008 New Revision: 35774 URL: http://svn.reactos.org/svn/reactos?rev=35774&view=rev Log: fix crtdll build Modified: branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.rbuild [iso-8859-1] Fri Aug 29 18:43:06 2008 @@ -5,7 +5,7 @@ <define name="_DISABLE_TIDENTS" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> - <define name="_MSVCRT_" /> + <define name="USE_MSVCRT_PREFIX" /> <define name="_MSVCRT_LIB_" /> <define name="__NO_CTYPE_INLINES" /> <define name="_CTYPE_DISABLE_MACROS" />

1 0

[tkreuzer] 35773: #if out RtlExtendedIntegerMultiply and RtlExtendedLargeIntegerDivide for amd64 in winnt4.h
by tkreuzer＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: tkreuzer Date: Fri Aug 29 18:29:19 2008 New Revision: 35773 URL: http://svn.reactos.org/svn/reactos?rev=35773&view=rev Log: #if out RtlExtendedIntegerMultiply and RtlExtendedLargeIntegerDivide for amd64 in winnt4.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winnt4.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winnt4.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winnt4.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winnt4.h [iso-8859-1] Fri Aug 29 18:29:19 2008 @@ -411,6 +411,7 @@ IN ULONG Multiplicand, IN ULONG Multiplier); +#ifndef _M_AMD64 NTSYSAPI LARGE_INTEGER NTAPI @@ -425,6 +426,7 @@ IN LARGE_INTEGER Dividend, IN ULONG Divisor, IN OUT PULONG Remainder); +#endif NTSYSAPI LARGE_INTEGER

1 0

[tkreuzer] 35772: fix for x86 build
by tkreuzer＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: tkreuzer Date: Fri Aug 29 18:22:20 2008 New Revision: 35772 URL: http://svn.reactos.org/svn/reactos?rev=35772&view=rev Log: fix for x86 build Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] Fri Aug 29 18:22:20 2008 @@ -194,8 +194,8 @@ /* Copy data to caller's buffer */ RtlCopyMemory(&BiosMemoryMap[MapCount], (PVOID)BIOSCALLBUFFER, Regs.x.ecx); - DbgPrint((DPRINT_MEMORY, "BaseAddress: 0x%p\n", (PVOID)BiosMemoryMap[MapCount].BaseAddress)); - DbgPrint((DPRINT_MEMORY, "Length: 0x%p\n", (PVOID)BiosMemoryMap[MapCount].Length)); + DbgPrint((DPRINT_MEMORY, "BaseAddress: 0x%p\n", (PVOID)(ULONG_PTR)BiosMemoryMap[MapCount].BaseAddress)); + DbgPrint((DPRINT_MEMORY, "Length: 0x%p\n", (PVOID)(ULONG_PTR)BiosMemoryMap[MapCount].Length)); DbgPrint((DPRINT_MEMORY, "Type: 0x%x\n", BiosMemoryMap[MapCount].Type)); DbgPrint((DPRINT_MEMORY, "Reserved: 0x%x\n", BiosMemoryMap[MapCount].Reserved)); DbgPrint((DPRINT_MEMORY, "\n"));

1 0

[tkreuzer] 35771: remove stuff from amd64 hal that doesn't belong there
by tkreuzer＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: tkreuzer Date: Fri Aug 29 17:47:11 2008 New Revision: 35771 URL: http://svn.reactos.org/svn/reactos?rev=35771&view=rev Log: remove stuff from amd64 hal that doesn't belong there Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c [iso-8859-1] Fri Aug 29 17:47:11 2008 @@ -12,14 +12,6 @@ #define NDEBUG #include <debug.h> #include <ndk/inbvfuncs.h> - -#undef ExAcquireFastMutex -#undef ExReleaseFastMutex -#undef ExTryToAcquireFastMutex -#undef KeAcquireSpinLock -#undef KeLowerIrql -#undef KeRaiseIrql -#undef KeReleaseSpinLock #define READ_REGISTER_ULONG(r) (*(volatile ULONG * const)(r)) #define WRITE_REGISTER_ULONG(r, v) (*(volatile ULONG *)(r) = (v)) @@ -786,173 +778,4 @@ return; } -/* - * @implemented - */ -VOID -NTAPI -KeRaiseIrql(KIRQL NewIrql, - PKIRQL OldIrql) -{ - /* Call the fastcall function */ - *OldIrql = KfRaiseIrql(NewIrql); -} - -/* - * @implemented - */ -VOID -NTAPI -KeAcquireSpinLock(PKSPIN_LOCK SpinLock, - PKIRQL OldIrql) -{ - /* Call the fastcall function */ - *OldIrql = KfAcquireSpinLock(SpinLock); -} - -/* - * @implemented - */ -KIRQL -FASTCALL -KeAcquireSpinLockRaiseToSynch(PKSPIN_LOCK SpinLock) -{ - /* Simply raise to dispatch */ - return KfRaiseIrql(DISPATCH_LEVEL); -} - -/* - * @implemented - */ -VOID -NTAPI -KeReleaseSpinLock(PKSPIN_LOCK SpinLock, - KIRQL NewIrql) -{ - /* Call the fastcall function */ - KfReleaseSpinLock(SpinLock, NewIrql); -} - -/* - * @implemented - */ -KIRQL -FASTCALL -KfAcquireSpinLock(PKSPIN_LOCK SpinLock) -{ - /* Simply raise to dispatch */ - return KfRaiseIrql(DISPATCH_LEVEL); -} - -/* - * @implemented - */ -VOID -FASTCALL -KfReleaseSpinLock(PKSPIN_LOCK SpinLock, - KIRQL OldIrql) -{ - /* Simply lower IRQL back */ - KeLowerIrql(OldIrql); -} - -/* - * @implemented - */ -KIRQL -FASTCALL -KeAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) -{ - /* Simply raise to dispatch */ - return KfRaiseIrql(DISPATCH_LEVEL); -} - -/* - * @implemented - */ -KIRQL -FASTCALL -KeAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) -{ - /* Simply raise to dispatch */ - return KfRaiseIrql(DISPATCH_LEVEL); -} - -/* - * @implemented - */ -VOID -FASTCALL -KeAcquireInStackQueuedSpinLock(IN PKSPIN_LOCK SpinLock, - IN PKLOCK_QUEUE_HANDLE LockHandle) -{ - /* Simply raise to dispatch */ - LockHandle->OldIrql = KfRaiseIrql(DISPATCH_LEVEL); -} - -/* - * @implemented - */ -VOID -FASTCALL -KeAcquireInStackQueuedSpinLockRaiseToSynch(IN PKSPIN_LOCK SpinLock, - IN PKLOCK_QUEUE_HANDLE LockHandle) -{ - /* Simply raise to synch */ - LockHandle->OldIrql = KfRaiseIrql(DISPATCH_LEVEL); -} - -/* - * @implemented - */ -VOID -FASTCALL -KeReleaseQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, - IN KIRQL OldIrql) -{ - /* Simply lower IRQL back */ - KeLowerIrql(OldIrql); -} - -/* - * @implemented - */ -VOID -FASTCALL -KeReleaseInStackQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle) -{ - /* Simply lower IRQL back */ - KeLowerIrql(LockHandle->OldIrql); -} - -/* - * @implemented - */ -BOOLEAN -FASTCALL -KeTryToAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, - IN PKIRQL OldIrql) -{ - /* Simply raise to dispatch */ - *OldIrql = KfRaiseIrql(DISPATCH_LEVEL); - - /* Always return true on UP Machines */ - return TRUE; -} - -/* - * @implemented - */ -LOGICAL -FASTCALL -KeTryToAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, - OUT PKIRQL OldIrql) -{ - /* Simply raise to dispatch */ - *OldIrql = KfRaiseIrql(DISPATCH_LEVEL); - - /* Always return true on UP Machines */ - return TRUE; -} - /* EOF */

1 0

[ekohl] 35770: QueryServiceConfig2A/W: Add more parameter checks. Fixes 3 winetest failures.
by ekohl＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: ekohl Date: Fri Aug 29 17:31:54 2008 New Revision: 35770 URL: http://svn.reactos.org/svn/reactos?rev=35770&view=rev Log: QueryServiceConfig2A/W: Add more parameter checks. Fixes 3 winetest failures. Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Fri Aug 29 17:31:54 2008 @@ -1831,7 +1831,15 @@ TRACE("QueryServiceConfig2A(%p, %lu, %p, %lu, %p)\n", hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); - if (lpBuffer == NULL && cbBufSize != 0) + if (dwInfoLevel != SERVICE_CONFIG_DESCRIPTION && + dwInfoLevel != SERVICE_CONFIG_FAILURE_ACTIONS) + { + SetLastError(ERROR_INVALID_LEVEL); + return FALSE; + } + + if ((lpBuffer == NULL && cbBufSize != 0) || + pcbBytesNeeded == NULL) { SetLastError(ERROR_INVALID_ADDRESS); return FALSE; @@ -1921,7 +1929,15 @@ TRACE("QueryServiceConfig2W(%p, %lu, %p, %lu, %p)\n", hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); - if (lpBuffer == NULL && cbBufSize != 0) + if (dwInfoLevel != SERVICE_CONFIG_DESCRIPTION && + dwInfoLevel != SERVICE_CONFIG_FAILURE_ACTIONS) + { + SetLastError(ERROR_INVALID_LEVEL); + return FALSE; + } + + if ((lpBuffer == NULL && cbBufSize != 0) || + pcbBytesNeeded == NULL) { SetLastError(ERROR_INVALID_ADDRESS); return FALSE;

1 0

[hpoussin] 35769: win32k: Add tags when allocating memory ntoskrnl: Relax checks when freeing a string
by hpoussin＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: hpoussin Date: Fri Aug 29 16:19:41 2008 New Revision: 35769 URL: http://svn.reactos.org/svn/reactos?rev=35769&view=rev Log: win32k: Add tags when allocating memory ntoskrnl: Relax checks when freeing a string Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/eng/xlate.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Fri Aug 29 16:19:41 2008 @@ -74,13 +74,18 @@ } +#define TAG_USTR TAG('U', 'S', 'T', 'R') +#define TAG_ASTR TAG('A', 'S', 'T', 'R') +#define TAG_OSTR TAG('O', 'S', 'T', 'R') VOID STDCALL RtlpFreeMemory(PVOID Mem, ULONG Tag) { - ExFreePoolWithTag(Mem, - Tag); + if (Tag == TAG_ASTR || Tag == TAG_OSTR || Tag == TAG_USTR) + ExFreePool(Mem); + else + ExFreePoolWithTag(Mem, Tag); } /* Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Fri Aug 29 16:19:41 2008 @@ -325,7 +325,7 @@ SurfObj->lDelta = DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BMF_8BPP)); SurfObj->cjBits = SurfObj->lDelta * Size.cy; UncompressedFormat = BMF_8BPP; - UncompressedBits = EngAllocMem(FL_ZERO_MEMORY, SurfObj->cjBits, 0); + UncompressedBits = EngAllocMem(FL_ZERO_MEMORY, SurfObj->cjBits, TAG_DIB); Decompress8bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, SurfObj->lDelta); } else @@ -356,7 +356,7 @@ { SurfObj->pvBits = EngAllocMem(0 != (Flags & BMF_NOZEROINIT) ? 0 : FL_ZERO_MEMORY, - SurfObj->cjBits, 0); + SurfObj->cjBits, TAG_DIB); } if (SurfObj->pvBits == NULL) { Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Fri Aug 29 16:19:41 2008 @@ -243,7 +243,7 @@ { XlateObj->cEntries = SourcePalGDI->NumColors; XlateObj->pulXlate = - EngAllocMem(0, sizeof(ULONG) * XlateObj->cEntries, 0); + EngAllocMem(0, sizeof(ULONG) * XlateObj->cEntries, TAG_XLATEOBJ); XlateObj->flXlate |= XO_TRIVIAL; for (i = 0; i < XlateObj->cEntries; i++) @@ -264,7 +264,7 @@ { XlateObj->cEntries = SourcePalGDI->NumColors; XlateObj->pulXlate = - EngAllocMem(0, sizeof(ULONG) * XlateObj->cEntries, 0); + EngAllocMem(0, sizeof(ULONG) * XlateObj->cEntries, TAG_XLATEOBJ); for (i = 0; i < XlateObj->cEntries; i++) XlateObj->pulXlate[i] = ShiftAndMask(XlateGDI, *((ULONG *)&SourcePalGDI->IndexedColors[i])); @@ -379,7 +379,7 @@ XlateObj = GDIToObj(XlateGDI, XLATE); XlateObj->cEntries = 2; - XlateObj->pulXlate = EngAllocMem(0, sizeof(ULONG) * XlateObj->cEntries, 0); + XlateObj->pulXlate = EngAllocMem(0, sizeof(ULONG) * XlateObj->cEntries, TAG_XLATEOBJ); if (XlateObj->pulXlate == NULL) { PALETTE_UnlockPalette(DestPalGDI); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Fri Aug 29 16:19:41 2008 @@ -317,7 +317,7 @@ NULL, 0, sizeof(CURICON_PROCESS), - 0, + TAG_DIB, 128); InitializeListHead(&gCurIconList); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Fri Aug 29 16:19:41 2008 @@ -155,14 +155,14 @@ NULL, 0, sizeof(USER_MESSAGE), - 0, + TAG_USRMSG, 256); ExInitializePagedLookasideList(&TimerLookasideList, NULL, NULL, 0, sizeof(TIMER_ENTRY), - 0, + TAG_TIMER, 64); return(STATUS_SUCCESS);

1 0

[ekohl] 35768: Forgot to commit this file too! Patch based on bug report #3669 by Michael Martin (aka bugboy) <martinmnet@hotmail.com> just like the patches r35748, r35750, r35752 and r35753.
by ekohl＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: ekohl Date: Fri Aug 29 15:44:40 2008 New Revision: 35768 URL: http://svn.reactos.org/svn/reactos?rev=35768&view=rev Log: Forgot to commit this file too! Patch based on bug report #3669 by Michael Martin (aka bugboy) <martinmnet(a)hotmail.com> just like the patches r35748, r35750, r35752 and r35753. Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Fri Aug 29 15:44:40 2008 @@ -172,10 +172,11 @@ /* Set the resume count */ lpService->dwResumeCount = dwResumeCount++; - /* Append service entry */ + /* Append service record */ InsertTailList(&ServiceListHead, &lpService->ServiceListEntry); + /* Initialize the service status */ lpService->Status.dwCurrentState = SERVICE_STOPPED; lpService->Status.dwControlsAccepted = 0; lpService->Status.dwWin32ExitCode = ERROR_SERVICE_NEVER_STARTED; @@ -184,6 +185,42 @@ lpService->Status.dwWaitHint = 2000; /* 2 seconds */ return ERROR_SUCCESS; +} + + +VOID +ScmDeleteServiceRecord(PSERVICE lpService) +{ + DPRINT1("Deleting Service %S\n", lpService->lpServiceName); + + /* Delete the display name */ + if (lpService->lpDisplayName != NULL && + lpService->lpDisplayName != lpService->lpServiceName) + HeapFree(GetProcessHeap(), 0, lpService->lpDisplayName); + + /* Decrement the image reference counter */ + if (lpService->lpImage) + lpService->lpImage->dwServiceRefCount--; + + /* Decrement the group reference counter */ + if (lpService->lpGroup) + lpService->lpGroup->dwRefCount--; + + /* FIXME: SecurityDescriptor */ + + /* Close the control pipe */ + if (lpService->ControlPipeHandle != INVALID_HANDLE_VALUE) + CloseHandle(lpService->ControlPipeHandle); + + /* Remove the Service from the List */ + RemoveEntryList(&lpService->ServiceListEntry); + + DPRINT1("Deleted Service %S\n", lpService->lpServiceName); + + /* Delete the service record */ + HeapFree(GetProcessHeap(), 0, lpService); + + DPRINT1("Done\n"); }

1 0

[ekohl] 35767: - Add a reference counter to the service record. - Implement a common service record delete function. - RCloseServiceHandle: Remove a service if it has been marked for deletion and the reference counter reaches 0. - RControlService: Stop a service only if there are no dependent services running. Patch based on bug report #3669 by Michael Martin (aka bugboy) <martinmnet@hotmail.com> just like the patches r35748, r35750, r35752 and r35753.
by ekohl＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: ekohl Date: Fri Aug 29 15:43:12 2008 New Revision: 35767 URL: http://svn.reactos.org/svn/reactos?rev=35767&view=rev Log: - Add a reference counter to the service record. - Implement a common service record delete function. - RCloseServiceHandle: Remove a service if it has been marked for deletion and the reference counter reaches 0. - RControlService: Stop a service only if there are no dependent services running. Patch based on bug report #3669 by Michael Martin (aka bugboy) <martinmnet(a)hotmail.com> just like the patches r35748, r35750, r35752 and r35753. Modified: trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h 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] Fri Aug 29 15:43:12 2008 @@ -404,6 +404,12 @@ LPSC_RPC_HANDLE hSCObject) { PMANAGER_HANDLE hManager; + PSERVICE_HANDLE hService; + PSERVICE lpService; + HKEY hServicesKey; + DWORD dwError; + DWORD pcbBytesNeeded = 0; + DWORD dwServicesReturned = 0; DPRINT("RCloseServiceHandle() called\n"); @@ -413,6 +419,7 @@ return ERROR_INVALID_HANDLE; hManager = (PMANAGER_HANDLE)*hSCObject; + hService = (PSERVICE_HANDLE)*hSCObject; if (hManager->Handle.Tag == MANAGER_TAG) { DPRINT("Found manager handle\n"); @@ -420,24 +427,92 @@ hManager->Handle.RefCount--; if (hManager->Handle.RefCount == 0) { - /* FIXME: add cleanup code */ + /* FIXME: add handle cleanup code */ HeapFree(GetProcessHeap(), 0, hManager); + hManager = NULL; } DPRINT("RCloseServiceHandle() done\n"); return ERROR_SUCCESS; } - else if (hManager->Handle.Tag == SERVICE_TAG) + else if (hService->Handle.Tag == SERVICE_TAG) { DPRINT("Found service handle\n"); - hManager->Handle.RefCount--; - if (hManager->Handle.RefCount == 0) - { - /* FIXME: add cleanup code */ - - HeapFree(GetProcessHeap(), 0, hManager); + /* Get the pointer to the service record */ + lpService = hService->ServiceEntry; + + ASSERT(hService->Handle.RefCount > 0); + + hService->Handle.RefCount--; + if (hService->Handle.RefCount == 0) + { + /* FIXME: add handle cleanup code */ + + /* Free the handle */ + HeapFree(GetProcessHeap(), 0, hService); + hService = NULL; + } + + ASSERT(lpService->dwRefCount > 0); + + lpService->dwRefCount--; + DPRINT1("CloseServiceHandle - lpService->dwRefCount %u\n", + lpService->dwRefCount); + + if (lpService->dwRefCount == 0) + { + /* If this service has been marked for deletion */ + if (lpService->bDeleted) + { + /* Open the Services Reg key */ + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services", + 0, + KEY_SET_VALUE | KEY_READ, + &hServicesKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Failed to open services key\n"); + return dwError; + } + + /* Call the internal function with NULL, just to get bytes we need */ + Int_EnumDependentServicesW(hServicesKey, + lpService, + SERVICE_ACTIVE, + NULL, + &pcbBytesNeeded, + &dwServicesReturned); + + /* if pcbBytesNeeded returned a value then there are services running that are dependent on this service*/ + if (pcbBytesNeeded) + { + DPRINT1("Deletion failed due to running dependencies.\n", + lpService->lpServiceName); + RegCloseKey(hServicesKey); + return ERROR_SUCCESS; + } + + /* There are no references and no runnning dependencies, + it is now safe to delete the service */ + + /* Delete the Service Key */ + dwError = RegDeleteKey(hServicesKey, + lpService->lpServiceName); + + RegCloseKey(hServicesKey); + + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Failed to Delete the Service Registry key\n"); + return dwError; + } + + /* Delete the Service */ + ScmDeleteServiceRecord(lpService); + } } DPRINT("RCloseServiceHandle() done\n"); @@ -461,6 +536,9 @@ PSERVICE lpService; ACCESS_MASK DesiredAccess; DWORD dwError = ERROR_SUCCESS; + DWORD pcbBytesNeeded = 0; + DWORD dwServicesReturned = 0; + HKEY hServicesKey = NULL; DPRINT("RControlService() called\n"); @@ -472,6 +550,14 @@ if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG) { DPRINT1("Invalid handle tag!\n"); + return ERROR_INVALID_HANDLE; + } + + /* Check the service entry point */ + lpService = hSvc->ServiceEntry; + if (lpService == NULL) + { + DPRINT1("lpService == NULL!\n"); return ERROR_INVALID_HANDLE; } @@ -507,12 +593,40 @@ DesiredAccess)) return ERROR_ACCESS_DENIED; - /* Check the service entry point */ - lpService = hSvc->ServiceEntry; - if (lpService == NULL) - { - DPRINT1("lpService == NULL!\n"); - return ERROR_INVALID_HANDLE; + if (dwControl == SERVICE_CONTROL_STOP) + { + /* Check if the service has dependencies running as windows + doesn't stop a service that does */ + + /* Open the Services Reg key */ + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services", + 0, + KEY_READ, + &hServicesKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Failed to open services key\n"); + return dwError; + } + + /* Call the internal function with NULL, just to get bytes we need */ + Int_EnumDependentServicesW(hServicesKey, + lpService, + SERVICE_ACTIVE, + NULL, + &pcbBytesNeeded, + &dwServicesReturned); + + RegCloseKey(hServicesKey); + + /* If pcbBytesNeeded is not zero then there are services running that + are dependent on this service */ + if (pcbBytesNeeded != 0) + { + DPRINT("Service has running dependencies. Failed to stop service.\n"); + return ERROR_DEPENDENT_SERVICES_RUNNING; + } } if (lpService->Status.dwServiceType & SERVICE_DRIVER) @@ -529,6 +643,9 @@ dwControl, lpServiceStatus); } + + if ((dwError == ERROR_SUCCESS) && (pcbBytesNeeded)) + dwError = ERROR_DEPENDENT_SERVICES_RUNNING; /* Return service status information */ RtlCopyMemory(lpServiceStatus, @@ -1120,7 +1237,7 @@ (wcslen(lpLoadOrderGroup) + 1) * sizeof(WCHAR)); if (dwError != ERROR_SUCCESS) goto done; - /* FIXME: update lpService->lpServiceGroup */ + /* FIXME: Update lpService->lpServiceGroup */ } if (lpdwTagId != NULL) @@ -1836,6 +1953,9 @@ if (dwError != ERROR_SUCCESS) goto done; + lpService->dwRefCount = 1; + DPRINT1("CreateService - lpService->dwRefCount %u\n", lpService->dwRefCount); + done:; if (hServiceKey != NULL) RegCloseKey(hServiceKey); @@ -2308,6 +2428,9 @@ HeapFree(GetProcessHeap(), 0, hHandle); return dwError; } + + lpService->dwRefCount++; + DPRINT1("OpenService - lpService->dwRefCount %u\n",lpService->dwRefCount); *lpServiceHandle = (unsigned long)hHandle; /* FIXME: 64 bit portability */ DPRINT("*hService = %p\n", *lpServiceHandle); Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Fri Aug 29 15:43:12 2008 @@ -40,6 +40,7 @@ PSERVICE_IMAGE lpImage; BOOL bDeleted; DWORD dwResumeCount; + DWORD dwRefCount; CLIENT_HANDLE hClient; SERVICE_STATUS Status; @@ -109,6 +110,7 @@ PSERVICE ScmGetServiceEntryByClientHandle(ULONG ThreadId); DWORD ScmCreateNewServiceRecord(LPWSTR lpServiceName, PSERVICE *lpServiceRecord); +VOID ScmDeleteServiceRecord(PSERVICE lpService); DWORD ScmMarkServiceForDelete(PSERVICE pService); DWORD ScmControlService(PSERVICE Service,

1 0

[dreimer] 35766: OK, now it works with three parameters. Not nice, but hey... its Batch :-P
by dreimer＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: dreimer Date: Fri Aug 29 15:23:16 2008 New Revision: 35766 URL: http://svn.reactos.org/svn/reactos?rev=35766&view=rev Log: OK, now it works with three parameters. Not nice, but hey... its Batch :-P Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Fri Aug 29 15:23:16 2008 @@ -34,30 +34,78 @@ set _ROSBE_CMDS=yes set _ROSBE_GCC=yes set _ROSBE_TOOLS=yes -set _ROSBE_PARAM=no :: :: Update the Vars if the params say so. :: +if "%1" == "" ( + goto :next +) + if "%1" == "nocmds" ( set _ROSBE_CMDS=no - set _ROSBE_PARAM=yes + goto :p1 ) if "%1" == "nogcc" ( set _ROSBE_GCC=no - set _ROSBE_PARAM=yes + goto :p1 ) if "%1" == "notools" ( set _ROSBE_TOOLS=no - set _ROSBE_PARAM=yes -) -if not "%1" == "" ( - if %_ROSBE_PARAM% == no ( - cls - echo Unknown parameter specified. Exiting. - goto :EOU - ) -) + goto :p1 +) + +cls +echo Unknown first parameter specified. Exiting. +goto :EOU + +:p1 + +if "%2" == "" ( + goto :next +) + +if "%2" == "nocmds" ( + set _ROSBE_CMDS=no + goto :p2 +) +if "%2" == "nogcc" ( + set _ROSBE_GCC=no + goto :p2 +) +if "%2" == "notools" ( + set _ROSBE_TOOLS=no + goto :p2 +) + +cls +echo Unknown second parameter specified. Exiting. +goto :EOU + +:p2 + +if "%3" == "" ( + goto :next +) + +if "%3" == "nocmds" ( + set _ROSBE_CMDS=no + goto :next +) +if "%3" == "nogcc" ( + set _ROSBE_GCC=no + goto :next +) +if "%3" == "notools" ( + set _ROSBE_TOOLS=no + goto :next +) + +cls +echo Unknown third parameter specified. Exiting. +goto :EOU + +:next cd /d "%_ROSBE_BASEDIR%" @@ -220,7 +268,6 @@ set _ROSBE_CMDS= set _ROSBE_GCC= set _ROSBE_TOOLS= -set _ROSBE_PARAM= set _ROSBE_OPATH= set _ROSBE_UPDDATE= set _ROSBE_UPDDATE2=

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
86
Older →

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 August 2008