December 2011 - Wine-Commits

Piotr Caban : msvcp90: Added ctype<wchar_t>:: tolower functions implementation.
by Alexandre Julliard Dec. 22, 2011

Dec. 22, 2011

Module: wine Branch: master Commit: b4e9bd74cf89fdd95ad7c78051afcc727165b933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4e9bd74cf89fdd95ad7c7805… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 22 18:24:46 2011 +0100 msvcp90: Added ctype<wchar_t>::tolower functions implementation. --- dlls/msvcp90/locale.c | 31 ++++++++++++++++++++++--------- dlls/msvcp90/msvcp90.spec | 2 +- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 1a71f6f..24d521f 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -2148,15 +2148,23 @@ MSVCP_size_t __cdecl ctype_wchar__Getcat(const locale_facet **facet, const local return LC_CTYPE; } +/* _Towlower */ +wchar_t __cdecl _Towlower(wchar_t ch, const _Ctypevec *ctype) +{ + TRACE("(%d %p)\n", ch, ctype); + return tolowerW(ch); +} + /* ?do_tolower@?$ctype(a)_W@std@@MBE_W_W(a)Z */ /* ?do_tolower@?$ctype(a)_W@std@@MEBA_W_W(a)Z */ /* ?do_tolower@?$ctype(a)G@std@@MBEGG(a)Z */ /* ?do_tolower@?$ctype(a)G@std@@MEBAGG(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar_do_tolower_ch, 8) -char __thiscall ctype_wchar_do_tolower_ch(const ctype_wchar *this, wchar_t ch) +#define call_ctype_wchar_do_tolower_ch(this, ch) CALL_VTBL_FUNC(this, 24, \ + wchar_t, (const ctype_wchar*, wchar_t), (this, ch)) +wchar_t __thiscall ctype_wchar_do_tolower_ch(const ctype_wchar *this, wchar_t ch) { - FIXME("(%p %d) stub\n", this, ch); - return 0; + return _Towlower(ch, &this->ctype); } /* ?do_tolower@?$ctype(a)_W@std@@MBEPB_WPA_WPB_W(a)Z */ @@ -2164,11 +2172,16 @@ char __thiscall ctype_wchar_do_tolower_ch(const ctype_wchar *this, wchar_t ch) /* ?do_tolower@?$ctype(a)G@std@@MBEPBGPAGPBG(a)Z */ /* ?do_tolower@?$ctype(a)G@std@@MEBAPEBGPEAGPEBG(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar_do_tolower, 12) +#define call_ctype_wchar_do_tolower(this, first, last) CALL_VTBL_FUNC(this, 20, \ + const wchar_t*, (const ctype_wchar*, wchar_t*, const wchar_t*), \ + (this, first, last)) const wchar_t* __thiscall ctype_wchar_do_tolower(const ctype_wchar *this, wchar_t *first, const wchar_t *last) { - FIXME("(%p %p %p) stub\n", this, first, last); - return NULL; + TRACE("(%p %p %p)\n", this, first, last); + for(; first<last; first++) + *first = _Towlower(*first, &this->ctype); + return last; } /* ?tolower@?$ctype(a)_W@std@@QBE_W_W(a)Z */ @@ -2178,8 +2191,8 @@ const wchar_t* __thiscall ctype_wchar_do_tolower(const ctype_wchar *this, DEFINE_THISCALL_WRAPPER(ctype_wchar_tolower_ch, 8) wchar_t __thiscall ctype_wchar_tolower_ch(const ctype_wchar *this, wchar_t ch) { - FIXME("(%p %d) stub\n", this, ch); - return 0; + TRACE("(%p %d)\n", this, ch); + return call_ctype_wchar_do_tolower_ch(this, ch); } /* ?tolower@?$ctype(a)_W@std@@QBEPB_WPA_WPB_W(a)Z */ @@ -2190,8 +2203,8 @@ DEFINE_THISCALL_WRAPPER(ctype_wchar_tolower, 12) const wchar_t* __thiscall ctype_wchar_tolower(const ctype_wchar *this, wchar_t *first, const wchar_t *last) { - FIXME("(%p %p %p) stub\n", this, first, last); - return NULL; + TRACE("(%p %p %p)\n", this, first, last); + return call_ctype_wchar_do_tolower(this, first, last); } /* ?do_toupper@?$ctype(a)_W@std@@MBE_W_W(a)Z */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index a5b5dbc..f03e024 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5800,7 +5800,7 @@ @ stub _Strxfrm @ cdecl _Tolower(long ptr) @ cdecl _Toupper(long ptr) -@ stub _Towlower +@ cdecl _Towlower(long ptr) @ stub _Towupper @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr)

1 0

Piotr Caban : msvcp90: Added ctype<wchar_t>::scan functions implementation.
by Alexandre Julliard Dec. 22, 2011

Dec. 22, 2011

