Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 36994: - Port RegDeleteTreeW from Wine, and remove previous implementation (fixes registry regtests). That previous implementation was better due to the fact it was not recursive, however it's buggy and noone managed to fix it since the commit's date (revision ~17000). It's wrapped into #if0-#endif now so the code doesn't get lost.
by fireball＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: fireball Date: Sun Oct 26 10:40:44 2008 New Revision: 36994 URL: http://svn.reactos.org/svn/reactos?rev=36994&view=rev Log: - Port RegDeleteTreeW from Wine, and remove previous implementation (fixes registry regtests). That previous implementation was better due to the fact it was not recursive, however it's buggy and noone managed to fix it since the commit's date (revision ~17000). It's wrapped into #if0-#endif now so the code doesn't get lost. Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Sun Oct 26 10:40:44 2008 @@ -1427,7 +1427,8 @@ return Ret; } - +#if 0 +// Non-recursive RegDeleteTreeW implementation by Thomas, however it needs bugfixing static NTSTATUS RegpDeleteTree(IN HKEY hKey) { @@ -1704,6 +1705,100 @@ return RtlNtStatusToDosError(Status); } +} +#endif + +/************************************************************************ + * RegDeleteTreeW + * + * @implemented + */ +LSTATUS +WINAPI +RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) +{ + LONG ret; + DWORD dwMaxSubkeyLen, dwMaxValueLen; + DWORD dwMaxLen, dwSize; + NTSTATUS Status; + HANDLE KeyHandle; + HKEY hSubKey; + WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; + + TRACE("(hkey=%p,%p %s)\n", hKey, lpszSubKey, debugstr_w(lpszSubKey)); + + Status = MapDefaultKey(&KeyHandle, + hKey); + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError(Status); + } + + hSubKey = KeyHandle; + + if(lpszSubKey) + { + ret = RegOpenKeyExW(KeyHandle, lpszSubKey, 0, KEY_READ, &hSubKey); + if (ret) + { + ClosePredefKey(KeyHandle); + return ret; + } + } + + /* Get highest length for keys, values */ + ret = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, NULL, + &dwMaxSubkeyLen, NULL, NULL, &dwMaxValueLen, NULL, NULL, NULL); + if (ret) goto cleanup; + + dwMaxSubkeyLen++; + dwMaxValueLen++; + dwMaxLen = max(dwMaxSubkeyLen, dwMaxValueLen); + if (dwMaxLen > sizeof(szNameBuf)/sizeof(WCHAR)) + { + /* Name too big: alloc a buffer for it */ + if (!(lpszName = RtlAllocateHeap( RtlGetProcessHeap(), 0, dwMaxLen*sizeof(WCHAR)))) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + } + + + /* Recursively delete all the subkeys */ + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumKeyExW(hSubKey, 0, lpszName, &dwSize, NULL, + NULL, NULL, NULL)) break; + + ret = RegDeleteTreeW(hSubKey, lpszName); + if (ret) goto cleanup; + } + + if (lpszSubKey) + ret = RegDeleteKeyW(KeyHandle, lpszSubKey); + else + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumValueW(KeyHandle, 0, lpszName, &dwSize, + NULL, NULL, NULL, NULL)) break; + + ret = RegDeleteValueW(KeyHandle, lpszName); + if (ret) goto cleanup; + } + +cleanup: + /* Free buffer if allocated */ + if (lpszName != szNameBuf) + RtlFreeHeap( RtlGetProcessHeap(), 0, lpszName); + if(lpszSubKey) + RegCloseKey(hSubKey); + + ClosePredefKey(KeyHandle); + + return ret; }

1 0

[sginsberg] 36993: - Convert to .spec
by sginsberg＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: sginsberg Date: Sun Oct 26 10:34:08 2008 New Revision: 36993 URL: http://svn.reactos.org/svn/reactos?rev=36993&view=rev Log: - Convert to .spec Added: branches/ros-amd64-bringup/reactos/dll/win32/smdll/smdll.spec (with props) Removed: branches/ros-amd64-bringup/reactos/dll/win32/smdll/smdll.def Modified: branches/ros-amd64-bringup/reactos/dll/win32/smdll/smdll.rbuild Removed: branches/ros-amd64-bringup/reactos/dll/win32/smdll/smdll.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/smdll/smdll.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/smdll/smdll.def (removed) @@ -1,7 +1,0 @@ -LIBRARY SMDLL.DLL -EXPORTS -SmCompleteSession@12 -SmConnectApiPort@16 -SmExecuteProgram@8 -SmQueryInformation@20 -SmLookupSubsystem@20 Modified: branches/ros-amd64-bringup/reactos/dll/win32/smdll/smdll.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/smdll/smdll.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/smdll/smdll.rbuild [iso-8859-1] Sun Oct 26 10:34:08 2008 @@ -1,5 +1,5 @@ <module name="smdll" type="nativedll" baseaddress="${BASEADDRESS_SMDLL}" installbase="system32" installname="smdll.dll"> - <importlibrary definition="smdll.def" /> + <importlibrary definition="smdll.spec" /> <include base="smdll">.</include> <include base="ReactOS">include/reactos/subsys</include> <define name="_DISABLE_TIDENTS" /> Added: branches/ros-amd64-bringup/reactos/dll/win32/smdll/smdll.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/smdll/smdll.spec (added) +++ branches/ros-amd64-bringup/reactos/dll/win32/smdll/smdll.spec [iso-8859-1] Sun Oct 26 10:34:08 2008 @@ -1,0 +1,5 @@ +@ stdcall SmCompleteSession(ptr ptr ptr) +@ stdcall SmConnectApiPort(ptr ptr long ptr) +@ stdcall SmExecuteProgram(ptr ptr) +@ stdcall SmQueryInformation(ptr long ptr long ptr) +@ stdcall SmLookupSubsystem(ptr ptr ptr ptr ptr) Propchange: branches/ros-amd64-bringup/reactos/dll/win32/smdll/smdll.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sginsberg] 36992: - Fix csrss compilation (treat handles as pointer sized, use SIZE_T where appropriate)
by sginsberg＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: sginsberg Date: Sun Oct 26 10:23:00 2008 New Revision: 36992 URL: http://svn.reactos.org/svn/reactos?rev=36992&view=rev Log: - Fix csrss compilation (treat handles as pointer sized, use SIZE_T where appropriate) Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/handle.c branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/process.c branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/user.c branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/wapi.c branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/video.c Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] Sun Oct 26 10:23:00 2008 @@ -22,7 +22,7 @@ static BOOL CsrIsConsoleHandle(HANDLE Handle) { - return ((ULONG)Handle & 0x10000003) == 0x3; + return ((ULONG_PTR)Handle & 0x10000003) == 0x3; } @@ -63,7 +63,7 @@ NTSTATUS STDCALL CsrGetObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object, DWORD Access ) { - ULONG h = (ULONG)Handle >> 2; + ULONG_PTR h = (ULONG_PTR)Handle >> 2; DPRINT("CsrGetObject, Object: %x, %x, %x\n", Object, Handle, ProcessData ? ProcessData->HandleTableSize : 0); RtlEnterCriticalSection(&ProcessData->HandleTableLock); @@ -110,7 +110,7 @@ CsrReleaseObject(PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle) { - ULONG h = (ULONG)Handle >> 2; + ULONG_PTR h = (ULONG_PTR)Handle >> 2; Object_t *Object; RtlEnterCriticalSection(&ProcessData->HandleTableLock); @@ -164,7 +164,7 @@ ProcessData->HandleTable[i].Object = Object; ProcessData->HandleTable[i].Access = Access; ProcessData->HandleTable[i].Inheritable = Inheritable; - *Handle = (HANDLE)((i << 2) | 0x3); + *Handle = (HANDLE)(ULONG_PTR)((i << 2) | 0x3); _InterlockedIncrement( &Object->ReferenceCount ); RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return(STATUS_SUCCESS); @@ -208,7 +208,7 @@ NTSTATUS STDCALL CsrVerifyObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle ) { - ULONG h = (ULONG)Handle >> 2; + ULONG_PTR h = (ULONG_PTR)Handle >> 2; if (h >= ProcessData->HandleTableSize || ProcessData->HandleTable[h].Object == NULL) Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/process.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/process.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/process.c [iso-8859-1] Sun Oct 26 10:23:00 2008 @@ -243,7 +243,7 @@ if (Request->Data.CreateProcessRequest.Flags & CREATE_NEW_PROCESS_GROUP) { - NewProcessData->ProcessGroup = (DWORD)NewProcessData->ProcessId; + NewProcessData->ProcessGroup = (DWORD)(ULONG_PTR)NewProcessData->ProcessId; } else { @@ -362,14 +362,14 @@ CSR_API(CsrDuplicateHandle) { - ULONG Index; + ULONG_PTR Index; PCSRSS_HANDLE Entry; DWORD DesiredAccess; Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Index = (ULONG)Request->Data.DuplicateHandleRequest.Handle >> 2; + Index = (ULONG_PTR)Request->Data.DuplicateHandleRequest.Handle >> 2; RtlEnterCriticalSection(&ProcessData->HandleTableLock); if (Index >= ProcessData->HandleTableSize || (Entry = &ProcessData->HandleTable[Index])->Object == NULL) Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/user.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/user.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/user.c [iso-8859-1] Sun Oct 26 10:23:00 2008 @@ -19,7 +19,7 @@ /* GLOBALS *******************************************************************/ static BOOLEAN ServicesProcessIdValid = FALSE; -static ULONG ServicesProcessId; +static ULONG_PTR ServicesProcessId; /* FUNCTIONS *****************************************************************/ @@ -36,7 +36,7 @@ } else { - ServicesProcessId = (ULONG)Request->Data.RegisterServicesProcessRequest.ProcessId; + ServicesProcessId = (ULONG_PTR)Request->Data.RegisterServicesProcessRequest.ProcessId; ServicesProcessIdValid = TRUE; return STATUS_SUCCESS; } Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/wapi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/wapi.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/wapi.c [iso-8859-1] Sun Oct 26 10:23:00 2008 @@ -272,8 +272,8 @@ } if (ProcessData->Terminated) { - DPRINT1("Message %d: process %d already terminated\n", - Request->Type, (ULONG)Request->Header.ClientId.UniqueProcess); + DPRINT1("Message %d: process %p already terminated\n", + Request->Type, Request->Header.ClientId.UniqueProcess); continue; } Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/video.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/video.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/video.c [iso-8859-1] Sun Oct 26 10:23:00 2008 @@ -24,7 +24,7 @@ HANDLE PhysMemHandle; PVOID BaseAddress; LARGE_INTEGER Offset; - ULONG ViewSize; + SIZE_T ViewSize; CHAR IVTAndBda[1024+256]; /* Open the physical memory section */

1 0

