Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[cgutman] 35614: - Merge aicom-network-fixes up to r35611
by cgutman＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: cgutman Date: Sun Aug 24 15:50:17 2008 New Revision: 35614 URL: http://svn.reactos.org/svn/reactos?rev=35614&view=rev Log: - Merge aicom-network-fixes up to r35611 Modified: trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/tdiconn.c trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Sun Aug 24 15:50:17 2008 @@ -330,8 +330,10 @@ ExFreePool( PendingConnObj ); - if( IsListEmpty( &FCB->PendingConnections ) ) + if( IsListEmpty( &FCB->PendingConnections ) ) { FCB->PollState &= ~AFD_EVENT_ACCEPT; + PollReeval( FCB->DeviceExt, FCB->FileObject ); + } SocketStateUnlock( FCB ); return Irp->IoStatus.Status; Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sun Aug 24 15:50:17 2008 @@ -98,6 +98,7 @@ if( FCB->Recv.BytesUsed == FCB->Recv.Content ) { FCB->Recv.BytesUsed = FCB->Recv.Content = 0; FCB->PollState &= ~AFD_EVENT_RECEIVE; + PollReeval( FCB->DeviceExt, FCB->FileObject ); if( !FCB->ReceiveIrp.InFlightRequest ) { AFD_DbgPrint(MID_TRACE,("Replenishing buffer\n")); @@ -480,12 +481,16 @@ DatagramRecv->Address = TaCopyTransportAddress( FCB->AddressFrom->RemoteAddress ); - InsertTailList( &FCB->DatagramList, &DatagramRecv->ListEntry ); + if( !DatagramRecv->Address ) Status = STATUS_NO_MEMORY; + } else Status = STATUS_NO_MEMORY; if( !NT_SUCCESS( Status ) ) { + if( DatagramRecv ) ExFreePool( DatagramRecv ); SocketStateUnlock( FCB ); return Status; + } else { + InsertTailList( &FCB->DatagramList, &DatagramRecv->ListEntry ); } /* Satisfy as many requests as we can */ Modified: trunk/reactos/drivers/network/afd/afd/tdiconn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] Sun Aug 24 15:50:17 2008 @@ -122,8 +122,10 @@ ExAllocatePool(NonPagedPool, sizeof(TDI_CONNECTION_INFORMATION) + TdiAddressSize); - if (!ConnInfo) - return STATUS_INSUFFICIENT_RESOURCES; + if (!ConnInfo) { + *ConnectionInfo = NULL; + return STATUS_INSUFFICIENT_RESOURCES; + } Status = TdiBuildNullConnectionInfoInPlace( ConnInfo, Type ); Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Sun Aug 24 15:50:17 2008 @@ -140,8 +140,9 @@ SocketCalloutLeave( FCB ); } else { FCB->PollState |= AFD_EVENT_SEND; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - } + } + + PollReeval( FCB->DeviceExt, FCB->FileObject ); if( TotalBytesCopied > 0 ) { UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); @@ -395,6 +396,8 @@ FCB->EventsFired &= ~AFD_EVENT_SEND; FCB->PollState &= ~AFD_EVENT_SEND; + PollReeval( FCB->DeviceExt, FCB->FileObject ); + /* Check that the socket is bound */ if( FCB->State != SOCKET_STATE_BOUND ) return UnlockAndMaybeComplete

1 0

[sginsberg] 35613: - [FORMATTING] Comment and formatting fixes for LocateChildDevice. No code change.
by sginsberg＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: sginsberg Date: Sun Aug 24 15:40:27 2008 New Revision: 35613 URL: http://svn.reactos.org/svn/reactos?rev=35613&view=rev Log: - [FORMATTING] Comment and formatting fixes for LocateChildDevice. No code change. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Sun Aug 24 15:40:27 2008 @@ -100,19 +100,24 @@ PPNPROOT_DEVICE Device; UNICODE_STRING DeviceIdU, InstanceIdU; + /* Initialize the strings to compare */ RtlInitUnicodeString(&DeviceIdU, DeviceId); RtlInitUnicodeString(&InstanceIdU, InstanceId); + /* Start looping */ LIST_FOR_EACH(Device, &DeviceExtension->DeviceListHead, PNPROOT_DEVICE, ListEntry) { - if (RtlEqualUnicodeString(&DeviceIdU, &Device->DeviceID, TRUE) - && RtlEqualUnicodeString(&InstanceIdU, &Device->InstanceID, TRUE)) - { + /* See if the strings match */ + if (RtlEqualUnicodeString(&DeviceIdU, &Device->DeviceID, TRUE) && + RtlEqualUnicodeString(&InstanceIdU, &Device->InstanceID, TRUE)) + { + /* They do, so set the pointer and return success */ *ChildDevice = Device; return STATUS_SUCCESS; } } + /* No device found */ return STATUS_NO_SUCH_DEVICE; }

1 0

