Alexandre Julliard : dpnet: Build with msvcrt.
Alexandre Julliard
julliard at winehq.org
Mon Jun 3 16:07:14 CDT 2019
Module: wine
Branch: master
Commit: c80ad80a92b4924dff10d51bbb9fac6177c8b76e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c80ad80a92b4924dff10d51bbb9fac6177c8b76e
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Jun 3 10:32:20 2019 +0200
dpnet: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dpnet/Makefile.in | 2 ++
dlls/dpnet/address.c | 6 ++----
dlls/dpnet/client.c | 1 -
dlls/dpnet/dpnet_main.c | 1 -
dlls/dpnet/dpnet_private.h | 7 +------
dlls/dpnet/lobbiedapp.c | 1 -
dlls/dpnet/peer.c | 1 -
dlls/dpnet/server.c | 1 -
dlls/dpnet/threadpool.c | 1 -
9 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/dlls/dpnet/Makefile.in b/dlls/dpnet/Makefile.in
index 541e104..bcf0777 100644
--- a/dlls/dpnet/Makefile.in
+++ b/dlls/dpnet/Makefile.in
@@ -2,6 +2,8 @@ MODULE = dpnet.dll
IMPORTLIB = dpnet
IMPORTS = dxguid uuid ole32 advapi32 ws2_32
+EXTRADLLFLAGS = -mno-cygwin
+
C_SRCS = \
address.c \
client.c \
diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c
index 0bfa2bc..6aa62a9 100644
--- a/dlls/dpnet/address.c
+++ b/dlls/dpnet/address.c
@@ -19,7 +19,6 @@
*
*/
-#include "config.h"
#include <stdarg.h>
@@ -30,7 +29,6 @@
#include "winuser.h"
#include "objbase.h"
-#include "wine/unicode.h"
#include "wine/debug.h"
#include "dpnet_private.h"
@@ -417,7 +415,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByIndex(IDirectPlay8Ad
entry = This->components[dwComponentID];
- namesize = strlenW(entry->name);
+ namesize = lstrlenW(entry->name);
if(*pdwBufferSize < entry->size || *pdwNameLen < namesize)
{
WARN("Buffer too small\n");
@@ -493,7 +491,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address *
}
break;
case DPNA_DATATYPE_STRING:
- if (((strlenW((WCHAR*)lpvData)+1)*sizeof(WCHAR)) != dwDataSize)
+ if (((lstrlenW((WCHAR*)lpvData)+1)*sizeof(WCHAR)) != dwDataSize)
{
WARN("Invalid STRING size, returning DPNERR_INVALIDPARAM\n");
return DPNERR_INVALIDPARAM;
diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c
index ea491ef..e7024e1 100644
--- a/dlls/dpnet/client.c
+++ b/dlls/dpnet/client.c
@@ -19,7 +19,6 @@
*
*/
-#include "config.h"
#include <stdarg.h>
diff --git a/dlls/dpnet/dpnet_main.c b/dlls/dpnet/dpnet_main.c
index cc80ebc..445374c 100644
--- a/dlls/dpnet/dpnet_main.c
+++ b/dlls/dpnet/dpnet_main.c
@@ -19,7 +19,6 @@
*
*/
-#include "config.h"
#include <stdarg.h>
diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h
index 2e72360..9458a51 100644
--- a/dlls/dpnet/dpnet_private.h
+++ b/dlls/dpnet/dpnet_private.h
@@ -21,14 +21,9 @@
#ifndef __WINE_DPNET_PRIVATE_H
#define __WINE_DPNET_PRIVATE_H
-#ifndef __WINE_CONFIG_H
-# error You must include config.h to use this header
-#endif
-
#include "wine/heap.h"
#include <wine/list.h>
#include "winsock2.h"
-#include "wine/unicode.h"
#include "dplay8.h"
#include "dplobby8.h"
@@ -159,7 +154,7 @@ static inline WCHAR *heap_strdupW( const WCHAR *src )
{
WCHAR *dst;
if (!src) return NULL;
- if ((dst = heap_alloc( (strlenW( src ) + 1) * sizeof(WCHAR) ))) strcpyW( dst, src );
+ if ((dst = heap_alloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) lstrcpyW( dst, src );
return dst;
}
diff --git a/dlls/dpnet/lobbiedapp.c b/dlls/dpnet/lobbiedapp.c
index d041e63..d58571a 100644
--- a/dlls/dpnet/lobbiedapp.c
+++ b/dlls/dpnet/lobbiedapp.c
@@ -19,7 +19,6 @@
*
*/
-#include "config.h"
#include <stdarg.h>
diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c
index 3e3cd9b..f935b2a 100644
--- a/dlls/dpnet/peer.c
+++ b/dlls/dpnet/peer.c
@@ -21,7 +21,6 @@
*
*/
-#include "config.h"
#include <stdarg.h>
diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c
index 46d5fe2..9777716 100644
--- a/dlls/dpnet/server.c
+++ b/dlls/dpnet/server.c
@@ -19,7 +19,6 @@
*
*/
-#include "config.h"
#include <stdarg.h>
diff --git a/dlls/dpnet/threadpool.c b/dlls/dpnet/threadpool.c
index 7e84a5a..22d871b 100644
--- a/dlls/dpnet/threadpool.c
+++ b/dlls/dpnet/threadpool.c
@@ -20,7 +20,6 @@
*
*/
-#include "config.h"
#include <stdarg.h>
More information about the wine-cvs
mailing list