Changeset 5311 for trunk/src/DPlayX/dplaysp.cpp

Timestamp:

Mar 14, 2001, 12:13:28 AM (24 years ago)

Author:

hugh

Message:

Synced with WINE

File:

• trunk/src/DPlayX/dplaysp.cpp (modified) (23 diffs)

trunk/src/DPlayX/dplaysp.cpp

@@ -1 @@
-// $Id: dplaysp.cpp,v 1.3 2000-10-06 19:49:04 hugh Exp $
+// $Id: dplaysp.cpp,v 1.4 2001-03-13 23:13:27 hugh Exp $
 /* This contains the implementation of the interface Service
  * Providers require to communicate with Direct Play
@@ -58 +58 @@
   IDirectPlay2Impl* dplay; /* FIXME: This should perhaps be iface not impl */
 
-  LPVOID lpPlayerData; /* FIXME: Need to figure out how this actually behaves */
-  DWORD dwPlayerDataSize;
 } DirectPlaySPData;
 
@@ -75 +73 @@
 /* Forward declaration of virtual tables */
 extern ICOM_VTABLE(IDirectPlaySP) directPlaySPVT;
+
+/* This structure is passed to the DP object for safe keeping */
+typedef struct tagDP_SPPLAYERDATA
+{
+  LPVOID lpPlayerLocalData;
+  DWORD  dwPlayerLocalDataSize;
+
+  LPVOID lpPlayerRemoteData;
+  DWORD  dwPlayerRemoteDataSize;
+} DP_SPPLAYERDATA, *LPDP_SPPLAYERDATA;
 
 
@@ -177 +185 @@
   /* IDirectPlayX_AddRef( (LPDIRECTPLAY2)dp ); */
 
+  /* FIXME: This is a kludge to get around a problem where a queryinterface
+   *        is used to get a new interface and then is closed. We will then
+   *        reference garbage. However, with this we will never deallocate
+   *        the interface we store. The correct fix is to require all
+   *        DP internal interfaces to use the This->dp2 interface which
+   *        should be changed to This->dp
+   */
+  IDirectPlayX_AddRef( (LPDIRECTPLAY2)dp );
+
   return TRUE;
 }
@@ -375 +392 @@
 )
 {
-  ICOM_THIS(IDirectPlaySPImpl,iface);
-
-  TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() );
-  FIXME( "(%p)->(0x%08lx,%p,%p,0x%08lx): stub\n",
+  HRESULT hr;
+  LPDP_SPPLAYERDATA lpPlayerData;
+  ICOM_THIS(IDirectPlaySPImpl,iface);
+
+/*  TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */
+  TRACE( "(%p)->(0x%08lx,%p,%p,0x%08lx)\n",
          This, idPlayer, lplpData, lpdwDataSize, dwFlags );
 
+  hr = DP_GetSPPlayerData( This->sp->dplay, idPlayer, (LPVOID*)&lpPlayerData );
+
+  if( FAILED(hr) )
+  {
+    TRACE( "Couldn't get player data: %s\n", DPLAYX_HresultToString(hr) );
+    return DPERR_INVALIDPLAYER;
+  }
+
   /* What to do in the case where there is nothing set yet? */
-
-  *lplpData     = This->sp->lpPlayerData;
-  *lpdwDataSize = This->sp->dwPlayerDataSize;
-
-  return DP_OK;
+  if( dwFlags == DPSET_LOCAL )
+  {
+    if( lpPlayerData->lpPlayerLocalData )
+    {
+      HeapFree( GetProcessHeap(), 0, lpPlayerData->lpPlayerLocalData );
+    }
+
+    *lplpData     = lpPlayerData->lpPlayerLocalData;
+    *lpdwDataSize = lpPlayerData->dwPlayerLocalDataSize;
+  }
+  else if( dwFlags == DPSET_REMOTE )
+  {
+    if( lpPlayerData->lpPlayerRemoteData )
+    {
+      HeapFree( GetProcessHeap(), 0, lpPlayerData->lpPlayerRemoteData );
+    }
+
+    *lplpData     = lpPlayerData->lpPlayerRemoteData;
+    *lpdwDataSize = lpPlayerData->dwPlayerRemoteDataSize;
+  }
+
+  if( *lplpData == NULL )
+  {
+    hr = DPERR_GENERIC;
+  }
+
+  return hr;
 }
 