[cgutman] 35612: - Same fix as my last commit
by cgutman＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: cgutman Date: Sun Aug 24 14:54:50 2008 New Revision: 35612 URL: http://svn.reactos.org/svn/reactos?rev=35612&view=rev Log: - Same fix as my last commit Modified: trunk/reactos/drivers/network/afd/afd/lock.c Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Sun Aug 24 14:54:50 2008 @@ -324,13 +324,12 @@ } VOID SocketCalloutEnter( PAFD_FCB FCB ) { - ASSERT(!FCB->Critical); + ASSERT(FCB->Locked); FCB->Critical = TRUE; SocketStateUnlock( FCB ); } VOID SocketCalloutLeave( PAFD_FCB FCB ) { - ASSERT(FCB->Critical); FCB->Critical = FALSE; SocketAcquireStateLock( FCB ); }

1 0

[cgutman] 35611: - Revert my whole ASSERT mess - This fixes Qemu
by cgutman＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: cgutman Date: Sun Aug 24 14:53:16 2008 New Revision: 35611 URL: http://svn.reactos.org/svn/reactos?rev=35611&view=rev Log: - Revert my whole ASSERT mess - This fixes Qemu Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] Sun Aug 24 14:53:16 2008 @@ -324,13 +324,12 @@ } VOID SocketCalloutEnter( PAFD_FCB FCB ) { - ASSERT(!FCB->Critical); + ASSERT(FCB->Locked); FCB->Critical = TRUE; SocketStateUnlock( FCB ); } VOID SocketCalloutLeave( PAFD_FCB FCB ) { - ASSERT(FCB->Critical); FCB->Critical = FALSE; SocketAcquireStateLock( FCB ); }

1 0

[cgutman] 35610: - Apply the same change in my branch as I did to trunk in r35602
by cgutman＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: cgutman Date: Sun Aug 24 14:28:25 2008 New Revision: 35610 URL: http://svn.reactos.org/svn/reactos?rev=35610&view=rev Log: - Apply the same change in my branch as I did to trunk in r35602 Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] Sun Aug 24 14:28:25 2008 @@ -325,7 +325,6 @@ VOID SocketCalloutEnter( PAFD_FCB FCB ) { ASSERT(!FCB->Critical); - ASSERT(FCB->Locked); FCB->Critical = TRUE; SocketStateUnlock( FCB ); }

1 0

[cgutman] 35609: - Add another missing PollReeval
by cgutman＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: cgutman Date: Sun Aug 24 14:21:41 2008 New Revision: 35609 URL: http://svn.reactos.org/svn/reactos?rev=35609&view=rev Log: - Add another missing PollReeval Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] Sun Aug 24 14:21:41 2008 @@ -330,8 +330,10 @@ ExFreePool( PendingConnObj ); - if( IsListEmpty( &FCB->PendingConnections ) ) + if( IsListEmpty( &FCB->PendingConnections ) ) { FCB->PollState &= ~AFD_EVENT_ACCEPT; + PollReeval( FCB->DeviceExt, FCB->FileObject ); + } SocketStateUnlock( FCB ); return Irp->IoStatus.Status;

1 0

[sginsberg] 35608: - [FORMATTING] Code style and comment cleanup. No code change.
by sginsberg＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: sginsberg Date: Sun Aug 24 13:47:14 2008 New Revision: 35608 URL: http://svn.reactos.org/svn/reactos?rev=35608&view=rev Log: - [FORMATTING] Code style and comment cleanup. No code change. Modified: trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c Modified: trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/drvrlist… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c [iso-8859-1] Sun Aug 24 13:47:14 2008 @@ -350,39 +350,44 @@ NTSTATUS INIT_FUNCTION IoDestroyDriverList(VOID) { - PSERVICE_GROUP CurrentGroup, tmp1; - PSERVICE CurrentService, tmp2; - - DPRINT("IoDestroyDriverList() called\n"); - - /* Destroy group list */ - LIST_FOR_EACH_SAFE(CurrentGroup, tmp1, &GroupListHead, SERVICE_GROUP, GroupListEntry) - { - ExFreePool(CurrentGroup->GroupName.Buffer); - RemoveEntryList(&CurrentGroup->GroupListEntry); - if (CurrentGroup->TagArray) - { - ExFreePool(CurrentGroup->TagArray); - } - ExFreePool(CurrentGroup); - } - - /* Destroy service list */ - LIST_FOR_EACH_SAFE(CurrentService, tmp2, &ServiceListHead, SERVICE, ServiceListEntry) - { - ExFreePool(CurrentService->ServiceName.Buffer); - ExFreePool(CurrentService->RegistryPath.Buffer); - if (CurrentService->ServiceGroup.Buffer) - ExFreePool(CurrentService->ServiceGroup.Buffer); - if (CurrentService->ImagePath.Buffer) - ExFreePool(CurrentService->ImagePath.Buffer); - RemoveEntryList(&CurrentService->ServiceListEntry); - ExFreePool(CurrentService); - } - - DPRINT("IoDestroyDriverList() done\n"); - - return(STATUS_SUCCESS); + PSERVICE_GROUP CurrentGroup, tmp1; + PSERVICE CurrentService, tmp2; + + DPRINT("IoDestroyDriverList() called\n"); + + /* Destroy the Group List */ + LIST_FOR_EACH_SAFE(CurrentGroup, tmp1, &GroupListHead, SERVICE_GROUP, GroupListEntry) + { + /* Remove it from the list */ + RemoveEntryList(&CurrentGroup->GroupListEntry); + + /* Free buffers */ + ExFreePool(CurrentGroup->GroupName.Buffer); + if (CurrentGroup->TagArray) + ExFreePool(CurrentGroup->TagArray); + ExFreePool(CurrentGroup); + } + + /* Destroy the Service List */ + LIST_FOR_EACH_SAFE(CurrentService, tmp2, &ServiceListHead, SERVICE, ServiceListEntry) + { + /* Remove it from the list */ + RemoveEntryList(&CurrentService->ServiceListEntry); + + /* Free buffers */ + ExFreePool(CurrentService->ServiceName.Buffer); + ExFreePool(CurrentService->RegistryPath.Buffer); + if (CurrentService->ServiceGroup.Buffer) + ExFreePool(CurrentService->ServiceGroup.Buffer); + if (CurrentService->ImagePath.Buffer) + ExFreePool(CurrentService->ImagePath.Buffer); + ExFreePool(CurrentService); + } + + DPRINT("IoDestroyDriverList() done\n"); + + /* Return success */ + return STATUS_SUCCESS; } static INIT_FUNCTION NTSTATUS @@ -435,8 +440,8 @@ * Return Value * None */ - -VOID FASTCALL +VOID +FASTCALL IopInitializeSystemDrivers(VOID) { PSERVICE_GROUP CurrentGroup; @@ -446,50 +451,55 @@ DPRINT("IopInitializeSystemDrivers()\n"); - LIST_FOR_EACH(CurrentGroup, &GroupListHead, SERVICE_GROUP, GroupListEntry) - { - DPRINT("Group: %wZ\n", &CurrentGroup->GroupName); - - /* Load all drivers with a valid tag */ - for (i = 0; i < CurrentGroup->TagCount; i++) - { - LIST_FOR_EACH(CurrentService, &ServiceListHead, SERVICE, ServiceListEntry) - { - if ((RtlCompareUnicodeString(&CurrentGroup->GroupName, - &CurrentService->ServiceGroup, TRUE) == 0) && - (CurrentService->Start == 1 /*SERVICE_SYSTEM_START*/) && - (CurrentService->Tag == CurrentGroup->TagArray[i])) - { - DPRINT(" Path: %wZ\n", &CurrentService->RegistryPath); - Status = IopLoadDriver(CurrentService); - } - } - } - - /* Load all drivers without a tag or with an invalid tag */ - LIST_FOR_EACH(CurrentService, &ServiceListHead, SERVICE, ServiceListEntry) - { - if ((RtlCompareUnicodeString(&CurrentGroup->GroupName, - &CurrentService->ServiceGroup, TRUE) == 0) && - (CurrentService->Start == 1 /*SERVICE_SYSTEM_START*/)) - { - for (i = 0; i < CurrentGroup->TagCount; i++) - { - if (CurrentGroup->TagArray[i] == CurrentService->Tag) - { - break; - } - } - if (i >= CurrentGroup->TagCount) - { - DPRINT(" Path: %wZ\n", &CurrentService->RegistryPath); - Status = IopLoadDriver(CurrentService); - } - } - } - - } - - DPRINT("IopInitializeSystemDrivers() done\n"); -} -/* EOF */ + /* Loop the list */ + LIST_FOR_EACH(CurrentGroup, &GroupListHead, SERVICE_GROUP, GroupListEntry) + { + + DPRINT("Group: %wZ\n", &CurrentGroup->GroupName); + + /* Load all drivers with a valid tag */ + for (i = 0; i < CurrentGroup->TagCount; i++) + { + /* Loop the list */ + LIST_FOR_EACH(CurrentService, &ServiceListHead, SERVICE, ServiceListEntry) + { + if ((!RtlCompareUnicodeString(&CurrentGroup->GroupName, + &CurrentService->ServiceGroup, + TRUE)) && + (CurrentService->Start == SERVICE_SYSTEM_START) && + (CurrentService->Tag == CurrentGroup->TagArray[i])) + + { + DPRINT(" Path: %wZ\n", &CurrentService->RegistryPath); + Status = IopLoadDriver(CurrentService); + } + } + } + + /* Load all drivers without a tag or with an invalid tag */ + LIST_FOR_EACH(CurrentService, &ServiceListHead, SERVICE, ServiceListEntry) + { + if ((!RtlCompareUnicodeString(&CurrentGroup->GroupName, + &CurrentService->ServiceGroup, + TRUE)) && + (CurrentService->Start == SERVICE_SYSTEM_START)) + { + for (i = 0; i < CurrentGroup->TagCount; i++) + { + if (CurrentGroup->TagArray[i] == CurrentService->Tag) + { + break; + } + } + + if (i >= CurrentGroup->TagCount) + { + DPRINT(" Path: %wZ\n", &CurrentService->RegistryPath); + Status = IopLoadDriver(CurrentService); + } + } + } + } + + DPRINT("IopInitializeSystemDrivers() done\n"); +}

