Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 16:12:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[JSPROXY] Sync with Wine Staging 3.3. CORE-14434

Browse source
This commit is contained in:
Amine Khaldi 2018-03-17 13:13:02 +01:00
parent e68a367aa6
commit 7d1b509fa0
2 changed files with 23 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

50
dll/win32/jsproxy/main.c
View file

@ -16,25 +16,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <wine/config.h> #include "config.h"
#include "wine/port.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 <stdarg.h>
#include <sys/types.h>
#ifdef HAVE_SYS_SOCKET_H #ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h> # include <sys/socket.h>
#endif #endif
@ -44,6 +30,9 @@
#ifdef HAVE_NETDB_H #ifdef HAVE_NETDB_H
# include <netdb.h> # include <netdb.h>
#endif #endif
#ifdef __REACTOS__
#define COBJMACROS
#endif
#if defined(__MINGW32__) || defined (_MSC_VER) #if defined(__MINGW32__) || defined (_MSC_VER)
# include <ws2tcpip.h> # include <ws2tcpip.h>
#else #else
@ -51,9 +40,24 @@
# define ioctlsocket ioctl # define ioctlsocket ioctl
#endif #endif
#include "windef.h"
#include "winbase.h"
#ifndef __MINGW32__ #ifndef __MINGW32__
#define USE_WS_PREFIX #define USE_WS_PREFIX
#endif #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; static HINSTANCE instance;
@ -89,16 +93,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
return TRUE; 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 ) static inline WCHAR *strdupAW( const char *src, int len )
{ {
WCHAR *dst = NULL; WCHAR *dst = NULL;

2
media/doc/README.WINE
View file

@ -86,7 +86,7 @@ reactos/dll/win32/iphlpapi # Out of sync
reactos/dll/win32/itircl # Synced to WineStaging-3.3 reactos/dll/win32/itircl # Synced to WineStaging-3.3
reactos/dll/win32/itss # 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/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/loadperf # Synced to WineStaging-2.9
reactos/dll/win32/lz32 # Synced to WineStaging-2.9 reactos/dll/win32/lz32 # Synced to WineStaging-2.9
reactos/dll/win32/mapi32 # Synced to WineStaging-2.16 reactos/dll/win32/mapi32 # Synced to WineStaging-2.16