dplobby.c
lobbysp.c
name_server.c
- dplayx_global.h)
+ precomp.h)
add_library(dplayx SHARED
${SOURCE}
set_module_type(dplayx win32dll)
target_link_libraries(dplayx dxguid uuid wine)
add_importlibs(dplayx winmm ole32 user32 advapi32 msvcrt kernel32 ntdll)
-add_pch(dplayx dplayx_global.h SOURCE)
+add_pch(dplayx precomp.h SOURCE)
add_cd_file(TARGET dplayx DESTINATION reactos/system32 FOR all)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "dplayx_global.h"
+#include <stdarg.h>
+#include <string.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "objbase.h"
+#include "winerror.h"
+#include "wine/debug.h"
+#include "dplay.h"
+#include "dplobby.h"
+#include "initguid.h"
+#include "dplay_global.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dplay);
+
typedef struct
{
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#define COBJMACROS
+#include "config.h"
+#include "wine/port.h"
+
+#include <stdarg.h>
+#include <string.h>
+
+#define NONAMELESSUNION
+
+#include "windef.h"
+#include "winerror.h"
+#include "winbase.h"
+#include "winnt.h"
+#include "winreg.h"
+#include "winnls.h"
+#include "wine/unicode.h"
+#include "wine/debug.h"
+
#include "dplayx_global.h"
+#include "name_server.h"
+#include "dplayx_queue.h"
+#include "wine/dplaysp.h"
+#include "dplay_global.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dplay);
/* FIXME: Should this be externed? */
extern HRESULT DPL_CreateCompoundAddress
#ifndef __WINE_DPLAY_GLOBAL_INCLUDED
#define __WINE_DPLAY_GLOBAL_INCLUDED
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wine/dplaysp.h"
+#include "lobbysp.h"
+#include "dplayx_queue.h"
+
extern HRESULT DPL_EnumAddress( LPDPENUMADDRESSCALLBACK lpEnumAddressCallback,
LPCVOID lpAddress, DWORD dwAddressSize,
LPVOID lpContext ) DECLSPEC_HIDDEN;
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "dplayx_global.h"
+#include <string.h>
+#include "winerror.h"
+#include "wine/debug.h"
+
+#include "wine/dplaysp.h"
+#include "dplay_global.h"
+#include "name_server.h"
+#include "dplayx_messages.h"
+
+#include "dplayx_global.h" /* FIXME: For global hack */
/* FIXME: Need to add interface locking inside procedures */
+WINE_DEFAULT_DEBUG_CHANNEL(dplay);
+
typedef struct IDirectPlaySPImpl
{
IDirectPlaySP IDirectPlaySP_iface;
*
*/
+#include <stdarg.h>
+#include <string.h>
+
+#define NONAMELESSUNION
+
+#include "wine/debug.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wine/unicode.h"
+
+#include "wingdi.h"
+#include "winuser.h"
+
#include "dplayx_global.h"
+#include "dplayx_messages.h" /* For CreateMessageReceptionThread only */
+
+WINE_DEFAULT_DEBUG_CHANNEL(dplay);
/* FIXME: Need to do all that fun other dll referencing type of stuff */
#ifndef __WINE_DPLAYX_GLOBAL
#define __WINE_DPLAYX_GLOBAL
-#include <wine/config.h>
-
#include <stdarg.h>
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <dplay.h>
-
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
-#include "dplaysp.h"
-#include "lobbysp.h"
-#include "dplayx_queue.h"
-#include "dplay_global.h"
-#include "dplayx_messages.h"
-#include "name_server.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dplay);
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "dplay.h"
BOOL DPLAYX_ConstructData(void) DECLSPEC_HIDDEN;
BOOL DPLAYX_DestructData(void) DECLSPEC_HIDDEN;
* client. Also get rid of offset dependency by making data offset independent
* somehow.
*/
-
+#include <stdarg.h>
+
+#include "winerror.h"
+#include "windef.h"
+#include "winbase.h"
+#include "objbase.h"
+#include "rpcproxy.h"
+#include "wine/debug.h"
#include "dplayx_global.h"
-#include <rpcproxy.h>
+WINE_DEFAULT_DEBUG_CHANNEL(dplay);
static HINSTANCE instance;
* o Messaging interface required for both DirectPlay and DirectPlayLobby.
*/
+#include <stdarg.h>
+#include <string.h>
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winerror.h"
+
+#include "dplayx_messages.h"
+#include "dplay_global.h"
#include "dplayx_global.h"
+#include "name_server.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dplay);
typedef struct tagMSGTHREADINFO
{
#ifndef __WINE_DPLAYX_MESSAGES__
#define __WINE_DPLAYX_MESSAGES__
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "dplay.h"
+#include "rpc.h" /* For GUID */
+
+#include "dplay_global.h"
+
DWORD CreateLobbyMessageReceptionThread( HANDLE hNotifyEvent, HANDLE hStart,
HANDLE hDeath, HANDLE hConnRead ) DECLSPEC_HIDDEN;
#define DPMSG_DEFAULT_WAIT_TIME DPMSG_WAIT_30_SECS
/* Message types etc. */
-#include <pshpack1.h>
+#include "pshpack1.h"
/* Non provided messages for DPLAY - guess work which may be wrong :( */
#define DPMSGCMD_ENUMSESSIONSREPLY 1
} DPMSG_FORWARDADDPLAYERNACK, *LPDPMSG_FORWARDADDPLAYERNACK;
typedef const DPMSG_FORWARDADDPLAYERNACK* LPCDPMSG_FORWARDADDPLAYERNACK;
-#include <poppack.h>
+#include "poppack.h"
-#endif /* __WINE_DPLAYX_MESSAGES__ */
+#endif
#ifndef __WINE_DPLAYX_QUEUE_H
#define __WINE_DPLAYX_QUEUE_H
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+
#define DPQ_INSERT(a,b,c) DPQ_INSERT_IN_TAIL(a,b,c)
/*
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include <stdarg.h>
+#include <string.h>
+
+#define COBJMACROS
+#define NONAMELESSUNION
+
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "winreg.h"
+#include "winnls.h"
+#include "wine/debug.h"
#include "dplayx_global.h"
+#include "dplayx_messages.h"
+#include "dplayx_queue.h"
+#include "dplobby.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dplay);
/* Forward declarations for this module helper methods */
HRESULT DPL_CreateCompoundAddress ( LPCDPCOMPOUNDADDRESSELEMENT lpElements, DWORD dwElementCount,
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "dplayx_global.h"
+#include "winerror.h"
+#include "wine/debug.h"
+#include "lobbysp.h"
+#include "dplay_global.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dplay);
typedef struct IDPLobbySPImpl
{
#ifndef __WINE_LOBBY_SP_H
#define __WINE_LOBBY_SP_H
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "dplobby.h"
+
/* GUID for IDPLobbySP {5A4E5A20-2CED-11d0-A889-00A0C905433C} */
DEFINE_GUID(IID_IDPLobbySP, 0x5a4e5a20, 0x2ced, 0x11d0, 0xa8, 0x89, 0x0, 0xa0, 0xc9, 0x5, 0x43, 0x3c);
typedef struct IDPLobbySP *LPDPLOBBYSP;
*/
extern DWORD gdwDPlaySPRefCount DECLSPEC_HIDDEN;
-#endif /* __WINE_LOBBY_SP_H */
+#endif
/* NOTE: Methods with the NS_ prefix are name server methods */
-#include "dplayx_global.h"
+#include <stdarg.h>
+#include <string.h>
+
+#define NONAMELESSUNION
-#include <mmsystem.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
+#include "wine/unicode.h"
+#include "wine/debug.h"
+#include "mmsystem.h"
+
+#include "dplayx_global.h"
+#include "name_server.h"
+#include "wine/dplaysp.h"
+#include "dplayx_messages.h"
+#include "dplayx_queue.h"
/* FIXME: Need to create a crit section, store and use it */
+WINE_DEFAULT_DEBUG_CHANNEL(dplay);
+
/* NS specific structures */
struct NSCacheData
{
#ifndef __WINE_DPLAYX_NAMESERVER
#define __WINE_DPLAYX_NAMESERVER
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "dplay.h"
+#include "wine/dplaysp.h"
+#include "dplayx_messages.h"
+#include "dplay_global.h"
+
void NS_SetLocalComputerAsNameServer( LPCDPSESSIONDESC2 lpsd, LPVOID lpNSInfo ) DECLSPEC_HIDDEN;
void NS_AddRemoteComputerAsNameServer( LPCVOID lpNSAddrHdr,
DWORD dwHdrSize,
--- /dev/null
+
+#ifndef __WINE_DPLAYX_PRECOMP_H
+#define __WINE_DPLAYX_PRECOMP_H
+
+#include <wine/config.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include "dplay_global.h"
+#include "dplayx_global.h"
+#include "dplayx_messages.h"
+#include "name_server.h"
+
+#include <winreg.h>
+#include <wine/debug.h>
+#include <wine/unicode.h>
+
+#endif /* !__WINE_DPLAYX_PRECOMP_H */
reactos/dll/directx/wine/dinput8 # Synced to WineStaging-3.3
reactos/dll/directx/wine/dmusic # Synced to WineStaging-3.3
reactos/dll/directx/wine/dplay # Synced to WineStaging-3.3
-reactos/dll/directx/wine/dplayx # Synced to WineStaging-2.16
+reactos/dll/directx/wine/dplayx # Synced to WineStaging-3.3
reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29
reactos/dll/directx/wine/dxdiagn # Synced to Wine-3.0
reactos/dll/directx/wine/msdmo # Synced to WineStaging-2.9