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

oleaut32: Use the default OLE allocator to allocate BSTRs. 

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Huw Davies 2016-01-22 09:39:21 +00:00 committed by Alexandre Julliard
parent eae84e7dde
commit 195f183ccd
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/oleaut32/oleaut.c
View File

@ -174,7 +174,7 @@ static bstr_t *alloc_bstr(size_t size)
} }
} }
ret = HeapAlloc(GetProcessHeap(), 0, bstr_alloc_size(size)); ret = CoTaskMemAlloc(bstr_alloc_size(size));
if(ret) if(ret)
ret->size = size; ret->size = size;
return ret; return ret;
@ -321,7 +321,7 @@ void WINAPI SysFreeString(BSTR str)
LeaveCriticalSection(&cs_bstr_cache); LeaveCriticalSection(&cs_bstr_cache);
} }
HeapFree(GetProcessHeap(), 0, bstr); CoTaskMemFree(bstr);
} }
/****************************************************************************** /******************************************************************************
@ -388,30 +388,25 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len)
{ {
/* Detect integer overflow. */ /* Detect integer overflow. */
if (len >= ((UINT_MAX-sizeof(WCHAR)-sizeof(DWORD))/sizeof(WCHAR))) if (len >= ((UINT_MAX-sizeof(WCHAR)-sizeof(DWORD))/sizeof(WCHAR)))
return 0; return FALSE;
if (*old!=NULL) { if (*old!=NULL) {
BSTR old_copy = *old;
DWORD newbytelen = len*sizeof(WCHAR); DWORD newbytelen = len*sizeof(WCHAR);
bstr_t *old_bstr = bstr_from_str(*old); bstr_t *old_bstr = bstr_from_str(*old);
bstr_t *bstr = HeapReAlloc(GetProcessHeap(), 0, old_bstr, bstr_alloc_size(newbytelen)); bstr_t *bstr = CoTaskMemRealloc(old_bstr, bstr_alloc_size(newbytelen));
if (!bstr) return FALSE;
*old = bstr->u.str; *old = bstr->u.str;
bstr->size = newbytelen; bstr->size = newbytelen;
/* Subtle hidden feature: The old string data is still there /* The old string data is still there when str is NULL */
* when 'in' is NULL! if (str && old_bstr->u.str != str) memmove(bstr->u.str, str, newbytelen);
* Some Microsoft program needs it. bstr->u.str[len] = 0;
* FIXME: Is it a sideeffect of BSTR caching?
*/
if (str && old_copy!=str) memmove(*old, str, newbytelen);
(*old)[len] = 0;
} else { } else {
/*
* Allocate the new string
*/
*old = SysAllocStringLen(str, len); *old = SysAllocStringLen(str, len);
} }
return 1; return TRUE;
} }
/****************************************************************************** /******************************************************************************