Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Process AddReg directive in main section to install

Browse source 
Simplify a call to SetupInstallFromInfSectionW
Fix a warning (thanks w3seek)

svn path=/trunk/; revision=18446
This commit is contained in:
Hervé Poussineau 2005-10-14 18:09:17 +00:00
parent 48b9916f22
commit 8325af0b6a
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
reactos/lib/setupapi/devinst.c
View file

@ -2936,7 +2936,7 @@ BOOL WINAPI SetupDiCallClassInstaller(
{ {
LIST_ENTRY ClassCoInstallersListHead; LIST_ENTRY ClassCoInstallersListHead;
LIST_ENTRY DeviceCoInstallersListHead; LIST_ENTRY DeviceCoInstallersListHead;
HMODULE ClassInstallerLibrary; HMODULE ClassInstallerLibrary = NULL;
CLASS_INSTALL_PROC ClassInstaller = NULL; CLASS_INSTALL_PROC ClassInstaller = NULL;
COINSTALLER_CONTEXT_DATA Context; COINSTALLER_CONTEXT_DATA Context;
PLIST_ENTRY ListEntry; PLIST_ENTRY ListEntry;
@ -4828,7 +4828,6 @@ SetupDiInstallDevice(
HKEY hClassKey = INVALID_HANDLE_VALUE; HKEY hClassKey = INVALID_HANDLE_VALUE;
LONG rc; LONG rc;
HWND hWnd; HWND hWnd;
PVOID callback_context;
BOOL ret = FALSE; /* Return value */ BOOL ret = FALSE; /* Return value */
TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData);
@ -4916,6 +4915,17 @@ SetupDiInstallDevice(
if (hKey == INVALID_HANDLE_VALUE) if (hKey == INVALID_HANDLE_VALUE)
goto cleanup; goto cleanup;
/* Install main section */
/* Files have already been copied in SetupDiInstallDriverFiles.
* Process only registry entries. */
*pSectionName = '\0';
Result = SetupInstallFromInfSectionW(hWnd, hInf, SectionName,
SPINST_REGISTRY, hKey, NULL, 0,
SetupDefaultQueueCallbackW, NULL,
NULL, NULL);
if (!Result)
goto cleanup;
/* Write information to driver key */ /* Write information to driver key */
*pSectionName = UNICODE_NULL; *pSectionName = UNICODE_NULL;
TRACE("Write information to driver key\n"); TRACE("Write information to driver key\n");
@ -5048,12 +5058,10 @@ nextfile:
/* Install .HW section */ /* Install .HW section */
wcscpy(pSectionName, L".HW"); wcscpy(pSectionName, L".HW");
callback_context = SetupInitDefaultQueueCallback(hWnd);
Result = SetupInstallFromInfSectionW(hWnd, hInf, SectionName, Result = SetupInstallFromInfSectionW(hWnd, hInf, SectionName,
SPINST_REGISTRY, hKey, NULL, 0, SPINST_REGISTRY, hKey, NULL, 0,
SetupDefaultQueueCallbackW, callback_context, SetupDefaultQueueCallbackW, NULL,
NULL, NULL); NULL, NULL);
SetupTermDefaultQueueCallback(callback_context);
if (!Result) if (!Result)
goto cleanup; goto cleanup;