[ekohl] 36991: Service Manager: - Get rid of the globally created binding handle and use the WIDL-generated custom binding handles and context handles instead. The other RPC interfaces will be converted as soon as possible.
by ekohl＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: ekohl Date: Sun Oct 26 10:11:28 2008 New Revision: 36991 URL: http://svn.reactos.org/svn/reactos?rev=36991&view=rev Log: Service Manager: - Get rid of the globally created binding handle and use the WIDL-generated custom binding handles and context handles instead. The other RPC interfaces will be converted as soon as possible. Modified: trunk/reactos/base/system/services/rpcserver.c trunk/reactos/dll/win32/advapi32/service/scm.c trunk/reactos/dll/win32/advapi32/service/sctrl.c trunk/reactos/include/reactos/idl/svcctl.idl Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Oct 26 10:11:28 2008 @@ -400,7 +400,6 @@ /* Function 0 */ DWORD RCloseServiceHandle( - handle_t BindingHandle, LPSC_RPC_HANDLE hSCObject) { PMANAGER_HANDLE hManager; @@ -526,7 +525,6 @@ /* Function 1 */ DWORD RControlService( - handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD dwControl, LPSERVICE_STATUS lpServiceStatus) @@ -657,7 +655,6 @@ /* Function 2 */ DWORD RDeleteService( - handle_t BindingHandle, SC_RPC_HANDLE hService) { PSERVICE_HANDLE hSvc; @@ -707,7 +704,6 @@ /* Function 3 */ DWORD RLockServiceDatabase( - handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPSC_RPC_LOCK lpLock) { @@ -736,7 +732,6 @@ /* Function 4 */ DWORD RQueryServiceObjectSecurity( - handle_t BindingHandle, SC_RPC_HANDLE hService, SECURITY_INFORMATION dwSecurityInformation, LPBYTE lpSecurityDescriptor, @@ -820,7 +815,6 @@ /* Function 5 */ DWORD RSetServiceObjectSecurity( - handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD dwSecurityInformation, LPBYTE lpSecurityDescriptor, @@ -940,7 +934,6 @@ /* Function 6 */ DWORD RQueryServiceStatus( - handle_t BindingHandle, SC_RPC_HANDLE hService, LPSERVICE_STATUS lpServiceStatus) { @@ -1004,7 +997,6 @@ /* Function 7 */ DWORD RSetServiceStatus( -// handle_t BindingHandle, RPC_SERVICE_STATUS_HANDLE hServiceStatus, LPSERVICE_STATUS lpServiceStatus) { @@ -1070,7 +1062,6 @@ /* Function 8 */ DWORD RUnlockServiceDatabase( - handle_t BindingHandle, LPSC_RPC_LOCK Lock) { UNIMPLEMENTED; @@ -1080,7 +1071,6 @@ /* Function 9 */ DWORD RNotifyBootConfigStatus( - handle_t BindingHandle, SVCCTL_HANDLEW lpMachineName, DWORD BootAcceptable) { @@ -1091,7 +1081,6 @@ /* Function 10 */ DWORD RI_ScSetServiceBitsW( -// handle_t BindingHandle, RPC_SERVICE_STATUS_HANDLE hServiceStatus, DWORD dwServiceBits, int bSetBitsOn, @@ -1105,7 +1094,6 @@ /* Function 11 */ DWORD RChangeServiceConfigW( - handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD dwServiceType, DWORD dwStartType, @@ -1715,7 +1703,6 @@ /* Function 12 */ DWORD RCreateServiceW( - handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPWSTR lpServiceName, LPWSTR lpDisplayName, @@ -2051,7 +2038,6 @@ /* Function 13 */ DWORD REnumDependentServicesW( - handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD dwServiceState, LPBYTE lpServices, @@ -2181,7 +2167,6 @@ /* Function 14 */ DWORD REnumServicesStatusW( - handle_t BindingHandle, SC_RPC_HANDLE hSCManager, DWORD dwServiceType, DWORD dwServiceState, @@ -2388,7 +2373,6 @@ /* Function 15 */ DWORD ROpenSCManagerW( -// handle_t BindingHandle, LPWSTR lpMachineName, LPWSTR lpDatabaseName, DWORD dwDesiredAccess, @@ -2439,7 +2423,6 @@ /* Function 16 */ DWORD ROpenServiceW( - handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPWSTR lpServiceName, DWORD dwDesiredAccess, @@ -2515,7 +2498,6 @@ /* Function 17 */ DWORD RQueryServiceConfigW( - handle_t BindingHandle, SC_RPC_HANDLE hService, LPBYTE lpBuf, //LPQUERY_SERVICE_CONFIGW lpServiceConfig, DWORD cbBufSize, @@ -2692,7 +2674,6 @@ /* Function 18 */ DWORD RQueryServiceLockStatusW( - handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPQUERY_SERVICE_LOCK_STATUSW lpLockStatus, DWORD cbBufSize, @@ -2705,7 +2686,6 @@ /* Function 19 */ DWORD RStartServiceW( - handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD argc, LPSTRING_PTRSW argv) @@ -2760,7 +2740,6 @@ /* Function 20 */ DWORD RGetServiceDisplayNameW( - handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPWSTR lpServiceName, LPWSTR lpDisplayName, @@ -2832,7 +2811,6 @@ /* Function 21 */ DWORD RGetServiceKeyNameW( - handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPWSTR lpDisplayName, LPWSTR lpServiceName, @@ -2893,7 +2871,6 @@ /* Function 22 */ DWORD RI_ScSetServiceBitsA( -// handle_t BindingHandle, RPC_SERVICE_STATUS_HANDLE hServiceStatus, DWORD dwServiceBits, int bSetBitsOn, @@ -2907,7 +2884,6 @@ /* Function 23 */ DWORD RChangeServiceConfigA( - handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD dwServiceType, DWORD dwStartType, @@ -3192,7 +3168,6 @@ /* Function 24 */ DWORD RCreateServiceA( - handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPSTR lpServiceName, LPSTR lpDisplayName, @@ -3217,7 +3192,6 @@ /* Function 25 */ DWORD REnumDependentServicesA( - handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD dwServiceState, LPBYTE lpServices, @@ -3365,7 +3339,6 @@ /* Function 26 */ DWORD REnumServicesStatusA( - handle_t BindingHandle, SC_RPC_HANDLE hSCManager, DWORD dwServiceType, DWORD dwServiceState, @@ -3394,7 +3367,7 @@ } } - dwError = REnumServicesStatusW(BindingHandle, + dwError = REnumServicesStatusW(//BindingHandle, hSCManager, dwServiceType, dwServiceState, @@ -3462,7 +3435,6 @@ /* Function 27 */ DWORD ROpenSCManagerA( -// handle_t BindingHandle, LPSTR lpMachineName, LPSTR lpDatabaseName, DWORD dwDesiredAccess, @@ -3500,7 +3472,6 @@ /* Function 28 */ DWORD ROpenServiceA( - handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPSTR lpServiceName, DWORD dwDesiredAccess, @@ -3515,7 +3486,7 @@ RtlCreateUnicodeStringFromAsciiz(&ServiceName, lpServiceName); - dwError = ROpenServiceW(BindingHandle, + dwError = ROpenServiceW(//BindingHandle, hSCManager, lpServiceName ? ServiceName.Buffer : NULL, dwDesiredAccess, @@ -3530,7 +3501,6 @@ /* Function 29 */ DWORD RQueryServiceConfigA( - handle_t BindingHandle, SC_RPC_HANDLE hService, LPBYTE lpBuf, //LPQUERY_SERVICE_CONFIGA lpServiceConfig, DWORD cbBufSize, @@ -3739,7 +3709,6 @@ /* Function 30 */ DWORD RQueryServiceLockStatusA( - handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPQUERY_SERVICE_LOCK_STATUSA lpLockStatus, DWORD cbBufSize, @@ -3752,7 +3721,6 @@ /* Function 31 */ DWORD RStartServiceA( - handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD argc, LPSTRING_PTRSA argv) @@ -3806,7 +3774,6 @@ /* Function 32 */ DWORD RGetServiceDisplayNameA( - handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPSTR lpServiceName, LPSTR lpDisplayName, @@ -3908,7 +3875,6 @@ /* Function 33 */ DWORD RGetServiceKeyNameA( - handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPSTR lpDisplayName, LPSTR lpServiceName, @@ -3983,7 +3949,6 @@ /* Function 34 */ DWORD RI_ScGetCurrentGroupStateW( - handle_t BindingHandle, SC_RPC_HANDLE hSCManager, LPWSTR lpLoadOrderGroup, LPDWORD lpState) @@ -3995,7 +3960,6 @@ /* Function 35 */ DWORD REnumServiceGroupW( - handle_t BindingHandle, SC_RPC_HANDLE hSCManager, DWORD dwServiceType, DWORD dwServiceState, @@ -4013,7 +3977,6 @@ /* Function 36 */ DWORD RChangeServiceConfig2A( - handle_t BindingHandle, SC_RPC_HANDLE hService, SC_RPC_CONFIG_INFOA Info) { @@ -4024,7 +3987,6 @@ /* Function 37 */ DWORD RChangeServiceConfig2W( - handle_t BindingHandle, SC_RPC_HANDLE hService, SC_RPC_CONFIG_INFOW Info) { @@ -4117,7 +4079,6 @@ /* Function 38 */ DWORD RQueryServiceConfig2A( - handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD dwInfoLevel, LPBYTE lpBuffer, @@ -4225,7 +4186,6 @@ /* Function 39 */ DWORD RQueryServiceConfig2W( - handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD dwInfoLevel, LPBYTE lpBuffer, @@ -4324,7 +4284,6 @@ /* Function 40 */ DWORD RQueryServiceStatusEx( - handle_t BindingHandle, SC_RPC_HANDLE hService, SC_STATUS_TYPE InfoLevel, LPBYTE lpBuffer, @@ -4385,7 +4344,6 @@ /* Function 41 */ DWORD REnumServicesStatusExA( - handle_t BindingHandle, SC_RPC_HANDLE hSCManager, SC_ENUM_TYPE InfoLevel, DWORD dwServiceType, @@ -4433,8 +4391,7 @@ } } - dwError = REnumServicesStatusExW(BindingHandle, - hSCManager, + dwError = REnumServicesStatusExW(hSCManager, InfoLevel, dwServiceType, dwServiceState, @@ -4507,7 +4464,6 @@ /* Function 42 */ DWORD REnumServicesStatusExW( - handle_t BindingHandle, SC_RPC_HANDLE hSCManager, SC_ENUM_TYPE InfoLevel, DWORD dwServiceType, @@ -4782,7 +4738,7 @@ /* Function 43 */ DWORD RSendTSMessage( - handle_t BindingHandle) + handle_t BindingHandle) /* FIXME */ { UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; @@ -4839,7 +4795,7 @@ /* Function 46 */ DWORD RQueryServiceTagInfo( - handle_t BindingHandle) + handle_t BindingHandle) /* FIXME */ { UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; @@ -4848,7 +4804,6 @@ /* Function 47 */ DWORD RNotifyServiceStatusChange( - handle_t BindingHandle, SC_RPC_HANDLE hService, SC_RPC_NOTIFY_PARAMS NotifyParams, GUID *pClientProcessGuid, @@ -4863,7 +4818,6 @@ /* Function 48 */ DWORD RGetNotifyResults( - handle_t BindingHandle, SC_NOTIFY_RPC_HANDLE hNotify, PSC_RPC_NOTIFY_PARAMS_LIST *ppNotifyParams) { @@ -4874,7 +4828,6 @@ /* Function 49 */ DWORD RCloseNotifyHandle( - handle_t BindingHandle, LPSC_NOTIFY_RPC_HANDLE phNotify, PBOOL pfApcFired) { @@ -4885,7 +4838,6 @@ /* Function 50 */ DWORD RControlServiceExA( - handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD dwControl, DWORD dwInfoLevel) @@ -4897,7 +4849,6 @@ /* Function 51 */ DWORD RControlServiceExW( - handle_t BindingHandle, SC_RPC_HANDLE hService, DWORD dwControl, DWORD dwInfoLevel) @@ -4909,7 +4860,7 @@ /* Function 52 */ DWORD RSendPnPMessage( - handle_t BindingHandle) + handle_t BindingHandle) /* FIXME */ { UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; @@ -4918,7 +4869,7 @@ /* Function 53 */ DWORD RValidatePnPService( - handle_t BindingHandle) + handle_t BindingHandle) /* FIXME */ { UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; @@ -4927,7 +4878,7 @@ /* Function 54 */ DWORD ROpenServiceStatusHandle( - handle_t BindingHandle) + handle_t BindingHandle) /* FIXME */ { UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; @@ -4936,7 +4887,7 @@ /* Function 55 */ DWORD RFunction55( - handle_t BindingHandle) + handle_t BindingHandle) /* FIXME */ { UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; @@ -4969,5 +4920,4 @@ { } - /* EOF */ 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] Sun Oct 26 10:11:28 2008 @@ -21,16 +21,126 @@ /* FUNCTIONS *****************************************************************/ -handle_t BindingHandle = NULL; - -VOID -HandleBind(VOID) -{ +handle_t __RPC_USER +SVCCTL_HANDLEA_bind(SVCCTL_HANDLEA szMachineName) +{ + handle_t hBinding = NULL; + UCHAR *pszStringBinding; + RPC_STATUS status; + + ERR("SVCCTL_HANDLEA_bind() called\n"); + + status = RpcStringBindingComposeA((UCHAR *)szMachineName, + (UCHAR *)"ncacn_np", + NULL, + (UCHAR *)"\\pipe\\ntsvcs", + NULL, + (UCHAR **)&pszStringBinding); + if (status) + { + ERR("RpcStringBindingCompose returned 0x%x\n", status); + return NULL; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingA(pszStringBinding, + &hBinding); + if (status) + { + ERR("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeA(&pszStringBinding); + if (status) + { + ERR("RpcStringFree returned 0x%x\n", status); + } + + return hBinding; +} + + +void __RPC_USER +SVCCTL_HANDLEA_unbind(SVCCTL_HANDLEA szMachineName, + handle_t hBinding) +{ + RPC_STATUS status; + + ERR("SVCCTL_HANDLEA_unbind() called\n"); + + status = RpcBindingFree(&hBinding); + if (status) + { + ERR("RpcBindingFree returned 0x%x\n", status); + } +} + + +handle_t __RPC_USER +SVCCTL_HANDLEW_bind(SVCCTL_HANDLEW szMachineName) +{ + handle_t hBinding = NULL; LPWSTR pszStringBinding; RPC_STATUS status; - if (BindingHandle != NULL) - return; + ERR("SVCCTL_HANDLEW_bind() called\n"); + + + status = RpcStringBindingComposeW(szMachineName, + L"ncacn_np", + NULL, + L"\\pipe\\ntsvcs", + NULL, + &pszStringBinding); + if (status) + { + ERR("RpcStringBindingCompose returned 0x%x\n", status); + return NULL; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingW(pszStringBinding, + &hBinding); + if (status) + { + ERR("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeW(&pszStringBinding); + if (status) + { + ERR("RpcStringFree returned 0x%x\n", status); + } + + return hBinding; +} + + +void __RPC_USER +SVCCTL_HANDLEW_unbind(SVCCTL_HANDLEW szMachineName, + handle_t hBinding) +{ + RPC_STATUS status; + + ERR("SVCCTL_HANDLEW_unbind() called\n"); + + status = RpcBindingFree(&hBinding); + if (status) + { + ERR("RpcBindingFree returned 0x%x\n", status); + } +} + + +handle_t __RPC_USER +RPC_SERVICE_STATUS_HANDLE_bind(RPC_SERVICE_STATUS_HANDLE hServiceStatus) +{ + handle_t hBinding = NULL; + LPWSTR pszStringBinding; + RPC_STATUS status; + + ERR("RPC_SERVICE_STATUS_HANDLE_bind() called\n"); + status = RpcStringBindingComposeW(NULL, L"ncacn_np", @@ -40,116 +150,6 @@ &pszStringBinding); if (status) { - TRACE("RpcStringBindingCompose returned 0x%x\n", status); - return; - } - - /* Set the binding handle that will be used to bind to the server. */ - status = RpcBindingFromStringBindingW(pszStringBinding, - &BindingHandle); - if (status) - { - TRACE("RpcBindingFromStringBinding returned 0x%x\n", status); - } - - status = RpcStringFreeW(&pszStringBinding); - if (status) - { - TRACE("RpcStringFree returned 0x%x\n", status); - } -} - - -#if 0 -static VOID -HandleUnbind(VOID) -{ - RPC_STATUS status; - - if (BindingHandle == NULL) - return; - - status = RpcBindingFree(&BindingHandle); - if (status) - { - TRACE("RpcBindingFree returned 0x%x\n", status); - } -} -#endif - -handle_t __RPC_USER -SVCCTL_HANDLEA_bind(SVCCTL_HANDLEA szMachineName) -{ - handle_t hBinding = NULL; - UCHAR *pszStringBinding; - RPC_STATUS status; - - ERR("SVCCTL_HANDLEA_bind() called\n"); - - status = RpcStringBindingComposeA((UCHAR *)szMachineName, - (UCHAR *)"ncacn_np", - NULL, - (UCHAR *)"\\pipe\\ntsvcs", - NULL, - (UCHAR **)&pszStringBinding); - if (status) - { - ERR("RpcStringBindingCompose returned 0x%x\n", status); - return NULL; - } - - /* Set the binding handle that will be used to bind to the server. */ - status = RpcBindingFromStringBindingA(pszStringBinding, - &hBinding); - if (status) - { - ERR("RpcBindingFromStringBinding returned 0x%x\n", status); - } - - status = RpcStringFreeA(&pszStringBinding); - if (status) - { - ERR("RpcStringFree returned 0x%x\n", status); - } - - return hBinding; -} - - -void __RPC_USER -SVCCTL_HANDLEA_unbind(SVCCTL_HANDLEA szMachineName, - handle_t hBinding) -{ - RPC_STATUS status; - - ERR("SVCCTL_HANDLEA_unbind() called\n"); - - status = RpcBindingFree(&hBinding); - if (status) - { - ERR("RpcBindingFree returned 0x%x\n", status); - } -} - - -handle_t __RPC_USER -SVCCTL_HANDLEW_bind(SVCCTL_HANDLEW szMachineName) -{ - handle_t hBinding = NULL; - LPWSTR pszStringBinding; - RPC_STATUS status; - - ERR("SVCCTL_HANDLEW_bind() called\n"); - - - status = RpcStringBindingComposeW(szMachineName, - L"ncacn_np", - NULL, - L"\\pipe\\ntsvcs", - NULL, - &pszStringBinding); - if (status) - { ERR("RpcStringBindingCompose returned 0x%x\n", status); return NULL; } @@ -173,62 +173,6 @@ void __RPC_USER -SVCCTL_HANDLEW_unbind(SVCCTL_HANDLEW szMachineName, - handle_t hBinding) -{ - RPC_STATUS status; - - ERR("SVCCTL_HANDLEW_unbind() called\n"); - - status = RpcBindingFree(&hBinding); - if (status) - { - ERR("RpcBindingFree returned 0x%x\n", status); - } -} - - -handle_t __RPC_USER -RPC_SERVICE_STATUS_HANDLE_bind(RPC_SERVICE_STATUS_HANDLE hServiceStatus) -{ - handle_t hBinding = NULL; - LPWSTR pszStringBinding; - RPC_STATUS status; - - ERR("RPC_SERVICE_STATUS_HANDLE_bind() called\n"); - - - status = RpcStringBindingComposeW(NULL, - L"ncacn_np", - NULL, - L"\\pipe\\ntsvcs", - NULL, - &pszStringBinding); - if (status) - { - ERR("RpcStringBindingCompose returned 0x%x\n", status); - return NULL; - } - - /* Set the binding handle that will be used to bind to the server. */ - status = RpcBindingFromStringBindingW(pszStringBinding, - &hBinding); - if (status) - { - ERR("RpcBindingFromStringBinding returned 0x%x\n", status); - } - - status = RpcStringFreeW(&pszStringBinding); - if (status) - { - ERR("RpcStringFree returned 0x%x\n", status); - } - - return hBinding; -} - - -void __RPC_USER RPC_SERVICE_STATUS_HANDLE_unbind(RPC_SERVICE_STATUS_HANDLE hServiceStatus, handle_t hBinding) { @@ -300,12 +244,9 @@ if (lpInfo == NULL) return TRUE; - HandleBind(); - - _SEH_TRY - { - dwError = RChangeServiceConfig2A(BindingHandle, - (SC_RPC_HANDLE)hService, + _SEH_TRY + { + dwError = RChangeServiceConfig2A((SC_RPC_HANDLE)hService, Info); } _SEH_HANDLE @@ -363,12 +304,9 @@ if (lpInfo == NULL) return TRUE; - HandleBind(); - - _SEH_TRY - { - dwError = RChangeServiceConfig2W(BindingHandle, - (SC_RPC_HANDLE)hService, + _SEH_TRY + { + dwError = RChangeServiceConfig2W((SC_RPC_HANDLE)hService, Info); } _SEH_HANDLE @@ -428,13 +366,10 @@ /* FIXME: Encrypt the password */ - HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = RChangeServiceConfigA(BindingHandle, - (SC_RPC_HANDLE)hService, + dwError = RChangeServiceConfigA((SC_RPC_HANDLE)hService, dwServiceType, dwStartType, dwErrorControl, @@ -505,13 +440,10 @@ /* FIXME: Encrypt the password */ - HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = RChangeServiceConfigW(BindingHandle, - (SC_RPC_HANDLE)hService, + dwError = RChangeServiceConfigW((SC_RPC_HANDLE)hService, dwServiceType, dwStartType, dwErrorControl, @@ -554,13 +486,10 @@ TRACE("CloseServiceHandle() called\n"); - HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = RCloseServiceHandle(BindingHandle, - (LPSC_RPC_HANDLE)&hSCObject); + dwError = RCloseServiceHandle((LPSC_RPC_HANDLE)&hSCObject); } _SEH_HANDLE { @@ -596,13 +525,10 @@ TRACE("ControlService(%x, %x, %p)\n", hService, dwControl, lpServiceStatus); - HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = RControlService(BindingHandle, - (SC_RPC_HANDLE)hService, + dwError = RControlService((SC_RPC_HANDLE)hService, dwControl, lpServiceStatus); } @@ -853,13 +779,10 @@ /* FIXME: Encrypt the password */ - HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = RCreateServiceW(BindingHandle, - (SC_RPC_HANDLE)hSCManager, + dwError = RCreateServiceW((SC_RPC_HANDLE)hSCManager, (LPWSTR)lpServiceName, (LPWSTR)lpDisplayName, dwDesiredAccess, @@ -905,13 +828,10 @@ TRACE("DeleteService(%x)\n", hService); - HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = RDeleteService(BindingHandle, - (SC_RPC_HANDLE)hService); + dwError = RDeleteService((SC_RPC_HANDLE)hService); } _SEH_HANDLE { @@ -949,12 +869,9 @@ TRACE("EnumServicesStatusA() called\n"); - HandleBind(); - - _SEH_TRY - { - dwError = REnumDependentServicesA(BindingHandle, - (SC_RPC_HANDLE)hService, + _SEH_TRY + { + dwError = REnumDependentServicesA((SC_RPC_HANDLE)hService, dwServiceState, (LPBYTE)lpServices, cbBufSize, @@ -1013,12 +930,9 @@ TRACE("EnumServicesStatusW() called\n"); - HandleBind(); - - _SEH_TRY - { - dwError = REnumDependentServicesW(BindingHandle, - (SC_RPC_HANDLE)hService, + _SEH_TRY + { + dwError = REnumDependentServicesW((SC_RPC_HANDLE)hService, dwServiceState, (LPBYTE)lpServices, cbBufSize, @@ -1103,12 +1017,9 @@ TRACE("EnumServicesStatusA() called\n"); - HandleBind(); - - _SEH_TRY - { - dwError = REnumServicesStatusA(BindingHandle, - (SC_RPC_HANDLE)hSCManager, + _SEH_TRY + { + dwError = REnumServicesStatusA((SC_RPC_HANDLE)hSCManager, dwServiceType, dwServiceState, (LPBYTE)lpServices, @@ -1171,12 +1082,9 @@ TRACE("EnumServicesStatusW() called\n"); - HandleBind(); - - _SEH_TRY - { - dwError = REnumServicesStatusW(BindingHandle, - (SC_RPC_HANDLE)hSCManager, + _SEH_TRY + { + dwError = REnumServicesStatusW((SC_RPC_HANDLE)hSCManager, dwServiceType, dwServiceState, (LPBYTE)lpServices, @@ -1241,12 +1149,9 @@ TRACE("EnumServicesStatusExA() called\n"); - HandleBind(); - - _SEH_TRY - { - dwError = REnumServicesStatusExA(BindingHandle, - (SC_RPC_HANDLE)hSCManager, + _SEH_TRY + { + dwError = REnumServicesStatusExA((SC_RPC_HANDLE)hSCManager, InfoLevel, dwServiceType, dwServiceState, @@ -1321,12 +1226,9 @@ TRACE("EnumServicesStatusExW() called\n"); - HandleBind(); - - _SEH_TRY - { - dwError = REnumServicesStatusExW(BindingHandle, - (SC_RPC_HANDLE)hSCManager, + _SEH_TRY + { + dwError = REnumServicesStatusExW((SC_RPC_HANDLE)hSCManager, InfoLevel, dwServiceType, dwServiceState, @@ -1396,12 +1298,9 @@ if (!lpDisplayName) *lpcchBuffer = 0; - HandleBind(); - - _SEH_TRY - { - dwError = RGetServiceDisplayNameA(BindingHandle, - (SC_RPC_HANDLE)hSCManager, + _SEH_TRY + { + dwError = RGetServiceDisplayNameA((SC_RPC_HANDLE)hSCManager, (LPSTR)lpServiceName, lpDisplayName, lpcchBuffer); @@ -1444,12 +1343,9 @@ if (!lpDisplayName) *lpcchBuffer = 0; - HandleBind(); - - _SEH_TRY - { - dwError = RGetServiceDisplayNameW(BindingHandle, - (SC_RPC_HANDLE)hSCManager, + _SEH_TRY + { + dwError = RGetServiceDisplayNameW((SC_RPC_HANDLE)hSCManager, (LPWSTR)lpServiceName, lpDisplayName, lpcchBuffer); @@ -1489,12 +1385,9 @@ if (!lpServiceName) *lpcchBuffer = 0; - HandleBind(); - - _SEH_TRY - { - dwError = RGetServiceKeyNameA(BindingHandle, - (SC_RPC_HANDLE)hSCManager, + _SEH_TRY + { + dwError = RGetServiceKeyNameA((SC_RPC_HANDLE)hSCManager, (LPSTR)lpDisplayName, lpServiceName, lpcchBuffer); @@ -1534,12 +1427,9 @@ if (!lpDisplayName) *lpcchBuffer = 0; - HandleBind(); - - _SEH_TRY - { - dwError = RGetServiceKeyNameW(BindingHandle, - (SC_RPC_HANDLE)hSCManager, + _SEH_TRY + { + dwError = RGetServiceKeyNameW((SC_RPC_HANDLE)hSCManager, (LPWSTR)lpDisplayName, lpServiceName, lpcchBuffer); @@ -1574,13 +1464,10 @@ TRACE("LockServiceDatabase(%x)\n", hSCManager); - HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = RLockServiceDatabase(BindingHandle, - (SC_RPC_HANDLE)hSCManager, + dwError = RLockServiceDatabase((SC_RPC_HANDLE)hSCManager, (SC_RPC_LOCK *)&hLock); } _SEH_HANDLE @@ -1660,13 +1547,10 @@ WaitForSCManager(); -// HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = ROpenSCManagerA(//BindingHandle, - (LPSTR)lpMachineName, + dwError = ROpenSCManagerA((LPSTR)lpMachineName, (LPSTR)lpDatabaseName, dwDesiredAccess, (SC_RPC_HANDLE *)&hScm); @@ -1708,13 +1592,10 @@ WaitForSCManager(); -// HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = ROpenSCManagerW(//BindingHandle, - (LPWSTR)lpMachineName, + dwError = ROpenSCManagerW((LPWSTR)lpMachineName, (LPWSTR)lpDatabaseName, dwDesiredAccess, (SC_RPC_HANDLE *)&hScm); @@ -1754,13 +1635,10 @@ TRACE("OpenServiceA(%p, %s, %lx)\n", hSCManager, lpServiceName, dwDesiredAccess); - HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = ROpenServiceA(BindingHandle, - (SC_RPC_HANDLE)hSCManager, + dwError = ROpenServiceA((SC_RPC_HANDLE)hSCManager, (LPSTR)lpServiceName, dwDesiredAccess, (SC_RPC_HANDLE *)&hService); @@ -1800,13 +1678,10 @@ TRACE("OpenServiceW(%p, %S, %lx)\n", hSCManager, lpServiceName, dwDesiredAccess); - HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = ROpenServiceW(BindingHandle, - (SC_RPC_HANDLE)hSCManager, + dwError = ROpenServiceW((SC_RPC_HANDLE)hSCManager, (LPWSTR)lpServiceName, dwDesiredAccess, (SC_RPC_HANDLE *)&hService); @@ -1849,13 +1724,10 @@ TRACE("QueryServiceConfigA(%p, %p, %lu, %p)\n", hService, lpServiceConfig, cbBufSize, pcbBytesNeeded); - HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = RQueryServiceConfigA(BindingHandle, - (SC_RPC_HANDLE)hService, + dwError = RQueryServiceConfigA((SC_RPC_HANDLE)hService, (LPBYTE)lpServiceConfig, cbBufSize, pcbBytesNeeded); @@ -1921,13 +1793,10 @@ TRACE("QueryServiceConfigW(%p, %p, %lu, %p)\n", hService, lpServiceConfig, cbBufSize, pcbBytesNeeded); - HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = RQueryServiceConfigW(BindingHandle, - (SC_RPC_HANDLE)hService, + dwError = RQueryServiceConfigW((SC_RPC_HANDLE)hService, (LPBYTE)lpServiceConfig, cbBufSize, pcbBytesNeeded); @@ -2011,13 +1880,10 @@ return FALSE; } - HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = RQueryServiceConfig2A(BindingHandle, - (SC_RPC_HANDLE)hService, + dwError = RQueryServiceConfig2A((SC_RPC_HANDLE)hService, dwInfoLevel, lpBuffer, cbBufSize, @@ -2109,13 +1975,10 @@ return FALSE; } - HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = RQueryServiceConfig2W(BindingHandle, - (SC_RPC_HANDLE)hService, + dwError = RQueryServiceConfig2W((SC_RPC_HANDLE)hService, dwInfoLevel, lpBuffer, cbBufSize, @@ -2191,13 +2054,10 @@ TRACE("QueryServiceLockStatusA() called\n"); - HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = RQueryServiceLockStatusA(BindingHandle, - (SC_RPC_HANDLE)hSCManager, + dwError = RQueryServiceLockStatusA((SC_RPC_HANDLE)hSCManager, lpLockStatus, cbBufSize, pcbBytesNeeded); @@ -2242,13 +2102,10 @@ TRACE("QueryServiceLockStatusW() called\n"); - HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = RQueryServiceLockStatusW(BindingHandle, - (SC_RPC_HANDLE)hSCManager, + dwError = RQueryServiceLockStatusW((SC_RPC_HANDLE)hSCManager, lpLockStatus, cbBufSize, pcbBytesNeeded); @@ -2295,13 +2152,10 @@ TRACE("QueryServiceObjectSecurity(%p, %lu, %p)\n", hService, dwSecurityInformation, lpSecurityDescriptor); - HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = RQueryServiceObjectSecurity(BindingHandle, - (SC_RPC_HANDLE)hService, + dwError = RQueryServiceObjectSecurity((SC_RPC_HANDLE)hService, dwSecurityInformation, (LPBYTE)lpSecurityDescriptor, cbBufSize, @@ -2365,13 +2219,10 @@ return FALSE; } - HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = RSetServiceObjectSecurity(BindingHandle, - (SC_RPC_HANDLE)hService, + dwError = RSetServiceObjectSecurity((SC_RPC_HANDLE)hService, dwSecurityInformation, (LPBYTE)SelfRelativeSD, Length); @@ -2409,13 +2260,10 @@ TRACE("QueryServiceStatus(%p, %p)\n", hService, lpServiceStatus); - HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = RQueryServiceStatus(BindingHandle, - (SC_RPC_HANDLE)hService, + dwError = RQueryServiceStatus((SC_RPC_HANDLE)hService, lpServiceStatus); } _SEH_HANDLE @@ -2451,13 +2299,10 @@ TRACE("QueryServiceStatusEx() called\n"); - HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = RQueryServiceStatusEx(BindingHandle, - (SC_RPC_HANDLE)hService, + dwError = RQueryServiceStatusEx((SC_RPC_HANDLE)hService, InfoLevel, lpBuffer, cbBufSize, @@ -2492,12 +2337,9 @@ { DWORD dwError; - HandleBind(); - - _SEH_TRY - { - dwError = RStartServiceA(BindingHandle, - (SC_RPC_HANDLE)hService, + _SEH_TRY + { + dwError = RStartServiceA((SC_RPC_HANDLE)hService, dwNumServiceArgs, (LPSTRING_PTRSA)lpServiceArgVectors); } @@ -2530,12 +2372,9 @@ { DWORD dwError; - HandleBind(); - - _SEH_TRY - { - dwError = RStartServiceW(BindingHandle, - (SC_RPC_HANDLE)hService, + _SEH_TRY + { + dwError = RStartServiceW((SC_RPC_HANDLE)hService, dwNumServiceArgs, (LPSTRING_PTRSW)lpServiceArgVectors); } @@ -2568,13 +2407,10 @@ TRACE("UnlockServiceDatabase(%x)\n", ScLock); - HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = RUnlockServiceDatabase(BindingHandle, - (LPSC_RPC_LOCK)&ScLock); + dwError = RUnlockServiceDatabase((LPSC_RPC_LOCK)&ScLock); } _SEH_HANDLE { @@ -2605,13 +2441,10 @@ TRACE("NotifyBootConfigStatus()\n"); - HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - dwError = RNotifyBootConfigStatus(BindingHandle, - NULL, + dwError = RNotifyBootConfigStatus(NULL, BootAcceptable); } _SEH_HANDLE Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Sun Oct 26 10:11:28 2008 @@ -19,8 +19,6 @@ /* TYPES *********************************************************************/ - -VOID HandleBind(VOID); typedef struct _ACTIVE_SERVICE { @@ -42,7 +40,6 @@ /* GLOBALS *******************************************************************/ -extern handle_t BindingHandle; static DWORD dwActiveServiceCount = 0; static PACTIVE_SERVICE lpActiveServices = NULL; @@ -544,13 +541,10 @@ { BOOL bResult; -// HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - bResult = RI_ScSetServiceBitsA(//BindingHandle, - (RPC_SERVICE_STATUS_HANDLE)hServiceStatus, + bResult = RI_ScSetServiceBitsA((RPC_SERVICE_STATUS_HANDLE)hServiceStatus, dwServiceBits, bSetBitsOn, bUpdateImmediately, @@ -583,13 +577,10 @@ { BOOL bResult; -// HandleBind(); - _SEH_TRY { /* Call to services.exe using RPC */ - bResult = RI_ScSetServiceBitsW(//BindingHandle, - (RPC_SERVICE_STATUS_HANDLE)hServiceStatus, + bResult = RI_ScSetServiceBitsW((RPC_SERVICE_STATUS_HANDLE)hServiceStatus, dwServiceBits, bSetBitsOn, bUpdateImmediately, @@ -639,11 +630,8 @@ TRACE("SetServiceStatus() called\n"); TRACE("hServiceStatus %lu\n", hServiceStatus); -// HandleBind(); - /* Call to services.exe using RPC */ - dwError = RSetServiceStatus(//BindingHandle, - (RPC_SERVICE_STATUS_HANDLE)hServiceStatus, + dwError = RSetServiceStatus((RPC_SERVICE_STATUS_HANDLE)hServiceStatus, lpServiceStatus); if (dwError != ERROR_SUCCESS) { Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Sun Oct 26 10:11:28 2008 @@ -18,11 +18,11 @@ typedef [handle] LPSTR SVCCTL_HANDLEA; typedef [handle] LPWSTR SVCCTL_HANDLEW; typedef [handle] ULONG_PTR RPC_SERVICE_STATUS_HANDLE; -typedef /*[context_handle]*/ unsigned long SC_RPC_HANDLE; +typedef [context_handle] PVOID SC_RPC_HANDLE; typedef SC_RPC_HANDLE* LPSC_RPC_HANDLE; -typedef /*[context_handle]*/ unsigned long SC_RPC_LOCK; +typedef [context_handle] PVOID SC_RPC_LOCK; typedef SC_RPC_LOCK* LPSC_RPC_LOCK; -typedef /*[context_handle]*/ unsigned long SC_NOTIFY_RPC_HANDLE; +typedef [context_handle] PVOID SC_NOTIFY_RPC_HANDLE; typedef SC_NOTIFY_RPC_HANDLE* LPSC_NOTIFY_RPC_HANDLE; typedef [range(0, 1024 * 4)] DWORD BOUNDED_DWORD_4K; typedef BOUNDED_DWORD_4K* LPBOUNDED_DWORD_4K; @@ -297,38 +297,33 @@ uuid(367abb81-9844-35f1-ad32-98f038001003), version(2.0), pointer_default(unique), -// #ifndef __midl + #ifndef __midl ,explicit_handle -// #endif + #endif ] interface svcctl { /* Function 0 */ DWORD RCloseServiceHandle( - [in] handle_t BindingHandle, [in, out] LPSC_RPC_HANDLE hSCObject); /* Function 1 */ DWORD RControlService( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] DWORD dwControl, [out] LPSERVICE_STATUS lpServiceStatus); /* Function 2 */ DWORD RDeleteService( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService); /* Function 3 */ DWORD RLockServiceDatabase( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [out] LPSC_RPC_LOCK lpLock); /* Function 4 */ DWORD RQueryServiceObjectSecurity( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] SECURITY_INFORMATION dwSecurityInformation, [out, size_is(cbBufSize)] LPBYTE lpSecurityDescriptor, @@ -337,7 +332,6 @@ /* Function 5 */ DWORD RSetServiceObjectSecurity( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] DWORD dwSecurityInformation, [in, size_is(dwSecuityDescriptorSize)] LPBYTE lpSecurityDescriptor, @@ -345,30 +339,25 @@ /* Function 6 */ DWORD RQueryServiceStatus( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [out] LPSERVICE_STATUS lpServiceStatus); /* Function 7 */ DWORD RSetServiceStatus( -// [in] handle_t BindingHandle, [in] RPC_SERVICE_STATUS_HANDLE hServiceStatus, [in] LPSERVICE_STATUS lpServiceStatus); /* Function 8 */ DWORD RUnlockServiceDatabase( - [in] handle_t BindingHandle, [in, out] LPSC_RPC_LOCK Lock); /* Function 9 */ DWORD RNotifyBootConfigStatus( - [in] handle_t BindingHandle, [in, string, unique, range(0, SC_MAX_COMPUTER_NAME_LENGTH)] SVCCTL_HANDLEW lpMachineName, [in] DWORD BootAcceptable); /* Function 10 */ DWORD RI_ScSetServiceBitsW( -// [in] handle_t BindingHandle, [in] RPC_SERVICE_STATUS_HANDLE hServiceStatus, [in] DWORD dwServiceBits, [in] BOOL bSetBitsOn, @@ -377,7 +366,6 @@ /* Function 11 */ DWORD RChangeServiceConfigW( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] DWORD dwServiceType, [in] DWORD dwStartType, @@ -394,7 +382,6 @@ /* Function 12 */ DWORD RCreateServiceW( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in, string, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpServiceName, [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpDisplayName, @@ -414,7 +401,6 @@ /* Function 13 */ DWORD REnumDependentServicesW( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] DWORD dwServiceState, [out, size_is(cbBufSize)] LPBYTE lpServices, @@ -424,7 +410,6 @@ /* Function 14 */ DWORD REnumServicesStatusW( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in] DWORD dwServiceType, [in] DWORD dwServiceState, @@ -436,7 +421,6 @@ /* Function 15 */ DWORD ROpenSCManagerW( -// [in] handle_t BindingHandle, [in, string, unique, range(0, SC_MAX_COMPUTER_NAME_LENGTH)] SVCCTL_HANDLEW lpMachineName, [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpDatabaseName, [in] DWORD dwDesiredAccess, @@ -444,7 +428,6 @@ /* Function 16 */ DWORD ROpenServiceW( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in, string, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpServiceName, [in] DWORD dwDesiredAccess, @@ -452,7 +435,6 @@ /* Function 17 */ DWORD RQueryServiceConfigW( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig, /* FIXME: should be [out] LPQUERY_SERVICE_CONFIGW lpServiceConfig, */ @@ -461,7 +443,6 @@ /* Function 18 */ DWORD RQueryServiceLockStatusW( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [out] LPQUERY_SERVICE_LOCK_STATUSW lpLockStatus, [in, range(0, 1024*4)] DWORD cbBufSize, @@ -469,14 +450,12 @@ /* Function 19 */ DWORD RStartServiceW( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in, range(0, SC_MAX_ARGUMENTS)] DWORD argc, [in, unique, size_is(argc)] LPSTRING_PTRSW argv); /* Function 20 */ DWORD RGetServiceDisplayNameW( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in, string, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpServiceName, [out, string, range(1, 4*1024+1), size_is(*lpcchBuffer + 1)] LPWSTR lpDisplayName, @@ -484,7 +463,6 @@ /* Function 21 */ DWORD RGetServiceKeyNameW( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in, string, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpDisplayName, [out, string, range(1, 4*1024+1), size_is(*lpcchBuffer + 1)] LPWSTR lpServiceName, @@ -492,7 +470,6 @@ /* Function 22 */ DWORD RI_ScSetServiceBitsA( -// [in] handle_t BindingHandle, [in] RPC_SERVICE_STATUS_HANDLE hServiceStatus, [in] DWORD dwServiceBits, [in] BOOL bSetBitsOn, @@ -501,7 +478,6 @@ /* Function 23 */ DWORD RChangeServiceConfigA( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] DWORD dwServiceType, [in] DWORD dwStartType, @@ -518,7 +494,6 @@ /* Function 24 */ DWORD RCreateServiceA( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in, string, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpServiceName, [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpDisplayName, @@ -538,7 +513,6 @@ /* Function 25 */ DWORD REnumDependentServicesA( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] DWORD dwServiceState, [out, size_is(cbBufSize)] LPBYTE lpServices, @@ -548,7 +522,6 @@ /* Function 26 */ DWORD REnumServicesStatusA( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in] DWORD dwServiceType, [in] DWORD dwServiceState, @@ -560,7 +533,6 @@ /* Function 27 */ DWORD ROpenSCManagerA( -// [in] handle_t BindingHandle, [in, string, unique, range(0, SC_MAX_COMPUTER_NAME_LENGTH)] SVCCTL_HANDLEA lpMachineName, [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpDatabaseName, [in] DWORD dwDesiredAccess, @@ -568,7 +540,6 @@ /* Function 28 */ DWORD ROpenServiceA( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in, string, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpServiceName, [in] DWORD dwDesiredAccess, @@ -576,7 +547,6 @@ /* Function 29 */ DWORD RQueryServiceConfigA( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig, /* FIXME: should be [out] LPQUERY_SERVICE_CONFIGA lpServiceConfig, */ @@ -585,7 +555,6 @@ /* Function 30 */ DWORD RQueryServiceLockStatusA( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [out] LPQUERY_SERVICE_LOCK_STATUSA lpLockStatus, [in, range(0, 1024*4)] DWORD cbBufSize, @@ -593,14 +562,12 @@ /* Function 31 */ DWORD RStartServiceA( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in, range(0, SC_MAX_ARGUMENTS)] DWORD argc, [in, unique, size_is(argc)] LPSTRING_PTRSA argv); /* Function 32 */ DWORD RGetServiceDisplayNameA( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in, string, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpServiceName, [out, string, size_is(*lpcchBuffer)] LPSTR lpDisplayName, @@ -608,7 +575,6 @@ /* Function 33 */ DWORD RGetServiceKeyNameA( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in, string, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpDisplayName, [out, string, size_is(*lpcchBuffer)] LPSTR lpKeyName, @@ -616,14 +582,12 @@ /* Function 34 */ DWORD RI_ScGetCurrentGroupStateW( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpLoadOrderGroup, [out] LPDWORD lpState); /* Function 35 */ DWORD REnumServiceGroupW( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in] DWORD dwServiceType, [in] DWORD dwServiceState, @@ -636,19 +600,16 @@ /* Function 36 */ DWORD RChangeServiceConfig2A( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] SC_RPC_CONFIG_INFOA Info); /* Function 37 */ DWORD RChangeServiceConfig2W( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] SC_RPC_CONFIG_INFOW Info); /* Function 38 */ DWORD RQueryServiceConfig2A( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] DWORD dwInfoLevel, [out, size_is(cbBufSize)] LPBYTE lpBuffer, @@ -657,7 +618,6 @@ /* Function 39 */ DWORD RQueryServiceConfig2W( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] DWORD dwInfoLevel, [out, size_is(cbBufSize)] LPBYTE lpBuffer, @@ -666,7 +626,6 @@ /* Function 40 */ DWORD RQueryServiceStatusEx( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] SC_STATUS_TYPE InfoLevel, [out, size_is(cbBufSize)] LPBYTE lpBuffer, @@ -675,7 +634,6 @@ /* Function 41 */ DWORD REnumServicesStatusExA( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in] SC_ENUM_TYPE InfoLevel, [in] DWORD dwServiceType, @@ -689,7 +647,6 @@ /* Function 42 */ DWORD REnumServicesStatusExW( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hSCManager, [in] SC_ENUM_TYPE InfoLevel, [in] DWORD dwServiceType, @@ -749,7 +706,6 @@ /* Function 47 */ DWORD RNotifyServiceStatusChange( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] SC_RPC_NOTIFY_PARAMS NotifyParams, [in] GUID* pClientProcessGuid, @@ -759,19 +715,16 @@ /* Function 48 */ DWORD RGetNotifyResults( - [in] handle_t BindingHandle, [in] SC_NOTIFY_RPC_HANDLE hNotify, [out] PSC_RPC_NOTIFY_PARAMS_LIST *ppNotifyParams); /* Function 49 */ DWORD RCloseNotifyHandle( - [in] handle_t BindingHandle, [in, out] LPSC_NOTIFY_RPC_HANDLE phNotify, [out] PBOOL pfApcFired); /* Function 50 */ DWORD RControlServiceExA( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] DWORD dwControl, [in] DWORD dwInfoLevel/*, @@ -780,7 +733,6 @@ /* Function 51 */ DWORD RControlServiceExW( - [in] handle_t BindingHandle, [in] SC_RPC_HANDLE hService, [in] DWORD dwControl, [in] DWORD dwInfoLevel/*,

