[ros-diffs] [akhaldi] 73954: [JSPROXY] Sync with Wine Staging 2.2. CORE-12823 2b094f9 jsproxy: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). aee5267 jsproxy: Use debugstr_a on URL.

Author: akhaldi
Date: Sun Feb 26 17:41:19 2017
New Revision: 73954

URL: http://svn.reactos.org/svn/reactos?rev=73954&view=rev
Log:
[JSPROXY] Sync with Wine Staging 2.2. CORE-12823

2b094f9 jsproxy: Add a __WINE_ALLOC_SIZE attribute to heap_alloc().
aee5267 jsproxy: Use debugstr_a on URL.

Modified:
    trunk/reactos/dll/win32/jsproxy/main.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/jsproxy/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jsproxy/main.c?r…
==============================================================================
--- trunk/reactos/dll/win32/jsproxy/main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/jsproxy/main.c	[iso-8859-1] Sun Feb 26 17:41:19 2017
@@ -89,14 +89,14 @@
     return TRUE;
 }
 
-static inline void *heap_alloc( SIZE_T size )
-{
-    return HeapAlloc( GetProcessHeap(), 0, size );
-}
-
-static inline BOOL heap_free( LPVOID mem )
-{
-    return HeapFree( GetProcessHeap(), 0, mem );
+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 )
@@ -637,7 +637,7 @@
     WCHAR *urlW = NULL, *hostnameW = NULL;
     BOOL ret = FALSE;
 
-    TRACE( "%s, %u, %s, %u, %p, %p\n", url, len_url, hostname, len_hostname,
proxy, len_proxy );
+    TRACE( "%s, %u, %s, %u, %p, %p\n", debugstr_a(url), len_url, hostname,
len_hostname, proxy, len_proxy );
 
     EnterCriticalSection( &cs_jsproxy );
 

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] Sun Feb 26 17:41:19 2017
@@ -86,7 +86,7 @@
 reactos/dll/win32/itircl              # Synced to WineStaging-1.9.11
 reactos/dll/win32/itss                # Synced to WineStaging-2.2
 reactos/dll/win32/jscript             # Synced to WineStaging-2.2
-reactos/dll/win32/jsproxy             # Synced to WineStaging-1.9.11
+reactos/dll/win32/jsproxy             # Synced to WineStaging-2.2
 reactos/dll/win32/loadperf            # Synced to WineStaging-1.9.11
 reactos/dll/win32/lz32                # Synced to WineStaging-1.9.11
 reactos/dll/win32/mapi32              # Synced to WineStaging-1.9.11