Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-03 21:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[JSPROXY] Sync with Wine Staging 2.2. CORE-12823

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

svn path=/trunk/; revision=73954
This commit is contained in:
Amine Khaldi 2017-02-26 17:41:19 +00:00
parent 7643fdc6bb
commit 90a505efb3
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/dll/win32/jsproxy/main.c
View file

@ -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 );

2
reactos/media/doc/README.WINE
View file

@ -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