Ros-diffs November 2011

ros-diffs@reactos.org

16 participants
274 discussions

[tfaber] 54354: [USBDRV] - Get rid of some inline assembly

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Nov 12 00:07:42 2011 New Revision: 54354 URL: http://svn.reactos.org/svn/reactos?rev=54354&view=rev Log: [USBDRV] - Get rid of some inline assembly Modified: trunk/reactos/drivers/usb/nt4compat/usbdrv/usb.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdrv/usb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdrv/usb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdrv/usb.c [iso-8859-1] Sat Nov 12 00:07:42 2011 @@ -982,31 +982,17 @@ __inline BOOLEAN usb_query_clicks(PLARGE_INTEGER clicks) { - BOOLEAN ret_val; + BOOLEAN ret_val = FALSE; + int cpu_info[4]; //so we have to use intel's cpu??? - ret_val = FALSE; - -#ifdef _MSC_VER - __asm - { - push ebx; - push eax; - mov eax, 1; //read version - cpuid; - test edx, 0x10; //timer stamp - jz LBL_OUT; - // cpuid //serialization - rdtsc; - mov ebx, dword ptr[clicks]; - mov dword ptr[ebx], eax; - mov dword ptr[ebx + 4], edx; - mov dword ptr[ret_val], TRUE; -LBL_OUT: - pop eax; - pop ebx; - } -#else - ret_val = FALSE; + +#if defined(_M_IX86) || defined(_M_AMD64) + __cpuid(cpu_info, 1); + if (cpu_info[3] & 0x10) // Time Stamp Counter (TSC) bit + { + clicks->QuadPart = __rdtsc(); + ret_val = TRUE; + } #endif return ret_val; }

13 years, 1 month

[tfaber] 54353: [KMTESTS] - Fix AMD64 build

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Nov 11 23:04:26 2011 New Revision: 54353 URL: http://svn.reactos.org/svn/reactos?rev=54353&view=rev Log: [KMTESTS] - Fix AMD64 build Modified: trunk/rostests/kmtests/ntos_ex/ExFastMutex.c trunk/rostests/kmtests/ntos_ke/KeIrql.c trunk/rostests/kmtests/ntos_ke/KeSpinLock.c trunk/rostests/kmtests/rtl/RtlMemory.c Modified: trunk/rostests/kmtests/ntos_ex/ExFastMutex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ex/ExFastMut… ============================================================================== --- trunk/rostests/kmtests/ntos_ex/ExFastMutex.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ex/ExFastMutex.c [iso-8859-1] Fri Nov 11 23:04:26 2011 @@ -44,6 +44,7 @@ ExReleaseFastMutex(Mutex); CheckMutex(Mutex, 1L, NULL, 0LU, OriginalIrql, OriginalIrql); +#ifdef _M_X86 /* ntoskrnl's fastcall version */ ExiAcquireFastMutex(Mutex); CheckMutex(Mutex, 0L, Thread, 0LU, OriginalIrql, APC_LEVEL); @@ -51,6 +52,7 @@ CheckMutex(Mutex, 0L, Thread, 0LU, OriginalIrql, APC_LEVEL); ExiReleaseFastMutex(Mutex); CheckMutex(Mutex, 1L, NULL, 0LU, OriginalIrql, OriginalIrql); +#endif /* try to acquire */ ok_bool_true(ExTryToAcquireFastMutex(Mutex), "ExTryToAcquireFastMutex returned"); Modified: trunk/rostests/kmtests/ntos_ke/KeIrql.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeIrql.c?… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeIrql.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ke/KeIrql.c [iso-8859-1] Fri Nov 11 23:04:26 2011 @@ -5,9 +5,10 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ +#ifndef _M_AMD64 __declspec(dllimport) void __stdcall KeRaiseIrql(unsigned char, unsigned char *); __declspec(dllimport) void __stdcall KeLowerIrql(unsigned char); -#ifdef _M_AMD64 +#else #define CLOCK1_LEVEL CLOCK_LEVEL #define CLOCK2_LEVEL CLOCK_LEVEL #endif @@ -137,6 +138,7 @@ KeLowerIrql(PASSIVE_LEVEL); } +#ifndef _M_AMD64 /* try the actual exports, not only the fastcall versions */ ok_irql(PASSIVE_LEVEL); (KeRaiseIrql)(HIGH_LEVEL, &Irql); @@ -144,6 +146,7 @@ ok_eq_uint(Irql, PASSIVE_LEVEL); (KeLowerIrql)(Irql); ok_irql(PASSIVE_LEVEL); +#endif /* make sure we exit gracefully */ ok_irql(PASSIVE_LEVEL); Modified: trunk/rostests/kmtests/ntos_ke/KeSpinLock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeSpinLoc… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeSpinLock.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ke/KeSpinLock.c [iso-8859-1] Fri Nov 11 23:04:26 2011 @@ -122,8 +122,13 @@ DEFINE_ACQUIRE(AcquireInStackForDpc, FALSE, KeAcquireInStackQueuedSpinLockForDpc(SpinLock, &CheckData->QueueHandle)) DEFINE_RELEASE(ReleaseInStackForDpc, FALSE, KeReleaseInStackQueuedSpinLockForDpc(&CheckData->QueueHandle)) +#ifdef _X86_ DEFINE_ACQUIRE(AcquireInt, FALSE, KiAcquireSpinLock(SpinLock)) DEFINE_RELEASE(ReleaseInt, FALSE, KiReleaseSpinLock(SpinLock)) +#else +DEFINE_ACQUIRE(AcquireInt, TRUE, KeAcquireSpinLock(SpinLock, &CheckData->Irql)) +DEFINE_RELEASE(ReleaseInt, TRUE, KeReleaseSpinLock(SpinLock, CheckData->Irql)) +#endif BOOLEAN TryQueued(PKSPIN_LOCK SpinLock, PCHECK_DATA CheckData) { LOGICAL Ret = KeTryToAcquireQueuedSpinLock(CheckData->QueueNumber, &CheckData->Irql); Modified: trunk/rostests/kmtests/rtl/RtlMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlMemory.c?r… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlMemory.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/rtl/RtlMemory.c [iso-8859-1] Fri Nov 11 23:04:26 2011 @@ -440,6 +440,8 @@ ok_eq_hex(Status, STATUS_SUCCESS); KeRaiseIrql(HIGH_LEVEL, &Irql); + /* TODO: fix NDK. This should work! */ +#if !defined _M_AMD64 || defined KMT_KERNEL_MODE /* RtlFillMemoryUlong */ MakeBuffer(Buffer, Size, 0, 0); RtlFillMemoryUlong(Buffer, HalfSize, 0x01234567LU); @@ -459,6 +461,7 @@ } _SEH2_END; ok_eq_hex(Status, STATUS_SUCCESS); KeRaiseIrql(HIGH_LEVEL, &Irql); +#endif /* RtlFillMemoryUlonglong */ /* TODO: this function doesn't exist in 2k3/x86? wdm.h error? */

13 years, 1 month

[cgutman] 54352: [PNP] - Kill some debug spam

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Nov 11 20:41:10 2011 New Revision: 54352 URL: http://svn.reactos.org/svn/reactos?rev=54352&view=rev Log: [PNP] - Kill some debug spam Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Fri Nov 11 20:41:10 2011 @@ -3141,7 +3141,7 @@ DWORD len; DWORD DeviceIdLength; - DPRINT1("Device enumerated: %S\n", PnpEvent->TargetDevice.DeviceIds); + DPRINT("Device enumerated: %S\n", PnpEvent->TargetDevice.DeviceIds); DeviceIdLength = lstrlenW(PnpEvent->TargetDevice.DeviceIds); if (DeviceIdLength) @@ -3163,7 +3163,7 @@ } else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL, &RpcStatus)) { - DPRINT1("Device arrival: %S\n", PnpEvent->TargetDevice.DeviceIds); + DPRINT("Device arrival: %S\n", PnpEvent->TargetDevice.DeviceIds); /* FIXME: ? */ } else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_EJECT_VETOED, &RpcStatus)) 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 Nov 11 20:41:10 2011 @@ -2115,7 +2115,7 @@ /* Device has a ClassGUID value, but no Service value. * Suppose it is using the NULL driver, so state the * device is started */ - DPRINT1("%wZ is using NULL driver\n", &DeviceNode->InstancePath); + DPRINT("%wZ is using NULL driver\n", &DeviceNode->InstancePath); IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); } else

13 years, 1 month

[jimtabor] 54351: [Shell32] - Fix edit control window procedure, see Bug 4856.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Nov 11 13:04:37 2011 New Revision: 54351 URL: http://svn.reactos.org/svn/reactos?rev=54351&view=rev Log: [Shell32] - Fix edit control window procedure, see Bug 4856. Modified: trunk/reactos/dll/win32/shell32/autocomplete.cpp Modified: trunk/reactos/dll/win32/shell32/autocomplete.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/autocomp… ============================================================================== --- trunk/reactos/dll/win32/shell32/autocomplete.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/autocomplete.cpp [iso-8859-1] Fri Nov 11 13:04:37 2011 @@ -39,6 +39,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +static const WCHAR autocomplete_propertyW[] = {'W','i','n','e',' ','A','u','t','o', + 'c','o','m','p','l','e','t','e',' ', + 'c','o','n','t','r','o','l',0}; + /************************************************************************** * IAutoComplete_Constructor */ @@ -63,6 +67,8 @@ TRACE(" destroying IAutoComplete(%p)\n", this); HeapFree(GetProcessHeap(), 0, quickComplete); HeapFree(GetProcessHeap(), 0, txtbackup); + RemovePropW(hwndEdit, autocomplete_propertyW); + SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (LONG_PTR)wpOrigEditProc); if (hwndListBox) DestroyWindow(hwndListBox); } @@ -125,7 +131,8 @@ this->hwndEdit = hwndEdit; this->initialized = TRUE; wpOrigEditProc = (WNDPROC)SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); - SetWindowLongPtrW(hwndEdit, GWLP_USERDATA, (LONG_PTR)this); +// SetWindowLongPtrW(hwndEdit, GWLP_USERDATA, (LONG_PTR)this); + SetPropW( hwndEdit, autocomplete_propertyW, (HANDLE)this ); if (options & ACO_AUTOSUGGEST) { @@ -249,7 +256,7 @@ */ LRESULT APIENTRY CAutoComplete::ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - CAutoComplete *pThis = (CAutoComplete *)GetWindowLongPtrW(hwnd, GWLP_USERDATA); + CAutoComplete *pThis = (CAutoComplete *)GetPropW(hwnd, autocomplete_propertyW);;//GetWindowLongPtrW(hwnd, GWLP_USERDATA); LPOLESTR strs; HRESULT hr; WCHAR hwndText[255];