1 0

[cgutman] 35607: - Revert r35601 - This should always be set if FCB->CurrentThread is non-NULL
by cgutman＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: cgutman Date: Sun Aug 24 13:32:19 2008 New Revision: 35607 URL: http://svn.reactos.org/svn/reactos?rev=35607&view=rev Log: - Revert r35601 - This should always be set if FCB->CurrentThread is non-NULL Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] Sun Aug 24 13:32:19 2008 @@ -225,7 +225,6 @@ if( CurrentThread == FCB->CurrentThread ) { FCB->LockCount++; - FCB->Locked = TRUE; AFD_DbgPrint(MID_TRACE, ("Same thread, lock count %d\n", FCB->LockCount)); return TRUE;

1 0

[ekohl] 35606: Don't try to print information about a service that doesn't exist.
by ekohl＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: ekohl Date: Sun Aug 24 13:30:59 2008 New Revision: 35606 URL: http://svn.reactos.org/svn/reactos?rev=35606&view=rev Log: Don't try to print information about a service that doesn't exist. Modified: trunk/reactos/base/applications/sc/query.c Modified: trunk/reactos/base/applications/sc/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/query… ============================================================================== --- trunk/reactos/base/applications/sc/query.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/query.c [iso-8859-1] Sun Aug 24 13:30:59 2008 @@ -227,17 +227,11 @@ LPCTSTR ServiceName = *ServiceArgs; pStatus = QueryService(ServiceName); - if (bExtended) + if (pStatus) { PrintService(ServiceName, pStatus, - TRUE); - } - else - { - PrintService(ServiceName, - pStatus, - FALSE); + bExtended); } }

1 0