@@ -403 +452 @@
   ICOM_THIS(IDirectPlaySPImpl,iface);
 
-  TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() );
+/*  TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */
   FIXME( "(%p)->(%p,0x%08lx,%p): mostly stub\n",
          This, lpMessageBody, dwMessageBodySize, lpMessageHeader );
@@ -421 +470 @@
   {
     /* Name server needs to handle this request */
+    /* FIXME: This should be done in direct play handler */
     case DPMSGCMD_ENUMSESSIONSREQUEST:
     {
@@ -442 +492 @@
 
     /* Name server needs to handle this request */
+    /* FIXME: This should be done in direct play handler */
     case DPMSGCMD_ENUMSESSIONSREPLY:
     {
@@ -450 +501 @@
 
       /* No reply expected */
-
-      break;
-    }
-
-    case DPMSGCMD_GETNAMETABLE:
-    case DPMSGCMD_GETNAMETABLEREPLY:
-    case DPMSGCMD_NEWPLAYERIDREPLY:
-    case DPMSGCMD_REQUESTNEWPLAYERID:
+      hr = DP_OK;
+
+      break;
+    }
+
+    /* Pass everything else to Direct Play */
+    default:
     {
       DPSP_REPLYDATA data;
@@ -465 +515 @@
 
       /* Pass this message to the dplay interface to handle */
-      DP_HandleMessage( This->sp->dplay, lpMessageBody, dwMessageBodySize,
+      hr = DP_HandleMessage( This->sp->dplay, lpMessageBody, dwMessageBodySize,
                         lpMessageHeader, wCommandId, wVersion,
                         &data.lpMessage, &data.dwMessageSize );
@@ -488 +538 @@
       break;
     }
-
-    default:
-      FIXME( "Unknown Command of %u and size 0x%08lx\n",
-             lpMsg->wCommandId, dwMessageBodySize );
   }
 
@@ -748 +794 @@
 )
 {
-  ICOM_THIS(IDirectPlaySPImpl,iface);
-
-  /* FIXME: I'm not sure if this stuff should be associated with the DPlay
-   *        player lists. How else would this stuff get deleted?
-   */
-
-  TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() );
-  FIXME( "(%p)->(0x%08lx,%p,0x%08lx,0x%08lx): stub\n",
+  HRESULT           hr;
+  LPDP_SPPLAYERDATA lpPlayerEntry;
+  LPVOID            lpPlayerData;
+
+  ICOM_THIS(IDirectPlaySPImpl,iface);
+
+/*  TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */
+  TRACE( "(%p)->(0x%08lx,%p,0x%08lx,0x%08lx)\n",
          This, idPlayer, lpData, dwDataSize, dwFlags );
 
-  This->sp->lpPlayerData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwDataSize );
-
-  This->sp->dwPlayerDataSize = dwDataSize;
-  CopyMemory( This->sp->lpPlayerData, lpData, dwDataSize );
-
-  return DP_OK;
+  hr = DP_GetSPPlayerData( This->sp->dplay, idPlayer, (LPVOID*)&lpPlayerEntry );
+  if( FAILED(hr) )
+  {
+    /* Player must not exist */
+    return DPERR_INVALIDPLAYER;
+  }
+
+  lpPlayerData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwDataSize );
+  CopyMemory( lpPlayerData, lpData, dwDataSize );
+
+  if( dwFlags == DPSET_LOCAL )
+  {
+    lpPlayerEntry->lpPlayerLocalData = lpPlayerData;
+    lpPlayerEntry->dwPlayerLocalDataSize = dwDataSize;
+  }
+  else if( dwFlags == DPSET_REMOTE )
+  {
+    lpPlayerEntry->lpPlayerRemoteData = lpPlayerData;
+    lpPlayerEntry->dwPlayerRemoteDataSize = dwDataSize;
+  }
+
+  hr = DP_SetSPPlayerData( This->sp->dplay, idPlayer, lpPlayerEntry );
+
+  return hr;
 }
 
