Skip to content

W
wine-winehq
Commit 88a2954a authored by Peter Hunnisett's avatar Peter Hunnisett Committed by Alexandre Julliard
Browse files
Options

- Added global data mutual exclusion

- Removed hack for creating processes suspended now that it's implemented - Fixed ordinal numbering and added spec stubs - Fixed EnumConnections callback to fill in all parameters with valid data - Made direct play allocation/deallocation follow the same pattern as direct play lobby
parent 6c8a67c3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 65 deletions
dlls/dplayx/dplayx_global.h
View file @ 88a2954a
...@@ -14,14 +14,9 @@ HRESULT DPLAYX_SetConnectionSettingsA ( DWORD dwFlags, DWORD dwAppID, LPDPLCONNE ...@@ -14,14 +14,9 @@ HRESULT DPLAYX_SetConnectionSettingsA ( DWORD dwFlags, DWORD dwAppID, LPDPLCONNE
HRESULT DPLAYX_SetConnectionSettingsW ( DWORD dwFlags, DWORD dwAppID, LPDPLCONNECTION lpConn ); HRESULT DPLAYX_SetConnectionSettingsW ( DWORD dwFlags, DWORD dwAppID, LPDPLCONNECTION lpConn );
BOOL DPLAYX_CreateLobbyApplication( DWORD dwAppID, HANDLE hReceiveEvent ); BOOL DPLAYX_CreateLobbyApplication( DWORD dwAppID, HANDLE hReceiveEvent );
BOOL DPLAYX_DestroyLobbyApplication( DWORD dwAppID );
/* This is a hack to ensure synchronization during application spawn */ /* Convert a DP or DPL HRESULT code into a string for human consumption */
#if !defined( WORKING_PROCESS_SUSPEND ) LPCSTR DPLAYX_HresultToString( HRESULT hr );
DWORD DPLAYX_AquireSemaphoreHack( void );
DWORD DPLAYX_ReleaseSemaphoreHack( void );
#endif
#endif /* __WINE_DPLAYX_GLOBAL */ #endif /* __WINE_DPLAYX_GLOBAL */
dlls/dplayx/dplobby.c
View file @ 88a2954a
...@@ -20,12 +20,14 @@ ...@@ -20,12 +20,14 @@
DEFAULT_DEBUG_CHANNEL(dplay) DEFAULT_DEBUG_CHANNEL(dplay)
/* FIXME: All the data structures are presently not needed except for unk */
/* FIXME: Move lock from unk to dpl */
/* Forward declarations for this module helper methods */ /* Forward declarations for this module helper methods */
static HRESULT DPL_CreateCompoundAddress ( LPCDPCOMPOUNDADDRESSELEMENT lpElements, DWORD dwElementCount, HRESULT DPL_CreateCompoundAddress ( LPCDPCOMPOUNDADDRESSELEMENT lpElements, DWORD dwElementCount,
LPVOID lpAddress, LPDWORD lpdwAddressSize, BOOL bAnsiInterface ); LPVOID lpAddress, LPDWORD lpdwAddressSize, BOOL bAnsiInterface );
HRESULT DPL_CreateAddress( REFGUID guidSP, REFGUID guidDataType, LPCVOID lpData, DWORD dwDataSize,
LPVOID lpAddress, LPDWORD lpdwAddressSize, BOOL bAnsiInterface );
static HRESULT DPL_EnumAddress( LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, LPCVOID lpAddress, static HRESULT DPL_EnumAddress( LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, LPCVOID lpAddress,
DWORD dwAddressSize, LPVOID lpContext ); DWORD dwAddressSize, LPVOID lpContext );
...@@ -76,27 +78,28 @@ typedef struct tagDirectPlayLobby3Data ...@@ -76,27 +78,28 @@ typedef struct tagDirectPlayLobby3Data
BOOL dummy; BOOL dummy;
} DirectPlayLobby3Data; } DirectPlayLobby3Data;
#define LOBBY_IMPL_FIELDS DirectPlayLobbyIUnknownData* unk; \ #define DPL_IMPL_FIELDS \
DirectPlayLobbyData* dpl; \ DirectPlayLobbyIUnknownData* unk; \
DirectPlayLobby2Data* dpl2; \ DirectPlayLobbyData* dpl; \
DirectPlayLobby3Data* dpl3; DirectPlayLobby2Data* dpl2; \
DirectPlayLobby3Data* dpl3;
struct IDirectPlayLobbyImpl struct IDirectPlayLobbyImpl
{ {
ICOM_VFIELD(IDirectPlayLobby); ICOM_VFIELD(IDirectPlayLobby);
LOBBY_IMPL_FIELDS DPL_IMPL_FIELDS
}; };
struct IDirectPlayLobby2Impl struct IDirectPlayLobby2Impl
{ {
ICOM_VFIELD(IDirectPlayLobby2); ICOM_VFIELD(IDirectPlayLobby2);
LOBBY_IMPL_FIELDS DPL_IMPL_FIELDS
}; };
struct IDirectPlayLobby3Impl struct IDirectPlayLobby3Impl
{ {
ICOM_VFIELD(IDirectPlayLobby3); ICOM_VFIELD(IDirectPlayLobby3);
LOBBY_IMPL_FIELDS DPL_IMPL_FIELDS
}; };
...@@ -146,16 +149,16 @@ BOOL DPL_CreateIUnknown( LPVOID lpDPL ) ...@@ -146,16 +149,16 @@ BOOL DPL_CreateIUnknown( LPVOID lpDPL )
This->unk = (DirectPlayLobbyIUnknownData*)HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, This->unk = (DirectPlayLobbyIUnknownData*)HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY,
sizeof( *(This->unk) ) ); sizeof( *(This->unk) ) );
if ( This->unk != NULL ) if ( This->unk == NULL )
{ {
InitializeCriticalSection( &This->unk->DPL_lock ); return FALSE;
}
IDirectPlayLobby_AddRef( (LPDIRECTPLAYLOBBYA)lpDPL ); InitializeCriticalSection( &This->unk->DPL_lock );
return TRUE; IDirectPlayLobby_AddRef( (LPDIRECTPLAYLOBBYA)lpDPL );
}
return FALSE; return TRUE;
} }
BOOL DPL_DestroyIUnknown( LPVOID lpDPL ) BOOL DPL_DestroyIUnknown( LPVOID lpDPL )
...@@ -710,27 +713,8 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_CreateAddress ...@@ -710,27 +713,8 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_CreateAddress
LPVOID lpAddress, LPVOID lpAddress,
LPDWORD lpdwAddressSize ) LPDWORD lpdwAddressSize )
{ {
ICOM_THIS(IDirectPlayLobbyAImpl,iface); return DPL_CreateAddress( guidSP, guidDataType, lpData, dwDataSize,
lpAddress, lpdwAddressSize, TRUE );
const DWORD dwNumAddElements = 2; /* Service Provide & address data type */
DPCOMPOUNDADDRESSELEMENT addressElements[ dwNumAddElements ];
TRACE( "(%p)->(%p,%p,%p,0x%08lx,%p,%p)\n", This, guidSP, guidDataType, lpData,
dwDataSize, lpAddress, lpdwAddressSize );
addressElements[ 0 ].guidDataType = DPAID_ServiceProvider;
addressElements[ 0 ].dwDataSize = sizeof( GUID );
addressElements[ 0 ].lpData = (LPVOID)guidSP;
addressElements[ 1 ].guidDataType = *guidDataType;
addressElements[ 1 ].dwDataSize = dwDataSize;
addressElements[ 1 ].lpData = (LPVOID)lpData;
/* Call CreateCompoundAddress to cut down on code.
NOTE: We can do this because we don't support DPL 1 interfaces! */
return IDirectPlayLobby_CreateCompoundAddress( (LPDIRECTPLAYLOBBY2A)iface,
addressElements, dwNumAddElements,
lpAddress, lpdwAddressSize );
} }
static HRESULT WINAPI IDirectPlayLobbyWImpl_CreateAddress static HRESULT WINAPI IDirectPlayLobbyWImpl_CreateAddress
...@@ -742,12 +726,24 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_CreateAddress ...@@ -742,12 +726,24 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_CreateAddress
LPVOID lpAddress, LPVOID lpAddress,
LPDWORD lpdwAddressSize ) LPDWORD lpdwAddressSize )
{ {
ICOM_THIS(IDirectPlayLobbyWImpl,iface); return DPL_CreateAddress( guidSP, guidDataType, lpData, dwDataSize,
lpAddress, lpdwAddressSize, FALSE );
}
HRESULT DPL_CreateAddress(
REFGUID guidSP,
REFGUID guidDataType,
LPCVOID lpData,
DWORD dwDataSize,
LPVOID lpAddress,
LPDWORD lpdwAddressSize,
BOOL bAnsiInterface )
{
const DWORD dwNumAddElements = 2; /* Service Provide & address data type */ const DWORD dwNumAddElements = 2; /* Service Provide & address data type */
DPCOMPOUNDADDRESSELEMENT addressElements[ dwNumAddElements ]; DPCOMPOUNDADDRESSELEMENT addressElements[ dwNumAddElements ];
TRACE( "(%p)->(%p,%p,%p,0x%08lx,%p,%p)\n", This, guidSP, guidDataType, lpData, TRACE( "(%p)->(%p,%p,0x%08lx,%p,%p,%d)\n", guidSP, guidDataType, lpData, dwDataSize,
dwDataSize, lpAddress, lpdwAddressSize ); lpAddress, lpdwAddressSize, bAnsiInterface );
addressElements[ 0 ].guidDataType = DPAID_ServiceProvider; addressElements[ 0 ].guidDataType = DPAID_ServiceProvider;
addressElements[ 0 ].dwDataSize = sizeof( GUID ); addressElements[ 0 ].dwDataSize = sizeof( GUID );
...@@ -759,12 +755,12 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_CreateAddress ...@@ -759,12 +755,12 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_CreateAddress
/* Call CreateCompoundAddress to cut down on code. /* Call CreateCompoundAddress to cut down on code.
NOTE: We can do this because we don't support DPL 1 interfaces! */ NOTE: We can do this because we don't support DPL 1 interfaces! */
return IDirectPlayLobby_CreateCompoundAddress( (LPDIRECTPLAYLOBBY2)iface, return DPL_CreateCompoundAddress( addressElements, dwNumAddElements,
addressElements, dwNumAddElements, lpAddress, lpdwAddressSize, bAnsiInterface );
lpAddress, lpdwAddressSize );
} }
/******************************************************************** /********************************************************************
* *
* Parses out chunks from the DirectPlay Address buffer by calling the * Parses out chunks from the DirectPlay Address buffer by calling the
...@@ -1274,7 +1270,7 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_RunApplication ...@@ -1274,7 +1270,7 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_RunApplication
PROCESS_INFORMATION newProcessInfo; PROCESS_INFORMATION newProcessInfo;
LPSTR appName; LPSTR appName;
FIXME( "(%p)->(0x%08lx,%p,%p,%p):semi stub\n", This, dwFlags, lpdwAppID, lpConn, hReceiveEvent ); TRACE( "(%p)->(0x%08lx,%p,%p,%p)\n", This, dwFlags, lpdwAppID, lpConn, hReceiveEvent );
if( dwFlags != 0 ) if( dwFlags != 0 )
{ {
...@@ -1312,10 +1308,6 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_RunApplication ...@@ -1312,10 +1308,6 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_RunApplication
ZeroMemory( &newProcessInfo, sizeof( newProcessInfo ) ); ZeroMemory( &newProcessInfo, sizeof( newProcessInfo ) );
#if !defined( WORKING_PROCESS_SUSPEND )
DPLAYX_AquireSemaphoreHack();
#endif
if( !CreateProcessA( appName, if( !CreateProcessA( appName,
enumData.lpszCommandLine, enumData.lpszCommandLine,
NULL, NULL,
...@@ -1330,6 +1322,12 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_RunApplication ...@@ -1330,6 +1322,12 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_RunApplication
) )
{ {
FIXME( "Failed to create process for app %s\n", appName ); FIXME( "Failed to create process for app %s\n", appName );
HeapFree( GetProcessHeap(), 0, appName );
HeapFree( GetProcessHeap(), 0, enumData.lpszCommandLine );
HeapFree( GetProcessHeap(), 0, enumData.lpszCurrentDirectory );
return DPERR_CANTCREATEPROCESS;
} }
HeapFree( GetProcessHeap(), 0, appName ); HeapFree( GetProcessHeap(), 0, appName );
...@@ -1346,19 +1344,15 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_RunApplication ...@@ -1346,19 +1344,15 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_RunApplication
if( hr != DP_OK ) if( hr != DP_OK )
{ {
FIXME( "SetConnectionSettings failure 0x%08lx\n", hr ); FIXME( "SetConnectionSettings failure %s\n", DPLAYX_HresultToString( hr ) );
return hr; return hr;
} }
/* Everything seems to have been set correctly, update the dwAppID */ /* Everything seems to have been set correctly, update the dwAppID */
*lpdwAppID = newProcessInfo.dwProcessId; *lpdwAppID = newProcessInfo.dwProcessId;
#if !defined( WORKING_PROCESS_SUSPEND ) /* Unsuspend the process */
FIXME( ": It would be at this point that we would allow the process to resume\n" );
DPLAYX_ReleaseSemaphoreHack();
#else
ResumeThread( newProcessInfo.dwThreadId ); ResumeThread( newProcessInfo.dwThreadId );
#endif
LeaveCriticalSection( &This->unk->DPL_lock ); LeaveCriticalSection( &This->unk->DPL_lock );
...@@ -1504,7 +1498,7 @@ static HRESULT WINAPI IDirectPlayLobby2AImpl_CreateCompoundAddress ...@@ -1504,7 +1498,7 @@ static HRESULT WINAPI IDirectPlayLobby2AImpl_CreateCompoundAddress
return DPL_CreateCompoundAddress( lpElements, dwElementCount, lpAddress, lpdwAddressSize, TRUE ); return DPL_CreateCompoundAddress( lpElements, dwElementCount, lpAddress, lpdwAddressSize, TRUE );
} }
static HRESULT DPL_CreateCompoundAddress HRESULT DPL_CreateCompoundAddress
( LPCDPCOMPOUNDADDRESSELEMENT lpElements, ( LPCDPCOMPOUNDADDRESSELEMENT lpElements,
DWORD dwElementCount, DWORD dwElementCount,
LPVOID lpAddress, LPVOID lpAddress,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment