[3/3] dpnet: Convert Address components to use a list
Alistair Leslie-Hughes
leslie_alistair at hotmail.com
Wed Feb 25 21:32:07 CST 2015
Hi,
Changelog:
dpnet: Convert Address components to use a list
Best Regards
Alistair Leslie-Hughes
-------------- next part --------------
>From 5e8aab2c460198f0e491c0a864930c1955f6d3fa Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Thu, 26 Feb 2015 14:22:31 +1100
Subject: [PATCH 8/8] Convert Address components to use a list
---
dlls/dpnet/address.c | 74 +++++++++++++++++++++++++++++++++++++++-------
dlls/dpnet/dpnet_private.h | 3 +-
2 files changed, 66 insertions(+), 11 deletions(-)
diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c
index 0699c21..80cc876 100644
--- a/dlls/dpnet/address.c
+++ b/dlls/dpnet/address.c
@@ -44,11 +44,41 @@ static inline void *heap_alloc(size_t len)
return HeapAlloc(GetProcessHeap(), 0, len);
}
+static inline void *heap_realloc(void *mem, size_t len)
+{
+ return HeapReAlloc( GetProcessHeap(), 0, mem, len);
+}
+
static inline BOOL heap_free(void *mem)
{
return HeapFree(GetProcessHeap(), 0, mem);
}
+static BOOL add_component(IDirectPlay8AddressImpl *This, struct component *item)
+{
+ if (!This->comp_count)
+ This->components = heap_alloc( sizeof(struct component *) * This->comp_count+1 );
+ else
+ {
+ struct component **temp;
+ temp = heap_realloc(This->components, sizeof(struct component *) * This->comp_count+1 );
+ if(!temp)
+ {
+ return FALSE;
+ }
+ This->components = temp;
+ }
+
+ if(This->components)
+ {
+ This->components[This->comp_count] = item;
+ This->comp_count++;
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
static inline LPWSTR heap_strdupW(LPCWSTR str)
{
LPWSTR ret = NULL;
@@ -112,10 +142,13 @@ static ULONG WINAPI IDirectPlay8AddressImpl_Release(IDirectPlay8Address *iface)
if (!ref)
{
- struct component *entry, *entry2;
+ DWORD i;
+ struct component *entry;
- LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &This->components, struct component, entry)
+ for(i=0; i < This->comp_count; i++)
{
+ entry = This->components[i];
+
switch(entry->type)
{
case DPNA_DATATYPE_STRING:
@@ -133,6 +166,7 @@ static ULONG WINAPI IDirectPlay8AddressImpl_Release(IDirectPlay8Address *iface)
heap_free(entry);
}
+ heap_free(This->components);
heap_free(This);
}
return ref;
@@ -181,6 +215,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_Duplicate(IDirectPlay8Address *ifa
IDirectPlay8Address **ppdpaNewAddress)
{
IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface);
+ struct component *entry;
IDirectPlay8Address *dup;
HRESULT hr;
@@ -193,13 +228,15 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_Duplicate(IDirectPlay8Address *ifa
if(hr == S_OK)
{
IDirectPlay8AddressImpl *DupThis = impl_from_IDirectPlay8Address(dup);
- struct component *entry;
+ DWORD i;
DupThis->SP_guid = This->SP_guid;
DupThis->init = This->init;
- LIST_FOR_EACH_ENTRY(entry, &This->components, struct component, entry)
+ for(i=0; i < This->comp_count; i++)
{
+ entry = This->components[i];
+
hr = IDirectPlay8Address_AddComponent(dup, entry->name, &entry->data, entry->size, entry->type);
if(hr != S_OK)
ERR("Failed to copy component: %s - 0x%08x\n", debugstr_w(entry->name), hr);
@@ -309,7 +346,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetNumComponents(IDirectPlay8Addre
if(!pdwNumComponents)
return DPNERR_INVALIDPOINTER;
- *pdwNumComponents = list_count(&This->components);
+ *pdwNumComponents = This->comp_count;
return DPN_OK;
}
@@ -319,14 +356,17 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByName(IDirectPlay8Add
{
IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface);
struct component *entry;
+ DWORD i;
TRACE("(%p)->(%p %p %p %p)\n", This, pwszName, pvBuffer, pdwBufferSize, pdwDataType);
if(!pwszName || !pdwBufferSize || !pdwDataType || (!pvBuffer && pdwBufferSize))
return E_POINTER;
- LIST_FOR_EACH_ENTRY(entry, &This->components, struct component, entry)
+ for(i=0; i < This->comp_count; i++)
{
+ entry = This->components[i];
+
if (lstrcmpW(pwszName, entry->name) == 0)
{
TRACE("Found %s\n", debugstr_w(pwszName));
@@ -382,14 +422,17 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address *
IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface);
struct component *entry;
BOOL found = FALSE;
+ DWORD i;
TRACE("(%p, %s, %p, %u, %x): stub\n", This, debugstr_w(pwszName), lpvData, dwDataSize, dwDataType);
if (NULL == lpvData)
return DPNERR_INVALIDPOINTER;
- LIST_FOR_EACH_ENTRY(entry, &This->components, struct component, entry)
+ for(i=0; i < This->comp_count; i++)
{
+ entry = This->components[i];
+
if (lstrcmpW(pwszName, entry->name) == 0)
{
TRACE("Found %s\n", debugstr_w(pwszName));
@@ -403,10 +446,23 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address *
{
/* Create a new one */
entry = heap_alloc(sizeof(struct component));
+ if(!entry)
+ return E_OUTOFMEMORY;
+
entry->name = heap_strdupW(pwszName);
+ if(!entry->name)
+ {
+ heap_free(entry);
+ return E_OUTOFMEMORY;
+ }
entry->type = dwDataType;
- list_add_tail(&This->components, &entry->entry);
+ if(!add_component(This, entry))
+ {
+ heap_free(entry->name);
+ heap_free(entry);
+ return E_OUTOFMEMORY;
+ }
}
switch (dwDataType)
@@ -519,8 +575,6 @@ HRESULT DPNET_CreateDirectPlay8Address(IClassFactory *iface, IUnknown *pUnkOuter
client->IDirectPlay8Address_iface.lpVtbl = &DirectPlay8Address_Vtbl;
client->ref = 1;
- list_init(&client->components);
-
ret = IDirectPlay8AddressImpl_QueryInterface(&client->IDirectPlay8Address_iface, riid, ppobj);
IDirectPlay8AddressImpl_Release(&client->IDirectPlay8Address_iface);
diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h
index 1ed4f25..99fba41 100644
--- a/dlls/dpnet/dpnet_private.h
+++ b/dlls/dpnet/dpnet_private.h
@@ -91,7 +91,8 @@ struct IDirectPlay8AddressImpl
GUID SP_guid;
BOOL init;
- struct list components;
+ struct component **components;
+ DWORD comp_count;
};
/*****************************************************************************
--
1.9.1
More information about the wine-patches
mailing list