dpvoice: Add DirectPlay Voice Test (try 3)
Alistair Leslie-Hughes
leslie_alistair at hotmail.com
Wed Sep 24 20:21:27 CDT 2014
Hi,
Changelog:
dpvoice: Add DirectPlay Voice Test
Best Regards
Alistair Leslie-Hughes
-------------- next part --------------
>From 9d4bedbc872ffd68670b2a008878820588f56e12 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Fri, 12 Sep 2014 11:02:42 +1000
Subject: [PATCH] Add DirectPlay Voice Test
To: wine-patches <wine-patches at winehq.org>
---
configure | 1 +
configure.ac | 1 +
dlls/dpvoice/tests/Makefile.in | 5 +
dlls/dpvoice/tests/voice.c | 342 +++++++++++++++++++++++++++++++++++++++++
4 files changed, 349 insertions(+)
create mode 100644 dlls/dpvoice/tests/Makefile.in
create mode 100644 dlls/dpvoice/tests/voice.c
diff --git a/configure b/configure
index 73b114f..4279f61 100755
--- a/configure
+++ b/configure
@@ -16952,6 +16952,7 @@ wine_fn_config_test dlls/dpnet/tests dpnet_test
wine_fn_config_dll dpnhpast enable_dpnhpast
wine_fn_config_dll dpnlobby enable_dpnlobby
wine_fn_config_dll dpvoice enable_dpvoice clean
+wine_fn_config_test dlls/dpvoice/tests dpvoice_test
wine_fn_config_dll dpwsockx enable_dpwsockx
wine_fn_config_dll drmclien enable_drmclien
wine_fn_config_dll dsound enable_dsound clean,implib
diff --git a/configure.ac b/configure.ac
index 17ff399..f1f721d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2861,6 +2861,7 @@ WINE_CONFIG_TEST(dlls/dpnet/tests)
WINE_CONFIG_DLL(dpnhpast)
WINE_CONFIG_DLL(dpnlobby)
WINE_CONFIG_DLL(dpvoice,,[clean])
+WINE_CONFIG_TEST(dlls/dpvoice/tests)
WINE_CONFIG_DLL(dpwsockx)
WINE_CONFIG_DLL(drmclien)
WINE_CONFIG_DLL(dsound,,[clean,implib])
diff --git a/dlls/dpvoice/tests/Makefile.in b/dlls/dpvoice/tests/Makefile.in
new file mode 100644
index 0000000..04b3a5c
--- /dev/null
+++ b/dlls/dpvoice/tests/Makefile.in
@@ -0,0 +1,5 @@
+TESTDLL = dpvoice.dll
+IMPORTS = uuid dpnet ole32 user32
+
+C_SRCS = \
+ voice.c
diff --git a/dlls/dpvoice/tests/voice.c b/dlls/dpvoice/tests/voice.c
new file mode 100644
index 0000000..4d950bd
--- /dev/null
+++ b/dlls/dpvoice/tests/voice.c
@@ -0,0 +1,342 @@
+/*
+ * DirectPlay Voice Client Interface
+ *
+ * Copyright (C) 2014 Alistair Leslie-Hughes
+ *
+ * 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
+ */
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <stdio.h>
+
+#include <initguid.h>
+#include <dplay8.h>
+#include <dvoice.h>
+#include "wine/test.h"
+
+static IDirectPlayVoiceClient *vclient = NULL;
+static IDirectPlayVoiceServer *vserver = NULL;
+static IDirectPlay8Server *dpserver = NULL;
+static IDirectPlay8Client *dpclient = NULL;
+static BOOL HasConnected = FALSE;
+static DWORD port = 8888;
+static HANDLE connected = NULL;
+
+static const GUID appguid = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa6 } };
+static WCHAR sessionname[] = {'w','i','n','e','g','a','m','e','s','s','e','r','v','e','r',0};
+static WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0};
+
+
+static HRESULT WINAPI DirectPlayMessageHandler(void *lpvUserContext, DWORD dwMessageId, void *lpMessage)
+{
+ trace("msgid: 0x%08x\n", dwMessageId);
+ return S_OK;
+}
+
+static HRESULT WINAPI DirectPlayClientMessageHandler(void *lpvUserContext, DWORD dwMessageId, void *lpMessage)
+{
+ trace("cmsgid: 0x%08x\n", dwMessageId);
+ switch(dwMessageId)
+ {
+ case DPN_MSGID_CONNECT_COMPLETE:
+ {
+ PDPNMSG_CONNECT_COMPLETE completemsg;
+ completemsg = (PDPNMSG_CONNECT_COMPLETE)lpMessage;
+
+ trace("DPN_MSGID_CONNECT_COMPLETE code: 0x%08x\n", completemsg->hResultCode);
+ SetEvent(connected);
+ break;
+ }
+ }
+
+ return S_OK;
+}
+
+static HRESULT CALLBACK DirectPlayVoiceServerMessageHandler(void *lpvUserContext, DWORD dwMessageId, void *lpMessage)
+{
+ trace("vserver: 0x%08x\n", dwMessageId);
+ return S_OK;
+}
+
+static HRESULT CALLBACK DirectPlayVoiceClientMessageHandler(void *lpvUserContext, DWORD dwMessageId, void *lpMessage)
+{
+ trace("cserver: 0x%08x\n", dwMessageId);
+
+ return S_OK;
+}
+
+static BOOL test_init_dpvoice_server(void)
+{
+ HRESULT hr;
+
+ hr = CoCreateInstance(&CLSID_DirectPlayVoiceServer, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlayVoiceServer, (void **)&vserver);
+ if(hr == S_OK)
+ {
+ DVSESSIONDESC dvSessionDesc;
+ IDirectPlay8Address *localaddr = NULL;
+ DPN_APPLICATION_DESC dpnAppDesc;
+
+ hr = CoCreateInstance(&CLSID_DirectPlay8Server, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Server, (void **)&dpserver);
+ ok(hr == S_OK, "CoCreateInstance failed with 0x%08x\n", hr);
+
+ hr = IDirectPlay8Server_Initialize(dpserver, NULL, DirectPlayMessageHandler, 0);
+ ok(hr == S_OK, "Initialize failed with 0x%08x\n", hr);
+
+ hr = CoCreateInstance(&CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (void **)&localaddr);
+ ok(hr == S_OK, "CoCreateInstance failed with 0x%08x\n", hr);
+
+ hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP);
+ ok(hr == S_OK, "SetSP with 0x%08x\n", hr);
+
+ hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, localhost, (lstrlenW(localhost)+1)*sizeof(WCHAR),
+ DPNA_DATATYPE_STRING );
+ ok(hr == S_OK, "AddComponent(addr) with 0x%08x\n", hr);
+
+ hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(port), DPNA_DATATYPE_DWORD);
+ ok(hr == S_OK, "AddComponent(port)) with 0x%08x\n", hr);
+
+ memset(&dpnAppDesc, 0, sizeof(DPN_APPLICATION_DESC) );
+ dpnAppDesc.dwSize = sizeof( DPN_APPLICATION_DESC );
+ dpnAppDesc.dwFlags = DPNSESSION_CLIENT_SERVER;
+ dpnAppDesc.guidApplication = appguid;
+ dpnAppDesc.pwszSessionName = sessionname;
+
+ hr = IDirectPlay8Server_Host(dpserver, &dpnAppDesc, &localaddr, 1, NULL, NULL, NULL, 0 );
+ todo_wine ok(hr == S_OK, "Host failed with 0x%08x\n", hr);
+
+ hr = IDirectPlayVoiceServer_Initialize(vserver, NULL, &DirectPlayVoiceServerMessageHandler, NULL, 0, 0);
+ todo_wine ok(hr == DVERR_NOTRANSPORT, "Initialize failed with 0x%08x\n", hr);
+
+ hr = IDirectPlayVoiceServer_Initialize(vserver, (IUnknown*)dpserver, &DirectPlayVoiceServerMessageHandler, NULL, 0, 0);
+ todo_wine ok(hr == S_OK, "Initialize failed with 0x%08x\n", hr);
+
+ memset( &dvSessionDesc, 0, sizeof(DVSESSIONDESC) );
+ dvSessionDesc.dwSize = sizeof( DVSESSIONDESC );
+ dvSessionDesc.dwBufferAggressiveness = DVBUFFERAGGRESSIVENESS_DEFAULT;
+ dvSessionDesc.dwBufferQuality = DVBUFFERQUALITY_DEFAULT;
+ dvSessionDesc.dwFlags = 0;
+ dvSessionDesc.dwSessionType = DVSESSIONTYPE_MIXING;
+ dvSessionDesc.guidCT = DPVCTGUID_DEFAULT;
+
+ hr = IDirectPlayVoiceServer_StartSession(vserver, &dvSessionDesc, 0);
+ todo_wine ok(hr == S_OK, "StartSession failed with 0x%08x\n", hr);
+
+ if(localaddr)
+ IDirectPlay8Address_Release(localaddr);
+ }
+ else
+ {
+ /* Everything after Windows XP doesnt have dpvoice installed. */
+ win_skip("IDirectPlayVoiceServer not supported on thie platform\n");
+ }
+
+ return vserver != NULL;
+}
+
+static BOOL test_init_dpvoice_client(void)
+{
+ HRESULT hr;
+ WCHAR player[] = {'w','i','n','e','u','s','e','r',0};
+
+ hr = CoCreateInstance(&CLSID_DirectPlayVoiceClient, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlayVoiceClient, (void **)&vclient);
+ if(hr == S_OK)
+ {
+ DVSOUNDDEVICECONFIG soundDeviceConfig;
+ DVCLIENTCONFIG clientConfig;
+ IDirectPlay8Address *localaddr = NULL;
+ IDirectPlay8Address *hostaddr = NULL;
+ DPN_PLAYER_INFO playerinfo;
+ DPN_APPLICATION_DESC appdesc;
+ DPNHANDLE asyncop;
+
+ connected = CreateEventA(NULL, FALSE, FALSE, NULL);
+
+ hr = CoCreateInstance(&CLSID_DirectPlay8Client, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Client, (void **)&dpclient);
+ ok(hr == S_OK, "CoCreateInstance failed with 0x%08x\n", hr);
+
+ hr = IDirectPlay8Client_Initialize(dpclient, NULL, DirectPlayClientMessageHandler, 0);
+ ok(hr == S_OK, "Initialize failed with 0x%08x\n", hr);
+
+ hr = CoCreateInstance(&CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (void **)&hostaddr);
+ ok(hr == S_OK, "CoCreateInstance failed with 0x%08x\n", hr);
+
+ hr = IDirectPlay8Address_SetSP(hostaddr, &CLSID_DP8SP_TCPIP);
+ ok(hr == S_OK, "SetSP with 0x%08x\n", hr);
+
+ hr = CoCreateInstance(&CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (void **)&localaddr);
+ ok(hr == S_OK, "CoCreateInstance failed with 0x%08x\n", hr);
+
+ hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP);
+ ok(hr == S_OK, "SetSP with 0x%08x\n", hr);
+
+ hr = IDirectPlay8Address_AddComponent(hostaddr, DPNA_KEY_HOSTNAME, localhost, (lstrlenW(localhost)+1)*sizeof(WCHAR),
+ DPNA_DATATYPE_STRING );
+ ok(hr == S_OK, "AddComponent(addr) with 0x%08x\n", hr);
+
+ hr = IDirectPlay8Address_AddComponent(hostaddr, DPNA_KEY_PORT, &port, sizeof(port), DPNA_DATATYPE_DWORD);
+ ok(hr == S_OK, "AddComponent(port)) with 0x%08x\n", hr);
+
+ memset( &playerinfo, 0, sizeof(DPN_PLAYER_INFO) );
+ playerinfo.dwSize = sizeof(DPN_PLAYER_INFO);
+ playerinfo.dwInfoFlags = DPNINFO_NAME;
+ playerinfo.pwszName = player;
+
+ hr = IDirectPlay8Client_SetClientInfo(dpclient, &playerinfo, NULL, NULL, DPNOP_SYNC);
+ ok(hr == S_OK, "SetClientInfo with 0x%08x\n", hr);
+
+ memset( &appdesc, 0, sizeof(DPN_APPLICATION_DESC));
+ appdesc.dwSize = sizeof( DPN_APPLICATION_DESC );
+ appdesc.guidApplication = appguid;
+
+ hr = IDirectPlay8Client_Connect(dpclient, &appdesc, hostaddr, localaddr, NULL, NULL, NULL, 0,
+ NULL, &asyncop, DPNCONNECT_OKTOQUERYFORADDRESSING);
+ ok(hr == S_OK || hr == DPNSUCCESS_PENDING, "Connect with 0x%08x\n", hr);
+
+ WaitForSingleObject(connected, 5000);
+
+ hr = IDirectPlayVoiceClient_Initialize(vclient, (IUnknown*)dpclient, DirectPlayVoiceClientMessageHandler, NULL, 0, 0 );
+ todo_wine ok(hr == S_OK, "Connect failed with 0x%08x\n", hr);
+
+ soundDeviceConfig.dwSize = sizeof(soundDeviceConfig);
+ soundDeviceConfig.dwFlags = 0;
+ soundDeviceConfig.guidPlaybackDevice = DSDEVID_DefaultVoicePlayback;
+ soundDeviceConfig.lpdsPlaybackDevice = NULL;
+ soundDeviceConfig.guidCaptureDevice = DSDEVID_DefaultVoiceCapture;
+ soundDeviceConfig.lpdsCaptureDevice = NULL;
+ soundDeviceConfig.hwndAppWindow = GetDesktopWindow();
+ soundDeviceConfig.lpdsMainBuffer = NULL;
+ soundDeviceConfig.dwMainBufferFlags = 0;
+ soundDeviceConfig.dwMainBufferPriority = 0;
+
+ memset(&clientConfig, 0, sizeof(clientConfig));
+ clientConfig.dwSize = sizeof(clientConfig);
+ clientConfig.dwFlags = DVCLIENTCONFIG_AUTOVOICEACTIVATED | DVCLIENTCONFIG_AUTORECORDVOLUME;
+ clientConfig.lPlaybackVolume = DVPLAYBACKVOLUME_DEFAULT;
+ clientConfig.dwBufferQuality = DVBUFFERQUALITY_DEFAULT;
+ clientConfig.dwBufferAggressiveness = DVBUFFERAGGRESSIVENESS_DEFAULT;
+ clientConfig.dwThreshold = DVTHRESHOLD_UNUSED;
+ clientConfig.lRecordVolume = DVRECORDVOLUME_LAST;
+ clientConfig.dwNotifyPeriod = 0;
+
+ /* Connect to the voice session */
+ hr = IDirectPlayVoiceClient_Connect(vclient, &soundDeviceConfig, &clientConfig, DVFLAGS_SYNC);
+ if(hr == DVERR_RUNSETUP)
+ {
+ IDirectPlayVoiceTest *voicetest;
+
+ /* See if we can get the default values from the registry and try again. */
+ hr = CoCreateInstance(&CLSID_DirectPlayVoiceTest, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlayVoiceTest, (void **)&voicetest);
+ todo_wine ok(hr == S_OK, "CoCreateInstance failed with 0x%08x\n", hr);
+ if(hr == S_OK)
+ {
+ hr = IDirectPlayVoiceTest_CheckAudioSetup(voicetest, &DSDEVID_DefaultVoicePlayback, &DSDEVID_DefaultVoiceCapture,
+ NULL, DVFLAGS_QUERYONLY);
+ todo_wine ok(hr == S_OK || hr == DVERR_RUNSETUP, "CheckAudioSetup failed with 0x%08x\n", hr);
+ if(hr == S_OK)
+ {
+ hr = IDirectPlayVoiceClient_Connect(vclient, &soundDeviceConfig, &clientConfig, DVFLAGS_SYNC);
+ todo_wine ok(hr == S_OK, "Voice Connect failed with 0x%08x\n", hr);
+ }
+ else
+ {
+ win_skip("DirectPlayVoice not setup.\n");
+ }
+
+ IDirectPlayVoiceTest_Release(voicetest);
+ }
+ }
+
+ HasConnected = (hr == S_OK);
+ if(!HasConnected)
+ {
+ IDirectPlayVoiceClient_Release(vclient);
+ vclient = NULL;
+ }
+
+ if(hostaddr)
+ IDirectPlay8Address_Release(hostaddr);
+
+ if(localaddr)
+ IDirectPlay8Address_Release(localaddr);
+
+ CloseHandle(connected);
+ }
+ else
+ {
+ /* Everything after Windows XP doesnt have dpvoice installed. */
+ win_skip("IDirectPlayVoiceClient not supported on thie platform\n");
+ }
+
+ return vclient != NULL;
+}
+
+static void test_cleanup_dpvoice(void)
+{
+ HRESULT hr;
+
+ if(vclient)
+ {
+ if(HasConnected)
+ {
+ hr = IDirectPlayVoiceClient_Disconnect(vclient, 0);
+ todo_wine ok(hr == S_OK || hr == DV_PENDING, "Disconnect failed with 0x%08x\n", hr);
+ }
+ IDirectPlayVoiceClient_Release(vclient);
+ }
+
+ if(dpclient)
+ {
+ hr = IDirectPlay8Client_Close(dpclient, 0);
+ ok(hr == S_OK, "IDirectPlay8Client_Close failed with 0x%08x\n", hr);
+
+ IDirectPlay8Client_Release(dpclient);
+ }
+
+ if(vserver)
+ {
+ hr = IDirectPlayVoiceServer_StopSession(vserver, 0);
+ todo_wine ok(hr == S_OK, "StopSession failed with 0x%08x\n", hr);
+
+ IDirectPlayVoiceServer_Release(vserver);
+ }
+
+ if(dpserver)
+ {
+ hr = IDirectPlay8Server_Close(dpserver, 0);
+ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
+
+ IDirectPlay8Server_Release(dpserver);
+ }
+}
+
+START_TEST(voice)
+{
+ HRESULT hr;
+
+ hr = CoInitialize(0);
+ ok(hr == S_OK, "failed to init com\n");
+ if(hr != S_OK)
+ return;
+
+ if(test_init_dpvoice_server() && test_init_dpvoice_client())
+ {
+ /* TODO */
+ }
+
+ test_cleanup_dpvoice();
+
+ CoUninitialize();
+}
--
1.9.1
More information about the wine-patches
mailing list