@@ -789 +853 @@
 )
 {
-  ICOM_THIS(IDirectPlaySPImpl,iface);
-
-  TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() );
+  HRESULT hr = DP_OK;
+  ICOM_THIS(IDirectPlaySPImpl,iface);
+
+/*  TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */
   TRACE( "(%p)->(%p,%p,0x%08lx)\n",
          This, lplpData, lpdwDataSize, dwFlags );
@@ -797 +862 @@
 #if 0
   /* This is what the documentation says... */
-  if( dwFlags != 0 )
+  if( dwFlags != DPSET_REMOTE )
   {
     return DPERR_INVALIDPARAMS;
@@ -806 +871 @@
    * thing?
    */
-  if( dwFlags != 0 )
+  if( dwFlags != DPSET_REMOTE )
   {
     FIXME( "Undocumented dwFlags 0x%08lx used\n", dwFlags );
   }
 #endif
+
+  /* FIXME: What to do in the case where this isn't initialized yet? */
 
   /* Yes, we're supposed to return a pointer to the memory we have stored! */
@@ -817 +884 @@
     *lpdwDataSize = This->sp->dwSpRemoteDataSize;
     *lplpData     = This->sp->lpSpRemoteData;
+
+    if( This->sp->lpSpRemoteData == NULL )
+    {
+      hr = DPERR_GENERIC;
+    }
   }
   else if( dwFlags == DPSET_LOCAL )
@@ -822 +894 @@
     *lpdwDataSize = This->sp->dwSpLocalDataSize;
     *lplpData     = This->sp->lpSpLocalData;
-  }
-
-  return DP_OK;
+
+    if( This->sp->lpSpLocalData == NULL )
+    {
+      hr = DPERR_GENERIC;
+    }
+  }
+
+  return hr;
 }
 
@@ -838 +915 @@
   ICOM_THIS(IDirectPlaySPImpl,iface);
 
-  TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() );
+/*  TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */
   TRACE( "(%p)->(%p,0x%08lx,0x%08lx)\n",
          This, lpData, dwDataSize, dwFlags );
@@ -844 +921 @@
 #if 0
   /* This is what the documentation says... */
-  if( dwFlags != 0 )
+  if( dwFlags != DPSET_REMOTE )
   {
     return DPERR_INVALIDPARAMS;
@@ -853 +930 @@
    * thing?
    */
-  if( dwFlags != 0 )
+  if( dwFlags != DPSET_REMOTE )
   {
     FIXME( "Undocumented dwFlags 0x%08lx used\n", dwFlags );
@@ -859 +936 @@
 #endif
 
-  if( dwFlags == DPSET_REMOTE )
-  {
-    lpSpData = DPLAYX_PrivHeapAlloc( HEAP_ZERO_MEMORY, dwDataSize );
-  }
-  else
-  {
-    lpSpData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwDataSize );
-  }
-
+  lpSpData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwDataSize );
   CopyMemory( lpSpData, lpData, dwDataSize );
 
@@ -873 +942 @@
   if( dwFlags == DPSET_REMOTE )
   {
-    /* FIXME: This doesn't strictly make sense as there is no means to share
-     *        this shared data. Must be misinterpreting something...
-     */
     if( This->sp->lpSpRemoteData )
     {
-      DPLAYX_PrivHeapFree( This->sp->lpSpRemoteData );
-    }
-
-    /* NOTE: dwDataSize is also stored in the heap structure */
+      HeapFree( GetProcessHeap(), 0, This->sp->lpSpRemoteData );
+    }
+
     This->sp->dwSpRemoteDataSize = dwDataSize;
     This->sp->lpSpRemoteData = lpSpData;
@@ -933 +998 @@
   IDirectPlaySPImpl_SendComplete
 };
+
+
+/* DP external interfaces to call into DPSP interface */
+
+/* Allocate the structure */
+extern LPVOID DPSP_CreateSPPlayerData(void)
+{
+  TRACE( "Creating SPPlayer data struct\n" );
+  return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY,
+                    sizeof( DP_SPPLAYERDATA ) );
+}
+