[akhaldi] 71583: [QMGR] Sync with Wine Staging 1.9.11. CORE-11368

Author: akhaldi
Date: Tue Jun  7 10:55:17 2016
New Revision: 71583

URL: http://svn.reactos.org/svn/reactos?rev=71583&view=rev
Log:
[QMGR] Sync with Wine Staging 1.9.11. CORE-11368

Modified:
    trunk/reactos/dll/win32/qmgr/file.c
    trunk/reactos/dll/win32/qmgr/job.c
    trunk/reactos/dll/win32/qmgr/service.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/qmgr/file.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/file.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/qmgr/file.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/qmgr/file.c	[iso-8859-1] Tue Jun  7 10:55:17 2016
@@ -412,7 +412,8 @@
     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;
@@ -513,17 +514,15 @@
     uc.nPort             = 0;
     uc.lpszUrlPath       = NULL;
     uc.dwUrlPathLength   = ~0u;
+    uc.lpszExtraInfo     = NULL;
+    uc.dwExtraInfoLength = 0;
     ret = WinHttpCrackUrl(file->info.RemoteName, 0, 0, &uc);
     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))

Modified: trunk/reactos/dll/win32/qmgr/job.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/job.c?rev=7…
==============================================================================
--- trunk/reactos/dll/win32/qmgr/job.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/qmgr/job.c	[iso-8859-1] Tue Jun  7 10:55:17 2016
@@ -364,6 +364,12 @@
              && This->state != BG_JOB_STATE_TRANSFERRING)
     {
         This->state = BG_JOB_STATE_QUEUED;
+        This->error.context = This->error.code = 0;
+        if (This->error.file)
+        {
+            IBackgroundCopyFile2_Release(This->error.file);
+            This->error.file = NULL;
+        }
         SetEvent(globalMgr.jobEvent);
     }
     LeaveCriticalSection(&globalMgr.cs);

Modified: trunk/reactos/dll/win32/qmgr/service.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/service.c?r…
==============================================================================
--- trunk/reactos/dll/win32/qmgr/service.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/qmgr/service.c	[iso-8859-1] Tue Jun  7 10:55:17 2016
@@ -143,7 +143,7 @@
     WaitForSingleObject(fileTxThread, INFINITE);
     UpdateStatus(SERVICE_STOPPED, NO_ERROR, 0);
     CloseHandle(stop_event);
-    TRACE("service stoped\n");
+    TRACE("service stopped\n");
 
     CoUninitialize();
 }

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Tue Jun  7 10:55:17 2016
@@ -156,7 +156,7 @@
 reactos/dll/win32/printui             # Synced to WineStaging-1.9.4
 reactos/dll/win32/propsys             # Synced to WineStaging-1.9.4
 reactos/dll/win32/pstorec             # Synced to WineStaging-1.9.4
-reactos/dll/win32/qmgr                # Synced to WineStaging-1.9.4
+reactos/dll/win32/qmgr                # Synced to WineStaging-1.9.11
 reactos/dll/win32/qmgrprxy            # Synced to WineStaging-1.9.4
 reactos/dll/win32/query               # Synced to WineStaging-1.9.4
 reactos/dll/win32/rasapi32            # Synced to WineStaging-1.9.4