November 2007 - Wine-Commits

Rob Shearman : advapi32: Use the open_for_write parameter to open_cred_mgr_key and fix get_cred_mgr_encryption_key to not need KEY_WRITE access to the key passed in .
by Alexandre Julliard Nov. 28, 2007

Nov. 28, 2007

Module: wine Branch: master Commit: c251100685265126f1044dc04e748aa660ff429d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c251100685265126f1044dc04… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 28 05:47:57 2007 +0000 advapi32: Use the open_for_write parameter to open_cred_mgr_key and fix get_cred_mgr_encryption_key to not need KEY_WRITE access to the key passed in. --- dlls/advapi32/cred.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 65677c4..f604425 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -624,7 +624,7 @@ static DWORD open_cred_mgr_key(HKEY *hkey, BOOL open_for_write) { return RegCreateKeyExW(HKEY_CURRENT_USER, wszCredentialManagerKey, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_READ | KEY_WRITE, NULL, hkey, NULL); + KEY_READ | (open_for_write ? KEY_WRITE : 0), NULL, hkey, NULL); } static DWORD get_cred_mgr_encryption_key(HKEY hkeyMgr, BYTE key_data[KEY_SIZE]) @@ -660,8 +660,19 @@ static DWORD get_cred_mgr_encryption_key(HKEY hkeyMgr, BYTE key_data[KEY_SIZE]) value = RtlUniform(&seed); *(DWORD *)(key_data + 4) = value; - return RegSetValueExW(hkeyMgr, wszEncryptionKeyValue, 0, REG_BINARY, - (LPVOID)key_data, KEY_SIZE); + ret = RegSetValueExW(hkeyMgr, wszEncryptionKeyValue, 0, REG_BINARY, + (LPVOID)key_data, KEY_SIZE); + if (ret == ERROR_ACCESS_DENIED) + { + ret = open_cred_mgr_key(&hkeyMgr, TRUE); + if (ret == ERROR_SUCCESS) + { + ret = RegSetValueExW(hkeyMgr, wszEncryptionKeyValue, 0, REG_BINARY, + (LPVOID)key_data, KEY_SIZE); + RegCloseKey(hkeyMgr); + } + } + return ret; } static LPWSTR get_key_name_for_target(LPCWSTR target_name, DWORD type)

1 0

Michael Stefaniuc : dnsapi: Rename the wrappers around HeapAlloc() &Co to use the new standard naming.
by Alexandre Julliard Nov. 28, 2007

Nov. 28, 2007

Module: wine Branch: master Commit: b3ff6803c0ac920a9b760dde30a4205c1d091ef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3ff6803c0ac920a9b760dde3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 28 00:11:14 2007 +0100 dnsapi: Rename the wrappers around HeapAlloc() &Co to use the new standard naming. --- dlls/dnsapi/dnsapi.h | 26 +++++++++++++------------- dlls/dnsapi/name.c | 8 ++++---- dlls/dnsapi/query.c | 24 ++++++++++++------------ dlls/dnsapi/record.c | 40 ++++++++++++++++++++-------------------- 4 files changed, 49 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3ff6803c0ac920a9b760…

1 0

Rob Shearman : oleaut32: Handle integer overflow of len in SysReAllocStringLen and SysAllocStringByteLen .
by Alexandre Julliard Nov. 28, 2007

Nov. 28, 2007

