wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

Dmitry Timoshkov : gdi32: Use graphics mode specified at the EMF creation time when playing EMR_EXTTEXTOUT record .
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 9bc5946cdedda3925f958667683d092f2ed4ea2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bc5946cdedda3925f9586676… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Feb 24 18:19:56 2011 +0800 gdi32: Use graphics mode specified at the EMF creation time when playing EMR_EXTTEXTOUT record. --- dlls/gdi32/enhmetafile.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 15f7c1b..b8863fd 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1133,6 +1133,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( const EMREXTTEXTOUTA *pExtTextOutA = (const EMREXTTEXTOUTA *)mr; RECT rc; const INT *dx = NULL; + int old_mode; rc.left = pExtTextOutA->emrtext.rcl.left; rc.top = pExtTextOutA->emrtext.rcl.top; @@ -1142,6 +1143,11 @@ BOOL WINAPI PlayEnhMetaFileRecord( pExtTextOutA->emrtext.ptlReference.x, pExtTextOutA->emrtext.ptlReference.y, rc.left, rc.top, rc.right, rc.bottom, pExtTextOutA->emrtext.fOptions); + old_mode = SetGraphicsMode(hdc, pExtTextOutA->iGraphicsMode); + /* Reselect the font back into the dc so that the transformation + gets updated. */ + SelectObject(hdc, GetCurrentObject(hdc, OBJ_FONT)); + /* Linux version of pstoedit produces EMFs with offDx set to 0. * These files can be enumerated and played under Win98 just * fine, but at least Win2k chokes on them. @@ -1153,6 +1159,8 @@ BOOL WINAPI PlayEnhMetaFileRecord( pExtTextOutA->emrtext.fOptions, &rc, (LPCSTR)((const BYTE *)mr + pExtTextOutA->emrtext.offString), pExtTextOutA->emrtext.nChars, dx); + + SetGraphicsMode(hdc, old_mode); break; } @@ -1161,6 +1169,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( const EMREXTTEXTOUTW *pExtTextOutW = (const EMREXTTEXTOUTW *)mr; RECT rc; const INT *dx = NULL; + int old_mode; rc.left = pExtTextOutW->emrtext.rcl.left; rc.top = pExtTextOutW->emrtext.rcl.top; @@ -1170,6 +1179,11 @@ BOOL WINAPI PlayEnhMetaFileRecord( pExtTextOutW->emrtext.ptlReference.x, pExtTextOutW->emrtext.ptlReference.y, rc.left, rc.top, rc.right, rc.bottom, pExtTextOutW->emrtext.fOptions); + old_mode = SetGraphicsMode(hdc, pExtTextOutW->iGraphicsMode); + /* Reselect the font back into the dc so that the transformation + gets updated. */ + SelectObject(hdc, GetCurrentObject(hdc, OBJ_FONT)); + /* Linux version of pstoedit produces EMFs with offDx set to 0. * These files can be enumerated and played under Win98 just * fine, but at least Win2k chokes on them. @@ -1181,6 +1195,8 @@ BOOL WINAPI PlayEnhMetaFileRecord( pExtTextOutW->emrtext.fOptions, &rc, (LPCWSTR)((const BYTE *)mr + pExtTextOutW->emrtext.offString), pExtTextOutW->emrtext.nChars, dx); + + SetGraphicsMode(hdc, old_mode); break; }

1 0

Huw Davies : oleaut32: Fix the typelib marshaler when the vtbl has holes.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: ac5e9812fdb6929e0fc3c9f3805223dd6062da62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac5e9812fdb6929e0fc3c9f38… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 24 10:09:36 2011 +0000 oleaut32: Fix the typelib marshaler when the vtbl has holes. --- dlls/oleaut32/tmarshal.c | 91 +++++++++++++++++++++++++++++++++------------- 1 files changed, 65 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 6536bb4..42eaadd 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -323,48 +323,85 @@ _get_typeinfo_for_iid(REFIID riid, ITypeInfo**ti) { } /* - * Determine the number of functions including all inherited functions. + * Determine the number of functions including all inherited functions + * and well as the size of the vtbl. * Note for non-dual dispinterfaces we simply return the size of IDispatch. */ -static HRESULT num_of_funcs(ITypeInfo *tinfo, unsigned int *num) +static HRESULT num_of_funcs(ITypeInfo *tinfo, unsigned int *num, + unsigned int *vtbl_size) { - HRESULT hres; + HRESULT hr; TYPEATTR *attr; ITypeInfo *tinfo2; + UINT inherited_funcs = 0, i; *num = 0; - hres = ITypeInfo_GetTypeAttr(tinfo, &attr); - if (hres) { - ERR("GetTypeAttr failed with %x\n",hres); - return hres; + if(vtbl_size) *vtbl_size = 0; + + hr = ITypeInfo_GetTypeAttr(tinfo, &attr); + if (hr) + { + ERR("GetTypeAttr failed with %x\n", hr); + return hr; } - if(attr->typekind == TKIND_DISPATCH && (attr->wTypeFlags & TYPEFLAG_FDUAL)) + if(attr->typekind == TKIND_DISPATCH) { - HREFTYPE href; - hres = ITypeInfo_GetRefTypeOfImplType(tinfo, -1, &href); - if(FAILED(hres)) + if(attr->wTypeFlags & TYPEFLAG_FDUAL) { - ERR("Unable to get interface href from dual dispinterface\n"); - goto end; + HREFTYPE href; + + ITypeInfo_ReleaseTypeAttr(tinfo, attr); + hr = ITypeInfo_GetRefTypeOfImplType(tinfo, -1, &href); + if(FAILED(hr)) + { + ERR("Unable to get interface href from dual dispinterface\n"); + return hr; + } + hr = ITypeInfo_GetRefTypeInfo(tinfo, href, &tinfo2); + if(FAILED(hr)) + { + ERR("Unable to get interface from dual dispinterface\n"); + return hr; + } + hr = num_of_funcs(tinfo2, num, vtbl_size); + ITypeInfo_Release(tinfo2); + return hr; } - hres = ITypeInfo_GetRefTypeInfo(tinfo, href, &tinfo2); - if(FAILED(hres)) + else /* non-dual dispinterface */ { - ERR("Unable to get interface from dual dispinterface\n"); - goto end; + /* These will be the size of IDispatchVtbl */ + *num = attr->cbSizeVft / sizeof(void *); + if(vtbl_size) *vtbl_size = attr->cbSizeVft; + ITypeInfo_ReleaseTypeAttr(tinfo, attr); + return hr; } - hres = num_of_funcs(tinfo2, num); - ITypeInfo_Release(tinfo2); } - else + + for (i = 0; i < attr->cImplTypes; i++) { - *num = attr->cbSizeVft / 4; + HREFTYPE href; + ITypeInfo *pSubTypeInfo; + UINT sub_funcs; + + hr = ITypeInfo_GetRefTypeOfImplType(tinfo, i, &href); + if (FAILED(hr)) goto end; + hr = ITypeInfo_GetRefTypeInfo(tinfo, href, &pSubTypeInfo); + if (FAILED(hr)) goto end; + + hr = num_of_funcs(pSubTypeInfo, &sub_funcs, NULL); + ITypeInfo_Release(pSubTypeInfo); + + if(FAILED(hr)) goto end; + inherited_funcs += sub_funcs; } + *num = inherited_funcs + attr->cFuncs; + if(vtbl_size) *vtbl_size = attr->cbSizeVft; + end: ITypeInfo_ReleaseTypeAttr(tinfo, attr); - return hres; + return hr; } #ifdef __i386__ @@ -1698,7 +1735,7 @@ static HRESULT init_proxy_entry_point(TMProxyImpl *proxy, unsigned int num) xasm->lret = 0xc2; xasm->bytestopop = (nrofargs+2)*4; /* pop args, This, iMethod */ xasm->nop = 0x90; - proxy->lpvtbl[num] = xasm; + proxy->lpvtbl[fdesc->oVft / sizeof(void *)] = xasm; #else FIXME("not implemented on non i386\n"); return E_FAIL; @@ -1713,7 +1750,7 @@ PSFacBuf_CreateProxy( { HRESULT hres; ITypeInfo *tinfo; - unsigned int i, nroffuncs; + unsigned int i, nroffuncs, vtbl_size; TMProxyImpl *proxy; TYPEATTR *typeattr; BOOL defer_to_dispatch = FALSE; @@ -1725,7 +1762,9 @@ PSFacBuf_CreateProxy( return hres; } - hres = num_of_funcs(tinfo, &nroffuncs); + hres = num_of_funcs(tinfo, &nroffuncs, &vtbl_size); + TRACE("Got %d funcs, vtbl size %d\n", nroffuncs, vtbl_size); + if (FAILED(hres)) { ERR("Cannot get number of functions for typeinfo %s\n",debugstr_guid(riid)); ITypeInfo_Release(tinfo); @@ -1756,7 +1795,7 @@ PSFacBuf_CreateProxy( InitializeCriticalSection(&proxy->crit); proxy->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": TMProxyImpl.crit"); - proxy->lpvtbl = HeapAlloc(GetProcessHeap(),0,sizeof(LPBYTE)*nroffuncs); + proxy->lpvtbl = HeapAlloc(GetProcessHeap(), 0, vtbl_size); /* if we derive from IDispatch then defer to its proxy for its methods */ hres = ITypeInfo_GetTypeAttr(tinfo, &typeattr);

1 0

Huw Davies : oleaut32: Mask off the lsb from the vtbl offset. This is set when the user specifies an offset in ICreateTypeInfo.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 060c8daf7facf6947e2b52e06a7d2ce771ba77b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=060c8daf7facf6947e2b52e06… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 24 09:42:58 2011 +0000 oleaut32: Mask off the lsb from the vtbl offset. This is set when the user specifies an offset in ICreateTypeInfo. --- dlls/oleaut32/typelib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index cc3497e..f101ead 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1987,7 +1987,7 @@ MSFT_DoFuncs(TLBContext* pcx, (*pptfd)->funcdesc.callconv = (pFuncRec->FKCCIC) >> 8 & 0xF; (*pptfd)->funcdesc.cParams = pFuncRec->nrargs ; (*pptfd)->funcdesc.cParamsOpt = pFuncRec->nroargs ; - (*pptfd)->funcdesc.oVft = pFuncRec->VtableOffset; + (*pptfd)->funcdesc.oVft = pFuncRec->VtableOffset & ~1; (*pptfd)->funcdesc.wFuncFlags = LOWORD(pFuncRec->Flags) ; MSFT_GetTdesc(pcx, @@ -3552,7 +3552,7 @@ static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, (*ppFuncDesc)->funcdesc.callconv = pFunc->nacc & 0x7; (*ppFuncDesc)->funcdesc.cParams = pFunc->nacc >> 3; (*ppFuncDesc)->funcdesc.cParamsOpt = (pFunc->retnextopt & 0x7e) >> 1; - (*ppFuncDesc)->funcdesc.oVft = pFunc->vtblpos; + (*ppFuncDesc)->funcdesc.oVft = pFunc->vtblpos & ~1; if(pFunc->magic & SLTG_FUNCTION_FLAGS_PRESENT) (*ppFuncDesc)->funcdesc.wFuncFlags = pFunc->funcflags;

1 0

Michael Stefaniuc : storage.dll16: COM cleanup in storage.c.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 15f4248a638af8c028ad22f0ed8052ff1349f771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15f4248a638af8c028ad22f0e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 24 11:21:40 2011 +0100 storage.dll16: COM cleanup in storage.c. --- dlls/storage.dll16/storage.c | 141 ++++++++++++++++++++++-------------------- 1 files changed, 74 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=15f4248a638af8c028ad2…

1 0

Michael Stefaniuc : msxml3: COM cleanup for the IDispatchEx iface.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 16c543a089f6808878efca35bbf0b898d8beef46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16c543a089f6808878efca35b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 23 23:15:47 2011 +0100 msxml3: COM cleanup for the IDispatchEx iface. --- dlls/msxml3/dispex.c | 14 ++++++-------- dlls/msxml3/msxml_private.h | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 1b8afb5..392d856 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -40,8 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); -#define DISPATCHEX(x) ((IDispatchEx*) &(x)->lpIDispatchExVtbl) - typedef struct { DISPID id; BSTR name; @@ -306,7 +304,7 @@ static inline BOOL is_dynamic_dispid(DISPID id) static inline DispatchEx *impl_from_IDispatchEx(IDispatchEx *iface) { - return (DispatchEx*)((char*)iface - FIELD_OFFSET(DispatchEx, lpIDispatchExVtbl)); + return CONTAINING_RECORD(iface, DispatchEx, IDispatchEx_iface); } static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) @@ -362,7 +360,7 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, lcid, rgDispId); for(i=0; i < cNames; i++) { - hres = IDispatchEx_GetDispID(DISPATCHEX(This), rgszNames[i], 0, rgDispId+i); + hres = IDispatchEx_GetDispID(&This->IDispatchEx_iface, rgszNames[i], 0, rgDispId+i); if(FAILED(hres)) return hres; } @@ -379,7 +377,7 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return IDispatchEx_InvokeEx(DISPATCHEX(This), dispIdMember, lcid, wFlags, + return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, NULL); } @@ -630,10 +628,10 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = DISPATCHEX(This); + *ppv = &This->IDispatchEx_iface; }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); - *ppv = DISPATCHEX(This); + *ppv = &This->IDispatchEx_iface; }else if(IsEqualGUID(&IID_UndocumentedScriptIface, riid)) { TRACE("(%p)->(IID_UndocumentedScriptIface %p) returning NULL\n", This, ppv); *ppv = NULL; @@ -651,7 +649,7 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) void init_dispex(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *data) { - dispex->lpIDispatchExVtbl = &DispatchExVtbl; + dispex->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; dispex->outer = outer; dispex->data = data; } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 65e10bf..2687324 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -144,7 +144,7 @@ typedef struct { } dispex_static_data_t; typedef struct { - const IDispatchExVtbl *lpIDispatchExVtbl; + IDispatchEx IDispatchEx_iface; IUnknown *outer;

1 0

Vincent Povirk : mscoree: Always return S_FALSE from DllCanUnloadNow.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: b92d834d36fe9f5df42def9e8c8ea589972e34e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b92d834d36fe9f5df42def9e8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 23 15:29:58 2011 -0600 mscoree: Always return S_FALSE from DllCanUnloadNow. We can't really unload after Mono is loaded unless we're exiting the process. We could before that, but it's probably not worth the effort. --- dlls/mscoree/corruntimehost.c | 7 ------- dlls/mscoree/metadata.c | 4 ---- dlls/mscoree/metahost.c | 8 -------- dlls/mscoree/mscoree_main.c | 7 +------ dlls/mscoree/mscoree_private.h | 4 ---- 5 files changed, 1 insertions(+), 29 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 0254753..bcdd485 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -95,8 +95,6 @@ static HRESULT RuntimeHost_AddDomain(RuntimeHost *This, MonoDomain **result) list_add_tail(&This->domains, &entry->entry); - MSCOREE_LockModule(); - *result = entry->domain; end: @@ -137,7 +135,6 @@ static void RuntimeHost_DeleteDomain(RuntimeHost *This, MonoDomain *domain) if (This->default_domain == domain) This->default_domain = NULL; HeapFree(GetProcessHeap(), 0, entry); - MSCOREE_UnlockModule(); break; } } @@ -183,8 +180,6 @@ static ULONG WINAPI corruntimehost_AddRef(ICorRuntimeHost* iface) { RuntimeHost *This = impl_from_ICorRuntimeHost( iface ); - MSCOREE_LockModule(); - return InterlockedIncrement( &This->ref ); } @@ -193,8 +188,6 @@ static ULONG WINAPI corruntimehost_Release(ICorRuntimeHost* iface) RuntimeHost *This = impl_from_ICorRuntimeHost( iface ); ULONG ref; - MSCOREE_UnlockModule(); - ref = InterlockedDecrement( &This->ref ); return ref; diff --git a/dlls/mscoree/metadata.c b/dlls/mscoree/metadata.c index 7a5336d..a2db508 100644 --- a/dlls/mscoree/metadata.c +++ b/dlls/mscoree/metadata.c @@ -79,8 +79,6 @@ static ULONG WINAPI MetaDataDispenser_AddRef(IMetaDataDispenserEx* iface) TRACE("%p ref=%u\n", This, ref); - MSCOREE_LockModule(); - return ref; } @@ -96,8 +94,6 @@ static ULONG WINAPI MetaDataDispenser_Release(IMetaDataDispenserEx* iface) HeapFree(GetProcessHeap(), 0, This); } - MSCOREE_UnlockModule(); - return ref; } diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 72215f0..708f638 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -325,13 +325,11 @@ static HRESULT WINAPI CLRRuntimeInfo_QueryInterface(ICLRRuntimeInfo* iface, static ULONG WINAPI CLRRuntimeInfo_AddRef(ICLRRuntimeInfo* iface) { - MSCOREE_LockModule(); return 2; } static ULONG WINAPI CLRRuntimeInfo_Release(ICLRRuntimeInfo* iface) { - MSCOREE_UnlockModule(); return 1; } @@ -788,8 +786,6 @@ static ULONG WINAPI InstalledRuntimeEnum_AddRef(IEnumUnknown* iface) struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; ULONG ref = InterlockedIncrement(&This->ref); - MSCOREE_LockModule(); - TRACE("(%p) refcount=%u\n", iface, ref); return ref; @@ -800,8 +796,6 @@ static ULONG WINAPI InstalledRuntimeEnum_Release(IEnumUnknown* iface) struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; ULONG ref = InterlockedDecrement(&This->ref); - MSCOREE_UnlockModule(); - TRACE("(%p) refcount=%u\n", iface, ref); if (ref == 0) @@ -942,13 +936,11 @@ static HRESULT WINAPI CLRMetaHost_QueryInterface(ICLRMetaHost* iface, static ULONG WINAPI CLRMetaHost_AddRef(ICLRMetaHost* iface) { - MSCOREE_LockModule(); return 2; } static ULONG WINAPI CLRMetaHost_Release(ICLRMetaHost* iface) { - MSCOREE_UnlockModule(); return 1; } diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 6901f7a..6f53c8f 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -47,8 +47,6 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); -LONG dll_refs = 0; - char *WtoA(LPCWSTR wstr) { int length; @@ -459,10 +457,7 @@ HRESULT WINAPI DllUnregisterServer(void) HRESULT WINAPI DllCanUnloadNow(VOID) { - if (dll_refs) - return S_FALSE; - else - return S_OK; + return S_FALSE; } INT WINAPI ND_RU1( const void *ptr, INT offset ) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 16ae5d3..aa0ee2e 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -20,10 +20,6 @@ #ifndef __MSCOREE_PRIVATE__ #define __MSCOREE_PRIVATE__ -extern LONG dll_refs; -static inline void MSCOREE_LockModule(void) { InterlockedIncrement(&dll_refs); } -static inline void MSCOREE_UnlockModule(void) { InterlockedDecrement(&dll_refs); } - extern char *WtoA(LPCWSTR wstr); extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj);

1 0

Vincent Povirk : mscoree: Overhaul of mono runtime shutdown process.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: d6582ae8bd3e5ffe526407c2b2d6fe0b572c28f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6582ae8bd3e5ffe526407c2b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 21 14:22:02 2011 -0600 mscoree: Overhaul of mono runtime shutdown process. It turns out that we can't free individual domains because that tears down important data structures. Instead we must shut down the entire runtime, but only if Mono doesn't shut itself down first. And we need to do it before DLL_PROCESS_DETACH because important libraries might be gone by then. --- dlls/mscoree/corruntimehost.c | 10 +++-- dlls/mscoree/metahost.c | 68 +++++++++++++++++++++++++++++++++++++++- dlls/mscoree/mscoree_main.c | 5 ++- dlls/mscoree/mscoree_private.h | 17 +++++++++- 4 files changed, 91 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6582ae8bd3e5ffe52640…

1 0

Vincent Povirk : msvcrt: Try to call CorExitProcess instead of ExitProcess on exit.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 71bfd33463e24de24ea4a94e47ce01946ad37a25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71bfd33463e24de24ea4a94e4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 21 15:49:59 2011 -0600 msvcrt: Try to call CorExitProcess instead of ExitProcess on exit. --- dlls/msvcrt/exit.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 6e5a58a..d7f28f1 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -265,8 +265,23 @@ MSVCRT__onexit_t CDECL MSVCRT__onexit(MSVCRT__onexit_t func) */ void CDECL MSVCRT_exit(int exitcode) { + HMODULE hmscoree; + static const WCHAR mscoreeW[] = {'m','s','c','o','r','e','e',0}; + void WINAPI (*pCorExitProcess)(int); + TRACE("(%d)\n",exitcode); MSVCRT__cexit(); + + hmscoree = GetModuleHandleW(mscoreeW); + + if (hmscoree) + { + pCorExitProcess = (void*)GetProcAddress(hmscoree, "CorExitProcess"); + + if (pCorExitProcess) + pCorExitProcess(exitcode); + } + ExitProcess(exitcode); }

1 0

Marcus Meissner : ws2_32: name is never NULL as array (Coverity).
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: ae0797150e40f30dbb35a395e68a1a0195c47d6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae0797150e40f30dbb35a395e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Feb 23 21:27:22 2011 +0100 ws2_32: name is never NULL as array (Coverity). --- dlls/ws2_32/tests/sock.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d2f011f..ca72e68 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2548,10 +2548,6 @@ static void test_gethostbyname_hack(void) he->h_addr_list[0][3]); } - /* No reason to test further with NULL hostname */ - if(name == NULL) - return; - if(strcmp(name, "localhost") == 0) { skip("hostname seems to be \"localhost\", skipping test.\n");

1 0

Marcus Meissner : msvcrt: Use = instead of == in test (Coverity).
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 706b43f4dd19616eb8a33a36a2da8ac220534255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=706b43f4dd19616eb8a33a36a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Feb 23 20:47:32 2011 +0100 msvcrt: Use = instead of == in test (Coverity). --- dlls/msvcrt/tests/misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index d93dccf..7135248 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -274,7 +274,7 @@ static void test__get_doserrno(void) errno = EBADF; ret = p_get_doserrno(NULL); ok(ret == EINVAL, "Expected _get_doserrno to return EINVAL, got %d\n", ret); - ok(_doserrno = ERROR_INVALID_CMM, "Expected _doserrno to be ERROR_INVALID_CMM, got %d\n", _doserrno); + ok(_doserrno == ERROR_INVALID_CMM, "Expected _doserrno to be ERROR_INVALID_CMM, got %d\n", _doserrno); ok(errno == EBADF, "Expected errno to be EBADF, got %d\n", errno); _doserrno = ERROR_INVALID_CMM;

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2011