Owen Rudge : wsdapi: Implement Get/SetRemoteAddress.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7b3024a25504857abc8295a637e6569790bf628c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7b3024a25504857abc8295a637...

Author: Owen Rudge 
Date:   Mon Jun 26 22:35:45 2017 +0100

wsdapi: Implement Get/SetRemoteAddress.

Signed-off-by: Owen Rudge 
Signed-off-by: Alexandre Julliard

---

dlls/wsdapi/msgparams.c       | 46 +++++++++++++++++++++++++++++++++++++++----
 dlls/wsdapi/tests/msgparams.c | 12 +++++------
 2 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/dlls/wsdapi/msgparams.c b/dlls/wsdapi/msgparams.c
index 2c59e3a..6675fa5 100644
--- a/dlls/wsdapi/msgparams.c
+++ b/dlls/wsdapi/msgparams.c
@@ -33,6 +33,7 @@ typedef struct IWSDMessageParametersImpl {
     IWSDMessageParameters IWSDMessageParameters_iface;
     LONG                  ref;
     IWSDAddress           *localAddress;
+    IWSDAddress           *remoteAddress;
 } IWSDMessageParametersImpl;

typedef struct IWSDUdpMessageParametersImpl {
@@ -74,6 +75,11 @@ static ULONG WINAPI IWSDMessageParametersImpl_Release(IWSDMessageParameters *ifa
             IWSDAddress_Release(This->localAddress);
         }

+        if (This->remoteAddress != NULL)
+        {
+            IWSDAddress_Release(This->remoteAddress);
+        }
+
         HeapFree(GetProcessHeap(), 0, This);
     }

@@ -126,14 +132,46 @@ static HRESULT WINAPI IWSDMessageParametersImpl_SetLocalAddress(IWSDMessageParam

static HRESULT WINAPI IWSDMessageParametersImpl_GetRemoteAddress(IWSDMessageParameters *This, IWSDAddress **ppAddress)
 {
-    FIXME("(%p, %p)\n", This, ppAddress);
-    return E_NOTIMPL;
+    IWSDMessageParametersImpl *impl = impl_from_IWSDMessageParameters(This);
+
+    TRACE("(%p, %p)\n", impl, ppAddress);
+
+    if (ppAddress == NULL)
+    {
+        return E_POINTER;
+    }
+
+    if (impl->remoteAddress == NULL)
+    {
+        return E_ABORT;
+    }
+
+    *ppAddress = impl->remoteAddress;
+    IWSDAddress_AddRef(*ppAddress);
+
+    return S_OK;
 }

static HRESULT WINAPI IWSDMessageParametersImpl_SetRemoteAddress(IWSDMessageParameters *This, IWSDAddress *pAddress)
 {
-    FIXME("(%p, %p)\n", This, pAddress);
-    return E_NOTIMPL;
+    IWSDMessageParametersImpl *impl = impl_from_IWSDMessageParameters(This);
+
+    TRACE("(%p, %p)\n", impl, pAddress);
+
+    if (pAddress == NULL)
+    {
+        return E_POINTER;
+    }
+
+    if (impl->remoteAddress != NULL)
+    {
+        IWSDAddress_Release(impl->remoteAddress);
+    }
+
+    impl->remoteAddress = pAddress;
+    IWSDAddress_AddRef(pAddress);
+
+    return S_OK;
 }

static HRESULT WINAPI IWSDMessageParametersImpl_GetLowerParameters(IWSDMessageParameters *This, IWSDMessageParameters **ppTxParams)
diff --git a/dlls/wsdapi/tests/msgparams.c b/dlls/wsdapi/tests/msgparams.c
index a8f905d..55ca7f3 100644
--- a/dlls/wsdapi/tests/msgparams.c
+++ b/dlls/wsdapi/tests/msgparams.c
@@ -142,11 +142,11 @@ static void RemoteAddress_tests(void)
     ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n");

rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, NULL);
-    todo_wine ok(rc == E_POINTER, "GetRemoteAddress failed: %08x\n", rc);
+    ok(rc == E_POINTER, "GetRemoteAddress failed: %08x\n", rc);
     ok(returnedAddress == NULL, "GetRemoteAddress returned %p\n", returnedAddress);

rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, &returnedAddress);
-    todo_wine ok(rc == E_ABORT, "GetRemoteAddress failed: %08x\n", rc);
+    ok(rc == E_ABORT, "GetRemoteAddress failed: %08x\n", rc);
     ok(returnedAddress == NULL, "GetRemoteAddress returned %p\n", returnedAddress);

rc = WSDCreateUdpAddress(&origUdpAddress);
@@ -157,14 +157,14 @@ static void RemoteAddress_tests(void)
     todo_wine ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc);

rc = IWSDUdpMessageParameters_SetRemoteAddress(udpMessageParams, (IWSDAddress *)origUdpAddress);
-    todo_wine ok(rc == S_OK, "SetRemoteAddress failed: %08x\n", rc);
+    ok(rc == S_OK, "SetRemoteAddress failed: %08x\n", rc);

rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, &returnedAddress);
-    todo_wine ok(rc == S_OK, "GetRemoteAddress failed: %08x\n", rc);
-    todo_wine ok(returnedAddress != NULL, "GetLocalAddress returned NULL\n");
+    ok(rc == S_OK, "GetRemoteAddress failed: %08x\n", rc);
+    ok(returnedAddress != NULL, "GetLocalAddress returned NULL\n");

/* Check if GetRemoteAddress returns the same object */
-    todo_wine ok(returnedAddress == (IWSDAddress *)origUdpAddress, "returnedAddress != origUdpAddress\n");
+    ok(returnedAddress == (IWSDAddress *)origUdpAddress, "returnedAddress != origUdpAddress\n");

ret = IWSDUdpMessageParameters_Release(udpMessageParams);
     ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret);