Changeset 4446 for trunk/src/DPlayX/dplayx_queue.h

Timestamp:

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

Author:

hugh

Message:

Updated to latest WINE

File:

• trunk/src/DPlayX/dplayx_queue.h (modified) (5 diffs)

trunk/src/DPlayX/dplayx_queue.h

@@ -1 @@
-// $Id: dplayx_queue.h,v 1.2 2000-09-24 22:47:39 hugh Exp $
+// $Id: dplayx_queue.h,v 1.3 2000-10-06 19:49:06 hugh Exp $
 /* A queue definition based on sys/queue.h TAILQ definitions
  *
@@ -79 +79 @@
 #define DPQ_FIND_ENTRY( head, elm, field, fieldCompareOperator, fieldToCompare, rc )\
 do {                                                           \
-  (rc) = (head).lpQHFirst; /* NULL head? */                    \
+  (rc) = DPQ_FIRST(head); /* NULL head? */                     \
                                                                \
   while( rc )                                                  \
@@ -100 +100 @@
 /* head - pointer to DPQ_HEAD struct
  * elm  - how to find the next element
+ * field - to be concatenated to rc to compare with fieldToCompare
+ * fieldToCompare - The value that we're comparing against
+ * compare_cb - Callback to invoke to determine if comparision should continue.
+ *              Callback must be defined with DPQ_DECL_COMPARECB.
+ * rc - Variable to put the return code. Same type as (head).lpQHFirst
+ */
+#define DPQ_FIND_ENTRY_CB( head, elm, field, compare_cb, fieldToCompare, rc )\
+do {                                                           \
+  (rc) = DPQ_FIRST(head); /* NULL head? */                     \
+                                                               \
+  while( rc )                                                  \
+  {                                                            \
+      /* What we're searching for? */                          \
+      if( compare_cb( &((rc)->field), &(fieldToCompare) ) )    \
+      {                                                        \
+        break; /* no more */                                   \
+      }                                                        \
+                                                               \
+      /* End of list check */                                  \
+      if( ( (rc) = (rc)->elm.lpQNext ) == (head).lpQHFirst )   \
+      {                                                        \
+        rc = NULL;                                             \
+        break;                                                 \
+      }                                                        \
+  }                                                            \
+} while(0)
+
+/* How to define the method to be passed to DPQ_DELETEQ */
+#define DPQ_DECL_COMPARECB( name, type ) BOOL name( const type* elem1, const type* elem2 )
+
+
+/* head - pointer to DPQ_HEAD struct
+ * elm  - how to find the next element
  * field - to be concatenated to rc to compare with fieldToEqual
  * fieldToCompare - The value that we're comparing against
@@ -117 +150 @@
 } while(0)
 
+/* head - pointer to DPQ_HEAD struct
+ * elm  - how to find the next element
+ * field - to be concatenated to rc to compare with fieldToCompare
+ * fieldToCompare - The value that we're comparing against
+ * compare_cb - Callback to invoke to determine if comparision should continue.
+ *              Callback must be defined with DPQ_DECL_COMPARECB.
+ * rc - Variable to put the return code. Same type as (head).lpQHFirst
+ */
+#define DPQ_REMOVE_ENTRY_CB( head, elm, field, compare_cb, fieldToCompare, rc )\
+do {                                                           \
+  DPQ_FIND_ENTRY_CB( head, elm, field, compare_cb, fieldToCompare, rc );\
+                                                               \
+  /* Was the element found? */                                 \
+  if( rc )                                                     \
+  {                                                            \
+    DPQ_REMOVE( head, rc, elm );                               \
+  }                                                            \
+} while(0)
+
+
 /* Delete the entire queue
  * head - pointer to the head of the queue
@@ -123 +176 @@
  * df - a delete function to be called. Declared with DPQ_DECL_DELETECB.
  */
-#define DPQ_DELETEQ( head, field, type, df )            \
-while( !DPQ_IS_EMPTY(head) )                               \
-{                                                       \
-  type holder = (head).lpQHFirst;                      \
-  DPQ_REMOVE( head, holder, field );                    \
-  df( holder );                                \
-}
+#define DPQ_DELETEQ( head, field, type, df )     \
+do                                               \
+{                                                \
+  while( !DPQ_IS_EMPTY(head) )                   \
+  {                                              \
+    type holder = DPQ_FIRST(head);               \
+    DPQ_REMOVE( head, holder, field );           \
+    df( holder );                                \
+  }                                              \
+} while(0)
 
 /* How to define the method to be passed to DPQ_DELETEQ */