marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ole32: Use proper allocators for storing description in ErrorInfoImpl.

oldstable
Jacek Caban 2012-07-19 11:49:22 +02:00 committed by Alexandre Julliard
parent 4843f031f9
commit cd1f67ee24
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/ole32/errorinfo.c
View File

@ -156,7 +156,7 @@ typedef struct ErrorInfoImpl
GUID m_Guid; GUID m_Guid;
WCHAR *source; WCHAR *source;
BSTR bstrDescription; WCHAR *description;
BSTR bstrHelpFile; BSTR bstrHelpFile;
DWORD m_dwHelpContext; DWORD m_dwHelpContext;
} ErrorInfoImpl; } ErrorInfoImpl;
@ -230,7 +230,7 @@ static ULONG WINAPI IErrorInfoImpl_Release(
TRACE("-- destroying IErrorInfo(%p)\n",This); TRACE("-- destroying IErrorInfo(%p)\n",This);
heap_free(This->source); heap_free(This->source);
ERRORINFO_SysFreeString(This->bstrDescription); heap_free(This->description);
ERRORINFO_SysFreeString(This->bstrHelpFile); ERRORINFO_SysFreeString(This->bstrHelpFile);
HeapFree(GetProcessHeap(),0,This); HeapFree(GetProcessHeap(),0,This);
return 0; return 0;
@ -270,7 +270,7 @@ static HRESULT WINAPI IErrorInfoImpl_GetDescription(
TRACE("(%p)->(pBstrDescription=%p)\n",This,pBstrDescription); TRACE("(%p)->(pBstrDescription=%p)\n",This,pBstrDescription);
if (pBstrDescription == NULL) if (pBstrDescription == NULL)
return E_INVALIDARG; return E_INVALIDARG;
*pBstrDescription = ERRORINFO_SysAllocString(This->bstrDescription); *pBstrDescription = SysAllocString(This->description);
return S_OK; return S_OK;
} }
@ -368,10 +368,9 @@ static HRESULT WINAPI ICreateErrorInfoImpl_SetDescription(
{ {
ErrorInfoImpl *This = impl_from_ICreateErrorInfo(iface); ErrorInfoImpl *This = impl_from_ICreateErrorInfo(iface);
TRACE("(%p): %s\n",This, debugstr_w(szDescription)); TRACE("(%p): %s\n",This, debugstr_w(szDescription));
if (This->bstrDescription != NULL)
ERRORINFO_SysFreeString(This->bstrDescription);
This->bstrDescription = ERRORINFO_SysAllocString(szDescription);
heap_free(This->description);
This->description = heap_strdupW(szDescription);
return S_OK; return S_OK;
} }
@ -458,7 +457,7 @@ static IErrorInfo* IErrorInfoImpl_Constructor(void)
This->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; This->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl;
This->ref = 1; This->ref = 1;
This->source = NULL; This->source = NULL;
This->bstrDescription = NULL; This->description = NULL;
This->bstrHelpFile = NULL; This->bstrHelpFile = NULL;
This->m_dwHelpContext = 0; This->m_dwHelpContext = 0;