Alexandre Julliard : dplayx: Build with msvcrt.
Alexandre Julliard
julliard at winehq.org
Mon Jun 3 16:07:14 CDT 2019
Module: wine
Branch: master
Commit: 5e5a48469c076761432cfec1885784e4c9a962ae
URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e5a48469c076761432cfec1885784e4c9a962ae
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Jun 3 10:31:26 2019 +0200
dplayx: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dplayx/Makefile.in | 2 ++
dlls/dplayx/dplay.c | 11 ++++-------
dlls/dplayx/dplayx_global.c | 25 ++++++++++++-------------
dlls/dplayx/name_server.c | 1 -
4 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in
index 8d41fdb..63e8ba8 100644
--- a/dlls/dplayx/Makefile.in
+++ b/dlls/dplayx/Makefile.in
@@ -2,6 +2,8 @@ MODULE = dplayx.dll
IMPORTLIB = dplayx
IMPORTS = dxguid uuid winmm ole32 user32 advapi32
+EXTRADLLFLAGS = -mno-cygwin
+
C_SRCS = \
dpclassfactory.c \
dplay.c \
diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
index 65c7e4d..e7d6edc 100644
--- a/dlls/dplayx/dplay.c
+++ b/dlls/dplayx/dplay.c
@@ -18,8 +18,6 @@
*/
#define COBJMACROS
-#include "config.h"
-#include "wine/port.h"
#include <stdarg.h>
#include <string.h>
@@ -32,7 +30,6 @@
#include "winnt.h"
#include "winreg.h"
#include "winnls.h"
-#include "wine/unicode.h"
#include "wine/debug.h"
#include "dplayx_global.h"
@@ -1440,14 +1437,14 @@ static BOOL DP_CopyDPNAMEStruct( LPDPNAME lpDst, const DPNAME *lpSrc, BOOL bAnsi
if( lpSrc->u1.lpszShortNameA )
{
lpDst->u1.lpszShortName = HeapAlloc( GetProcessHeap(), 0,
- (strlenW(lpSrc->u1.lpszShortName)+1)*sizeof(WCHAR) );
- strcpyW( lpDst->u1.lpszShortName, lpSrc->u1.lpszShortName );
+ (lstrlenW(lpSrc->u1.lpszShortName)+1)*sizeof(WCHAR) );
+ lstrcpyW( lpDst->u1.lpszShortName, lpSrc->u1.lpszShortName );
}
if( lpSrc->u2.lpszLongNameA )
{
lpDst->u2.lpszLongName = HeapAlloc( GetProcessHeap(), 0,
- (strlenW(lpSrc->u2.lpszLongName)+1)*sizeof(WCHAR) );
- strcpyW( lpDst->u2.lpszLongName, lpSrc->u2.lpszLongName );
+ (lstrlenW(lpSrc->u2.lpszLongName)+1)*sizeof(WCHAR) );
+ lstrcpyW( lpDst->u2.lpszLongName, lpSrc->u2.lpszLongName );
}
}
diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c
index bc087c8..a544cd2 100644
--- a/dlls/dplayx/dplayx_global.c
+++ b/dlls/dplayx/dplayx_global.c
@@ -38,7 +38,6 @@
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
-#include "wine/unicode.h"
#include "wingdi.h"
#include "winuser.h"
@@ -624,18 +623,18 @@ static void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, const DPLCONNECTION *s
/* Session names may or may not exist */
if( src->lpSessionDesc->u1.lpszSessionName )
{
- strcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpSessionDesc->u1.lpszSessionName );
+ lstrcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpSessionDesc->u1.lpszSessionName );
dest->lpSessionDesc->u1.lpszSessionName = (LPWSTR)lpStartOfFreeSpace;
lpStartOfFreeSpace += sizeof(WCHAR) *
- ( strlenW( dest->lpSessionDesc->u1.lpszSessionName ) + 1 );
+ ( lstrlenW( dest->lpSessionDesc->u1.lpszSessionName ) + 1 );
}
if( src->lpSessionDesc->u2.lpszPassword )
{
- strcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpSessionDesc->u2.lpszPassword );
+ lstrcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpSessionDesc->u2.lpszPassword );
dest->lpSessionDesc->u2.lpszPassword = (LPWSTR)lpStartOfFreeSpace;
lpStartOfFreeSpace += sizeof(WCHAR) *
- ( strlenW( dest->lpSessionDesc->u2.lpszPassword ) + 1 );
+ ( lstrlenW( dest->lpSessionDesc->u2.lpszPassword ) + 1 );
}
}
@@ -648,18 +647,18 @@ static void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, const DPLCONNECTION *s
if( src->lpPlayerName->u1.lpszShortName )
{
- strcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpPlayerName->u1.lpszShortName );
+ lstrcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpPlayerName->u1.lpszShortName );
dest->lpPlayerName->u1.lpszShortName = (LPWSTR)lpStartOfFreeSpace;
lpStartOfFreeSpace += sizeof(WCHAR) *
- ( strlenW( dest->lpPlayerName->u1.lpszShortName ) + 1 );
+ ( lstrlenW( dest->lpPlayerName->u1.lpszShortName ) + 1 );
}
if( src->lpPlayerName->u2.lpszLongName )
{
- strcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpPlayerName->u2.lpszLongName );
+ lstrcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpPlayerName->u2.lpszLongName );
dest->lpPlayerName->u2.lpszLongName = (LPWSTR)lpStartOfFreeSpace;
lpStartOfFreeSpace += sizeof(WCHAR) *
- ( strlenW( dest->lpPlayerName->u2.lpszLongName ) + 1 );
+ ( lstrlenW( dest->lpPlayerName->u2.lpszLongName ) + 1 );
}
}
@@ -739,13 +738,13 @@ static DWORD DPLAYX_SizeOfLobbyDataW( const DPLCONNECTION *lpConn )
if( lpConn->lpSessionDesc->u1.lpszSessionName )
{
dwTotalSize += sizeof( WCHAR ) *
- ( strlenW( lpConn->lpSessionDesc->u1.lpszSessionName ) + 1 );
+ ( lstrlenW( lpConn->lpSessionDesc->u1.lpszSessionName ) + 1 );
}
if( lpConn->lpSessionDesc->u2.lpszPassword )
{
dwTotalSize += sizeof( WCHAR ) *
- ( strlenW( lpConn->lpSessionDesc->u2.lpszPassword ) + 1 );
+ ( lstrlenW( lpConn->lpSessionDesc->u2.lpszPassword ) + 1 );
}
}
@@ -756,13 +755,13 @@ static DWORD DPLAYX_SizeOfLobbyDataW( const DPLCONNECTION *lpConn )
if( lpConn->lpPlayerName->u1.lpszShortName )
{
dwTotalSize += sizeof( WCHAR ) *
- ( strlenW( lpConn->lpPlayerName->u1.lpszShortName ) + 1 );
+ ( lstrlenW( lpConn->lpPlayerName->u1.lpszShortName ) + 1 );
}
if( lpConn->lpPlayerName->u2.lpszLongName )
{
dwTotalSize += sizeof( WCHAR ) *
- ( strlenW( lpConn->lpPlayerName->u2.lpszLongName ) + 1 );
+ ( lstrlenW( lpConn->lpPlayerName->u2.lpszLongName ) + 1 );
}
}
diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c
index 7ca1500..f1ebc44 100644
--- a/dlls/dplayx/name_server.c
+++ b/dlls/dplayx/name_server.c
@@ -27,7 +27,6 @@
#include "windef.h"
#include "winbase.h"
#include "winnls.h"
-#include "wine/unicode.h"
#include "wine/debug.h"
#include "mmsystem.h"
More information about the wine-cvs
mailing list