system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-08 03:45:57 +00:00
Code Issues Projects Releases Wiki Activity

windowscodecs: Use standard C functions for memory allocation in metadataquery.c.

Browse Source
This commit is contained in:
Alex Henrie 2022-11-17 22:08:51 -07:00 committed by Alexandre Julliard
parent 81a432c356
commit 971548728c
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/windowscodecs/metadataquery.c
View File

@ -86,8 +86,8 @@ static ULONG WINAPI mqr_Release(IWICMetadataQueryReader *iface)
if (!ref)
{
IWICMetadataBlockReader_Release(This->block);
HeapFree(GetProcessHeap(), 0, This->root);
HeapFree(GetProcessHeap(), 0, This);
free(This->root);
free(This);
}
return ref;
}
@ -461,7 +461,7 @@ static HRESULT WINAPI mqr_GetMetadataByName(IWICMetadataQueryReader *iface, LPCW
len = lstrlenW(query) + 1;
if (This->root) len += lstrlenW(This->root);
full_query = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
full_query = malloc(len * sizeof(WCHAR));
full_query[0] = 0;
if (This->root)
lstrcpyW(full_query, This->root);
@ -591,7 +591,7 @@ static HRESULT WINAPI mqr_GetMetadataByName(IWICMetadataQueryReader *iface, LPCW
else
PropVariantClear(&new_value);
HeapFree(GetProcessHeap(), 0, full_query);
free(full_query);
return hr;
}
@ -730,7 +730,7 @@ HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, const W
{
QueryReader *obj;
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj));
obj = calloc(1, sizeof(*obj));
if (!obj)
return E_OUTOFMEMORY;
@ -740,7 +740,7 @@ HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, const W
IWICMetadataBlockReader_AddRef(mbr);
obj->block = mbr;
obj->root = root ? heap_strdupW(root) : NULL;
obj->root = wcsdup(root);
*out = &obj->IWICMetadataQueryReader_iface;
@ -804,8 +804,8 @@ static ULONG WINAPI mqw_Release(IWICMetadataQueryWriter *iface)
if (!ref)
{
IWICMetadataBlockWriter_Release(writer->block);
HeapFree(GetProcessHeap(), 0, writer->root);
HeapFree(GetProcessHeap(), 0, writer);
free(writer->root);
free(writer);
}
return ref;
}
@ -870,7 +870,7 @@ HRESULT MetadataQueryWriter_CreateInstance(IWICMetadataBlockWriter *mbw, const W
{
QueryWriter *obj;
obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj));
obj = calloc(1, sizeof(*obj));
if (!obj)
return E_OUTOFMEMORY;
@ -880,7 +880,7 @@ HRESULT MetadataQueryWriter_CreateInstance(IWICMetadataBlockWriter *mbw, const W
IWICMetadataBlockWriter_AddRef(mbw);
obj->block = mbw;
obj->root = root ? heap_strdupW(root) : NULL;
obj->root = wcsdup(root);
*out = &obj->IWICMetadataQueryWriter_iface;

10
dlls/windowscodecs/wincodecs_private.h
View File

@ -229,16 +229,6 @@ extern HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *, con
extern HRESULT MetadataQueryWriter_CreateInstance(IWICMetadataBlockWriter *, const WCHAR *, IWICMetadataQueryWriter **) DECLSPEC_HIDDEN;
extern HRESULT stream_initialize_from_filehandle(IWICStream *iface, HANDLE hfile) DECLSPEC_HIDDEN;
static inline WCHAR *heap_strdupW(const WCHAR *src)
{
WCHAR *dst;
SIZE_T len;
if (!src) return NULL;
len = (lstrlenW(src) + 1) * sizeof(WCHAR);
if ((dst = HeapAlloc(GetProcessHeap(), 0, len))) memcpy(dst, src, len);
return dst;
}
static inline const char *debug_wic_rect(const WICRect *rect)
{
if (!rect) return "(null)";