[PATCH 3/4] dmusic: Check wrong params when creating a port + tests.

Christian Costa titan.costa at gmail.com
Mon Apr 9 06:31:22 CDT 2012


---
 dlls/dmusic/dmusic.c       |   17 ++++++++++++-----
 dlls/dmusic/tests/dmusic.c |   10 ++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c
index 5e089d8..c58b4e9 100644
--- a/dlls/dmusic/dmusic.c
+++ b/dlls/dmusic/dmusic.c
@@ -176,12 +176,19 @@ static HRESULT WINAPI IDirectMusic8Impl_CreatePort (LPDIRECTMUSIC8 iface, REFCLS
 	GUID default_port;
 	const GUID *request_port = rclsidPort;
 
-	TRACE("(%p, %s, %p, %p, %p)\n", This, debugstr_dmguid(rclsidPort), pPortParams, ppPort, pUnkOuter);
-	if (TRACE_ON(dmusic))
-		dump_DMUS_PORTPARAMS(pPortParams);
+    TRACE("(%p, %s, %p, %p, %p)\n", This, debugstr_dmguid(rclsidPort), pPortParams, ppPort, pUnkOuter);
 
-	if(!rclsidPort)
-		return E_POINTER;
+    if (!rclsidPort)
+        return E_POINTER;
+    if (!pPortParams)
+        return E_INVALIDARG;
+    if (!ppPort)
+        return E_POINTER;
+    if (pUnkOuter)
+        return CLASS_E_NOAGGREGATION;
+
+    if (TRACE_ON(dmusic))
+        dump_DMUS_PORTPARAMS(pPortParams);
 
 	ZeroMemory(&PortCaps, sizeof(DMUS_PORTCAPS));
 	PortCaps.dwSize = sizeof(DMUS_PORTCAPS);
diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c
index 6853ad9..29ad642 100644
--- a/dlls/dmusic/tests/dmusic.c
+++ b/dlls/dmusic/tests/dmusic.c
@@ -66,6 +66,16 @@ static void test_dmusic(void)
     hr = IDirectMusic_SetDirectSound(dmusic, NULL, NULL);
     ok(hr == S_OK, "IDirectMusic_SetDirectSound returned: %x\n", hr);
 
+    /* Check wrong params */
+    hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, &port_params, &port, (IUnknown*)dmusic);
+    ok(hr == CLASS_E_NOAGGREGATION, "IDirectMusic_CreatePort returned: %x\n", hr);
+    hr = IDirectMusic_CreatePort(dmusic, NULL, &port_params, &port, NULL);
+    ok(hr == E_POINTER, "IDirectMusic_CreatePort returned: %x\n", hr);
+    hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, NULL, &port, NULL);
+    ok(hr == E_INVALIDARG, "IDirectMusic_CreatePort returned: %x\n", hr);
+    hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, &port_params, NULL, NULL);
+    ok(hr == E_POINTER, "IDirectMusic_CreatePort returned: %x\n", hr);
+
     /* Test creation of default port with GUID_NULL */
     hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, &port_params, &port, NULL);
     ok(hr == S_OK, "IDirectMusic_CreatePort returned: %x\n", hr);




More information about the wine-patches mailing list