ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi/tests: Delete TestService after testing. 

Signed-off-by: Andreas Maier <andy1.m@gmx.de>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Andreas Maier 2016-06-06 23:35:16 +02:00 committed by Alexandre Julliard
parent ddc1baa432
commit 62eb31d852
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dlls/msi/tests/action.c
View File

@ -5427,6 +5427,30 @@ static void test_start_stop_services(void)
DeleteFileA(msifile); DeleteFileA(msifile);
} }
static void delete_TestService(void)
{
BOOL ret;
SC_HANDLE manager, service;
manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS);
ok(manager != NULL, "can't open service manager\n");
if (!manager)
return;
service = OpenServiceA(manager, "TestService", GENERIC_ALL);
ok(service != NULL, "TestService doesn't exist\n");
if (service)
{
ret = DeleteService( service );
ok( ret, "failed to delete service %u\n", GetLastError() );
CloseServiceHandle(service);
}
CloseServiceHandle(manager);
}
static void test_delete_services(void) static void test_delete_services(void)
{ {
UINT r; UINT r;
@ -5492,6 +5516,7 @@ static void test_delete_services(void)
ok(delete_pf("msitest", FALSE), "Directory not created\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n");
error: error:
delete_TestService();
delete_test_files(); delete_test_files();
DeleteFileA(msifile); DeleteFileA(msifile);
} }
@ -5500,7 +5525,9 @@ static void test_install_services(void)
{ {
UINT r; UINT r;
SC_HANDLE manager, service; SC_HANDLE manager, service;
BOOL ret; LONG res;
HKEY hKey;
DWORD err_control, err_controlsize, err_controltype;
if (is_process_limited()) if (is_process_limited())
{ {
@ -5550,20 +5577,8 @@ static void test_install_services(void)
ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "Directory not created\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n");
manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS);
ok(manager != NULL, "can't open service manager\n");
if (!manager) goto error;
service = OpenServiceA(manager, "TestService", GENERIC_ALL);
ok(service != NULL, "TestService doesn't exist\n");
ret = DeleteService( service );
ok( ret, "failed to delete service %u\n", GetLastError() );
CloseServiceHandle(service);
CloseServiceHandle(manager);
error: error:
delete_TestService();
delete_test_files(); delete_test_files();
DeleteFileA(msifile); DeleteFileA(msifile);
} }