[WINHTTP] Sync with Wine Staging 1.9.16. CORE-11866

svn path=/trunk/; revision=72354

diff --git a/reactos/dll/win32/winhttp/handle.c b/reactos/dll/win32/winhttp/handle.c
index f7d1b39..e67e5e3 100644 (file)
--- a/reactos/dll/win32/winhttp/handle.c
+++ b/reactos/dll/win32/winhttp/handle.c
@@ -77,9 +77,10 @@ void release_object( object_header_t *hdr )
 HINTERNET alloc_handle( object_header_t *hdr )
 {
     object_header_t **p;
-    ULONG_PTR handle = 0, num;
+    ULONG_PTR handle, num;
 
     list_init( &hdr->children );
+    hdr->handle = NULL;
 
     EnterCriticalSection( &handle_cs );
     if (!max_handles)
@@ -100,11 +101,12 @@ HINTERNET alloc_handle( object_header_t *hdr )
     if (handles[handle]) ERR("handle isn't free but should be\n");
 
     handles[handle] = addref_object( hdr );
-    while (handles[next_handle] && (next_handle < max_handles)) next_handle++;
+    hdr->handle = (HINTERNET)(handle + 1);
+    while ((next_handle < max_handles) && handles[next_handle]) next_handle++;
 
 end:
     LeaveCriticalSection( &handle_cs );
-    return hdr->handle = (HINTERNET)(handle + 1);
+    return hdr->handle;
 }
 
 BOOL free_handle( HINTERNET hinternet )

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 7414057..a1f08e9 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.9.16
 reactos/dll/win32/windowscodecsext    # Synced to WineStaging-1.9.11
 reactos/dll/win32/winemp3.acm         # Synced to WineStaging-1.9.11
 reactos/dll/win32/wing32              # Synced to WineStaging-1.9.11
-reactos/dll/win32/winhttp             # Synced to WineStaging-1.9.11
+reactos/dll/win32/winhttp             # Synced to WineStaging-1.9.16
 reactos/dll/win32/wininet             # Synced to WineStaging-1.9.11
 reactos/dll/win32/winmm               # Forked at Wine-20050628
 reactos/dll/win32/winmm/midimap       # Forked at Wine-20050628