Changeset 4446 for trunk/src/DPlayX/dplayx_messages.cpp

Timestamp:

Oct 6, 2000, 9:49:06 PM (25 years ago)

Author:

hugh

Message:

Updated to latest WINE

File:

• trunk/src/DPlayX/dplayx_messages.cpp (modified) (7 diffs)

trunk/src/DPlayX/dplayx_messages.cpp

@@ -1 @@
-// $Id: dplayx_messages.cpp,v 1.2 2000-09-24 22:47:38 hugh Exp $
+// $Id: dplayx_messages.cpp,v 1.3 2000-10-06 19:49:05 hugh Exp $
 /* DirectPlay & DirectPlayLobby messaging implementation
  *
@@ -26 +26 @@
 DEFAULT_DEBUG_CHANNEL(dplay)
 
+#undef  debugstr_guid
 #define debugstr_guid(a) a
 
@@ -158 +159 @@
   HRESULT                    hr = DP_OK;
 
-  FIXME( "semi stub\n" );
-
-  DebugBreak();
-
   dwMsgSize = This->dp2->spData.dwSPHeaderSize + sizeof( *lpMsgBody );
 
@@ -195 +192 @@
     This->dp2->hMsgReceipt = CreateEventA( NULL, FALSE, FALSE, NULL );
 
+    TRACE( "Sending request for player id\n" );
+
     hr = (*This->dp2->spData.lpCB->Send)( &data );
 
@@ -201 +200 @@
       ERR( "Request for new playerID send failed: %s\n",
            DPLAYX_HresultToString( hr ) );
+      return DPERR_NOCONNECTION;
     }
   }
@@ -208 +208 @@
   {
     ERR( "Wait failed 0x%08lx\n", dwWaitReturn );
+    hr = DPERR_TIMEOUT;
   }
 
@@ -214 +215 @@
 
   /* Need to examine the data and extract the new player id */
-  /* I just hope that dplay doesn't return the whole new player! */
+  if( !FAILED(hr) )
+  {
+    LPCDPMSG_NEWPLAYERIDREPLY lpcReply;
+
+    lpcReply = (LPCDPMSG_NEWPLAYERIDREPLY)This->dp2->lpMsgReceived;
+
+    *lpdpidAllocatedId = lpcReply->dpidNewPlayerId;
+
+    TRACE( "Received reply for id = 0x%08lx\n", lpcReply->dpidNewPlayerId );
+
+    /* FIXME: I think that the rest of the message has something to do
+     *        with remote data for the player that perhaps I need to setup.
+     */
+#if 0
+   /* Set the passed service provider data */
+   IDirectPlaySP_SetSPData( This->dp2->spData.lpISP, data,
+                            msgsize, DPSET_REMOTE );
+
+#endif
+
+    HeapFree( GetProcessHeap(), 0, This->dp2->lpMsgReceived );
+    This->dp2->lpMsgReceived = NULL;
+  }
 
   return hr;