system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 11:34:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mscoree: Use standard C functions for memory allocation in assembly.c.

Browse source 
The big win here is getting rid of the reimplementation of wcsdup.
This commit is contained in:
Alex Henrie 2022-11-07 21:54:14 -07:00 committed by Alexandre Julliard
parent 06321ba57b
commit 15cbe49798
1 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
dlls/mscoree/assembly.c
View file

@ -79,20 +79,6 @@ struct tagASSEMBLY
METADATAHDR *metadatahdr; METADATAHDR *metadatahdr;
}; };
static inline LPWSTR strdupW(LPCWSTR src)
{
LPWSTR dest;
if (!src)
return NULL;
dest = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(WCHAR));
if (dest)
lstrcpyW(dest, src);
return dest;
}
static void* assembly_rva_to_va(ASSEMBLY *assembly, ULONG rva) static void* assembly_rva_to_va(ASSEMBLY *assembly, ULONG rva)
{ {
if (assembly->is_mapped_file) if (assembly->is_mapped_file)
@ -130,7 +116,7 @@ static HRESULT parse_metadata_header(ASSEMBLY *assembly, DWORD *hdrsz)
metadatahdr = (METADATAHDR *)ptr; metadatahdr = (METADATAHDR *)ptr;
assembly->metadatahdr = HeapAlloc(GetProcessHeap(), 0, sizeof(METADATAHDR)); assembly->metadatahdr = malloc(sizeof(METADATAHDR));
if (!assembly->metadatahdr) if (!assembly->metadatahdr)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
@ -210,13 +196,13 @@ HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file)
*out = NULL; *out = NULL;
assembly = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ASSEMBLY)); assembly = calloc(1, sizeof(ASSEMBLY));
if (!assembly) if (!assembly)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
assembly->is_mapped_file = TRUE; assembly->is_mapped_file = TRUE;
assembly->path = strdupW(file); assembly->path = wcsdup(file);
if (!assembly->path) if (!assembly->path)
{ {
hr = E_OUTOFMEMORY; hr = E_OUTOFMEMORY;
@ -264,7 +250,7 @@ HRESULT assembly_from_hmodule(ASSEMBLY **out, HMODULE hmodule)
*out = NULL; *out = NULL;
assembly = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ASSEMBLY)); assembly = calloc(1, sizeof(ASSEMBLY));
if (!assembly) if (!assembly)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
@ -292,9 +278,9 @@ HRESULT assembly_release(ASSEMBLY *assembly)
CloseHandle(assembly->hmap); CloseHandle(assembly->hmap);
CloseHandle(assembly->hfile); CloseHandle(assembly->hfile);
} }
HeapFree(GetProcessHeap(), 0, assembly->metadatahdr); free(assembly->metadatahdr);
HeapFree(GetProcessHeap(), 0, assembly->path); free(assembly->path);
HeapFree(GetProcessHeap(), 0, assembly); free(assembly);
return S_OK; return S_OK;
} }