[ros-diffs] [akhaldi] 73287: [QMGR] Sync with Wine Staging 1.9.23. CORE-12409

Author: akhaldi
Date: Thu Nov 17 23:01:19 2016
New Revision: 73287

URL: http://svn.reactos.org/svn/reactos?rev=73287&view=rev
Log:
[QMGR] Sync with Wine Staging 1.9.23. CORE-12409

Modified:
    trunk/reactos/dll/win32/qmgr/file.c
    trunk/reactos/dll/win32/qmgr/job.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] Thu Nov 17 23:01:19 2016
@@ -193,7 +193,7 @@
     return S_OK;
 }
 
-static HRESULT error_from_http_response(DWORD code)
+static HRESULT hresult_from_http_response(DWORD code)
 {
     switch (code)
     {
@@ -231,7 +231,7 @@
         if (WinHttpQueryHeaders(handle,
WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER,
                                 NULL, &code, &size, NULL))
         {
-            if ((job->error.code = error_from_http_response(code)))
+            if ((job->error.code = hresult_from_http_response(code)))
             {
                 EnterCriticalSection(&job->cs);
 
@@ -273,7 +273,7 @@
     case WINHTTP_CALLBACK_STATUS_REQUEST_ERROR:
     {
         WINHTTP_ASYNC_RESULT *result = (WINHTTP_ASYNC_RESULT *)buf;
-        job->error.code = result->dwError;
+        job->error.code = HRESULT_FROM_WIN32(result->dwError);
         transitionJobState(job, BG_JOB_STATE_TRANSFERRING, BG_JOB_STATE_ERROR);
         break;
     }
@@ -378,10 +378,10 @@
     if (!set_request_credentials(req, job)) goto done;
 
     if (!(WinHttpSendRequest(req, job->http_options.headers, ~0u, NULL, 0, 0,
(DWORD_PTR)file))) goto done;
-    if (wait_for_completion(job) || job->error.code) goto done;
+    if (wait_for_completion(job) || FAILED(job->error.code)) goto done;
 
     if (!(WinHttpReceiveResponse(req, NULL))) goto done;
-    if (wait_for_completion(job) || job->error.code) goto done;
+    if (wait_for_completion(job) || FAILED(job->error.code)) goto done;
 
     transitionJobState(job, BG_JOB_STATE_CONNECTING, BG_JOB_STATE_TRANSFERRING);
 
@@ -392,7 +392,7 @@
     {
         file->read_size = 0;
         if (!(ret = WinHttpReadData(req, buf, sizeof(buf), NULL))) break;
-        if (wait_for_completion(job) || job->error.code)
+        if (wait_for_completion(job) || FAILED(job->error.code))
         {
             ret = FALSE;
             break;

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] Thu Nov 17 23:01:19 2016
@@ -364,7 +364,8 @@
              && This->state != BG_JOB_STATE_TRANSFERRING)
     {
         This->state = BG_JOB_STATE_QUEUED;
-        This->error.context = This->error.code = 0;
+        This->error.context = 0;
+        This->error.code = S_OK;
         if (This->error.file)
         {
             IBackgroundCopyFile2_Release(This->error.file);
@@ -1238,7 +1239,7 @@
     This->callback2 = FALSE;
 
     This->error.context = 0;
-    This->error.code = 0;
+    This->error.code = S_OK;
     This->error.file = NULL;
 
     memset(&This->http_options, 0, sizeof(This->http_options));

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] Thu Nov 17 23:01:19 2016
@@ -153,7 +153,7 @@
 reactos/dll/win32/printui             # Synced to WineStaging-1.9.11
 reactos/dll/win32/propsys             # Synced to WineStaging-1.9.16
 reactos/dll/win32/pstorec             # Synced to WineStaging-1.9.16
-reactos/dll/win32/qmgr                # Synced to WineStaging-1.9.11
+reactos/dll/win32/qmgr                # Synced to WineStaging-1.9.23
 reactos/dll/win32/qmgrprxy            # Synced to WineStaging-1.9.11
 reactos/dll/win32/query               # Synced to WineStaging-1.9.11
 reactos/dll/win32/rasapi32            # Synced to WineStaging-1.9.11