1 0

[sginsberg] 36990: - Fix function definitions to match header changes - Don't use x86 fiber assembly for amd64, just stub it out completely - Use AMD64 definitions in BasepInitializeContext, and add a broken KGDT_64_R3_TEB
by sginsberg＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: sginsberg Date: Sun Oct 26 09:45:13 2008 New Revision: 36990 URL: http://svn.reactos.org/svn/reactos?rev=36990&view=rev Log: - Fix function definitions to match header changes - Don't use x86 fiber assembly for amd64, just stub it out completely - Use AMD64 definitions in BasepInitializeContext, and add a broken KGDT_64_R3_TEB Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/utils.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/process/proc.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/amd64/fiber.S branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/utils.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/utils.c [iso-8859-1] Sun Oct 26 09:45:13 2008 @@ -386,11 +386,11 @@ /* The other registers are undefined */ /* Setup the Segments */ - Context->SegFs = KGDT_R3_TEB | RPL_MASK; - Context->SegEs = KGDT_R3_DATA | RPL_MASK; - Context->SegDs = KGDT_R3_DATA | RPL_MASK; - Context->SegCs = KGDT_R3_CODE | RPL_MASK; - Context->SegSs = KGDT_R3_DATA | RPL_MASK; + Context->SegFs = KGDT_64_R3_TEB | RPL_MASK; + Context->SegEs = KGDT_64_DATA | RPL_MASK; + Context->SegDs = KGDT_64_DATA | RPL_MASK; + Context->SegCs = KGDT_64_R3_CODE | RPL_MASK; + Context->SegSs = KGDT_64_DATA | RPL_MASK; Context->SegGs = 0; /* Set the EFLAGS */ Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/process/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] Sun Oct 26 09:45:13 2008 @@ -33,8 +33,8 @@ */ BOOL STDCALL GetProcessAffinityMask (HANDLE hProcess, - LPDWORD lpProcessAffinityMask, - LPDWORD lpSystemAffinityMask) + PDWORD_PTR lpProcessAffinityMask, + PDWORD_PTR lpSystemAffinityMask) { PROCESS_BASIC_INFORMATION ProcessInfo; SYSTEM_BASIC_INFORMATION SystemInfo; @@ -73,7 +73,7 @@ */ BOOL STDCALL SetProcessAffinityMask (HANDLE hProcess, - DWORD dwProcessAffinityMask) + DWORD_PTR dwProcessAffinityMask) { NTSTATUS Status; Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/amd64/fiber.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/amd64/fiber.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/amd64/fiber.S [iso-8859-1] Sun Oct 26 09:45:13 2008 @@ -9,116 +9,9 @@ #include <ndk/asm.h> -#define CONTEXT_FULL 0x10007 -#define CONTEXT_FLOATING_POINT 0xF - .globl _SwitchToFiber .intel_syntax noprefix _SwitchToFiber: - /* Get the TEB */ - mov edx, fs:[KGDT_R3_TEB] - - /* Get the Fiber */ - mov eax, [edx+TEB_FIBER_DATA] - - /* Save the non-volatile registers */ - mov [eax+FIBER_CONTEXT_EBX], ebx - mov [eax+FIBER_CONTEXT_ESI], esi - mov [eax+FIBER_CONTEXT_EDI], edi - mov [eax+FIBER_CONTEXT_EBP], ebp - - /* Check if we're to save FPU State */ - cmp dword ptr [eax+FIBER_CONTEXT_FLAGS], CONTEXT_FULL + CONTEXT_FLOATING_POINT - jnz NoFpuStateSave - - /* Save the FPU State (Status and Control)*/ - fstsw [eax+FIBER_CONTEXT_FLOAT_SAVE_STATUS_WORD] - fstcw [eax+FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD] - - /* Check if the CPU supports SIMD MXCSR State Save */ - cmp byte ptr ds:[PROCESSOR_FEATURE_FXSR], 0 - jnz NoFpuStateSave - stmxcsr [eax+FIBER_CONTEXT_DR6] - -NoFpuStateSave: - - /* Save stack since we're not touching it anymore */ - mov [eax+FIBER_CONTEXT_ESP], esp - - /* Transfer some data from the TEB */ - mov ecx, [edx+TEB_FLS_DATA] - mov [eax+FIBER_FLS_DATA], ecx - mov ecx, [edx+TEB_ACTIVATION_CONTEXT_STACK_POINTER] - mov [eax+FIBER_ACTIVATION_CONTEXT_STACK], ecx - - /* Transfer some data related to the Stack */ - mov ecx, [edx+TEB_EXCEPTION_LIST] - mov [eax+FIBER_EXCEPTION_LIST], ecx - mov ecx, [edx+TEB_STACK_LIMIT] - mov [eax+FIBER_STACK_LIMIT], ecx - mov ecx, [edx+TEB_GUARANTEED_STACK_BYTES] - mov [eax+FIBER_GUARANTEED_STACK_BYTES], ecx - - /* Switch to the new fiber */ - mov ecx, [esp+4] - mov [edx+TEB_FIBER_DATA], ecx - - /* Switch Fiber Data */ - mov esi, [ecx+FIBER_EXCEPTION_LIST] - mov [edx+TEB_EXCEPTION_LIST], esi - mov esi, [ecx+FIBER_STACK_BASE] - mov [edx+TEB_STACK_BASE], esi - mov esi, [ecx+FIBER_STACK_LIMIT] - mov [edx+TEB_STACK_LIMIT], esi - mov esi, [ecx+FIBER_DEALLOCATION_STACK] - mov [edx+TEB_DEALLOCATION_STACK], esi - mov esi, [ecx+FIBER_GUARANTEED_STACK_BYTES] - mov [edx+TEB_GUARANTEED_STACK_BYTES], esi - mov esi, [ecx+FIBER_ACTIVATION_CONTEXT_STACK] - mov [edx+TEB_ACTIVATION_CONTEXT_STACK_POINTER], esi - - /* Restore FPU State */ - cmp dword ptr [eax+FIBER_CONTEXT_FLAGS], CONTEXT_FULL + CONTEXT_FLOATING_POINT - jnz NoFpuStateRestore - - /* Check if the Status Word Changed */ - mov esi, [eax+FIBER_CONTEXT_FLOAT_SAVE_STATUS_WORD] - cmp si, word ptr [ecx+FIBER_CONTEXT_FLOAT_SAVE_STATUS_WORD] - jnz StatusWordChanged - - /* Check if the Control Word Changed */ - mov esi, [eax+FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD] - cmp si, word ptr [ecx+FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD] - jz ControlWordEqual - -StatusWordChanged: - - /* Load the new one */ - mov word ptr [ecx+FIBER_CONTEXT_FLOAT_SAVE_TAG_WORD], 0xFFFF - fldenv [ecx+FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD] - -ControlWordEqual: - - /* Load the new one */ - cmp byte ptr ds:[PROCESSOR_FEATURE_FXSR], 0 - jnz NoFpuStateRestore - ldmxcsr [ecx+FIBER_CONTEXT_DR6] - -NoFpuStateRestore: - - /* Restore non-volatile registers */ - mov esi, [ecx+FIBER_CONTEXT_ESI] - mov edi, [ecx+FIBER_CONTEXT_EDI] - mov ebx, [ecx+FIBER_CONTEXT_EBX] - mov ebp, [ecx+FIBER_CONTEXT_EBP] - mov esp, [ecx+FIBER_CONTEXT_ESP] - - /* Restore FLS Data */ - mov eax, [ecx+FIBER_FLS_DATA] - mov [edx+TEB_FLS_DATA], eax - - /* Return */ + /* FIXME: TODO */ ret 4 - -/* EOF */ Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Sun Oct 26 09:45:13 2008 @@ -64,6 +64,7 @@ #define KGDT_64_R3_CODE 0x0030 // 33 #define KGDT_TSS 0x0040 #define KGDT_32_R3_TEB 0x0050 // 53 +#define KGDT_64_R3_TEB 0x0000 // FIXME //

