[WINHTTP] Sync with Wine Staging 1.9.4. CORE-10912

svn path=/trunk/; revision=70946

diff --git a/reactos/dll/win32/winhttp/request.c b/reactos/dll/win32/winhttp/request.c
index fff0a1d..6baa317 100644 (file)
--- a/reactos/dll/win32/winhttp/request.c
+++ b/reactos/dll/win32/winhttp/request.c
@@ -2411,8 +2411,8 @@ static BOOL receive_response( request_t *request, BOOL async )
         {
             if (request->hdr.disable_flags & WINHTTP_DISABLE_AUTHENTICATION) break;
 
         {
             if (request->hdr.disable_flags & WINHTTP_DISABLE_AUTHENTICATION) break;
 

-            drain_content( request );

             if (!handle_authorization( request, status )) break;
             if (!handle_authorization( request, status )) break;

+            drain_content( request );

 
             /* recurse synchronously */
             if ((ret = send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ))) continue;
 
             /* recurse synchronously */
             if ((ret = send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ))) continue;


@@ -3052,7 +3052,7 @@ static HRESULT WINAPI winhttp_request_SetCredentials(
     DWORD target, scheme = WINHTTP_AUTH_SCHEME_BASIC; /* FIXME: query supported schemes */
     DWORD err = ERROR_SUCCESS;
 
     DWORD target, scheme = WINHTTP_AUTH_SCHEME_BASIC; /* FIXME: query supported schemes */
     DWORD err = ERROR_SUCCESS;
 

-    TRACE("%p, %s, %p\n", request, debugstr_w(username), password);
+    TRACE("%p, %s, %p, 0x%08x\n", request, debugstr_w(username), password, flags);

 
     EnterCriticalSection( &request->cs );
     if (request->state < REQUEST_STATE_OPEN)
 
     EnterCriticalSection( &request->cs );
     if (request->state < REQUEST_STATE_OPEN)

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 01a3410..85d4fc0 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -204,7 +204,7 @@ reactos/dll/win32/windowscodecs       # Synced to WineStaging-1.7.55
 reactos/dll/win32/windowscodecsext    # Synced to WineStaging-1.7.55
 reactos/dll/win32/winemp3.acm         # Synced to WineStaging-1.7.55
 reactos/dll/win32/wing32              # Synced to WineStaging-1.7.55
 reactos/dll/win32/windowscodecsext    # Synced to WineStaging-1.7.55
 reactos/dll/win32/winemp3.acm         # Synced to WineStaging-1.7.55
 reactos/dll/win32/wing32              # Synced to WineStaging-1.7.55

-reactos/dll/win32/winhttp             # Synced to WineStaging-1.7.55
+reactos/dll/win32/winhttp             # Synced to WineStaging-1.9.4

 reactos/dll/win32/wininet             # Synced to WineStaging-1.7.55
 reactos/dll/win32/winmm               # Forked at Wine-20050628
 reactos/dll/win32/winmm/midimap       # Forked at Wine-20050628
 reactos/dll/win32/wininet             # Synced to WineStaging-1.7.55
 reactos/dll/win32/winmm               # Forked at Wine-20050628
 reactos/dll/win32/winmm/midimap       # Forked at Wine-20050628