Module: wine Branch: master Commit: 241b25b5bdd470d844afa6ec71de8b3476c832c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=241b25b5bdd470d844afa6ec7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Nov 27 22:43:00 2007 +0000 oleaut32: Handle integer overflow of len in SysReAllocStringLen and SysAllocStringByteLen. --- dlls/oleaut32/oleaut.c | 8 ++++++++ dlls/oleaut32/tests/vartype.c | 3 +++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index f756d83..a677408 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -291,6 +291,10 @@ BSTR WINAPI SysAllocStringLen(const OLECHAR *str, unsigned int len) */ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) { + /* Detect integer overflow. */ + if (len >= ((UINT_MAX-sizeof(WCHAR)-sizeof(DWORD))/sizeof(WCHAR))) + return 0; + if (*old!=NULL) { DWORD newbytelen = len*sizeof(WCHAR); DWORD *ptr = HeapReAlloc(GetProcessHeap(),0,((DWORD*)*old)-1,newbytelen+sizeof(WCHAR)+sizeof(DWORD)); @@ -340,6 +344,10 @@ BSTR WINAPI SysAllocStringByteLen(LPCSTR str, UINT len) DWORD* newBuffer; char* stringBuffer; + /* Detect integer overflow. */ + if (len >= (UINT_MAX-sizeof(WCHAR)-sizeof(DWORD))) + return NULL; + /* * Allocate a new buffer to hold the string. * don't forget to keep an empty spot at the beginning of the diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index b0335aa..2292036 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5068,6 +5068,9 @@ static void test_SysAllocStringByteLen(void) str = SysAllocStringByteLen(szTestA, 0x80000000); ok (str == NULL, "Expected NULL, got %p\n", str); + str = SysAllocStringByteLen(szTestA, 0xffffffff); + ok (str == NULL, "Expected NULL, got %p\n", str); + str = SysAllocStringByteLen(NULL, 0); ok (str != NULL, "Expected non-NULL\n"); if (str)

1 0

Michael Stefaniuc : shdocvw: Rename the wrappers around HeapAlloc() &Co to use the new standard naming.
by Alexandre Julliard Nov. 28, 2007

Nov. 28, 2007

Module: wine Branch: master Commit: ac527f1e6c247989ca6ea331c3e3260e403436d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac527f1e6c247989ca6ea331c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 28 00:09:35 2007 +0100 shdocvw: Rename the wrappers around HeapAlloc() &Co to use the new standard naming. --- dlls/shdocvw/events.c | 10 +++++----- dlls/shdocvw/ie.c | 2 +- dlls/shdocvw/iexplore.c | 4 ++-- dlls/shdocvw/navigate.c | 8 ++++---- dlls/shdocvw/shdocvw.h | 6 +++--- dlls/shdocvw/shlinstobj.c | 14 +++++++------- dlls/shdocvw/webbrowser.c | 6 +++--- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/shdocvw/events.c b/dlls/shdocvw/events.c index be531db..f12ff95 100644 --- a/dlls/shdocvw/events.c +++ b/dlls/shdocvw/events.c @@ -206,10 +206,10 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown * } if(i == This->sinks_size) - This->sinks = shdocvw_realloc(This->sinks, + This->sinks = heap_realloc(This->sinks, (++This->sinks_size)*sizeof(*This->sinks)); }else { - This->sinks = shdocvw_alloc(sizeof(*This->sinks)); + This->sinks = heap_alloc(sizeof(*This->sinks)); This->sinks_size = 1; i = 0; } @@ -271,7 +271,7 @@ void call_sink(ConnectionPoint *This, DISPID dispid, DISPPARAMS *dispparams) static void ConnectionPoint_Create(REFIID riid, ConnectionPoint **cp, IConnectionPointContainer *container) { - ConnectionPoint *ret = shdocvw_alloc(sizeof(ConnectionPoint)); + ConnectionPoint *ret = heap_alloc(sizeof(ConnectionPoint)); ret->lpConnectionPointVtbl = &ConnectionPointVtbl; @@ -293,8 +293,8 @@ static void ConnectionPoint_Destroy(ConnectionPoint *This) IDispatch_Release(This->sinks[i]); } - shdocvw_free(This->sinks); - shdocvw_free(This); + heap_free(This->sinks); + heap_free(This); } void ConnectionPointContainer_Init(ConnectionPointContainer *This, IUnknown *impl) diff --git a/dlls/shdocvw/ie.c b/dlls/shdocvw/ie.c index 7627691..493e753 100644 --- a/dlls/shdocvw/ie.c +++ b/dlls/shdocvw/ie.c @@ -75,7 +75,7 @@ static ULONG WINAPI InternetExplorer_Release(IWebBrowser2 *iface) if(!ref) { DocHost_Release(&This->doc_host); - shdocvw_free(This); + heap_free(This); } return ref; diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index c8fa61d..e6387d5 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -161,7 +161,7 @@ HRESULT InternetExplorer_Create(IUnknown *pOuter, REFIID riid, void **ppv) TRACE("(%p %s %p)\n", pOuter, debugstr_guid(riid), ppv); - ret = shdocvw_alloc(sizeof(InternetExplorer)); + ret = heap_alloc(sizeof(InternetExplorer)); ret->ref = 0; ret->doc_host.disp = (IDispatch*)WEBBROWSER2(ret); @@ -174,7 +174,7 @@ HRESULT InternetExplorer_Create(IUnknown *pOuter, REFIID riid, void **ppv) hres = IWebBrowser2_QueryInterface(WEBBROWSER2(ret), riid, ppv); if(FAILED(hres)) { - shdocvw_free(ret); + heap_free(ret); return hres; } diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index fce2bb9..429a71e 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -137,8 +137,8 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface) if(!ref) { if(This->post_data) GlobalFree(This->post_data); - shdocvw_free(This->headers); - shdocvw_free(This); + heap_free(This->headers); + heap_free(This); } return ref; @@ -293,7 +293,7 @@ static const IHttpNegotiateVtbl HttpNegotiateVtbl = { static IBindStatusCallback *create_callback(DocHost *This, PBYTE post_data, ULONG post_data_len, LPWSTR headers, VARIANT_BOOL *cancel) { - BindStatusCallback *ret = shdocvw_alloc(sizeof(BindStatusCallback)); + BindStatusCallback *ret = heap_alloc(sizeof(BindStatusCallback)); ret->lpBindStatusCallbackVtbl = &BindStatusCallbackVtbl; ret->lpHttpNegotiateVtbl = &HttpNegotiateVtbl; @@ -310,7 +310,7 @@ static IBindStatusCallback *create_callback(DocHost *This, PBYTE post_data, if(headers) { int size = (strlenW(headers)+1)*sizeof(WCHAR); - ret->headers = shdocvw_alloc(size); + ret->headers = heap_alloc(size); memcpy(ret->headers, headers, size); } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 0b048eb..494bae9 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -226,17 +226,17 @@ DWORD register_iexplore(BOOL); /* memory allocation functions */ -static inline void *shdocvw_alloc(size_t len) +static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } -static inline void *shdocvw_realloc(void *mem, size_t len) +static inline void *heap_realloc(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), 0, mem, len); } -static inline BOOL shdocvw_free(void *mem) +static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); } diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index a697918..eaca590 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -59,7 +59,7 @@ static void RegistryPropertyBag_Destroy(RegistryPropertyBag *This) { TRACE("This=%p)\n", This); RegCloseKey(This->m_hInitPropertyBagKey); - shdocvw_free(This); + heap_free(This); } static HRESULT WINAPI RegistryPropertyBag_IPropertyBag_QueryInterface(IPropertyBag *iface, @@ -130,20 +130,20 @@ static HRESULT WINAPI RegistryPropertyBag_IPropertyBag_Read(IPropertyBag *iface, if (res != ERROR_SUCCESS) return E_INVALIDARG; - pwszValue = shdocvw_alloc(cbData); + pwszValue = heap_alloc(cbData); if (!pwszValue) return E_OUTOFMEMORY; res = RegQueryValueExW(This->m_hInitPropertyBagKey, pwszPropName, NULL, &dwType, (LPBYTE)pwszValue, &cbData); if (res != ERROR_SUCCESS) { - shdocvw_free(pwszValue); + heap_free(pwszValue); return E_INVALIDARG; } V_VT(pVar) = VT_BSTR; V_BSTR(pVar) = SysAllocString(pwszValue); - shdocvw_free(pwszValue); + heap_free(pwszValue); if (vtDst != VT_BSTR) { hr = VariantChangeTypeEx(pVar, pVar, LOCALE_SYSTEM_DEFAULT, 0, vtDst); @@ -176,7 +176,7 @@ static HRESULT RegistryPropertyBag_Constructor(HKEY hInitPropertyBagKey, REFIID TRACE("(hInitPropertyBagKey=%p, riid=%s, ppvObject=%p)\n", hInitPropertyBagKey, debugstr_guid(riid), ppvObject); - pRegistryPropertyBag = shdocvw_alloc(sizeof(RegistryPropertyBag)); + pRegistryPropertyBag = heap_alloc(sizeof(RegistryPropertyBag)); if (pRegistryPropertyBag) { pRegistryPropertyBag->lpIPropertyBagVtbl = &RegistryPropertyBag_IPropertyBagVtbl; pRegistryPropertyBag->m_cRef = 0; @@ -206,7 +206,7 @@ typedef struct _InstanceObjectFactory { static void InstanceObjectFactory_Destroy(InstanceObjectFactory *This) { IPropertyBag_Release(This->m_pPropertyBag); - shdocvw_free(This); + heap_free(This); } static HRESULT WINAPI InstanceObjectFactory_IClassFactory_QueryInterface(IClassFactory *iface, @@ -322,7 +322,7 @@ static HRESULT InstanceObjectFactory_Constructor(REFCLSID rclsid, IPropertyBag * TRACE("(RegistryPropertyBag=%p, riid=%s, ppvObject=%p)\n", pPropertyBag, debugstr_guid(riid), ppvObject); - pInstanceObjectFactory = shdocvw_alloc(sizeof(InstanceObjectFactory)); + pInstanceObjectFactory = heap_alloc(sizeof(InstanceObjectFactory)); if (pInstanceObjectFactory) { pInstanceObjectFactory->lpIClassFactoryVtbl = &InstanceObjectFactory_IClassFactoryVtbl; pInstanceObjectFactory->m_cRef = 0; diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 59cc117..e2b79ae 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -148,7 +148,7 @@ static ULONG WINAPI WebBrowser_Release(IWebBrowser2 *iface) WebBrowser_OleObject_Destroy(This); - shdocvw_free(This); + heap_free(This); SHDOCVW_UnlockModule(); } @@ -945,7 +945,7 @@ static HRESULT WebBrowser_Create(INT version, IUnknown *pOuter, REFIID riid, voi TRACE("(%p %s %p) version=%d\n", pOuter, debugstr_guid(riid), ppv, version); - ret = shdocvw_alloc(sizeof(WebBrowser)); + ret = heap_alloc(sizeof(WebBrowser)); ret->lpWebBrowser2Vtbl = &WebBrowser2Vtbl; ret->ref = 0; @@ -970,7 +970,7 @@ static HRESULT WebBrowser_Create(INT version, IUnknown *pOuter, REFIID riid, voi if(SUCCEEDED(hres)) { SHDOCVW_LockModule(); }else { - shdocvw_free(ret); + heap_free(ret); return hres; }

1 0

Juan Lang : crypt32: Implement finding an existing certificate in a store.
by Alexandre Julliard Nov. 28, 2007

Nov. 28, 2007

Module: wine Branch: master Commit: ab55435ef16f1531292f1b6c48496ad022be1214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab55435ef16f1531292f1b6c4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 26 11:49:36 2007 -0800 crypt32: Implement finding an existing certificate in a store. --- dlls/crypt32/cert.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index b3808ff..97f9360 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1084,6 +1084,14 @@ static BOOL compare_cert_by_issuer(PCCERT_CONTEXT pCertContext, DWORD dwType, return ret; } +static BOOL compare_existing_cert(PCCERT_CONTEXT pCertContext, DWORD dwType, + DWORD dwFlags, const void *pvPara) +{ + PCCERT_CONTEXT toCompare = (PCCERT_CONTEXT)pvPara; + return CertCompareCertificate(pCertContext->dwCertEncodingType, + pCertContext->pCertInfo, toCompare->pCertInfo); +} + PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, DWORD dwCertEncodingType, DWORD dwFlags, DWORD dwType, const void *pvPara, PCCERT_CONTEXT pPrevCertContext) @@ -1117,6 +1125,9 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, case CERT_COMPARE_ISSUER_OF: compare = compare_cert_by_issuer; break; + case CERT_COMPARE_EXISTING: + compare = compare_existing_cert; + break; default: FIXME("find type %08x unimplemented\n", dwType); compare = NULL;

1 0

Anatoly Lyutin : msi: Fix invalid SQL query.
by Alexandre Julliard Nov. 28, 2007

Nov. 28, 2007

Module: wine Branch: master Commit: 704c399237eefa4c5bca93af2e748199f44a5f16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=704c399237eefa4c5bca93af2… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Tue Nov 27 22:21:58 2007 +0300 msi: Fix invalid SQL query. --- dlls/msi/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 9241a66..d0e91cd 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -810,7 +810,7 @@ static LPWSTR msi_get_checkbox_value( msi_dialog *dialog, LPCWSTR prop ) { static const WCHAR query[] = { 'S','E','L','E','C','T',' ','*',' ', - 'F','R','O','M',' ','`','C','h','e','c','k','B','o','x',' ','`', + 'F','R','O','M',' ','`','C','h','e','c','k','B','o','x','`',' ', 'W','H','E','R','E',' ', '`','P','r','o','p','e','r','t','y','`',' ','=',' ', '\'','%','s','\'',0

1 0

Rob Shearman : oleaut32: Introduce a new helper function, TLB_FreeCustData, for freeing custom data.
by Alexandre Julliard Nov. 28, 2007

Nov. 28, 2007

Module: wine Branch: master Commit: e68371040f2d1bebbeb07aed670ffb58f5af9d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e68371040f2d1bebbeb07aed6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Nov 27 19:16:35 2007 +0000 oleaut32: Introduce a new helper function, TLB_FreeCustData, for freeing custom data. Fix memory leaks caused by the variable and interface custom data not being freed properly. --- dlls/oleaut32/typelib.c | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ab5df57..ae4df69 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1421,6 +1421,19 @@ static void *TLB_CopyTypeDesc( TYPEDESC *dest, const TYPEDESC *src, void *buffer return buffer; } +/* free custom data allocated by MSFT_CustData */ +static inline void TLB_FreeCustData(TLBCustData *pCustData) +{ + TLBCustData *pCustDataNext; + for (; pCustData; pCustData = pCustDataNext) + { + VariantClear(&pCustData->data); + + pCustDataNext = pCustData->next; + TLB_Free(pCustData); + } +} + /********************************************************************** * * Functions for reading MSFT typelibs (those created by CreateTypeLib2) @@ -4474,7 +4487,6 @@ static ULONG WINAPI ITypeInfo_fnRelease(ITypeInfo2 *iface) TLBFuncDesc *pFInfo, *pFInfoNext; TLBVarDesc *pVInfo, *pVInfoNext; TLBImplType *pImpl, *pImplNext; - TLBCustData *pCustData, *pCustDataNext; TRACE("destroying ITypeInfo(%p)\n",This); @@ -4514,13 +4526,7 @@ static ULONG WINAPI ITypeInfo_fnRelease(ITypeInfo2 *iface) } TLB_Free(pFInfo->funcdesc.lprgelemdescParam); TLB_Free(pFInfo->pParamDesc); - for (pCustData = pFInfo->pCustData; pCustData; pCustData = pCustDataNext) - { - VariantClear(&pCustData->data); - - pCustDataNext = pCustData->next; - TLB_Free(pCustData); - } + TLB_FreeCustData(pFInfo->pCustData); if (HIWORD(pFInfo->Entry) != 0 && pFInfo->Entry != (BSTR)-1) SysFreeString(pFInfo->Entry); SysFreeString(pFInfo->HelpString); @@ -4536,23 +4542,18 @@ static ULONG WINAPI ITypeInfo_fnRelease(ITypeInfo2 *iface) VariantClear(pVInfo->vardesc.u.lpvarValue); TLB_Free(pVInfo->vardesc.u.lpvarValue); } + TLB_FreeCustData(pVInfo->pCustData); SysFreeString(pVInfo->Name); pVInfoNext = pVInfo->next; TLB_Free(pVInfo); } for(pImpl = This->impltypelist; pImpl; pImpl = pImplNext) { - for (pCustData = pImpl->pCustData; pCustData; pCustData = pCustDataNext) - { - VariantClear(&pCustData->data); - - pCustDataNext = pCustData->next; - TLB_Free(pCustData); - } + TLB_FreeCustData(pImpl->pCustData); pImplNext = pImpl->next; TLB_Free(pImpl); } - TLB_Free(This->pCustData); + TLB_FreeCustData(This->pCustData); finish_free: if (This->next)

1 0

Lionel Debroux : ntdll: Trace arena magics ( may help debugging some heap corruptions).
by Alexandre Julliard Nov. 28, 2007

Nov. 28, 2007

Module: wine Branch: master Commit: ec80b544e10bab9ab4f1a5bd6e1d82bf04976aaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec80b544e10bab9ab4f1a5bd6… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Sun Nov 25 09:56:31 2007 +0100 ntdll: Trace arena magics (may help debugging some heap corruptions). --- dlls/ntdll/heap.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index fa0c1c4..0c80f83 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -243,15 +243,16 @@ static void HEAP_Dump( HEAP *heap ) DPRINTF( "\n\nSub-heap %p: base=%p size=%08lx committed=%08lx\n", subheap, subheap->base, subheap->size, subheap->commitSize ); - DPRINTF( "\n Block Stat Size Id\n" ); + DPRINTF( "\n Block Arena Stat Size Id\n" ); ptr = (char *)subheap->base + subheap->headerSize; while (ptr < (char *)subheap->base + subheap->size) { if (*(DWORD *)ptr & ARENA_FLAG_FREE) { ARENA_FREE *pArena = (ARENA_FREE *)ptr; - DPRINTF( "%p free %08x prev=%p next=%p\n", - pArena, pArena->size & ARENA_SIZE_MASK, + DPRINTF( "%p %08x free %08x prev=%p next=%p\n", + pArena, pArena->magic, + pArena->size & ARENA_SIZE_MASK, LIST_ENTRY( pArena->entry.prev, ARENA_FREE, entry ), LIST_ENTRY( pArena->entry.next, ARENA_FREE, entry ) ); ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); @@ -261,8 +262,8 @@ static void HEAP_Dump( HEAP *heap ) else if (*(DWORD *)ptr & ARENA_FLAG_PREV_FREE) { ARENA_INUSE *pArena = (ARENA_INUSE *)ptr; - DPRINTF( "%p Used %08x back=%p\n", - pArena, pArena->size & ARENA_SIZE_MASK, *((ARENA_FREE **)pArena - 1) ); + DPRINTF( "%p %08x Used %08x back=%p\n", + pArena, pArena->magic, pArena->size & ARENA_SIZE_MASK, *((ARENA_FREE **)pArena - 1) ); ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); arenaSize += sizeof(ARENA_INUSE); usedSize += pArena->size & ARENA_SIZE_MASK; @@ -270,7 +271,7 @@ static void HEAP_Dump( HEAP *heap ) else { ARENA_INUSE *pArena = (ARENA_INUSE *)ptr; - DPRINTF( "%p used %08x\n", pArena, pArena->size & ARENA_SIZE_MASK ); + DPRINTF( "%p %08x used %08x\n", pArena, pArena->magic, pArena->size & ARENA_SIZE_MASK ); ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); arenaSize += sizeof(ARENA_INUSE); usedSize += pArena->size & ARENA_SIZE_MASK; @@ -813,7 +814,7 @@ static BOOL HEAP_ValidateFreeArena( SUBHEAP *subheap, ARENA_FREE *pArena ) /* Check magic number */ if (pArena->magic != ARENA_FREE_MAGIC) { - ERR("Heap %p: invalid free arena magic for %p\n", subheap->heap, pArena ); + ERR("Heap %p: invalid free arena magic %08x for %p\n", subheap->heap, pArena->magic, pArena ); return FALSE; } /* Check size flags */ @@ -916,11 +917,11 @@ static BOOL HEAP_ValidateInUseArena( const SUBHEAP *subheap, const ARENA_INUSE * if (pArena->magic != ARENA_INUSE_MAGIC) { if (quiet == NOISY) { - ERR("Heap %p: invalid in-use arena magic for %p\n", subheap->heap, pArena ); + ERR("Heap %p: invalid in-use arena magic %08x for %p\n", subheap->heap, pArena->magic, pArena ); if (TRACE_ON(heap)) HEAP_Dump( subheap->heap ); } else if (WARN_ON(heap)) { - WARN("Heap %p: invalid in-use arena magic for %p\n", subheap->heap, pArena ); + WARN("Heap %p: invalid in-use arena magic %08x for %p\n", subheap->heap, pArena->magic, pArena ); if (TRACE_ON(heap)) HEAP_Dump( subheap->heap ); }

1 0

Stefan Leichter : d3dx8: Add WINAPI to the prototypes of D3DXMatrixTransformation.
by Alexandre Julliard Nov. 28, 2007

Nov. 28, 2007

Module: wine Branch: master Commit: d12793a2b53cb7e538e75c5a19a4cd794b1a08c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d12793a2b53cb7e538e75c5a1… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Nov 27 20:31:15 2007 +0100 d3dx8: Add WINAPI to the prototypes of D3DXMatrixTransformation. --- dlls/d3dx8/math.c | 2 +- include/d3dx8math.h | 2 +- include/d3dx9math.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 04072bf..55da2d9 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -480,7 +480,7 @@ D3DXMATRIX* WINAPI D3DXMatrixShadow(D3DXMATRIX *pout, CONST D3DXVECTOR4 *plight, return pout; } -D3DXMATRIX* D3DXMatrixTransformation(D3DXMATRIX *pout, CONST D3DXVECTOR3 *pscalingcenter, CONST D3DXQUATERNION *pscalingrotation, CONST D3DXVECTOR3 *pscaling, CONST D3DXVECTOR3 *protationcenter, CONST D3DXQUATERNION *protation, CONST D3DXVECTOR3 *ptranslation) +D3DXMATRIX* WINAPI D3DXMatrixTransformation(D3DXMATRIX *pout, CONST D3DXVECTOR3 *pscalingcenter, CONST D3DXQUATERNION *pscalingrotation, CONST D3DXVECTOR3 *pscaling, CONST D3DXVECTOR3 *protationcenter, CONST D3DXQUATERNION *protation, CONST D3DXVECTOR3 *ptranslation) { D3DXMATRIX m1, m2, m3, m4, m5, m6, m7, p1, p2, p3, p4, p5; D3DXQUATERNION prc; diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 4ea4d7d..1863ac0 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -293,7 +293,7 @@ D3DXMATRIX* WINAPI D3DXMatrixRotationYawPitchRoll(D3DXMATRIX *pout, FLOAT yaw, F D3DXMATRIX* WINAPI D3DXMatrixRotationZ(D3DXMATRIX *pout, FLOAT angle); D3DXMATRIX* WINAPI D3DXMatrixScaling(D3DXMATRIX *pout, FLOAT sx, FLOAT sy, FLOAT sz); D3DXMATRIX* WINAPI D3DXMatrixShadow(D3DXMATRIX *pout, CONST D3DXVECTOR4 *plight, CONST D3DXPLANE *pPlane); -D3DXMATRIX* D3DXMatrixTransformation(D3DXMATRIX *pout, CONST D3DXVECTOR3 *pscalingcenter, CONST D3DXQUATERNION *pscalingrotation, CONST D3DXVECTOR3 *pscaling, CONST D3DXVECTOR3 *protationcenter, CONST D3DXQUATERNION *protation, CONST D3DXVECTOR3 *ptranslation); +D3DXMATRIX* WINAPI D3DXMatrixTransformation(D3DXMATRIX *pout, CONST D3DXVECTOR3 *pscalingcenter, CONST D3DXQUATERNION *pscalingrotation, CONST D3DXVECTOR3 *pscaling, CONST D3DXVECTOR3 *protationcenter, CONST D3DXQUATERNION *protation, CONST D3DXVECTOR3 *ptranslation); D3DXMATRIX* WINAPI D3DXMatrixTranslation(D3DXMATRIX *pout, FLOAT x, FLOAT y, FLOAT z); D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm); diff --git a/include/d3dx9math.h b/include/d3dx9math.h index bfbeba0..d4bd379 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -293,7 +293,7 @@ D3DXMATRIX* WINAPI D3DXMatrixRotationYawPitchRoll(D3DXMATRIX *pout, FLOAT yaw, F D3DXMATRIX* WINAPI D3DXMatrixRotationZ(D3DXMATRIX *pout, FLOAT angle); D3DXMATRIX* WINAPI D3DXMatrixScaling(D3DXMATRIX *pout, FLOAT sx, FLOAT sy, FLOAT sz); D3DXMATRIX* WINAPI D3DXMatrixShadow(D3DXMATRIX *pout, CONST D3DXVECTOR4 *plight, CONST D3DXPLANE *pPlane); -D3DXMATRIX* D3DXMatrixTransformation(D3DXMATRIX *pout, CONST D3DXVECTOR3 *pscalingcenter, CONST D3DXQUATERNION *pscalingrotation, CONST D3DXVECTOR3 *pscaling, CONST D3DXVECTOR3 *protationcenter, CONST D3DXQUATERNION *protation, CONST D3DXVECTOR3 *ptranslation); +D3DXMATRIX* WINAPI D3DXMatrixTransformation(D3DXMATRIX *pout, CONST D3DXVECTOR3 *pscalingcenter, CONST D3DXQUATERNION *pscalingrotation, CONST D3DXVECTOR3 *pscaling, CONST D3DXVECTOR3 *protationcenter, CONST D3DXQUATERNION *protation, CONST D3DXVECTOR3 *ptranslation); D3DXMATRIX* WINAPI D3DXMatrixTranslation(D3DXMATRIX *pout, FLOAT x, FLOAT y, FLOAT z); D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm);

1 0

Rob Shearman : oleaut32: Free the correct custom data inside ITypeInfo_fnRelease.
by Alexandre Julliard Nov. 28, 2007

Nov. 28, 2007

Module: wine Branch: master Commit: aaa6c4007fbe619bb6d369d0341d03001707f642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa6c4007fbe619bb6d369d03… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Nov 27 19:16:19 2007 +0000 oleaut32: Free the correct custom data inside ITypeInfo_fnRelease. Since the code is inside the loop for function data, it should be freeing the function's custom data, not the interface's. --- dlls/oleaut32/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 8e37de0..ab5df57 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4514,7 +4514,7 @@ static ULONG WINAPI ITypeInfo_fnRelease(ITypeInfo2 *iface) } TLB_Free(pFInfo->funcdesc.lprgelemdescParam); TLB_Free(pFInfo->pParamDesc); - for (pCustData = This->pCustData; pCustData; pCustData = pCustDataNext) + for (pCustData = pFInfo->pCustData; pCustData; pCustData = pCustDataNext) { VariantClear(&pCustData->data);

1 0