Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-06 18:00:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SETUPAPI]

Browse source 
set the correct LastError in case of failure

svn path=/trunk/; revision=68628
This commit is contained in:
Christoph von Wittich 2015-08-08 12:53:32 +00:00
parent 7d80502d38
commit bdb599cd5e
1 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
reactos/dll/win32/setupapi/install.c
View file

@ -244,7 +244,7 @@ static void append_multi_sz_value( HKEY hkey, const WCHAR *value, const WCHAR *s
{ {
memcpy( p, strings, len * sizeof(WCHAR) ); memcpy( p, strings, len * sizeof(WCHAR) );
p[len] = 0; p[len] = 0;
total += len; total += len * sizeof(WCHAR);
} }
strings += len; strings += len;
} }
@ -1790,11 +1790,20 @@ static BOOL InstallOneService(
BOOL useTag; BOOL useTag;
if (!GetIntField(hInf, ServiceSection, ServiceTypeKey, &ServiceType)) if (!GetIntField(hInf, ServiceSection, ServiceTypeKey, &ServiceType))
{
SetLastError( ERROR_BAD_SERVICE_INSTALLSECT );
goto cleanup; goto cleanup;
}
if (!GetIntField(hInf, ServiceSection, StartTypeKey, &StartType)) if (!GetIntField(hInf, ServiceSection, StartTypeKey, &StartType))
{
SetLastError( ERROR_BAD_SERVICE_INSTALLSECT );
goto cleanup; goto cleanup;
}
if (!GetIntField(hInf, ServiceSection, ErrorControlKey, &ErrorControl)) if (!GetIntField(hInf, ServiceSection, ErrorControlKey, &ErrorControl))
{
SetLastError( ERROR_BAD_SERVICE_INSTALLSECT );
goto cleanup; goto cleanup;
}
useTag = (ServiceType == SERVICE_BOOT_START || ServiceType == SERVICE_SYSTEM_START); useTag = (ServiceType == SERVICE_BOOT_START || ServiceType == SERVICE_SYSTEM_START);
hSCManager = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_CREATE_SERVICE); hSCManager = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_CREATE_SERVICE);
@ -1802,7 +1811,10 @@ static BOOL InstallOneService(
goto cleanup; goto cleanup;
if (!GetLineText(hInf, ServiceSection, ServiceBinaryKey, &ServiceBinary)) if (!GetLineText(hInf, ServiceSection, ServiceBinaryKey, &ServiceBinary))
{
SetLastError( ERROR_BAD_SERVICE_INSTALLSECT );
goto cleanup; goto cleanup;
}
/* Adjust binary path according to the service type */ /* Adjust binary path according to the service type */
FixupServiceBinaryPath(ServiceType, &ServiceBinary); FixupServiceBinaryPath(ServiceType, &ServiceBinary);
@ -2096,21 +2108,27 @@ BOOL WINAPI SetupInstallServicesFromInfSectionExW( HINF hinf, PCWSTR sectionname
SERVICE_STATUS ServiceStatus; SERVICE_STATUS ServiceStatus;
ret = ControlService(hService, SERVICE_CONTROL_STOP, &ServiceStatus); ret = ControlService(hService, SERVICE_CONTROL_STOP, &ServiceStatus);
if (!ret && GetLastError() != ERROR_SERVICE_NOT_ACTIVE) if (!ret && GetLastError() != ERROR_SERVICE_NOT_ACTIVE)
goto cleanup; goto done;
if (ServiceStatus.dwCurrentState != SERVICE_STOP_PENDING && ServiceStatus.dwCurrentState != SERVICE_STOPPED) if (ServiceStatus.dwCurrentState != SERVICE_STOP_PENDING && ServiceStatus.dwCurrentState != SERVICE_STOPPED)
{ {
SetLastError(ERROR_INSTALL_SERVICE_FAILURE); SetLastError(ERROR_INSTALL_SERVICE_FAILURE);
goto cleanup; goto done;
} }
#endif #endif
flags &= ~SPSVCINST_STOPSERVICE; flags &= ~SPSVCINST_STOPSERVICE;
} }
if (!(ret = SetupFindFirstLineW( hinf, sectionname, NULL, &ContextService )))
{
SetLastError( ERROR_SECTION_NOT_FOUND );
goto done;
}
ret = SetupFindFirstLineW(hinf, sectionname, AddService, &ContextService); ret = SetupFindFirstLineW(hinf, sectionname, AddService, &ContextService);
while (ret) while (ret)
{ {
if (!GetStringField(&ContextService, 1, &ServiceName)) if (!GetStringField(&ContextService, 1, &ServiceName))
goto nextservice; goto done;
ret = SetupGetIntField( ret = SetupGetIntField(
&ContextService, &ContextService,
@ -2123,20 +2141,19 @@ BOOL WINAPI SetupInstallServicesFromInfSectionExW( HINF hinf, PCWSTR sectionname
} }
if (!GetStringField(&ContextService, 3, &ServiceSection)) if (!GetStringField(&ContextService, 3, &ServiceSection))
goto nextservice; goto done;
ret = InstallOneService(list, hinf, ServiceSection, ServiceName, (ServiceFlags & ~SPSVCINST_ASSOCSERVICE) | flags); ret = InstallOneService(list, hinf, ServiceSection, ServiceName, (ServiceFlags & ~SPSVCINST_ASSOCSERVICE) | flags);
if (!ret) if (!ret)
goto nextservice; goto done;
if (ServiceFlags & SPSVCINST_ASSOCSERVICE) if (ServiceFlags & SPSVCINST_ASSOCSERVICE)
{ {
ret = SetupDiSetDeviceRegistryPropertyW(DeviceInfoSet, DeviceInfoData, SPDRP_SERVICE, (LPBYTE)ServiceName, (strlenW(ServiceName) + 1) * sizeof(WCHAR)); ret = SetupDiSetDeviceRegistryPropertyW(DeviceInfoSet, DeviceInfoData, SPDRP_SERVICE, (LPBYTE)ServiceName, (strlenW(ServiceName) + 1) * sizeof(WCHAR));
if (!ret) if (!ret)
goto nextservice; goto done;
} }
nextservice:
HeapFree(GetProcessHeap(), 0, ServiceName); HeapFree(GetProcessHeap(), 0, ServiceName);
HeapFree(GetProcessHeap(), 0, ServiceSection); HeapFree(GetProcessHeap(), 0, ServiceSection);
ServiceName = ServiceSection = NULL; ServiceName = ServiceSection = NULL;
@ -2149,7 +2166,7 @@ nextservice:
SetLastError(ERROR_SUCCESS); SetLastError(ERROR_SUCCESS);
ret = TRUE; ret = TRUE;
} }
done:
TRACE("Returning %d\n", ret); TRACE("Returning %d\n", ret);
return ret; return ret;
} }