https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eed824362a80311eceba62...
commit eed824362a80311eceba622adab4fb8d9b2cffe9 Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Sat Oct 26 13:04:51 2019 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Sat Oct 26 13:04:51 2019 +0100
[DPLAYX] Sync with Wine Staging 4.18. CORE-16441 --- dll/directx/wine/dplayx/dplay.c | 11 ++++------- dll/directx/wine/dplayx/dplaysp.c | 2 +- dll/directx/wine/dplayx/dplayx_global.c | 25 ++++++++++++------------- dll/directx/wine/dplayx/name_server.c | 1 - media/doc/README.WINE | 2 +- 5 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/dll/directx/wine/dplayx/dplay.c b/dll/directx/wine/dplayx/dplay.c index 65c7e4df5d5..e7d6edc6a06 100644 --- a/dll/directx/wine/dplayx/dplay.c +++ b/dll/directx/wine/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/dll/directx/wine/dplayx/dplaysp.c b/dll/directx/wine/dplayx/dplaysp.c index 43938e8511c..53be88e0648 100644 --- a/dll/directx/wine/dplayx/dplaysp.c +++ b/dll/directx/wine/dplayx/dplaysp.c @@ -466,7 +466,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage( IDirectPlaySP *iface, voi { LPDPMSG_CHAT msg = lpMsg;
- FIXME( "DPSYS_CHAT not implemeneted\n" ); + FIXME( "DPSYS_CHAT not implemented\n" );
break; } diff --git a/dll/directx/wine/dplayx/dplayx_global.c b/dll/directx/wine/dplayx/dplayx_global.c index bc087c8b33b..a544cd2196e 100644 --- a/dll/directx/wine/dplayx/dplayx_global.c +++ b/dll/directx/wine/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/dll/directx/wine/dplayx/name_server.c b/dll/directx/wine/dplayx/name_server.c index 7ca1500bfb3..f1ebc4403c1 100644 --- a/dll/directx/wine/dplayx/name_server.c +++ b/dll/directx/wine/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"
diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 847c5e092de..251a6528d34 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -34,7 +34,7 @@ dll/directx/wine/dinput # Synced to WineStaging-4.18 dll/directx/wine/dinput8 # Synced to WineStaging-3.3 dll/directx/wine/dmusic # Synced to WineStaging-4.18 dll/directx/wine/dplay # Synced to WineStaging-3.3 -dll/directx/wine/dplayx # Synced to WineStaging-3.17 +dll/directx/wine/dplayx # Synced to WineStaging-4.18 dll/directx/wine/dpnhpast # Synced to WineStaging-4.5 dll/directx/wine/dsound # Synced to Wine-1.3.29 dll/directx/wine/dxdiagn # Synced to WineStaging-3.3
-
Amine Khaldi