Module: wine Branch: master Commit: b433f1cd04c8d4d6fa61413b71c535ffae82f7c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b433f1cd04c8d4d6fa61413b7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 22 18:25:23 2011 +0100 msvcp90: Added ctype<wchar_t>::scan functions implementation. --- dlls/msvcp90/locale.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index a8d04d4..a628e4d 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -2339,11 +2339,17 @@ const wchar_t* __thiscall ctype_wchar_is(const ctype_wchar *this, /* ?do_scan_is@?$ctype(a)G@std@@MBEPBGFPBG0(a)Z */ /* ?do_scan_is@?$ctype(a)G@std@@MEBAPEBGFPEBG0(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar_do_scan_is, 16) +#define call_ctype_wchar_do_scan_is(this, mask, first, last) CALL_VTBL_FUNC(this, 12, \ + const wchar_t*, (const ctype_wchar*, short, const wchar_t*, const wchar_t*), \ + (this, mask, first, last)) const wchar_t* __thiscall ctype_wchar_do_scan_is(const ctype_wchar *this, short mask, const wchar_t *first, const wchar_t *last) { - FIXME("(%p %d %p %p) stub\n", this, mask, first, last); - return NULL; + TRACE("(%p %d %p %p)\n", this, mask, first, last); + for(; first<last; first++) + if(!ctype_wchar_is_ch(this, mask, *first)) + break; + return first; } /* ?scan_is@?$ctype(a)_W@std@@QBEPB_WFPB_W0(a)Z */ @@ -2354,8 +2360,8 @@ DEFINE_THISCALL_WRAPPER(ctype_wchar_scan_is, 16) const wchar_t* __thiscall ctype_wchar_scan_is(const ctype_wchar *this, short mask, const wchar_t *first, const wchar_t *last) { - FIXME("(%p %x %p %p) stub\n", this, mask, first, last); - return NULL; + TRACE("(%p %x %p %p)\n", this, mask, first, last); + return call_ctype_wchar_do_scan_is(this, mask, first, last); } /* ?do_scan_not@?$ctype(a)_W@std@@MBEPB_WFPB_W0(a)Z */ @@ -2363,11 +2369,17 @@ const wchar_t* __thiscall ctype_wchar_scan_is(const ctype_wchar *this, /* ?do_scan_not@?$ctype(a)G@std@@MBEPBGFPBG0(a)Z */ /* ?do_scan_not@?$ctype(a)G@std@@MEBAPEBGFPEBG0(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar_do_scan_not, 16) +#define call_ctype_wchar_do_scan_not(this, mask, first, last) CALL_VTBL_FUNC(this, 16, \ + const wchar_t*, (const ctype_wchar*, short, const wchar_t*, const wchar_t*), \ + (this, mask, first, last)) const wchar_t* __thiscall ctype_wchar_do_scan_not(const ctype_wchar *this, short mask, const wchar_t *first, const wchar_t *last) { - FIXME("(%p %x %p %p) stub\n", this, mask, first, last); - return NULL; + TRACE("(%p %x %p %p)\n", this, mask, first, last); + for(; first<last; first++) + if(ctype_wchar_is_ch(this, mask, *first)) + break; + return first; } /* ?scan_not@?$ctype(a)_W@std@@QBEPB_WFPB_W0(a)Z */ @@ -2378,8 +2390,8 @@ DEFINE_THISCALL_WRAPPER(ctype_wchar_scan_not, 16) const wchar_t* __thiscall ctype_wchar_scan_not(const ctype_wchar *this, short mask, const wchar_t *first, const wchar_t *last) { - FIXME("(%p %x %p %p) stub\n", this, mask, first, last); - return NULL; + TRACE("(%p %x %p %p)\n", this, mask, first, last); + return call_ctype_wchar_do_scan_not(this, mask, first, last); } /* ??0_Locimp(a)locale@std@@AAE(a)_N@Z */

1 0

Piotr Caban : msvcp90: Added ctype<wchar_t>::is functions implementation.
by Alexandre Julliard Dec. 22, 2011

Dec. 22, 2011

Module: wine Branch: master Commit: 1de0fe3a004b342086c58b8c3d92473280a2bc8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1de0fe3a004b342086c58b8c3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 22 18:25:07 2011 +0100 msvcp90: Added ctype<wchar_t>::is functions implementation. --- dlls/msvcp90/locale.c | 38 ++++++++++++++++++++++++++++++-------- dlls/msvcp90/msvcp90.spec | 4 ++-- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 0ffc25c..a8d04d4 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -2266,15 +2266,34 @@ const wchar_t* __thiscall ctype_wchar_toupper(const ctype_wchar *this, return call_ctype_wchar_do_toupper(this, first, last); } +/* _Getwctypes */ +const wchar_t* __cdecl _Getwctypes(const wchar_t *first, const wchar_t *last, + short *mask, const _Ctypevec *ctype) +{ + TRACE("(%p %p %p %p)\n", first, last, mask, ctype); + GetStringTypeW(CT_CTYPE1, first, last-first, (WORD*)mask); + return last; +} + +/* _Getwctype */ +short __cdecl _Getwctype(wchar_t ch, const _Ctypevec *ctype) +{ + short mask = 0; + _Getwctypes(&ch, &ch+1, &mask, ctype); + return mask; +} + /* ?do_is@?$ctype(a)_W@std@@MBE_NF_W(a)Z */ /* ?do_is@?$ctype(a)_W@std@@MEBA_NF_W(a)Z */ /* ?do_is@?$ctype(a)G@std@@MBE_NFG(a)Z */ /* ?do_is@?$ctype(a)G@std@@MEBA_NFG(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar_do_is_ch, 12) +#define call_ctype_wchar_do_is_ch(this, mask, ch) CALL_VTBL_FUNC(this, 8, \ + MSVCP_bool, (const ctype_wchar*, short, wchar_t), (this, mask, ch)) MSVCP_bool __thiscall ctype_wchar_do_is_ch(const ctype_wchar *this, short mask, wchar_t ch) { - FIXME("(%p %x %d) stub\n", this, mask, ch); - return 0; + TRACE("(%p %x %d)\n", this, mask, ch); + return !(_Getwctype(ch, &this->ctype) & mask); } /* ?do_is@?$ctype(a)_W@std@@MBEPB_WPB_W0PAF(a)Z */ @@ -2282,11 +2301,14 @@ MSVCP_bool __thiscall ctype_wchar_do_is_ch(const ctype_wchar *this, short mask, /* ?do_is@?$ctype(a)G@std@@MBEPBGPBG0PAF(a)Z */ /* ?do_is@?$ctype(a)G@std@@MEBAPEBGPEBG0PEAF(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar_do_is, 16) +#define call_ctype_wchar_do_is(this, first, last, dest) CALL_VTBL_FUNC(this, 4, \ + const wchar_t*, (const ctype_wchar*, const wchar_t*, const wchar_t*, short*), \ + (this, first, last, dest)) const wchar_t* __thiscall ctype_wchar_do_is(const ctype_wchar *this, const wchar_t *first, const wchar_t *last, short *dest) { - FIXME("(%p %p %p %p) stub\n", this, first, last, dest); - return NULL; + TRACE("(%p %p %p %p)\n", this, first, last, dest); + return _Getwctypes(first, last, dest, &this->ctype); } /* ?is@?$ctype(a)_W@std@@QBE_NF_W(a)Z */ @@ -2296,8 +2318,8 @@ const wchar_t* __thiscall ctype_wchar_do_is(const ctype_wchar *this, DEFINE_THISCALL_WRAPPER(ctype_wchar_is_ch, 12) MSVCP_bool __thiscall ctype_wchar_is_ch(const ctype_wchar *this, short mask, wchar_t ch) { - FIXME("(%p %x %d) stub\n", this, mask, ch); - return 0; + TRACE("(%p %x %d)\n", this, mask, ch); + return call_ctype_wchar_do_is_ch(this, mask, ch); } /* ?is@?$ctype(a)_W@std@@QBEPB_WPB_W0PAF(a)Z */ @@ -2308,8 +2330,8 @@ DEFINE_THISCALL_WRAPPER(ctype_wchar_is, 16) const wchar_t* __thiscall ctype_wchar_is(const ctype_wchar *this, const wchar_t *first, const wchar_t *last, short *dest) { - FIXME("(%p %p %p %p) stub\n", this, first, last, dest); - return NULL; + TRACE("(%p %p %p %p)\n", this, first, last, dest); + return call_ctype_wchar_do_is(this, first, last, dest); } /* ?do_scan_is@?$ctype(a)_W@std@@MBEPB_WFPB_W0(a)Z */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 1555fac..fa7fef7 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5754,8 +5754,8 @@ @ cdecl _Getctype() @ cdecl _Getcvt() @ stub _Getdateorder -@ stub _Getwctype -@ stub _Getwctypes +@ cdecl _Getwctype(long ptr) +@ cdecl _Getwctypes(ptr ptr ptr ptr) @ extern _Hugeval @ extern _Inf @ stub _LCosh

1 0

Piotr Caban : msvcp90: Added ctype<wchar_t> constructors implementation.
by Alexandre Julliard Dec. 22, 2011

Dec. 22, 2011

Module: wine Branch: master Commit: b4a93e46ccea70b69e9cd5d8452831c2bd17067a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4a93e46ccea70b69e9cd5d84… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 22 18:24:07 2011 +0100 msvcp90: Added ctype<wchar_t> constructors implementation. --- dlls/msvcp90/locale.c | 72 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 55 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index ad72732..7474586 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -1674,16 +1674,16 @@ extern const vtable_ptr MSVCP_ctype_short_vtable; /* ?_Id_func@?$ctype(a)_W@std@@SAAEAVid(a)locale@2(a)XZ */ locale_id* __cdecl ctype_wchar__Id_func(void) { - FIXME("() stub\n"); - return NULL; + TRACE("()\n"); + return &ctype_wchar_id; } /* ?_Id_func@?$ctype(a)G@std@@SAAAVid(a)locale@2(a)XZ */ /* ?_Id_func@?$ctype(a)G@std@@SAAEAVid(a)locale@2(a)XZ */ locale_id* __cdecl ctype_short__Id_func(void) { - FIXME("() stub\n"); - return NULL; + TRACE("()\n"); + return &ctype_short_id; } /* ?_Init@?$ctype(a)_W@std@@IAEXABV_Locinfo(a)2@@Z */ @@ -1693,7 +1693,9 @@ locale_id* __cdecl ctype_short__Id_func(void) DEFINE_THISCALL_WRAPPER(ctype_wchar__Init, 8) void __thiscall ctype_wchar__Init(ctype_wchar *this, _Locinfo *locinfo) { - FIXME("(%p %p) stub\n", this, locinfo); + TRACE("(%p %p)\n", this, locinfo); + this->ctype = _Locinfo__Getctype(locinfo); + this->cvt = _Locinfo__Getcvt(locinfo); } /* ??0?$ctype(a)_W@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ @@ -1702,9 +1704,11 @@ DEFINE_THISCALL_WRAPPER(ctype_wchar_ctor_locinfo, 12) ctype_wchar* __thiscall ctype_wchar_ctor_locinfo(ctype_wchar *this, _Locinfo *locinfo, MSVCP_size_t refs) { - FIXME("(%p %p %lu) stub\n", this, locinfo, refs); + TRACE("(%p %p %lu)\n", this, locinfo, refs); + ctype_base_ctor_refs(&this->base, refs); this->base.facet.vtable = &MSVCP_ctype_wchar_vtable; - return NULL; + ctype_wchar__Init(this, locinfo); + return this; } /* ??0?$ctype(a)G@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ @@ -1723,9 +1727,17 @@ ctype_wchar* __thiscall ctype_short_ctor_locinfo(ctype_wchar *this, DEFINE_THISCALL_WRAPPER(ctype_wchar_ctor_refs, 8) ctype_wchar* __thiscall ctype_wchar_ctor_refs(ctype_wchar *this, MSVCP_size_t refs) { - FIXME("(%p %lu) stub\n", this, refs); + _Locinfo locinfo; + + TRACE("(%p %lu)\n", this, refs); + + ctype_base_ctor_refs(&this->base, refs); this->base.facet.vtable = &MSVCP_ctype_wchar_vtable; - return NULL; + + _Locinfo_ctor(&locinfo); + ctype_wchar__Init(this, &locinfo); + _Locinfo_dtor(&locinfo); + return this; } /* ??0?$ctype(a)G@std@@QAE(a)I@Z */ @@ -1739,13 +1751,22 @@ ctype_wchar* __thiscall ctype_short_ctor_refs(ctype_wchar *this, MSVCP_size_t re } /* ??0?$ctype(a)G@std@@IAE(a)PBDI@Z */ +/* ??0?$ctype(a)G@std@@IEAA(a)PEBD_K@Z */ DEFINE_THISCALL_WRAPPER(ctype_short_ctor_name, 12) ctype_wchar* __thiscall ctype_short_ctor_name(ctype_wchar *this, const char *name, MSVCP_size_t refs) { - FIXME("(%p %s %lu) stub\n", this, debugstr_a(name), refs); + _Locinfo locinfo; + + TRACE("(%p %s %lu)\n", this, debugstr_a(name), refs); + + ctype_base_ctor_refs(&this->base, refs); this->base.facet.vtable = &MSVCP_ctype_short_vtable; - return NULL; + + _Locinfo_ctor_cstr(&locinfo, name); + ctype_wchar__Init(this, &locinfo); + _Locinfo_dtor(&locinfo); + return this; } /* ??_F?$ctype(a)_W@std@@QAEXXZ */ @@ -1753,9 +1774,8 @@ ctype_wchar* __thiscall ctype_short_ctor_name(ctype_wchar *this, DEFINE_THISCALL_WRAPPER(ctype_wchar_ctor, 4) ctype_wchar* __thiscall ctype_wchar_ctor(ctype_wchar *this) { - FIXME("(%p) stub\n", this); - this->base.facet.vtable = &MSVCP_ctype_wchar_vtable; - return NULL; + TRACE("(%p)\n", this); + return ctype_short_ctor_refs(this, 0); } /* ??_F?$ctype(a)G@std@@QAEXXZ */ @@ -1775,7 +1795,9 @@ ctype_wchar* __thiscall ctype_short_ctor(ctype_wchar *this) DEFINE_THISCALL_WRAPPER(ctype_wchar_dtor, 4) void __thiscall ctype_wchar_dtor(ctype_wchar *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + if(this->ctype.delfl) + free((void*)this->ctype.table); } DEFINE_THISCALL_WRAPPER(MSVCP_ctype_wchar_vector_dtor, 8) @@ -1972,8 +1994,24 @@ const char* __thiscall ctype_wchar__Widen_s(const ctype_wchar *this, /* ?_Getcat@?$ctype(a)G@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ MSVCP_size_t __cdecl ctype_wchar__Getcat(const locale_facet **facet, const locale *loc) { - FIXME("(%p %p) stub\n", facet, loc); - return 0; + TRACE("(%p %p)\n", facet, loc); + + if(facet && !*facet) { + _Locinfo locinfo; + + *facet = MSVCRT_operator_new(sizeof(ctype_wchar)); + if(!*facet) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return 0; + } + + _Locinfo_ctor_cstr(&locinfo, MSVCP_basic_string_char_c_str(&loc->ptr->name)); + ctype_wchar_ctor_locinfo((ctype_wchar*)*facet, &locinfo, 0); + _Locinfo_dtor(&locinfo); + } + + return LC_CTYPE; } /* ?do_tolower@?$ctype(a)_W@std@@MBE_W_W(a)Z */

1 0

Piotr Caban : msvcp90: Added ctype<wchar_t>::widen functions implementation .
by Alexandre Julliard Dec. 22, 2011

Dec. 22, 2011

Module: wine Branch: master Commit: a75d94289b00b54c09bacc273d502be7e041ce8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a75d94289b00b54c09bacc273… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 22 18:24:36 2011 +0100 msvcp90: Added ctype<wchar_t>::widen functions implementation. --- dlls/msvcp90/locale.c | 118 ++++++++++++++++++++++++++++++++++++++------- dlls/msvcp90/msvcp90.spec | 12 ++-- 2 files changed, 107 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a75d94289b00b54c09bac…

1 0

Aric Stewart : usp10: Implement ScriptGetFontScriptTags.
by Alexandre Julliard Dec. 22, 2011

Dec. 22, 2011

Module: wine Branch: master Commit: 525d9d151973b795a364a44d6f6c582d462c8cd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=525d9d151973b795a364a44d6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 22 10:46:34 2011 -0600 usp10: Implement ScriptGetFontScriptTags. --- dlls/usp10/shape.c | 60 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/tests/usp10.c | 44 +++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 9 ++++++ dlls/usp10/usp10.spec | 2 +- dlls/usp10/usp10_internal.h | 1 + 5 files changed, 115 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index c238d09..7f23296 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -3775,3 +3775,63 @@ DWORD CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, LPWORD pgi, DW } return 0; } + +static HRESULT GSUB_GetFontScriptTags(LPCVOID table, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags, LPCVOID* script_table) +{ + const GSUB_ScriptList *script; + const GSUB_Header* header = (const GSUB_Header*)table; + int i; + HRESULT rc = S_OK; + + script = (const GSUB_ScriptList*)((const BYTE*)header + GET_BE_WORD(header->ScriptList)); + + *pcTags = 0; + TRACE("%i scripts in this font\n",GET_BE_WORD(script->ScriptCount)); + if (!searchingFor && cMaxTags < GET_BE_WORD(script->ScriptCount)) + rc = E_OUTOFMEMORY; + for (i = 0; i < GET_BE_WORD(script->ScriptCount); i++) + { + if (searchingFor) + { + if (strncmp(script->ScriptRecord[i].ScriptTag, (char*)&searchingFor,4)==0) + { + pScriptTags[0] = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); + *pcTags = 1; + if (script_table) + { + int offset = GET_BE_WORD(script->ScriptRecord[i].Script); + *script_table = ((const BYTE*)script + offset); + } + break; + } + } + else if (i < cMaxTags) + { + pScriptTags[i] = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); + *pcTags = *pcTags + 1; + } + } + return rc; +} + +HRESULT SHAPE_GetFontScriptTags( HDC hdc, ScriptCache *psc, + SCRIPT_ANALYSIS *psa, int cMaxTags, + OPENTYPE_TAG *pScriptTags, int *pcTags) +{ + HRESULT hr; + OPENTYPE_TAG searching = 0x00000000; + + if (!psc->GSUB_Table) + psc->GSUB_Table = load_gsub_table(hdc); + + if (psa) + { + if (ShapingData[psa->eScript].otTag[0] != 0) + searching = MS_MAKE_TAG(ShapingData[psa->eScript].otTag[0], ShapingData[psa->eScript].otTag[1], ShapingData[psa->eScript].otTag[2], ShapingData[psa->eScript].otTag[3]); + } + + hr = GSUB_GetFontScriptTags(psc->GSUB_Table, searching, cMaxTags, pScriptTags, pcTags, NULL); + if (FAILED(hr)) + *pcTags = 0; + return hr; +} diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 2e05f48..cdd1510 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -59,6 +59,8 @@ static HRESULT (WINAPI *pScriptShapeOpenType)( HDC hdc, SCRIPT_CACHE *psc, SCRIP static DWORD (WINAPI *pGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); +static HRESULT (WINAPI *pScriptGetFontScriptTags)( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS *psa, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags); + static inline void _test_items_ok(LPCWSTR string, DWORD cchString, SCRIPT_CONTROL *Control, SCRIPT_STATE *State, DWORD nItems, const itemTest* items, BOOL nItemsToDo, @@ -2865,6 +2867,46 @@ static void test_newlines(void) ok(count == 4, "got %d expected 4\n", count); } +static void test_ScriptGetFontFunctions(HDC hdc) +{ + HRESULT hr; + pScriptGetFontScriptTags = (void*)GetProcAddress(GetModuleHandleA("usp10.dll"), "ScriptGetFontScriptTags"); + if (!pScriptGetFontScriptTags) + { + win_skip("ScriptGetFontScriptTags not available on this platform\n"); + } + else + { + SCRIPT_CACHE sc = NULL; + OPENTYPE_TAG tags[5]; + int count = 0; + + hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 0, NULL, NULL); + ok(hr == E_INVALIDARG,"Incorrect return code\n"); + ok(sc == NULL, "ScriptCache should remain uninitialized\n"); + hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 0, NULL, &count); + ok(hr == E_INVALIDARG,"Incorrect return code\n"); + ok(sc == NULL, "ScriptCache should remain uninitialized\n"); + hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 5, tags, NULL); + ok(hr == E_INVALIDARG,"Incorrect return code\n"); + ok(sc == NULL, "ScriptCache should remain uninitialized\n"); + hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 0, tags, &count); + ok(hr == E_INVALIDARG,"Incorrect return code\n"); + ok(sc == NULL, "ScriptCache should remain uninitialized\n"); + hr = pScriptGetFontScriptTags(NULL, &sc, NULL, 5, tags, &count); + ok(hr == E_PENDING,"Incorrect return code\n"); + ok(sc == NULL, "ScriptCache should remain uninitialized\n"); + hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 5, tags, &count); + ok((hr == S_OK || hr == E_OUTOFMEMORY),"Incorrect return code\n"); + if (hr == S_OK) + ok(count <= 5, "Count should be less or equal to 5 with S_OK return\n"); + else if (hr == E_OUTOFMEMORY) + ok(count == 0, "Count should be 0 with E_OUTOFMEMORY return\n"); + ok(sc != NULL, "ScriptCache should be initialized\n"); + ScriptFreeCache(&sc); + } +} + START_TEST(usp10) { HWND hwnd; @@ -2917,6 +2959,8 @@ START_TEST(usp10) test_ScriptBreak(); test_newlines(); + test_ScriptGetFontFunctions(hdc); + ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); } diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 93d7b0f..14674a7 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3525,3 +3525,12 @@ HRESULT WINAPI ScriptJustify(const SCRIPT_VISATTR *sva, const int *advance, for (i = 0; i < num_glyphs; i++) justify[i] = advance[i]; return S_OK; } + +HRESULT WINAPI ScriptGetFontScriptTags( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS *psa, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags) +{ + HRESULT hr; + if (!pScriptTags || !pcTags || cMaxTags == 0) return E_INVALIDARG; + if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; + + return SHAPE_GetFontScriptTags(hdc, (ScriptCache *)*psc, psa, cMaxTags, pScriptTags, pcTags); +} diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 05269c5..63375a5 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -10,7 +10,7 @@ @ stub ScriptGetFontFeatureTags @ stub ScriptGetFontLanguageTags @ stdcall ScriptGetFontProperties(long ptr ptr) -@ stub ScriptGetFontScriptTags +@ stdcall ScriptGetFontScriptTags(long ptr ptr long ptr ptr) @ stdcall ScriptGetGlyphABCWidth(ptr ptr long ptr) @ stdcall ScriptGetLogicalWidths(ptr long long ptr ptr ptr ptr) @ stdcall ScriptGetProperties(ptr long) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index ea04324..559a0bc 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -184,6 +184,7 @@ void SHAPE_ApplyDefaultOpentypeFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYS HRESULT SHAPE_CheckFontForRequiredFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa) DECLSPEC_HIDDEN; void SHAPE_CharGlyphProp(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp) DECLSPEC_HIDDEN; INT SHAPE_does_GSUB_feature_apply_to_chars(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, const WCHAR *chars, INT write_dir, INT count, const char* feature) DECLSPEC_HIDDEN; +HRESULT SHAPE_GetFontScriptTags( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags); void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR input, int cChars, IndicSyllable **syllables, int *syllable_count, lexical_function lexical_f, reorder_function reorder_f, BOOL modern) DECLSPEC_HIDDEN; void Indic_ParseSyllables( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR input, const int cChar, IndicSyllable **syllables, int *syllable_count, lexical_function lex, BOOL modern);

