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

dxdiagn: Avoid zeroing memory in container functions.

This commit is contained in:
Andrew Nguyen 2011-02-01 04:31:47 -06:00 committed by Alexandre Julliard
parent efbe695147
commit 99e36ffabd
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/dxdiagn/container.c
View File

@ -244,13 +244,17 @@ HRESULT WINAPI IDxDiagContainerImpl_AddProp(PDXDIAGCONTAINER iface, LPCWSTR pwsz
return E_INVALIDARG; return E_INVALIDARG;
} }
pNew = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDxDiagContainerImpl_Property)); pNew = HeapAlloc(GetProcessHeap(), 0, sizeof(IDxDiagContainerImpl_Property));
if (NULL == pNew) { if (NULL == pNew) {
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
VariantInit(&pNew->v); VariantInit(&pNew->v);
VariantCopy(&pNew->v, pVarProp); VariantCopy(&pNew->v, pVarProp);
pNew->vName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (lstrlenW(pwszPropName) + 1) * sizeof(WCHAR)); pNew->vName = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pwszPropName) + 1) * sizeof(WCHAR));
if (NULL == pNew->vName) {
HeapFree(GetProcessHeap(), 0, pNew);
return E_OUTOFMEMORY;
}
lstrcpyW(pNew->vName, pwszPropName); lstrcpyW(pNew->vName, pwszPropName);
pNew->next = NULL; pNew->next = NULL;
@ -278,12 +282,16 @@ HRESULT WINAPI IDxDiagContainerImpl_AddChildContainer(PDXDIAGCONTAINER iface, LP
return E_INVALIDARG; return E_INVALIDARG;
} }
pNew = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDxDiagContainerImpl_SubContainer)); pNew = HeapAlloc(GetProcessHeap(), 0, sizeof(IDxDiagContainerImpl_SubContainer));
if (NULL == pNew) { if (NULL == pNew) {
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
pNew->pCont = pSubCont; pNew->pCont = pSubCont;
pNew->contName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (lstrlenW(pszContName) + 1) * sizeof(WCHAR)); pNew->contName = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pszContName) + 1) * sizeof(WCHAR));
if (NULL == pNew->contName) {
HeapFree(GetProcessHeap(), 0, pNew)
return E_OUTOFMEMORY;
}
lstrcpyW(pNew->contName, pszContName); lstrcpyW(pNew->contName, pszContName);
pNew->next = NULL; pNew->next = NULL;