April 2014 - Wine-commits - list.winehq.org

Alexandre Julliard : msvcrt: Update comments for non-exported functions.
by Alexandre Julliard 21 Apr '14

21 Apr '14

Module: wine Branch: master Commit: 0c496f02804af77eb89cbc820b36787624bedec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c496f02804af77eb89cbc820… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 21 14:32:40 2014 +0200 msvcrt: Update comments for non-exported functions. --- dlls/msvcrt/errno.c | 8 ++++++-- dlls/msvcrt/except.c | 10 +++++++--- dlls/msvcrt/exit.c | 8 ++++---- dlls/msvcrt/file.c | 12 +++++++++--- dlls/msvcrt/locale.c | 4 +++- dlls/msvcrt/math.c | 4 +++- dlls/msvcrt/mbcs.c | 4 +++- dlls/msvcrt/thread.c | 2 +- dlls/msvcrt/wcs.c | 8 ++++++-- 9 files changed, 42 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index e8e964a..6c1a912 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -451,14 +451,18 @@ void CDECL _invalid_parameter_noinfo(void) MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 ); } -/* _get_invalid_parameter_handler - not exported in native msvcrt, added in msvcr80 */ +/********************************************************************* + * _get_invalid_parameter_handler (MSVCR80.@) + */ MSVCRT_invalid_parameter_handler CDECL _get_invalid_parameter_handler(void) { TRACE("\n"); return invalid_parameter_handler; } -/* _set_invalid_parameter_handler - not exproted in native msvcrt, added in msvcr80 */ +/********************************************************************* + * _set_invalid_parameter_handler (MSVCR80.@) + */ MSVCRT_invalid_parameter_handler CDECL _set_invalid_parameter_handler( MSVCRT_invalid_parameter_handler handler) { diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index a1dd41a..f5c8b03 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -285,14 +285,16 @@ int CDECL _abnormal_termination(void) } /****************************************************************** - * MSVCRT___uncaught_exception + * __uncaught_exception (MSVCRT.@) */ BOOL CDECL MSVCRT___uncaught_exception(void) { return FALSE; } -/* _set_security_error_handler - not exported in native msvcrt, added in msvcr70 */ +/********************************************************************* + * _set_security_error_handler (MSVCR70.@) + */ MSVCRT_security_error_handler CDECL _set_security_error_handler( MSVCRT_security_error_handler handler ) { @@ -304,7 +306,9 @@ MSVCRT_security_error_handler CDECL _set_security_error_handler( return old; } -/* __security_error_handler - not exported in native msvcrt */ +/********************************************************************* + * __security_error_handler (MSVCR70.@) + */ void CDECL __security_error_handler(int code, void *data) { if(security_error_handler) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 11373b5..0d2992d 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -184,9 +184,7 @@ void CDECL MSVCRT_abort(void) } /********************************************************************* - * _set_abort_behavior (MSVCRT.@) - * - * Not exported by native msvcrt, added in msvcr80 + * _set_abort_behavior (MSVCR80.@) */ unsigned int CDECL MSVCRT__set_abort_behavior(unsigned int flags, unsigned int mask) { @@ -327,7 +325,9 @@ int CDECL MSVCRT_atexit(void (*func)(void)) return MSVCRT__onexit((MSVCRT__onexit_t)func) == (MSVCRT__onexit_t)func ? 0 : -1; } -/* _set_purecall_handler - not exported in native msvcrt */ +/********************************************************************* + * _set_purecall_handler (MSVCR71.@) + */ MSVCRT_purecall_handler CDECL _set_purecall_handler(MSVCRT_purecall_handler function) { MSVCRT_purecall_handler ret = purecall_handler; diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 4090839..aff5a89 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1628,7 +1628,9 @@ int CDECL MSVCRT__fstat(int fd, struct MSVCRT__stat* buf) return ret; } -/* _fstat32 - not exported in native msvcrt */ +/********************************************************************* + * _fstat32 (MSVCR80.@) + */ int CDECL MSVCRT__fstat32(int fd, struct MSVCRT__stat32* buf) { int ret; @@ -1640,7 +1642,9 @@ int CDECL MSVCRT__fstat32(int fd, struct MSVCRT__stat32* buf) return ret; } -/* _fstat64i32 - not exported in native msvcrt */ +/********************************************************************* + * _fstat64i32 (MSVCR80.@) + */ int CDECL MSVCRT__fstat64i32(int fd, struct MSVCRT__stat64i32* buf) { int ret; @@ -3976,7 +3980,9 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm } -/* fread_s - not exported in native msvcrt */ +/********************************************************************* + * fread_s (MSVCR80.@) + */ MSVCRT_size_t CDECL MSVCRT_fread_s(void *buf, MSVCRT_size_t buf_size, MSVCRT_size_t elem_size, MSVCRT_size_t count, MSVCRT_FILE *stream) { diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 7a33376..992aa3e 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1455,7 +1455,9 @@ MSVCRT_wchar_t* CDECL MSVCRT__wsetlocale(int category, const MSVCRT_wchar_t* wlo return ret ? current_lc_all : NULL; } -/* _configthreadlocale - not exported in native msvcrt */ +/********************************************************************* + * _configthreadlocale (MSVCR80.@) + */ int CDECL _configthreadlocale(int type) { thread_data_t *data = msvcrt_get_thread_data(); diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 1d6977d..2c5a8f3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2185,7 +2185,9 @@ void __cdecl __libm_sse2_tanf(void) __asm__ __volatile__( "movd %0,%%xmm0" : : "g" (f) ); } -/* __libm_sse2_sqrt_precise */ +/*********************************************************************** + * __libm_sse2_sqrt_precise (MSVCR110.@) + */ void __cdecl __libm_sse2_sqrt_precise(void) { double d; diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 60464c3..dd14abd 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -184,7 +184,9 @@ int CDECL MSVCRT____mb_cur_max_func(void) return get_locinfo()->mb_cur_max; } -/* ___mb_cur_max_l_func - not exported in native msvcrt */ +/********************************************************************* + * ___mb_cur_max_l_func (MSVCR80.@) + */ int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index 8d00e8b..5e62354 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -155,7 +155,7 @@ void CDECL _endthreadex( } /********************************************************************* - * _getptd - not exported in native msvcrt + * _getptd (MSVCR80.@) */ thread_data_t* CDECL _getptd(void) { diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index fcc6c6b..37ca3fb 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -40,13 +40,17 @@ static BOOL n_format_enabled = TRUE; #include "printf.h" #undef PRINTF_WIDE -/* _get_printf_count_output - not exported in native msvcrt */ +/********************************************************************* + * _get_printf_count_output (MSVCR80.@) + */ int CDECL MSVCRT__get_printf_count_output( void ) { return n_format_enabled ? 1 : 0; } -/* _set_printf_count_output - not exported in native msvcrt */ +/********************************************************************* + * _set_printf_count_output (MSVCR80.@) + */ int CDECL MSVCRT__set_printf_count_output( int enable ) { BOOL old = n_format_enabled;

1 0

Jacek Caban : mshtml: Added IHTMLElementCollection:: get__newEnum implementation.
by Alexandre Julliard 21 Apr '14

21 Apr '14

Module: wine Branch: master Commit: f7635f17b3cabf81b05ad948a107a8810a4f31ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7635f17b3cabf81b05ad948a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 21 13:48:23 2014 +0200 mshtml: Added IHTMLElementCollection::get__newEnum implementation. --- dlls/mshtml/htmlelemcol.c | 139 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 137 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 102a438..e9cd1af 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -42,6 +42,15 @@ typedef struct { } HTMLElementCollection; typedef struct { + IEnumVARIANT IEnumVARIANT_iface; + + LONG ref; + + ULONG iter; + HTMLElementCollection *col; +} HTMLElementCollectionEnum; + +typedef struct { HTMLElement **buf; DWORD len; DWORD size; @@ -86,6 +95,117 @@ static inline BOOL is_elem_node(nsIDOMNode *node) return type == ELEMENT_NODE || type == COMMENT_NODE; } +static inline HTMLElementCollectionEnum *impl_from_IEnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, HTMLElementCollectionEnum, IEnumVARIANT_iface); +} + +static HRESULT WINAPI HTMLElementCollectionEnum_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IEnumVARIANT_iface; + }else if(IsEqualGUID(riid, &IID_IEnumVARIANT)) { + TRACE("(%p)->(IID_IEnumVARIANT %p)\n", This, ppv); + *ppv = &This->IEnumVARIANT_iface; + }else { + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLElementCollectionEnum_AddRef(IEnumVARIANT *iface) +{ + HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLElementCollectionEnum_Release(IEnumVARIANT *iface) +{ + HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + IHTMLElementCollection_Release(&This->col->IHTMLElementCollection_iface); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLElementCollectionEnum_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface); + ULONG fetched = 0; + + TRACE("(%p)->(%d %p %p)\n", This, celt, rgVar, pCeltFetched); + + while(This->iter+fetched < This->col->len && fetched < celt) { + V_VT(rgVar+fetched) = VT_DISPATCH; + V_DISPATCH(rgVar+fetched) = (IDispatch*)&This->col->elems[This->iter+fetched]->IHTMLElement_iface; + IDispatch_AddRef(V_DISPATCH(rgVar+fetched)); + fetched++; + } + + This->iter += fetched; + *pCeltFetched = fetched; + return fetched == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI HTMLElementCollectionEnum_Skip(IEnumVARIANT *iface, ULONG celt) +{ + HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface); + + TRACE("(%p)->(%d)\n", This, celt); + + if(This->iter + celt > This->col->len) { + This->iter = This->col->len; + return S_FALSE; + } + + This->iter += celt; + return S_OK; +} + +static HRESULT WINAPI HTMLElementCollectionEnum_Reset(IEnumVARIANT *iface) +{ + HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface); + + TRACE("(%p)->()\n", This); + + This->iter = 0; + return S_OK; +} + +static HRESULT WINAPI HTMLElementCollectionEnum_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl HTMLElementCollectionEnumVtbl = { + HTMLElementCollectionEnum_QueryInterface, + HTMLElementCollectionEnum_AddRef, + HTMLElementCollectionEnum_Release, + HTMLElementCollectionEnum_Next, + HTMLElementCollectionEnum_Skip, + HTMLElementCollectionEnum_Reset, + HTMLElementCollectionEnum_Clone +}; + static inline HTMLElementCollection *impl_from_IHTMLElementCollection(IHTMLElementCollection *iface) { return CONTAINING_RECORD(iface, HTMLElementCollection, IHTMLElementCollection_iface); @@ -210,8 +330,23 @@ static HRESULT WINAPI HTMLElementCollection_get__newEnum(IHTMLElementCollection IUnknown **p) { HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + HTMLElementCollectionEnum *ret; + + TRACE("(%p)->(%p)\n", This, p); + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IEnumVARIANT_iface.lpVtbl = &HTMLElementCollectionEnumVtbl; + ret->ref = 1; + ret->iter = 0; + + IHTMLElementCollection_AddRef(&This->IHTMLElementCollection_iface); + ret->col = This; + + *p = (IUnknown*)&ret->IEnumVARIANT_iface; + return S_OK; } static BOOL is_elem_id(HTMLElement *elem, LPCWSTR name)

1 0

Jacek Caban : mshtml: Added IHTMLElementCollection::get__newEnum tests.
by Alexandre Julliard 21 Apr '14

21 Apr '14

Module: wine Branch: master Commit: 2518b8f31b9d42c2bc5b2d3ddbecdd4953835eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=2518b8f31b9d42c2bc5b2d3dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 21 13:48:55 2014 +0200 mshtml: Added IHTMLElementCollection::get__newEnum tests. --- dlls/mshtml/tests/dom.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 23677f4..65ca1d3 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2108,9 +2108,12 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, const elem_type_t *elem_types, LONG exlen) { IHTMLElementCollection *col; + IEnumVARIANT *enum_var; + IUnknown *enum_unk; + ULONG fetched; LONG len; DWORD i; - VARIANT name, index; + VARIANT name, index, v, vs[5]; IDispatch *disp, *disp2; HRESULT hres; @@ -2128,6 +2131,13 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, V_VT(&index) = VT_EMPTY; + hres = IHTMLElementCollection_get__newEnum(col, &enum_unk); + ok_(__FILE__,line)(hres == S_OK, "_newEnum failed: %08x\n", hres); + + hres = IUnknown_QueryInterface(enum_unk, &IID_IEnumVARIANT, (void**)&enum_var); + IUnknown_Release(enum_unk); + ok_(__FILE__,line)(hres == S_OK, "Could not get IEnumVARIANT iface: %08x\n", hres); + for(i=0; i<len; i++) { V_VT(&name) = VT_I4; V_I4(&name) = i; @@ -2151,9 +2161,53 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, IDispatch_Release(disp2); } + fetched = 0; + V_VT(&v) = VT_ERROR; + hres = IEnumVARIANT_Next(enum_var, 1, &v, &fetched); + ok_(__FILE__,line)(hres == S_OK, "Next failed: %08x\n", hres); + ok_(__FILE__,line)(fetched == 1, "fetched = %d\n", fetched); + ok_(__FILE__,line)(V_VT(&v) == VT_DISPATCH && V_DISPATCH(&v), "V_VT(v) = %d\n", V_VT(&v)); + ok_(__FILE__,line)(iface_cmp((IUnknown*)disp, (IUnknown*)V_DISPATCH(&v)), "disp != V_DISPATCH(v)\n"); + IDispatch_Release(V_DISPATCH(&v)); + IDispatch_Release(disp); } + fetched = 0xdeadbeef; + V_VT(&v) = VT_BOOL; + hres = IEnumVARIANT_Next(enum_var, 1, &v, &fetched); + ok_(__FILE__,line)(hres == S_FALSE, "Next returned %08x, expected S_FALSE\n", hres); + ok_(__FILE__,line)(fetched == 0, "fetched = %d\n", fetched); + ok_(__FILE__,line)(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + + hres = IEnumVARIANT_Reset(enum_var); + ok_(__FILE__,line)(hres == S_OK, "Reset failed: %08x\n", hres); + + hres = IEnumVARIANT_Skip(enum_var, len > 2 ? len-2 : 0); + ok_(__FILE__,line)(hres == S_OK, "Skip failed: %08x\n", hres); + + memset(vs, 0, sizeof(vs)); + fetched = 0; + hres = IEnumVARIANT_Next(enum_var, sizeof(vs)/sizeof(*vs), vs, &fetched); + ok_(__FILE__,line)(hres == S_FALSE, "Next failed: %08x\n", hres); + ok_(__FILE__,line)(fetched == (len > 2 ? 2 : len), "fetched = %d\n", fetched); + if(len) { + ok_(__FILE__,line)(V_VT(vs) == VT_DISPATCH && V_DISPATCH(vs), "V_VT(vs[0]) = %d\n", V_VT(vs)); + IDispatch_Release(V_DISPATCH(vs)); + } + if(len > 1) { + ok_(__FILE__,line)(V_VT(vs+1) == VT_DISPATCH && V_DISPATCH(vs+1), "V_VT(vs[1]) = %d\n", V_VT(vs+1)); + IDispatch_Release(V_DISPATCH(vs+1)); + } + + hres = IEnumVARIANT_Reset(enum_var); + ok_(__FILE__,line)(hres == S_OK, "Reset failed: %08x\n", hres); + + hres = IEnumVARIANT_Skip(enum_var, len+1); + ok_(__FILE__,line)(hres == S_FALSE, "Skip failed: %08x\n", hres); + + IEnumVARIANT_Release(enum_var); + V_VT(&name) = VT_I4; V_I4(&name) = len; disp = (void*)0xdeadbeef;

1 0

Piotr Caban : msvcrt/tests: Fix _popen test failures when path contains spaces.
by Alexandre Julliard 21 Apr '14

21 Apr '14

Module: wine Branch: master Commit: 1d865f90d6b2223eca48128ac93968ce8f3a0005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d865f90d6b2223eca48128ac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 21 14:07:49 2014 +0200 msvcrt/tests: Fix _popen test failures when path contains spaces. --- dlls/msvcrt/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 3a72e68..523d277 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -327,7 +327,7 @@ static void test__popen(const char *name) char buf[1024]; int ret; - sprintf(buf, "%s misc popen", name); + sprintf(buf, "\"%s\" misc popen", name); pipe = _popen(buf, "r"); ok(pipe != NULL, "_popen failed with error: %d\n", errno);

1 0

Nikolay Sivov : mshtml/tests: Remove old system version check that doesn' t work anymore.
by Alexandre Julliard 21 Apr '14

21 Apr '14

Module: wine Branch: master Commit: 95b6958752992f044eca6b0084d0bbed15b27056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95b6958752992f044eca6b008… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 21 16:11:02 2014 +0400 mshtml/tests: Remove old system version check that doesn't work anymore. --- dlls/mshtml/tests/activex.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 2ceb8f0..852f81d 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -2691,12 +2691,6 @@ static BOOL check_ie(void) IHTMLDocument5 *doc; HRESULT hres; - static const WCHAR xW[] = {'x',0}; - static const WCHAR yW[] = {'y',0}; - - if(!lstrcmpW(xW, yW)) - return FALSE; - hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument5, (void**)&doc); if(FAILED(hres))

1 0

Piotr Caban : msvcr80: Add type_info::name partial implementation.
by Alexandre Julliard 21 Apr '14

21 Apr '14

Module: wine Branch: master Commit: 026ea82a2debf32aef53f5caf2f8946f68e18416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=026ea82a2debf32aef53f5caf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 21 15:28:09 2014 +0200 msvcr80: Add type_info::name partial implementation. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/cpp.c | 27 +-------------------------- 5 files changed, 10 insertions(+), 35 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6a9461b..9c20f28 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -465,8 +465,8 @@ @ stub -arch=win64 ?lock(a)reader_writer_lock@Concurrency@@QEAAXXZ @ stub -arch=win32 ?lock_read(a)reader_writer_lock@Concurrency@@QAEXXZ @ stub -arch=win64 ?lock_read(a)reader_writer_lock@Concurrency@@QEAAXXZ -@ stub -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const -@ stub -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64 +@ thiscall -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method +@ cdecl -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method @ stub -arch=win32 ?native_handle(a)critical_section@Concurrency@@QAEAAV12(a)XZ @ stub -arch=win64 ?native_handle(a)critical_section@Concurrency@@QEAAAEAV12(a)XZ @ cdecl -arch=arm ?raw_name(a)type_info@@QBAPBDXZ(ptr) MSVCRT_type_info_raw_name diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 68b48b7..0034b2f 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -755,9 +755,9 @@ @ stub -arch=arm ?lock_read(a)reader_writer_lock@Concurrency@@QAAXXZ @ stub -arch=i386 ?lock_read(a)reader_writer_lock@Concurrency@@QAEXXZ @ stub -arch=win64 ?lock_read(a)reader_writer_lock@Concurrency@@QEAAXXZ -@ stub -arch=arm ?name(a)type_info@@QBAPBDPAU__type_info_node@@@Z -@ stub -arch=i386 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const -@ stub -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64 +@ cdecl -arch=arm ?name(a)type_info@@QBAPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method +@ thiscall -arch=i386 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method +@ cdecl -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method @ stub -arch=arm ?native_handle(a)critical_section@Concurrency@@QAAAAV12(a)XZ @ stub -arch=i386 ?native_handle(a)critical_section@Concurrency@@QAEAAV12(a)XZ @ stub -arch=win64 ?native_handle(a)critical_section@Concurrency@@QEAAAEAV12(a)XZ diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 105970a..1caa7e0 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -113,8 +113,8 @@ @ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH(a)Z(wstr long long long) MSVCRT__wsopen @ thiscall -arch=i386 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) MSVCRT_type_info_before @ cdecl -arch=win64 ?before(a)type_info@@QEBAHAEBV1@@Z(ptr ptr) MSVCRT_type_info_before -@ stub -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const -@ stub -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64 +@ thiscall -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method +@ cdecl -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method @ cdecl -arch=arm ?raw_name(a)type_info@@QBAPBDXZ(ptr) MSVCRT_type_info_raw_name @ thiscall -arch=i386 ?raw_name(a)type_info@@QBEPBDXZ(ptr) MSVCRT_type_info_raw_name @ cdecl -arch=win64 ?raw_name(a)type_info@@QEBAPEBDXZ(ptr) MSVCRT_type_info_raw_name diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 20260e2..b624bd0 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -113,8 +113,8 @@ @ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH(a)Z(wstr long long long) MSVCRT__wsopen @ thiscall -arch=i386 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) MSVCRT_type_info_before @ cdecl -arch=win64 ?before(a)type_info@@QEBAHAEBV1@@Z(ptr ptr) MSVCRT_type_info_before -@ stub -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const -@ stub -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64 +@ thiscall -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method +@ cdecl -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method @ cdecl -arch=arm ?raw_name(a)type_info@@QBAPBDXZ(ptr) MSVCRT_type_info_raw_name @ thiscall -arch=i386 ?raw_name(a)type_info@@QBEPBDXZ(ptr) MSVCRT_type_info_raw_name @ cdecl -arch=win64 ?raw_name(a)type_info@@QEBAPEBDXZ(ptr) MSVCRT_type_info_raw_name diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index cffcdd7..e392208 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1191,32 +1191,7 @@ DEFINE_THISCALL_WRAPPER(type_info_name_internal_method,8) const char * __thiscall type_info_name_internal_method(type_info * _this, struct __type_info_node *node) { static int once; - if (node && !once++) FIXME("type_info_node parameter ignored\n"); - if (!_this->name) - { - /* Create and set the demangled name */ - /* Note: mangled name in type_info struct always starts with a '.', while - * it isn't valid for mangled name. - * Is this '.' really part of the mangled name, or has it some other meaning ? - */ - char* name = __unDName(0, _this->mangled + 1, 0, MSVCRT_malloc, MSVCRT_free, 0x2800); - if (name) - { - unsigned int len = strlen(name); - - /* It seems _unDName may leave blanks at the end of the demangled name */ - while (len && name[--len] == ' ') - name[len] = '\0'; - - if (InterlockedCompareExchangePointer((void**)&_this->name, name, NULL)) - { - /* Another thread set this member since we checked above - use it */ - MSVCRT_free(name); - } - } - } - TRACE("(%p) returning %s\n", _this, _this->name); - return _this->name; + return MSVCRT_type_info_name(_this); }

