From 90a505efb3939994c676a9d15a187145e32b0d71 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 26 Feb 2017 17:41:19 +0000 Subject: [PATCH] [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. svn path=/trunk/; revision=73954 --- reactos/dll/win32/jsproxy/main.c | 10 +++++----- reactos/media/doc/README.WINE | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/reactos/dll/win32/jsproxy/main.c b/reactos/dll/win32/jsproxy/main.c index c4649c878d8..9a3a1967176 100644 --- a/reactos/dll/win32/jsproxy/main.c +++ b/reactos/dll/win32/jsproxy/main.c @@ -89,14 +89,14 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return TRUE; } -static inline void *heap_alloc( SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc( GetProcessHeap(), 0, size ); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline BOOL heap_free( LPVOID mem ) +static inline BOOL heap_free(void *mem) { - return HeapFree( GetProcessHeap(), 0, mem ); + return HeapFree(GetProcessHeap(), 0, mem); } static inline WCHAR *strdupAW( const char *src, int len ) @@ -637,7 +637,7 @@ BOOL WINAPI InternetGetProxyInfo( LPCSTR url, DWORD len_url, LPCSTR hostname, DW 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 ); diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 02138c7a6d0..b48ee16c3a9 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -86,7 +86,7 @@ reactos/dll/win32/iphlpapi # Out of sync 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