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

wmiutils: Introduce memory allocation helpers.

This commit is contained in:
Hans Leidekker 2013-01-02 13:33:10 +01:00 committed by Alexandre Julliard
parent 63a89f9be2
commit 0ee1b888a2
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/wmiutils/path.c
View File

@ -61,8 +61,8 @@ static ULONG WINAPI path_Release(
if (!refs) if (!refs)
{ {
TRACE("destroying %p\n", path); TRACE("destroying %p\n", path);
HeapFree( GetProcessHeap(), 0, path->text ); heap_free( path->text );
HeapFree( GetProcessHeap(), 0, path ); heap_free( path );
} }
return refs; return refs;
} }
@ -103,8 +103,7 @@ static HRESULT WINAPI path_SetText(
if (uMode) FIXME("igoring mode %u\n", uMode); if (uMode) FIXME("igoring mode %u\n", uMode);
len = strlenW( pszPath ); len = strlenW( pszPath );
if (!(path->text = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) if (!(path->text = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY;
return E_OUTOFMEMORY;
strcpyW( path->text, pszPath ); strcpyW( path->text, pszPath );
path->len = len; path->len = len;
@ -382,7 +381,7 @@ HRESULT WbemPath_create( IUnknown *pUnkOuter, LPVOID *ppObj )
TRACE("%p, %p\n", pUnkOuter, ppObj); TRACE("%p, %p\n", pUnkOuter, ppObj);
if (!(path = HeapAlloc( GetProcessHeap(), 0, sizeof(*path) ))) return E_OUTOFMEMORY; if (!(path = heap_alloc( sizeof(*path) ))) return E_OUTOFMEMORY;
path->IWbemPath_iface.lpVtbl = &path_vtbl; path->IWbemPath_iface.lpVtbl = &path_vtbl;
path->refs = 1; path->refs = 1;

5
dlls/wmiutils/statuscode.c
View File

@ -59,7 +59,7 @@ static ULONG WINAPI status_code_Release(
if (!refs) if (!refs)
{ {
TRACE("destroying %p\n", status_code); TRACE("destroying %p\n", status_code);
HeapFree( GetProcessHeap(), 0, status_code ); heap_free( status_code );
} }
return refs; return refs;
} }
@ -138,8 +138,7 @@ HRESULT WbemStatusCodeText_create( IUnknown *pUnkOuter, LPVOID *ppObj )
TRACE("(%p,%p)\n", pUnkOuter, ppObj); TRACE("(%p,%p)\n", pUnkOuter, ppObj);
sc = HeapAlloc( GetProcessHeap(), 0, sizeof(*sc) ); if (!(sc = heap_alloc( sizeof(*sc) ))) return E_OUTOFMEMORY;
if (!sc) return E_OUTOFMEMORY;
sc->IWbemStatusCodeText_iface.lpVtbl = &status_code_vtbl; sc->IWbemStatusCodeText_iface.lpVtbl = &status_code_vtbl;
sc->refs = 1; sc->refs = 1;

11
dlls/wmiutils/wmiutils_private.h
View File

@ -18,3 +18,14 @@
HRESULT WbemPath_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemPath_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
HRESULT WbemStatusCodeText_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemStatusCodeText_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1);
static inline void *heap_alloc( size_t len )
{
return HeapAlloc( GetProcessHeap(), 0, len );
}
static inline BOOL heap_free( void *mem )
{
return HeapFree( GetProcessHeap(), 0, mem );
}