dplayx: NS_GetOtherMagic() is not used, so remove it. (try2)

Francois Gouget fgouget at free.fr
Thu May 14 18:51:07 CDT 2009


---

The previous patch was enclosing it in an #if 0, but apparently there's 
no point even keeping it.

 dlls/dplayx/dplayx_messages.c |    4 ----
 dlls/dplayx/name_server.c     |    8 --------
 dlls/dplayx/name_server.h     |    1 -
 3 files changed, 0 insertions(+), 13 deletions(-)

diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c
index 181e6b0..2e34950 100644
--- a/dlls/dplayx/dplayx_messages.c
+++ b/dlls/dplayx/dplayx_messages.c
@@ -329,11 +329,7 @@ HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlay2AImpl* This, DPID dpidServer )
   lpMsgBody->unknown4[5] =  0x0;
   lpMsgBody->unknown4[6] =  0x0;
 
-#if 0
-  lpMsgBody->unknown4[7] =  NS_GetOtherMagic( This->dp2->lpNameServerData )
-#else
   lpMsgBody->unknown4[7] =  NS_GetNsMagic( This->dp2->lpNameServerData );
-#endif
   TRACE( "Setting second magic to 0x%08x\n", lpMsgBody->unknown4[7] );
 
   lpMsgBody->unknown4[8] =  0x0;
diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c
index e6a6b62..58402cc 100644
--- a/dlls/dplayx/name_server.c
+++ b/dlls/dplayx/name_server.c
@@ -183,14 +183,6 @@ DWORD NS_GetNsMagic( LPVOID lpNSInfo )
   return lpHdrInfo[1];
 }
 
-/* Get the magic number associated with the non NS end */
-DWORD NS_GetOtherMagic( LPVOID lpNSInfo )
-{
-  lpNSCache lpCache = (lpNSCache)lpNSInfo;
-
-  return ((LPDWORD)lpCache->lpLocalAddrHdr)[1];
-}
-
 void NS_SetLocalAddr( LPVOID lpNSInfo, LPCVOID lpHdr, DWORD dwHdrSize )
 {
   lpNSCache lpCache = (lpNSCache)lpNSInfo;
diff --git a/dlls/dplayx/name_server.h b/dlls/dplayx/name_server.h
index 9c09ec6..c9df0c0 100644
--- a/dlls/dplayx/name_server.h
+++ b/dlls/dplayx/name_server.h
@@ -35,7 +35,6 @@ void NS_AddRemoteComputerAsNameServer( LPCVOID lpNSAddrHdr,
                                        LPVOID lpNSInfo );
 LPVOID NS_GetNSAddr( LPVOID lpNSInfo );
 DWORD NS_GetNsMagic( LPVOID lpNSInfo );
-DWORD NS_GetOtherMagic( LPVOID lpNSInfo );
 void NS_SetLocalAddr( LPVOID lpNSInfo, LPCVOID lpHdr, DWORD dwHdrSize );
 
 void NS_ReplyToEnumSessionsRequest( LPCVOID lpcMsg,
-- 
1.6.2.1




More information about the wine-patches mailing list