- Added a little more dll level debugging and small changes

dlls/dplayx/dplayx_main.c

@@ -16,6 +16,9 @@ static DWORD DPLAYX_dwProcessesAttached = 0;
 
 BOOL WINAPI DPLAYX_LibMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
 {
+
+  FIXME( "(%p,0x%08lx,%p) & 0x%08lx\n", hinstDLL, fdwReason, lpvReserved, DPLAYX_dwProcessesAttached );
+
   switch ( fdwReason ) 
   {
     case DLL_PROCESS_ATTACH:
@@ -24,6 +27,7 @@ BOOL WINAPI DPLAYX_LibMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReser
       if ( DPLAYX_dwProcessesAttached == 0 )
       {
         /* First instance perform construction of global processor data */ 
+        FIXME( "DPLAYX_dwProcessesAttached = 0x%08lx\n", DPLAYX_dwProcessesAttached );
         DPLAYX_ConstructData();
       } 
 

dlls/dplayx/dplayx_queue.h

+
+/* Helper functions for TAILQ functions defined in <sys/queue.h> 
+ * 
+ * Blame any implementation mistakes on Peter Hunnisett
+ * <hunnise@nortelnetworks.com>
+ */
+
+#ifndef __WINE_DPLAYX_QUEUE_H
+#define __WINE_DPLAYX_QUEUE_H
+
+#include <sys/queue.h>
+
+/* head - pointer to TAILQ_HEAD struct
+ * elm  - how to find the next element
+ * field - to be concatenated to rc to compare with fieldToEqual
+ * fieldToEqual - The value that we're looking for
+ * rc - Variable to put the return code. Same type as (head)->tqh_first
+ */
+#define TAILQ_FIND_ENTRY( head, elm, field, fieldToEqual, rc ) { \
+  (rc) = (head)->tqh_first; /* NULL head? */                    \
+                                                                 \
+  while( rc )                                                    \
+  {                                                              \
+      /* What we're searching for? */                            \
+      if( (rc)->field == (fieldToEqual) )                        \
+      {                                                          \
+        break; /* rc == correct element */                       \
+      }                                                          \
+                                                                 \
+      /* End of list check */                                    \
+      if( ( (rc) = (rc)->elm.tqe_next ) == (head)->tqh_first )   \
+      {                                                          \
+        rc = NULL;                                               \
+        break;                                                   \
+      }                                                          \
+  }                                                              \
+}
+
+#endif /* __WINE_DPLAYX_QUEUE_H */

dlls/dplayx/dplobby.c

@@ -1986,13 +1986,20 @@ HRESULT WINAPI DirectPlayLobbyCreateW( LPGUID lpGUIDDSP,
   /* Parameter Check: lpGUIDSP, lpUnk & lpData must be NULL. dwDataSize must 
    * equal 0. These fields are mostly for future expansion.
    */
-  if ( lpGUIDDSP || lpUnk || lpData || dwDataSize )
+  if ( lpGUIDDSP || lpData || dwDataSize )
   {
      *lplpDPL = NULL;
      ERR("Bad parameters!\n" );
      return DPERR_INVALIDPARAMS;
   }
 
+  if( lpUnk )
+  {
+     *lplpDPL = NULL;
+     ERR("Bad parameters!\n" );
+     return CLASS_E_NOAGGREGATION;
+  }
+
   return directPlayLobby_QueryInterface( &IID_IDirectPlayLobby, (void**)lplpDPL );  
 
 }