Hans Leidekker : qmgr: Change job state on failure in transfer_file_http.

[Alexandre Julliard]

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

Author: Hans Leidekker <hans(a)codeweavers.com>
Date:   Tue May 17 10:53:07 2016 +0200

qmgr: Change job state on failure in transfer_file_http.

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/qmgr/file.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c
index 2525caf..302f407 100644
--- a/dlls/qmgr/file.c
+++ b/dlls/qmgr/file.c
@@ -420,7 +420,8 @@ done:
     WinHttpCloseHandle(req);
     WinHttpCloseHandle(con);
     WinHttpCloseHandle(ses);
-    if (!ret) DeleteFileW(tmpfile);
+    if (!ret && !transitionJobState(job, BG_JOB_STATE_CONNECTING, BG_JOB_STATE_ERROR))
+        transitionJobState(job, BG_JOB_STATE_TRANSFERRING, BG_JOB_STATE_ERROR);
 
     SetEvent(job->done);
     return ret;
@@ -525,13 +526,9 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job)
     if (!ret)
     {
         TRACE("WinHttpCrackUrl failed, trying local file copy\n");
-        if (!transfer_file_local(file, tmpName)) return FALSE;
-    }
-    else if (!transfer_file_http(file, &uc, tmpName))
-    {
-        WARN("HTTP transfer failed\n");
-        return FALSE;
+        if (!transfer_file_local(file, tmpName)) WARN("local transfer failed\n");
     }
+    else if (!transfer_file_http(file, &uc, tmpName)) WARN("HTTP transfer failed\n");
 
     if (transitionJobState(job, BG_JOB_STATE_CONNECTING, BG_JOB_STATE_QUEUED) ||
         transitionJobState(job, BG_JOB_STATE_TRANSFERRING, BG_JOB_STATE_QUEUED))