diff --git a/dlls/dpnet/Makefile.in b/dlls/dpnet/Makefile.in index 17929ea16f2..a3641c3ef30 100644 --- a/dlls/dpnet/Makefile.in +++ b/dlls/dpnet/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ address.c \ client.c \ dpnet_main.c \ + lobbiedapp.c \ peer.c \ regsvr.c \ server.c diff --git a/dlls/dpnet/dpnet_main.c b/dlls/dpnet/dpnet_main.c index 44788d4eadf..1a2a90c78ce 100644 --- a/dlls/dpnet/dpnet_main.c +++ b/dlls/dpnet/dpnet_main.c @@ -31,8 +31,8 @@ #include "wine/debug.h" #include "dplay8.h" -/* - *#include "dplobby8.h" +#include "dplobby8.h" + /* *#include "dplay8sp.h" */ #include "dpnet_private.h" @@ -114,6 +114,7 @@ static IClassFactoryImpl DPNET_CFS[] = { { &DICF_Vtbl, 1, &CLSID_DirectPlay8Server, DPNET_CreateDirectPlay8Server }, { &DICF_Vtbl, 1, &CLSID_DirectPlay8Peer, DPNET_CreateDirectPlay8Peer }, { &DICF_Vtbl, 1, &CLSID_DirectPlay8Address, DPNET_CreateDirectPlay8Address }, + { &DICF_Vtbl, 1, &CLSID_DirectPlay8LobbiedApplication, (void *)DPNET_CreateDirectPlay8LobbiedApp }, { NULL, 0, NULL, NULL } }; diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 005eed8e05f..40cd671239d 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -26,14 +26,15 @@ #endif #include "dplay8.h" +#include "dplobby8.h" /* - *#include "dplobby8.h" *#include "dplay8sp.h" */ /* DirectPlay8 Interfaces: */ typedef struct IDirectPlay8ClientImpl IDirectPlay8ClientImpl; typedef struct IDirectPlay8AddressImpl IDirectPlay8AddressImpl; +typedef struct IDirectPlay8LobbiedApplicationImpl IDirectPlay8LobbiedApplicationImpl; /* ------------------ */ /* IDirectPlay8Client */ @@ -67,6 +68,17 @@ struct IDirectPlay8AddressImpl const WCHAR *url; }; +/***************************************************************************** + * IDirectPlay8LobbiedApplication implementation structure + */ +struct IDirectPlay8LobbiedApplicationImpl +{ + /* IUnknown fields */ + const IDirectPlay8LobbiedApplicationVtbl *lpVtbl; + LONG ref; + /* IDirectPlay8LobbiedApplication fields */ +}; + /** * factories */ @@ -74,6 +86,7 @@ extern HRESULT DPNET_CreateDirectPlay8Client(LPCLASSFACTORY iface, LPUNKNOWN pun extern HRESULT DPNET_CreateDirectPlay8Server(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); extern HRESULT DPNET_CreateDirectPlay8Peer(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); extern HRESULT DPNET_CreateDirectPlay8Address(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); +extern HRESULT DPNET_CreateDirectPlay8LobbiedApp(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); /** * debug diff --git a/dlls/dpnet/lobbiedapp.c b/dlls/dpnet/lobbiedapp.c new file mode 100644 index 00000000000..8b5a7f3faca --- /dev/null +++ b/dlls/dpnet/lobbiedapp.c @@ -0,0 +1,193 @@ +/* + * DirectPlay8 LobbiedApplication + * + * Copyright 2007 Jason Edmeades + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * 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 "config.h" + +#include + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "objbase.h" +#include "wine/debug.h" + +#include "dplay8.h" +#include "dplobby8.h" +#include "dpnet_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dpnet); + +/* IDirectPlay8LobbiedApplication IUnknown parts follow: */ +static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_QueryInterface( + PDIRECTPLAY8LOBBIEDAPPLICATION iface, + REFIID riid, + LPVOID *ppobj) { + IDirectPlay8LobbiedApplicationImpl *This = (IDirectPlay8LobbiedApplicationImpl *)iface; + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDirectPlay8LobbiedApplication)) { + IUnknown_AddRef(iface); + *ppobj = This; + return DPN_OK; + } + + WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + return E_NOINTERFACE; +} + +static ULONG WINAPI IDirectPlay8LobbiedApplicationImpl_AddRef( + PDIRECTPLAY8LOBBIEDAPPLICATION iface) { + IDirectPlay8LobbiedApplicationImpl *This = (IDirectPlay8LobbiedApplicationImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + + return refCount; +} + +static ULONG WINAPI IDirectPlay8LobbiedApplicationImpl_Release( + PDIRECTPLAY8LOBBIEDAPPLICATION iface) { + IDirectPlay8LobbiedApplicationImpl *This = (IDirectPlay8LobbiedApplicationImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + + if (!refCount) { + HeapFree(GetProcessHeap(), 0, This); + } + return refCount; +} + +/* IDirectPlay8LobbiedApplication Interface follow: */ + +static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_Initialize(PDIRECTPLAY8LOBBIEDAPPLICATION iface, + CONST PVOID pvUserContext, + CONST PFNDPNMESSAGEHANDLER pfn, + DPNHANDLE* CONST pdpnhConnection, + CONST DWORD dwFlags) { + IDirectPlay8LobbiedApplicationImpl *This = (IDirectPlay8LobbiedApplicationImpl *)iface; + FIXME("(%p): stub\n", This); + return DPN_OK; +} + +static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_RegisterProgram(PDIRECTPLAY8LOBBIEDAPPLICATION iface, + PDPL_PROGRAM_DESC pdplProgramDesc, + CONST DWORD dwFlags) { + IDirectPlay8LobbiedApplicationImpl *This = (IDirectPlay8LobbiedApplicationImpl *)iface; + FIXME("(%p): stub\n", This); + return DPN_OK; +} + +static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_UnRegisterProgram(PDIRECTPLAY8LOBBIEDAPPLICATION iface, + GUID* pguidApplication, + CONST DWORD dwFlags) { + IDirectPlay8LobbiedApplicationImpl *This = (IDirectPlay8LobbiedApplicationImpl *)iface; + FIXME("(%p): stub\n", This); + return DPN_OK; +} + +static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_Send(PDIRECTPLAY8LOBBIEDAPPLICATION iface, + CONST DPNHANDLE hConnection, + BYTE* CONST pBuffer, + CONST DWORD pBufferSize, + CONST DWORD dwFlags) { + IDirectPlay8LobbiedApplicationImpl *This = (IDirectPlay8LobbiedApplicationImpl *)iface; + FIXME("(%p): stub\n", This); + return DPN_OK; +} + +static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_SetAppAvailable(PDIRECTPLAY8LOBBIEDAPPLICATION iface, + CONST BOOL fAvailable, + CONST DWORD dwFlags) { + IDirectPlay8LobbiedApplicationImpl *This = (IDirectPlay8LobbiedApplicationImpl *)iface; + FIXME("(%p): stub\n", This); + return DPN_OK; +} + +static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_UpdateStatus(PDIRECTPLAY8LOBBIEDAPPLICATION iface, + CONST DPNHANDLE hConnection, + CONST DWORD dwStatus, + CONST DWORD dwFlags) { + IDirectPlay8LobbiedApplicationImpl *This = (IDirectPlay8LobbiedApplicationImpl *)iface; + FIXME("(%p): stub\n", This); + return DPN_OK; +} + +static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_Close(PDIRECTPLAY8LOBBIEDAPPLICATION iface, + CONST DWORD dwFlags) { + IDirectPlay8LobbiedApplicationImpl *This = (IDirectPlay8LobbiedApplicationImpl *)iface; + FIXME("(%p): stub\n", This); + return DPN_OK; +} + +static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_GetConnectionSettings(PDIRECTPLAY8LOBBIEDAPPLICATION iface, + CONST DPNHANDLE hConnection, + DPL_CONNECTION_SETTINGS* CONST pdplSessionInfo, + DWORD* pdwInfoSize, + CONST DWORD dwFlags) { + IDirectPlay8LobbiedApplicationImpl *This = (IDirectPlay8LobbiedApplicationImpl *)iface; + FIXME("(%p): stub\n", This); + return DPN_OK; +} + +static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_SetConnectionSettings(PDIRECTPLAY8LOBBIEDAPPLICATION iface, + CONST DPNHANDLE hConnection, + CONST DPL_CONNECTION_SETTINGS* CONST pdplSessionInfo, + CONST DWORD dwFlags) { + IDirectPlay8LobbiedApplicationImpl *This = (IDirectPlay8LobbiedApplicationImpl *)iface; + FIXME("(%p): stub\n", This); + return DPN_OK; +} + +static const IDirectPlay8LobbiedApplicationVtbl DirectPlay8LobbiedApplication_Vtbl = +{ + IDirectPlay8LobbiedApplicationImpl_QueryInterface, + IDirectPlay8LobbiedApplicationImpl_AddRef, + IDirectPlay8LobbiedApplicationImpl_Release, + IDirectPlay8LobbiedApplicationImpl_Initialize, + IDirectPlay8LobbiedApplicationImpl_RegisterProgram, + IDirectPlay8LobbiedApplicationImpl_UnRegisterProgram, + IDirectPlay8LobbiedApplicationImpl_Send, + IDirectPlay8LobbiedApplicationImpl_SetAppAvailable, + IDirectPlay8LobbiedApplicationImpl_UpdateStatus, + IDirectPlay8LobbiedApplicationImpl_Close, + IDirectPlay8LobbiedApplicationImpl_GetConnectionSettings, + IDirectPlay8LobbiedApplicationImpl_SetConnectionSettings +}; + + + +HRESULT DPNET_CreateDirectPlay8LobbiedApp(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) { + IDirectPlay8LobbiedApplicationImpl* app; + + TRACE("(%p, %s, %p)\n", punkOuter, debugstr_guid(riid), ppobj); + + app = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8LobbiedApplicationImpl)); + if (NULL == app) { + *ppobj = NULL; + return E_OUTOFMEMORY; + } + app->lpVtbl = &DirectPlay8LobbiedApplication_Vtbl; + app->ref = 0; /* will be inited with QueryInterface */ + return IDirectPlay8LobbiedApplicationImpl_QueryInterface ((PDIRECTPLAY8LOBBIEDAPPLICATION)app, riid, ppobj); +} diff --git a/dlls/dpnet/regsvr.c b/dlls/dpnet/regsvr.c index 42d5cfd2cfd..802faad02cf 100644 --- a/dlls/dpnet/regsvr.c +++ b/dlls/dpnet/regsvr.c @@ -30,6 +30,7 @@ #include "initguid.h" #include "dplay8.h" +#include "dplobby8.h" #include "wine/debug.h" @@ -543,6 +544,16 @@ static struct regsvr_coclass const coclass_list[] = { "DirectPlay8.Address.1", "DirectPlay8.Address" }, + { + &CLSID_DirectPlay8LobbiedApplication, + "DirectPlay8LobbiedApplication Object", + NULL, + "dpnet.dll", + "Both", + "DirectPlay8.LobbiedApplication.1", + "DirectPlay8.LobbiedApplication", + NULL + }, { NULL } /* list terminator */ };