March 2013 - Wine-commits - list.winehq.org

Piotr Caban : msvcp90: Added collate facet to locale object.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 1c688130c4cd638bf4f36eff60f820f1df0ce0f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c688130c4cd638bf4f36eff6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 19 15:37:59 2013 +0100 msvcp90: Added collate facet to locale object. --- dlls/msvcp90/locale.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 138 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 77b140c..253edb6 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -768,7 +768,7 @@ collate* __thiscall collate_char_ctor_name(collate *this, const char *name, MSVC /* ??0?$collate(a)D@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ /* ??0?$collate(a)D@std@@QEAA(a)AEBV_Locinfo@1(a)_K@Z */ DEFINE_THISCALL_WRAPPER(collate_char_ctor_locinfo, 12) -collate* __thiscall collate_char_ctor_locinfo(collate *this, _Locinfo *locinfo, MSVCP_size_t refs) +collate* __thiscall collate_char_ctor_locinfo(collate *this, const _Locinfo *locinfo, MSVCP_size_t refs) { TRACE("(%p %p %lu)\n", this, locinfo, refs); @@ -842,6 +842,34 @@ MSVCP_size_t __cdecl collate_char__Getcat(const locale_facet **facet, const loca return LC_COLLATE; } +static collate* collate_char_use_facet(const locale *loc) +{ + static collate *obj = NULL; + + _Lockit lock; + const locale_facet *fac; + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&collate_char_id)); + if(fac) { + _Lockit_dtor(&lock); + return (collate*)fac; + } + + if(obj) { + _Lockit_dtor(&lock); + return obj; + } + + collate_char__Getcat(&fac, loc); + obj = (collate*)fac; + locale_facet__Incref(&obj->facet); + locale_facet_register(&obj->facet); + _Lockit_dtor(&lock); + + return obj; +} + /* _Strcoll */ int __cdecl _Strcoll(const char *first1, const char *last1, const char *first2, const char *last2, const _Collvec *coll) @@ -979,7 +1007,7 @@ collate* __thiscall collate_short_ctor_name(collate *this, const char *name, MSV /* ??0?$collate(a)_W@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ /* ??0?$collate(a)_W@std@@QEAA(a)AEBV_Locinfo@1(a)_K@Z */ DEFINE_THISCALL_WRAPPER(collate_wchar_ctor_locinfo, 12) -collate* __thiscall collate_wchar_ctor_locinfo(collate *this, _Locinfo *locinfo, MSVCP_size_t refs) +collate* __thiscall collate_wchar_ctor_locinfo(collate *this, const _Locinfo *locinfo, MSVCP_size_t refs) { TRACE("(%p %p %lu)\n", this, locinfo, refs); @@ -992,7 +1020,7 @@ collate* __thiscall collate_wchar_ctor_locinfo(collate *this, _Locinfo *locinfo, /* ??0?$collate(a)G@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ /* ??0?$collate(a)G@std@@QEAA(a)AEBV_Locinfo@1(a)_K@Z */ DEFINE_THISCALL_WRAPPER(collate_short_ctor_locinfo, 12) -collate* __thiscall collate_short_ctor_locinfo(collate *this, _Locinfo *locinfo, MSVCP_size_t refs) +collate* __thiscall collate_short_ctor_locinfo(collate *this, const _Locinfo *locinfo, MSVCP_size_t refs) { collate *ret = collate_wchar_ctor_locinfo(this, locinfo, refs); ret->facet.vtable = &MSVCP_collate_short_vtable; @@ -1085,6 +1113,34 @@ MSVCP_size_t __cdecl collate_wchar__Getcat(const locale_facet **facet, const loc return LC_COLLATE; } +static collate* collate_wchar_use_facet(const locale *loc) +{ + static collate *obj = NULL; + + _Lockit lock; + const locale_facet *fac; + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&collate_wchar_id)); + if(fac) { + _Lockit_dtor(&lock); + return (collate*)fac; + } + + if(obj) { + _Lockit_dtor(&lock); + return obj; + } + + collate_wchar__Getcat(&fac, loc); + obj = (collate*)fac; + locale_facet__Incref(&obj->facet); + locale_facet_register(&obj->facet); + _Lockit_dtor(&lock); + + return obj; +} + /* ?_Getcat@?$collate(a)G@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$collate(a)G@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ MSVCP_size_t __cdecl collate_short__Getcat(const locale_facet **facet, const locale *loc) @@ -1097,6 +1153,34 @@ MSVCP_size_t __cdecl collate_short__Getcat(const locale_facet **facet, const loc return LC_COLLATE; } +static collate* collate_short_use_facet(const locale *loc) +{ + static collate *obj = NULL; + + _Lockit lock; + const locale_facet *fac; + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&collate_short_id)); + if(fac) { + _Lockit_dtor(&lock); + return (collate*)fac; + } + + if(obj) { + _Lockit_dtor(&lock); + return obj; + } + + collate_short__Getcat(&fac, loc); + obj = (collate*)fac; + locale_facet__Incref(&obj->facet); + locale_facet_register(&obj->facet); + _Lockit_dtor(&lock); + + return obj; +} + /* _Wcscoll */ int __cdecl _Wcscoll(const wchar_t *first1, const wchar_t *last1, const wchar_t *first2, const wchar_t *last2, const _Collvec *coll) @@ -8407,7 +8491,7 @@ locale__Locimp** __cdecl locale__Locimp__Clocptr_func(void) /* ?_Makeushloc(a)_Locimp@locale(a)std@@CAXABV_Locinfo(a)3@HPAV123(a)PBV23@@Z */ /* ?_Makeushloc(a)_Locimp@locale(a)std@@CAXAEBV_Locinfo(a)3@HPEAV123(a)PEBV23@@Z */ /* List of missing facets: - * num_put, collate, messages, money_get, money_put, moneypunct, moneypunct, time_get, time_put + * messages, money_get, money_put, moneypunct, moneypunct, time_get, time_put */ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, locale__Locimp *locimp, const locale *loc) { @@ -8477,6 +8561,22 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l locale__Locimp__Addfac(locimp, &numpunct->facet, locale_id_operator_size_t(&numpunct_short_id)); } + if(cat & (1<<(collate_short__Getcat(NULL, NULL)-1))) { + collate *c; + + if(loc) { + c = collate_short_use_facet(loc); + }else { + c = MSVCRT_operator_new(sizeof(collate)); + if(!c) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + collate_short_ctor_locinfo(c, locinfo, 0); + } + locale__Locimp__Addfac(locimp, &c->facet, locale_id_operator_size_t(&collate_short_id)); + } + if(cat & (1<<(codecvt_short__Getcat(NULL, NULL)-1))) { codecvt_wchar *codecvt; @@ -8497,7 +8597,7 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l /* ?_Makewloc(a)_Locimp@locale(a)std@@CAXABV_Locinfo(a)3@HPAV123(a)PBV23@@Z */ /* ?_Makewloc(a)_Locimp@locale(a)std@@CAXAEBV_Locinfo(a)3@HPEAV123(a)PEBV23@@Z */ /* List of missing facets: - * collate, messages, money_get, money_put, moneypunct, moneypunct, time_get, time_put + * messages, money_get, money_put, moneypunct, moneypunct, time_get, time_put */ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, locale__Locimp *locimp, const locale *loc) { @@ -8567,6 +8667,22 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc locale__Locimp__Addfac(locimp, &numpunct->facet, locale_id_operator_size_t(&numpunct_wchar_id)); } + if(cat & (1<<(collate_wchar__Getcat(NULL, NULL)-1))) { + collate *c; + + if(loc) { + c = collate_wchar_use_facet(loc); + }else { + c = MSVCRT_operator_new(sizeof(collate)); + if(!c) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + collate_wchar_ctor_locinfo(c, locinfo, 0); + } + locale__Locimp__Addfac(locimp, &c->facet, locale_id_operator_size_t(&collate_wchar_id)); + } + if(cat & (1<<(codecvt_wchar__Getcat(NULL, NULL)-1))) { codecvt_wchar *codecvt; @@ -8587,7 +8703,7 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc /* ?_Makexloc(a)_Locimp@locale(a)std@@CAXABV_Locinfo(a)3@HPAV123(a)PBV23@@Z */ /* ?_Makexloc(a)_Locimp@locale(a)std@@CAXAEBV_Locinfo(a)3@HPEAV123(a)PEBV23@@Z */ /* List of missing facets: - * collate, messages, money_get, money_put, moneypunct, moneypunct, time_get, time_put + * messages, money_get, money_put, moneypunct, moneypunct, time_get, time_put */ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, locale__Locimp *locimp, const locale *loc) { @@ -8657,6 +8773,22 @@ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, loc locale__Locimp__Addfac(locimp, &numpunct->facet, locale_id_operator_size_t(&numpunct_char_id)); } + if(cat & (1<<(collate_char__Getcat(NULL, NULL)-1))) { + collate *c; + + if(loc) { + c = collate_char_use_facet(loc); + }else { + c = MSVCRT_operator_new(sizeof(collate)); + if(!c) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + collate_char_ctor_locinfo(c, locinfo, 0); + } + locale__Locimp__Addfac(locimp, &c->facet, locale_id_operator_size_t(&collate_char_id)); + } + if(cat & (1<<(codecvt_char__Getcat(NULL, NULL)-1))) { codecvt_char *codecvt;

1 0

Piotr Caban : msvcp90: Added time_put facet to locale object.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 5401437739f28169f548aa2b53ff57f2918149b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5401437739f28169f548aa2b5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 19 15:38:14 2013 +0100 msvcp90: Added time_put facet to locale object. --- dlls/msvcp90/locale.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 135 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 253edb6..5e11ece 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -7982,6 +7982,34 @@ MSVCP_size_t __cdecl time_put_char__Getcat(const locale_facet **facet, const loc return LC_TIME; } +static time_put* time_put_char_use_facet(const locale *loc) +{ + static time_put *obj = NULL; + + _Lockit lock; + const locale_facet *fac; + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&time_put_char_id)); + if(fac) { + _Lockit_dtor(&lock); + return (time_put*)fac; + } + + if(obj) { + _Lockit_dtor(&lock); + return obj; + } + + time_put_char__Getcat(&fac, loc); + obj = (time_put*)fac; + locale_facet__Incref(&obj->facet); + locale_facet_register(&obj->facet); + _Lockit_dtor(&lock); + + return obj; +} + /* ?do_put@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DPBUtm@@DD(a)Z */ /* ?do_put@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@DPEBUtm@@DD(a)Z */ DEFINE_THISCALL_WRAPPER(time_put_char_do_put, 36) @@ -8217,6 +8245,34 @@ MSVCP_size_t __cdecl time_put_wchar__Getcat(const locale_facet **facet, const lo return LC_TIME; } +static time_put* time_put_wchar_use_facet(const locale *loc) +{ + static time_put *obj = NULL; + + _Lockit lock; + const locale_facet *fac; + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&time_put_wchar_id)); + if(fac) { + _Lockit_dtor(&lock); + return (time_put*)fac; + } + + if(obj) { + _Lockit_dtor(&lock); + return obj; + } + + time_put_wchar__Getcat(&fac, loc); + obj = (time_put*)fac; + locale_facet__Incref(&obj->facet); + locale_facet_register(&obj->facet); + _Lockit_dtor(&lock); + + return obj; +} + /* ?_Getcat@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ MSVCP_size_t __cdecl time_put_short__Getcat(const locale_facet **facet, const locale *loc) @@ -8237,6 +8293,34 @@ MSVCP_size_t __cdecl time_put_short__Getcat(const locale_facet **facet, const lo return LC_TIME; } +static time_put* time_put_short_use_facet(const locale *loc) +{ + static time_put *obj = NULL; + + _Lockit lock; + const locale_facet *fac; + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&time_put_short_id)); + if(fac) { + _Lockit_dtor(&lock); + return (time_put*)fac; + } + + if(obj) { + _Lockit_dtor(&lock); + return obj; + } + + time_put_short__Getcat(&fac, loc); + obj = (time_put*)fac; + locale_facet__Incref(&obj->facet); + locale_facet_register(&obj->facet); + _Lockit_dtor(&lock); + + return obj; +} + /* ?do_put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AAVios_base(a)2@GPBUtm@@DD(a)Z */ /* ?do_put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@GPEBUtm@@DD(a)Z */ /* ?do_put@?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AAVios_base(a)2@_WPBUtm@@DD(a)Z */ @@ -8491,7 +8575,7 @@ locale__Locimp** __cdecl locale__Locimp__Clocptr_func(void) /* ?_Makeushloc(a)_Locimp@locale(a)std@@CAXABV_Locinfo(a)3@HPAV123(a)PBV23@@Z */ /* ?_Makeushloc(a)_Locimp@locale(a)std@@CAXAEBV_Locinfo(a)3@HPEAV123(a)PEBV23@@Z */ /* List of missing facets: - * messages, money_get, money_put, moneypunct, moneypunct, time_get, time_put + * messages, money_get, money_put, moneypunct, moneypunct, time_get */ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, locale__Locimp *locimp, const locale *loc) { @@ -8577,6 +8661,22 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l locale__Locimp__Addfac(locimp, &c->facet, locale_id_operator_size_t(&collate_short_id)); } + if(cat & (1<<(time_put_short__Getcat(NULL, NULL)-1))) { + time_put *t; + + if(loc) { + t = time_put_short_use_facet(loc); + }else { + t = MSVCRT_operator_new(sizeof(time_put)); + if(!t) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + time_put_short_ctor_locinfo(t, locinfo, 0); + } + locale__Locimp__Addfac(locimp, &t->facet, locale_id_operator_size_t(&time_put_short_id)); + } + if(cat & (1<<(codecvt_short__Getcat(NULL, NULL)-1))) { codecvt_wchar *codecvt; @@ -8597,7 +8697,7 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l /* ?_Makewloc(a)_Locimp@locale(a)std@@CAXABV_Locinfo(a)3@HPAV123(a)PBV23@@Z */ /* ?_Makewloc(a)_Locimp@locale(a)std@@CAXAEBV_Locinfo(a)3@HPEAV123(a)PEBV23@@Z */ /* List of missing facets: - * messages, money_get, money_put, moneypunct, moneypunct, time_get, time_put + * messages, money_get, money_put, moneypunct, moneypunct, time_get */ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, locale__Locimp *locimp, const locale *loc) { @@ -8683,6 +8783,22 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc locale__Locimp__Addfac(locimp, &c->facet, locale_id_operator_size_t(&collate_wchar_id)); } + if(cat & (1<<(time_put_wchar__Getcat(NULL, NULL)-1))) { + time_put *t; + + if(loc) { + t = time_put_wchar_use_facet(loc); + }else { + t = MSVCRT_operator_new(sizeof(time_put)); + if(!t) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + time_put_wchar_ctor_locinfo(t, locinfo, 0); + } + locale__Locimp__Addfac(locimp, &t->facet, locale_id_operator_size_t(&time_put_wchar_id)); + } + if(cat & (1<<(codecvt_wchar__Getcat(NULL, NULL)-1))) { codecvt_wchar *codecvt; @@ -8703,7 +8819,7 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc /* ?_Makexloc(a)_Locimp@locale(a)std@@CAXABV_Locinfo(a)3@HPAV123(a)PBV23@@Z */ /* ?_Makexloc(a)_Locimp@locale(a)std@@CAXAEBV_Locinfo(a)3@HPEAV123(a)PEBV23@@Z */ /* List of missing facets: - * messages, money_get, money_put, moneypunct, moneypunct, time_get, time_put + * messages, money_get, money_put, moneypunct, moneypunct, time_get */ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, locale__Locimp *locimp, const locale *loc) { @@ -8789,6 +8905,22 @@ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, loc locale__Locimp__Addfac(locimp, &c->facet, locale_id_operator_size_t(&collate_char_id)); } + if(cat & (1<<(time_put_char__Getcat(NULL, NULL)-1))) { + time_put *t; + + if(loc) { + t = time_put_char_use_facet(loc); + }else { + t = MSVCRT_operator_new(sizeof(time_put)); + if(!t) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + time_put_char_ctor_locinfo(t, locinfo, 0); + } + locale__Locimp__Addfac(locimp, &t->facet, locale_id_operator_size_t(&time_put_char_id)); + } + if(cat & (1<<(codecvt_char__Getcat(NULL, NULL)-1))) { codecvt_char *codecvt;

1 0

Piotr Caban : msvcp: Sync implementations.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: a0a12d7b7c939dcb4740ce7fb0221457225c6c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0a12d7b7c939dcb4740ce7fb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 19 15:38:42 2013 +0100 msvcp: Sync implementations. --- dlls/msvcp100/locale.c | 878 ++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp100/msvcp100.spec | 128 ++++---- dlls/msvcp60/ios.c | 9 - dlls/msvcp60/locale.c | 796 ++++++++++++++++++++++++++++++++++++++- dlls/msvcp60/msvcp60.spec | 72 ++-- dlls/msvcp70/msvcp70.spec | 108 +++--- dlls/msvcp71/locale.c | 698 ++++++++++++++++++++++++++++++++++- dlls/msvcp71/msvcp71.spec | 108 +++--- dlls/msvcp80/msvcp80.spec | 116 +++--- 9 files changed, 2623 insertions(+), 290 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0a12d7b7c939dcb4740c…

1 0

Andrew Eikum : riched20: EM_FINDTEXT implementation should match richedit character type.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 3f02c241631ee2fff6bfbb2b075187479e4ad4c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f02c241631ee2fff6bfbb2b0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Mar 22 11:34:42 2013 -0500 riched20: EM_FINDTEXT implementation should match richedit character type. --- dlls/riched20/editor.c | 42 ++++++++----- dlls/riched20/tests/editor.c | 137 ++++++++++++++++++++++++++++++------------ 2 files changed, 125 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f02c241631ee2fff6bfb…

1 0

Marcus Meissner : urlmon: Pass up error on error condition (Coverity).
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 542fe17a050b4493aa2c1ff6017b46f82b762340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=542fe17a050b4493aa2c1ff60… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Mar 23 11:14:04 2013 +0100 urlmon: Pass up error on error condition (Coverity). --- dlls/urlmon/protocol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 5598780..2682465 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -78,7 +78,7 @@ static HRESULT start_downloading(Protocol *protocol) if(FAILED(hres)) { protocol_close_connection(protocol); report_result(protocol, hres); - return S_OK; + return hres; } if(protocol->bindf & BINDF_NEEDFILE) {

1 0

Marcus Meissner : strmbase: Fixed user-after-free (Coverity).
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 2ba014bf40d98dd1a1b97ab19e60311be7839214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ba014bf40d98dd1a1b97ab19… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Mar 23 11:14:13 2013 +0100 strmbase: Fixed user-after-free (Coverity). --- dlls/strmbase/transform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 0e014b0..df72d99 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -343,8 +343,8 @@ ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface) DeleteCriticalSection(&This->csReceive); FreeMediaType(&This->pmt); QualityControlImpl_Destroy(This->qcimpl); - CoTaskMemFree(This); IUnknown_Release(This->seekthru_unk); + CoTaskMemFree(This); return 0; }

1 0

André Hentschel : winedump: Recognize IMAGE_DEBUG_TYPE_CLSID.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 5d712e7ea08fed6e0a926458d9870422b0121d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d712e7ea08fed6e0a926458d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 23 17:16:20 2013 +0100 winedump: Recognize IMAGE_DEBUG_TYPE_CLSID. --- include/winnt.h | 1 + tools/winedump/pe.c | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index b701de3..447e727 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3436,6 +3436,7 @@ typedef struct _IMAGE_DEBUG_DIRECTORY { #define IMAGE_DEBUG_TYPE_OMAP_FROM_SRC 8 #define IMAGE_DEBUG_TYPE_BORLAND 9 #define IMAGE_DEBUG_TYPE_RESERVED10 10 +#define IMAGE_DEBUG_TYPE_CLSID 11 typedef enum ReplacesCorHdrNumericDefines { diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index b6c8a34..bf29082 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -871,6 +871,7 @@ static void dump_dir_debug_dir(const IMAGE_DEBUG_DIRECTORY* idd, int idx) case IMAGE_DEBUG_TYPE_OMAP_FROM_SRC:str = "OMAP_FROM_SRC"; break; case IMAGE_DEBUG_TYPE_BORLAND: str = "BORLAND"; break; case IMAGE_DEBUG_TYPE_RESERVED10: str = "RESERVED10"; break; + case IMAGE_DEBUG_TYPE_CLSID: str = "CLSID"; break; } printf(" Type: %u (%s)\n", idd->Type, str); printf(" SizeOfData: %u\n", idd->SizeOfData); @@ -915,6 +916,8 @@ static void dump_dir_debug_dir(const IMAGE_DEBUG_DIRECTORY* idd, int idx) break; case IMAGE_DEBUG_TYPE_RESERVED10: break; + case IMAGE_DEBUG_TYPE_CLSID: + break; } printf("\n"); }

1 0

André Hentschel : winedump: Dump exception info on ARM .
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 18c95cf165a09ee0fe77f431ec31a5b101affd15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c95cf165a09ee0fe77f431e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 23 17:17:45 2013 +0100 winedump: Dump exception info on ARM. --- tools/winedump/main.c | 2 +- tools/winedump/pe.c | 82 +++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 74 insertions(+), 10 deletions(-) diff --git a/tools/winedump/main.c b/tools/winedump/main.c index 4186044..dbc2d67 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -228,7 +228,7 @@ static const struct my_option option_table[] = { {"-C", DUMP, 0, do_symdmngl, "-C Turns on symbol demangling"}, {"-f", DUMP, 0, do_dumphead, "-f Dumps file header information"}, {"-G", DUMP, 0, do_rawdebug, "-G Dumps raw debug information"}, - {"-j", DUMP, 1, do_dumpsect, "-j sect_name Dumps only the content of section sect_name (import, export, debug, resource, tls, clr)"}, + {"-j", DUMP, 1, do_dumpsect, "-j sect_name Dumps only the content of section sect_name (import, export, debug, resource, tls, clr, reloc, except)"}, {"-t", DUMP, 0, do_symtable, "-t Dumps symbol table"}, {"-x", DUMP, 0, do_dumpall, "-x Dumps everything"}, {NULL, NONE, 0, NULL, NULL} diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index bf29082..2029ef2 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -547,16 +547,35 @@ static void dump_dir_exported_functions(void) } -struct runtime_function +struct runtime_function_x86_64 { DWORD BeginAddress; DWORD EndAddress; DWORD UnwindData; }; +struct runtime_function_armnt +{ + DWORD BeginAddress; + union { + DWORD UnwindData; + struct { + DWORD Flag : 2; + DWORD FunctionLength : 11; + DWORD Ret : 2; + DWORD H : 1; + DWORD Reg : 3; + DWORD R : 1; + DWORD L : 1; + DWORD C : 1; + DWORD StackAdjust : 10; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; +}; + union handler_data { - struct runtime_function chain; + struct runtime_function_x86_64 chain; DWORD handler; }; @@ -567,7 +586,7 @@ struct opcode BYTE info : 4; }; -struct unwind_info +struct unwind_info_x86_64 { BYTE version : 3; BYTE flags : 5; @@ -579,6 +598,14 @@ struct unwind_info /* followed by union handler_data */ }; +struct unwind_info_armnt +{ + WORD function_length; + WORD unknown1 : 7; + WORD count : 5; + WORD unknown2 : 4; +}; + #define UWOP_PUSH_NONVOL 0 #define UWOP_ALLOC_LARGE 1 #define UWOP_ALLOC_SMALL 2 @@ -593,20 +620,20 @@ struct unwind_info #define UNW_FLAG_UHANDLER 2 #define UNW_FLAG_CHAININFO 4 -static void dump_x86_64_unwind_info( const struct runtime_function *function ) +static void dump_x86_64_unwind_info( const struct runtime_function_x86_64 *function ) { static const char * const reg_names[16] = { "rax", "rcx", "rdx", "rbx", "rsp", "rbp", "rsi", "rdi", "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15" }; const union handler_data *handler_data; - const struct unwind_info *info; + const struct unwind_info_x86_64 *info; unsigned int i, count; printf( "\nFunction %08x-%08x:\n", function->BeginAddress, function->EndAddress ); if (function->UnwindData & 1) { - const struct runtime_function *next = RVA( function->UnwindData & ~1, sizeof(*next) ); + const struct runtime_function_x86_64 *next = RVA( function->UnwindData & ~1, sizeof(*next) ); printf( " -> function %08x-%08x\n", next->BeginAddress, next->EndAddress ); return; } @@ -698,19 +725,56 @@ static void dump_x86_64_unwind_info( const struct runtime_function *function ) (ULONG)(function->UnwindData + (const char *)(&handler_data->handler + 1) - (const char *)info )); } +static void dump_armnt_unwind_info( const struct runtime_function_armnt *function ) +{ + const struct unwind_info_armnt *info; + if (function->u.s.Flag) + { + printf( "\nFunction %08x-%08x:\n", function->BeginAddress & ~1, + (function->BeginAddress & ~1) + function->u.s.FunctionLength * 2 ); + printf( " Flag %x\n", function->u.s.Flag ); + printf( " FunctionLength %x\n", function->u.s.FunctionLength ); + printf( " Ret %x\n", function->u.s.Ret ); + printf( " H %x\n", function->u.s.H ); + printf( " Reg %x\n", function->u.s.Reg ); + printf( " R %x\n", function->u.s.R ); + printf( " L %x\n", function->u.s.L ); + printf( " C %x\n", function->u.s.C ); + printf( " StackAdjust %x\n", function->u.s.StackAdjust ); + return; + } + + info = RVA( function->u.UnwindData, sizeof(*info) ); + + printf( "\nFunction %08x-%08x:\n", function->BeginAddress & ~1, + (function->BeginAddress & ~1) + info->function_length * 2 ); + printf( " unwind info at %08x\n", function->u.UnwindData ); + printf( " Flag %x\n", function->u.s.Flag ); + printf( " FunctionLength %x\n", info->function_length ); + printf( " Unknown1 %x\n", info->unknown1 ); + printf( " Count %x\n", info->count ); + printf( " Unknown2 %x\n", info->unknown2 ); +} + static void dump_dir_exceptions(void) { unsigned int i, size = 0; - const struct runtime_function *funcs = get_dir_and_size(IMAGE_FILE_EXCEPTION_DIRECTORY, &size); + const void *funcs = get_dir_and_size(IMAGE_FILE_EXCEPTION_DIRECTORY, &size); const IMAGE_FILE_HEADER *file_header = &PE_nt_headers->FileHeader; if (!funcs) return; if (file_header->Machine == IMAGE_FILE_MACHINE_AMD64) { - size /= sizeof(*funcs); + size /= sizeof(struct runtime_function_x86_64); + printf( "Exception info (%u functions):\n", size ); + for (i = 0; i < size; i++) dump_x86_64_unwind_info( (struct runtime_function_x86_64*)funcs + i ); + } + else if (file_header->Machine == IMAGE_FILE_MACHINE_ARMNT) + { + size /= sizeof(struct runtime_function_armnt); printf( "Exception info (%u functions):\n", size ); - for (i = 0; i < size; i++) dump_x86_64_unwind_info( funcs + i ); + for (i = 0; i < size; i++) dump_armnt_unwind_info( (struct runtime_function_armnt*)funcs + i ); } else printf( "Exception information not supported for %s binaries\n", get_machine_str(file_header->Machine));

1 0

André Hentschel : ntdll: Add stubs for RtlAddFunctionTable and RtlDeleteFunctionTable on ARM.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: df7f4fb72031154751f4f70fb4d54e2467cef4b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df7f4fb72031154751f4f70fb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 23 17:20:28 2013 +0100 ntdll: Add stubs for RtlAddFunctionTable and RtlDeleteFunctionTable on ARM. --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/signal_arm.c | 20 ++++++++++++++++++++ include/winnt.h | 3 +++ 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 93bfb77..a07a9ff 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1028,11 +1028,11 @@ @ stdcall ResetWriteWatch(ptr long) @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error @ stdcall ResumeThread(long) -@ cdecl -arch=x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable +@ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable @ stdcall -register RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace @ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory -@ cdecl -arch=x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable +@ cdecl -arch=arm,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory @ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 83e9260..d67c85e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -409,7 +409,7 @@ # @ stub RtlAddAuditAccessObjectAce # @ stub RtlAddCompoundAce # @ stub RtlAddRange -@ cdecl -arch=x86_64 RtlAddFunctionTable(ptr long long) +@ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) @ stdcall RtlAddRefActivationContext(ptr) # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredExceptionHandler(long ptr) @@ -515,7 +515,7 @@ @ stdcall RtlDeleteCriticalSection(ptr) @ stub RtlDeleteElementGenericTable @ stub RtlDeleteElementGenericTableAvl -@ cdecl -arch=x86_64 RtlDeleteFunctionTable(ptr) +@ cdecl -arch=arm,x86_64 RtlDeleteFunctionTable(ptr) @ stub RtlDeleteNoSplay @ stub RtlDeleteOwnersRanges @ stub RtlDeleteRange diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index ce6a6b6..f9cde38 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -913,6 +913,26 @@ void __wine_enter_vm86( CONTEXT *context ) MESSAGE("vm86 mode not supported on this platform\n"); } + +/********************************************************************** + * RtlAddFunctionTable (NTDLL.@) + */ +BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD addr ) +{ + FIXME( "%p %u %x: stub\n", table, count, addr ); + return TRUE; +} + + +/********************************************************************** + * RtlDeleteFunctionTable (NTDLL.@) + */ +BOOLEAN CDECL RtlDeleteFunctionTable( RUNTIME_FUNCTION *table ) +{ + FIXME( "%p: stub\n", table ); + return TRUE; +} + /*********************************************************************** * RtlUnwind (NTDLL.@) */ diff --git a/include/winnt.h b/include/winnt.h index 447e727..a40ff75 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1708,6 +1708,9 @@ typedef struct _CONTEXT { ULONG Cpsr; } CONTEXT; +BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,DWORD); +BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); + #endif /* __arm__ */ #ifdef __aarch64__

1 0

Marcus Meissner : jscript: Check the correct heap return condition ( Coverity).
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 339ec9c4ed7386c220b222354a0d2c82f89a6088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=339ec9c4ed7386c220b222354… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 15 19:42:12 2013 +0100 jscript: Check the correct heap return condition (Coverity). --- dlls/jscript/jsregexp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 61e9a95..3863142 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -609,7 +609,7 @@ HRESULT create_regexp(script_ctx_t *ctx, jsstr_t *src, DWORD flags, jsdisp_t **r regexp->jsregexp = regexp_new(ctx, &ctx->tmp_heap, regexp->str->str, jsstr_length(regexp->str), flags, FALSE); - if(FAILED(hres)) { + if(!regexp->jsregexp) { WARN("regexp_new failed\n"); jsdisp_release(&regexp->dispex); return E_FAIL;

1 0