Changeset 4446 for trunk/src

Timestamp:

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

Author:

hugh

Message:

Updated to latest WINE

Location:

trunk/src/DPlayX

Files:

• dplay.cpp (modified) (20 diffs)
• dplaysp.cpp (modified) (4 diffs)
• dplayx_global.cpp (modified) (2 diffs)
• dplayx_messages.cpp (modified) (7 diffs)
• dplayx_messages.h (modified) (5 diffs)
• dplayx_queue.h (modified) (5 diffs)
• dplobby.cpp (modified) (4 diffs)
• makefile (modified) (2 diffs)
• name_server.cpp (modified) (9 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;

trunk/src/DPlayX/dplaysp.cpp

@@ -1 @@
-// $Id: dplaysp.cpp,v 1.2 2000-09-24 22:47:37 hugh Exp $
+// $Id: dplaysp.cpp,v 1.3 2000-10-06 19:49:04 hugh Exp $
 /* This contains the implementation of the interface Service
  * Providers require to communicate with Direct Play
@@ -28 +28 @@
 DEFAULT_DEBUG_CHANNEL(dplay);
 
+#undef  debugstr_guid
 #define debugstr_guid(a) a
 
@@ -380 +381 @@
          This, idPlayer, lplpData, lpdwDataSize, dwFlags );
 
+  /* What to do in the case where there is nothing set yet? */
+
   *lplpData     = This->sp->lpPlayerData;
   *lpdwDataSize = This->sp->dwPlayerDataSize;
@@ -451 +454 @@
     }
 
+    case DPMSGCMD_GETNAMETABLE:
+    case DPMSGCMD_GETNAMETABLEREPLY:
     case DPMSGCMD_NEWPLAYERIDREPLY:
     case DPMSGCMD_REQUESTNEWPLAYERID:

trunk/src/DPlayX/dplayx_global.cpp

@@ -1 @@
-// $Id: dplayx_global.cpp,v 1.2 2000-09-24 22:47:37 hugh Exp $
+// $Id: dplayx_global.cpp,v 1.3 2000-10-06 19:49:05 hugh Exp $
 /* dplayx.dll global data implementation.
  *
@@ -32 +32 @@
 DEFAULT_DEBUG_CHANNEL(dplay);
 
+#undef  debugstr_guid
 #define debugstr_guid(a) a
 

trunk/src/DPlayX/dplayx_messages.cpp

@@ -1 @@
-// $Id: dplayx_messages.cpp,v 1.2 2000-09-24 22:47:38 hugh Exp $
+// $Id: dplayx_messages.cpp,v 1.3 2000-10-06 19:49:05 hugh Exp $
 /* DirectPlay & DirectPlayLobby messaging implementation
  *
@@ -26 +26 @@
 DEFAULT_DEBUG_CHANNEL(dplay)
 
+#undef  debugstr_guid
 #define debugstr_guid(a) a
 
@@ -158 +159 @@
   HRESULT                    hr = DP_OK;
 
-  FIXME( "semi stub\n" );
-
-  DebugBreak();
-
   dwMsgSize = This->dp2->spData.dwSPHeaderSize + sizeof( *lpMsgBody );
 
@@ -195 +192 @@
     This->dp2->hMsgReceipt = CreateEventA( NULL, FALSE, FALSE, NULL );
 
+    TRACE( "Sending request for player id\n" );
+
     hr = (*This->dp2->spData.lpCB->Send)( &data );
 
@@ -201 +200 @@
       ERR( "Request for new playerID send failed: %s\n",
            DPLAYX_HresultToString( hr ) );
+      return DPERR_NOCONNECTION;
     }
   }
@@ -208 +208 @@
   {
     ERR( "Wait failed 0x%08lx\n", dwWaitReturn );
+    hr = DPERR_TIMEOUT;
   }
 
@@ -214 +215 @@
 
   /* Need to examine the data and extract the new player id */
-  /* I just hope that dplay doesn't return the whole new player! */
+  if( !FAILED(hr) )
+  {
+    LPCDPMSG_NEWPLAYERIDREPLY lpcReply;
+
+    lpcReply = (LPCDPMSG_NEWPLAYERIDREPLY)This->dp2->lpMsgReceived;
+
+    *lpdpidAllocatedId = lpcReply->dpidNewPlayerId;
+
+    TRACE( "Received reply for id = 0x%08lx\n", lpcReply->dpidNewPlayerId );
+
+    /* FIXME: I think that the rest of the message has something to do
+     *        with remote data for the player that perhaps I need to setup.
+     */
+#if 0
+   /* Set the passed service provider data */
+   IDirectPlaySP_SetSPData( This->dp2->spData.lpISP, data,
+                            msgsize, DPSET_REMOTE );
+
+#endif
+
+    HeapFree( GetProcessHeap(), 0, This->dp2->lpMsgReceived );
+    This->dp2->lpMsgReceived = NULL;
+  }
 
   return hr;

trunk/src/DPlayX/dplayx_messages.h

