From: Anton Baskanov baskanov@gmail.com
--- dlls/dplayx/dplay.c | 3 +-- dlls/dplayx/tests/dplayx.c | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index ccc8af14a09..9852e493548 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -2220,8 +2220,7 @@ static HRESULT WINAPI IDirectPlay4Impl_EnumGroupPlayers( IDirectPlay4 *iface, DP /* We do not enum the name server or app server as they are of no * consequence to the end user. */ - if ( ( plist->lpPData->dpid != DPID_NAME_SERVER ) && - ( plist->lpPData->dpid != DPID_SERVERPLAYER ) ) + if ( !(plist->lpPData->dwFlags & DPLAYI_PLAYER_SYSPLAYER) ) { /* FIXME: Need to add stuff for flags checking */ if ( !enumplayercb( plist->lpPData->dpid, DPPLAYERTYPE_PLAYER, diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index f6184bc5882..503cf4cdc4c 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -2065,7 +2065,7 @@ static BOOL CALLBACK checkPlayerListCallback( DPID dpid, DWORD playerType, const } }
- todo_wine ok_( __FILE__, data->line )( 0, "unexpected player dpid %#lx.\n", dpid ); + ok_( __FILE__, data->line )( 0, "unexpected player dpid %#lx.\n", dpid );
++data->actualPlayerCount;
@@ -2085,8 +2085,8 @@ static void checkPlayerList_( int line, IDirectPlay4 *dp, ExpectedPlayer *expect
hr = IDirectPlayX_EnumPlayers( dp, NULL, checkPlayerListCallback, &data, 0 ); ok_( __FILE__, line )( hr == DP_OK, "EnumPlayers() returned %#lx.\n", hr ); - ok_( __FILE__, line )( data.actualPlayerCount == data.expectedPlayerCount, "got player count %d.\n", - data.actualPlayerCount ); + todo_wine ok_( __FILE__, line )( data.actualPlayerCount == data.expectedPlayerCount, "got player count %d.\n", + data.actualPlayerCount ); }
#define check_Open( dp, dpsd, serverDpsd, requestExpected, port, expectedPassword, expectedHr ) check_Open_( __LINE__, dp, dpsd, serverDpsd, requestExpected, port, expectedPassword, expectedHr )