From abaeaf245ea7d5648798d393758f922573953f60 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 26 Nov 2015 23:33:27 +0000 Subject: [PATCH] [SERVICES_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 svn path=/trunk/; revision=70138 --- rostests/winetests/services/service.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/rostests/winetests/services/service.c b/rostests/winetests/services/service.c index 99d28ebf4ee..bebfa681aeb 100644 --- a/rostests/winetests/services/service.c +++ b/rostests/winetests/services/service.c @@ -328,6 +328,7 @@ static void test_service(void) ok(res, "StartService failed: %u\n", GetLastError()); if(!res) { DeleteService(service_handle); + CloseServiceHandle(service_handle); return; } expect_event("RUNNING"); @@ -368,6 +369,7 @@ static inline void test_no_stop(void) ok(res, "StartService failed: %u\n", GetLastError()); if(!res) { DeleteService(service_handle); + CloseServiceHandle(service_handle); return; } expect_event("RUNNING"); @@ -468,10 +470,14 @@ START_TEST(service) return; } - argc = winetest_get_mainargs(&argv); - scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); - ok(scm_handle != NULL, "OpenSCManager failed: %u\n", GetLastError()); + ok(scm_handle != NULL || GetLastError() == ERROR_ACCESS_DENIED, "OpenSCManager failed: %u\n", GetLastError()); + if(!scm_handle) { + skip("OpenSCManager failed, skipping tests\n"); + return; + } + + argc = winetest_get_mainargs(&argv); if(argc < 3) { test_runner(test_service); -- 2.17.1