1 0

[fireball] 36989: - Print out event GUID if it's unknown in umpnpmgr. - Fix a typo in vdmmain.c.
by fireball＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: fireball Date: Sun Oct 26 09:38:50 2008 New Revision: 36989 URL: http://svn.reactos.org/svn/reactos?rev=36989&view=rev Log: - Print out event GUID if it's unknown in umpnpmgr. - Fix a typo in vdmmain.c. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/ntoskrnl/vdm/vdmmain.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] Sun Oct 26 09:38:50 2008 @@ -2193,7 +2193,11 @@ } else { - DPRINT1("Unknown event\n"); + DPRINT1("Unknown event, GUID {%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}\n", + PnpEvent->EventGuid.Data1, PnpEvent->EventGuid.Data2, PnpEvent->EventGuid.Data3, + PnpEvent->EventGuid.Data4[0], PnpEvent->EventGuid.Data4[1], PnpEvent->EventGuid.Data4[2], + PnpEvent->EventGuid.Data4[3], PnpEvent->EventGuid.Data4[4], PnpEvent->EventGuid.Data4[5], + PnpEvent->EventGuid.Data4[6], PnpEvent->EventGuid.Data4[7]); } /* Dequeue the current pnp event and signal the next one */ Modified: trunk/reactos/ntoskrnl/vdm/vdmmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/vdm/vdmmain.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/vdm/vdmmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/vdm/vdmmain.c [iso-8859-1] Sun Oct 26 09:38:50 2008 @@ -120,7 +120,7 @@ return Status; } - /* Now, copy the first physical pagee into the first virtual page */ + /* Now, copy the first physical page into the first virtual page */ _SEH_TRY { RtlMoveMemory(NullAddress, BaseAddress, ViewSize);

