[ros-diffs] [akhaldi] 70138: [SERVICES_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536

Author: akhaldi
Date: Thu Nov 26 23:33:27 2015
New Revision: 70138

URL: http://svn.reactos.org/svn/reactos?rev=70138&view=rev
Log:
[SERVICES_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536

Modified:
    trunk/rostests/winetests/services/service.c

Modified: trunk/rostests/winetests/services/service.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/services/service...
==============================================================================
--- trunk/rostests/winetests/services/service.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/services/service.c	[iso-8859-1] Thu Nov 26 23:33:27 2015
@@ -328,6 +328,7 @@
     ok(res, "StartService failed: %u\n", GetLastError());
     if(!res) {
         DeleteService(service_handle);
+        CloseServiceHandle(service_handle);
         return;
     }
     expect_event("RUNNING");
@@ -368,6 +369,7 @@
     ok(res, "StartService failed: %u\n", GetLastError());
     if(!res) {
         DeleteService(service_handle);
+        CloseServiceHandle(service_handle);
         return;
     }
     expect_event("RUNNING");
@@ -468,10 +470,14 @@
         return;
     }

+    scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL);
+    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);
-
-    scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL);
-    ok(scm_handle != NULL, "OpenSCManager failed: %u\n", GetLastError());

if(argc < 3) {
         test_runner(test_service);