setupapi: Install services in InstallHinfSection.

This commit is contained in:
Alexandre Julliard 2008-04-16 12:36:18 +02:00
parent cf78e6c38c
commit c7e661b8e5
2 changed files with 4 additions and 3 deletions

View File

@ -1032,8 +1032,9 @@ void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, LPCWSTR cmdline, I
static const WCHAR nt_platformW[] = {'.','n','t',0};
#endif
static const WCHAR nt_genericW[] = {'.','n','t',0};
static const WCHAR servicesW[] = {'.','S','e','r','v','i','c','e','s',0};
WCHAR *s, *path, section[MAX_PATH + sizeof(nt_platformW)/sizeof(WCHAR)];
WCHAR *s, *path, section[MAX_PATH + (sizeof(nt_platformW) + sizeof(servicesW)) / sizeof(WCHAR)];
void *callback_context;
UINT mode;
HINF hinf;
@ -1076,6 +1077,8 @@ void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, LPCWSTR cmdline, I
SetupDefaultQueueCallbackW, callback_context,
NULL, NULL );
SetupTermDefaultQueueCallback( callback_context );
strcatW( section, servicesW );
SetupInstallServicesFromInfSectionW( hinf, section, 0 );
SetupCloseInfFile( hinf );
/* FIXME: should check the mode and maybe reboot */

View File

@ -329,12 +329,10 @@ static void test_driver_install(void)
/* Open the service to see if it's really there */
svc_handle = OpenServiceA(scm_handle, "Winetest", DELETE);
todo_wine
ok(svc_handle != NULL, "Service was not created\n");
SetLastError(0xdeadbeef);
ret = DeleteService(svc_handle);
todo_wine
ok(ret, "Service could not be deleted : %d\n", GetLastError());
CloseServiceHandle(svc_handle);