system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 02:06:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

jsproxy: Build with msvcrt.

Browse source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2019-06-06 09:21:50 +02:00
parent 5831a0bfea
commit 4ce467ff3b
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/jsproxy/Makefile.in
View file

@ -2,6 +2,8 @@ MODULE = jsproxy.dll
IMPORTS = uuid oleaut32 ole32 ws2_32
IMPORTLIB = jsproxy
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
main.c

18
dlls/jsproxy/main.c
View file

@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include <sys/types.h>
@ -35,7 +32,6 @@
#include "activscp.h"
#include "wine/debug.h"
#include "wine/heap.h"
#include "wine/unicode.h"
static HINSTANCE instance;
@ -275,7 +271,7 @@ static HRESULT WINAPI dispex_GetNameSpaceParent(
static HRESULT WINAPI dispex_GetDispID(
IDispatchEx *iface, BSTR name, DWORD flags, DISPID *id )
{
if (!strcmpW( name, dns_resolveW ))
if (!lstrcmpW( name, dns_resolveW ))
{
*id = DISPID_GLOBAL_DNSRESOLVE;
return S_OK;
@ -299,9 +295,9 @@ static char *get_computer_name( COMPUTER_NAME_FORMAT format )
return ret;
}
static void printf_addr( const WCHAR *fmt, WCHAR *buf, struct sockaddr_in *addr )
static void printf_addr( const WCHAR *fmt, WCHAR *buf, SIZE_T size, struct sockaddr_in *addr )
{
sprintfW( buf, fmt,
swprintf( buf, size, fmt,
(unsigned int)(ntohl( addr->sin_addr.s_addr ) >> 24 & 0xff),
(unsigned int)(ntohl( addr->sin_addr.s_addr ) >> 16 & 0xff),
(unsigned int)(ntohl( addr->sin_addr.s_addr ) >> 8 & 0xff),
@ -333,7 +329,7 @@ static HRESULT dns_resolve( const WCHAR *hostname, VARIANT *result )
freeaddrinfo( ai );
return S_FALSE;
}
printf_addr( fmtW, addr, (struct sockaddr_in *)elem->ai_addr );
printf_addr( fmtW, addr, ARRAY_SIZE(addr), (struct sockaddr_in *)elem->ai_addr );
freeaddrinfo( ai );
V_VT( result ) = VT_BSTR;
V_BSTR( result ) = SysAllocString( addr );
@ -412,7 +408,7 @@ static HRESULT WINAPI site_GetItemInfo(
IActiveScriptSite *iface, LPCOLESTR name, DWORD mask,
IUnknown **item, ITypeInfo **type_info )
{
if (!strcmpW( name, global_funcsW ) && mask == SCRIPTINFO_IUNKNOWN)
if (!lstrcmpW( name, global_funcsW ) && mask == SCRIPTINFO_IUNKNOWN)
{
*item = (IUnknown *)&global_dispex;
return S_OK;
@ -488,9 +484,9 @@ static BSTR include_pac_utils( const WCHAR *script )
data = LoadResource( hmod, rsrc );
len = MultiByteToWideChar( CP_ACP, 0, data, size, NULL, 0 );
if (!(ret = SysAllocStringLen( NULL, len + strlenW( script ) + 1 ))) return NULL;
if (!(ret = SysAllocStringLen( NULL, len + lstrlenW( script ) + 1 ))) return NULL;
MultiByteToWideChar( CP_ACP, 0, data, size, ret, len );
strcpyW( ret + len, script );
lstrcpyW( ret + len, script );
return ret;
}