1 0

Andrew Sheldon : wined3d: Add NVIDIA Geforce GTX 780 to supported device list.
by Alexandre Julliard 21 Apr '14

21 Apr '14

Module: wine Branch: master Commit: 5ef54904f24c7dfc4a0bfd1795e59cf510c425d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef54904f24c7dfc4a0bfd179… Author: Andrew Sheldon <asheldon55(a)gmail.com> Date: Sat Apr 19 16:28:36 2014 +1000 wined3d: Add NVIDIA Geforce GTX 780 to supported device list. --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 94a002e..4be7ea5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1269,6 +1269,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX765M, "NVIDIA GeForce GTX 765M", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770M, "NVIDIA GeForce GTX 770M", DRIVER_NVIDIA_GEFORCE6, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE6, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE6, 3072}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1675,6 +1676,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl } cards[] = { + {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ {"GTX 770", CARD_NVIDIA_GEFORCE_GTX770}, /* Geforce 700 - highend */ {"GTX 765M", CARD_NVIDIA_GEFORCE_GTX765M}, /* Geforce 700 - midend high mobile */ @@ -2177,6 +2179,7 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i /* Maxwell */ {"NV117", CARD_NVIDIA_GEFORCE_GTX750}, /* Kepler */ + {"NVF0", CARD_NVIDIA_GEFORCE_GTX780}, {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* Fermi */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4e5d315..4ab45cc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1495,6 +1495,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX765M = 0x11e2, CARD_NVIDIA_GEFORCE_GTX770M = 0x11e0, CARD_NVIDIA_GEFORCE_GTX770 = 0x1184, + CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_VMWARE_SVGA3D = 0x0405,

1 0

Qian Hong : wscript: Don't fail silently for unsupported switches.
by Alexandre Julliard 21 Apr '14

21 Apr '14

Module: wine Branch: master Commit: a1f83952907e0688bfa87c42fd276d18d6701a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1f83952907e0688bfa87c42f… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat Apr 19 01:04:09 2014 +0800 wscript: Don't fail silently for unsupported switches. --- programs/wscript/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index b232949..c7d3801 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -358,7 +358,10 @@ static BOOL set_host_properties(const WCHAR *prop) else if(strcmpiW(prop, nologoW) == 0) WINE_FIXME("ignored %s switch\n", debugstr_w(nologoW)); else + { + WINE_FIXME("unsupported switch %s\n", debugstr_w(prop)); return FALSE; + } return TRUE; }

1 0

Nikolay Sivov : gdiplus: Properly delete a DC.
by Alexandre Julliard 21 Apr '14

21 Apr '14

Module: wine Branch: master Commit: 62502d0670fcd5513f4cb0cfade08e319a9cf8d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62502d0670fcd5513f4cb0cfa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 19 13:54:59 2014 +0400 gdiplus: Properly delete a DC. --- dlls/gdiplus/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index a811a60..f485058 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1521,7 +1521,7 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)fontCollection, 0)) { - ReleaseDC(0, hdc); + DeleteDC(hdc); return OutOfMemory; } @@ -1649,7 +1649,7 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&installedFontCollection, 0)) { free_installed_fonts(); - ReleaseDC(0, hdc); + DeleteDC(hdc); return OutOfMemory; }

