Author: ekohl
Date: Fri Aug 29 08:08:03 2008
New Revision: 35756
URL:
http://svn.reactos.org/svn/reactos?rev=35756&view=rev
Log:
[FORMATTING] No code changes.
Modified:
trunk/reactos/base/system/services/rpcserver.c
Modified: trunk/reactos/base/system/services/rpcserver.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse…
==============================================================================
--- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Fri Aug 29 08:08:03 2008
@@ -6,7 +6,6 @@
* COPYRIGHT: Copyright 2005-2006 Eric Kohl
* Copyright 2006-2007 Hervé Poussineau <hpoussin(a)reactos.org>
* Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org>
- *
*/
/* INCLUDES ****************************************************************/
@@ -1168,6 +1167,7 @@
return dwError;
}
+
/* Create a path suitable for the bootloader out of the full path */
DWORD
ScmConvertToBootPathName(wchar_t *CanonName, wchar_t **RelativeName)
@@ -1183,12 +1183,12 @@
DPRINT("ScmConvertToBootPathName %S\n", CanonName);
ServiceNameLen = wcslen(CanonName);
+
/* First check, if it's already good */
if (ServiceNameLen > 12 &&
!wcsnicmp(L"\\SystemRoot\\", CanonName, 12))
{
*RelativeName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR) +
sizeof(WCHAR));
-
if (*RelativeName == NULL)
{
DPRINT1("Error allocating memory for boot driver name!\n");
@@ -1236,8 +1236,8 @@
Expanded = LocalAlloc(LMEM_ZEROINIT, BufferSize * sizeof(WCHAR) + sizeof(WCHAR));
if (!Expanded)
{
- DPRINT1("Error allocating memory for boot driver name!\n");
- return ERROR_NOT_ENOUGH_MEMORY;
+ DPRINT1("Error allocating memory for boot driver name!\n");
+ return ERROR_NOT_ENOUGH_MEMORY;
}
/* Expand it */
@@ -1279,7 +1279,6 @@
/* Only \SystemRoot\ is missing */
*RelativeName = LocalAlloc(LMEM_ZEROINIT,
(ServiceNameLen - ExpandedLen) * sizeof(WCHAR) + 13*sizeof(WCHAR));
-
if (*RelativeName == NULL)
{
DPRINT1("Error allocating memory for boot driver name!\n");
@@ -1644,9 +1643,8 @@
if (dwServiceType & SERVICE_DRIVER)
{
dwError = ScmCanonDriverImagePath(dwStartType,
- lpBinaryPathName,
- &lpImagePath);
-
+ lpBinaryPathName,
+ &lpImagePath);
if (dwError != ERROR_SUCCESS)
goto done;
}
@@ -3210,10 +3208,10 @@
lpDatabaseName);
dwError = ROpenSCManagerW(BindingHandle,
- lpMachineName ? MachineName.Buffer : NULL,
- lpDatabaseName ? DatabaseName.Buffer : NULL,
- dwDesiredAccess,
- lpScHandle);
+ lpMachineName ? MachineName.Buffer : NULL,
+ lpDatabaseName ? DatabaseName.Buffer : NULL,
+ dwDesiredAccess,
+ lpScHandle);
if (lpMachineName)
RtlFreeUnicodeString(&MachineName);
@@ -3243,10 +3241,10 @@
lpServiceName);
dwError = ROpenServiceW(BindingHandle,
- hSCManager,
- ServiceName.Buffer,
- dwDesiredAccess,
- lpServiceHandle);
+ hSCManager,
+ lpServiceName ? ServiceName.Buffer : NULL,
+ dwDesiredAccess,
+ lpServiceHandle);
if (lpServiceName)
RtlFreeUnicodeString(&ServiceName);