From df3058ce7d89a1d8d58a81a4a0bf4e53a1eb8dbd Mon Sep 17 00:00:00 2001 From: Ismael Barros Date: Fri, 1 Aug 2008 13:22:10 +0300 Subject: [PATCH] dplayx: Adjusted timers to the values in the documentation --- dlls/dplayx/dplayx_messages.c | 4 ++-- dlls/dplayx/dplayx_messages.h | 5 +++++ dlls/dplayx/name_server.c | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c index 4dbbfcc274f..6006c414b4c 100644 --- a/dlls/dplayx/dplayx_messages.c +++ b/dlls/dplayx/dplayx_messages.c @@ -227,7 +227,7 @@ HRESULT DP_MSG_SendRequestPlayerId( IDirectPlay2AImpl* This, DWORD dwFlags, TRACE( "Asking for player id w/ Flags 0x%08x\n", lpMsgBody->Flags ); - DP_MSG_ExpectReply( This, &data, DPMSG_DEFAULT_WAIT_TIME, DPMSGCMD_REQUESTPLAYERREPLY, + DP_MSG_ExpectReply( This, &data, DPMSG_RELIABLE_API_TIMER, DPMSGCMD_REQUESTPLAYERREPLY, &lpMsg, &dwMsgSize ); } @@ -285,7 +285,7 @@ HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlay2AImpl* This, DPID dpidServer ) TRACE( "Sending forward player request with 0x%08x\n", dpidServer ); lpMsg = DP_MSG_ExpectReply( This, &data, - DPMSG_WAIT_60_SECS, + DPMSG_RELIABLE_API_TIMER, DPMSGCMD_ADDFORWARD, &lpMsg, &dwMsgSize ); } diff --git a/dlls/dplayx/dplayx_messages.h b/dlls/dplayx/dplayx_messages.h index 24729e3ceab..ef68b00add3 100644 --- a/dlls/dplayx/dplayx_messages.h +++ b/dlls/dplayx/dplayx_messages.h @@ -46,6 +46,11 @@ void DP_MSG_ErrorReceived( IDirectPlay2AImpl* This, WORD wCommandId, #define DPMSG_WAIT_30_SECS 30000 #define DPMSG_WAIT_60_SECS 60000 #define DPMSG_DEFAULT_WAIT_TIME DPMSG_WAIT_30_SECS +#define DPMSG_RELIABLE_API_TIMER 5000 +#define DPMSG_LOGON_TIMER 25000 +#define DPMSG_PACKETIZE_BASE_TIMER 900 +#define DPMSG_PING_TIMER 35000 +#define DPMSG_NAMETABLE_TIMER 15000 /* Message types etc. */ #include "pshpack1.h" diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c index 8396b4a8a24..4bd53d7bb3b 100644 --- a/dlls/dplayx/name_server.c +++ b/dlls/dplayx/name_server.c @@ -319,7 +319,7 @@ void NS_PruneSessionCache( LPVOID lpNSInfo ) lpNSCache lpCache = lpNSInfo; const DWORD dwPresentTime = timeGetTime(); - const DWORD dwPrunePeriod = DPMSG_WAIT_60_SECS; /* is 60 secs enough? */ + const DWORD dwPrunePeriod = DPMSG_LOGON_TIMER; /* 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 -- 2.11.4.GIT