From: Alistair Leslie-Hughes Subject: [4/4] dpnet: Correct usage of memcpy in GetComponentByName (try 5) Message-Id: Date: Fri, 6 Mar 2015 15:13:18 +1100 Hi, Changelog: dpnet: Correct usage of memcpy in GetComponentByName Best Regards Alistair Leslie-Hughes >From 91aab4f5848445c41b61de6a733aa125dc18424c Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 6 Mar 2015 09:05:56 +1100 Subject: [PATCH 09/10] Correct usage of memcpy in GetComponentByName --- dlls/dpnet/address.c | 6 +++--- dlls/dpnet/tests/address.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index ba644a2..defd894 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -348,13 +348,13 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByName(IDirectPlay8Add memcpy(pvBuffer, &entry->data.guid, sizeof(GUID)); break; case DPNA_DATATYPE_STRING: - memcpy(pvBuffer, &entry->data.string, entry->size); + memcpy(pvBuffer, entry->data.string, entry->size); break; case DPNA_DATATYPE_STRING_ANSI: - memcpy(pvBuffer, &entry->data.ansi, entry->size); + memcpy(pvBuffer, entry->data.ansi, entry->size); break; case DPNA_DATATYPE_BINARY: - memcpy(pvBuffer, &entry->data.binary, entry->size); + memcpy(pvBuffer, entry->data.binary, entry->size); break; } diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index 74d27ee..c7239c9 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -126,7 +126,7 @@ static void address_addcomponents(void) hr = IDirectPlay8Address_GetComponentByName(localaddr, DPNA_KEY_HOSTNAME, buffer, &size, &type); ok(hr == S_OK, "got 0x%08x\n", hr); ok(type == DPNA_DATATYPE_STRING, "incorrect type %d\n", type); - todo_wine ok(!lstrcmpW(buffer, localhost), "Invalid string: %s\n", wine_dbgstr_w(buffer)); + ok(!lstrcmpW(buffer, localhost), "Invalid string: %s\n", wine_dbgstr_w(buffer)); hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD)+2, DPNA_DATATYPE_DWORD); ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); -- 1.9.1