December 2011 - Wine-commits

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

22 Dec '11

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

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

22 Dec '11

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>:: toupper functions implementation.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 8f3a5198bc5abe1a0f105c1665f82fdc3973ce74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f3a5198bc5abe1a0f105c166… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 22 18:24:55 2011 +0100 msvcp90: Added ctype<wchar_t>::toupper functions implementation. --- dlls/msvcp90/locale.c | 29 +++++++++++++++++++++-------- dlls/msvcp90/msvcp90.spec | 2 +- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 24d521f..0ffc25c 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -2207,15 +2207,23 @@ const wchar_t* __thiscall ctype_wchar_tolower(const ctype_wchar *this, return call_ctype_wchar_do_tolower(this, first, last); } +/* _Towupper */ +wchar_t __cdecl _Towupper(wchar_t ch, const _Ctypevec *ctype) +{ + TRACE("(%d %p)\n", ch, ctype); + return toupperW(ch); +} + /* ?do_toupper@?$ctype(a)_W@std@@MBE_W_W(a)Z */ /* ?do_toupper@?$ctype(a)_W@std@@MEBA_W_W(a)Z */ /* ?do_toupper@?$ctype(a)G@std@@MBEGG(a)Z */ /* ?do_toupper@?$ctype(a)G@std@@MEBAGG(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar_do_toupper_ch, 8) +#define call_ctype_wchar_do_toupper_ch(this, ch) CALL_VTBL_FUNC(this, 32, \ + wchar_t, (const ctype_wchar*, wchar_t), (this, ch)) wchar_t __thiscall ctype_wchar_do_toupper_ch(const ctype_wchar *this, wchar_t ch) { - FIXME("(%p %d) stub\n", this, ch); - return 0; + return _Towupper(ch, &this->ctype); } /* ?do_toupper@?$ctype(a)_W@std@@MBEPB_WPA_WPB_W(a)Z */ @@ -2223,11 +2231,16 @@ wchar_t __thiscall ctype_wchar_do_toupper_ch(const ctype_wchar *this, wchar_t ch /* ?do_toupper@?$ctype(a)G@std@@MBEPBGPAGPBG(a)Z */ /* ?do_toupper@?$ctype(a)G@std@@MEBAPEBGPEAGPEBG(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar_do_toupper, 12) +#define call_ctype_wchar_do_toupper(this, first, last) CALL_VTBL_FUNC(this, 28, \ + const wchar_t*, (const ctype_wchar*, wchar_t*, const wchar_t*), \ + (this, first, last)) const wchar_t* __thiscall ctype_wchar_do_toupper(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 = _Towupper(*first, &this->ctype); + return last; } /* ?toupper@?$ctype(a)_W@std@@QBE_W_W(a)Z */ @@ -2237,8 +2250,8 @@ const wchar_t* __thiscall ctype_wchar_do_toupper(const ctype_wchar *this, DEFINE_THISCALL_WRAPPER(ctype_wchar_toupper_ch, 8) wchar_t __thiscall ctype_wchar_toupper_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_toupper_ch(this, ch); } /* ?toupper@?$ctype(a)_W@std@@QBEPB_WPA_WPB_W(a)Z */ @@ -2249,8 +2262,8 @@ DEFINE_THISCALL_WRAPPER(ctype_wchar_toupper, 12) const wchar_t* __thiscall ctype_wchar_toupper(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_toupper(this, first, last); } /* ?do_is@?$ctype(a)_W@std@@MBE_NF_W(a)Z */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index f03e024..1555fac 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5801,7 +5801,7 @@ @ cdecl _Tolower(long ptr) @ cdecl _Toupper(long ptr) @ cdecl _Towlower(long ptr) -@ stub _Towupper +@ cdecl _Towupper(long ptr) @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) @ stub _Wcsxfrm

1 0

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

22 Dec '11

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>::scan functions implementation.
by Alexandre Julliard 22 Dec '11

22 Dec '11

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

Alexandre Julliard : gdi32: Fix handling of COLORREFs with illegal values for the high byte.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 7f3a7ae5852ac73fea0e4a4cd73d5141b8f844a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f3a7ae5852ac73fea0e4a4cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 11:31:46 2011 +0100 gdi32: Fix handling of COLORREFs with illegal values for the high byte. --- dlls/gdi32/dibdrv/objects.c | 50 ++++++++++--------------------- dlls/gdi32/tests/dib.c | 70 +++++++++++++++++++++++++------------------ 2 files changed, 57 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f3a7ae5852ac73fea0e4…

1 0

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

22 Dec '11

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