13 years, 1 month

[pschweitzer] 54350: [KERNEL32] No need to init string to empty This will make Coverity happier

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Nov 11 12:22:05 2011 New Revision: 54350 URL: http://svn.reactos.org/svn/reactos?rev=54350&view=rev Log: [KERNEL32] No need to init string to empty This will make Coverity happier Modified: trunk/reactos/dll/win32/kernel32/client/file/console.c Modified: trunk/reactos/dll/win32/kernel32/client/file/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/console.c [iso-8859-1] Fri Nov 11 12:22:05 2011 @@ -31,7 +31,7 @@ ULONG NrAllocatedHandlers; #define INPUTEXENAME_BUFLEN 256 -static WCHAR InputExeName[INPUTEXENAME_BUFLEN] = L""; +static WCHAR InputExeName[INPUTEXENAME_BUFLEN]; /* Default Console Control Handler *******************************************/

13 years, 1 month

[fireball] 54349: [RTL] - A bit more of the DPH code cleanup, no bugs found so far.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Nov 11 11:55:49 2011 New Revision: 54349 URL: http://svn.reactos.org/svn/reactos?rev=54349&view=rev Log: [RTL] - A bit more of the DPH code cleanup, no bugs found so far. Modified: trunk/reactos/lib/rtl/heappage.c Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=543… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Fri Nov 11 11:55:49 2011 @@ -909,14 +909,13 @@ ULONG Protection; PVOID Base; - // FIXME: Check this, when we should add up usersize and when we shouldn't! - if (!(DphRoot->ExtraFlags & DPH_EXTRA_CHECK_UNDERRUN)) + if (DphRoot->ExtraFlags & DPH_EXTRA_CHECK_UNDERRUN) + { + Base = VirtualBlock + PAGE_SIZE; + } + else { Base = VirtualBlock; - } - else - { - Base = VirtualBlock + PAGE_SIZE; } // FIXME: It should be different, but for now it's fine @@ -928,6 +927,8 @@ NTSTATUS NTAPI RtlpDphSetProtectionAfterUse(PDPH_HEAP_ROOT DphRoot, /*PUCHAR VirtualBlock*/PDPH_HEAP_BLOCK Node) { + ASSERT((Node->nVirtualAccessSize + PAGE_SIZE) <= Node->nVirtualBlockSize); + // FIXME: Bring stuff here if (DphRoot->ExtraFlags & DPH_EXTRA_CHECK_UNDERRUN) { @@ -1679,7 +1680,6 @@ if (!DphRoot) return NULL; /* Acquire the heap lock */ - //RtlpDphEnterCriticalSection(DphRoot, Flags); RtlpDphPreProcessing(DphRoot, Flags); /* Perform internal validation if specified by flags */ @@ -1881,7 +1881,7 @@ } /* Set new protection */ - RtlpDphSetProtectionAfterUse(DphRoot, Node); + //RtlpDphSetProtectionAfterUse(DphRoot, Node); /* Remove it from the list of busy nodes */ RtlpDphRemoveFromBusyList(DphRoot, Node);

13 years, 1 month

[tfaber] 54348: [SERVICES] - Allow changing the image path with ChangeServiceConfig. Fixes timeout that shouldn't actually be a timeout in advapi32:service test. See issue #6646 for more details.

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Nov 10 22:56:22 2011 New Revision: 54348 URL: http://svn.reactos.org/svn/reactos?rev=54348&view=rev Log: [SERVICES] - Allow changing the image path with ChangeServiceConfig. Fixes timeout that shouldn't actually be a timeout in advapi32:service test. See issue #6646 for more details. 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] Thu Nov 10 22:56:22 2011 @@ -1730,6 +1730,7 @@ PSERVICE lpService = NULL; HKEY hServiceKey = NULL; LPWSTR lpDisplayNameW = NULL; + LPWSTR lpImagePathW = NULL; DPRINT("RChangeServiceConfigW() called\n"); DPRINT("dwServiceType = %lu\n", dwServiceType); @@ -1852,39 +1853,34 @@ lpService->dwErrorControl = dwErrorControl; } -#if 0 - /* FIXME: set the new ImagePath value */ - - /* Set the image path */ - if (dwServiceType & SERVICE_WIN32) - { - if (lpBinaryPathName != NULL && *lpBinaryPathName != 0) - { - dwError = RegSetValueExW(hServiceKey, - L"ImagePath", - 0, - REG_EXPAND_SZ, - (LPBYTE)lpBinaryPathName, - (wcslen(lpBinaryPathName) + 1) * sizeof(WCHAR)); + if (lpBinaryPathName != NULL && *lpBinaryPathName != 0) + { + /* Set the image path */ + lpImagePathW = lpBinaryPathName; + + if (lpService->Status.dwServiceType & SERVICE_DRIVER) + { + dwError = ScmCanonDriverImagePath(lpService->dwStartType, + lpBinaryPathName, + &lpImagePathW); + if (dwError != ERROR_SUCCESS) goto done; } - } - else if (dwServiceType & SERVICE_DRIVER) - { - if (lpImagePath != NULL && *lpImagePath != 0) - { - dwError = RegSetValueExW(hServiceKey, - L"ImagePath", - 0, - REG_EXPAND_SZ, - (LPBYTE)lpImagePath, - (wcslen(lpImagePath) + 1) *sizeof(WCHAR)); - if (dwError != ERROR_SUCCESS) - goto done; - } - } -#endif + + dwError = RegSetValueExW(hServiceKey, + L"ImagePath", + 0, + REG_EXPAND_SZ, + (LPBYTE)lpImagePathW, + (wcslen(lpImagePathW) + 1) * sizeof(WCHAR)); + + if (lpImagePathW != lpBinaryPathName) + HeapFree(GetProcessHeap(), 0, lpImagePathW); + + if (dwError != ERROR_SUCCESS) + goto done; + } /* Set the group name */ if (lpLoadOrderGroup != NULL && *lpLoadOrderGroup != 0) @@ -3258,7 +3254,8 @@ PSERVICE lpService = NULL; HKEY hServiceKey = NULL; LPWSTR lpDisplayNameW = NULL; - // LPWSTR lpBinaryPathNameW = NULL; + LPWSTR lpBinaryPathNameW = NULL; + LPWSTR lpCanonicalImagePathW = NULL; LPWSTR lpLoadOrderGroupW = NULL; LPWSTR lpDependenciesW = NULL; // LPWSTR lpPasswordW = NULL; @@ -3392,41 +3389,51 @@ lpService->dwErrorControl = dwErrorControl; } -#if 0 - /* FIXME: set the new ImagePath value */ - - /* Set the image path */ - if (dwServiceType & SERVICE_WIN32) - { - if (lpBinaryPathName != NULL && *lpBinaryPathName != 0) - { - lpBinaryPathNameW=HeapAlloc(GetProcessHeap(),0, (strlen(lpBinaryPathName)+1) * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, lpBinaryPathName, -1, lpBinaryPathNameW, strlen(lpBinaryPathName)+1); - dwError = RegSetValueExW(hServiceKey, - L"ImagePath", - 0, - REG_EXPAND_SZ, - (LPBYTE)lpBinaryPathNameW, - (wcslen(lpBinaryPathNameW) + 1) * sizeof(WCHAR)); + if (lpBinaryPathName != NULL && *lpBinaryPathName != 0) + { + /* Set the image path */ + lpBinaryPathNameW = HeapAlloc(GetProcessHeap(), + 0, + (strlen(lpBinaryPathName) + 1) * sizeof(WCHAR)); + if (lpBinaryPathNameW == NULL) + { + dwError = ERROR_NOT_ENOUGH_MEMORY; + goto done; + } + + MultiByteToWideChar(CP_ACP, + 0, + lpBinaryPathName, + -1, + lpBinaryPathNameW, + strlen(lpBinaryPathName) + 1); + + if (lpService->Status.dwServiceType & SERVICE_DRIVER) + { + dwError = ScmCanonDriverImagePath(lpService->dwStartType, + lpBinaryPathNameW, + &lpCanonicalImagePathW); + + HeapFree(GetProcessHeap(), 0, lpBinaryPathNameW); + if (dwError != ERROR_SUCCESS) goto done; - } - } - else if (dwServiceType & SERVICE_DRIVER) - { - if (lpImagePath != NULL && *lpImagePath != 0) - { - dwError = RegSetValueExW(hServiceKey, - L"ImagePath", - 0, - REG_EXPAND_SZ, - (LPBYTE)lpImagePath, - (wcslen(lpImagePath) + 1) *sizeof(WCHAR)); - if (dwError != ERROR_SUCCESS) - goto done; - } - } -#endif + + lpBinaryPathNameW = lpCanonicalImagePathW; + } + + dwError = RegSetValueExW(hServiceKey, + L"ImagePath", + 0, + REG_EXPAND_SZ, + (LPBYTE)lpBinaryPathNameW, + (wcslen(lpBinaryPathNameW) + 1) * sizeof(WCHAR)); + + HeapFree(GetProcessHeap(), 0, lpBinaryPathNameW); + + if (dwError != ERROR_SUCCESS) + goto done; + } /* Set the group name */ if (lpLoadOrderGroup != NULL && *lpLoadOrderGroup != 0)

13 years, 1 month

[cgutman] 54347: [BOOTDATA] - Disable usbdrv - I've heard too many reports of it breaking boot and too few reports of it actually working on real hardware (although it does work perfectly in QEMU)

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Nov 10 22:42:16 2011 New Revision: 54347 URL: http://svn.reactos.org/svn/reactos?rev=54347&view=rev Log: [BOOTDATA] - Disable usbdrv - I've heard too many reports of it breaking boot and too few reports of it actually working on real hardware (although it does work perfectly in QEMU) Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Thu Nov 10 22:42:16 2011 @@ -1743,7 +1743,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Group",0x00000000,"Base" HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ImagePath",0x00020000,"system32\drivers\usbdrv.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Type",0x00010001,0x00000001 ; USB storage driver Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Thu Nov 10 22:42:16 2011 @@ -32,7 +32,7 @@ disk.sys=,,,,,,x,,,,,,4 floppy.sys=,,,,,,x,,,,,,4 i8042prt.sys=,,,,,,x,,,,,,4 -usbdrv.sys=,,,,,,x,,,,,,4 +usbdrv.sys=,,,,,,,,,,,,4 kbdclass.sys=,,,,,,x,,,,,,4 l_intl.nls=,,,,,,,,,,,,2 ntfs.sys=,,,,,,,,,,,,4

