[ros-diffs] 01/01: [JSPROXY] Sync with Wine Staging 3.3. CORE-14434

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d1b509fa0b1885e4bb21…

commit 7d1b509fa0b1885e4bb21aa3553481ed86a3ace1
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sat Mar 17 13:13:02 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Sat Mar 17 13:13:02 2018 +0100

    [JSPROXY] Sync with Wine Staging 3.3. CORE-14434
---
 dll/win32/jsproxy/main.c | 50 +++++++++++++++++++++---------------------------
 media/doc/README.WINE    |  2 +-
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/dll/win32/jsproxy/main.c b/dll/win32/jsproxy/main.c
index 9a3a196717..e6a35d5ff2 100644
--- a/dll/win32/jsproxy/main.c
+++ b/dll/win32/jsproxy/main.c
@@ -16,25 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <wine/config.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <oleauto.h>
-#include <dispex.h>
-#include <activscp.h>
-#include <wininet.h>
-
-#include <wine/debug.h>
-#include <wine/unicode.h>
+#include "config.h"
+#include "wine/port.h"
 
+#include <stdarg.h>
+#include <sys/types.h>
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
@@ -44,6 +30,9 @@
 #ifdef HAVE_NETDB_H
 # include <netdb.h>
 #endif
+#ifdef __REACTOS__
+#define COBJMACROS
+#endif
 #if defined(__MINGW32__) || defined (_MSC_VER)
 # include <ws2tcpip.h>
 #else
@@ -51,9 +40,24 @@
 # define ioctlsocket ioctl
 #endif
 
+#include "windef.h"
+#include "winbase.h"
 #ifndef __MINGW32__
 #define USE_WS_PREFIX
 #endif
+#include "winsock2.h"
+#include "ws2ipdef.h"
+#include "winnls.h"
+#include "wininet.h"
+#ifndef __REACTOS__
+#define COBJMACROS
+#endif
+#include "ole2.h"
+#include "dispex.h"
+#include "activscp.h"
+#include "wine/debug.h"
+#include "wine/heap.h"
+#include "wine/unicode.h"
 
 static HINSTANCE instance;
 
@@ -89,16 +93,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
     return TRUE;
 }
 
-static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size)
-{
-    return HeapAlloc(GetProcessHeap(), 0, size);
-}
-
-static inline BOOL heap_free(void *mem)
-{
-    return HeapFree(GetProcessHeap(), 0, mem);
-}
-
 static inline WCHAR *strdupAW( const char *src, int len )
 {
     WCHAR *dst = NULL;
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index bd747fa90b..4c50bcfc6d 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -86,7 +86,7 @@ reactos/dll/win32/iphlpapi            # Out of sync
 reactos/dll/win32/itircl              # Synced to WineStaging-3.3
 reactos/dll/win32/itss                # Synced to WineStaging-3.3
 reactos/dll/win32/jscript             # Synced to WineStaging-3.3
-reactos/dll/win32/jsproxy             # Synced to WineStaging-2.16
+reactos/dll/win32/jsproxy             # Synced to WineStaging-3.3
 reactos/dll/win32/loadperf            # Synced to WineStaging-2.9
 reactos/dll/win32/lz32                # Synced to WineStaging-2.9
 reactos/dll/win32/mapi32              # Synced to WineStaging-2.16