@@ -1 @@
-// $Id: dplayx_messages.h,v 1.2 2000-09-24 22:47:39 hugh Exp $
+// $Id: dplayx_messages.h,v 1.3 2000-10-06 19:49:06 hugh Exp $
 
 #ifndef __WINE_DPLAYX_MESSAGES__
@@ -21 +21 @@
 #define DPMSGCMD_ENUMSESSIONSREQUEST  2
 
-#define DPMSGCMD_GETSETNAMETABLE      3 /* Request info from NS about
-                                           existing players/groups etc. Is
-                                           also used for reply */
 
 #define DPMSGCMD_REQUESTNEWPLAYERID   5
@@ -36 +33 @@
 #define DPMSGCMD_ENUMGROUPS           17
 
-#define DPMSGCMD_FORWARDCREATEPLAYER  19  /* This may be a get name table req */
+#define DPMSGCMD_GETNAMETABLE         19
+
+#define DPMSGCMD_GETNAMETABLEREPLY    29
 
 /* This is what DP 6 defines it as. Don't know what it means. All messages
@@ -50 +49 @@
  */
 
-/* Size is 4 bytes */
+/* Size is 8 bytes */
 typedef struct tagDPMSG_SENDENVELOPE
 {
@@ -128 +127 @@
 typedef const DPMSG_REQUESTNEWPLAYERID* LPCDPMSG_REQUESTNEWPLAYERID;
 
-/* 64 byte - ~18 header ~= 46 bytes msg */
+/* 48 bytes msg */
 typedef struct tagDPMSG_NEWPLAYERIDREPLY
 {
   DPMSG_SENDENVELOPE envelope;
 
-#if 0
   DPID dpidNewPlayerId;
-#else
-  BYTE unknown[38];
+#if 1
+  /* Assume that this is data that is tacked on to the end of the message
+   * that comes from the SP remote data stored that needs to be propagated.
+   */
+  BYTE unknown[36];     /* This appears to always be 0 - not sure though */
 #endif
 

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 */

trunk/src/DPlayX/dplobby.cpp

@@ -1 @@
-// $Id: dplobby.cpp,v 1.2 2000-09-24 22:47:38 hugh Exp $
+// $Id: dplobby.cpp,v 1.3 2000-10-06 19:49:05 hugh Exp $
 /* Direct Play Lobby 2 & 3 Implementation
  *
@@ -28 +28 @@
 DEFAULT_DEBUG_CHANNEL(dplay)
 
+#undef  debugstr_guid
 #define debugstr_guid(a) a
 
@@ -1148 +1149 @@
 {
   /* These are the handles for the created process */
-  HANDLE hAppStart, hAppDeath, hAppRead;
+  HANDLE hAppStart, hAppDeath, hAppRead, hTemp;;
   SECURITY_ATTRIBUTES s_attrib;
 
@@ -1156 +1157 @@
 
   /* FIXME: Is there a handle leak here? */
-  *lphStart = CreateEventA( &s_attrib, TRUE, FALSE, NULL );
-  *lphDeath = CreateEventA( &s_attrib, TRUE, FALSE, NULL );
-  *lphRead  = CreateEventA( &s_attrib, TRUE, FALSE, NULL );
+  hTemp = CreateEventA( &s_attrib, TRUE, FALSE, NULL );
+  *lphStart = ConvertToGlobalHandle( hTemp );
+
+  hTemp = CreateEventA( &s_attrib, TRUE, FALSE, NULL );
+  *lphDeath = ConvertToGlobalHandle( hTemp );
+
+  hTemp = CreateEventA( &s_attrib, TRUE, FALSE, NULL );
+  *lphRead  = ConvertToGlobalHandle( hTemp );
 
   if( ( !DuplicateHandle( GetCurrentProcess(), *lphStart,

trunk/src/DPlayX/makefile

@@ -1 @@
-# $Id: makefile,v 1.10 2000-09-24 22:28:35 hugh Exp $
+# $Id: makefile,v 1.11 2000-10-06 19:49:06 hugh Exp $
 
 #
@@ -70 +70 @@
 $(PDWIN32_LIB)/user32.lib
 $(PDWIN32_LIB)/ole32.lib
+$(PDWIN32_LIB)/winmm.lib
 $(PDWIN32_LIB)/ntdll.lib
 $(PDWIN32_LIB)/msvfw32.lib

trunk/src/DPlayX/name_server.cpp

@@ -1 @@
-// $Id: name_server.cpp,v 1.2 2000-09-24 22:47:38 hugh Exp $
+// $Id: name_server.cpp,v 1.3 2000-10-06 19:49:06 hugh Exp $
 /* DPLAYX.DLL name server implementation
  *
@@ -21 +21 @@
 #include "heap.h"
 #include "heapstring.h"
+#include "mmsystem.h"
 
 #include "dplayx_global.h"
@@ -32 +33 @@
 DEFAULT_DEBUG_CHANNEL(dplay);
 
+#undef  debugstr_guid
 #define debugstr_guid(a) a
 
@@ -54 +56 @@
 };
 typedef struct NSCache NSCache, *lpNSCache;
+
+/* Function prototypes */
+DPQ_DECL_DELETECB( cbDeleteNSNodeFromHeap, lpNSCacheData );
 
 /* Name Server functions
@@ -61 +66 @@
 {
 #if 0
+  /* FIXME: Remove this method? */
   DPLAYX_SetLocalSession( lpsd );
 #endif
+}
+
+DPQ_DECL_COMPARECB( cbUglyPig, GUID )
+{
+  return IsEqualGUID( elem1, elem2 );
 }
 
@@ -77 +88 @@
 
   /* FIXME: Should check to see if the reply is for an existing session. If
-   *        so we just update the contents and update the timestamp.
+   *        so we remove the old and add the new so oldest is at front.
    */
+
+  /* See if we can find this session. If we can, remove it as it's a dup */
+  DPQ_REMOVE_ENTRY_CB( lpCache->first, next, data->guidInstance, cbUglyPig,
+                     lpMsg->sd.guidInstance, lpCacheNode );
+
+  if( lpCacheNode != NULL )
+  {
+    TRACE( "Duplicate session entry for %s removed - updated version kept\n",
+           debugstr_guid( &lpCacheNode->data->guidInstance ) );
+    cbDeleteNSNodeFromHeap( lpCacheNode );
+  }
+
+  /* Add this to the list */
   lpCacheNode = (lpNSCacheData)HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY,
                                           sizeof( *lpCacheNode ) );
@@ -128 +152 @@
   /* Ok. Cheat and don't search for the correct stuff just take the first.
    * FIXME: In the future how are we to know what is _THE_ enum we used?
+   *        This is going to have to go into dplay somehow. Perhaps it
+   *        comes back with app server id for the join command! Oh...that
+   *        must be it. That would make this method obsolete once that's
+   *        in place.
    */
 
@@ -171 +199 @@
 }
 
-DPQ_DECL_DELETECB( cbDeleteNSNodeFromHeap, lpNSCacheData );
 DPQ_DECL_DELETECB( cbDeleteNSNodeFromHeap, lpNSCacheData )
 {
+  /* NOTE: This proc doesn't deal with the walking pointer */
+
   /* FIXME: Memory leak on data (contained ptrs) */
   HeapFree( GetProcessHeap(), 0, elem->data );
@@ -259 +288 @@
 {
   lpNSCache     lpCache = (lpNSCache)lpNSInfo;
-  lpNSCacheData lpCacheEntry;
-
-  DWORD dwPresentTime = GetTickCount();
-#if defined( HACK_TIMEGETTIME )
-  DWORD dwPruneTime   = dwPresentTime - 2; /* One iteration with safety */
-#else
-  DWORD dwPruneTime   = dwPresentTime - 10000 /* 10 secs? */;
-#endif
-
-  FIXME( ": semi stub\n" );
-
-  /* FIXME: This doesn't handle time roll over correctly */
-  /* FIXME: Session memory leak on delete */
-  do
-  {
-    DPQ_FIND_ENTRY( lpCache->first, next, dwTime, <=, dwPruneTime, lpCacheEntry );
-  }
-  while( lpCacheEntry != NULL );
+
+  const DWORD dwPresentTime = timeGetTime();
+  const DWORD dwPrunePeriod = 60000; /* is 60 secs enough? */
+  const DWORD dwPruneTime   = dwPresentTime - dwPrunePeriod;
+
+  /* This silly little algorithm is based on the fact we keep entries in
+   * the queue in a time based order. It also assumes that it is not possible
+   * to wrap around over yourself (which is not unreasonable).
+   * The if statements verify if the first entry in the queue is less
+   * than dwPrunePeriod old depending on the "clock" roll over.
+   */
+  for( ;; )
+  {
+    lpNSCacheData lpFirstData;
+
+    if( DPQ_IS_EMPTY(lpCache->first) )
+    {
+      /* Nothing to prune */
+      break;
+    }
+
+    if( dwPruneTime > dwPresentTime ) /* 0 <= dwPresentTime <= dwPrunePeriod */
+    {
+      if( ( DPQ_FIRST(lpCache->first)->dwTime <= dwPresentTime ) ||
+          ( DPQ_FIRST(lpCache->first)->dwTime > dwPruneTime )
+        )
+      {
+        /* Less than dwPrunePeriod old - keep */
+        break;
+      }
+    }
+    else /* dwPrunePeriod <= dwPresentTime <= max dword */
+    {
+      if( ( DPQ_FIRST(lpCache->first)->dwTime <= dwPresentTime ) &&
+          ( DPQ_FIRST(lpCache->first)->dwTime > dwPruneTime )
+        )
+      {
+        /* Less than dwPrunePeriod old - keep */
+        break;
+      }
+    }
+
+    lpFirstData = DPQ_FIRST(lpCache->first);
+    DPQ_REMOVE( lpCache->first, DPQ_FIRST(lpCache->first), next );
+    cbDeleteNSNodeFromHeap( lpFirstData );
+  }
 
 }