1 0

Jörg Höhle : winealsa: Use an ALSA buffer of 4 periods to limit prefill.
by Alexandre Julliard Dec. 22, 2011

Dec. 22, 2011

Module: wine Branch: master Commit: 6d17715b01dc09a2091e5d7ed4932da8f2504e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d17715b01dc09a2091e5d7ed… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Nov 11 06:33:24 2011 +0400 winealsa: Use an ALSA buffer of 4 periods to limit prefill. --- dlls/winealsa.drv/mmdevdrv.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index e79a7b6..2557e6e 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -945,6 +945,24 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->hw_params, &alsa_period_us, NULL)) < 0) WARN("Unable to set period time near %u: %d (%s)\n", alsa_period_us, err, snd_strerror(err)); + /* ALSA updates the output variable alsa_period_us */ + + This->mmdev_period_frames = MulDiv(fmt->nSamplesPerSec, + This->mmdev_period_rt, 10000000); + + This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); + + /* Buffer 4 ALSA periods if large enough, else 4 mmdevapi periods */ + This->alsa_bufsize_frames = This->mmdev_period_frames * 4; + if(err < 0 || alsa_period_us < period / 10) + err = snd_pcm_hw_params_set_buffer_size_near(This->pcm_handle, + This->hw_params, &This->alsa_bufsize_frames); + else{ + unsigned int periods = 4; + err = snd_pcm_hw_params_set_periods_near(This->pcm_handle, This->hw_params, &periods, NULL); + } + if(err < 0) + WARN("Unable to set buffer size: %d (%s)\n", err, snd_strerror(err)); if((err = snd_pcm_hw_params(This->pcm_handle, This->hw_params)) < 0){ WARN("Unable to set hw params: %d (%s)\n", err, snd_strerror(err)); @@ -1008,12 +1026,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, /* Check if the ALSA buffer is so small that it will run out before * the next MMDevAPI period tick occurs. Allow a little wiggle room * with 120% of the period time. */ - This->mmdev_period_frames = (fmt->nSamplesPerSec * This->mmdev_period_rt) / 10000000.; if(This->alsa_bufsize_frames < 1.2 * This->mmdev_period_frames) - FIXME("ALSA buffer time is smaller than our period time. Expect underruns. (%lu < %u)\n", + FIXME("ALSA buffer time is too small. Expect underruns. (%lu < %u * 1.2)\n", This->alsa_bufsize_frames, This->mmdev_period_frames); - This->bufsize_frames = ceil((duration / 10000000.) * fmt->nSamplesPerSec); This->local_buffer = HeapAlloc(GetProcessHeap(), 0, This->bufsize_frames * fmt->nBlockAlign); if(!This->local_buffer){

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetVectorArray() test.
by Alexandre Julliard Dec. 22, 2011

Dec. 22, 2011

Module: wine Branch: master Commit: 0c1574bd5e49b771321dda9ff1a933705f5bacf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c1574bd5e49b771321dda9ff… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Dec 22 12:16:19 2011 +0100 d3dx9/tests: Add effect parameter value GetVectorArray() test. --- dlls/d3dx9_36/tests/effect.c | 62 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 36ec9ca..8cf01de 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -859,6 +859,67 @@ static void test_effect_parameter_value_GetVector(const struct test_effect_param } } +static void test_effect_parameter_value_GetVectorArray(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + HRESULT hr; + DWORD cmp = 0xabababab; + FLOAT fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; + UINT l, k; + + memset(fvalue, 0xab, sizeof(fvalue)); + hr = effect->lpVtbl->GetVectorArray(effect, parameter, (D3DXVECTOR4 *)&fvalue, res_desc->Elements); + if (!res_desc->Elements) + { + ok(hr == D3D_OK, "%u - %s: GetVectorArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetVectorArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } + else if (res_desc->Elements && res_desc->Class == D3DXPC_VECTOR) + { + ok(hr == D3D_OK, "%u - %s: GetVectorArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (k = 0; k < res_desc->Elements; ++k) + { + for (l = 0; l < res_desc->Columns; ++l) + { + ok(compare_float(fvalue[l + k * 4], get_float(res_desc->Type, &res_value[ l + k * res_desc->Columns]), 512), + "%u - %s: GetVectorArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l + k * 4, fvalue[ l + k * 4], get_float(res_desc->Type, &res_value[ l + k * res_desc->Columns])); + } + + for (l = res_desc->Columns; l < 4; ++l) + { + ok(fvalue[ l + k * 4] == 0.0f, "%u - %s: GetVectorArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l + k * 4, fvalue[ l + k * 4], 0.0f); + } + } + + for (l = res_desc->Elements * 4; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetVectorArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetVectorArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetVectorArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -936,6 +997,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetFloat(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetFloatArray(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetVector(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetVectorArray(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetFloat() test.
by Alexandre Julliard Dec. 22, 2011

Dec. 22, 2011

Module: wine Branch: master Commit: 47ae7db16af7d9772a129eb095dddf62b199f2f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ae7db16af7d9772a129eb09… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Dec 22 12:16:08 2011 +0100 d3dx9/tests: Add effect parameter value GetFloat() test. --- dlls/d3dx9_36/tests/effect.c | 70 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 54d6a25..c3153a0 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -18,10 +18,27 @@ #define COBJMACROS #include "initguid.h" +#include <limits.h> #include "wine/test.h" #include "d3dx9.h" /* helper functions */ +static BOOL compare_float(FLOAT f, FLOAT g, UINT ulps) +{ + INT x = *(INT *)&f; + INT y = *(INT *)&g; + + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; + + if (abs(x - y) > ulps) + return FALSE; + + return TRUE; +} + static inline INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) { INT i; @@ -49,6 +66,33 @@ static inline INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) return i; } +static inline FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) +{ + FLOAT f; + + switch (type) + { + case D3DXPT_FLOAT: + f = *(FLOAT *)data; + break; + + case D3DXPT_INT: + f = *(INT *)data; + break; + + case D3DXPT_BOOL: + f = *(BOOL *)data; + break; + + default: + f = 0.0f; + ok(0, "Unhandled type %x.\n", type); + break; + } + + return f; +} + static inline BOOL get_bool(LPCVOID data) { return (*(BOOL *)data) ? TRUE : FALSE; @@ -688,6 +732,31 @@ static void test_effect_parameter_value_GetIntArray(const struct test_effect_par } } +static void test_effect_parameter_value_GetFloat(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + HRESULT hr; + DWORD cmp = 0xabababab; + FLOAT fvalue = *(FLOAT *)&cmp; + + hr = effect->lpVtbl->GetFloat(effect, parameter, &fvalue); + if (!res_desc->Elements && res_desc->Columns == 1 && res_desc->Rows == 1) + { + ok(hr == D3D_OK, "%u - %s: GetFloat failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + ok(compare_float(fvalue, get_float(res_desc->Type, res_value), 512), "%u - %s: GetFloat fvalue failed, got %f, expected %f\n", + i, res_full_name, fvalue, get_float(res_desc->Type, res_value)); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetFloat failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + ok(fvalue == *(FLOAT *)&cmp, "%u - %s: GetFloat fvalue failed, got %f, expected %f\n", + i, res_full_name, fvalue, *(FLOAT *)&cmp); + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -762,6 +831,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetBoolArray(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetInt(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetIntArray(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetFloat(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9: Simplify ID3DXBaseEffect:: SetInt().
by Alexandre Julliard Dec. 22, 2011

Dec. 22, 2011

Module: wine Branch: master Commit: ed700553e03b9d4618e8d7be5719d46b6aeac4b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed700553e03b9d4618e8d7be5… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Dec 22 12:15:53 2011 +0100 d3dx9: Simplify ID3DXBaseEffect::SetInt(). --- dlls/d3dx9_36/effect.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 75680d3..01a407c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1,5 +1,6 @@ /* * Copyright 2010 Christian Costa + * Copyright 2011 Rico Schüller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1839,19 +1840,14 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetInt(ID3DXBaseEffect *iface, D3DXHAN ((param->class == D3DXPC_VECTOR && param->columns != 2) || (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) { - FLOAT tmp = ((n & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; - set_number((DWORD *)param->data, param->type, &tmp, D3DXPT_FLOAT); - - tmp = ((n & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; - set_number((DWORD *)param->data + 1, param->type, &tmp, D3DXPT_FLOAT); - - tmp = (n & 0xff) * INT_FLOAT_MULTI_INVERSE; - set_number((DWORD *)param->data + 2, param->type, &tmp, D3DXPT_FLOAT); + TRACE("Vector fixup\n"); + *(FLOAT *)param->data = ((n & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; + ((FLOAT *)param->data)[1] = ((n & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; + ((FLOAT *)param->data)[2] = (n & 0xff) * INT_FLOAT_MULTI_INVERSE; if (param->rows * param->columns > 3) { - tmp = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; - set_number((DWORD *)param->data + 3, param->type, &tmp, D3DXPT_FLOAT); + ((FLOAT *)param->data)[3] = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; } return D3D_OK; } @@ -1882,6 +1878,8 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetInt(ID3DXBaseEffect *iface, D3DXHAN ((param->class == D3DXPC_VECTOR && param->columns != 2) || (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) { + TRACE("Vector fixup\n"); + /* all components (3,4) are clamped (0,255) and put in the INT */ *n = (INT)(min(max(0.0f, *((FLOAT *)param->data + 2)), 1.0f) * INT_FLOAT_MULTI); *n += ((INT)(min(max(0.0f, *((FLOAT *)param->data + 1)), 1.0f) * INT_FLOAT_MULTI)) << 8;

1 0