13 years, 1 month

[tfaber] 54346: [ADVAPI32_WINETEST] - Skip service start timeout tests. They cannot time out until services uses asynchronous I/O. See issue #6646 for more details.

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Nov 10 22:34:31 2011 New Revision: 54346 URL: http://svn.reactos.org/svn/reactos?rev=54346&view=rev Log: [ADVAPI32_WINETEST] - Skip service start timeout tests. They cannot time out until services uses asynchronous I/O. See issue #6646 for more details. Modified: trunk/rostests/winetests/advapi32/service.c Modified: trunk/rostests/winetests/advapi32/service.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/servic… ============================================================================== --- trunk/rostests/winetests/advapi32/service.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/service.c [iso-8859-1] Thu Nov 10 22:34:31 2011 @@ -2169,6 +2169,12 @@ goto cleanup; } + if (!winetest_interactive) + { + skip("reactos bug 6646: Skipping service start timeout tests!\n"); + goto cleanup; + } + /* Again with a process that exits right away */ displayname = "Winetest Exit Service"; ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, cmd, NULL, NULL, NULL, NULL, NULL, displayname);

13 years, 1 month

[tfaber] 54345: [SERVICES] - Move utility functions to the top

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Nov 10 22:21:11 2011 New Revision: 54345 URL: http://svn.reactos.org/svn/reactos?rev=54345&view=rev Log: [SERVICES] - Move utility functions to the top 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] Thu Nov 10 22:21:11 2011 @@ -387,1172 +387,6 @@ DPRINT1("Failed to assign new tag to service %S, error=%lu\n", lpService->lpServiceName, dwError); } - - return dwError; -} - - -/* Internal recursive function */ -/* Need to search for every dependency on every service */ -static DWORD -Int_EnumDependentServicesW(HKEY hServicesKey, - PSERVICE lpService, - DWORD dwServiceState, - PSERVICE *lpServices, - LPDWORD pcbBytesNeeded, - LPDWORD lpServicesReturned) -{ - DWORD dwError = ERROR_SUCCESS; - WCHAR szNameBuf[MAX_PATH]; - WCHAR szValueBuf[MAX_PATH]; - WCHAR *lpszNameBuf = szNameBuf; - WCHAR *lpszValueBuf = szValueBuf; - DWORD dwSize; - DWORD dwNumSubKeys; - DWORD dwIteration; - PSERVICE lpCurrentService; - HKEY hServiceEnumKey; - DWORD dwCurrentServiceState = SERVICE_ACTIVE; - DWORD dwDependServiceStrPtr = 0; - DWORD dwRequiredSize = 0; - - /* Get the number of service keys */ - dwError = RegQueryInfoKeyW(hServicesKey, - NULL, - NULL, - NULL, - &dwNumSubKeys, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL); - if (dwError != ERROR_SUCCESS) - { - DPRINT("ERROR! Unable to get number of services keys.\n"); - return dwError; - } - - /* Iterate the service keys to see if another service depends on the this service */ - for (dwIteration = 0; dwIteration < dwNumSubKeys; dwIteration++) - { - dwSize = MAX_PATH; - dwError = RegEnumKeyExW(hServicesKey, - dwIteration, - lpszNameBuf, - &dwSize, - NULL, - NULL, - NULL, - NULL); - if (dwError != ERROR_SUCCESS) - return dwError; - - /* Open the Service key */ - dwError = RegOpenKeyExW(hServicesKey, - lpszNameBuf, - 0, - KEY_READ, - &hServiceEnumKey); - if (dwError != ERROR_SUCCESS) - return dwError; - - dwSize = MAX_PATH; - - /* Check for the DependOnService Value */ - dwError = RegQueryValueExW(hServiceEnumKey, - L"DependOnService", - NULL, - NULL, - (LPBYTE)lpszValueBuf, - &dwSize); - - /* FIXME: Handle load order. */ - - /* If the service found has a DependOnService value */ - if (dwError == ERROR_SUCCESS) - { - dwDependServiceStrPtr = 0; - - /* Can be more than one Dependencies in the DependOnService string */ - while (wcslen(lpszValueBuf + dwDependServiceStrPtr) > 0) - { - if (_wcsicmp(lpszValueBuf + dwDependServiceStrPtr, lpService->lpServiceName) == 0) - { - /* Get the current enumed service pointer */ - lpCurrentService = ScmGetServiceEntryByName(lpszNameBuf); - - /* Check for valid Service */ - if (!lpCurrentService) - { - /* This should never happen! */ - DPRINT("This should not happen at this point, report to Developer\n"); - return ERROR_NOT_FOUND; - } - - /* Determine state the service is in */ - if (lpCurrentService->Status.dwCurrentState == SERVICE_STOPPED) - dwCurrentServiceState = SERVICE_INACTIVE; - - /* If the ServiceState matches that requested or searching for SERVICE_STATE_ALL */ - if ((dwCurrentServiceState == dwServiceState) || - (dwServiceState == SERVICE_STATE_ALL)) - { - /* Calculate the required size */ - dwRequiredSize += sizeof(SERVICE_STATUS); - dwRequiredSize += ((wcslen(lpCurrentService->lpServiceName) + 1) * sizeof(WCHAR)); - dwRequiredSize += ((wcslen(lpCurrentService->lpDisplayName) + 1) * sizeof(WCHAR)); - - /* Add the size for service name and display name pointers */ - dwRequiredSize += (2 * sizeof(PVOID)); - - /* increase the BytesNeeded size */ - *pcbBytesNeeded = *pcbBytesNeeded + dwRequiredSize; - - /* Don't fill callers buffer yet, as MSDN read that the last service with dependency - comes first */ - - /* Recursive call to check for its dependencies */ - Int_EnumDependentServicesW(hServicesKey, - lpCurrentService, - dwServiceState, - lpServices, - pcbBytesNeeded, - lpServicesReturned); - - /* If the lpServices is valid set the service pointer */ - if (lpServices) - lpServices[*lpServicesReturned] = lpCurrentService; - - *lpServicesReturned = *lpServicesReturned + 1; - } - } - - dwDependServiceStrPtr += (wcslen(lpszValueBuf + dwDependServiceStrPtr) + 1); - } - } - else if (*pcbBytesNeeded) - { - dwError = ERROR_SUCCESS; - } - - RegCloseKey(hServiceEnumKey); - } - - return dwError; -} - - -/* Function 0 */ -DWORD RCloseServiceHandle( - 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"); - - DPRINT("hSCObject = %p\n", *hSCObject); - - if (*hSCObject == 0) - return ERROR_INVALID_HANDLE; - - hManager = ScmGetServiceManagerFromHandle(*hSCObject); - hService = ScmGetServiceFromHandle(*hSCObject); - - if (hManager != NULL) - { - DPRINT("Found manager handle\n"); - - /* FIXME: add handle cleanup code */ - - HeapFree(GetProcessHeap(), 0, hManager); - hManager = NULL; - - *hSCObject = NULL; - - DPRINT("RCloseServiceHandle() done\n"); - return ERROR_SUCCESS; - } - else if (hService != NULL) - { - DPRINT("Found service handle\n"); - - /* Lock the service database exlusively */ - ScmLockDatabaseExclusive(); - - /* Get the pointer to the service record */ - lpService = hService->ServiceEntry; - - /* FIXME: add handle cleanup code */ - - /* Free the handle */ - HeapFree(GetProcessHeap(), 0, hService); - hService = NULL; - - ASSERT(lpService->dwRefCount > 0); - - lpService->dwRefCount--; - DPRINT("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) - { - DPRINT("Failed to open services key\n"); - ScmUnlockDatabase(); - 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) - { - DPRINT("Deletion failed due to running dependencies.\n"); - RegCloseKey(hServicesKey); - ScmUnlockDatabase(); - return ERROR_SUCCESS; - } - - /* There are no references and no runnning dependencies, - it is now safe to delete the service */ - - /* Delete the Service Key */ - dwError = RegDeleteKeyW(hServicesKey, - lpService->lpServiceName); - - RegCloseKey(hServicesKey); - - if (dwError != ERROR_SUCCESS) - { - DPRINT("Failed to Delete the Service Registry key\n"); - ScmUnlockDatabase(); - return dwError; - } - - /* Delete the Service */ - ScmDeleteServiceRecord(lpService); - } - } - - ScmUnlockDatabase(); - - *hSCObject = NULL; - - DPRINT("RCloseServiceHandle() done\n"); - return ERROR_SUCCESS; - } - - DPRINT("Invalid handle tag (Tag %lx)\n", hManager->Handle.Tag); - - return ERROR_INVALID_HANDLE; -} - - -/* Function 1 */ -DWORD RControlService( - SC_RPC_HANDLE hService, - DWORD dwControl, - LPSERVICE_STATUS lpServiceStatus) -{ - PSERVICE_HANDLE hSvc; - PSERVICE lpService; - ACCESS_MASK DesiredAccess; - DWORD dwError = ERROR_SUCCESS; - DWORD pcbBytesNeeded = 0; - DWORD dwServicesReturned = 0; - DWORD dwControlsAccepted; - DWORD dwCurrentState; - HKEY hServicesKey = NULL; - - DPRINT("RControlService() called\n"); - - if (ScmShutdown) - return ERROR_SHUTDOWN_IN_PROGRESS; - - /* Check the service handle */ - hSvc = ScmGetServiceFromHandle(hService); - if (hSvc == NULL) - { - DPRINT1("Invalid service handle!\n"); - return ERROR_INVALID_HANDLE; - } - - - /* Check the service entry point */ - lpService = hSvc->ServiceEntry; - if (lpService == NULL) - { - DPRINT1("lpService == NULL!\n"); - return ERROR_INVALID_HANDLE; - } - - /* Check access rights */ - switch (dwControl) - { - case SERVICE_CONTROL_STOP: - DesiredAccess = SERVICE_STOP; - break; - - case SERVICE_CONTROL_PAUSE: - case SERVICE_CONTROL_CONTINUE: - DesiredAccess = SERVICE_PAUSE_CONTINUE; - break; - - case SERVICE_INTERROGATE: - DesiredAccess = SERVICE_INTERROGATE; - break; - - default: - if (dwControl >= 128 && dwControl <= 255) - DesiredAccess = SERVICE_USER_DEFINED_CONTROL; - else - return ERROR_INVALID_PARAMETER; - break; - } - - if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, - DesiredAccess)) - return ERROR_ACCESS_DENIED; - - 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) - { - DPRINT("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) - { - /* Send control code to the driver */ - dwError = ScmControlDriver(lpService, - dwControl, - lpServiceStatus); - } - else - { - dwControlsAccepted = lpService->Status.dwControlsAccepted; - 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: - 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); - - /* Return service status information */ - RtlCopyMemory(lpServiceStatus, - &lpService->Status, - sizeof(SERVICE_STATUS)); - } - - if ((dwError == ERROR_SUCCESS) && (pcbBytesNeeded)) - dwError = ERROR_DEPENDENT_SERVICES_RUNNING; - - return dwError; -} - - -/* Function 2 */ -DWORD RDeleteService( - SC_RPC_HANDLE hService) -{ - PSERVICE_HANDLE hSvc; - PSERVICE lpService; - DWORD dwError; - - DPRINT("RDeleteService() called\n"); - - if (ScmShutdown) - return ERROR_SHUTDOWN_IN_PROGRESS; - - hSvc = ScmGetServiceFromHandle(hService); - if (hSvc == NULL) - { - DPRINT1("Invalid service handle!\n"); - return ERROR_INVALID_HANDLE; - } - - if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, - DELETE)) - return ERROR_ACCESS_DENIED; - - lpService = hSvc->ServiceEntry; - if (lpService == NULL) - { - DPRINT("lpService == NULL!\n"); - return ERROR_INVALID_HANDLE; - } - - /* Lock the service database exclusively */ - ScmLockDatabaseExclusive(); - - if (lpService->bDeleted) - { - DPRINT("The service has already been marked for delete!\n"); - dwError = ERROR_SERVICE_MARKED_FOR_DELETE; - goto Done; - } - - /* Mark service for delete */ - lpService->bDeleted = TRUE; - - dwError = ScmMarkServiceForDelete(lpService); - -Done:; - /* Unlock the service database */ - ScmUnlockDatabase(); - - DPRINT("RDeleteService() done\n"); - - return dwError; -} - - -/* Function 3 */ -DWORD RLockServiceDatabase( - SC_RPC_HANDLE hSCManager, - LPSC_RPC_LOCK lpLock) -{ - PMANAGER_HANDLE hMgr; - - DPRINT("RLockServiceDatabase() called\n"); - - *lpLock = 0; - - hMgr = ScmGetServiceManagerFromHandle(hSCManager); - if (hMgr == NULL) - { - DPRINT1("Invalid service manager handle!\n"); - return ERROR_INVALID_HANDLE; - } - - if (!RtlAreAllAccessesGranted(hMgr->Handle.DesiredAccess, - SC_MANAGER_LOCK)) - return ERROR_ACCESS_DENIED; - -// return ScmLockDatabase(0, hMgr->0xC, hLock); - - /* FIXME: Lock the database */ - *lpLock = (SC_RPC_LOCK)0x12345678; /* Dummy! */ - - return ERROR_SUCCESS; -} - - -/* Function 4 */ -DWORD RQueryServiceObjectSecurity( - SC_RPC_HANDLE hService, - SECURITY_INFORMATION dwSecurityInformation, - LPBYTE lpSecurityDescriptor, - DWORD cbBufSize, - LPBOUNDED_DWORD_256K pcbBytesNeeded) -{ - PSERVICE_HANDLE hSvc; - PSERVICE lpService; - ULONG DesiredAccess = 0; - NTSTATUS Status; - DWORD dwBytesNeeded; - DWORD dwError; - - - SECURITY_DESCRIPTOR ObjectDescriptor; - - DPRINT("RQueryServiceObjectSecurity() called\n"); - - hSvc = ScmGetServiceFromHandle(hService); - if (hSvc == NULL) - { - DPRINT1("Invalid service handle!\n"); - return ERROR_INVALID_HANDLE; - } - - if (dwSecurityInformation & (DACL_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION | - OWNER_SECURITY_INFORMATION)) - DesiredAccess |= READ_CONTROL; - - if (dwSecurityInformation & SACL_SECURITY_INFORMATION) - DesiredAccess |= ACCESS_SYSTEM_SECURITY; - - if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, - DesiredAccess)) - { - DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); - return ERROR_ACCESS_DENIED; - } - - lpService = hSvc->ServiceEntry; - if (lpService == NULL) - { - DPRINT("lpService == NULL!\n"); - return ERROR_INVALID_HANDLE; - } - - /* Lock the service database */ - ScmLockDatabaseShared(); - - - /* hack */ - Status = RtlCreateSecurityDescriptor(&ObjectDescriptor, SECURITY_DESCRIPTOR_REVISION); - - Status = RtlQuerySecurityObject(&ObjectDescriptor /* lpService->lpSecurityDescriptor */, - dwSecurityInformation, - (PSECURITY_DESCRIPTOR)lpSecurityDescriptor, - cbBufSize, - &dwBytesNeeded); - - /* Unlock the service database */ - ScmUnlockDatabase(); - - if (NT_SUCCESS(Status)) - { - *pcbBytesNeeded = dwBytesNeeded; - dwError = STATUS_SUCCESS; - } - else if (Status == STATUS_BUFFER_TOO_SMALL) - { - *pcbBytesNeeded = dwBytesNeeded; - dwError = ERROR_INSUFFICIENT_BUFFER; - } - else if (Status == STATUS_BAD_DESCRIPTOR_FORMAT) - { - dwError = ERROR_GEN_FAILURE; - } - else - { - dwError = RtlNtStatusToDosError(Status); - } - - return dwError; -} - - -/* Function 5 */ -DWORD RSetServiceObjectSecurity( - SC_RPC_HANDLE hService, - DWORD dwSecurityInformation, - LPBYTE lpSecurityDescriptor, - DWORD dwSecuityDescriptorSize) -{ - PSERVICE_HANDLE hSvc; - PSERVICE lpService; - ULONG DesiredAccess = 0; - /* HANDLE hToken = NULL; */ - HKEY hServiceKey; - /* NTSTATUS Status; */ - DWORD dwError; - - DPRINT("RSetServiceObjectSecurity() called\n"); - - hSvc = ScmGetServiceFromHandle(hService); - if (hSvc == NULL) - { - DPRINT1("Invalid service handle!\n"); - return ERROR_INVALID_HANDLE; - } - - if (dwSecurityInformation == 0 || - dwSecurityInformation & ~(OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION - | DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION)) - return ERROR_INVALID_PARAMETER; - - if (!RtlValidSecurityDescriptor((PSECURITY_DESCRIPTOR)lpSecurityDescriptor)) - return ERROR_INVALID_PARAMETER; - - if (dwSecurityInformation & SACL_SECURITY_INFORMATION) - DesiredAccess |= ACCESS_SYSTEM_SECURITY; - - if (dwSecurityInformation & DACL_SECURITY_INFORMATION) - DesiredAccess |= WRITE_DAC; - - if (dwSecurityInformation & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION)) - DesiredAccess |= WRITE_OWNER; - - if ((dwSecurityInformation & OWNER_SECURITY_INFORMATION) && - (((PISECURITY_DESCRIPTOR)lpSecurityDescriptor)->Owner == NULL)) - return ERROR_INVALID_PARAMETER; - - if ((dwSecurityInformation & GROUP_SECURITY_INFORMATION) && - (((PISECURITY_DESCRIPTOR)lpSecurityDescriptor)->Group == NULL)) - return ERROR_INVALID_PARAMETER; - - if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, - DesiredAccess)) - { - DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); - return ERROR_ACCESS_DENIED; - } - - lpService = hSvc->ServiceEntry; - if (lpService == NULL) - { - DPRINT("lpService == NULL!\n"); - return ERROR_INVALID_HANDLE; - } - - if (lpService->bDeleted) - return ERROR_SERVICE_MARKED_FOR_DELETE; - -#if 0 - RpcImpersonateClient(NULL); - - Status = NtOpenThreadToken(NtCurrentThread(), - 8, - TRUE, - &hToken); - if (!NT_SUCCESS(Status)) - return RtlNtStatusToDosError(Status); - - RpcRevertToSelf(); -#endif - - /* Lock the service database exclusive */ - ScmLockDatabaseExclusive(); - -#if 0 - Status = RtlSetSecurityObject(dwSecurityInformation, - (PSECURITY_DESCRIPTOR)lpSecurityDescriptor, - &lpService->lpSecurityDescriptor, - &ScmServiceMapping, - hToken); - if (!NT_SUCCESS(Status)) - { - dwError = RtlNtStatusToDosError(Status); - goto Done; - } -#endif - - dwError = ScmOpenServiceKey(lpService->lpServiceName, - READ_CONTROL | KEY_CREATE_SUB_KEY | KEY_SET_VALUE, - &hServiceKey); - if (dwError != ERROR_SUCCESS) - goto Done; - - UNIMPLEMENTED; - dwError = ERROR_SUCCESS; -// dwError = ScmWriteSecurityDescriptor(hServiceKey, -// lpService->lpSecurityDescriptor); - - RegFlushKey(hServiceKey); - RegCloseKey(hServiceKey); - -Done: - -#if 0 - if (hToken != NULL) - NtClose(hToken); -#endif - - /* Unlock service database */ - ScmUnlockDatabase(); - - DPRINT("RSetServiceObjectSecurity() done (Error %lu)\n", dwError); - - return dwError; -} - - -/* Function 6 */ -DWORD RQueryServiceStatus( - SC_RPC_HANDLE hService, - LPSERVICE_STATUS lpServiceStatus) -{ - PSERVICE_HANDLE hSvc; - PSERVICE lpService; - - DPRINT("RQueryServiceStatus() called\n"); - - if (ScmShutdown) - return ERROR_SHUTDOWN_IN_PROGRESS; - - hSvc = ScmGetServiceFromHandle(hService); - if (hSvc == NULL) - { - DPRINT1("Invalid service handle!\n"); - return ERROR_INVALID_HANDLE; - } - - if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, - SERVICE_QUERY_STATUS)) - { - DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); - return ERROR_ACCESS_DENIED; - } - - lpService = hSvc->ServiceEntry; - if (lpService == NULL) - { - DPRINT("lpService == NULL!\n"); - return ERROR_INVALID_HANDLE; - } - - /* Lock the service database shared */ - ScmLockDatabaseShared(); - - /* Return service status information */ - RtlCopyMemory(lpServiceStatus, - &lpService->Status, - sizeof(SERVICE_STATUS)); - - /* Unlock the service database */ - ScmUnlockDatabase(); - - return ERROR_SUCCESS; -} - - -static BOOL -ScmIsValidServiceState(DWORD dwCurrentState) -{ - switch (dwCurrentState) - { - case SERVICE_STOPPED: - case SERVICE_START_PENDING: - case SERVICE_STOP_PENDING: - case SERVICE_RUNNING: - case SERVICE_CONTINUE_PENDING: - case SERVICE_PAUSE_PENDING: - case SERVICE_PAUSED: - return TRUE; - - default: - return FALSE; - } -} - - -/* Function 7 */ -DWORD RSetServiceStatus( - RPC_SERVICE_STATUS_HANDLE hServiceStatus, - LPSERVICE_STATUS lpServiceStatus) -{ - PSERVICE lpService; - - DPRINT("RSetServiceStatus() called\n"); - DPRINT("hServiceStatus = %p\n", hServiceStatus); - DPRINT("dwServiceType = %lu\n", lpServiceStatus->dwServiceType); - DPRINT("dwCurrentState = %lu\n", lpServiceStatus->dwCurrentState); - DPRINT("dwControlsAccepted = %lu\n", lpServiceStatus->dwControlsAccepted); - DPRINT("dwWin32ExitCode = %lu\n", lpServiceStatus->dwWin32ExitCode); - DPRINT("dwServiceSpecificExitCode = %lu\n", lpServiceStatus->dwServiceSpecificExitCode); - DPRINT("dwCheckPoint = %lu\n", lpServiceStatus->dwCheckPoint); - DPRINT("dwWaitHint = %lu\n", lpServiceStatus->dwWaitHint); - - if (hServiceStatus == 0) - { - DPRINT("hServiceStatus == NULL!\n"); - return ERROR_INVALID_HANDLE; - } - - lpService = (PSERVICE)hServiceStatus; - if (lpService == NULL) - { - DPRINT("lpService == NULL!\n"); - return ERROR_INVALID_HANDLE; - } - - /* Check current state */ - if (!ScmIsValidServiceState(lpServiceStatus->dwCurrentState)) - { - DPRINT("Invalid service state!\n"); - return ERROR_INVALID_DATA; - } - - /* Check service type */ - if (!(lpServiceStatus->dwServiceType & SERVICE_WIN32) && - (lpServiceStatus->dwServiceType & SERVICE_DRIVER)) - { - DPRINT("Invalid service type!\n"); - return ERROR_INVALID_DATA; - } - - /* Check accepted controls */ - if (lpServiceStatus->dwControlsAccepted & ~0xFF) - { - DPRINT("Invalid controls accepted!\n"); - return ERROR_INVALID_DATA; - } - - /* Lock the service database exclusively */ - ScmLockDatabaseExclusive(); - - RtlCopyMemory(&lpService->Status, - lpServiceStatus, - sizeof(SERVICE_STATUS)); - - /* Unlock the service database */ - ScmUnlockDatabase(); - - DPRINT("Set %S to %lu\n", lpService->lpDisplayName, lpService->Status.dwCurrentState); - DPRINT("RSetServiceStatus() done\n"); - - return ERROR_SUCCESS; -} - - -/* Function 8 */ -DWORD RUnlockServiceDatabase( - LPSC_RPC_LOCK Lock) -{ - UNIMPLEMENTED; - return ERROR_SUCCESS; -} - - -/* Function 9 */ -DWORD RNotifyBootConfigStatus( - SVCCTL_HANDLEW lpMachineName, - DWORD BootAcceptable) -{ - DPRINT1("RNotifyBootConfigStatus(%p %lu) called\n", lpMachineName, BootAcceptable); - return ERROR_SUCCESS; - -// UNIMPLEMENTED; -// return ERROR_CALL_NOT_IMPLEMENTED; -} - - -/* Function 10 */ -DWORD RI_ScSetServiceBitsW( - RPC_SERVICE_STATUS_HANDLE hServiceStatus, - DWORD dwServiceBits, - int bSetBitsOn, - int bUpdateImmediately, - wchar_t *lpString) -{ - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; -} - - -/* Function 11 */ -DWORD RChangeServiceConfigW( - SC_RPC_HANDLE hService, - DWORD dwServiceType, - DWORD dwStartType, - DWORD dwErrorControl, - LPWSTR lpBinaryPathName, - LPWSTR lpLoadOrderGroup, - LPDWORD lpdwTagId, - LPBYTE lpDependencies, - DWORD dwDependSize, - LPWSTR lpServiceStartName, - LPBYTE lpPassword, - DWORD dwPwSize, - LPWSTR lpDisplayName) -{ - DWORD dwError = ERROR_SUCCESS; - PSERVICE_HANDLE hSvc; - PSERVICE lpService = NULL; - HKEY hServiceKey = NULL; - LPWSTR lpDisplayNameW = NULL; - - DPRINT("RChangeServiceConfigW() called\n"); - DPRINT("dwServiceType = %lu\n", dwServiceType); - DPRINT("dwStartType = %lu\n", dwStartType); - DPRINT("dwErrorControl = %lu\n", dwErrorControl); - DPRINT("lpBinaryPathName = %S\n", lpBinaryPathName); - DPRINT("lpLoadOrderGroup = %S\n", lpLoadOrderGroup); - DPRINT("lpDisplayName = %S\n", lpDisplayName); - - if (ScmShutdown) - return ERROR_SHUTDOWN_IN_PROGRESS; - - hSvc = ScmGetServiceFromHandle(hService); - if (hSvc == NULL) - { - DPRINT1("Invalid service handle!\n"); - return ERROR_INVALID_HANDLE; - } - - if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, - SERVICE_CHANGE_CONFIG)) - { - DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); - return ERROR_ACCESS_DENIED; - } - - lpService = hSvc->ServiceEntry; - if (lpService == NULL) - { - DPRINT("lpService == NULL!\n"); - return ERROR_INVALID_HANDLE; - } - - /* Lock the service database exclusively */ - ScmLockDatabaseExclusive(); - - if (lpService->bDeleted) - { - DPRINT("The service has already been marked for delete!\n"); - dwError = ERROR_SERVICE_MARKED_FOR_DELETE; - goto done; - } - - /* Open the service key */ - dwError = ScmOpenServiceKey(lpService->szServiceName, - KEY_SET_VALUE, - &hServiceKey); - if (dwError != ERROR_SUCCESS) - goto done; - - /* Write service data to the registry */ - /* Set the display name */ - if (lpDisplayName != NULL && *lpDisplayName != 0) - { - RegSetValueExW(hServiceKey, - L"DisplayName", - 0, - REG_SZ, - (LPBYTE)lpDisplayName, - (wcslen(lpDisplayName) + 1) * sizeof(WCHAR)); - - /* Update the display name */ - lpDisplayNameW = HeapAlloc(GetProcessHeap(), - 0, - (wcslen(lpDisplayName) + 1) * sizeof(WCHAR)); - if (lpDisplayNameW == NULL) - { - dwError = ERROR_NOT_ENOUGH_MEMORY; - goto done; - } - - if (lpService->lpDisplayName != lpService->lpServiceName) - HeapFree(GetProcessHeap(), 0, lpService->lpDisplayName); - - lpService->lpDisplayName = lpDisplayNameW; - } - - if (dwServiceType != SERVICE_NO_CHANGE) - { - /* Set the service type */ - dwError = RegSetValueExW(hServiceKey, - L"Type", - 0, - REG_DWORD, - (LPBYTE)&dwServiceType, - sizeof(DWORD)); - if (dwError != ERROR_SUCCESS) - goto done; - - lpService->Status.dwServiceType = dwServiceType; - } - - if (dwStartType != SERVICE_NO_CHANGE) - { - /* Set the start value */ - dwError = RegSetValueExW(hServiceKey, - L"Start", - 0, - REG_DWORD, - (LPBYTE)&dwStartType, - sizeof(DWORD)); - if (dwError != ERROR_SUCCESS) - goto done; - - lpService->dwStartType = dwStartType; - } - - if (dwErrorControl != SERVICE_NO_CHANGE) - { - /* Set the error control value */ - dwError = RegSetValueExW(hServiceKey, - L"ErrorControl", - 0, - REG_DWORD, - (LPBYTE)&dwErrorControl, - sizeof(DWORD)); - if (dwError != ERROR_SUCCESS) - goto done; - - lpService->dwErrorControl = dwErrorControl; - } - -#if 0 - /* FIXME: set the new ImagePath value */ - - /* Set the image path */ - if (dwServiceType & SERVICE_WIN32) - { - if (lpBinaryPathName != NULL && *lpBinaryPathName != 0) - { - dwError = RegSetValueExW(hServiceKey, - L"ImagePath", - 0, - REG_EXPAND_SZ, - (LPBYTE)lpBinaryPathName, - (wcslen(lpBinaryPathName) + 1) * sizeof(WCHAR)); - if (dwError != ERROR_SUCCESS) - goto done; - } - } - else if (dwServiceType & SERVICE_DRIVER) - { - if (lpImagePath != NULL && *lpImagePath != 0) - { - dwError = RegSetValueExW(hServiceKey, - L"ImagePath", - 0, - REG_EXPAND_SZ, - (LPBYTE)lpImagePath, - (wcslen(lpImagePath) + 1) *sizeof(WCHAR)); - if (dwError != ERROR_SUCCESS) - goto done; - } - } -#endif - - /* Set the group name */ - if (lpLoadOrderGroup != NULL && *lpLoadOrderGroup != 0) - { - dwError = RegSetValueExW(hServiceKey, - L"Group", - 0, - REG_SZ, - (LPBYTE)lpLoadOrderGroup, - (wcslen(lpLoadOrderGroup) + 1) * sizeof(WCHAR)); - if (dwError != ERROR_SUCCESS) - goto done; - - dwError = ScmSetServiceGroup(lpService, - lpLoadOrderGroup); - if (dwError != ERROR_SUCCESS) - goto done; - } - - if (lpdwTagId != NULL) - { - dwError = ScmAssignNewTag(lpService); - if (dwError != ERROR_SUCCESS) - goto done; - - dwError = RegSetValueExW(hServiceKey, - L"Tag", - 0, - REG_DWORD, - (LPBYTE)&lpService->dwTag, - sizeof(DWORD)); - if (dwError != ERROR_SUCCESS) - goto done; - - *lpdwTagId = lpService->dwTag; - } - - /* Write dependencies */ - if (lpDependencies != NULL && *lpDependencies != 0) - { - dwError = ScmWriteDependencies(hServiceKey, - (LPWSTR)lpDependencies, - dwDependSize); - if (dwError != ERROR_SUCCESS) - goto done; - } - - if (lpPassword != NULL) - { - /* FIXME: Write password */ - } - -done: - if (hServiceKey != NULL) - RegCloseKey(hServiceKey); - - /* Unlock the service database */ - ScmUnlockDatabase(); - - DPRINT("RChangeServiceConfigW() done (Error %lu)\n", dwError); return dwError; } @@ -1950,6 +784,1172 @@ } +/* Internal recursive function */ +/* Need to search for every dependency on every service */ +static DWORD +Int_EnumDependentServicesW(HKEY hServicesKey, + PSERVICE lpService, + DWORD dwServiceState, + PSERVICE *lpServices, + LPDWORD pcbBytesNeeded, + LPDWORD lpServicesReturned) +{ + DWORD dwError = ERROR_SUCCESS; + WCHAR szNameBuf[MAX_PATH]; + WCHAR szValueBuf[MAX_PATH]; + WCHAR *lpszNameBuf = szNameBuf; + WCHAR *lpszValueBuf = szValueBuf; + DWORD dwSize; + DWORD dwNumSubKeys; + DWORD dwIteration; + PSERVICE lpCurrentService; + HKEY hServiceEnumKey; + DWORD dwCurrentServiceState = SERVICE_ACTIVE; + DWORD dwDependServiceStrPtr = 0; + DWORD dwRequiredSize = 0; + + /* Get the number of service keys */ + dwError = RegQueryInfoKeyW(hServicesKey, + NULL, + NULL, + NULL, + &dwNumSubKeys, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL); + if (dwError != ERROR_SUCCESS) + { + DPRINT("ERROR! Unable to get number of services keys.\n"); + return dwError; + } + + /* Iterate the service keys to see if another service depends on the this service */ + for (dwIteration = 0; dwIteration < dwNumSubKeys; dwIteration++) + { + dwSize = MAX_PATH; + dwError = RegEnumKeyExW(hServicesKey, + dwIteration, + lpszNameBuf, + &dwSize, + NULL, + NULL, + NULL, + NULL); + if (dwError != ERROR_SUCCESS) + return dwError; + + /* Open the Service key */ + dwError = RegOpenKeyExW(hServicesKey, + lpszNameBuf, + 0, + KEY_READ, + &hServiceEnumKey); + if (dwError != ERROR_SUCCESS) + return dwError; + + dwSize = MAX_PATH; + + /* Check for the DependOnService Value */ + dwError = RegQueryValueExW(hServiceEnumKey, + L"DependOnService", + NULL, + NULL, + (LPBYTE)lpszValueBuf, + &dwSize); + + /* FIXME: Handle load order. */ + + /* If the service found has a DependOnService value */ + if (dwError == ERROR_SUCCESS) + { + dwDependServiceStrPtr = 0; + + /* Can be more than one Dependencies in the DependOnService string */ + while (wcslen(lpszValueBuf + dwDependServiceStrPtr) > 0) + { + if (_wcsicmp(lpszValueBuf + dwDependServiceStrPtr, lpService->lpServiceName) == 0) + { + /* Get the current enumed service pointer */ + lpCurrentService = ScmGetServiceEntryByName(lpszNameBuf); + + /* Check for valid Service */ + if (!lpCurrentService) + { + /* This should never happen! */ + DPRINT("This should not happen at this point, report to Developer\n"); + return ERROR_NOT_FOUND; + } + + /* Determine state the service is in */ + if (lpCurrentService->Status.dwCurrentState == SERVICE_STOPPED) + dwCurrentServiceState = SERVICE_INACTIVE; + + /* If the ServiceState matches that requested or searching for SERVICE_STATE_ALL */ + if ((dwCurrentServiceState == dwServiceState) || + (dwServiceState == SERVICE_STATE_ALL)) + { + /* Calculate the required size */ + dwRequiredSize += sizeof(SERVICE_STATUS); + dwRequiredSize += ((wcslen(lpCurrentService->lpServiceName) + 1) * sizeof(WCHAR)); + dwRequiredSize += ((wcslen(lpCurrentService->lpDisplayName) + 1) * sizeof(WCHAR)); + + /* Add the size for service name and display name pointers */ + dwRequiredSize += (2 * sizeof(PVOID)); + + /* increase the BytesNeeded size */ + *pcbBytesNeeded = *pcbBytesNeeded + dwRequiredSize; + + /* Don't fill callers buffer yet, as MSDN read that the last service with dependency + comes first */ + + /* Recursive call to check for its dependencies */ + Int_EnumDependentServicesW(hServicesKey, + lpCurrentService, + dwServiceState, + lpServices, + pcbBytesNeeded, + lpServicesReturned); + + /* If the lpServices is valid set the service pointer */ + if (lpServices) + lpServices[*lpServicesReturned] = lpCurrentService; + + *lpServicesReturned = *lpServicesReturned + 1; + } + } + + dwDependServiceStrPtr += (wcslen(lpszValueBuf + dwDependServiceStrPtr) + 1); + } + } + else if (*pcbBytesNeeded) + { + dwError = ERROR_SUCCESS; + } + + RegCloseKey(hServiceEnumKey); + } + + return dwError; +} + + +/* Function 0 */ +DWORD RCloseServiceHandle( + 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"); + + DPRINT("hSCObject = %p\n", *hSCObject); + + if (*hSCObject == 0) + return ERROR_INVALID_HANDLE; + + hManager = ScmGetServiceManagerFromHandle(*hSCObject); + hService = ScmGetServiceFromHandle(*hSCObject); + + if (hManager != NULL) + { + DPRINT("Found manager handle\n"); + + /* FIXME: add handle cleanup code */ + + HeapFree(GetProcessHeap(), 0, hManager); + hManager = NULL; + + *hSCObject = NULL; + + DPRINT("RCloseServiceHandle() done\n"); + return ERROR_SUCCESS; + } + else if (hService != NULL) + { + DPRINT("Found service handle\n"); + + /* Lock the service database exlusively */ + ScmLockDatabaseExclusive(); + + /* Get the pointer to the service record */ + lpService = hService->ServiceEntry; + + /* FIXME: add handle cleanup code */ + + /* Free the handle */ + HeapFree(GetProcessHeap(), 0, hService); + hService = NULL; + + ASSERT(lpService->dwRefCount > 0); + + lpService->dwRefCount--; + DPRINT("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) + { + DPRINT("Failed to open services key\n"); + ScmUnlockDatabase(); + 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) + { + DPRINT("Deletion failed due to running dependencies.\n"); + RegCloseKey(hServicesKey); + ScmUnlockDatabase(); + return ERROR_SUCCESS; + } + + /* There are no references and no runnning dependencies, + it is now safe to delete the service */ + + /* Delete the Service Key */ + dwError = RegDeleteKeyW(hServicesKey, + lpService->lpServiceName); + + RegCloseKey(hServicesKey); + + if (dwError != ERROR_SUCCESS) + { + DPRINT("Failed to Delete the Service Registry key\n"); + ScmUnlockDatabase(); + return dwError; + } + + /* Delete the Service */ + ScmDeleteServiceRecord(lpService); + } + } + + ScmUnlockDatabase(); + + *hSCObject = NULL; + + DPRINT("RCloseServiceHandle() done\n"); + return ERROR_SUCCESS; + } + + DPRINT("Invalid handle tag (Tag %lx)\n", hManager->Handle.Tag); + + return ERROR_INVALID_HANDLE; +} + + +/* Function 1 */ +DWORD RControlService( + SC_RPC_HANDLE hService, + DWORD dwControl, + LPSERVICE_STATUS lpServiceStatus) +{ + PSERVICE_HANDLE hSvc; + PSERVICE lpService; + ACCESS_MASK DesiredAccess; + DWORD dwError = ERROR_SUCCESS; + DWORD pcbBytesNeeded = 0; + DWORD dwServicesReturned = 0; + DWORD dwControlsAccepted; + DWORD dwCurrentState; + HKEY hServicesKey = NULL; + + DPRINT("RControlService() called\n"); + + if (ScmShutdown) + return ERROR_SHUTDOWN_IN_PROGRESS; + + /* Check the service handle */ + hSvc = ScmGetServiceFromHandle(hService); + if (hSvc == NULL) + { + DPRINT1("Invalid service handle!\n"); + return ERROR_INVALID_HANDLE; + } + + + /* Check the service entry point */ + lpService = hSvc->ServiceEntry; + if (lpService == NULL) + { + DPRINT1("lpService == NULL!\n"); + return ERROR_INVALID_HANDLE; + } + + /* Check access rights */ + switch (dwControl) + { + case SERVICE_CONTROL_STOP: + DesiredAccess = SERVICE_STOP; + break; + + case SERVICE_CONTROL_PAUSE: + case SERVICE_CONTROL_CONTINUE: + DesiredAccess = SERVICE_PAUSE_CONTINUE; + break; + + case SERVICE_INTERROGATE: + DesiredAccess = SERVICE_INTERROGATE; + break; + + default: + if (dwControl >= 128 && dwControl <= 255) + DesiredAccess = SERVICE_USER_DEFINED_CONTROL; + else + return ERROR_INVALID_PARAMETER; + break; + } + + if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, + DesiredAccess)) + return ERROR_ACCESS_DENIED; + + 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) + { + DPRINT("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) + { + /* Send control code to the driver */ + dwError = ScmControlDriver(lpService, + dwControl, + lpServiceStatus); + } + else + { + dwControlsAccepted = lpService->Status.dwControlsAccepted; + 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: + 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); + + /* Return service status information */ + RtlCopyMemory(lpServiceStatus, + &lpService->Status, + sizeof(SERVICE_STATUS)); + } + + if ((dwError == ERROR_SUCCESS) && (pcbBytesNeeded)) + dwError = ERROR_DEPENDENT_SERVICES_RUNNING; + + return dwError; +} + + +/* Function 2 */ +DWORD RDeleteService( + SC_RPC_HANDLE hService) +{ + PSERVICE_HANDLE hSvc; + PSERVICE lpService; + DWORD dwError; + + DPRINT("RDeleteService() called\n"); + + if (ScmShutdown) + return ERROR_SHUTDOWN_IN_PROGRESS; + + hSvc = ScmGetServiceFromHandle(hService); + if (hSvc == NULL) + { + DPRINT1("Invalid service handle!\n"); + return ERROR_INVALID_HANDLE; + } + + if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, + DELETE)) + return ERROR_ACCESS_DENIED; + + lpService = hSvc->ServiceEntry; + if (lpService == NULL) + { + DPRINT("lpService == NULL!\n"); + return ERROR_INVALID_HANDLE; + } + + /* Lock the service database exclusively */ + ScmLockDatabaseExclusive(); + + if (lpService->bDeleted) + { + DPRINT("The service has already been marked for delete!\n"); + dwError = ERROR_SERVICE_MARKED_FOR_DELETE; + goto Done; + } + + /* Mark service for delete */ + lpService->bDeleted = TRUE; + + dwError = ScmMarkServiceForDelete(lpService); + +Done:; + /* Unlock the service database */ + ScmUnlockDatabase(); + + DPRINT("RDeleteService() done\n"); + + return dwError; +} + + +/* Function 3 */ +DWORD RLockServiceDatabase( + SC_RPC_HANDLE hSCManager, + LPSC_RPC_LOCK lpLock) +{ + PMANAGER_HANDLE hMgr; + + DPRINT("RLockServiceDatabase() called\n"); + + *lpLock = 0; + + hMgr = ScmGetServiceManagerFromHandle(hSCManager); + if (hMgr == NULL) + { + DPRINT1("Invalid service manager handle!\n"); + return ERROR_INVALID_HANDLE; + } + + if (!RtlAreAllAccessesGranted(hMgr->Handle.DesiredAccess, + SC_MANAGER_LOCK)) + return ERROR_ACCESS_DENIED; + +// return ScmLockDatabase(0, hMgr->0xC, hLock); + + /* FIXME: Lock the database */ + *lpLock = (SC_RPC_LOCK)0x12345678; /* Dummy! */ + + return ERROR_SUCCESS; +} + + +/* Function 4 */ +DWORD RQueryServiceObjectSecurity( + SC_RPC_HANDLE hService, + SECURITY_INFORMATION dwSecurityInformation, + LPBYTE lpSecurityDescriptor, + DWORD cbBufSize, + LPBOUNDED_DWORD_256K pcbBytesNeeded) +{ + PSERVICE_HANDLE hSvc; + PSERVICE lpService; + ULONG DesiredAccess = 0; + NTSTATUS Status; + DWORD dwBytesNeeded; + DWORD dwError; + + + SECURITY_DESCRIPTOR ObjectDescriptor; + + DPRINT("RQueryServiceObjectSecurity() called\n"); + + hSvc = ScmGetServiceFromHandle(hService); + if (hSvc == NULL) + { + DPRINT1("Invalid service handle!\n"); + return ERROR_INVALID_HANDLE; + } + + if (dwSecurityInformation & (DACL_SECURITY_INFORMATION | + GROUP_SECURITY_INFORMATION | + OWNER_SECURITY_INFORMATION)) + DesiredAccess |= READ_CONTROL; + + if (dwSecurityInformation & SACL_SECURITY_INFORMATION) + DesiredAccess |= ACCESS_SYSTEM_SECURITY; + + if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, + DesiredAccess)) + { + DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + lpService = hSvc->ServiceEntry; + if (lpService == NULL) + { + DPRINT("lpService == NULL!\n"); + return ERROR_INVALID_HANDLE; + } + + /* Lock the service database */ + ScmLockDatabaseShared(); + + + /* hack */ + Status = RtlCreateSecurityDescriptor(&ObjectDescriptor, SECURITY_DESCRIPTOR_REVISION); + + Status = RtlQuerySecurityObject(&ObjectDescriptor /* lpService->lpSecurityDescriptor */, + dwSecurityInformation, + (PSECURITY_DESCRIPTOR)lpSecurityDescriptor, + cbBufSize, + &dwBytesNeeded); + + /* Unlock the service database */ + ScmUnlockDatabase(); + + if (NT_SUCCESS(Status)) + { + *pcbBytesNeeded = dwBytesNeeded; + dwError = STATUS_SUCCESS; + } + else if (Status == STATUS_BUFFER_TOO_SMALL) + { + *pcbBytesNeeded = dwBytesNeeded; + dwError = ERROR_INSUFFICIENT_BUFFER; + } + else if (Status == STATUS_BAD_DESCRIPTOR_FORMAT) + { + dwError = ERROR_GEN_FAILURE; + } + else + { + dwError = RtlNtStatusToDosError(Status); + } + + return dwError; +} + + +/* Function 5 */ +DWORD RSetServiceObjectSecurity( + SC_RPC_HANDLE hService, + DWORD dwSecurityInformation, + LPBYTE lpSecurityDescriptor, + DWORD dwSecuityDescriptorSize) +{ + PSERVICE_HANDLE hSvc; + PSERVICE lpService; + ULONG DesiredAccess = 0; + /* HANDLE hToken = NULL; */ + HKEY hServiceKey; + /* NTSTATUS Status; */ + DWORD dwError; + + DPRINT("RSetServiceObjectSecurity() called\n"); + + hSvc = ScmGetServiceFromHandle(hService); + if (hSvc == NULL) + { + DPRINT1("Invalid service handle!\n"); + return ERROR_INVALID_HANDLE; + } + + if (dwSecurityInformation == 0 || + dwSecurityInformation & ~(OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION + | DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION)) + return ERROR_INVALID_PARAMETER; + + if (!RtlValidSecurityDescriptor((PSECURITY_DESCRIPTOR)lpSecurityDescriptor)) + return ERROR_INVALID_PARAMETER; + + if (dwSecurityInformation & SACL_SECURITY_INFORMATION) + DesiredAccess |= ACCESS_SYSTEM_SECURITY; + + if (dwSecurityInformation & DACL_SECURITY_INFORMATION) + DesiredAccess |= WRITE_DAC; + + if (dwSecurityInformation & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION)) + DesiredAccess |= WRITE_OWNER; + + if ((dwSecurityInformation & OWNER_SECURITY_INFORMATION) && + (((PISECURITY_DESCRIPTOR)lpSecurityDescriptor)->Owner == NULL)) + return ERROR_INVALID_PARAMETER; + + if ((dwSecurityInformation & GROUP_SECURITY_INFORMATION) && + (((PISECURITY_DESCRIPTOR)lpSecurityDescriptor)->Group == NULL)) + return ERROR_INVALID_PARAMETER; + + if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, + DesiredAccess)) + { + DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + lpService = hSvc->ServiceEntry; + if (lpService == NULL) + { + DPRINT("lpService == NULL!\n"); + return ERROR_INVALID_HANDLE; + } + + if (lpService->bDeleted) + return ERROR_SERVICE_MARKED_FOR_DELETE; + +#if 0 + RpcImpersonateClient(NULL); + + Status = NtOpenThreadToken(NtCurrentThread(), + 8, + TRUE, + &hToken); + if (!NT_SUCCESS(Status)) + return RtlNtStatusToDosError(Status); + + RpcRevertToSelf(); +#endif + + /* Lock the service database exclusive */ + ScmLockDatabaseExclusive(); + +#if 0 + Status = RtlSetSecurityObject(dwSecurityInformation, + (PSECURITY_DESCRIPTOR)lpSecurityDescriptor, + &lpService->lpSecurityDescriptor, + &ScmServiceMapping, + hToken); + if (!NT_SUCCESS(Status)) + { + dwError = RtlNtStatusToDosError(Status); + goto Done; + } +#endif + + dwError = ScmOpenServiceKey(lpService->lpServiceName, + READ_CONTROL | KEY_CREATE_SUB_KEY | KEY_SET_VALUE, + &hServiceKey); + if (dwError != ERROR_SUCCESS) + goto Done; + + UNIMPLEMENTED; + dwError = ERROR_SUCCESS; +// dwError = ScmWriteSecurityDescriptor(hServiceKey, +// lpService->lpSecurityDescriptor); + + RegFlushKey(hServiceKey); + RegCloseKey(hServiceKey); + +Done: + +#if 0 + if (hToken != NULL) + NtClose(hToken); +#endif + + /* Unlock service database */ + ScmUnlockDatabase(); + + DPRINT("RSetServiceObjectSecurity() done (Error %lu)\n", dwError); + + return dwError; +} + + +/* Function 6 */ +DWORD RQueryServiceStatus( + SC_RPC_HANDLE hService, + LPSERVICE_STATUS lpServiceStatus) +{ + PSERVICE_HANDLE hSvc; + PSERVICE lpService; + + DPRINT("RQueryServiceStatus() called\n"); + + if (ScmShutdown) + return ERROR_SHUTDOWN_IN_PROGRESS; + + hSvc = ScmGetServiceFromHandle(hService); + if (hSvc == NULL) + { + DPRINT1("Invalid service handle!\n"); + return ERROR_INVALID_HANDLE; + } + + if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, + SERVICE_QUERY_STATUS)) + { + DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + lpService = hSvc->ServiceEntry; + if (lpService == NULL) + { + DPRINT("lpService == NULL!\n"); + return ERROR_INVALID_HANDLE; + } + + /* Lock the service database shared */ + ScmLockDatabaseShared(); + + /* Return service status information */ + RtlCopyMemory(lpServiceStatus, + &lpService->Status, + sizeof(SERVICE_STATUS)); + + /* Unlock the service database */ + ScmUnlockDatabase(); + + return ERROR_SUCCESS; +} + + +static BOOL +ScmIsValidServiceState(DWORD dwCurrentState) +{ + switch (dwCurrentState) + { + case SERVICE_STOPPED: + case SERVICE_START_PENDING: + case SERVICE_STOP_PENDING: + case SERVICE_RUNNING: + case SERVICE_CONTINUE_PENDING: + case SERVICE_PAUSE_PENDING: + case SERVICE_PAUSED: + return TRUE; + + default: + return FALSE; + } +} + + +/* Function 7 */ +DWORD RSetServiceStatus( + RPC_SERVICE_STATUS_HANDLE hServiceStatus, + LPSERVICE_STATUS lpServiceStatus) +{ + PSERVICE lpService; + + DPRINT("RSetServiceStatus() called\n"); + DPRINT("hServiceStatus = %p\n", hServiceStatus); + DPRINT("dwServiceType = %lu\n", lpServiceStatus->dwServiceType); + DPRINT("dwCurrentState = %lu\n", lpServiceStatus->dwCurrentState); + DPRINT("dwControlsAccepted = %lu\n", lpServiceStatus->dwControlsAccepted); + DPRINT("dwWin32ExitCode = %lu\n", lpServiceStatus->dwWin32ExitCode); + DPRINT("dwServiceSpecificExitCode = %lu\n", lpServiceStatus->dwServiceSpecificExitCode); + DPRINT("dwCheckPoint = %lu\n", lpServiceStatus->dwCheckPoint); + DPRINT("dwWaitHint = %lu\n", lpServiceStatus->dwWaitHint); + + if (hServiceStatus == 0) + { + DPRINT("hServiceStatus == NULL!\n"); + return ERROR_INVALID_HANDLE; + } + + lpService = (PSERVICE)hServiceStatus; + if (lpService == NULL) + { + DPRINT("lpService == NULL!\n"); + return ERROR_INVALID_HANDLE; + } + + /* Check current state */ + if (!ScmIsValidServiceState(lpServiceStatus->dwCurrentState)) + { + DPRINT("Invalid service state!\n"); + return ERROR_INVALID_DATA; + } + + /* Check service type */ + if (!(lpServiceStatus->dwServiceType & SERVICE_WIN32) && + (lpServiceStatus->dwServiceType & SERVICE_DRIVER)) + { + DPRINT("Invalid service type!\n"); + return ERROR_INVALID_DATA; + } + + /* Check accepted controls */ + if (lpServiceStatus->dwControlsAccepted & ~0xFF) + { + DPRINT("Invalid controls accepted!\n"); + return ERROR_INVALID_DATA; + } + + /* Lock the service database exclusively */ + ScmLockDatabaseExclusive(); + + RtlCopyMemory(&lpService->Status, + lpServiceStatus, + sizeof(SERVICE_STATUS)); + + /* Unlock the service database */ + ScmUnlockDatabase(); + + DPRINT("Set %S to %lu\n", lpService->lpDisplayName, lpService->Status.dwCurrentState); + DPRINT("RSetServiceStatus() done\n"); + + return ERROR_SUCCESS; +} + + +/* Function 8 */ +DWORD RUnlockServiceDatabase( + LPSC_RPC_LOCK Lock) +{ + UNIMPLEMENTED; + return ERROR_SUCCESS; +} + + +/* Function 9 */ +DWORD RNotifyBootConfigStatus( + SVCCTL_HANDLEW lpMachineName, + DWORD BootAcceptable) +{ + DPRINT1("RNotifyBootConfigStatus(%p %lu) called\n", lpMachineName, BootAcceptable); + return ERROR_SUCCESS; + +// UNIMPLEMENTED; +// return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 10 */ +DWORD RI_ScSetServiceBitsW( + RPC_SERVICE_STATUS_HANDLE hServiceStatus, + DWORD dwServiceBits, + int bSetBitsOn, + int bUpdateImmediately, + wchar_t *lpString) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 11 */ +DWORD RChangeServiceConfigW( + SC_RPC_HANDLE hService, + DWORD dwServiceType, + DWORD dwStartType, + DWORD dwErrorControl, + LPWSTR lpBinaryPathName, + LPWSTR lpLoadOrderGroup, + LPDWORD lpdwTagId, + LPBYTE lpDependencies, + DWORD dwDependSize, + LPWSTR lpServiceStartName, + LPBYTE lpPassword, + DWORD dwPwSize, + LPWSTR lpDisplayName) +{ + DWORD dwError = ERROR_SUCCESS; + PSERVICE_HANDLE hSvc; + PSERVICE lpService = NULL; + HKEY hServiceKey = NULL; + LPWSTR lpDisplayNameW = NULL; + + DPRINT("RChangeServiceConfigW() called\n"); + DPRINT("dwServiceType = %lu\n", dwServiceType); + DPRINT("dwStartType = %lu\n", dwStartType); + DPRINT("dwErrorControl = %lu\n", dwErrorControl); + DPRINT("lpBinaryPathName = %S\n", lpBinaryPathName); + DPRINT("lpLoadOrderGroup = %S\n", lpLoadOrderGroup); + DPRINT("lpDisplayName = %S\n", lpDisplayName); + + if (ScmShutdown) + return ERROR_SHUTDOWN_IN_PROGRESS; + + hSvc = ScmGetServiceFromHandle(hService); + if (hSvc == NULL) + { + DPRINT1("Invalid service handle!\n"); + return ERROR_INVALID_HANDLE; + } + + if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, + SERVICE_CHANGE_CONFIG)) + { + DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + lpService = hSvc->ServiceEntry; + if (lpService == NULL) + { + DPRINT("lpService == NULL!\n"); + return ERROR_INVALID_HANDLE; + } + + /* Lock the service database exclusively */ + ScmLockDatabaseExclusive(); + + if (lpService->bDeleted) + { + DPRINT("The service has already been marked for delete!\n"); + dwError = ERROR_SERVICE_MARKED_FOR_DELETE; + goto done; + } + + /* Open the service key */ + dwError = ScmOpenServiceKey(lpService->szServiceName, + KEY_SET_VALUE, + &hServiceKey); + if (dwError != ERROR_SUCCESS) + goto done; + + /* Write service data to the registry */ + /* Set the display name */ + if (lpDisplayName != NULL && *lpDisplayName != 0) + { + RegSetValueExW(hServiceKey, + L"DisplayName", + 0, + REG_SZ, + (LPBYTE)lpDisplayName, + (wcslen(lpDisplayName) + 1) * sizeof(WCHAR)); + + /* Update the display name */ + lpDisplayNameW = HeapAlloc(GetProcessHeap(), + 0, + (wcslen(lpDisplayName) + 1) * sizeof(WCHAR)); + if (lpDisplayNameW == NULL) + { + dwError = ERROR_NOT_ENOUGH_MEMORY; + goto done; + } + + if (lpService->lpDisplayName != lpService->lpServiceName) + HeapFree(GetProcessHeap(), 0, lpService->lpDisplayName); + + lpService->lpDisplayName = lpDisplayNameW; + } + + if (dwServiceType != SERVICE_NO_CHANGE) + { + /* Set the service type */ + dwError = RegSetValueExW(hServiceKey, + L"Type", + 0, + REG_DWORD, + (LPBYTE)&dwServiceType, + sizeof(DWORD)); + if (dwError != ERROR_SUCCESS) + goto done; + + lpService->Status.dwServiceType = dwServiceType; + } + + if (dwStartType != SERVICE_NO_CHANGE) + { + /* Set the start value */ + dwError = RegSetValueExW(hServiceKey, + L"Start", + 0, + REG_DWORD, + (LPBYTE)&dwStartType, + sizeof(DWORD)); + if (dwError != ERROR_SUCCESS) + goto done; + + lpService->dwStartType = dwStartType; + } + + if (dwErrorControl != SERVICE_NO_CHANGE) + { + /* Set the error control value */ + dwError = RegSetValueExW(hServiceKey, + L"ErrorControl", + 0, + REG_DWORD, + (LPBYTE)&dwErrorControl, + sizeof(DWORD)); + if (dwError != ERROR_SUCCESS) + goto done; + + lpService->dwErrorControl = dwErrorControl; + } + +#if 0 + /* FIXME: set the new ImagePath value */ + + /* Set the image path */ + if (dwServiceType & SERVICE_WIN32) + { + if (lpBinaryPathName != NULL && *lpBinaryPathName != 0) + { + dwError = RegSetValueExW(hServiceKey, + L"ImagePath", + 0, + REG_EXPAND_SZ, + (LPBYTE)lpBinaryPathName, + (wcslen(lpBinaryPathName) + 1) * sizeof(WCHAR)); + if (dwError != ERROR_SUCCESS) + goto done; + } + } + else if (dwServiceType & SERVICE_DRIVER) + { + if (lpImagePath != NULL && *lpImagePath != 0) + { + dwError = RegSetValueExW(hServiceKey, + L"ImagePath", + 0, + REG_EXPAND_SZ, + (LPBYTE)lpImagePath, + (wcslen(lpImagePath) + 1) *sizeof(WCHAR)); + if (dwError != ERROR_SUCCESS) + goto done; + } + } +#endif + + /* Set the group name */ + if (lpLoadOrderGroup != NULL && *lpLoadOrderGroup != 0) + { + dwError = RegSetValueExW(hServiceKey, + L"Group", + 0, + REG_SZ, + (LPBYTE)lpLoadOrderGroup, + (wcslen(lpLoadOrderGroup) + 1) * sizeof(WCHAR)); + if (dwError != ERROR_SUCCESS) + goto done; + + dwError = ScmSetServiceGroup(lpService, + lpLoadOrderGroup); + if (dwError != ERROR_SUCCESS) + goto done; + } + + if (lpdwTagId != NULL) + { + dwError = ScmAssignNewTag(lpService); + if (dwError != ERROR_SUCCESS) + goto done; + + dwError = RegSetValueExW(hServiceKey, + L"Tag", + 0, + REG_DWORD, + (LPBYTE)&lpService->dwTag, + sizeof(DWORD)); + if (dwError != ERROR_SUCCESS) + goto done; + + *lpdwTagId = lpService->dwTag; + } + + /* Write dependencies */ + if (lpDependencies != NULL && *lpDependencies != 0) + { + dwError = ScmWriteDependencies(hServiceKey, + (LPWSTR)lpDependencies, + dwDependSize); + if (dwError != ERROR_SUCCESS) + goto done; + } + + if (lpPassword != NULL) + { + /* FIXME: Write password */ + } + +done: + if (hServiceKey != NULL) + RegCloseKey(hServiceKey); + + /* Unlock the service database */ + ScmUnlockDatabase(); + + DPRINT("RChangeServiceConfigW() done (Error %lu)\n", dwError); + + return dwError; +} + + /* Function 12 */ DWORD RCreateServiceW( SC_RPC_HANDLE hSCManager,

13 years, 1 month

← Newer
1
...
18
19
20
21
22
23
24
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2011