[PATCH 2/7] dpwsockx: Set player data in CreatePlayer().

[Anton Baskanov]

From: Anton Baskanov

---
 dlls/dpwsockx/dpwsockx_dll.h  |  6 +++++
 dlls/dpwsockx/dpwsockx_main.c | 45 ++++++++++++++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/dlls/dpwsockx/dpwsockx_dll.h b/dlls/dpwsockx/dpwsockx_dll.h
index 1b80fa02004..88eb26ae220 100644
--- a/dlls/dpwsockx/dpwsockx_dll.h
+++ b/dlls/dpwsockx/dpwsockx_dll.h
@@ -45,6 +45,12 @@ typedef struct tagDPSP_MSG_HEADER
 } DPSP_MSG_HEADER, *LPDPSP_MSG_HEADER;
 typedef const DPSP_MSG_HEADER* LPCDPSP_MSG_HEADER;

+typedef struct
+{
+    SOCKADDR_IN tcpAddr;
+    SOCKADDR_IN udpAddr;
+} DPWS_PLAYERDATA;
+
 #include "poppack.h"

typedef struct tagDPWS_IN_CONNECTION DPWS_IN_CONNECTION;
diff --git a/dlls/dpwsockx/dpwsockx_main.c b/dlls/dpwsockx/dpwsockx_main.c
index 7ff3484a3c2..74a22751996 100644
--- a/dlls/dpwsockx/dpwsockx_main.c
+++ b/dlls/dpwsockx/dpwsockx_main.c
@@ -452,9 +452,52 @@ static HRESULT WINAPI DPWSCB_Send( LPDPSP_SENDDATA data )

static HRESULT WINAPI DPWSCB_CreatePlayer( LPDPSP_CREATEPLAYERDATA data )
 {
-    FIXME( "(%ld,0x%08lx,%p,%p) stub\n",
+    DPWS_PLAYERDATA *playerData;
+    DWORD playerDataSize;
+    DPWS_DATA *dpwsData;
+    DWORD dpwsDataSize;
+    HRESULT hr;
+
+    TRACE( "(%ld,0x%08lx,%p,%p)\n",
            data->idPlayer, data->dwFlags,
            data->lpSPMessageHeader, data->lpISP );
+
+    hr = IDirectPlaySP_GetSPData( data->lpISP, (void **) &dpwsData, &dpwsDataSize, DPSET_LOCAL );
+    if ( FAILED( hr ) )
+        return hr;
+
+    if ( !data->lpSPMessageHeader )
+    {
+        DPWS_PLAYERDATA playerDataPlaceholder = { 0 };
+        hr = IDirectPlaySP_SetSPPlayerData( data->lpISP, data->idPlayer,
+                                            (void *) &playerDataPlaceholder,
+                                            sizeof( playerDataPlaceholder ), DPSET_REMOTE );
+        if ( FAILED( hr ) )
+            return hr;
+    }
+
+    hr = IDirectPlaySP_GetSPPlayerData( data->lpISP, data->idPlayer, (void **) &playerData,
+                                        &playerDataSize, DPSET_REMOTE );
+    if ( FAILED( hr ) )
+        return hr;
+    if ( playerDataSize != sizeof( DPWS_PLAYERDATA ) )
+        return DPERR_GENERIC;
+
+    if ( data->lpSPMessageHeader )
+    {
+        DPSP_MSG_HEADER *header = data->lpSPMessageHeader;
+        if ( !playerData->tcpAddr.sin_addr.s_addr )
+            playerData->tcpAddr.sin_addr = header->SockAddr.sin_addr;
+        if ( !playerData->udpAddr.sin_addr.s_addr )
+            playerData->udpAddr.sin_addr = header->SockAddr.sin_addr;
+    }
+    else
+    {
+        playerData->tcpAddr.sin_family = AF_INET;
+        playerData->tcpAddr.sin_port = dpwsData->tcpAddr.sin_port;
+        playerData->udpAddr.sin_family = AF_INET;
+    }
+
     return DP_OK;
 }