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

Timestamp:

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

Author:

hugh

Message:

Updated to latest WINE

File:

• trunk/src/DPlayX/dplay.cpp (modified) (20 diffs)

trunk/src/DPlayX/dplay.cpp

@@ -1 @@
-// $Id: dplay.cpp,v 1.2 2000-09-24 22:47:36 hugh Exp $
+// $Id: dplay.cpp,v 1.3 2000-10-06 19:49:03 hugh Exp $
 /* Direct Play 2,3,4 Implementation
  *
@@ -32 +32 @@
 DEFAULT_DEBUG_CHANNEL(dplay)
 
+#undef debugstr_guid
 #define debugstr_guid(a) a
 
@@ -274 +275 @@
   This->dp2->spData.dwSPVersion = DPSP_MAJORVERSION;
 
-  This->dp2->spData.lpCB = (LPDPSP_SPCALLBACKS)HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY,
-                                      sizeof( *This->dp2->spData.lpCB ) );
+  This->dp2->spData.lpCB = (DPSP_SPCALLBACKS*)HeapAlloc( GetProcessHeap(),
+                                                         HEAP_ZERO_MEMORY,
+                                                         sizeof( *This->dp2->spData.lpCB ) );
   This->dp2->spData.lpCB->dwSize = sizeof( *This->dp2->spData.lpCB );
   This->dp2->spData.lpCB->dwVersion = DPSP_MAJORVERSION;
@@ -634 +636 @@
          wVersion );
 
+  DebugBreak();
+
   switch( wCommandId )
   {
@@ -650 +654 @@
                                                         *lpdwMsgSize );
 
-      FIXME( "Ignoring dwFlags in msg\n" );
+      FIXME( "Ignoring dwFlags in request msg\n" );
+
+#if 0
+      /* This is just a test. See how large the SPData is and send it */
+      {
+        LPVOID lpData;
+        DWORD  dwDataSize;
+        HRESULT hr;
+
+        hr = IDirectPlaySP_GetSPData( This->dp2->spData.lpISP, &lpData,
+                                      &dwDataSize, DPSET_REMOTE );
+
+        if( FAILED(hr) )
+        {
+          ERR( "Unable to get remote SPData %s\n", DPLAYX_HresultToString(hr) );
+        }
+
+      }
+#endif
 
       /* Setup the reply */
@@ -660 +682 @@
       lpReply->envelope.wVersion   = DPMSGVER_DP6;
 
-#if 0
-      /* FIXME: Need to know the proper contents of the message! */
       lpReply->dpidNewPlayerId = DP_NextObjectId();
-#endif
+
+      TRACE( "Allocating new playerid 0x%08lx from remote request\n",
+             lpReply->dpidNewPlayerId );
 
       break;
@@ -670 +692 @@
     case DPMSGCMD_NEWPLAYERIDREPLY:
     {
-
-      DebugBreak();
 
       if( This->dp2->hMsgReceipt )
@@ -684 +704 @@
       else
       {
-        ERR( "No receipt event set\n" );
+        ERR( "No receipt event set - only expecting in reply mode\n" );
       }
 
@@ -1316 +1336 @@
   BOOL bAnsi )
 {
+  HANDLE hr = DP_OK;
   lpPlayerData lpPData;
   lpPlayerList lpPList;
@@ -1353 +1374 @@
     else
     {
-      HRESULT hr = DP_MSG_SendRequestPlayerId( This, dwFlags, lpidPlayer );
+      hr = DP_MSG_SendRequestPlayerId( This, dwFlags, lpidPlayer );
 
       if( FAILED(hr) )
@@ -1421 +1442 @@
     data.lpISP             = This->dp2->spData.lpISP;
 
-    (*This->dp2->spData.lpCB->CreatePlayer)( &data );
+    hr = (*This->dp2->spData.lpCB->CreatePlayer)( &data );
+  }
+
+  if( FAILED(hr) )
+  {
+    ERR( "Failed to create player with sp: %s\n", DPLAYX_HresultToString(hr) );
+    return hr;
+  }
+
+  /* Now let the SP know that this player is a member of the system group */
+  if( This->dp2->spData.lpCB->AddPlayerToGroup )
+  {
+    DPSP_ADDPLAYERTOGROUPDATA data;
+
+    data.idPlayer = *lpidPlayer;
+    data.idGroup  = DPID_SYSTEM_GROUP;
+    data.lpISP    = This->dp2->spData.lpISP;
+
+    TRACE( "Calling SP AddPlayerToGroup (sys group)\n" );
+
+    hr = (*This->dp2->spData.lpCB->AddPlayerToGroup)( &data );
+  }
+
+  if( FAILED(hr) )
+  {
+    ERR( "Failed to add player to sys groupwith sp: %s\n",
+         DPLAYX_HresultToString(hr) );
+    return hr;
   }
 
@@ -1447 +1495 @@
     /* FIXME: Should size include data w/ message or just message "header" */
     /* FIXME: Check return code */
-    DP_SendEx( This, DPID_SERVERPLAYER, DPID_ALLPLAYERS, 0, &msg, sizeof( msg ),
-               0, 0, NULL, NULL, bAnsi );
-  }
-
-  return DP_OK;
+    hr = DP_SendEx( This, DPID_SERVERPLAYER, DPID_ALLPLAYERS, 0, &msg,
+                    sizeof( msg ), 0, 0, NULL, NULL, bAnsi );
+  }
+
+  return hr;
 }
 
