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

dxdiagn: Convert the container linked list to a standard Wine list.

Browse Source
This commit is contained in:
Andrew Nguyen 2011-02-01 04:32:05 -06:00 committed by Alexandre Julliard
parent 99e36ffabd
commit a421adf0a0
2 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/dxdiagn/container.c
View File

@ -86,7 +86,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfChildContainers(PDXDIAGCON
static HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(PDXDIAGCONTAINER iface, DWORD dwIndex, LPWSTR pwszContainer, DWORD cchContainer) { static HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(PDXDIAGCONTAINER iface, DWORD dwIndex, LPWSTR pwszContainer, DWORD cchContainer) {
IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface;
IDxDiagContainerImpl_SubContainer* p = NULL; IDxDiagContainerImpl_SubContainer *p;
DWORD i = 0; DWORD i = 0;
TRACE("(%p, %u, %p, %u)\n", iface, dwIndex, pwszContainer, cchContainer); TRACE("(%p, %u, %p, %u)\n", iface, dwIndex, pwszContainer, cchContainer);
@ -95,15 +95,14 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(PDXDIAGCONTAI
return E_INVALIDARG; return E_INVALIDARG;
} }
p = This->subContainers; LIST_FOR_EACH_ENTRY(p, &This->subContainers, IDxDiagContainerImpl_SubContainer, entry)
while (NULL != p) { {
if (dwIndex == i) { if (dwIndex == i) {
TRACE("Found container name %s, copying string\n", debugstr_w(p->contName)); TRACE("Found container name %s, copying string\n", debugstr_w(p->contName));
lstrcpynW(pwszContainer, p->contName, cchContainer); lstrcpynW(pwszContainer, p->contName, cchContainer);
return (cchContainer <= strlenW(p->contName)) ? return (cchContainer <= strlenW(p->contName)) ?
DXDIAG_E_INSUFFICIENT_BUFFER : S_OK; DXDIAG_E_INSUFFICIENT_BUFFER : S_OK;
} }
p = p->next;
++i; ++i;
} }
@ -114,16 +113,16 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(PDXDIAGCONTAI
static HRESULT IDxDiagContainerImpl_GetChildContainerInternal(PDXDIAGCONTAINER iface, LPCWSTR pwszContainer, IDxDiagContainer** ppInstance) { static HRESULT IDxDiagContainerImpl_GetChildContainerInternal(PDXDIAGCONTAINER iface, LPCWSTR pwszContainer, IDxDiagContainer** ppInstance) {
IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface;
IDxDiagContainerImpl_SubContainer* p = NULL; IDxDiagContainerImpl_SubContainer *p;
p = This->subContainers; LIST_FOR_EACH_ENTRY(p, &This->subContainers, IDxDiagContainerImpl_SubContainer, entry)
while (NULL != p) { {
if (0 == lstrcmpW(p->contName, pwszContainer)) { if (0 == lstrcmpW(p->contName, pwszContainer)) {
*ppInstance = p->pCont; *ppInstance = p->pCont;
return S_OK; return S_OK;
} }
p = p->next;
} }
return E_INVALIDARG; return E_INVALIDARG;
} }
@ -273,8 +272,7 @@ HRESULT WINAPI IDxDiagContainerImpl_AddProp(PDXDIAGCONTAINER iface, LPCWSTR pwsz
HRESULT WINAPI IDxDiagContainerImpl_AddChildContainer(PDXDIAGCONTAINER iface, LPCWSTR pszContName, PDXDIAGCONTAINER pSubCont) { HRESULT WINAPI IDxDiagContainerImpl_AddChildContainer(PDXDIAGCONTAINER iface, LPCWSTR pszContName, PDXDIAGCONTAINER pSubCont) {
IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface;
IDxDiagContainerImpl_SubContainer* p = NULL; IDxDiagContainerImpl_SubContainer *pNew;
IDxDiagContainerImpl_SubContainer* pNew = NULL;
TRACE("(%p, %s, %p)\n", iface, debugstr_w(pszContName), pSubCont); TRACE("(%p, %s, %p)\n", iface, debugstr_w(pszContName), pSubCont);
@ -286,24 +284,16 @@ HRESULT WINAPI IDxDiagContainerImpl_AddChildContainer(PDXDIAGCONTAINER iface, LP
if (NULL == pNew) { if (NULL == pNew) {
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
pNew->pCont = pSubCont;
pNew->contName = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pszContName) + 1) * sizeof(WCHAR)); pNew->contName = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pszContName) + 1) * sizeof(WCHAR));
if (NULL == pNew->contName) { if (NULL == pNew->contName) {
HeapFree(GetProcessHeap(), 0, pNew) HeapFree(GetProcessHeap(), 0, pNew);
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
lstrcpyW(pNew->contName, pszContName); lstrcpyW(pNew->contName, pszContName);
pNew->next = NULL; pNew->pCont = pSubCont;
p = This->subContainers; list_add_tail(&This->subContainers, &pNew->entry);
if (NULL == p) {
This->subContainers = pNew;
} else {
while (NULL != p->next) {
p = p->next;
}
p->next = pNew;
}
++This->nSubContainers; ++This->nSubContainers;
return S_OK; return S_OK;
} }
@ -334,5 +324,6 @@ HRESULT DXDiag_CreateDXDiagContainer(REFIID riid, LPVOID *ppobj) {
} }
container->lpVtbl = &DxDiagContainer_Vtbl; container->lpVtbl = &DxDiagContainer_Vtbl;
container->ref = 0; /* will be inited with QueryInterface */ container->ref = 0; /* will be inited with QueryInterface */
list_init(&container->subContainers);
return IDxDiagContainerImpl_QueryInterface((PDXDIAGCONTAINER)container, riid, ppobj); return IDxDiagContainerImpl_QueryInterface((PDXDIAGCONTAINER)container, riid, ppobj);
} }

9
dlls/dxdiagn/dxdiag_private.h
View File

@ -27,6 +27,7 @@
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "wine/list.h"
#include "dxdiag.h" #include "dxdiag.h"
/* DXDiag Interfaces: */ /* DXDiag Interfaces: */
@ -55,9 +56,9 @@ struct IDxDiagProviderImpl {
/* ---------------- */ /* ---------------- */
typedef struct IDxDiagContainerImpl_SubContainer { typedef struct IDxDiagContainerImpl_SubContainer {
IDxDiagContainer* pCont; struct list entry;
WCHAR* contName; WCHAR *contName;
struct IDxDiagContainerImpl_SubContainer* next; IDxDiagContainer *pCont;
} IDxDiagContainerImpl_SubContainer; } IDxDiagContainerImpl_SubContainer;
typedef struct IDxDiagContainerImpl_Property { typedef struct IDxDiagContainerImpl_Property {
@ -76,7 +77,7 @@ struct IDxDiagContainerImpl {
LONG ref; LONG ref;
/* IDxDiagContainer fields */ /* IDxDiagContainer fields */
IDxDiagContainerImpl_Property* properties; IDxDiagContainerImpl_Property* properties;
IDxDiagContainerImpl_SubContainer* subContainers; struct list subContainers;
DWORD nProperties; DWORD nProperties;
DWORD nSubContainers; DWORD nSubContainers;
}; };