1 0

[sginsberg] 36988: - Make user32 compile and link by defining Get/SetClass/WindowLongPtrA/W
by sginsberg＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: sginsberg Date: Sun Oct 26 09:25:12 2008 New Revision: 36988 URL: http://svn.reactos.org/svn/reactos?rev=36988&view=rev Log: - Make user32 compile and link by defining Get/SetClass/WindowLongPtrA/W Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.spec branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/class.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.spec [iso-8859-1] Sun Oct 26 09:25:12 2008 @@ -256,8 +256,11 @@ @ stdcall GetClassInfoW(long wstr ptr) @ stdcall GetClassLongA(long long) @ stdcall GetClassLongW(long long) -@ stub GetClassLongPtrA -@ stub GetClassLongPtrW + +; FIXME -- Only for Win64 +@ stdcall GetClassLongPtrA(ptr long) +@ stdcall GetClassLongPtrW(ptr long) + @ stdcall GetClassNameA(long ptr long) @ stdcall GetClassNameW(long ptr long) @ stdcall GetClassWord(long long) @@ -375,8 +378,11 @@ @ stdcall GetWindowDC(long) @ stdcall GetWindowInfo(long ptr) @ stdcall GetWindowLongA(long long) -@ stub GetWindowLongPtrA -@ stub GetWindowLongPtrW + +; FIXME -- Only for Win64 +@ stdcall GetWindowLongPtrA(ptr long) +@ stdcall GetWindowLongPtrW(ptr long) + @ stdcall GetWindowLongW(long long) @ stdcall GetWindowModuleFileName(long ptr long) GetWindowModuleFileNameA @ stdcall GetWindowModuleFileNameA(long ptr long) @@ -603,8 +609,11 @@ @ stdcall SetCaretBlinkTime(long) @ stdcall SetCaretPos(long long) @ stdcall SetClassLongA(long long long) -@ stub SetClassLongPtrA #(long long long) -@ stub SetClassLongPtrW #(long long long) + +; FIXME -- Only for Win64 +@ stdcall SetClassLongPtrA(ptr long ptr) +@ stdcall SetClassLongPtrW(ptr long ptr) + @ stdcall SetClassLongW(long long long) @ stdcall SetClassWord(long long long) @ stdcall SetClipboardData(long long) @@ -665,8 +674,11 @@ @ stdcall SetWindowContextHelpId(long long) @ stub SetWindowFullScreenState @ stdcall SetWindowLongA(long long long) -@ stub SetWindowLongPtrA #(long long long) -@ stub SetWindowLongPtrW #(long long long) + +; FIXME -- Only for Win64 +@ stdcall SetWindowLongPtrA(ptr long ptr) +@ stdcall SetWindowLongPtrW(ptr long ptr) + @ stdcall SetWindowLongW(long long long) @ stdcall SetWindowPlacement(long ptr) @ stdcall SetWindowPos(long long long long long long long) Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/class.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/class.c [iso-8859-1] Sun Oct 26 09:25:12 2008 @@ -410,6 +410,32 @@ return Ret; } +#ifdef _WIN64 +/* + * @unimplemented + */ +ULONG_PTR +WINAPI +GetClassLongPtrA(HWND hWnd, + INT nIndex) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +ULONG_PTR +WINAPI +GetClassLongPtrW(HWND hWnd, + INT nIndex) +{ + UNIMPLEMENTED; + return 0; +} +#endif + /* * @implemented @@ -602,6 +628,32 @@ } } +#ifdef _WIN64 +/* + * @unimplemented + */ +LONG_PTR +WINAPI +GetWindowLongPtrA(HWND hWnd, + INT nIndex) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +LONG_PTR +WINAPI +GetWindowLongPtrW(HWND hWnd, + INT nIndex) +{ + UNIMPLEMENTED; + return 0; +} +#endif // _WIN64 + /* * @implemented */ @@ -1159,6 +1211,33 @@ FALSE); } +#ifdef _WIN64 +/* + * @unimplemented + */ +ULONG_PTR +WINAPI +SetClassLongPtrA(HWND hWnd, + INT nIndex, + LONG_PTR dwNewLong) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +ULONG_PTR +WINAPI +SetClassLongPtrW(HWND hWnd, + INT nIndex, + LONG_PTR dwNewLong) +{ + UNIMPLEMENTED; + return 0; +} +#endif // _WIN64 /* * @implemented @@ -1207,6 +1286,33 @@ return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, FALSE); } +#ifdef _WIN64 +/* + * @unimplemented + */ +LONG_PTR +WINAPI +SetWindowLongPtrA(HWND hWnd, + INT nIndex, + LONG_PTR dwNewLong) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +LONG_PTR +WINAPI +SetWindowLongPtrW(HWND hWnd, + INT nIndex, + LONG_PTR dwNewLong) +{ + UNIMPLEMENTED; + return 0; +} +#endif /* * @implemented

