[0.4.11] [WINHTTP] Sledge-Hammer-Revert to SVN r75943 to fix regression CORE-13952

Our RCs were still affected by that regression.
The revert allows to run the current Online! setup
of Flash-Player 32.0.0.1 to download.
(I was able to watch a flash video in Opera 12.18 afterwards, before I was not)

same procedure as last releases

Author: JoachimHenze

dll/win32/winhttp/CMakeLists.txt

@@ -1,7 +1,4 @@
 
-remove_definitions(-D_WIN32_WINNT=0x502)
-add_definitions(-D_WIN32_WINNT=0x600)
-
 add_definitions(
     -D__WINESRC__
     -D_WINE)
@@ -17,7 +14,7 @@ list(APPEND SOURCE
     request.c
     session.c
     url.c
-    precomp.h)
+    winhttp_private.h)
 
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/winhttp_tlb.tlb)
 add_typelib(winhttp_tlb.idl)
@@ -30,7 +27,7 @@ add_library(winhttp SHARED
 set_module_type(winhttp win32dll)
 target_link_libraries(winhttp uuid wine)
 add_delay_importlibs(winhttp oleaut32 ole32 crypt32 secur32)
-add_importlibs(winhttp user32 advapi32 ws2_32 jsproxy kernel32_vista msvcrt kernel32 ntdll)
+add_importlibs(winhttp user32 advapi32 ws2_32 jsproxy msvcrt kernel32 ntdll)
 add_dependencies(winhttp stdole2)
-add_pch(winhttp precomp.h SOURCE)
+add_pch(winhttp winhttp_private.h SOURCE)
 add_cd_file(TARGET winhttp DESTINATION reactos/system32 FOR all)

dll/win32/winhttp/cookie.c

@@ -16,20 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include <stdarg.h>
-
-#include "wine/debug.h"
-#include "wine/list.h"
-
-#include "windef.h"
-#include "winbase.h"
-#include "winhttp.h"
-
 #include "winhttp_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(winhttp);
-
 static domain_t *add_domain( session_t *session, WCHAR *name )
 {
     domain_t *domain;
@@ -152,7 +140,7 @@ static cookie_t *parse_cookie( const WCHAR *string )
 
     if (*p++ == '=')
     {
-        while (*p == ' ') p++;
+        while (*p && *p == ' ') p++;
         len = strlenW( p );
         while (len && p[len - 1] == ' ') len--;
 

dll/win32/winhttp/handle.c

@@ -18,20 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-#include "wine/debug.h"
-
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winhttp.h"
-
 #include "winhttp_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(winhttp);
-
 #define HANDLE_CHUNK_SIZE 0x10
 
 static CRITICAL_SECTION handle_cs;

dll/win32/winhttp/inet_ntop.c

@@ -51,18 +51,16 @@ static const char *inet_ntop6(const u_char *src, char *dst, size_t size);
  * author:
  *	Paul Vixie, 1996.
  */
-
-PCSTR
-WSAAPI
-inet_ntop(INT Family, PVOID pAddr, PSTR pStringBuf, size_t StringBufSize)
+const char *
+inet_ntop(int af, const void *src, char *dst, size_t size)
 {
 
-	switch (Family) {
+	switch (af) {
 	case AF_INET:
-		return (inet_ntop4(pAddr, pStringBuf, StringBufSize));
+		return (inet_ntop4(src, dst, size));
 #ifdef INET6
 	case AF_INET6:
-		return (inet_ntop6(pAddr, pStringBuf, StringBufSize));
+		return (inet_ntop6(src, dst, size));
 #endif
 	default:
 		WSASetLastError(WSAEAFNOSUPPORT);

dll/win32/winhttp/main.c

@@ -16,23 +16,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
-#include "config.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "objbase.h"
-#include "rpcproxy.h"
-#include "httprequest.h"
-#include "winhttp.h"
-
-#include "wine/debug.h"
 #include "winhttp_private.h"
 
-HINSTANCE winhttp_instance;
+#include <rpcproxy.h>
+#include <httprequest.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(winhttp);
+static HINSTANCE instance;
 
 /******************************************************************
  *              DllMain (winhttp.@)
@@ -42,7 +31,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
     switch(fdwReason)
     {
     case DLL_PROCESS_ATTACH:
-        winhttp_instance = hInstDLL;
+        instance = hInstDLL;
         DisableThreadLibraryCalls(hInstDLL);
         break;
     case DLL_PROCESS_DETACH:
@@ -169,13 +158,13 @@ HRESULT WINAPI DllCanUnloadNow(void)
  */
 HRESULT WINAPI DllRegisterServer(void)
 {
-    return __wine_register_resources( winhttp_instance );
+    return __wine_register_resources( instance );
 }
 
 /***********************************************************************
  *          DllUnregisterServer (winhttp.@)
  */
 HRESULT WINAPI DllUnregisterServer(void)
 {
-    return __wine_unregister_resources( winhttp_instance );
+    return __wine_unregister_resources( instance );
 }