- Small update to documentation

dlls/dplayx/dplayx_main.c

@@ -17,7 +17,7 @@ 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 );
+  TRACE( "(%p,0x%08lx,%p) & 0x%08lx\n", hinstDLL, fdwReason, lpvReserved, DPLAYX_dwProcessesAttached );
 
   switch ( fdwReason ) 
   {
@@ -27,7 +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 );
+        TRACE( "DPLAYX_dwProcessesAttached = 0x%08lx\n", DPLAYX_dwProcessesAttached );
         DPLAYX_ConstructData();
       } 
 

dlls/dplayx/dplayx_queue.h

@@ -16,8 +16,9 @@
  * 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? */                    \
+#define TAILQ_FIND_ENTRY( head, elm, field, fieldToEqual, rc )   \
+do {                                                             \
+  (rc) = (head)->tqh_first; /* NULL head? */                     \
                                                                  \
   while( rc )                                                    \
   {                                                              \
@@ -34,6 +35,23 @@
         break;                                                   \
       }                                                          \
   }                                                              \
-}
+} while(0)
+
+/* 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_REMOVE_ENTRY( head, elm, field, fieldToEqual, rc )   \
+do {                                                               \
+  TAILQ_FIND_ENTRY( head, elm, field, fieldToEqual, rc );          \
+                                                                   \
+  /* Was the element found? */                                     \
+  if( rc )                                                         \
+  {                                                                \
+    TAILQ_REMOVE( head, rc, elm );                                 \
+  }                                                                \
+} while(0)
 
 #endif /* __WINE_DPLAYX_QUEUE_H */

documentation/status/directplay

@@ -72,6 +72,9 @@ TODO:
   - Fix all the buffer sizes for registry calls. They're off by one - but in a safe direction.
   - Find out how to call the service provider dlls - they don't have a published interface!
   - Fix race condition on interface destruction
+  - Handles need to be correctly reference counted
+  - Need to check if we need to deallocate any list objects when destroying 
+    dplay interface
 
 Programs to make work:
   - lserver.exe (from sdk)