Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-31 23:18:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DPLAYX] Sync with Wine Staging 2.2. CORE-12823

Browse source 
7603e85 dplayx: Don't print an error when no Lobby Providers are found.
7ae50b2 dplayx: Fix multiple assigments to the same lvalue (coccinellery).

svn path=/trunk/; revision=73936
This commit is contained in:
Amine Khaldi 2017-02-26 16:41:39 +00:00
parent 1f3623d2ae
commit f059b95530
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/dll/directx/wine/dplayx/dplay.c
View file

@ -4355,8 +4355,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_EnumConnections( IDirectPlay4A *iface,
if( RegOpenKeyExA( HKEY_LOCAL_MACHINE, searchSubKey,
0, KEY_READ, &hkResult ) != ERROR_SUCCESS )
{
/* Hmmm. Does this mean that there are no service providers? */
ERR(": no service providers?\n");
TRACE("No Lobby Providers have been registered.\n");
return DP_OK;
}

8
reactos/dll/directx/wine/dplayx/dplayx_messages.c
View file

@ -287,10 +287,10 @@ HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlayImpl *This, DPID dpidServer )
lpMsgBody->dpidAppServer2 = dpidServer;
lpMsgBody->unknown3[0] = 0x0;
lpMsgBody->unknown3[0] = 0x0;
lpMsgBody->unknown3[0] = 0x20;
lpMsgBody->unknown3[0] = 0x0;
lpMsgBody->unknown3[0] = 0x0;
lpMsgBody->unknown3[1] = 0x0;
lpMsgBody->unknown3[2] = 0x20;
lpMsgBody->unknown3[3] = 0x0;
lpMsgBody->unknown3[4] = 0x0;
lpMsgBody->dpidAppServer3 = dpidServer;
lpMsgBody->unknown4[0] = 0x30;

2
reactos/media/doc/README.WINE
View file

@ -34,7 +34,7 @@ reactos/dll/directx/wine/dinput # Synced to WineStaging-2.2
reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.23
reactos/dll/directx/wine/dmusic # 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-1.9.23
reactos/dll/directx/wine/dplayx # Synced to WineStaging-2.2
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