From: Alistair Leslie-Hughes Subject: [3/3] dpnet: Always update Component type since it can change (try 3) Message-Id: Date: Thu, 5 Mar 2015 19:55:01 +1100 Hi, Rebased Changelog: dpnet: Always update Component type since it can change Best Regards Alistair Leslie-Hughes >From 954f33e0ee5596704dee1e4806778698c34ff789 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 5 Mar 2015 19:53:03 +1100 Subject: [PATCH 8/8] Always update type since it might change --- dlls/dpnet/address.c | 2 +- dlls/dpnet/tests/address.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 6c91f48..ba644a2 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -442,7 +442,6 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * /* Create a new one */ entry = heap_alloc(sizeof(struct component)); entry->name = heap_strdupW(pwszName); - entry->type = dwDataType; list_add_tail(&This->components, &entry->entry); } @@ -472,6 +471,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * break; } + entry->type = dwDataType; entry->size = dwDataSize; return DPN_OK; diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index 30f65b7..74d27ee 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -125,7 +125,7 @@ static void address_addcomponents(void) size = sizeof(buffer); hr = IDirectPlay8Address_GetComponentByName(localaddr, DPNA_KEY_HOSTNAME, buffer, &size, &type); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(type == DPNA_DATATYPE_STRING, "incorrect type %d\n", type); + ok(type == DPNA_DATATYPE_STRING, "incorrect type %d\n", type); todo_wine 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); -- 2.1.4