Paul Vriens : advapi32/service: Set correct error when the service doesn' t exist.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Jul 30 08:55:56 CDT 2007


Module: wine
Branch: master
Commit: 07af2fe2b5b55e64bc1e2d225e7bb59430b0f101
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=07af2fe2b5b55e64bc1e2d225e7bb59430b0f101

Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date:   Fri Jul 27 21:47:43 2007 +0200

advapi32/service: Set correct error when the service doesn't exist.

---

 dlls/advapi32/service.c       |    2 ++
 dlls/advapi32/tests/service.c |    1 -
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c
index 0c37313..f0592fb 100644
--- a/dlls/advapi32/service.c
+++ b/dlls/advapi32/service.c
@@ -2352,6 +2352,8 @@ BOOL WINAPI GetServiceDisplayNameW( SC_HANDLE hSCManager, LPCWSTR lpServiceName,
             SetLastError(ERROR_INSUFFICIENT_BUFFER);
             *lpcchBuffer = (size / sizeof(WCHAR)) - 1;
         }
+        else if (ret == ERROR_FILE_NOT_FOUND)
+            SetLastError(ERROR_SERVICE_DOES_NOT_EXIST);
         else
             SetLastError(ret);
         return FALSE;
diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c
index 8fc1af9..2291236 100644
--- a/dlls/advapi32/tests/service.c
+++ b/dlls/advapi32/tests/service.c
@@ -420,7 +420,6 @@ static void test_get_displayname(void)
     displaysize = -1;
     ret = GetServiceDisplayNameA(scm_handle, deadbeef, NULL, &displaysize);
     ok(!ret, "Expected failure\n");
-    todo_wine
     ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST,
        "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError());
 




More information about the wine-cvs mailing list