Dmitry Timoshkov : schedsvc: Fix NetrJobDel return value in case of invalid job id.

Alexandre Julliard julliard at winehq.org
Wed Apr 25 15:11:15 CDT 2018


Module: wine
Branch: master
Commit: 325f96b952435cb7a963582ea8df9667cfa83b32
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=325f96b952435cb7a963582ea8df9667cfa83b32

Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date:   Wed Apr 25 11:29:50 2018 +0800

schedsvc: Fix NetrJobDel return value in case of invalid job id.

Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/schedsvc/atsvc.c          | 4 ++--
 dlls/schedsvc/tests/atsvcapi.c | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c
index 2010245..e7e59a4 100644
--- a/dlls/schedsvc/atsvc.c
+++ b/dlls/schedsvc/atsvc.c
@@ -589,7 +589,7 @@ DWORD __cdecl NetrJobAdd(ATSVC_HANDLE server_name, AT_INFO *info, DWORD *jobid)
 
 DWORD __cdecl NetrJobDel(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jobid)
 {
-    DWORD jobid, ret = ERROR_FILE_NOT_FOUND;
+    DWORD jobid, ret = APE_AT_ID_NOT_FOUND;
 
     TRACE("%s,%u,%u\n", debugstr_w(server_name), min_jobid, max_jobid);
 
@@ -602,7 +602,7 @@ DWORD __cdecl NetrJobDel(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jo
         if (!job)
         {
             TRACE("job %u not found\n", jobid);
-            ret = ERROR_FILE_NOT_FOUND;
+            ret = APE_AT_ID_NOT_FOUND;
             break;
         }
 
diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c
index 367c6da..66f237e 100644
--- a/dlls/schedsvc/tests/atsvcapi.c
+++ b/dlls/schedsvc/tests/atsvcapi.c
@@ -108,6 +108,9 @@ START_TEST(atsvcapi)
     ret = NetrJobGetInfo(server_name, 0xdeadbeef, &info2);
     ok(ret == APE_AT_ID_NOT_FOUND || broken(1) /* vista and w2008 return rubbish here */, "wrong error %u\n", ret);
 
+    ret = NetrJobDel(server_name, 0xdeadbeef, 0xdeadbeef);
+    ok(ret == APE_AT_ID_NOT_FOUND, "wrong error %u\n", ret);
+
     try_count = 5;
 
     for (try = 1; try <= try_count; try++)




More information about the wine-cvs mailing list