diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 731d668b8aa21805f58e67c40ddc240a8b0232ad..9fc351fd0b06ac8de6c2411d377b354e87626bfa 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1228,12 +1228,6 @@ SC_HANDLE WINAPI OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, TRACE("%p %s %d\n", hSCManager, debugstr_w(lpServiceName), dwDesiredAccess); - if (!lpServiceName) - { - SetLastError(ERROR_INVALID_ADDRESS); - return NULL; - } - hscm = sc_handle_get_handle_data( hSCManager, SC_HTYPE_MANAGER ); if (!hscm) { @@ -1241,6 +1235,12 @@ SC_HANDLE WINAPI OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, return FALSE; } + if (!lpServiceName) + { + SetLastError(ERROR_INVALID_ADDRESS); + return NULL; + } + r = RegOpenKeyExW( hscm->hkey, lpServiceName, 0, KEY_ALL_ACCESS, &hKey ); if (r!=ERROR_SUCCESS) { diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 341423ec7eb754f898f7a68d601ad740ae291edb..b3779f9fb9ed0d66e37878e1ddda890107075783 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -93,7 +93,6 @@ static void test_open_svc(void) SetLastError(0xdeadbeef); svc_handle = OpenServiceA(NULL, NULL, 0); ok(!svc_handle, "Expected failure\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); /* TODO: Add some tests with invalid handles. These produce errors on Windows but crash on Wine */