diff --git a/reactos/dll/directx/wine/dplayx/dplay.c b/reactos/dll/directx/wine/dplayx/dplay.c index 8ed7ae5efa3..118bc51b394 100644 --- a/reactos/dll/directx/wine/dplayx/dplay.c +++ b/reactos/dll/directx/wine/dplayx/dplay.c @@ -221,6 +221,7 @@ static BOOL DP_DestroyDirectPlay2( LPVOID lpDP ) NS_DeleteSessionCache( This->dp2->lpNameServerData ); + HeapFree( GetProcessHeap(), 0, This->dp2->dplspData.lpCB); HeapFree( GetProcessHeap(), 0, This->dp2->lpSessionDesc ); IDirectPlaySP_Release( This->dp2->spData.lpISP ); @@ -2866,9 +2867,15 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerCaps( IDirectPlay4 *iface, DPID TRACE( "(%p)->(0x%08x,%p,0x%08x)\n", This, player, caps, flags); + if ( !caps ) + return DPERR_INVALIDPARAMS; + if ( This->dp2->connectionInitialized == NO_PROVIDER ) return DPERR_UNINITIALIZED; + if( caps->dwSize != sizeof(DPCAPS) ) + return DPERR_INVALIDPARAMS; + /* Query the service provider */ data.idPlayer = player; data.dwFlags = flags; @@ -4336,8 +4343,10 @@ static HRESULT WINAPI IDirectPlay4AImpl_EnumConnections( IDirectPlay4A *iface, if( !lpEnumCallback( &serviceProviderGUID, lpAddressBuffer, dwAddressBufferSize, &dpName, dwFlags, lpContext ) ) { + HeapFree( GetProcessHeap(), 0, lpAddressBuffer ); return DP_OK; } + HeapFree( GetProcessHeap(), 0, lpAddressBuffer ); } } diff --git a/reactos/dll/directx/wine/dplayx/dplobby.c b/reactos/dll/directx/wine/dplayx/dplobby.c index 2458eef2216..dd59a3e1395 100644 --- a/reactos/dll/directx/wine/dplayx/dplobby.c +++ b/reactos/dll/directx/wine/dplayx/dplobby.c @@ -1709,8 +1709,7 @@ HRESULT DPL_CreateCompoundAddress } else { - ERR( "Unknown GUID %s\n", debugstr_guid(&lpElements->guidDataType) ); - return DPERR_INVALIDFLAGS; + WARN( "Skipping Unknown GUID %s\n", debugstr_guid(&lpElements->guidDataType) ); } } diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index f67c4e83c4d..695bc4f4017 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -34,7 +34,7 @@ reactos/dll/directx/wine/dinput # Synced to WineStaging-2.9 reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/dmusic # Synced to WineStaging-2.9 reactos/dll/directx/wine/dplay # Synced to WineStaging-1.9.23 -reactos/dll/directx/wine/dplayx # Synced to WineStaging-2.2 +reactos/dll/directx/wine/dplayx # Synced to WineStaging-2.9 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.23