1 0

Nikolay Sivov : services: Remove loop that's not really used anymore ( Coverity).
by Alexandre Julliard 21 Apr '14

21 Apr '14

Module: wine Branch: master Commit: fdbd8ffffc9a807c0089ff625a6bb5ab6160540e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdbd8ffffc9a807c0089ff625… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 19 13:55:21 2014 +0400 services: Remove loop that's not really used anymore (Coverity). --- programs/services/services.c | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index f6de89d..2fe3806 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -695,32 +695,29 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE * static DWORD service_wait_for_startup(struct service_entry *service_entry, HANDLE process_handle) { - WINE_TRACE("%p\n", service_entry); + HANDLE handles[2] = { service_entry->status_changed_event, process_handle }; + DWORD state, ret; - for (;;) - { - DWORD dwCurrentStatus; - HANDLE handles[2] = { service_entry->status_changed_event, process_handle }; - DWORD ret; - ret = WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout ); - if (ret != WAIT_OBJECT_0) - return ERROR_SERVICE_REQUEST_TIMEOUT; - service_lock_shared(service_entry); - dwCurrentStatus = service_entry->status.dwCurrentState; - service_unlock(service_entry); - if (dwCurrentStatus == SERVICE_START_PENDING) - { - WINE_TRACE("Service changed its status to SERVICE_START_PENDING\n"); - return ERROR_SUCCESS; - } - else if (dwCurrentStatus == SERVICE_RUNNING) - { - WINE_TRACE("Service started successfully\n"); - return ERROR_SUCCESS; - } + WINE_TRACE("%p\n", service_entry); + ret = WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout ); + if (ret != WAIT_OBJECT_0) return ERROR_SERVICE_REQUEST_TIMEOUT; + service_lock_shared(service_entry); + state = service_entry->status.dwCurrentState; + service_unlock(service_entry); + if (state == SERVICE_START_PENDING) + { + WINE_TRACE("Service state changed to SERVICE_START_PENDING\n"); + return ERROR_SUCCESS; } + else if (state == SERVICE_RUNNING) + { + WINE_TRACE("Service started successfully\n"); + return ERROR_SUCCESS; + } + + return ERROR_SERVICE_REQUEST_TIMEOUT; } /******************************************************************************

1 0