1 0

[sserapion] 36987: - Fix user32 compilation errors. - Don't let stefan steal the glory.
by sserapion＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: sserapion Date: Sun Oct 26 08:56:59 2008 New Revision: 36987 URL: http://svn.reactos.org/svn/reactos?rev=36987&view=rev Log: - Fix user32 compilation errors. - Don't let stefan steal the glory. Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/winhelp.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/menu.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Sun Oct 26 08:56:59 2008 @@ -206,7 +206,7 @@ HWND hwnd1, HWND hwnd2, UINT u1, - DWORD dw1, + ULONG_PTR dw1, HCURSOR hc1 ) { Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/winhelp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/winhelp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/winhelp.c [iso-8859-1] Sun Oct 26 08:56:59 2008 @@ -51,7 +51,7 @@ */ BOOL STDCALL -WinHelpA(HWND hWnd, LPCSTR lpszHelp, UINT uCommand, DWORD dwData) +WinHelpA(HWND hWnd, LPCSTR lpszHelp, UINT uCommand, ULONG_PTR dwData) { static WORD WM_WINHELP = 0; HWND hDest; @@ -137,7 +137,7 @@ */ BOOL STDCALL -WinHelpW(HWND hWnd, LPCWSTR lpszHelp, UINT uCommand, DWORD dwData) +WinHelpW(HWND hWnd, LPCWSTR lpszHelp, UINT uCommand, ULONG_PTR dwData) { INT len; LPSTR file; Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sun Oct 26 08:56:59 2008 @@ -4523,7 +4523,7 @@ HMENU hMenu, UINT uPosition, UINT uFlags, - UINT uIDNewItem, + UINT_PTR uIDNewItem, LPCSTR lpNewItem) { MENUITEMINFOA mii; @@ -4645,7 +4645,7 @@ HMENU hMenu, UINT uPosition, UINT uFlags, - UINT uIDNewItem, + UINT_PTR uIDNewItem, LPCWSTR lpNewItem) { MENUITEMINFOW mii; @@ -4784,7 +4784,7 @@ HMENU hMnu, UINT uPosition, UINT uFlags, - UINT uIDNewItem, + UINT_PTR uIDNewItem, LPCSTR lpNewItem) { ROSMENUINFO mi; @@ -4831,7 +4831,7 @@ HMENU hMnu, UINT uPosition, UINT uFlags, - UINT uIDNewItem, + UINT_PTR uIDNewItem, LPCWSTR lpNewItem) { ROSMENUINFO mi;

