mirror of
https://github.com/reactos/reactos.git
synced 2024-07-22 12:18:04 +00:00
[DPLAYX] Sync with Wine Staging 2.9. CORE-13362
2bb3636 dplayx: Skip over unknown DataTypes guids in EnumAddressTypes. svn path=/trunk/; revision=74778
This commit is contained in:
parent
d52d8cb667
commit
755627e213
|
@ -221,6 +221,7 @@ static BOOL DP_DestroyDirectPlay2( LPVOID lpDP )
|
||||||
|
|
||||||
NS_DeleteSessionCache( This->dp2->lpNameServerData );
|
NS_DeleteSessionCache( This->dp2->lpNameServerData );
|
||||||
|
|
||||||
|
HeapFree( GetProcessHeap(), 0, This->dp2->dplspData.lpCB);
|
||||||
HeapFree( GetProcessHeap(), 0, This->dp2->lpSessionDesc );
|
HeapFree( GetProcessHeap(), 0, This->dp2->lpSessionDesc );
|
||||||
|
|
||||||
IDirectPlaySP_Release( This->dp2->spData.lpISP );
|
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);
|
TRACE( "(%p)->(0x%08x,%p,0x%08x)\n", This, player, caps, flags);
|
||||||
|
|
||||||
|
if ( !caps )
|
||||||
|
return DPERR_INVALIDPARAMS;
|
||||||
|
|
||||||
if ( This->dp2->connectionInitialized == NO_PROVIDER )
|
if ( This->dp2->connectionInitialized == NO_PROVIDER )
|
||||||
return DPERR_UNINITIALIZED;
|
return DPERR_UNINITIALIZED;
|
||||||
|
|
||||||
|
if( caps->dwSize != sizeof(DPCAPS) )
|
||||||
|
return DPERR_INVALIDPARAMS;
|
||||||
|
|
||||||
/* Query the service provider */
|
/* Query the service provider */
|
||||||
data.idPlayer = player;
|
data.idPlayer = player;
|
||||||
data.dwFlags = flags;
|
data.dwFlags = flags;
|
||||||
|
@ -4336,8 +4343,10 @@ static HRESULT WINAPI IDirectPlay4AImpl_EnumConnections( IDirectPlay4A *iface,
|
||||||
if( !lpEnumCallback( &serviceProviderGUID, lpAddressBuffer, dwAddressBufferSize,
|
if( !lpEnumCallback( &serviceProviderGUID, lpAddressBuffer, dwAddressBufferSize,
|
||||||
&dpName, dwFlags, lpContext ) )
|
&dpName, dwFlags, lpContext ) )
|
||||||
{
|
{
|
||||||
|
HeapFree( GetProcessHeap(), 0, lpAddressBuffer );
|
||||||
return DP_OK;
|
return DP_OK;
|
||||||
}
|
}
|
||||||
|
HeapFree( GetProcessHeap(), 0, lpAddressBuffer );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1709,8 +1709,7 @@ HRESULT DPL_CreateCompoundAddress
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ERR( "Unknown GUID %s\n", debugstr_guid(&lpElements->guidDataType) );
|
WARN( "Skipping Unknown GUID %s\n", debugstr_guid(&lpElements->guidDataType) );
|
||||||
return DPERR_INVALIDFLAGS;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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/dinput8 # Synced to WineStaging-1.9.23
|
||||||
reactos/dll/directx/wine/dmusic # Synced to WineStaging-2.9
|
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/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/dsound # Synced to Wine-1.3.29
|
||||||
reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.23
|
reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.23
|
||||||
reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.23
|
reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.23
|
||||||
|
|
Loading…
Reference in a new issue