mirror of
https://github.com/reactos/reactos.git
synced 2024-08-05 11:00:55 +00:00
Repair TCP/IP service installation
svn path=/trunk/; revision=30022
This commit is contained in:
parent
596a6762cf
commit
273ddbf9fd
|
@ -101,7 +101,8 @@ static BOOL
|
|||
InstallInfSection(
|
||||
IN HWND hWnd,
|
||||
IN LPCWSTR InfFile,
|
||||
IN LPCWSTR InfSection)
|
||||
IN LPCWSTR InfSection OPTIONAL,
|
||||
IN LPCWSTR InfService OPTIONAL)
|
||||
{
|
||||
WCHAR Buffer[MAX_PATH];
|
||||
HINF hInf = INVALID_HANDLE_VALUE;
|
||||
|
@ -132,12 +133,21 @@ InstallInfSection(
|
|||
if (Context == NULL)
|
||||
goto cleanup;
|
||||
|
||||
ret = SetupInstallFromInfSectionW(
|
||||
hWnd, hInf,
|
||||
InfSection, SPINST_ALL,
|
||||
NULL, NULL, SP_COPY_NEWER,
|
||||
SetupDefaultQueueCallbackW, Context,
|
||||
NULL, NULL);
|
||||
ret = TRUE;
|
||||
if (ret && InfSection)
|
||||
{
|
||||
ret = SetupInstallFromInfSectionW(
|
||||
hWnd, hInf,
|
||||
InfSection, SPINST_ALL,
|
||||
NULL, NULL, SP_COPY_NEWER,
|
||||
SetupDefaultQueueCallbackW, Context,
|
||||
NULL, NULL);
|
||||
}
|
||||
if (ret && InfService)
|
||||
{
|
||||
ret = SetupInstallServicesFromInfSectionW(
|
||||
hInf, InfService, 0);
|
||||
}
|
||||
|
||||
cleanup:
|
||||
if (Context)
|
||||
|
@ -158,7 +168,8 @@ InstallAdditionalServices(
|
|||
ret = InstallInfSection(
|
||||
hWnd,
|
||||
L"nettcpip.inf",
|
||||
L"MS_TCPIP.PrimaryInstall");
|
||||
L"MS_TCPIP.PrimaryInstall",
|
||||
L"MS_TCPIP.PrimaryInstall.Services");
|
||||
if (!ret && GetLastError() != ERROR_FILE_NOT_FOUND)
|
||||
{
|
||||
DPRINT("InstallInfSection() failed with error 0x%lx\n", GetLastError());
|
||||
|
|
Loading…
Reference in a new issue