Rico Schüller : d3dx9: Use a loop in get_vector().
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 9273ac028647494f206cf013ef5e08f3b99842ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9273ac028647494f206cf013e… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Dec 22 12:16:04 2011 +0100 d3dx9: Use a loop in get_vector(). --- dlls/d3dx9_36/effect.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 01a407c..fa28ae0 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -887,14 +887,6 @@ static inline BOOL get_bool(LPCVOID data) return (*(DWORD *)data) ? TRUE : FALSE; } -static void get_vector(struct d3dx_parameter *param, D3DXVECTOR4 *vector) -{ - vector->x = get_float(param->type, (float *)param->data); - vector->y = param->columns > 1 ? get_float(param->type, (float *)param->data + 1) : 0.0f; - vector->z = param->columns > 2 ? get_float(param->type, (float *)param->data + 2) : 0.0f; - vector->w = param->columns > 3 ? get_float(param->type, (float *)param->data + 3) : 0.0f; -} - static void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DXPARAMETER_TYPE intype) { TRACE("Changing from type %i to type %i\n", intype, outtype); @@ -920,6 +912,16 @@ static void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indat } } +static void get_vector(struct d3dx_parameter *param, D3DXVECTOR4 *vector) +{ + UINT i; + + for (i = 0; i < 4; ++i) + { + ((FLOAT *)vector)[i] = i < param->columns ? get_float(param->type, (DWORD *)param->data + i) : 0.0f; + } +} + static void set_vector(struct d3dx_parameter *param, CONST D3DXVECTOR4 *vector) { UINT i; @@ -932,14 +934,14 @@ static void set_vector(struct d3dx_parameter *param, CONST D3DXVECTOR4 *vector) static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) { - unsigned int i, k; + UINT i, k; for (i = 0; i < 4; ++i) { for (k = 0; k < 4; ++k) { if ((i < param->rows) && (k < param->columns)) - matrix->u.m[i][k] = get_float(param->type, (float *)param->data + i * param->columns + k); + matrix->u.m[i][k] = get_float(param->type, (FLOAT *)param->data + i * param->columns + k); else matrix->u.m[i][k] = 0.0f; } @@ -948,14 +950,14 @@ static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) static void set_matrix(struct d3dx_parameter *param, CONST D3DXMATRIX *matrix) { - unsigned int i, k; + UINT i, k; for (i = 0; i < 4; ++i) { for (k = 0; k < 4; ++k) { if ((i < param->rows) && (k < param->columns)) - set_number((float *)param->data + i * param->columns + k, param->type, &matrix->u.m[i][k], D3DXPT_FLOAT); + set_number((FLOAT *)param->data + i * param->columns + k, param->type, &matrix->u.m[i][k], D3DXPT_FLOAT); } } }

1 0

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

22 Dec '11

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/tests: Add effect parameter value GetFloatArray() test.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 828b82780d382d6f053576d1cd9bddebbf4ea33c URL: http://source.winehq.org/git/wine.git/?a=commit;h=828b82780d382d6f053576d1c… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Dec 22 12:16:11 2011 +0100 d3dx9/tests: Add effect parameter value GetFloatArray() test. --- dlls/d3dx9_36/tests/effect.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index c3153a0..37e04bd 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -757,6 +757,50 @@ static void test_effect_parameter_value_GetFloat(const struct test_effect_parame } } +static void test_effect_parameter_value_GetFloatArray(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; + FLOAT favalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; + HRESULT hr; + UINT l; + DWORD cmp = 0xabababab; + + memset(favalue, 0xab, sizeof(favalue)); + hr = effect->lpVtbl->GetFloatArray(effect, parameter, favalue, res_desc->Bytes / sizeof(*favalue)); + if (res_desc->Class == D3DXPC_SCALAR + || res_desc->Class == D3DXPC_VECTOR + || res_desc->Class == D3DXPC_MATRIX_ROWS) + { + ok(hr == D3D_OK, "%u - %s: GetFloatArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (l = 0; l < res_desc->Bytes / sizeof(*favalue); ++l) + { + ok(compare_float(favalue[l], get_float(res_desc->Type, &res_value[l]), 512), + "%u - %s: GetFloatArray favalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, favalue[l], get_float(res_desc->Type, &res_value[l])); + } + + for (l = res_desc->Bytes / sizeof(*favalue); l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(favalue[l] == *(FLOAT *)&cmp, "%u - %s: GetFloatArray favalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, favalue[l], *(FLOAT *)&cmp); + } + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetFloatArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(favalue[l] == *(FLOAT *)&cmp, "%u - %s: GetFloatArray favalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, favalue[l], *(FLOAT *)&cmp); + } + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -832,6 +876,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) 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); + test_effect_parameter_value_GetFloatArray(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0