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

[DPLAYX] Sync with Wine Staging 4.18. CORE-16441

Browse source
This commit is contained in:
Amine Khaldi 2019-10-26 13:04:51 +01:00
parent c1cf2ac305
commit eed824362a
5 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dll/directx/wine/dplayx/dplay.c
View file

@ -18,8 +18,6 @@
*/ */
#define COBJMACROS #define COBJMACROS
#include "config.h"
#include "wine/port.h"
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
@ -32,7 +30,6 @@
#include "winnt.h" #include "winnt.h"
#include "winreg.h" #include "winreg.h"
#include "winnls.h" #include "winnls.h"
#include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "dplayx_global.h" #include "dplayx_global.h"
@ -1440,14 +1437,14 @@ static BOOL DP_CopyDPNAMEStruct( LPDPNAME lpDst, const DPNAME *lpSrc, BOOL bAnsi
if( lpSrc->u1.lpszShortNameA ) if( lpSrc->u1.lpszShortNameA )
{ {
lpDst->u1.lpszShortName = HeapAlloc( GetProcessHeap(), 0, lpDst->u1.lpszShortName = HeapAlloc( GetProcessHeap(), 0,
(strlenW(lpSrc->u1.lpszShortName)+1)*sizeof(WCHAR) ); (lstrlenW(lpSrc->u1.lpszShortName)+1)*sizeof(WCHAR) );
strcpyW( lpDst->u1.lpszShortName, lpSrc->u1.lpszShortName ); lstrcpyW( lpDst->u1.lpszShortName, lpSrc->u1.lpszShortName );
} }
if( lpSrc->u2.lpszLongNameA ) if( lpSrc->u2.lpszLongNameA )
{ {
lpDst->u2.lpszLongName = HeapAlloc( GetProcessHeap(), 0, lpDst->u2.lpszLongName = HeapAlloc( GetProcessHeap(), 0,
(strlenW(lpSrc->u2.lpszLongName)+1)*sizeof(WCHAR) ); (lstrlenW(lpSrc->u2.lpszLongName)+1)*sizeof(WCHAR) );
strcpyW( lpDst->u2.lpszLongName, lpSrc->u2.lpszLongName ); lstrcpyW( lpDst->u2.lpszLongName, lpSrc->u2.lpszLongName );
} }
} }

2
dll/directx/wine/dplayx/dplaysp.c
View file

@ -466,7 +466,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage( IDirectPlaySP *iface, voi
{ {
LPDPMSG_CHAT msg = lpMsg; LPDPMSG_CHAT msg = lpMsg;
FIXME( "DPSYS_CHAT not implemeneted\n" ); FIXME( "DPSYS_CHAT not implemented\n" );
break; break;
} }

25
dll/directx/wine/dplayx/dplayx_global.c
View file

@ -38,7 +38,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "wine/unicode.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
@ -624,18 +623,18 @@ static void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, const DPLCONNECTION *s
/* Session names may or may not exist */ /* Session names may or may not exist */
if( src->lpSessionDesc->u1.lpszSessionName ) 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; dest->lpSessionDesc->u1.lpszSessionName = (LPWSTR)lpStartOfFreeSpace;
lpStartOfFreeSpace += sizeof(WCHAR) * lpStartOfFreeSpace += sizeof(WCHAR) *
( strlenW( dest->lpSessionDesc->u1.lpszSessionName ) + 1 ); ( lstrlenW( dest->lpSessionDesc->u1.lpszSessionName ) + 1 );
} }
if( src->lpSessionDesc->u2.lpszPassword ) 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; dest->lpSessionDesc->u2.lpszPassword = (LPWSTR)lpStartOfFreeSpace;
lpStartOfFreeSpace += sizeof(WCHAR) * 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 ) 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; dest->lpPlayerName->u1.lpszShortName = (LPWSTR)lpStartOfFreeSpace;
lpStartOfFreeSpace += sizeof(WCHAR) * lpStartOfFreeSpace += sizeof(WCHAR) *
( strlenW( dest->lpPlayerName->u1.lpszShortName ) + 1 ); ( lstrlenW( dest->lpPlayerName->u1.lpszShortName ) + 1 );
} }
if( src->lpPlayerName->u2.lpszLongName ) 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; dest->lpPlayerName->u2.lpszLongName = (LPWSTR)lpStartOfFreeSpace;
lpStartOfFreeSpace += sizeof(WCHAR) * 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 ) if( lpConn->lpSessionDesc->u1.lpszSessionName )
{ {
dwTotalSize += sizeof( WCHAR ) * dwTotalSize += sizeof( WCHAR ) *
( strlenW( lpConn->lpSessionDesc->u1.lpszSessionName ) + 1 ); ( lstrlenW( lpConn->lpSessionDesc->u1.lpszSessionName ) + 1 );
} }
if( lpConn->lpSessionDesc->u2.lpszPassword ) if( lpConn->lpSessionDesc->u2.lpszPassword )
{ {
dwTotalSize += sizeof( WCHAR ) * 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 ) if( lpConn->lpPlayerName->u1.lpszShortName )
{ {
dwTotalSize += sizeof( WCHAR ) * dwTotalSize += sizeof( WCHAR ) *
( strlenW( lpConn->lpPlayerName->u1.lpszShortName ) + 1 ); ( lstrlenW( lpConn->lpPlayerName->u1.lpszShortName ) + 1 );
} }
if( lpConn->lpPlayerName->u2.lpszLongName ) if( lpConn->lpPlayerName->u2.lpszLongName )
{ {
dwTotalSize += sizeof( WCHAR ) * dwTotalSize += sizeof( WCHAR ) *
( strlenW( lpConn->lpPlayerName->u2.lpszLongName ) + 1 ); ( lstrlenW( lpConn->lpPlayerName->u2.lpszLongName ) + 1 );
} }
} }

1
dll/directx/wine/dplayx/name_server.c
View file

@ -27,7 +27,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "mmsystem.h" #include "mmsystem.h"

2
media/doc/README.WINE
View file

@ -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/dinput8 # Synced to WineStaging-3.3
dll/directx/wine/dmusic # Synced to WineStaging-4.18 dll/directx/wine/dmusic # Synced to WineStaging-4.18
dll/directx/wine/dplay # Synced to WineStaging-3.3 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/dpnhpast # Synced to WineStaging-4.5
dll/directx/wine/dsound # Synced to Wine-1.3.29 dll/directx/wine/dsound # Synced to Wine-1.3.29
dll/directx/wine/dxdiagn # Synced to WineStaging-3.3 dll/directx/wine/dxdiagn # Synced to WineStaging-3.3