1 0

[cwittich] 36986: import LookupPrivilegeNameA from wine
by cwittich＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: cwittich Date: Sun Oct 26 07:35:42 2008 New Revision: 36986 URL: http://svn.reactos.org/svn/reactos?rev=36986&view=rev Log: import LookupPrivilegeNameA from wine Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] Sun Oct 26 07:35:42 2008 @@ -1396,11 +1396,51 @@ LookupPrivilegeNameA(LPCSTR lpSystemName, PLUID lpLuid, LPSTR lpName, - LPDWORD cbName) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - SetLastError (ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + LPDWORD cchName) +{ + UNICODE_STRING lpSystemNameW; + BOOL ret; + DWORD wLen = 0; + + TRACE("%s %p %p %p\n", debugstr_a(lpSystemName), lpLuid, lpName, cchName); + + RtlCreateUnicodeStringFromAsciiz(&lpSystemNameW, lpSystemName); + ret = LookupPrivilegeNameW(lpSystemNameW.Buffer, lpLuid, NULL, &wLen); + if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + LPWSTR lpNameW = HeapAlloc(GetProcessHeap(), 0, wLen * sizeof(WCHAR)); + + ret = LookupPrivilegeNameW(lpSystemNameW.Buffer, lpLuid, lpNameW, + &wLen); + if (ret) + { + /* Windows crashes if cchName is NULL, so will I */ + unsigned int len = WideCharToMultiByte(CP_ACP, 0, lpNameW, -1, lpName, + *cchName, NULL, NULL); + + if (len == 0) + { + /* WideCharToMultiByte failed */ + ret = FALSE; + } + else if (len > *cchName) + { + *cchName = len; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + else + { + /* WideCharToMultiByte succeeded, output length needs to be + * length not including NULL terminator + */ + *cchName = len - 1; + } + } + HeapFree(GetProcessHeap(), 0, lpNameW); + } + RtlFreeUnicodeString(&lpSystemNameW); + return ret; }

1 0

