Francois Gouget : dplayx: DPLAYX_SetLocalSession() and DPLAYX_CopyIntoSessionDesc2A() are unused so remove them.
Alexandre Julliard
julliard at winehq.org
Tue May 26 09:24:55 CDT 2009
Module: wine
Branch: master
Commit: 185b4bf605baec7185794da46f76cb87f4e135d5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=185b4bf605baec7185794da46f76cb87f4e135d5
Author: Francois Gouget <fgouget at free.fr>
Date: Tue May 26 00:38:15 2009 +0200
dplayx: DPLAYX_SetLocalSession() and DPLAYX_CopyIntoSessionDesc2A() are unused so remove them.
---
dlls/dplayx/dplayx_global.c | 43 -------------------------------------------
dlls/dplayx/dplayx_global.h | 2 --
dlls/dplayx/name_server.c | 4 ----
3 files changed, 0 insertions(+), 49 deletions(-)
diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c
index 9035902..d7f3cca 100644
--- a/dlls/dplayx/dplayx_global.c
+++ b/dlls/dplayx/dplayx_global.c
@@ -995,49 +995,6 @@ HRESULT DPLAYX_SetConnectionSettingsW
return DP_OK;
}
-
-
-/* Copy an ANSI session desc structure to the given buffer */
-static BOOL DPLAYX_CopyIntoSessionDesc2A( LPDPSESSIONDESC2 lpSessionDest,
- LPCDPSESSIONDESC2 lpSessionSrc )
-{
- CopyMemory( lpSessionDest, lpSessionSrc, sizeof( *lpSessionSrc ) );
-
- if( lpSessionSrc->u1.lpszSessionNameA )
- {
- if ((lpSessionDest->u1.lpszSessionNameA = HeapAlloc( GetProcessHeap(), 0,
- strlen(lpSessionSrc->u1.lpszSessionNameA)+1 )))
- strcpy( lpSessionDest->u1.lpszSessionNameA, lpSessionSrc->u1.lpszSessionNameA );
- }
- if( lpSessionSrc->u2.lpszPasswordA )
- {
- if ((lpSessionDest->u2.lpszPasswordA = HeapAlloc( GetProcessHeap(), 0,
- strlen(lpSessionSrc->u2.lpszPasswordA)+1 )))
- strcpy( lpSessionDest->u2.lpszPasswordA, lpSessionSrc->u2.lpszPasswordA );
- }
-
- return TRUE;
-}
-
-void DPLAYX_SetLocalSession( LPCDPSESSIONDESC2 lpsd )
-{
- UINT i;
-
- /* FIXME: Is this an error if it exists already? */
-
- /* Crude/wrong implementation for now. Just always add to first empty spot */
- for( i=0; i < numSupportedSessions; i++ )
- {
- /* Is this one empty? */
- if( sessionData[i].dwSize == 0 )
- {
- DPLAYX_CopyIntoSessionDesc2A( &sessionData[i], lpsd );
- break;
- }
- }
-
-}
-
BOOL DPLAYX_WaitForConnectionSettings( BOOL bWait )
{
LPDPLAYX_LOBBYDATA lpLobbyData;
diff --git a/dlls/dplayx/dplayx_global.h b/dlls/dplayx/dplayx_global.h
index b9d48f4..5650348 100644
--- a/dlls/dplayx/dplayx_global.h
+++ b/dlls/dplayx/dplayx_global.h
@@ -51,8 +51,6 @@ BOOL DPLAYX_AnyLobbiesWaitingForConnSettings(void);
BOOL DPLAYX_SetLobbyHandles( DWORD dwAppID,
HANDLE hStart, HANDLE hDeath, HANDLE hConnRead );
-void DPLAYX_SetLocalSession( LPCDPSESSIONDESC2 lpsd );
-
BOOL DPLAYX_SetLobbyMsgThreadId( DWORD dwAppId, DWORD dwThreadId );
diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c
index 58402cc..65d36ef 100644
--- a/dlls/dplayx/name_server.c
+++ b/dlls/dplayx/name_server.c
@@ -74,10 +74,6 @@ static DPQ_DECL_DELETECB( cbDeleteNSNodeFromHeap, lpNSCacheData );
*/
void NS_SetLocalComputerAsNameServer( LPCDPSESSIONDESC2 lpsd, LPVOID lpNSInfo )
{
-#if 0
- /* FIXME: Remove this method? */
- DPLAYX_SetLocalSession( lpsd );
-#endif
lpNSCache lpCache = (lpNSCache)lpNSInfo;
lpCache->bNsIsLocal = TRUE;
More information about the wine-cvs
mailing list