[ekohl] 35605: SEH-protect all calls to remote functions. Based on patches from Bug #3669 by bugboy <martinmnet@hotmail.com>.
by ekohl＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: ekohl Date: Sun Aug 24 13:27:17 2008 New Revision: 35605 URL: http://svn.reactos.org/svn/reactos?rev=35605&view=rev Log: SEH-protect all calls to remote functions. Based on patches from Bug #3669 by bugboy <martinmnet(a)hotmail.com>. Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sun Aug 24 13:27:17 2008 @@ -78,6 +78,26 @@ #endif +static DWORD +ScmRpcStatusToWinError(RPC_STATUS Status) +{ + switch (Status) + { + case RPC_X_SS_IN_NULL_CONTEXT: + return ERROR_INVALID_HANDLE; + + case RPC_X_NULL_REF_POINTER: + return ERROR_INVALID_PARAMETER; + + case STATUS_ACCESS_VIOLATION: + return ERROR_INVALID_ADDRESS; + + default: + return (DWORD)Status; + } +} + + /********************************************************************** * ChangeServiceConfig2A * @@ -116,9 +136,18 @@ HandleBind(); - dwError = RChangeServiceConfig2A(BindingHandle, - (SC_RPC_HANDLE)hService, - Info); + _SEH_TRY + { + dwError = RChangeServiceConfig2A(BindingHandle, + (SC_RPC_HANDLE)hService, + Info); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("RChangeServiceConfig2A() failed (Error %lu)\n", dwError); @@ -170,9 +199,18 @@ HandleBind(); - dwError = RChangeServiceConfig2W(BindingHandle, - (SC_RPC_HANDLE)hService, - Info); + _SEH_TRY + { + dwError = RChangeServiceConfig2W(BindingHandle, + (SC_RPC_HANDLE)hService, + Info); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("RChangeServiceConfig2W() failed (Error %lu)\n", dwError); @@ -226,21 +264,30 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = RChangeServiceConfigA(BindingHandle, - (SC_RPC_HANDLE)hService, - dwServiceType, - dwStartType, - dwErrorControl, - (LPSTR)lpBinaryPathName, - (LPSTR)lpLoadOrderGroup, - lpdwTagId, - (LPSTR)lpDependencies, - dwDependenciesLength, - (LPSTR)lpServiceStartName, - NULL, /* FIXME: lpPassword */ - 0, /* FIXME: dwPasswordLength */ - (LPSTR)lpDisplayName); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = RChangeServiceConfigA(BindingHandle, + (SC_RPC_HANDLE)hService, + dwServiceType, + dwStartType, + dwErrorControl, + (LPSTR)lpBinaryPathName, + (LPSTR)lpLoadOrderGroup, + lpdwTagId, + (LPSTR)lpDependencies, + dwDependenciesLength, + (LPSTR)lpServiceStartName, + NULL, /* FIXME: lpPassword */ + 0, /* FIXME: dwPasswordLength */ + (LPSTR)lpDisplayName); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("RChangeServiceConfigA() failed (Error %lu)\n", dwError); @@ -294,21 +341,30 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = RChangeServiceConfigW(BindingHandle, - (SC_RPC_HANDLE)hService, - dwServiceType, - dwStartType, - dwErrorControl, - (LPWSTR)lpBinaryPathName, - (LPWSTR)lpLoadOrderGroup, - lpdwTagId, - (LPBYTE)lpDependencies, - dwDependenciesLength, - (LPWSTR)lpServiceStartName, - NULL, /* FIXME: lpPassword */ - 0, /* FIXME: dwPasswordLength */ - (LPWSTR)lpDisplayName); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = RChangeServiceConfigW(BindingHandle, + (SC_RPC_HANDLE)hService, + dwServiceType, + dwStartType, + dwErrorControl, + (LPWSTR)lpBinaryPathName, + (LPWSTR)lpLoadOrderGroup, + lpdwTagId, + (LPBYTE)lpDependencies, + dwDependenciesLength, + (LPWSTR)lpServiceStartName, + NULL, /* FIXME: lpPassword */ + 0, /* FIXME: dwPasswordLength */ + (LPWSTR)lpDisplayName); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("RChangeServiceConfigW() failed (Error %lu)\n", dwError); @@ -334,9 +390,18 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = RCloseServiceHandle(BindingHandle, - (LPSC_RPC_HANDLE)&hSCObject); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = RCloseServiceHandle(BindingHandle, + (LPSC_RPC_HANDLE)&hSCObject); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError) { ERR("RCloseServiceHandle() failed (Error %lu)\n", dwError); @@ -367,11 +432,20 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = RControlService(BindingHandle, - (SC_RPC_HANDLE)hService, - dwControl, - lpServiceStatus); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = RControlService(BindingHandle, + (SC_RPC_HANDLE)hService, + dwControl, + lpServiceStatus); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("RControlService() failed (Error %lu)\n", dwError); @@ -401,7 +475,6 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } - /********************************************************************** @@ -616,24 +689,33 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = RCreateServiceW(BindingHandle, - (SC_RPC_HANDLE)hSCManager, - (LPWSTR)lpServiceName, - (LPWSTR)lpDisplayName, - dwDesiredAccess, - dwServiceType, - dwStartType, - dwErrorControl, - (LPWSTR)lpBinaryPathName, - (LPWSTR)lpLoadOrderGroup, - lpdwTagId, - (LPBYTE)lpDependencies, - dwDependenciesLength, - (LPWSTR)lpServiceStartName, - NULL, /* FIXME: lpPassword */ - 0, /* FIXME: dwPasswordLength */ - (SC_RPC_HANDLE *)&hService); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = RCreateServiceW(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + (LPWSTR)lpServiceName, + (LPWSTR)lpDisplayName, + dwDesiredAccess, + dwServiceType, + dwStartType, + dwErrorControl, + (LPWSTR)lpBinaryPathName, + (LPWSTR)lpLoadOrderGroup, + lpdwTagId, + (LPBYTE)lpDependencies, + dwDependenciesLength, + (LPWSTR)lpServiceStartName, + NULL, /* FIXME: lpPassword */ + 0, /* FIXME: dwPasswordLength */ + (SC_RPC_HANDLE *)&hService); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("RCreateServiceW() failed (Error %lu)\n", dwError); @@ -659,9 +741,18 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = RDeleteService(BindingHandle, - (SC_RPC_HANDLE)hService); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = RDeleteService(BindingHandle, + (SC_RPC_HANDLE)hService); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("RDeleteService() failed (Error %lu)\n", dwError); @@ -687,20 +778,28 @@ LPDWORD lpServicesReturned) { LPENUM_SERVICE_STATUSA lpStatusPtr; - DWORD dwError = ERROR_SUCCESS; + DWORD dwError; DWORD dwCount; TRACE("EnumServicesStatusA() called\n"); HandleBind(); - dwError = REnumDependentServicesA(BindingHandle, - (SC_RPC_HANDLE)hService, - dwServiceState, - (LPBYTE)lpServices, - cbBufSize, - pcbBytesNeeded, - lpServicesReturned); + _SEH_TRY + { + dwError = REnumDependentServicesA(BindingHandle, + (SC_RPC_HANDLE)hService, + dwServiceState, + (LPBYTE)lpServices, + cbBufSize, + pcbBytesNeeded, + lpServicesReturned); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; lpStatusPtr = (LPENUM_SERVICE_STATUSA)lpServices; for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) @@ -743,20 +842,28 @@ LPDWORD lpServicesReturned) { LPENUM_SERVICE_STATUSW lpStatusPtr; - DWORD dwError = ERROR_SUCCESS; + DWORD dwError; DWORD dwCount; TRACE("EnumServicesStatusW() called\n"); HandleBind(); - dwError = REnumDependentServicesW(BindingHandle, - (SC_RPC_HANDLE)hService, - dwServiceState, - (LPBYTE)lpServices, - cbBufSize, - pcbBytesNeeded, - lpServicesReturned); + _SEH_TRY + { + dwError = REnumDependentServicesW(BindingHandle, + (SC_RPC_HANDLE)hService, + dwServiceState, + (LPBYTE)lpServices, + cbBufSize, + pcbBytesNeeded, + lpServicesReturned); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; lpStatusPtr = (LPENUM_SERVICE_STATUSW)lpServices; for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) @@ -825,22 +932,30 @@ LPDWORD lpResumeHandle) { LPENUM_SERVICE_STATUSA lpStatusPtr; - DWORD dwError = ERROR_SUCCESS; + DWORD dwError; DWORD dwCount; TRACE("EnumServicesStatusA() called\n"); HandleBind(); - dwError = REnumServicesStatusA(BindingHandle, - (SC_RPC_HANDLE)hSCManager, - dwServiceType, - dwServiceState, - (LPBYTE)lpServices, - cbBufSize, - pcbBytesNeeded, - lpServicesReturned, - lpResumeHandle); + _SEH_TRY + { + dwError = REnumServicesStatusA(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + dwServiceType, + dwServiceState, + (LPBYTE)lpServices, + cbBufSize, + pcbBytesNeeded, + lpServicesReturned, + lpResumeHandle); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; lpStatusPtr = (LPENUM_SERVICE_STATUSA)lpServices; for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) @@ -885,22 +1000,30 @@ LPDWORD lpResumeHandle) { LPENUM_SERVICE_STATUSW lpStatusPtr; - DWORD dwError = ERROR_SUCCESS; + DWORD dwError; DWORD dwCount; TRACE("EnumServicesStatusW() called\n"); HandleBind(); - dwError = REnumServicesStatusW(BindingHandle, - (SC_RPC_HANDLE)hSCManager, - dwServiceType, - dwServiceState, - (LPBYTE)lpServices, - cbBufSize, - pcbBytesNeeded, - lpServicesReturned, - lpResumeHandle); + _SEH_TRY + { + dwError = REnumServicesStatusW(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + dwServiceType, + dwServiceState, + (LPBYTE)lpServices, + cbBufSize, + pcbBytesNeeded, + lpServicesReturned, + lpResumeHandle); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; lpStatusPtr = (LPENUM_SERVICE_STATUSW)lpServices; for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) @@ -947,24 +1070,32 @@ LPCSTR pszGroupName) { LPENUM_SERVICE_STATUS_PROCESSA lpStatusPtr; - DWORD dwError = ERROR_SUCCESS; + DWORD dwError; DWORD dwCount; TRACE("EnumServicesStatusExA() called\n"); HandleBind(); - dwError = REnumServicesStatusExA(BindingHandle, - (SC_RPC_HANDLE)hSCManager, - InfoLevel, - dwServiceType, - dwServiceState, - (LPBYTE)lpServices, - cbBufSize, - pcbBytesNeeded, - lpServicesReturned, - lpResumeHandle, - (LPSTR)pszGroupName); + _SEH_TRY + { + dwError = REnumServicesStatusExA(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + InfoLevel, + dwServiceType, + dwServiceState, + (LPBYTE)lpServices, + cbBufSize, + pcbBytesNeeded, + lpServicesReturned, + lpResumeHandle, + (LPSTR)pszGroupName); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; if (dwError == ERROR_MORE_DATA) { @@ -1019,24 +1150,32 @@ LPCWSTR pszGroupName) { LPENUM_SERVICE_STATUS_PROCESSW lpStatusPtr; - DWORD dwError = ERROR_SUCCESS; + DWORD dwError; DWORD dwCount; TRACE("EnumServicesStatusExW() called\n"); HandleBind(); - dwError = REnumServicesStatusExW(BindingHandle, - (SC_RPC_HANDLE)hSCManager, - InfoLevel, - dwServiceType, - dwServiceState, - (LPBYTE)lpServices, - cbBufSize, - pcbBytesNeeded, - lpServicesReturned, - lpResumeHandle, - (LPWSTR)pszGroupName); + _SEH_TRY + { + dwError = REnumServicesStatusExW(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + InfoLevel, + dwServiceType, + dwServiceState, + (LPBYTE)lpServices, + cbBufSize, + pcbBytesNeeded, + lpServicesReturned, + lpResumeHandle, + (LPWSTR)pszGroupName); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; if (dwError == ERROR_MORE_DATA) { @@ -1090,11 +1229,23 @@ HandleBind(); - dwError = RGetServiceDisplayNameA(BindingHandle, - (SC_RPC_HANDLE)hSCManager, - (LPSTR)lpServiceName, - lpDisplayName, - lpcchBuffer); + _SEH_TRY + { + dwError = RGetServiceDisplayNameA(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + (LPSTR)lpServiceName, + lpDisplayName, + lpcchBuffer); + } + _SEH_HANDLE + { + /* HACK: because of a problem with rpcrt4, rpcserver is hacked to return 6 for ERROR_SERVICE_DOES_NOT_EXIST */ + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + + + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("RGetServiceDisplayNameA() failed (Error %lu)\n", dwError); @@ -1125,11 +1276,20 @@ HandleBind(); - dwError = RGetServiceDisplayNameW(BindingHandle, - (SC_RPC_HANDLE)hSCManager, - (LPWSTR)lpServiceName, - lpDisplayName, - lpcchBuffer); + _SEH_TRY + { + dwError = RGetServiceDisplayNameW(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + (LPWSTR)lpServiceName, + lpDisplayName, + lpcchBuffer); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("RGetServiceDisplayNameW() failed (Error %lu)\n", dwError); @@ -1160,11 +1320,20 @@ HandleBind(); - dwError = RGetServiceKeyNameA(BindingHandle, - (SC_RPC_HANDLE)hSCManager, - (LPSTR)lpDisplayName, - lpServiceName, - lpcchBuffer); + _SEH_TRY + { + dwError = RGetServiceKeyNameA(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + (LPSTR)lpDisplayName, + lpServiceName, + lpcchBuffer); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("RGetServiceKeyNameA() failed (Error %lu)\n", dwError); @@ -1195,11 +1364,20 @@ HandleBind(); - dwError = RGetServiceKeyNameW(BindingHandle, - (SC_RPC_HANDLE)hSCManager, - (LPWSTR)lpDisplayName, - lpServiceName, - lpcchBuffer); + _SEH_TRY + { + dwError = RGetServiceKeyNameW(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + (LPWSTR)lpDisplayName, + lpServiceName, + lpcchBuffer); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("RGetServiceKeyNameW() failed (Error %lu)\n", dwError); @@ -1228,10 +1406,19 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = RLockServiceDatabase(BindingHandle, - (SC_RPC_HANDLE)hSCManager, - (SC_RPC_LOCK *)&hLock); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = RLockServiceDatabase(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + (SC_RPC_LOCK *)&hLock); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("RLockServiceDatabase() failed (Error %lu)\n", dwError); @@ -1305,12 +1492,21 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = ROpenSCManagerA(BindingHandle, - (LPSTR)lpMachineName, - (LPSTR)lpDatabaseName, - dwDesiredAccess, - (SC_RPC_HANDLE *)&hScm); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = ROpenSCManagerA(BindingHandle, + (LPSTR)lpMachineName, + (LPSTR)lpDatabaseName, + dwDesiredAccess, + (SC_RPC_HANDLE *)&hScm); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("ROpenSCManagerA() failed (Error %lu)\n", dwError); @@ -1344,12 +1540,21 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = ROpenSCManagerW(BindingHandle, - (LPWSTR)lpMachineName, - (LPWSTR)lpDatabaseName, - dwDesiredAccess, - (SC_RPC_HANDLE *)&hScm); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = ROpenSCManagerW(BindingHandle, + (LPWSTR)lpMachineName, + (LPWSTR)lpDatabaseName, + dwDesiredAccess, + (SC_RPC_HANDLE *)&hScm); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("ROpenSCManagerW() failed (Error %lu)\n", dwError); @@ -1381,12 +1586,21 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = ROpenServiceA(BindingHandle, - (SC_RPC_HANDLE)hSCManager, - (LPSTR)lpServiceName, - dwDesiredAccess, - (SC_RPC_HANDLE *)&hService); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = ROpenServiceA(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + (LPSTR)lpServiceName, + dwDesiredAccess, + (SC_RPC_HANDLE *)&hService); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("ROpenServiceA() failed (Error %lu)\n", dwError); @@ -1418,12 +1632,21 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = ROpenServiceW(BindingHandle, - (SC_RPC_HANDLE)hSCManager, - (LPWSTR)lpServiceName, - dwDesiredAccess, - (SC_RPC_HANDLE *)&hService); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = ROpenServiceW(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + (LPWSTR)lpServiceName, + dwDesiredAccess, + (SC_RPC_HANDLE *)&hService); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { if (dwError == ERROR_SERVICE_DOES_NOT_EXIST) @@ -1458,12 +1681,21 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = RQueryServiceConfigA(BindingHandle, - (SC_RPC_HANDLE)hService, - (LPBYTE)lpServiceConfig, - cbBufSize, - pcbBytesNeeded); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = RQueryServiceConfigA(BindingHandle, + (SC_RPC_HANDLE)hService, + (LPBYTE)lpServiceConfig, + cbBufSize, + pcbBytesNeeded); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("RQueryServiceConfigA() failed (Error %lu)\n", dwError); @@ -1521,12 +1753,21 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = RQueryServiceConfigW(BindingHandle, - (SC_RPC_HANDLE)hService, - (LPBYTE)lpServiceConfig, - cbBufSize, - pcbBytesNeeded); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = RQueryServiceConfigW(BindingHandle, + (SC_RPC_HANDLE)hService, + (LPBYTE)lpServiceConfig, + cbBufSize, + pcbBytesNeeded); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { if (dwError == ERROR_INSUFFICIENT_BUFFER) @@ -1588,13 +1829,22 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = RQueryServiceConfig2A(BindingHandle, - (SC_RPC_HANDLE)hService, - dwInfoLevel, - lpBuffer, - cbBufSize, - pcbBytesNeeded); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = RQueryServiceConfig2A(BindingHandle, + (SC_RPC_HANDLE)hService, + dwInfoLevel, + lpBuffer, + cbBufSize, + pcbBytesNeeded); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("RQueryServiceConfig2A() failed (Error %lu)\n", dwError); @@ -1663,13 +1913,22 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = RQueryServiceConfig2W(BindingHandle, - (SC_RPC_HANDLE)hService, - dwInfoLevel, - lpBuffer, - cbBufSize, - pcbBytesNeeded); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = RQueryServiceConfig2W(BindingHandle, + (SC_RPC_HANDLE)hService, + dwInfoLevel, + lpBuffer, + cbBufSize, + pcbBytesNeeded); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("RQueryServiceConfig2W() failed (Error %lu)\n", dwError); @@ -1736,12 +1995,21 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = RQueryServiceLockStatusA(BindingHandle, - (SC_RPC_HANDLE)hSCManager, - lpLockStatus, - cbBufSize, - pcbBytesNeeded); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = RQueryServiceLockStatusA(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + lpLockStatus, + cbBufSize, + pcbBytesNeeded); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("RQueryServiceLockStatusA() failed (Error %lu)\n", dwError); @@ -1778,12 +2046,21 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = RQueryServiceLockStatusW(BindingHandle, - (SC_RPC_HANDLE)hSCManager, - lpLockStatus, - cbBufSize, - pcbBytesNeeded); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = RQueryServiceLockStatusW(BindingHandle, + (SC_RPC_HANDLE)hSCManager, + lpLockStatus, + cbBufSize, + pcbBytesNeeded); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("RQueryServiceLockStatusW() failed (Error %lu)\n", dwError); @@ -1822,13 +2099,22 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = RQueryServiceObjectSecurity(BindingHandle, - (SC_RPC_HANDLE)hService, - dwSecurityInformation, - (LPBYTE)lpSecurityDescriptor, - cbBufSize, - pcbBytesNeeded); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = RQueryServiceObjectSecurity(BindingHandle, + (SC_RPC_HANDLE)hService, + dwSecurityInformation, + (LPBYTE)lpSecurityDescriptor, + cbBufSize, + pcbBytesNeeded); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("QueryServiceObjectSecurity() failed (Error %lu)\n", dwError); @@ -1883,12 +2169,20 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = RSetServiceObjectSecurity(BindingHandle, - (SC_RPC_HANDLE)hService, - dwSecurityInformation, - (LPBYTE)SelfRelativeSD, - Length); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = RSetServiceObjectSecurity(BindingHandle, + (SC_RPC_HANDLE)hService, + dwSecurityInformation, + (LPBYTE)SelfRelativeSD, + Length); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; HeapFree(GetProcessHeap(), 0, SelfRelativeSD); @@ -1919,10 +2213,19 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = RQueryServiceStatus(BindingHandle, - (SC_RPC_HANDLE)hService, - lpServiceStatus); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = RQueryServiceStatus(BindingHandle, + (SC_RPC_HANDLE)hService, + lpServiceStatus); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("RQueryServiceStatus() failed (Error %lu)\n", dwError); @@ -1952,13 +2255,22 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = RQueryServiceStatusEx(BindingHandle, - (SC_RPC_HANDLE)hService, - InfoLevel, - lpBuffer, - cbBufSize, - pcbBytesNeeded); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = RQueryServiceStatusEx(BindingHandle, + (SC_RPC_HANDLE)hService, + InfoLevel, + lpBuffer, + cbBufSize, + pcbBytesNeeded); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("RQueryServiceStatusEx() failed (Error %lu)\n", dwError); @@ -1982,11 +2294,18 @@ { DWORD dwError; - dwError = RStartServiceA(BindingHandle, - (SC_RPC_HANDLE)hService, - dwNumServiceArgs, - (LPSTRING_PTRSA)lpServiceArgVectors); - + _SEH_TRY + { + dwError = RStartServiceA(BindingHandle, + (SC_RPC_HANDLE)hService, + dwNumServiceArgs, + (LPSTRING_PTRSA)lpServiceArgVectors); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; if (dwError != ERROR_SUCCESS) { @@ -2011,10 +2330,18 @@ { DWORD dwError; - dwError = RStartServiceW(BindingHandle, - (SC_RPC_HANDLE)hService, - dwNumServiceArgs, - (LPSTRING_PTRSW)lpServiceArgVectors); + _SEH_TRY + { + dwError = RStartServiceW(BindingHandle, + (SC_RPC_HANDLE)hService, + dwNumServiceArgs, + (LPSTRING_PTRSW)lpServiceArgVectors); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; if (dwError != ERROR_SUCCESS) { @@ -2041,9 +2368,18 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = RUnlockServiceDatabase(BindingHandle, - (SC_RPC_LOCK)ScLock); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = RUnlockServiceDatabase(BindingHandle, + (SC_RPC_LOCK)ScLock); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("RUnlockServiceDatabase() failed (Error %lu)\n", dwError); @@ -2069,10 +2405,19 @@ HandleBind(); - /* Call to services.exe using RPC */ - dwError = RNotifyBootConfigStatus(BindingHandle, - NULL, - BootAcceptable); + _SEH_TRY + { + /* Call to services.exe using RPC */ + dwError = RNotifyBootConfigStatus(BindingHandle, + NULL, + BootAcceptable); + } + _SEH_HANDLE + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + _SEH_END; + if (dwError != ERROR_SUCCESS) { ERR("NotifyBootConfigStatus() failed (Error %lu)\n", dwError);

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2008