[ekohl] 36985: Service Manager: - Fix declaration of SERVICE_STATUS_HANDLE in the PSDK. - Add a new custom binding handle to svcctl.idl as an alias of SERVICE_STATUS_HANDLE. - Enable all custom binding handles in svcctl.idl and fix services.exe and advapi32.dll accordingly.
by ekohl＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: ekohl Date: Sun Oct 26 07:33:36 2008 New Revision: 36985 URL: http://svn.reactos.org/svn/reactos?rev=36985&view=rev Log: Service Manager: - Fix declaration of SERVICE_STATUS_HANDLE in the PSDK. - Add a new custom binding handle to svcctl.idl as an alias of SERVICE_STATUS_HANDLE. - Enable all custom binding handles in svcctl.idl and fix services.exe and advapi32.dll accordingly. Modified: trunk/reactos/base/system/services/rpcserver.c trunk/reactos/dll/win32/advapi32/service/scm.c trunk/reactos/dll/win32/advapi32/service/sctrl.c trunk/reactos/include/psdk/winsvc.h trunk/reactos/include/reactos/idl/svcctl.idl Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Oct 26 07:33:36 2008 @@ -1004,8 +1004,8 @@ /* Function 7 */ DWORD RSetServiceStatus( - handle_t BindingHandle, - SC_RPC_HANDLE hServiceStatus, +// handle_t BindingHandle, + RPC_SERVICE_STATUS_HANDLE hServiceStatus, LPSERVICE_STATUS lpServiceStatus) { PSERVICE lpService; @@ -1026,7 +1026,7 @@ return ERROR_INVALID_HANDLE; } - lpService = ScmGetServiceEntryByClientHandle((ULONG)hServiceStatus); + lpService = ScmGetServiceEntryByClientHandle(hServiceStatus); if (lpService == NULL) { DPRINT1("lpService == NULL!\n"); @@ -1091,8 +1091,8 @@ /* Function 10 */ DWORD RI_ScSetServiceBitsW( - handle_t BindingHandle, - SC_RPC_HANDLE hServiceStatus, +// handle_t BindingHandle, + RPC_SERVICE_STATUS_HANDLE hServiceStatus, DWORD dwServiceBits, int bSetBitsOn, int bUpdateImmediately, @@ -2388,7 +2388,7 @@ /* Function 15 */ DWORD ROpenSCManagerW( - handle_t BindingHandle, +// handle_t BindingHandle, LPWSTR lpMachineName, LPWSTR lpDatabaseName, DWORD dwDesiredAccess, @@ -2893,8 +2893,8 @@ /* Function 22 */ DWORD RI_ScSetServiceBitsA( - handle_t BindingHandle, - SC_RPC_HANDLE hServiceStatus, +// handle_t BindingHandle, + RPC_SERVICE_STATUS_HANDLE hServiceStatus, DWORD dwServiceBits, int bSetBitsOn, int bUpdateImmediately, @@ -3462,7 +3462,7 @@ /* Function 27 */ DWORD ROpenSCManagerA( - handle_t BindingHandle, +// handle_t BindingHandle, LPSTR lpMachineName, LPSTR lpDatabaseName, DWORD dwDesiredAccess, @@ -3482,7 +3482,7 @@ RtlCreateUnicodeStringFromAsciiz(&DatabaseName, lpDatabaseName); - dwError = ROpenSCManagerW(BindingHandle, + dwError = ROpenSCManagerW(//BindingHandle, lpMachineName ? MachineName.Buffer : NULL, lpDatabaseName ? DatabaseName.Buffer : NULL, dwDesiredAccess, 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] Sun Oct 26 07:33:36 2008 @@ -76,6 +76,172 @@ } } #endif + +handle_t __RPC_USER +SVCCTL_HANDLEA_bind(SVCCTL_HANDLEA szMachineName) +{ + handle_t hBinding = NULL; + UCHAR *pszStringBinding; + RPC_STATUS status; + + ERR("SVCCTL_HANDLEA_bind() called\n"); + + status = RpcStringBindingComposeA((UCHAR *)szMachineName, + (UCHAR *)"ncacn_np", + NULL, + (UCHAR *)"\\pipe\\ntsvcs", + NULL, + (UCHAR **)&pszStringBinding); + if (status) + { + ERR("RpcStringBindingCompose returned 0x%x\n", status); + return NULL; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingA(pszStringBinding, + &hBinding); + if (status) + { + ERR("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeA(&pszStringBinding); + if (status) + { + ERR("RpcStringFree returned 0x%x\n", status); + } + + return hBinding; +} + + +void __RPC_USER +SVCCTL_HANDLEA_unbind(SVCCTL_HANDLEA szMachineName, + handle_t hBinding) +{ + RPC_STATUS status; + + ERR("SVCCTL_HANDLEA_unbind() called\n"); + + status = RpcBindingFree(&hBinding); + if (status) + { + ERR("RpcBindingFree returned 0x%x\n", status); + } +} + + +handle_t __RPC_USER +SVCCTL_HANDLEW_bind(SVCCTL_HANDLEW szMachineName) +{ + handle_t hBinding = NULL; + LPWSTR pszStringBinding; + RPC_STATUS status; + + ERR("SVCCTL_HANDLEW_bind() called\n"); + + + status = RpcStringBindingComposeW(szMachineName, + L"ncacn_np", + NULL, + L"\\pipe\\ntsvcs", + NULL, + &pszStringBinding); + if (status) + { + ERR("RpcStringBindingCompose returned 0x%x\n", status); + return NULL; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingW(pszStringBinding, + &hBinding); + if (status) + { + ERR("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeW(&pszStringBinding); + if (status) + { + ERR("RpcStringFree returned 0x%x\n", status); + } + + return hBinding; +} + + +void __RPC_USER +SVCCTL_HANDLEW_unbind(SVCCTL_HANDLEW szMachineName, + handle_t hBinding) +{ + RPC_STATUS status; + + ERR("SVCCTL_HANDLEW_unbind() called\n"); + + status = RpcBindingFree(&hBinding); + if (status) + { + ERR("RpcBindingFree returned 0x%x\n", status); + } +} + + +handle_t __RPC_USER +RPC_SERVICE_STATUS_HANDLE_bind(RPC_SERVICE_STATUS_HANDLE hServiceStatus) +{ + handle_t hBinding = NULL; + LPWSTR pszStringBinding; + RPC_STATUS status; + + ERR("RPC_SERVICE_STATUS_HANDLE_bind() called\n"); + + + status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + NULL, + L"\\pipe\\ntsvcs", + NULL, + &pszStringBinding); + if (status) + { + ERR("RpcStringBindingCompose returned 0x%x\n", status); + return NULL; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingW(pszStringBinding, + &hBinding); + if (status) + { + ERR("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeW(&pszStringBinding); + if (status) + { + ERR("RpcStringFree returned 0x%x\n", status); + } + + return hBinding; +} + + +void __RPC_USER +RPC_SERVICE_STATUS_HANDLE_unbind(RPC_SERVICE_STATUS_HANDLE hServiceStatus, + handle_t hBinding) +{ + RPC_STATUS status; + + ERR("RPC_SERVICE_STATUS_HANDLE_unbind() called\n"); + + status = RpcBindingFree(&hBinding); + if (status) + { + ERR("RpcBindingFree returned 0x%x\n", status); + } +} DWORD @@ -1494,12 +1660,12 @@ WaitForSCManager(); - HandleBind(); +// HandleBind(); _SEH_TRY { /* Call to services.exe using RPC */ - dwError = ROpenSCManagerA(BindingHandle, + dwError = ROpenSCManagerA(//BindingHandle, (LPSTR)lpMachineName, (LPSTR)lpDatabaseName, dwDesiredAccess, @@ -1542,12 +1708,12 @@ WaitForSCManager(); - HandleBind(); +// HandleBind(); _SEH_TRY { /* Call to services.exe using RPC */ - dwError = ROpenSCManagerW(BindingHandle, + dwError = ROpenSCManagerW(//BindingHandle, (LPWSTR)lpMachineName, (LPWSTR)lpDatabaseName, dwDesiredAccess, Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Sun Oct 26 07:33:36 2008 @@ -536,7 +536,7 @@ * @implemented */ BOOL STDCALL -I_ScSetServiceBitsA(SC_RPC_HANDLE hServiceStatus, +I_ScSetServiceBitsA(SERVICE_STATUS_HANDLE hServiceStatus, DWORD dwServiceBits, BOOL bSetBitsOn, BOOL bUpdateImmediately, @@ -544,13 +544,13 @@ { BOOL bResult; - HandleBind(); +// HandleBind(); _SEH_TRY { /* Call to services.exe using RPC */ - bResult = RI_ScSetServiceBitsA(BindingHandle, - (SC_RPC_HANDLE)hServiceStatus, + bResult = RI_ScSetServiceBitsA(//BindingHandle, + (RPC_SERVICE_STATUS_HANDLE)hServiceStatus, dwServiceBits, bSetBitsOn, bUpdateImmediately, @@ -575,7 +575,7 @@ * @implemented */ BOOL STDCALL -I_ScSetServiceBitsW(SC_RPC_HANDLE hServiceStatus, +I_ScSetServiceBitsW(SERVICE_STATUS_HANDLE hServiceStatus, DWORD dwServiceBits, BOOL bSetBitsOn, BOOL bUpdateImmediately, @@ -583,13 +583,13 @@ { BOOL bResult; - HandleBind(); +// HandleBind(); _SEH_TRY { /* Call to services.exe using RPC */ - bResult = RI_ScSetServiceBitsW(BindingHandle, - (SC_RPC_HANDLE)hServiceStatus, + bResult = RI_ScSetServiceBitsW(//BindingHandle, + (RPC_SERVICE_STATUS_HANDLE)hServiceStatus, dwServiceBits, bSetBitsOn, bUpdateImmediately, @@ -639,11 +639,11 @@ TRACE("SetServiceStatus() called\n"); TRACE("hServiceStatus %lu\n", hServiceStatus); - HandleBind(); +// HandleBind(); /* Call to services.exe using RPC */ - dwError = RSetServiceStatus(BindingHandle, - (SC_RPC_HANDLE)hServiceStatus, + dwError = RSetServiceStatus(//BindingHandle, + (RPC_SERVICE_STATUS_HANDLE)hServiceStatus, lpServiceStatus); if (dwError != ERROR_SUCCESS) { Modified: trunk/reactos/include/psdk/winsvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsvc.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winsvc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsvc.h [iso-8859-1] Sun Oct 26 07:33:36 2008 @@ -158,7 +158,7 @@ DECLARE_HANDLE(SC_HANDLE); typedef SC_HANDLE *LPSC_HANDLE; typedef PVOID SC_LOCK; -typedef DWORD SERVICE_STATUS_HANDLE; +DECLARE_HANDLE(SERVICE_STATUS_HANDLE); typedef VOID(WINAPI *LPHANDLER_FUNCTION)(DWORD); typedef DWORD (WINAPI *LPHANDLER_FUNCTION_EX)(DWORD,DWORD,LPVOID,LPVOID); typedef struct _SERVICE_DESCRIPTIONA { Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Sun Oct 26 07:33:36 2008 @@ -15,8 +15,9 @@ const unsigned short SC_MAX_ARGUMENT_LENGTH = 1024; const unsigned short SC_MAX_ARGUMENTS = 1024; -typedef /*[handle]*/ LPSTR SVCCTL_HANDLEA; -typedef /*[handle]*/ LPWSTR SVCCTL_HANDLEW; +typedef [handle] LPSTR SVCCTL_HANDLEA; +typedef [handle] LPWSTR SVCCTL_HANDLEW; +typedef [handle] ULONG_PTR RPC_SERVICE_STATUS_HANDLE; typedef /*[context_handle]*/ unsigned long SC_RPC_HANDLE; typedef SC_RPC_HANDLE* LPSC_RPC_HANDLE; typedef /*[context_handle]*/ unsigned long SC_RPC_LOCK; @@ -296,9 +297,9 @@ uuid(367abb81-9844-35f1-ad32-98f038001003), version(2.0), pointer_default(unique), - #ifndef __midl +// #ifndef __midl ,explicit_handle - #endif +// #endif ] interface svcctl { @@ -350,8 +351,8 @@ /* Function 7 */ DWORD RSetServiceStatus( - [in] handle_t BindingHandle, - [in] SC_RPC_HANDLE hServiceStatus, +// [in] handle_t BindingHandle, + [in] RPC_SERVICE_STATUS_HANDLE hServiceStatus, [in] LPSERVICE_STATUS lpServiceStatus); /* Function 8 */ @@ -367,8 +368,8 @@ /* Function 10 */ DWORD RI_ScSetServiceBitsW( - [in] handle_t BindingHandle, - [in] SC_RPC_HANDLE hServiceStatus, +// [in] handle_t BindingHandle, + [in] RPC_SERVICE_STATUS_HANDLE hServiceStatus, [in] DWORD dwServiceBits, [in] BOOL bSetBitsOn, [in] BOOL bUpdateImmediately, @@ -435,8 +436,8 @@ /* Function 15 */ DWORD ROpenSCManagerW( - [in] handle_t BindingHandle, - [in, string, unique, range(0, SC_MAX_COMPUTER_NAME_LENGTH)] LPWSTR lpMachineName, +// [in] handle_t BindingHandle, + [in, string, unique, range(0, SC_MAX_COMPUTER_NAME_LENGTH)] SVCCTL_HANDLEW lpMachineName, [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPWSTR lpDatabaseName, [in] DWORD dwDesiredAccess, [out] LPSC_RPC_HANDLE lpScHandle); @@ -491,8 +492,8 @@ /* Function 22 */ DWORD RI_ScSetServiceBitsA( - [in] handle_t BindingHandle, - [in] SC_RPC_HANDLE hServiceStatus, +// [in] handle_t BindingHandle, + [in] RPC_SERVICE_STATUS_HANDLE hServiceStatus, [in] DWORD dwServiceBits, [in] BOOL bSetBitsOn, [in] BOOL bUpdateImmediately, @@ -559,8 +560,8 @@ /* Function 27 */ DWORD ROpenSCManagerA( - [in] handle_t BindingHandle, - [in, string, unique, range(0, SC_MAX_COMPUTER_NAME_LENGTH)] LPSTR lpMachineName, +// [in] handle_t BindingHandle, + [in, string, unique, range(0, SC_MAX_COMPUTER_NAME_LENGTH)] SVCCTL_HANDLEA lpMachineName, [in, string, unique, range(0, SC_MAX_NAME_LENGTH)] LPSTR lpDatabaseName, [in] DWORD dwDesiredAccess, [out] LPSC_RPC_HANDLE lpScHandle);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs