July 2009 - Wine-commits - list.winehq.org

Piotr Caban : jscript: Make String_indexOf generic.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 4881cf8de454a10bfb5bd053d1bb5226f18ed87e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4881cf8de454a10bfb5bd053d… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 19:51:08 2009 +0200 jscript: Make String_indexOf generic. --- dlls/jscript/string.c | 32 +++++++++++++++++++++++--------- 1 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index b0185d9..0c9e3d6 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -481,20 +481,30 @@ static HRESULT String_indexOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR { DWORD length, pos = 0; const WCHAR *str; - BSTR search_str; + BSTR search_str, val_str = NULL; INT ret = -1; HRESULT hres; TRACE("\n"); - if(is_class(dispex, JSCLASS_STRING)) { - StringInstance *string = (StringInstance*)dispex; + if(!is_class(dispex, JSCLASS_STRING)) { + VARIANT this; - str = string->str; - length = string->length; - }else { - FIXME("not String this\n"); - return E_NOTIMPL; + V_VT(&this) = VT_DISPATCH; + V_DISPATCH(&this) = (IDispatch*)_IDispatchEx_(dispex); + + hres = to_string(dispex->ctx, &this, ei, &val_str); + if(FAILED(hres)) + return hres; + + str = val_str; + length = SysStringLen(val_str); + } + else { + StringInstance *this = (StringInstance*)dispex; + + str = this->str; + length = this->length; } if(!arg_cnt(dp)) { @@ -502,12 +512,15 @@ static HRESULT String_indexOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR V_VT(retv) = VT_I4; V_I4(retv) = -1; } + SysFreeString(val_str); return S_OK; } hres = to_string(dispex->ctx, get_arg(dp,0), ei, &search_str); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } if(arg_cnt(dp) >= 2) { VARIANT ival; @@ -534,6 +547,7 @@ static HRESULT String_indexOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR } SysFreeString(search_str); + SysFreeString(val_str); if(FAILED(hres)) return hres;

1 0

Piotr Caban : jscript: Make String_charCodeAt generic.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: a9d7135eccdb26effa32b8edad218ac6e75d349d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9d7135eccdb26effa32b8eda… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 22:05:57 2009 +0200 jscript: Make String_charCodeAt generic. --- dlls/jscript/string.c | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 4c83d68..b0185d9 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -340,30 +340,44 @@ static HRESULT String_charCodeAt(DispatchEx *dispex, LCID lcid, WORD flags, DISP VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { const WCHAR *str; + BSTR val_str = NULL; DWORD length, idx = 0; HRESULT hres; TRACE("\n"); - if(dispex->builtin_info->class == JSCLASS_STRING) { - StringInstance *string = (StringInstance*)dispex; + if(!is_class(dispex, JSCLASS_STRING)) { + VARIANT this; - str = string->str; - length = string->length; - }else { - FIXME("not string this not supported\n"); - return E_NOTIMPL; + V_VT(&this) = VT_DISPATCH; + V_DISPATCH(&this) = (IDispatch*)_IDispatchEx_(dispex); + + hres = to_string(dispex->ctx, &this, ei, &val_str); + if(FAILED(hres)) + return hres; + + str = val_str; + length = SysStringLen(val_str); + } + else { + StringInstance *this = (StringInstance*)dispex; + + str = this->str; + length = this->length; } if(arg_cnt(dp) > 0) { VARIANT v; hres = to_integer(dispex->ctx, get_arg(dp, 0), ei, &v); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } if(V_VT(&v) != VT_I4 || V_I4(&v) < 0 || V_I4(&v) >= length) { if(retv) num_set_nan(&v); + SysFreeString(val_str); return S_OK; } @@ -374,6 +388,8 @@ static HRESULT String_charCodeAt(DispatchEx *dispex, LCID lcid, WORD flags, DISP V_VT(retv) = VT_I4; V_I4(retv) = str[idx]; } + + SysFreeString(val_str); return S_OK; }

1 0

Piotr Caban : jscript: Make String_charAt generic.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 0fae85fc63d0bdee5435a3ff03fefc50eafaea3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fae85fc63d0bdee5435a3ff0… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 19:50:50 2009 +0200 jscript: Make String_charAt generic. --- dlls/jscript/string.c | 46 +++++++++++++++++++++++++++++++++------------- 1 files changed, 33 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 4c58eff..4c83d68 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -271,26 +271,42 @@ static HRESULT String_bold(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS static HRESULT String_charAt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - StringInstance *strobj; - BSTR str; + const WCHAR *str; + DWORD length; + BSTR ret, val_str = NULL; INT pos = 0; HRESULT hres; TRACE("\n"); - if(dispex->builtin_info->class != JSCLASS_STRING) { - FIXME("not string this not supported\n"); - return E_NOTIMPL; + if(!is_class(dispex, JSCLASS_STRING)) { + VARIANT this; + + V_VT(&this) = VT_DISPATCH; + V_DISPATCH(&this) = (IDispatch*)_IDispatchEx_(dispex); + + hres = to_string(dispex->ctx, &this, ei, &val_str); + if(FAILED(hres)) + return hres; + + str = val_str; + length = SysStringLen(val_str); } + else { + StringInstance *this = (StringInstance*)dispex; - strobj = (StringInstance*)dispex; + str = this->str; + length = this->length; + } if(arg_cnt(dp)) { VARIANT num; hres = to_integer(dispex->ctx, get_arg(dp, 0), ei, &num); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } if(V_VT(&num) == VT_I4) { pos = V_I4(&num); @@ -300,18 +316,22 @@ static HRESULT String_charAt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA } } - if(!retv) + if(!retv) { + SysFreeString(val_str); return S_OK; + } - if(0 <= pos && pos < strobj->length) - str = SysAllocStringLen(strobj->str+pos, 1); + if(0 <= pos && pos < length) + ret = SysAllocStringLen(str+pos, 1); else - str = SysAllocStringLen(NULL, 0); - if(!str) + ret = SysAllocStringLen(NULL, 0); + SysFreeString(val_str); + if(!ret) { return E_OUTOFMEMORY; + } V_VT(retv) = VT_BSTR; - V_BSTR(retv) = str; + V_BSTR(retv) = ret; return S_OK; }

1 0

Piotr Caban : jscript: Make do_attribute_tag_format generic.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 16b38c457d569c7202ec558b75981c1eff485012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16b38c457d569c7202ec558b7… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 22:05:00 2009 +0200 jscript: Make do_attribute_tag_format generic. --- dlls/jscript/string.c | 38 +++++++++++++++++++++++++++++--------- 1 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 56048fb..4c58eff 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -177,43 +177,63 @@ static HRESULT do_attribute_tag_format(DispatchEx *dispex, LCID lcid, WORD flags = {'<','%','s',' ','%','s','=','\"','%','s','\"','>','%','s','<','/','%','s','>',0}; static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; - StringInstance *string; - BSTR ret, attr_value; + const WCHAR *str; + DWORD length; + BSTR attr_value, val_str = NULL; HRESULT hres; if(!is_class(dispex, JSCLASS_STRING)) { - WARN("this is not a string object\n"); - return E_NOTIMPL; + VARIANT this; + + V_VT(&this) = VT_DISPATCH; + V_DISPATCH(&this) = (IDispatch*)_IDispatchEx_(dispex); + + hres = to_string(dispex->ctx, &this, ei, &val_str); + if(FAILED(hres)) + return hres; + + str = val_str; + length = SysStringLen(val_str); } + else { + StringInstance *this = (StringInstance*)dispex; - string = (StringInstance*) dispex; + str = this->str; + length = this->length; + } if(arg_cnt(dp)) { hres = to_string(dispex->ctx, get_arg(dp, 0), ei, &attr_value); - if(FAILED(hres)) + if(FAILED(hres)) { + SysFreeString(val_str); return hres; + } } else { attr_value = SysAllocString(undefinedW); - if(!attr_value) + if(!attr_value) { + SysFreeString(val_str); return E_OUTOFMEMORY; + } } if(retv) { - ret = SysAllocStringLen(NULL, string->length + 2*strlenW(tagname) + BSTR ret = SysAllocStringLen(NULL, length + 2*strlenW(tagname) + strlenW(attr) + SysStringLen(attr_value) + 9); if(!ret) { SysFreeString(attr_value); + SysFreeString(val_str); return E_OUTOFMEMORY; } - sprintfW(ret, tagfmtW, tagname, attr, attr_value, string->str, tagname); + sprintfW(ret, tagfmtW, tagname, attr, attr_value, str, tagname); V_VT(retv) = VT_BSTR; V_BSTR(retv) = ret; } SysFreeString(attr_value); + SysFreeString(val_str); return S_OK; }

1 0

Piotr Caban : jscript: Change do_attributeless_tag_format so it works on non string objects.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 0ee06df4b06763297995a55d7e066fc2a27b1140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee06df4b06763297995a55d7… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 12 19:50:22 2009 +0200 jscript: Change do_attributeless_tag_format so it works on non string objects. --- dlls/jscript/string.c | 35 +++++++++++++++++++++++++++-------- 1 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 70ec50b..56048fb 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -127,26 +127,45 @@ static HRESULT do_attributeless_tag_format(DispatchEx *dispex, LCID lcid, WORD f VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp, const WCHAR *tagname) { static const WCHAR tagfmt[] = {'<','%','s','>','%','s','<','/','%','s','>',0}; - StringInstance *string; - BSTR ret; + const WCHAR *str; + DWORD length; + BSTR val_str = NULL; + HRESULT hres; if(!is_class(dispex, JSCLASS_STRING)) { - WARN("this is not a string object\n"); - return E_NOTIMPL; + VARIANT this; + + V_VT(&this) = VT_DISPATCH; + V_DISPATCH(&this) = (IDispatch*)_IDispatchEx_(dispex); + + hres = to_string(dispex->ctx, &this, ei, &val_str); + if(FAILED(hres)) + return hres; + + str = val_str; + length = SysStringLen(val_str); } + else { + StringInstance *this = (StringInstance*)dispex; - string = (StringInstance*)dispex; + str = this->str; + length = this->length; + } if(retv) { - ret = SysAllocStringLen(NULL, string->length + 2*strlenW(tagname) + 5); - if(!ret) + BSTR ret = SysAllocStringLen(NULL, length + 2*strlenW(tagname) + 5); + if(!ret) { + SysFreeString(val_str); return E_OUTOFMEMORY; + } - sprintfW(ret, tagfmt, tagname, string->str, tagname); + sprintfW(ret, tagfmt, tagname, str, tagname); V_VT(retv) = VT_BSTR; V_BSTR(retv) = ret; } + + SysFreeString(val_str); return S_OK; }

1 0

Roderick Colenbrander : winex11: Add an XRender based GetSrcAreaStretch.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 004eabfbd398192c0de92bafe1b31381a07d7a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=004eabfbd398192c0de92bafe… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Jul 9 21:20:12 2009 +0200 winex11: Add an XRender based GetSrcAreaStretch. --- dlls/winex11.drv/bitblt.c | 23 +++++--- dlls/winex11.drv/x11drv.h | 7 ++ dlls/winex11.drv/xrender.c | 137 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=004eabfbd398192c0de92…

1 0

Roderick Colenbrander : winex11: Add a helper function for converting a random color to a XRenderColor.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: ea700f5d549f0cfbbb7ff2e445f714aa2858c7e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea700f5d549f0cfbbb7ff2e44… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Jul 6 23:01:07 2009 +0200 winex11: Add a helper function for converting a random color to a XRenderColor. --- dlls/winex11.drv/xrender.c | 41 ++++++++++++++++++++++++----------------- 1 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index dd53f23..a3f5c3b 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -390,6 +390,29 @@ sym_not_found: else TRACE("Using X11 core fonts\n"); } +/* Helper function to convert from a color packed in a 32-bit integer to a XRenderColor */ +static void get_xrender_color(WineXRenderFormat *wxr_format, int src_color, XRenderColor *dst_color) +{ + XRenderPictFormat *pf = wxr_format->pict_format; + + if(pf->direct.redMask) + dst_color->red = ((src_color >> pf->direct.red) & pf->direct.redMask) * 65535/pf->direct.redMask; + else + dst_color->red = 0; + + if(pf->direct.greenMask) + dst_color->green = ((src_color >> pf->direct.green) & pf->direct.greenMask) * 65535/pf->direct.greenMask; + else + dst_color->green = 0; + + if(pf->direct.blueMask) + dst_color->blue = ((src_color >> pf->direct.blue) & pf->direct.blueMask) * 65535/pf->direct.blueMask; + else + dst_color->blue = 0; + + dst_color->alpha = 0xffff; +} + static WineXRenderFormat *get_xrender_format(WXRFormat format) { int i; @@ -1323,23 +1346,7 @@ static Picture get_tile_pict(WineXRenderFormat *wxr_format, int text_pixel) if(text_pixel != tile->current_color && wxr_format->format != WXR_FORMAT_MONO) { - /* Map 0 -- 0xff onto 0 -- 0xffff */ - int r_shift, r_len; - int g_shift, g_len; - int b_shift, b_len; - - ExamineBitfield (visual->red_mask, &r_shift, &r_len ); - ExamineBitfield (visual->green_mask, &g_shift, &g_len); - ExamineBitfield (visual->blue_mask, &b_shift, &b_len); - - col.red = GetField(text_pixel, r_shift, r_len); - col.red |= col.red << 8; - col.green = GetField(text_pixel, g_shift, g_len); - col.green |= col.green << 8; - col.blue = GetField(text_pixel, b_shift, b_len); - col.blue |= col.blue << 8; - col.alpha = 0xffff; - + get_xrender_color(wxr_format, text_pixel, &col); wine_tsx11_lock(); pXRenderFillRectangle(gdi_display, PictOpSrc, tile->pict, &col, 0, 0, 1, 1); wine_tsx11_unlock();

1 0

David Adam : include: Remove useless headers.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 5bfe680d3fd3a089b7056b1a7e5fef81b5c5482b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bfe680d3fd3a089b7056b1a7… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jul 11 18:14:09 2009 +0200 include: Remove useless headers. --- include/Makefile.in | 5 - include/d3dx8.h | 32 -- include/d3dx8core.h | 130 ----- include/d3dx8math.h | 415 ---------------- include/d3dx8math.inl | 1268 ------------------------------------------------- include/d3dx8mesh.h | 41 -- 6 files changed, 0 insertions(+), 1891 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5bfe680d3fd3a089b7056…

1 0

David Adam : d3dx8: Remove the d3dx8 dll.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 14a98e3dc6319d5bdd738422cdc8a5478c234efa URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a98e3dc6319d5bdd738422c… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jul 11 18:12:12 2009 +0200 d3dx8: Remove the d3dx8 dll. --- configure | 18 - configure.ac | 2 - dlls/Makefile.in | 5 - dlls/d3dx8/Makefile.in | 17 - dlls/d3dx8/core.c | 148 ---- dlls/d3dx8/d3dx8.spec | 156 ----- dlls/d3dx8/d3dx8_main.c | 43 -- dlls/d3dx8/d3dx8_private.h | 94 --- dlls/d3dx8/math.c | 1524 ------------------------------------------ dlls/d3dx8/mesh.c | 247 ------- dlls/d3dx8/tests/Makefile.in | 14 - dlls/d3dx8/tests/math.c | 1523 ----------------------------------------- dlls/d3dx8/tests/mesh.c | 396 ----------- 13 files changed, 0 insertions(+), 4187 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14a98e3dc6319d5bdd738…

1 0

David Adam : dxguid: Remove the useless d3dx8 include.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 245dbcf1f794b5d1362440b99f95260b1957a73d URL: http://source.winehq.org/git/wine.git/?a=commit;h=245dbcf1f794b5d1362440b99… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jul 11 18:12:43 2009 +0200 dxguid: Remove the useless d3dx8 include. --- dlls/dxguid/dx8guid.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/dxguid/dx8guid.c b/dlls/dxguid/dx8guid.c index 6b51c9e..76d8cd1 100644 --- a/dlls/dxguid/dx8guid.c +++ b/dlls/dxguid/dx8guid.c @@ -31,4 +31,3 @@ #include "initguid.h" #include "d3d8.h" -#include "d3dx8.h"

1 0