@@ -1947 +1995 @@
 
   FIXME( ": not checking for conditions\n" );
+
+  /* Not sure if this should be pruning but it's convenient */
+  NS_PruneSessionCache( lpNSInfo );
 
   NS_ResetSessionEnumeration( lpNSInfo );
@@ -2675 +2726 @@
   if( dwFlags & DPOPEN_JOIN )
   {
-    DPID dpidServerId = DPID_SERVERPLAYER;
+    DPID dpidServerId = DPID_UNKNOWN;
 
     /* Create the server player for this interface. This way we can receive
@@ -2697 +2748 @@
   }
 
+  if( FAILED(hr) )
+  {
+    ERR( "Couldn't create name server/system player: %s\n",
+         DPLAYX_HresultToString(hr) );
+  }
+
   return hr;
 }
@@ -3406 +3463 @@
   }
 
-  if( (LPVOID)lpEnumCallback==NULL || *(int*)lpEnumCallback==NULL )
+  if( lpEnumCallback==NULL || *(DWORD*)lpEnumCallback==0 )
   {
      return DPERR_INVALIDPARAMS;
@@ -3460 +3517 @@
       }
 
-      if( RegQueryValueExA( hkServiceProvider, guidDataSubKey,
+      if( RegQueryValueExA( hkServiceProvider, (LPSTR)guidDataSubKey,
                             NULL, &returnTypeGUID, (LPBYTE)returnBuffer,
                             &sizeOfReturnBuffer ) != ERROR_SUCCESS )
@@ -3469 +3526 @@
 
       /* FIXME: Check return types to ensure we're interpreting data right */
-      lpWGUIDString = HEAP_strdupAtoW( GetProcessHeap(), 0, (LPCSTR)returnBuffer );
+      lpWGUIDString = HEAP_strdupAtoW( GetProcessHeap(), 0, returnBuffer );
       CLSIDFromString( (LPCOLESTR)lpWGUIDString, &serviceProviderGUID );
       HeapFree( GetProcessHeap(), 0, lpWGUIDString );
@@ -3566 +3623 @@
       }
 
-      if( RegQueryValueExA( hkServiceProvider, guidDataSubKey,
+      if( RegQueryValueExA( hkServiceProvider, (LPSTR)guidDataSubKey,
                             NULL, &returnTypeGUID, (LPBYTE)returnBuffer,
                             &sizeOfReturnBuffer ) != ERROR_SUCCESS )
@@ -3910 +3967 @@
    * The rest will be done in DP_LoadSP
    */
-  This->dp2->spData.lpAddress = (LPDPADDRESS)lpConnection;
+  This->dp2->spData.lpAddress = (DPADDRESS*)lpConnection;
   This->dp2->spData.dwAddressSize = dwAddrSize;
   This->dp2->spData.lpGuid = &guidSP;