ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wsdapi: Implement Get/SetRemoteAddress.

Browse Source 
Signed-off-by: Owen Rudge <orudge@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Owen Rudge 2017-06-26 22:35:45 +01:00 committed by Alexandre Julliard
parent 9ce9d73414
commit 7b3024a255
2 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dlls/wsdapi/msgparams.c
View File

@ -33,6 +33,7 @@ typedef struct IWSDMessageParametersImpl {
IWSDMessageParameters IWSDMessageParameters_iface; IWSDMessageParameters IWSDMessageParameters_iface;
LONG ref; LONG ref;
IWSDAddress *localAddress; IWSDAddress *localAddress;
IWSDAddress *remoteAddress;
} IWSDMessageParametersImpl; } IWSDMessageParametersImpl;
typedef struct IWSDUdpMessageParametersImpl { typedef struct IWSDUdpMessageParametersImpl {
@ -74,6 +75,11 @@ static ULONG WINAPI IWSDMessageParametersImpl_Release(IWSDMessageParameters *ifa
IWSDAddress_Release(This->localAddress); IWSDAddress_Release(This->localAddress);
} }
if (This->remoteAddress != NULL)
{
IWSDAddress_Release(This->remoteAddress);
}
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
} }
@ -126,14 +132,46 @@ static HRESULT WINAPI IWSDMessageParametersImpl_SetLocalAddress(IWSDMessageParam
static HRESULT WINAPI IWSDMessageParametersImpl_GetRemoteAddress(IWSDMessageParameters *This, IWSDAddress **ppAddress) static HRESULT WINAPI IWSDMessageParametersImpl_GetRemoteAddress(IWSDMessageParameters *This, IWSDAddress **ppAddress)
{ {
FIXME("(%p, %p)\n", This, ppAddress); IWSDMessageParametersImpl *impl = impl_from_IWSDMessageParameters(This);
return E_NOTIMPL;
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) static HRESULT WINAPI IWSDMessageParametersImpl_SetRemoteAddress(IWSDMessageParameters *This, IWSDAddress *pAddress)
{ {
FIXME("(%p, %p)\n", This, pAddress); IWSDMessageParametersImpl *impl = impl_from_IWSDMessageParameters(This);
return E_NOTIMPL;
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) static HRESULT WINAPI IWSDMessageParametersImpl_GetLowerParameters(IWSDMessageParameters *This, IWSDMessageParameters **ppTxParams)

12
dlls/wsdapi/tests/msgparams.c
View File

@ -142,11 +142,11 @@ static void RemoteAddress_tests(void)
ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n");
rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, NULL); 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); ok(returnedAddress == NULL, "GetRemoteAddress returned %p\n", returnedAddress);
rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, &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); ok(returnedAddress == NULL, "GetRemoteAddress returned %p\n", returnedAddress);
rc = WSDCreateUdpAddress(&origUdpAddress); rc = WSDCreateUdpAddress(&origUdpAddress);
@ -157,14 +157,14 @@ static void RemoteAddress_tests(void)
todo_wine ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); todo_wine ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc);
rc = IWSDUdpMessageParameters_SetRemoteAddress(udpMessageParams, (IWSDAddress *)origUdpAddress); 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); rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, &returnedAddress);
todo_wine ok(rc == S_OK, "GetRemoteAddress failed: %08x\n", rc); ok(rc == S_OK, "GetRemoteAddress failed: %08x\n", rc);
todo_wine ok(returnedAddress != NULL, "GetLocalAddress returned NULL\n"); ok(returnedAddress != NULL, "GetLocalAddress returned NULL\n");
/* Check if GetRemoteAddress returns the same object */ /* 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); ret = IWSDUdpMessageParameters_Release(udpMessageParams);
ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret); ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret);