November 2012 - Wine-Commits

Piotr Caban : msvcp60: Added locale::_Getfacet export.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: 08280758dd84a7bfac239371896201b65c0b06ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=08280758dd84a7bfac2393718… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:12:04 2012 +0000 msvcp60: Added locale::_Getfacet export. --- dlls/msvcp60/locale.c | 42 ++++++++++++++++++++++-------------------- dlls/msvcp60/msvcp60.spec | 4 ++-- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index f225b4d..d6bd542 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -42,7 +42,7 @@ char* __cdecl _Getmonths(void); void* __cdecl _Gettnames(void); unsigned int __cdecl ___lc_codepage_func(void); LCID* __cdecl ___lc_handle_func(void); -static const locale_facet* locale__Getfacet(const locale*, MSVCP_size_t); +const locale_facet* __thiscall locale__Getfacet(const locale*, MSVCP_size_t, MSVCP_bool); typedef int category; @@ -1318,7 +1318,7 @@ ctype_char* ctype_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_char_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_char_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (ctype_char*)fac; @@ -1965,7 +1965,7 @@ ctype_wchar* ctype_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_wchar_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_wchar_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (ctype_wchar*)fac; @@ -1993,7 +1993,7 @@ ctype_wchar* ctype_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_short_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_short_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (ctype_wchar*)fac; @@ -2460,7 +2460,7 @@ codecvt_char* codecvt_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_char_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_char_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (codecvt_char*)fac; @@ -2698,7 +2698,7 @@ static codecvt_wchar* codecvt_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_wchar_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_wchar_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (codecvt_wchar*)fac; @@ -2750,7 +2750,7 @@ codecvt_wchar* codecvt_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_short_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_short_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (codecvt_wchar*)fac; @@ -3120,7 +3120,7 @@ static numpunct_char* numpunct_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_char_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_char_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (numpunct_char*)fac; @@ -3456,7 +3456,7 @@ static numpunct_wchar* numpunct_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_wchar_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_wchar_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (numpunct_wchar*)fac; @@ -3504,7 +3504,7 @@ static numpunct_wchar* numpunct_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_short_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_short_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (numpunct_wchar*)fac; @@ -3866,7 +3866,7 @@ static num_get* num_get_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_wchar_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_wchar_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_get*)fac; @@ -3906,7 +3906,7 @@ num_get* num_get_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_short_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_short_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_get*)fac; @@ -4878,7 +4878,7 @@ num_get* num_get_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_char_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_char_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_get*)fac; @@ -5632,7 +5632,7 @@ num_put* num_put_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_char_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_char_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_put*)fac; @@ -6242,7 +6242,7 @@ static num_put* num_put_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_wchar_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_wchar_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_put*)fac; @@ -6270,7 +6270,7 @@ num_put* num_put_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_short_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_short_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_put*)fac; @@ -7559,16 +7559,18 @@ locale* __thiscall locale__Addfac(locale *this, locale_facet *facet, MSVCP_size_ return this; } -/* ?_Getfacet(a)locale@std@@QBEPBVfacet(a)12@I(a)Z */ -/* ?_Getfacet(a)locale@std@@QEBAPEBVfacet(a)12@_K(a)Z */ -static const locale_facet* locale__Getfacet(const locale *this, MSVCP_size_t id) +/* ?_Getfacet(a)locale@std@@QBEPBVfacet(a)12@I_N(a)Z */ +/* ?_Getfacet(a)locale@std@@QEBAPEBVfacet(a)12@_K_N(a)Z */ +DEFINE_THISCALL_WRAPPER(locale__Getfacet, 12) +const locale_facet* __thiscall locale__Getfacet(const locale *this, + MSVCP_size_t id, MSVCP_bool allow_transparent) { locale_facet *fac; TRACE("(%p %lu)\n", this, id); fac = id < this->ptr->facet_cnt ? this->ptr->facetvec[id] : NULL; - if(fac || !this->ptr->transparent) + if(fac || !this->ptr->transparent || !allow_transparent) return fac; return id < global_locale->facet_cnt ? global_locale->facetvec[id] : NULL; diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 121cf11..6e8bddd 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2148,8 +2148,8 @@ @ cdecl -arch=win64 ?_Getcvt(a)_Locinfo@std@@QEBA?AU_Cvtvec@@XZ(ptr ptr) _Locinfo__Getcvt @ thiscall -arch=win32 ?_Getdays(a)_Locinfo@std@@QBEPBDXZ(ptr) _Locinfo__Getdays @ cdecl -arch=win64 ?_Getdays(a)_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Getdays -@ stub -arch=win32 ?_Getfacet(a)locale@std@@QBEPBVfacet(a)12@I_N(a)Z -@ stub -arch=win64 ?_Getfacet(a)locale@std@@QEBAPEBVfacet(a)12@_K_N(a)Z +@ thiscall -arch=win32 ?_Getfacet(a)locale@std@@QBEPBVfacet(a)12@I_N(a)Z(ptr long long) locale__Getfacet +@ cdecl -arch=win64 ?_Getfacet(a)locale@std@@QEBAPEBVfacet(a)12@_K_N(a)Z(ptr long long) locale__Getfacet @ thiscall -arch=win32 ?_Getfalse(a)_Locinfo@std@@QBEPBDXZ(ptr) _Locinfo__Getfalse @ cdecl -arch=win64 ?_Getfalse(a)_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Getfalse @ stub -arch=win32 ?_Getffld@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@CAHPADAAV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)1ABVlocale@2@@Z

1 0

Piotr Caban : msvcp60: Added basic_filebuf<short>::_Initcvt export.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: dea74b4da36dfe37d2eb54debdcad724ecd00e0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dea74b4da36dfe37d2eb54deb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:15:48 2012 +0000 msvcp60: Added basic_filebuf<short>::_Initcvt export. --- dlls/msvcp60/msvcp60.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index e8f2ccc..ec7380d 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2285,8 +2285,8 @@ @ extern ?_Init_cnt(a)_Winit@std@@0HA _Winit__Init_cnt @ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@IAEXXZ(ptr) basic_filebuf_char__Initcvt @ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@IEAAXXZ(ptr) basic_filebuf_char__Initcvt -@ stub -arch=win32 ?_Initcvt@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@IAEXXZ -@ stub -arch=win64 ?_Initcvt@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@IEAAXXZ +@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@IAEXXZ(ptr) basic_filebuf_wchar__Initcvt +@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@IEAAXXZ(ptr) basic_filebuf_wchar__Initcvt @ stub -arch=win32 ?_Iput@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@KA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DPADI(a)Z @ stub -arch=win64 ?_Iput@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@KA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@DPEAD_K(a)Z @ stub -arch=win32 ?_Iput@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AAVios_base(a)2@GPADI(a)Z

1 0

Piotr Caban : msvcp60: Forward bad_cast functions to msvcrt.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: e6e0da609da495e739f5123d5bb3bb8327c13b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6e0da609da495e739f5123d5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:11:22 2012 +0000 msvcp60: Forward bad_cast functions to msvcrt. --- dlls/msvcp60/exception.c | 2 ++ dlls/msvcp60/msvcp60.spec | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp60/exception.c b/dlls/msvcp60/exception.c index b8c6921..1dcce4e 100644 --- a/dlls/msvcp60/exception.c +++ b/dlls/msvcp60/exception.c @@ -149,6 +149,8 @@ DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor) /* ?_Doraise(a)out_of_range@std@@MEBAXXZ */ /* ?_Doraise(a)runtime_error@std@@MBEXXZ */ /* ?_Doraise(a)runtime_error@std@@MEBAXXZ */ +/* ?_Doraise(a)bad_cast@std@@MBEXXZ */ +/* ?_Doraise(a)bad_cast@std@@MEBAXXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_exception__Doraise, 4) void __thiscall MSVCP_exception__Doraise(exception *this) { diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 137f09c..27cae4b 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -845,10 +845,10 @@ @ cdecl -arch=win64 ??0bad_alloc(a)std@@QEAA(a)PEBD@Z(ptr str) MSVCP_bad_alloc_ctor @ thiscall -arch=win32 ??0bad_alloc(a)std@@QAE(a)XZ(ptr) MSVCP_bad_alloc_default_ctor @ cdecl -arch=win64 ??0bad_alloc(a)std@@QEAA(a)XZ(ptr) MSVCP_bad_alloc_default_ctor -@ stub -arch=win32 ??0bad_cast(a)std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0bad_cast(a)std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0bad_cast(a)std@@QAE(a)PBD@Z -@ stub -arch=win64 ??0bad_cast(a)std@@QEAA(a)PEBD@Z +@ thiscall -arch=win32 ??0bad_cast(a)std@@QAE(a)ABV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QAE(a)ABV0@@Z +@ cdecl -arch=win64 ??0bad_cast(a)std@@QEAA(a)AEBV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QEAA(a)AEBV0@@Z +@ thiscall -arch=win32 ??0bad_cast(a)std@@QAE(a)PBD@Z(ptr str) msvcrt.??0bad_cast@@QAE(a)PBD@Z +@ cdecl -arch=win64 ??0bad_cast(a)std@@QEAA(a)PEBD@Z(ptr str) msvcrt.??0bad_cast@@QEAA(a)PEBD@Z @ stub -arch=win32 ??0bad_exception(a)std@@QAE(a)ABV01@@Z @ stub -arch=win64 ??0bad_exception(a)std@@QEAA(a)AEBV01@@Z @ stub -arch=win32 ??0bad_exception(a)std@@QAE(a)PBD@Z @@ -1049,8 +1049,8 @@ @ stub -arch=win64 ??1__non_rtti_object(a)std@@UEAA(a)XZ @ thiscall -arch=win32 ??1bad_alloc(a)std@@UAE(a)XZ(ptr) MSVCP_bad_alloc_dtor @ cdecl -arch=win64 ??1bad_alloc(a)std@@UEAA(a)XZ(ptr) MSVCP_bad_alloc_dtor -@ stub -arch=win32 ??1bad_cast(a)std@@UAE(a)XZ -@ stub -arch=win64 ??1bad_cast(a)std@@UEAA(a)XZ +@ thiscall -arch=win32 ??1bad_cast(a)std@@UAE(a)XZ(ptr) msvcrt.??1bad_cast@@UAE(a)XZ +@ cdecl -arch=win64 ??1bad_cast(a)std@@UEAA(a)XZ(ptr) msvcrt.??1bad_cast@@UEAA(a)XZ @ stub -arch=win32 ??1bad_exception(a)std@@UAE(a)XZ @ stub -arch=win64 ??1bad_exception(a)std@@UEAA(a)XZ @ stub -arch=win32 ??1bad_typeid(a)std@@UAE(a)XZ @@ -1235,8 +1235,8 @@ @ stub -arch=win64 ??4__non_rtti_object(a)std@@QEAAAEAV01(a)AEBV01@@Z @ thiscall -arch=win32 ??4bad_alloc(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_bad_alloc_assign @ cdecl -arch=win64 ??4bad_alloc(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_bad_alloc_assign -@ stub -arch=win32 ??4bad_cast(a)std@@QAEAAV01(a)ABV01@@Z -@ stub -arch=win64 ??4bad_cast(a)std@@QEAAAEAV01(a)AEBV01@@Z +@ thiscall -arch=win32 ??4bad_cast(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QAEAAV0(a)ABV0@@Z +@ cdecl -arch=win64 ??4bad_cast(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QEAAAEAV0(a)AEBV0@@Z @ stub -arch=win32 ??4bad_exception(a)std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??4bad_exception(a)std@@QEAAAEAV01(a)AEBV01@@Z @ stub -arch=win32 ??4bad_typeid(a)std@@QAEAAV01(a)ABV01@@Z @@ -1815,7 +1815,7 @@ # extern ??_7?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@6B@ # extern ??_7__non_rtti_object(a)std@@6B@ @ extern ??_7bad_alloc(a)std@@6B@ MSVCP_bad_alloc_vtable -# extern ??_7bad_cast(a)std@@6B@ +@ extern ??_7bad_cast(a)std@@6B@ msvcrt.??_7bad_cast@@6B@ # extern ??_7bad_exception(a)std@@6B@ # extern ??_7bad_typeid(a)std@@6B@ @ extern ??_7codecvt_base(a)std@@6B@ MSVCP_codecvt_base_vtable @@ -1979,8 +1979,8 @@ @ cdecl -arch=win64 ??_F_Locinfo(a)std@@QEAAXXZ(ptr) _Locinfo_ctor @ thiscall -arch=win32 ??_F_Timevec(a)std@@QAEXXZ(ptr) _Timevec_ctor @ cdecl -arch=win64 ??_F_Timevec(a)std@@QEAAXXZ(ptr) _Timevec_ctor -@ stub -arch=win32 ??_Fbad_cast(a)std@@QAEXXZ -@ stub -arch=win64 ??_Fbad_cast(a)std@@QEAAXXZ +@ thiscall -arch=win32 ??_Fbad_cast(a)std@@QAEXXZ(ptr) msvcrt.??_Fbad_cast@@QAEXXZ +@ cdecl -arch=win64 ??_Fbad_cast(a)std@@QEAAXXZ(ptr) msvcrt.??_Fbad_cast@@QEAAXXZ @ stub -arch=win32 ??_Fbad_exception(a)std@@QAEXXZ @ stub -arch=win64 ??_Fbad_exception(a)std@@QEAAXXZ @ stub -arch=win32 ??_Fbad_typeid(a)std@@QAEXXZ @@ -2029,8 +2029,8 @@ @ cdecl -arch=win64 ?_Decref(a)facet@locale(a)std@@QEAAPEAV123(a)XZ(ptr) locale_facet__Decref @ thiscall -arch=win32 ?_Doraise(a)bad_alloc@std@@MBEXXZ(ptr) MSVCP_exception__Doraise @ cdecl -arch=win64 ?_Doraise(a)bad_alloc@std@@MEBAXXZ(ptr) MSVCP_exception__Doraise -@ stub -arch=win32 ?_Doraise(a)bad_cast@std@@MBEXXZ -@ stub -arch=win64 ?_Doraise(a)bad_cast@std@@MEBAXXZ +@ thiscall -arch=win32 ?_Doraise(a)bad_cast@std@@MBEXXZ(ptr) MSVCP_exception__Doraise +@ cdecl -arch=win64 ?_Doraise(a)bad_cast@std@@MEBAXXZ(ptr) MSVCP_exception__Doraise @ stub -arch=win32 ?_Doraise(a)bad_exception@std@@MBEXXZ @ stub -arch=win64 ?_Doraise(a)bad_exception@std@@MEBAXXZ @ stub -arch=win32 ?_Doraise(a)bad_typeid@std@@MBEXXZ

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXPMESH.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: 35a88f5ea291fa17d69f52c50fb9d32c0fb1e148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a88f5ea291fa17d69f52c50… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 27 22:10:58 2012 +0100 d3dx9: Avoid LPD3DXPMESH. --- include/d3dx9anim.h | 2 +- include/d3dx9mesh.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 71a18f0..40bf47d 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -85,7 +85,7 @@ typedef struct _D3DXMESHDATA union { LPD3DXMESH pMesh; - LPD3DXPMESH pPMesh; + ID3DXPMesh *pPMesh; ID3DXPatchMesh *pPatchMesh; } DUMMYUNIONNAME; } D3DXMESHDATA, *LPD3DXMESHDATA; diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 9b68a94..f5bbd7f 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -783,7 +783,9 @@ HRESULT WINAPI D3DXConvertMeshSubsetToStrips(struct ID3DXBaseMesh *mesh_in, DWOR HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD, D3DVERTEXELEMENT9[MAX_FVF_DECL_SIZE]); HRESULT WINAPI D3DXFVFFromDeclarator(const D3DVERTEXELEMENT9 *decl, DWORD *fvf); HRESULT WINAPI D3DXGenerateOutputDecl(D3DVERTEXELEMENT9 *, CONST D3DVERTEXELEMENT9 *); -HRESULT WINAPI D3DXGeneratePMesh(LPD3DXMESH, CONST DWORD *, CONST D3DXATTRIBUTEWEIGHTS *, CONST FLOAT *, DWORD, DWORD, LPD3DXPMESH *); +HRESULT WINAPI D3DXGeneratePMesh(ID3DXMesh *mesh, const DWORD *adjacency, + const D3DXATTRIBUTEWEIGHTS *attribute_weights, const float *vertex_weights, + DWORD min_value, DWORD flags, ID3DXPMesh **pmesh); HRESULT WINAPI D3DXIntersect(LPD3DXBASEMESH, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, BOOL *, DWORD *, FLOAT *, FLOAT *, FLOAT *, LPD3DXBUFFER *, DWORD *); HRESULT WINAPI D3DXIntersectSubset(LPD3DXBASEMESH, DWORD, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, BOOL *, DWORD *, FLOAT *, FLOAT *, FLOAT *, LPD3DXBUFFER *, DWORD *); BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3*, FLOAT *, FLOAT *, FLOAT *);

1 0

Alexandre Julliard : gdi32: Add a font glyph cache in the DIB engine.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: 6050a025bb15fe7d91b9086fad04e83de6177b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6050a025bb15fe7d91b9086fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 27 23:19:29 2012 +0100 gdi32: Add a font glyph cache in the DIB engine. --- dlls/gdi32/dibdrv/dc.c | 1 + dlls/gdi32/dibdrv/dibdrv.h | 3 + dlls/gdi32/dibdrv/graphics.c | 282 +++++++++++++++++++++++++++++++++--------- 3 files changed, 226 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6050a025bb15fe7d91b90…

1 0

Vincent Povirk : gdiplus: Use clipping region in alpha_blend_pixels.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: 423d50eb3b4edd3140880ed2ccbe9d6ca665dcb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=423d50eb3b4edd3140880ed2c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 27 13:42:07 2012 -0600 gdiplus: Use clipping region in alpha_blend_pixels. --- dlls/gdiplus/graphics.c | 163 +++++++++++++++++++++++++++++----------------- 1 files changed, 103 insertions(+), 60 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f56682b..247b17d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -359,68 +359,67 @@ static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_ } } +static GpStatus get_clip_hrgn(GpGraphics *graphics, HRGN *hrgn) +{ + return GdipGetRegionHRgn(graphics->clip, graphics, hrgn); +} + /* Draw non-premultiplied ARGB data to the given graphics object */ -static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, +static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, const BYTE *src, INT src_width, INT src_height, INT src_stride) { - if (graphics->image && graphics->image->type == ImageTypeBitmap) - { - GpBitmap *dst_bitmap = (GpBitmap*)graphics->image; - INT x, y; + GpBitmap *dst_bitmap = (GpBitmap*)graphics->image; + INT x, y; - for (x=0; x<src_width; x++) + for (x=0; x<src_width; x++) + { + for (y=0; y<src_height; y++) { - for (y=0; y<src_height; y++) - { - ARGB dst_color, src_color; - GdipBitmapGetPixel(dst_bitmap, x+dst_x, y+dst_y, &dst_color); - src_color = ((ARGB*)(src + src_stride * y))[x]; - GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over(dst_color, src_color)); - } + ARGB dst_color, src_color; + GdipBitmapGetPixel(dst_bitmap, x+dst_x, y+dst_y, &dst_color); + src_color = ((ARGB*)(src + src_stride * y))[x]; + GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over(dst_color, src_color)); } - - return Ok; - } - else if (graphics->image && graphics->image->type == ImageTypeMetafile) - { - ERR("This should not be used for metafiles; fix caller\n"); - return NotImplemented; } - else - { - HDC hdc; - HBITMAP hbitmap; - BITMAPINFOHEADER bih; - BYTE *temp_bits; - - hdc = CreateCompatibleDC(0); - - bih.biSize = sizeof(BITMAPINFOHEADER); - bih.biWidth = src_width; - bih.biHeight = -src_height; - bih.biPlanes = 1; - bih.biBitCount = 32; - bih.biCompression = BI_RGB; - bih.biSizeImage = 0; - bih.biXPelsPerMeter = 0; - bih.biYPelsPerMeter = 0; - bih.biClrUsed = 0; - bih.biClrImportant = 0; - - hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, - (void**)&temp_bits, NULL, 0); - - convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, - 4 * src_width, src, src_stride); - - SelectObject(hdc, hbitmap); - gdi_alpha_blend(graphics, dst_x, dst_y, src_width, src_height, - hdc, 0, 0, src_width, src_height); - DeleteDC(hdc); - DeleteObject(hbitmap); - return Ok; - } + return Ok; +} + +static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, + const BYTE *src, INT src_width, INT src_height, INT src_stride) +{ + HDC hdc; + HBITMAP hbitmap; + BITMAPINFOHEADER bih; + BYTE *temp_bits; + + hdc = CreateCompatibleDC(0); + + bih.biSize = sizeof(BITMAPINFOHEADER); + bih.biWidth = src_width; + bih.biHeight = -src_height; + bih.biPlanes = 1; + bih.biBitCount = 32; + bih.biCompression = BI_RGB; + bih.biSizeImage = 0; + bih.biXPelsPerMeter = 0; + bih.biYPelsPerMeter = 0; + bih.biClrUsed = 0; + bih.biClrImportant = 0; + + hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, + (void**)&temp_bits, NULL, 0); + + convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, + 4 * src_width, src, src_stride); + + SelectObject(hdc, hbitmap); + gdi_alpha_blend(graphics, dst_x, dst_y, src_width, src_height, + hdc, 0, 0, src_width, src_height); + DeleteDC(hdc); + DeleteObject(hbitmap); + + return Ok; } static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst_y, @@ -433,20 +432,44 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst int i, size; RGNDATA *rgndata; RECT *rects; + HRGN hrgn, visible_rgn; + + hrgn = CreateRectRgn(dst_x, dst_y, dst_x + src_width, dst_y + src_height); + if (!hrgn) + return OutOfMemory; + + stat = get_clip_hrgn(graphics, &visible_rgn); + if (stat != Ok) + { + DeleteObject(hrgn); + return stat; + } + + if (visible_rgn) + { + CombineRgn(hrgn, hrgn, visible_rgn, RGN_AND); + DeleteObject(visible_rgn); + } - size = GetRegionData(hregion, 0, NULL); + if (hregion) + CombineRgn(hrgn, hrgn, hregion, RGN_AND); + + size = GetRegionData(hrgn, 0, NULL); rgndata = GdipAlloc(size); if (!rgndata) + { + DeleteObject(hrgn); return OutOfMemory; + } - GetRegionData(hregion, size, rgndata); + GetRegionData(hrgn, size, rgndata); rects = (RECT*)&rgndata->Buffer; for (i=0; stat == Ok && i<rgndata->rdh.nCount; i++) { - stat = alpha_blend_pixels(graphics, rects[i].left, rects[i].top, + stat = alpha_blend_bmp_pixels(graphics, rects[i].left, rects[i].top, &src[(rects[i].left - dst_x) * 4 + (rects[i].top - dst_y) * src_stride], rects[i].right - rects[i].left, rects[i].bottom - rects[i].top, src_stride); @@ -454,6 +477,8 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst GdipFree(rgndata); + DeleteObject(hrgn); + return stat; } else if (graphics->image && graphics->image->type == ImageTypeMetafile) @@ -463,21 +488,39 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst } else { + HRGN hrgn; int save; + stat = get_clip_hrgn(graphics, &hrgn); + + if (stat != Ok) + return stat; + save = SaveDC(graphics->hdc); - ExtSelectClipRgn(graphics->hdc, hregion, RGN_AND); + if (hrgn) + ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); - stat = alpha_blend_pixels(graphics, dst_x, dst_y, src, src_width, + if (hregion) + ExtSelectClipRgn(graphics->hdc, hregion, RGN_AND); + + stat = alpha_blend_hdc_pixels(graphics, dst_x, dst_y, src, src_width, src_height, src_stride); RestoreDC(graphics->hdc, save); + DeleteObject(hrgn); + return stat; } } +static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, + const BYTE *src, INT src_width, INT src_height, INT src_stride) +{ + return alpha_blend_pixels_hrgn(graphics, dst_x, dst_y, src, src_width, src_height, src_stride, NULL); +} + static ARGB blend_colors(ARGB start, ARGB end, REAL position) { ARGB result=0;

1 0

Aric Stewart : user32: More instances where early versions of usp10 are not well behaved with ScriptString_pSize being NULL .
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: bd7e8df6ba2d7984043ad9aaf50e966d05395ff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7e8df6ba2d7984043ad9aaf… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 27 14:31:46 2012 -0600 user32: More instances where early versions of usp10 are not well behaved with ScriptString_pSize being NULL. Issue discovered by Qian Hong. --- dlls/user32/edit.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index f5d4e65..c143aa6 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -640,7 +640,9 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta current_line->net_length = prev; EDIT_InvalidateUniscribeData_linedef(current_line); EDIT_UpdateUniscribeData_linedef(es, NULL, current_line); - sz = ScriptString_pSize(current_line->ssa); + if (current_line->ssa) + sz = ScriptString_pSize(current_line->ssa); + else sz = 0; if (sz) current_line->width = sz->cx; else @@ -697,8 +699,13 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta if (current_line->net_length > 0) { EDIT_UpdateUniscribeData_linedef(es, NULL, current_line); - sz = ScriptString_pSize(current_line->ssa); - current_line->width = sz->cx; + if (current_line->ssa) + { + sz = ScriptString_pSize(current_line->ssa); + current_line->width = sz->cx; + } + else + current_line->width = 0; } else current_line->width = 0; }

1 0

Alexandre Julliard : winex11: Don' t bother waiting for XShmPutImage to finish.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: e2da590a8550292182b96562cd20f11cfe94ce2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2da590a8550292182b96562c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 28 14:40:13 2012 +0100 winex11: Don't bother waiting for XShmPutImage to finish. --- dlls/winex11.drv/bitblt.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 17ebde7..23837de 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1910,15 +1910,12 @@ static void x11drv_surface_flush( struct window_surface *window_surface ) #ifdef HAVE_LIBXXSHM if (surface->shminfo.shmid != -1) - { XShmPutImage( gdi_display, surface->window, surface->gc, surface->image, coords.visrect.left, coords.visrect.top, surface->header.rect.left + coords.visrect.left, surface->header.rect.top + coords.visrect.top, coords.visrect.right - coords.visrect.left, coords.visrect.bottom - coords.visrect.top, False ); - XSync( gdi_display, False ); - } else #endif XPutImage( gdi_display, surface->window, surface->gc, surface->image,

1 0

Alexandre Julliard : user32: Fix handling of NULL paint struct in BeginPaint.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: ab2cac4815e0ef4dbacea2708b121a22180438c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab2cac4815e0ef4dbacea2708… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 27 20:52:25 2012 +0100 user32: Fix handling of NULL paint struct in BeginPaint. --- dlls/user32/painting.c | 24 ++++++++++++++++-------- dlls/user32/tests/msg.c | 20 ++++++++++++++++++++ 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index b2ddfe6..a6fb23f 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -893,20 +893,28 @@ static HWND fix_caret(HWND hWnd, const RECT *scroll_rect, INT dx, INT dy, HDC WINAPI BeginPaint( HWND hwnd, PAINTSTRUCT *lps ) { HRGN hrgn; + HDC hdc; + BOOL erase; + RECT rect; UINT flags = UPDATE_NONCLIENT | UPDATE_ERASE | UPDATE_PAINT | UPDATE_INTERNALPAINT | UPDATE_NOCHILDREN; - if (!lps) return 0; - HideCaret( hwnd ); if (!(hrgn = send_ncpaint( hwnd, NULL, &flags ))) return 0; - lps->fErase = send_erase( hwnd, flags, hrgn, &lps->rcPaint, &lps->hdc ); + erase = send_erase( hwnd, flags, hrgn, &rect, &hdc ); - TRACE("hdc = %p box = (%s), fErase = %d\n", - lps->hdc, wine_dbgstr_rect(&lps->rcPaint), lps->fErase); + TRACE("hdc = %p box = (%s), fErase = %d\n", hdc, wine_dbgstr_rect(&rect), erase); - return lps->hdc; + if (!lps) + { + release_dc( hwnd, hdc, TRUE ); + return 0; + } + lps->fErase = erase; + lps->rcPaint = rect; + lps->hdc = hdc; + return hdc; } @@ -915,10 +923,10 @@ HDC WINAPI BeginPaint( HWND hwnd, PAINTSTRUCT *lps ) */ BOOL WINAPI EndPaint( HWND hwnd, const PAINTSTRUCT *lps ) { - if (!lps) return FALSE; - release_dc( hwnd, lps->hdc, TRUE ); ShowCaret( hwnd ); flush_window_surfaces( FALSE ); + if (!lps) return FALSE; + release_dc( hwnd, lps->hdc, TRUE ); return TRUE; } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9816f13..ac3ba16 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9093,6 +9093,26 @@ static void test_DispatchMessage(void) if (++count > 10) break; } } + + flush_sequence(); + RedrawWindow( hwnd, &rect, 0, RDW_INVALIDATE|RDW_ERASE|RDW_FRAME ); + count = 0; + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) + { + if (msg.message != WM_PAINT) DispatchMessage( &msg ); + else + { + HDC hdc; + + flush_sequence(); + hdc = BeginPaint( hwnd, NULL ); + ok( !hdc, "got valid hdc %p from BeginPaint\n", hdc ); + ok( !EndPaint( hwnd, NULL ), "EndPaint succeeded\n" ); + ok_sequence( WmDispatchPaint, "WmDispatchPaint", FALSE ); + ok( !count, "Got multiple WM_PAINTs\n" ); + if (++count > 10) break; + } + } DestroyWindow(hwnd); }

1 0

Christian Costa : amstream: Fix return value of BasePinImp_GetMediaType.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: eca0bc35656fef9f0e9179cfe5fec3074d8cbe9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca0bc35656fef9f0e9179cfe… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Nov 27 09:14:13 2012 +0100 amstream: Fix return value of BasePinImp_GetMediaType. --- dlls/amstream/mediastreamfilter.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 3c0777c..afd080a 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -181,15 +181,14 @@ static HRESULT WINAPI BasePinImp_GetMediaType(BasePin *This, int index, AM_MEDIA } else if (IsEqualGUID(&purpose_id, &MSPID_PrimaryAudio)) { - if (!index) - { - amt->majortype = MEDIATYPE_Audio; - amt->subtype = MEDIASUBTYPE_PCM; - return S_OK; - } + if (index) + return S_FALSE; + + amt->majortype = MEDIATYPE_Audio; + amt->subtype = MEDIASUBTYPE_PCM; } - return S_FALSE; + return S_OK; } static const BasePinFuncTable input_BaseFuncTable = {

1 0