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

Piotr Caban : jscript: Make String_indexOf generic.
by Alexandre Julliard July 13, 2009

July 13, 2009

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 July 13, 2009

July 13, 2009

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 July 13, 2009

July 13, 2009

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 July 13, 2009

July 13, 2009

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 July 13, 2009

July 13, 2009

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 July 13, 2009

July 13, 2009

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 July 13, 2009

July 13, 2009

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 July 13, 2009

July 13, 2009

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 July 13, 2009

July 13, 2009

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 July 13, 2009

July 13, 2009

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

David Adam : d3dx9: Remove the useless d3dx8 import.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 5dfa6955eead20de0288a3e7b37e450b39ade14c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dfa6955eead20de0288a3e7b… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jul 11 18:09:40 2009 +0200 d3dx9: Remove the useless d3dx8 import. --- dlls/d3dx9_36/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index d64257d..88ac1d7 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3dx9_36.dll IMPORTLIB = d3dx9 -IMPORTS = d3d9 d3dx8 gdi32 user32 kernel32 +IMPORTS = d3d9 gdi32 user32 kernel32 C_SRCS = \ core.c \

1 0

David Adam : d3dx9: Merge d3dx8 math tests into d3dx9.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: e5753acee533e25ffd0f1bfa97667aac1f903059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5753acee533e25ffd0f1bfa9… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jul 11 18:08:31 2009 +0200 d3dx9: Merge d3dx8 math tests into d3dx9. --- dlls/d3dx9_36/tests/math.c | 1475 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 1462 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5753acee533e25ffd0f1…

1 0

David Adam : d3dx9: Clean-up the spec file.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 39fdb9ffde366c0172af1daa6381da16c75683ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=39fdb9ffde366c0172af1daa6… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jul 11 18:07:57 2009 +0200 d3dx9: Clean-up the spec file. --- dlls/d3dx9_36/d3dx9_36.spec | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 8dca4b8..d3fe3ac 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -23,7 +23,7 @@ @ stub D3DXComputeIMTFromSignal @ stub D3DXComputeIMTFromTexture @ stub D3DXComputeNormalMap -@ stdcall D3DXComputeNormals(ptr ptr) d3dx8.D3DXComputeNormals +@ stub D3DXComputeNormals @ stub D3DXComputeTangent @ stub D3DXComputeTangentFrame @ stub D3DXComputeTangentFrameEx @@ -83,7 +83,7 @@ @ stub D3DXCreatePRTEngine @ stub D3DXCreateRenderToEnvMap @ stub D3DXCreateRenderToSurface -@ stdcall D3DXCreateSPMesh(ptr ptr ptr ptr ptr) d3dx8.D3DXCreateSPMesh +@ stub D3DXCreateSPMesh @ stub D3DXCreateSkinInfo @ stub D3DXCreateSkinInfoFromBlendedMesh @ stub D3DXCreateSkinInfoFVF @@ -146,7 +146,7 @@ @ stub D3DXGatherFragmentsFromResourceA @ stub D3DXGatherFragmentsFromResourceW @ stub D3DXGenerateOutputDecl -@ stdcall D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) d3dx8.D3DXGeneratePMesh +@ stub D3DXGeneratePMesh @ stub D3DXGetDeclLength @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @@ -165,8 +165,8 @@ @ stdcall D3DXGetShaderSize(ptr) @ stdcall D3DXGetShaderVersion(ptr) @ stdcall D3DXGetVertexShaderProfile(ptr) -@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) d3dx8.D3DXIntersect -@ stdcall D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) d3dx8.D3DXIntersectSubset +@ stub D3DXIntersect +@ stub D3DXIntersectSubset @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stub D3DXLoadMeshFromXA @ stub D3DXLoadMeshFromXInMemory @@ -252,7 +252,7 @@ @ stdcall D3DXQuaternionRotationYawPitchRoll(ptr long long long) @ stdcall D3DXQuaternionSlerp(ptr ptr ptr long) @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr long) -@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) d3dx8.D3DXQuaternionSquadSetup +@ stub D3DXQuaternionSquadSetup @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXRectPatchSize @ stub D3DXSaveMeshHierarchyToFileA @@ -290,17 +290,17 @@ @ stub D3DXSHRotate @ stub D3DXSHRotateZ @ stub D3DXSHScale -@ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx8.D3DXSimplifyMesh +@ stub D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr long ptr ptr) -@ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx8.D3DXSplitMesh -@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx8.D3DXTessellateNPatches +@ stub D3DXSplitMesh +@ stub D3DXTessellateNPatches @ stub D3DXTessellateRectPatch @ stub D3DXTessellateTriPatch @ stub D3DXTriPatchSize @ stub D3DXUVAtlasCreate @ stub D3DXUVAtlasPack @ stub D3DXUVAtlasPartition -@ stdcall D3DXValidMesh(ptr ptr ptr) d3dx8.D3DXValidMesh +@ stub D3DXValidMesh @ stub D3DXValidPatchMesh @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr long long) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr long)

1 0

David Adam : d3dx9: Merge d3dx8 math into d3dx9.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: d1c2d2a4f8cfed3550b7a853e65fec6c5626ea6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c2d2a4f8cfed3550b7a853e… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jul 11 18:06:44 2009 +0200 d3dx9: Merge d3dx8 math into d3dx9. --- dlls/d3dx9_36/d3dx9_36.spec | 144 ++-- dlls/d3dx9_36/d3dx9_36_private.h | 13 + dlls/d3dx9_36/math.c | 1586 +++++++++++++++++++++++++++++++++++--- include/d3dx9math.h | 69 ++ 4 files changed, 1651 insertions(+), 161 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1c2d2a4f8cfed3550b7a…

1 0

David Adam : d3dx9: Merge d3dx8 mesh tests into d3dx9.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 35ada0dc2d372df2be25fad4f56027535c5d15c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ada0dc2d372df2be25fad4f… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jul 11 18:03:46 2009 +0200 d3dx9: Merge d3dx8 mesh tests into d3dx9. --- dlls/d3dx9_36/tests/mesh.c | 368 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 368 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35ada0dc2d372df2be25f…

1 0

David Adam : d3dx9: Merge d3dx8 mesh into d3dx9.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 40c6cf77ce6a6302f13f5ad8492e77518a2cd65b URL: http://source.winehq.org/git/wine.git/?a=commit;h=40c6cf77ce6a6302f13f5ad84… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jul 11 18:01:59 2009 +0200 d3dx9: Merge d3dx8 mesh into d3dx9. --- dlls/d3dx9_36/d3dx9_36.spec | 4 +- dlls/d3dx9_36/mesh.c | 93 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 94 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 30926c2..a0f092f 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -3,7 +3,7 @@ @ stub D3DXAssembleShaderFromFileW @ stub D3DXAssembleShaderFromResourceA @ stub D3DXAssembleShaderFromResourceW -@ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx8.D3DXBoxBoundProbe +@ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) @ stub D3DXCheckCubeTextureRequirements @ stub D3DXCheckTextureRequirements @ stdcall D3DXCheckVersion(long long) @@ -291,7 +291,7 @@ @ stub D3DXSHRotateZ @ stub D3DXSHScale @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx8.D3DXSimplifyMesh -@ stdcall D3DXSphereBoundProbe(ptr long ptr ptr) d3dx8.D3DXSphereBoundProbe +@ stdcall D3DXSphereBoundProbe(ptr long ptr ptr) @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx8.D3DXSplitMesh @ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx8.D3DXTessellateNPatches @ stub D3DXTessellateRectPatch diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 9b54ce0..251bb40 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -28,6 +28,79 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); /************************************************************************* + * D3DXBoxBoundProbe + */ +BOOL WINAPI D3DXBoxBoundProbe(CONST D3DXVECTOR3 *pmin, CONST D3DXVECTOR3 *pmax, CONST D3DXVECTOR3 *prayposition, CONST D3DXVECTOR3 *praydirection) + +/* Algorithm taken from the article: An Efficient and Robust Ray-Box Intersection Algoritm +Amy Williams University of Utah +Steve Barrus University of Utah +R. Keith Morley University of Utah +Peter Shirley University of Utah + +International Conference on Computer Graphics and Interactive Techniques archive +ACM SIGGRAPH 2005 Courses +Los Angeles, California + +This algorithm is free of patents or of copyrights, as confirmed by Peter Shirley himself. + +Algorithm: Consider the box as the intersection of three slabs. Clip the ray +against each slab, if there's anything left of the ray after we're +done we've got an intersection of the ray with the box. +*/ + +{ + FLOAT div, tmin, tmax, tymin, tymax, tzmin, tzmax; + + div = 1.0f / praydirection->x; + if ( div >= 0.0f ) + { + tmin = ( pmin->x - prayposition->x ) * div; + tmax = ( pmax->x - prayposition->x ) * div; + } + else + { + tmin = ( pmax->x - prayposition->x ) * div; + tmax = ( pmin->x - prayposition->x ) * div; + } + + if ( tmax < 0.0f ) return FALSE; + + div = 1.0f / praydirection->y; + if ( div >= 0.0f ) + { + tymin = ( pmin->y - prayposition->y ) * div; + tymax = ( pmax->y - prayposition->y ) * div; + } + else + { + tymin = ( pmax->y - prayposition->y ) * div; + tymax = ( pmin->y - prayposition->y ) * div; + } + + if ( ( tymax < 0.0f ) || ( tmin > tymax ) || ( tymin > tmax ) ) return FALSE; + + if ( tymin > tmin ) tmin = tymin; + if ( tymax < tmax ) tmax = tymax; + + div = 1.0f / praydirection->z; + if ( div >= 0.0f ) + { + tzmin = ( pmin->z - prayposition->z ) * div; + tzmax = ( pmax->z - prayposition->z ) * div; + } + else + { + tzmin = ( pmax->z - prayposition->z ) * div; + tzmax = ( pmin->z - prayposition->z ) * div; + } + + if ( (tzmax < 0.0f ) || ( tmin > tzmax ) || ( tzmin > tmax ) ) return FALSE; + + return TRUE; +} + +/************************************************************************* * D3DXComputeBoundingBox */ HRESULT WINAPI D3DXComputeBoundingBox(CONST D3DXVECTOR3 *pfirstposition, DWORD numvertices, DWORD dwstride, D3DXVECTOR3 *pmin, D3DXVECTOR3 *pmax) @@ -131,7 +204,7 @@ UINT WINAPI D3DXGetFVFVertexSize(DWORD FVF) } /************************************************************************* - * D3DXGetFVFVertexSize + * D3DXGetDeclVertexSize */ UINT WINAPI D3DXGetDeclVertexSize(const D3DVERTEXELEMENT9 *decl, DWORD stream_idx) { @@ -223,3 +296,21 @@ BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *p0, CONST D3DXVECTOR3 *p1, CONST return FALSE; } + +/************************************************************************* + * D3DXSphereBoundProbe + */ +BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *pcenter, FLOAT radius, CONST D3DXVECTOR3 *prayposition, CONST D3DXVECTOR3 *praydirection) +{ + D3DXVECTOR3 difference; + FLOAT a, b, c, d; + + a = D3DXVec3LengthSq(praydirection); + if (!D3DXVec3Subtract(&difference, prayposition, pcenter)) return FALSE; + b = D3DXVec3Dot(&difference, praydirection); + c = D3DXVec3LengthSq(&difference) - radius * radius; + d = b * b - a * c; + + if ( ( d <= 0.0f ) || ( sqrt(d) <= b ) ) return FALSE; + return TRUE; +}

1 0

David Adam : d3dx9: Merge d3dx8 core into d3dx9.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: de5090c51c2b372e8b5193bda6c0be6b0758b83a URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5090c51c2b372e8b5193bda… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jul 11 18:00:20 2009 +0200 d3dx9: Merge d3dx8 core into d3dx9. --- dlls/d3dx9_36/Makefile.in | 1 + dlls/d3dx9_36/core.c | 120 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/d3dx9_36_private.h | 15 +++++ 4 files changed, 137 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index 1c6195b..d64257d 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -7,6 +7,7 @@ IMPORTLIB = d3dx9 IMPORTS = d3d9 d3dx8 gdi32 user32 kernel32 C_SRCS = \ + core.c \ d3dx9_36_main.c \ font.c \ math.c \ diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c new file mode 100644 index 0000000..3b63e9e --- /dev/null +++ b/dlls/d3dx9_36/core.c @@ -0,0 +1,120 @@ +/* + * + * Copyright 2002 Raphael Junqueira + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "wine/debug.h" +#include "wine/unicode.h" + +#include "d3dx9_36_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +/* ID3DXBuffer IUnknown parts follow: */ +static HRESULT WINAPI ID3DXBufferImpl_QueryInterface(LPD3DXBUFFER iface, REFIID riid, LPVOID* ppobj) +{ + ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_ID3DXBuffer)) + { + IUnknown_AddRef(iface); + *ppobj = This; + return D3D_OK; + } + + WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + return E_NOINTERFACE; +} + +static ULONG WINAPI ID3DXBufferImpl_AddRef(LPD3DXBUFFER iface) +{ + ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) : AddRef from %d\n", This, ref - 1); + + return ref; +} + +static ULONG WINAPI ID3DXBufferImpl_Release(LPD3DXBUFFER iface) +{ + ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) : ReleaseRef to %d\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This->buffer); + HeapFree(GetProcessHeap(), 0, This); + } + return ref; +} + +/* ID3DXBuffer Interface follow: */ +static LPVOID WINAPI ID3DXBufferImpl_GetBufferPointer(LPD3DXBUFFER iface) +{ + ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; + return This->buffer; +} + +static DWORD WINAPI ID3DXBufferImpl_GetBufferSize(LPD3DXBUFFER iface) +{ + ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; + return This->bufferSize; +} + +const ID3DXBufferVtbl D3DXBuffer_Vtbl = +{ + ID3DXBufferImpl_QueryInterface, + ID3DXBufferImpl_AddRef, + ID3DXBufferImpl_Release, + ID3DXBufferImpl_GetBufferPointer, + ID3DXBufferImpl_GetBufferSize +}; + +HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) +{ + ID3DXBufferImpl *object; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXBufferImpl)); + if (object == NULL) + { + *ppBuffer = NULL; + return E_OUTOFMEMORY; + } + object->lpVtbl = &D3DXBuffer_Vtbl; + object->ref = 1; + object->bufferSize = NumBytes; + object->buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, NumBytes); + if (object->buffer == NULL) + { + HeapFree(GetProcessHeap(), 0, object); + *ppBuffer = NULL; + return E_OUTOFMEMORY; + } + + *ppBuffer = (LPD3DXBUFFER)object; + return D3D_OK; +} diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 8a7cdf7..30926c2 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -32,7 +32,7 @@ @ stub D3DXConvertMeshSubsetToStrips @ stub D3DXCreateAnimationController @ stub D3DXCreateBox -@ stdcall D3DXCreateBuffer(long ptr) d3dx8.D3DXCreateBuffer +@ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet @ stub D3DXCreateCubeTexture @ stub D3DXCreateCubeTextureFromFileA diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index cf3e176..a1ff7bc 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -1,4 +1,5 @@ /* + * Copyright (C) 2002 Raphael Junqueira * Copyright (C) 2008 Tony Wasserka * * This library is free software; you can redistribute it and/or @@ -32,6 +33,20 @@ HRESULT map_view_of_file(LPCWSTR filename, LPVOID *buffer, DWORD *length); HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, LPVOID *buffer, DWORD *length); +extern const ID3DXBufferVtbl D3DXBuffer_Vtbl; + +/* ID3DXBUFFER */ +typedef struct ID3DXBufferImpl +{ + /* IUnknown fields */ + const ID3DXBufferVtbl *lpVtbl; + LONG ref; + + /* ID3DXBuffer fields */ + DWORD *buffer; + DWORD bufferSize; +} ID3DXBufferImpl; + /* ID3DXFont */ typedef struct ID3DXFontImpl

1 0

David Adam : d3dx9: Add d3dx9.h in dxguid.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 3871fb34d17ce1609e33270094358d68899c0fba URL: http://source.winehq.org/git/wine.git/?a=commit;h=3871fb34d17ce1609e3327009… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jul 11 17:59:27 2009 +0200 d3dx9: Add d3dx9.h in dxguid. --- dlls/dxguid/dx9guid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dxguid/dx9guid.c b/dlls/dxguid/dx9guid.c index 2ab60ad..d64e690 100644 --- a/dlls/dxguid/dx9guid.c +++ b/dlls/dxguid/dx9guid.c @@ -31,4 +31,4 @@ #include "olectl.h" #include "initguid.h" -#include "d3d9.h" +#include "d3dx9.h"

1 0

David Adam : d3dx9: Fix the prototype of some functions.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: bd7421cd6db2f0270bdbf51822380d8af3b0ddd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7421cd6db2f0270bdbf5182… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jul 11 17:58:54 2009 +0200 d3dx9: Fix the prototype of some functions. --- dlls/d3dx9_36/math.c | 2 +- include/d3dx9math.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index e735303..2cf22d7 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -87,7 +87,7 @@ D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation2D( /************************************************************************* * D3DXMatrixDecompose */ -HRESULT WINAPI D3DXMatrixDecompose(D3DXVECTOR3 *poutscale, D3DXQUATERNION *poutrotation, D3DXVECTOR3 *pouttranslation, D3DXMATRIX *pm) +HRESULT WINAPI D3DXMatrixDecompose(D3DXVECTOR3 *poutscale, D3DXQUATERNION *poutrotation, D3DXVECTOR3 *pouttranslation, CONST D3DXMATRIX *pm) { D3DXMATRIX normalized; D3DXVECTOR3 vec; diff --git a/include/d3dx9math.h b/include/d3dx9math.h index 83b8749..a033796 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -266,9 +266,9 @@ extern "C" { D3DXCOLOR* WINAPI D3DXColorAdjustContrast(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, FLOAT s); D3DXCOLOR* WINAPI D3DXColorAdjustSaturation(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, FLOAT s); -D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, float scaling, D3DXVECTOR3 *rotationcenter, D3DXQUATERNION *rotation, D3DXVECTOR3 *translation); +D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, FLOAT scaling, CONST D3DXVECTOR3 *rotationcenter, CONST D3DXQUATERNION *rotation, CONST D3DXVECTOR3 *translation); D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation2D(D3DXMATRIX *pout, FLOAT scaling, CONST D3DXVECTOR2 *protationcenter, FLOAT rotation, CONST D3DXVECTOR2 *ptranslation); -HRESULT WINAPI D3DXMatrixDecompose(D3DXVECTOR3 *poutscale, D3DXQUATERNION *poutrotation, D3DXVECTOR3 *pouttranslation, D3DXMATRIX *pm); +HRESULT WINAPI D3DXMatrixDecompose(D3DXVECTOR3 *poutscale, D3DXQUATERNION *poutrotation, D3DXVECTOR3 *pouttranslation, CONST D3DXMATRIX *pm); FLOAT WINAPI D3DXMatrixDeterminant(CONST D3DXMATRIX *pm); D3DXMATRIX* WINAPI D3DXMatrixInverse(D3DXMATRIX *pout, FLOAT *pdeterminant, CONST D3DXMATRIX *pm); D3DXMATRIX* WINAPI D3DXMatrixLookAtLH(D3DXMATRIX *pout, CONST D3DXVECTOR3 *peye, CONST D3DXVECTOR3 *pat, CONST D3DXVECTOR3 *pup);

1 0

Yuri Khan : winex11.drv: Handle clipboard on an auxiliary thread for windowless apps.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: f1c131ba2731cca5139d2ffef628fd340e51617b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1c131ba2731cca5139d2ffef… Author: Yuri Khan <yurivkhan(a)gmail.com> Date: Fri Jul 10 07:53:00 2009 +0700 winex11.drv: Handle clipboard on an auxiliary thread for windowless apps. --- dlls/winex11.drv/clipboard.c | 87 +++++++++++++++++++++++++++++------------- 1 files changed, 60 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 3806080..82928a2 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2504,6 +2504,52 @@ INT CDECL X11DRV_GetClipboardFormatName(UINT wFormat, LPWSTR retStr, INT maxlen) return strlenW(retStr); } +static void selection_acquire(void) +{ + Window owner; + Display *display; + + owner = thread_selection_wnd(); + display = thread_display(); + + wine_tsx11_lock(); + + selectionAcquired = 0; + selectionWindow = 0; + + /* Grab PRIMARY selection if not owned */ + if (use_primary_selection) + XSetSelectionOwner(display, XA_PRIMARY, owner, CurrentTime); + + /* Grab CLIPBOARD selection if not owned */ + XSetSelectionOwner(display, x11drv_atom(CLIPBOARD), owner, CurrentTime); + + if (use_primary_selection && XGetSelectionOwner(display, XA_PRIMARY) == owner) + selectionAcquired |= S_PRIMARY; + + if (XGetSelectionOwner(display,x11drv_atom(CLIPBOARD)) == owner) + selectionAcquired |= S_CLIPBOARD; + + wine_tsx11_unlock(); + + if (selectionAcquired) + { + selectionWindow = owner; + TRACE("Grabbed X selection, owner=(%08x)\n", (unsigned) owner); + } +} + +static DWORD WINAPI selection_thread_proc(LPVOID unused) +{ + selection_acquire(); + + while (selectionAcquired) + { + MsgWaitForMultipleObjectsEx(0, NULL, INFINITE, QS_SENDMESSAGE, 0); + } + + return 0; +} /************************************************************************** * AcquireClipboard (X11DRV.@) @@ -2511,8 +2557,7 @@ INT CDECL X11DRV_GetClipboardFormatName(UINT wFormat, LPWSTR retStr, INT maxlen) int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) { DWORD procid; - Window owner; - Display *display; + HANDLE selectionThread; TRACE(" %p\n", hWndClipWindow); @@ -2540,33 +2585,21 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) } } - owner = thread_selection_wnd(); - display = thread_display(); - - wine_tsx11_lock(); - - selectionAcquired = 0; - selectionWindow = 0; - - /* Grab PRIMARY selection if not owned */ - if (use_primary_selection) - XSetSelectionOwner(display, XA_PRIMARY, owner, CurrentTime); - - /* Grab CLIPBOARD selection if not owned */ - XSetSelectionOwner(display, x11drv_atom(CLIPBOARD), owner, CurrentTime); - - if (use_primary_selection && XGetSelectionOwner(display, XA_PRIMARY) == owner) - selectionAcquired |= S_PRIMARY; - - if (XGetSelectionOwner(display,x11drv_atom(CLIPBOARD)) == owner) - selectionAcquired |= S_CLIPBOARD; + if (hWndClipWindow) + { + selection_acquire(); + } + else + { + selectionThread = CreateThread(NULL, 0, &selection_thread_proc, NULL, 0, NULL); - wine_tsx11_unlock(); + if (!selectionThread) + { + WARN("Could not start clipboard thread\n"); + return 0; + } - if (selectionAcquired) - { - selectionWindow = owner; - TRACE("Grabbed X selection, owner=(%08x)\n", (unsigned) owner); + CloseHandle(selectionThread); } return 1;

1 0

Maarten Lankhorst : winealsa.drv: Add support for indirect read/ write in directsound support.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: f27d88e16fe0292d3efa7dac8966a0b612e62e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f27d88e16fe0292d3efa7dac8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Jul 12 20:11:55 2009 +0200 winealsa.drv: Add support for indirect read/write in directsound support. Allows pulseaudio to use the idsdriver interface, making it almost as fast as using native pulseaudio calls for as far as directsound is concerned. Prevents the creation of separate winmm feeder threads. --- dlls/winealsa.drv/dsoutput.c | 159 ++++++++++++++++++++++++++++++++---------- 1 files changed, 123 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f27d88e16fe0292d3efa7…

1 0

Frédéric Delanoy : kernel32: Fix typos in English errors messages.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: c692edb7e774fed7dc795795d1e1a5059e3616f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c692edb7e774fed7dc795795d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 12 13:14:30 2009 +0200 kernel32: Fix typos in English errors messages. --- dlls/kernel32/nls/winerr_enu.mc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/nls/winerr_enu.mc b/dlls/kernel32/nls/winerr_enu.mc index 8dd2088..0c3aee4 100644 --- a/dlls/kernel32/nls/winerr_enu.mc +++ b/dlls/kernel32/nls/winerr_enu.mc @@ -786,7 +786,7 @@ Auto data segment exceeds 64k MessageId=200 SymbolicName=ERROR_RING2SEG_MUST_BE_MOVABLE Language=ENU -Ring 2 segment must be moveable +Ring 2 segment must be movable . MessageId=201 SymbolicName=ERROR_RELOC_CHAIN_XEEDS_SEGLIM @@ -1356,7 +1356,7 @@ No media in drive MessageId=1113 SymbolicName=ERROR_NO_UNICODE_TRANSLATION Language=ENU -No unicode translation +No Unicode translation . MessageId=1114 SymbolicName=ERROR_DLL_INIT_FAILED @@ -1756,7 +1756,7 @@ Connection refused MessageId=1226 SymbolicName=ERROR_GRACEFUL_DISCONNECT Language=ENU -Conection gracefully closed +Connection gracefully closed . MessageId=1227 SymbolicName=ERROR_ADDRESS_ALREADY_ASSOCIATED @@ -2226,7 +2226,7 @@ Bad logon session state MessageId=1366 SymbolicName=ERROR_LOGON_SESSION_COLLISION Language=ENU -Logon sesion ID collision +Logon session ID collision . MessageId=1367 SymbolicName=ERROR_INVALID_LOGON_TYPE @@ -3256,17 +3256,17 @@ Address error MessageId=1769 SymbolicName=RPC_S_FP_DIV_ZERO Language=ENU -Floating divide-by-zero +Floating-point divide-by-zero . MessageId=1770 SymbolicName=RPC_S_FP_UNDERFLOW Language=ENU -Floating underflow +Floating-point underflow . MessageId=1771 SymbolicName=RPC_S_FP_OVERFLOW Language=ENU -Floating overlow +Floating-point overflow . MessageId=1772 SymbolicName=RPC_X_NO_MORE_ENTRIES

1 0

Frédéric Delanoy : kernel32: Convert German error msgs resources to UTF-8.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 06a1aebdb3140bd4a86077a5fd2a08f4d616a739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06a1aebdb3140bd4a86077a5f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 12 14:07:18 2009 +0200 kernel32: Convert German error msgs resources to UTF-8. --- dlls/kernel32/nls/winerr_deu.mc | 530 +++++++++++++++++++------------------- 1 files changed, 265 insertions(+), 265 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06a1aebdb3140bd4a8607…

1 0

Frédéric Delanoy : kernel32: Convert French resources to UTF-8.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 83d537f3f0df54b0a793fb15ffa85316047d3fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83d537f3f0df54b0a793fb15f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 10 18:36:57 2009 +0200 kernel32: Convert French resources to UTF-8. --- dlls/kernel32/nls/winerr_fra.mc | 112 +++++++++++++++++++------------------- 1 files changed, 56 insertions(+), 56 deletions(-) diff --git a/dlls/kernel32/nls/winerr_fra.mc b/dlls/kernel32/nls/winerr_fra.mc index 164e9b1..842616e 100644 --- a/dlls/kernel32/nls/winerr_fra.mc +++ b/dlls/kernel32/nls/winerr_fra.mc @@ -17,12 +17,12 @@ ; LanguageNames=(FRA=0x0c:winerr) -CodePages=(FRA=1252:0) +CodePages=(FRA=65001:0) MessageId=0 SymbolicName=ERROR_SUCCESS Language=FRA -Succ�s +Succès . MessageId=1 SymbolicName=ERROR_INVALID_FUNCTION @@ -47,7 +47,7 @@ Trop de fichiers ouverts MessageId=5 SymbolicName=ERROR_ACCESS_DENIED Language=FRA -Acc�s refus� +Accès refusé . MessageId=6 SymbolicName=ERROR_INVALID_HANDLE @@ -57,12 +57,12 @@ Attache invalide MessageId=7 SymbolicName=ERROR_ARENA_TRASHED Language=FRA -M�moire invalid�e +Mémoire invalidée . MessageId=8 SymbolicName=ERROR_NOT_ENOUGH_MEMORY Language=FRA -Pas assez de m�moire +Pas assez de mémoire . MessageId=9 SymbolicName=ERROR_INVALID_BLOCK @@ -82,17 +82,17 @@ Format incorrect MessageId=12 SymbolicName=ERROR_INVALID_ACCESS Language=FRA -Acc�s invalide +Accès invalide . MessageId=13 SymbolicName=ERROR_INVALID_DATA Language=FRA -Donn�es invalides +Données invalides . MessageId=14 SymbolicName=ERROR_OUTOFMEMORY Language=FRA -M�moire insuffisante +Mémoire insuffisante . MessageId=15 SymbolicName=ERROR_INVALID_DRIVE @@ -102,12 +102,12 @@ Lecteur invalide MessageId=16 SymbolicName=ERROR_CURRENT_DIRECTORY Language=FRA -Impossible de supprimer le r�pertoire courant +Impossible de supprimer le répertoire courant . MessageId=17 SymbolicName=ERROR_NOT_SAME_DEVICE Language=FRA -P�riph�rique diff�rent +Périphérique différent . MessageId=18 SymbolicName=ERROR_NO_MORE_FILES @@ -117,17 +117,17 @@ Plus de fichiers MessageId=19 SymbolicName=ERROR_WRITE_PROTECT Language=FRA -Prot�g� contre l'�criture +Protégé contre l'écriture . MessageId=20 SymbolicName=ERROR_BAD_UNIT Language=FRA -Unit� incorrecte +Unité incorrecte . MessageId=21 SymbolicName=ERROR_NOT_READY Language=FRA -Non pr�t +Non prêt . MessageId=22 SymbolicName=ERROR_BAD_COMMAND @@ -167,7 +167,7 @@ Plus de papier MessageId=29 SymbolicName=ERROR_WRITE_FAULT Language=FRA -Erreur d'�criture +Erreur d'écriture . MessageId=30 SymbolicName=ERROR_READ_FAULT @@ -177,7 +177,7 @@ Erreur de lecture MessageId=31 SymbolicName=ERROR_GEN_FAILURE Language=FRA -Erreur g�n�rale +Erreur générale . MessageId=32 SymbolicName=ERROR_SHARING_VIOLATION @@ -197,7 +197,7 @@ Mauvais disque MessageId=36 SymbolicName=ERROR_SHARING_BUFFER_EXCEEDED Language=FRA -Tampon de partage d�pass� +Tampon de partage dépassé . MessageId=38 SymbolicName=ERROR_HANDLE_EOF @@ -212,32 +212,32 @@ Disque plein MessageId=50 SymbolicName=ERROR_NOT_SUPPORTED Language=FRA -Requ�te non support�e +Requête non supportée . MessageId=51 SymbolicName=ERROR_REM_NOT_LIST Language=FRA -La machine distante n'�coute pas +La machine distante n'écoute pas . MessageId=52 SymbolicName=ERROR_DUP_NAME Language=FRA -Nom r�seau dupliqu� +Nom réseau dupliqué . MessageId=53 SymbolicName=ERROR_BAD_NETPATH Language=FRA -Chemin r�seau incorrect +Chemin réseau incorrect . MessageId=54 SymbolicName=ERROR_NETWORK_BUSY Language=FRA -R�seau occup� +Réseau occupé . MessageId=55 SymbolicName=ERROR_DEV_NOT_EXIST Language=FRA -Le p�riph�rique n'existe pas +Le périphérique n'existe pas . MessageId=56 SymbolicName=ERROR_TOO_MANY_CMDS @@ -247,17 +247,17 @@ Trop de commandes MessageId=57 SymbolicName=ERROR_ADAP_HDW_ERR Language=FRA -Erreur mat�rielle de l'adaptateur +Erreur matérielle de l'adaptateur . MessageId=58 SymbolicName=ERROR_BAD_NET_RESP Language=FRA -R�ponse du r�seau incorrecte +Réponse du réseau incorrecte . MessageId=59 SymbolicName=ERROR_UNEXP_NET_ERR Language=FRA -Erreur r�seau inattendue +Erreur réseau inattendue . MessageId=60 SymbolicName=ERROR_BAD_REM_ADAP @@ -277,37 +277,37 @@ Pas d'espace de spool MessageId=63 SymbolicName=ERROR_PRINT_CANCELLED Language=FRA -Impression annul�e +Impression annulée . MessageId=64 SymbolicName=ERROR_NETNAME_DELETED Language=FRA -Nom r�seau supprim� +Nom réseau supprimé . MessageId=65 SymbolicName=ERROR_NETWORK_ACCESS_DENIED Language=FRA -Acc�s r�seau refus� +Accès réseau refusé . MessageId=66 SymbolicName=ERROR_BAD_DEV_TYPE Language=FRA -Type de p�riph�rique incorrect +Type de périphérique incorrect . MessageId=67 SymbolicName=ERROR_BAD_NET_NAME Language=FRA -Nom r�seau incorrect +Nom réseau incorrect . MessageId=68 SymbolicName=ERROR_TOO_MANY_NAMES Language=FRA -Trop de noms r�seau +Trop de noms réseau . MessageId=69 SymbolicName=ERROR_TOO_MANY_SESS Language=FRA -Trop de sessions r�seau +Trop de sessions réseau . MessageId=70 SymbolicName=ERROR_SHARING_PAUSED @@ -317,7 +317,7 @@ Partage en pause MessageId=71 SymbolicName=ERROR_REQ_NOT_ACCEP Language=FRA -Requ�te non accept�e +Requête non acceptée . MessageId=72 SymbolicName=ERROR_REDIR_PAUSED @@ -332,7 +332,7 @@ Le fichier existe MessageId=82 SymbolicName=ERROR_CANNOT_MAKE Language=FRA -Impossible de cr�er +Impossible de créer . MessageId=83 SymbolicName=ERROR_FAIL_I24 @@ -342,12 +342,12 @@ Erreur Int24 MessageId=84 SymbolicName=ERROR_OUT_OF_STRUCTURES Language=FRA -� cours de structures +À cours de structures . MessageId=85 SymbolicName=ERROR_ALREADY_ASSIGNED Language=FRA -D�j� assign� +Déjà assigné . MessageId=86 SymbolicName=ERROR_INVALID_PASSWORD @@ -357,12 +357,12 @@ Mot de passe non valide MessageId=87 SymbolicName=ERROR_INVALID_PARAMETER Language=FRA -Param�tre non valide +Paramètre non valide . MessageId=88 SymbolicName=ERROR_NET_WRITE_FAULT Language=FRA -Erreur d'�criture r�seau +Erreur d'écriture réseau . MessageId=89 SymbolicName=ERROR_NO_PROC_SLOTS @@ -372,22 +372,22 @@ Plus d'emplacement pour processus MessageId=100 SymbolicName=ERROR_TOO_MANY_SEMAPHORES Language=FRA -Trop de s�maphores +Trop de sémaphores . MessageId=101 SymbolicName=ERROR_EXCL_SEM_ALREADY_OWNED Language=FRA -S�maphore exclusif d�j� acquis +Sémaphore exclusif déjà acquis . MessageId=102 SymbolicName=ERROR_SEM_IS_SET Language=FRA -Le s�maphore est actif +Le sémaphore est actif . MessageId=103 SymbolicName=ERROR_TOO_MANY_SEM_REQUESTS Language=FRA -Trop de requ�tes de s�maphores +Trop de requêtes de sémaphores . MessageId=104 SymbolicName=ERROR_INVALID_AT_INTERRUPT_TIME @@ -397,22 +397,22 @@ Non valide au moment de l'interruption MessageId=105 SymbolicName=ERROR_SEM_OWNER_DIED Language=FRA -L'acqu�reur du s�maphore est mort +L'acquéreur du sémaphore est mort . MessageId=106 SymbolicName=ERROR_SEM_USER_LIMIT Language=FRA -Limite utilisateur pour le s�maphore +Limite utilisateur pour le sémaphore . MessageId=107 SymbolicName=ERROR_DISK_CHANGE Language=FRA -Ins�rez le disque pour le lecteur %1 +Insérez le disque pour le lecteur %1 . MessageId=108 SymbolicName=ERROR_DRIVE_LOCKED Language=FRA -Lecteur verrouill� +Lecteur verrouillé . MessageId=109 SymbolicName=ERROR_BROKEN_PIPE @@ -422,12 +422,12 @@ Tube interrompu MessageId=110 SymbolicName=ERROR_OPEN_FAILED Language=FRA -�chec lors de l'ouverture +Échec lors de l'ouverture . MessageId=111 SymbolicName=ERROR_BUFFER_OVERFLOW Language=FRA -D�passement de tampon +Dépassement de tampon . MessageId=112 SymbolicName=ERROR_DISK_FULL @@ -452,7 +452,7 @@ IOCTL non valide MessageId=118 SymbolicName=ERROR_INVALID_VERIFY_SWITCH Language=FRA -Bascule de v�rification non valide +Bascule de vérification non valide . MessageId=119 SymbolicName=ERROR_BAD_DRIVER_LEVEL @@ -462,12 +462,12 @@ Niveau de pilote incorrect MessageId=120 SymbolicName=ERROR_CALL_NOT_IMPLEMENTED Language=FRA -Appel non impl�ment� +Appel non implémenté . MessageId=121 SymbolicName=ERROR_SEM_TIMEOUT Language=FRA -D�passement du d�lai du s�maphore +Dépassement du délai du sémaphore . MessageId=122 SymbolicName=ERROR_INSUFFICIENT_BUFFER @@ -487,7 +487,7 @@ Niveau non valide MessageId=125 SymbolicName=ERROR_NO_VOLUME_LABEL Language=FRA -Pas d'�tiquette de volume +Pas d'étiquette de volume . MessageId=126 SymbolicName=ERROR_MOD_NOT_FOUND @@ -497,7 +497,7 @@ Module introuvable MessageId=127 SymbolicName=ERROR_PROC_NOT_FOUND Language=FRA -Proc�dure introuvable +Procédure introuvable . MessageId=128 SymbolicName=ERROR_WAIT_NO_CHILDREN @@ -572,7 +572,7 @@ Attempt to SUBST to a JOINed drive MessageId=142 SymbolicName=ERROR_BUSY_DRIVE Language=FRA -Le lecteur est occup� +Le lecteur est occupé . MessageId=143 SymbolicName=ERROR_SAME_DRIVE @@ -587,7 +587,7 @@ Not toplevel directory MessageId=145 SymbolicName=ERROR_DIR_NOT_EMPTY Language=FRA -Le r�pertoire n'est pas vide +Le répertoire n'est pas vide . MessageId=146 SymbolicName=ERROR_IS_SUBST_PATH @@ -3607,7 +3607,7 @@ Already awaiting printer handle MessageId=1905 SymbolicName=ERROR_PRINTER_DELETED Language=FRA -Imprimante supprim�e +Imprimante supprimée . MessageId=1906 SymbolicName=ERROR_INVALID_PRINTER_STATE

1 0

Vincent Povirk : windowscodecs: Don' t leak memory when BmpFrameDecode_CopyPalette fails.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: d15870edfdb4a26d321493d88c6eda858f1aff0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15870edfdb4a26d321493d88… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 9 11:24:42 2009 -0500 windowscodecs: Don't leak memory when BmpFrameDecode_CopyPalette fails. --- dlls/windowscodecs/bmpdecode.c | 51 ++++++++++++++++++++------------------- 1 files changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 80447cf..0064e9d 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -191,6 +191,10 @@ static HRESULT WINAPI BmpFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, { HRESULT hr; BmpFrameDecode *This = (BmpFrameDecode*)iface; + int count; + WICColor *wiccolors=NULL; + RGBTRIPLE *bgrcolors=NULL; + TRACE("(%p,%p)\n", iface, pIPalette); if (This->bih.bV5Size == sizeof(BITMAPCOREHEADER)) @@ -199,30 +203,30 @@ static HRESULT WINAPI BmpFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, if (bch->bcBitCount <= 8) { /* 2**n colors in BGR format after the header */ - int count = 1 << bch->bcBitCount; - WICColor *wiccolors; ULONG tablesize, bytesread; - RGBTRIPLE *bgrcolors; LARGE_INTEGER offset; int i; + count = 1 << bch->bcBitCount; wiccolors = HeapAlloc(GetProcessHeap(), 0, sizeof(WICColor) * count); tablesize = sizeof(RGBTRIPLE) * count; bgrcolors = HeapAlloc(GetProcessHeap(), 0, tablesize); if (!wiccolors || !bgrcolors) { - HeapFree(GetProcessHeap(), 0, wiccolors); - HeapFree(GetProcessHeap(), 0, bgrcolors); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto end; } offset.QuadPart = sizeof(BITMAPFILEHEADER)+sizeof(BITMAPCOREHEADER); hr = IStream_Seek(This->stream, offset, STREAM_SEEK_SET, NULL); - if (FAILED(hr)) return hr; + if (FAILED(hr)) goto end; hr = IStream_Read(This->stream, bgrcolors, tablesize, &bytesread); - if (FAILED(hr)) return hr; - if (bytesread != tablesize) return E_FAIL; + if (FAILED(hr)) goto end; + if (bytesread != tablesize) { + hr = E_FAIL; + goto end; + } for (i=0; i<count; i++) { @@ -231,12 +235,6 @@ static HRESULT WINAPI BmpFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, (bgrcolors[i].rgbtGreen<<8)| bgrcolors[i].rgbtBlue; } - - hr = IWICPalette_InitializeCustom(pIPalette, wiccolors, count); - - HeapFree(GetProcessHeap(), 0, wiccolors); - HeapFree(GetProcessHeap(), 0, bgrcolors); - return hr; } else { @@ -247,8 +245,6 @@ static HRESULT WINAPI BmpFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, { if (This->bih.bV5BitCount <= 8) { - int count; - WICColor *wiccolors; ULONG tablesize, bytesread; LARGE_INTEGER offset; int i; @@ -264,26 +260,31 @@ static HRESULT WINAPI BmpFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, offset.QuadPart = sizeof(BITMAPFILEHEADER) + This->bih.bV5Size; hr = IStream_Seek(This->stream, offset, STREAM_SEEK_SET, NULL); - if (FAILED(hr)) return hr; + if (FAILED(hr)) goto end; hr = IStream_Read(This->stream, wiccolors, tablesize, &bytesread); - if (FAILED(hr)) return hr; - if (bytesread != tablesize) return E_FAIL; + if (FAILED(hr)) goto end; + if (bytesread != tablesize) { + hr = E_FAIL; + goto end; + } /* convert from BGR to BGRA by setting alpha to 100% */ for (i=0; i<count; i++) wiccolors[i] |= 0xff000000; - - hr = IWICPalette_InitializeCustom(pIPalette, wiccolors, count); - - HeapFree(GetProcessHeap(), 0, wiccolors); - return hr; } else { return WINCODEC_ERR_PALETTEUNAVAILABLE; } } + + hr = IWICPalette_InitializeCustom(pIPalette, wiccolors, count); + +end: + HeapFree(GetProcessHeap(), 0, wiccolors); + HeapFree(GetProcessHeap(), 0, bgrcolors); + return hr; } static HRESULT WINAPI BmpFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface,

1 0

Dylan Smith : richedit: Add more tests for WM_SETTEXT RTF support.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: e7fd0b46b0fc4f5a7f7ab4e5bc944a29eef71d99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7fd0b46b0fc4f5a7f7ab4e5b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jul 10 23:54:01 2009 -0400 richedit: Add more tests for WM_SETTEXT RTF support. --- dlls/riched20/tests/editor.c | 54 ++++++++++++++++++++++++++++++----------- 1 files changed, 39 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 0383d14..914f25b 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3282,10 +3282,15 @@ static void test_WM_SETTEXT(void) const char * TestItem7 = "TestSomeText\r\n\r\r\n\rTestSomeText"; const char * TestItem7_after = "TestSomeText\r\n \r\nTestSomeText"; + const char rtftextA[] = "{\\rtf sometext}"; + const char urtftextA[] = "{\\urtf sometext}"; + const WCHAR rtftextW[] = {'{','\\','r','t','f',' ','s','o','m','e','t','e','x','t','}',0}; + const WCHAR urtftextW[] = {'{','\\','u','r','t','f',' ','s','o','m','e','t','e','x','t','}',0}; + const WCHAR sometextW[] = {'s','o','m','e','t','e','x','t',0}; + char buf[1024] = {0}; + WCHAR bufW[1024] = {0}; LRESULT result; - EDITSTREAM es; - char * p; /* This test attempts to show that WM_SETTEXT on a riched20 control causes any solitary \r to be converted to \r\n on return. Properly paired @@ -3302,7 +3307,7 @@ static void test_WM_SETTEXT(void) result, lstrlen(buf)); \ result = strcmp(b, buf); \ ok(result == 0, \ - "WM_SETTEXT round trip: strcmp = %ld\n", result); + "WM_SETTEXT round trip: strcmp = %ld, text=\"%s\"\n", result, buf); TEST_SETTEXT(TestItem1, TestItem1) TEST_SETTEXT(TestItem2, TestItem2_after) @@ -3313,20 +3318,39 @@ static void test_WM_SETTEXT(void) TEST_SETTEXT(TestItem6, TestItem6_after) TEST_SETTEXT(TestItem7, TestItem7_after) - /* The following test demonstrates that WM_SETTEXT supports RTF strings */ - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) TestItem1); - p = buf; - es.dwCookie = (DWORD_PTR)&p; - es.dwError = 0; - es.pfnCallback = test_WM_SETTEXT_esCallback; - memset(buf, 0, sizeof(buf)); - SendMessage(hwndRichEdit, EM_STREAMOUT, - (WPARAM)(SF_RTF), (LPARAM)&es); - trace("EM_STREAMOUT produced:\n%s\n", buf); - TEST_SETTEXT(buf, TestItem1) - + /* The following tests demonstrate that WM_SETTEXT supports RTF strings */ + TEST_SETTEXT(rtftextA, "sometext") /* interpreted as ascii rtf */ + TEST_SETTEXT(urtftextA, "sometext") /* interpreted as ascii rtf */ + TEST_SETTEXT(rtftextW, "{") /* interpreted as ascii text */ + TEST_SETTEXT(urtftextW, "{") /* interpreted as ascii text */ + DestroyWindow(hwndRichEdit); #undef TEST_SETTEXT + +#define TEST_SETTEXTW(a, b) \ + result = SendMessageW(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) a); \ + ok (result == 1, "WM_SETTEXT returned %ld instead of 1\n", result); \ + result = SendMessageW(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) bufW); \ + ok (result == lstrlenW(bufW), \ + "WM_GETTEXT returned %ld instead of expected %u\n", \ + result, lstrlenW(bufW)); \ + result = lstrcmpW(b, bufW); \ + ok(result == 0, "WM_SETTEXT round trip: strcmp = %ld\n", result); + + if (is_win9x) + { + skip("Cannot perform unicode tests\n"); + return; + } +hwndRichEdit = CreateWindowW(RICHEDIT_CLASS20W, NULL, + ES_MULTILINE|WS_POPUP|WS_HSCROLL|WS_VSCROLL|WS_VISIBLE, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwndRichEdit != NULL, "class: RichEdit20W, error: %d\n", (int) GetLastError()); + TEST_SETTEXTW(rtftextA, sometextW) /* interpreted as ascii rtf */ + TEST_SETTEXTW(urtftextA, sometextW) /* interpreted as ascii rtf */ + TEST_SETTEXTW(rtftextW, rtftextW) /* interpreted as ascii text */ + TEST_SETTEXTW(urtftextW, urtftextW) /* interpreted as ascii text */ DestroyWindow(hwndRichEdit); +#undef TEST_SETTEXTW } static void test_EM_STREAMOUT(void)

1 0

Dylan Smith : richedit: Support ascii RTF in WM_SETTEXT even for unicode messages.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 88c2b90aa63b3a893f6edc0ffb4f652889a02c39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88c2b90aa63b3a893f6edc0ff… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jul 10 23:54:34 2009 -0400 richedit: Support ascii RTF in WM_SETTEXT even for unicode messages. WM_SETTEXT seems to check for {\rtf or {\urtf to determine if it is an ascii RTF string, even if it is a unicode message. So I removed the check to see if it is a unicode message, and added a check for {\urtf. --- dlls/riched20/editor.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 278b9aa..4cd72c8 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3194,7 +3194,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, /* If we detect ascii rtf at the start of the string, * we know it isn't unicode. */ bRtf = (lParam && (!strncmp((char *)lParam, "{\\rtf", 5) || - !strncmp((char *)lParam, "{\\urtf}", 6))); + !strncmp((char *)lParam, "{\\urtf", 6))); bUnicode = !bRtf && pStruct->codepage == 1200; TRACE("EM_SETTEXTEX - %s, flags %d, cp %d\n", @@ -3463,7 +3463,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (lParam) { TRACE("WM_SETTEXT lParam==%lx\n",lParam); - if (!unicode && !strncmp((char *)lParam, "{\\rtf", 5)) + if (!strncmp((char *)lParam, "{\\rtf", 5) || + !strncmp((char *)lParam, "{\\urtf", 6)) { /* Undocumented: WM_SETTEXT supports RTF text */ ME_StreamInRTFString(editor, 0, (char *)lParam);

1 0

Huw Davies : gdi32/tests: Allow a small tolerance when comparing scaling values.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: e5c614e6b144c06bc1950dc45f75d8bf5fdfb036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5c614e6b144c06bc1950dc45… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 10 14:47:50 2009 +0100 gdi32/tests: Allow a small tolerance when comparing scaling values. --- dlls/gdi32/tests/metafile.c | 48 ++++++++++++++++++------------------------ 1 files changed, 21 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 2eacd37..4a081d6 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2308,19 +2308,14 @@ static void test_SetWinMetaFileBits(void) HeapFree(GetProcessHeap(), 0, buffer); } -/* This is somewhat different to MulDiv, but appears to be how native behaves */ -static INT muldiv(INT m1, INT m2, INT d) +static BOOL near_match(int x, int y) { - LONGLONG ret; + int epsilon = min(abs(x), abs(y)); - ret = ((LONGLONG)m1 * m2 + d/2) / d; /* Always add d/2 even if ret will be -ve */ + epsilon = max(epsilon/100, 2); - if((LONGLONG)m1 * m2 * 2 == (2 * ret - 1) * d) /* If the answer is exactly n.5 round towards zero */ - { - if(ret > 0) ret--; - else ret++; - } - return ret; + if(x < y - epsilon || x > y + epsilon) return FALSE; + return TRUE; } static void getwinmetafilebits(UINT mode, int scale, RECT *rc) @@ -2422,43 +2417,42 @@ static void getwinmetafilebits(UINT mode, int scale, RECT *rc) case MM_TEXT: case MM_ISOTROPIC: case MM_ANISOTROPIC: - pt.y = muldiv(rc->top, vert_res, vert_size * 100); - pt.x = muldiv(rc->left, horz_res, horz_size * 100); + pt.y = MulDiv(rc->top, vert_res, vert_size * 100) + 1; + pt.x = MulDiv(rc->left, horz_res, horz_size * 100); break; case MM_LOMETRIC: - pt.y = muldiv(-rc->top, 1, 10) + 1; - pt.x = muldiv( rc->left, 1, 10); + pt.y = MulDiv(-rc->top, 1, 10) + 1; + pt.x = MulDiv( rc->left, 1, 10); break; case MM_HIMETRIC: pt.y = -rc->top + 1; pt.x = (rc->left >= 0) ? rc->left : rc->left + 1; /* strange but true */ break; case MM_LOENGLISH: - pt.y = muldiv(-rc->top, 10, 254) + 1; - pt.x = muldiv( rc->left, 10, 254); + pt.y = MulDiv(-rc->top, 10, 254) + 1; + pt.x = MulDiv( rc->left, 10, 254); break; case MM_HIENGLISH: - pt.y = muldiv(-rc->top, 100, 254) + 1; - pt.x = muldiv( rc->left, 100, 254); + pt.y = MulDiv(-rc->top, 100, 254) + 1; + pt.x = MulDiv( rc->left, 100, 254); break; case MM_TWIPS: - pt.y = muldiv(-rc->top, 72 * 20, 2540) + 1; - pt.x = muldiv( rc->left, 72 * 20, 2540); + pt.y = MulDiv(-rc->top, 72 * 20, 2540) + 1; + pt.x = MulDiv( rc->left, 72 * 20, 2540); break; default: pt.x = pt.y = 0; } - ok((short)rec->rdParm[0] == pt.y || - broken(mode >= MM_LOMETRIC && mode <= MM_TWIPS && (short)rec->rdParm[0] == pt.y - 1), /* win9x, winme */ - "got %d expect %d\n", (short)rec->rdParm[0], pt.y); - ok((short)rec->rdParm[1] == pt.x, "got %d expect %d\n", (short)rec->rdParm[1], pt.x); + ok(near_match((short)rec->rdParm[0], pt.y), "got %d expect %d\n", (short)rec->rdParm[0], pt.y); + ok(near_match((short)rec->rdParm[1], pt.x), "got %d expect %d\n", (short)rec->rdParm[1], pt.x); } if(rec_num == mfcomment_chunks + 2) { ok(rec->rdFunction == META_SETWINDOWEXT, "got %04x\n", rec->rdFunction); - ok((short)rec->rdParm[0] == muldiv(rc->bottom - rc->top, vert_res, vert_size * 100), "got %d\n", (short)rec->rdParm[0]); - ok((short)rec->rdParm[1] == muldiv(rc->right - rc->left, horz_res, horz_size * 100), "got %d\n", (short)rec->rdParm[1]); - + ok(near_match((short)rec->rdParm[0], MulDiv(rc->bottom - rc->top, vert_res, vert_size * 100)), + "got %d\n", (short)rec->rdParm[0]); + ok(near_match((short)rec->rdParm[1], MulDiv(rc->right - rc->left, horz_res, horz_size * 100)), + "got %d\n", (short)rec->rdParm[1]); } rec_num++;

1 0

Jacek Caban : wininet: Rename WININETFTPFILEW to ftp_file_t.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 54870c1431d14ae0601c2ffe6dd5c9e2745b117d URL: http://source.winehq.org/git/wine.git/?a=commit;h=54870c1431d14ae0601c2ffe6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 01:46:44 2009 +0200 wininet: Rename WININETFTPFILEW to ftp_file_t. --- dlls/wininet/ftp.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index f809568..fcc9d9e 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -76,7 +76,7 @@ typedef struct ftp_session_t *lpFtpSession; BOOL session_deleted; int nDataSocket; -} WININETFTPFILE, *LPWININETFTPFILE; +} ftp_file_t; struct _ftp_session_t { @@ -85,7 +85,7 @@ struct _ftp_session_t int sndSocket; int lstnSocket; int pasvSocket; /* data socket connected by us in case of passive FTP */ - LPWININETFTPFILE download_in_progress; + ftp_file_t *download_in_progress; struct sockaddr_in socketAddress; struct sockaddr_in lstnSocketAddress; LPWSTR lpszPassword; @@ -1086,7 +1086,7 @@ lend: */ static void FTPFILE_Destroy(object_header_t *hdr) { - LPWININETFTPFILE lpwh = (LPWININETFTPFILE) hdr; + ftp_file_t *lpwh = (ftp_file_t*) hdr; ftp_session_t *lpwfs = lpwh->lpFtpSession; INT nResCode; @@ -1125,7 +1125,7 @@ static DWORD FTPFILE_QueryOption(object_header_t *hdr, DWORD option, void *buffe static DWORD FTPFILE_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DWORD *read) { - WININETFTPFILE *file = (WININETFTPFILE*)hdr; + ftp_file_t *file = (ftp_file_t*)hdr; int res; if (file->nDataSocket == -1) @@ -1152,7 +1152,7 @@ static DWORD FTPFILE_ReadFileExW(object_header_t *hdr, INTERNET_BUFFERSW *buffer static BOOL FTPFILE_WriteFile(object_header_t *hdr, const void *buffer, DWORD size, DWORD *written) { - LPWININETFTPFILE lpwh = (LPWININETFTPFILE) hdr; + ftp_file_t *lpwh = (ftp_file_t*) hdr; int res; res = send(lpwh->nDataSocket, buffer, size, 0); @@ -1161,7 +1161,7 @@ static BOOL FTPFILE_WriteFile(object_header_t *hdr, const void *buffer, DWORD si return res >= 0; } -static void FTP_ReceiveRequestData(WININETFTPFILE *file, BOOL first_notif) +static void FTP_ReceiveRequestData(ftp_file_t *file, BOOL first_notif) { INTERNET_ASYNC_RESULT iar; BYTE buffer[4096]; @@ -1185,14 +1185,14 @@ static void FTP_ReceiveRequestData(WININETFTPFILE *file, BOOL first_notif) static void FTPFILE_AsyncQueryDataAvailableProc(WORKREQUEST *workRequest) { - WININETFTPFILE *file = (WININETFTPFILE*)workRequest->hdr; + ftp_file_t *file = (ftp_file_t*)workRequest->hdr; FTP_ReceiveRequestData(file, FALSE); } static DWORD FTPFILE_QueryDataAvailable(object_header_t *hdr, DWORD *available, DWORD flags, DWORD_PTR ctx) { - LPWININETFTPFILE file = (LPWININETFTPFILE) hdr; + ftp_file_t *file = (ftp_file_t*) hdr; int retval, unread = 0; TRACE("(%p %p %x %lx)\n", file, available, flags, ctx); @@ -1259,7 +1259,7 @@ HINTERNET FTP_FtpOpenFileW(ftp_session_t *lpwfs, { INT nDataSocket; BOOL bSuccess = FALSE; - LPWININETFTPFILE lpwh = NULL; + ftp_file_t *lpwh = NULL; appinfo_t *hIC = NULL; HINTERNET handle = NULL; @@ -1282,7 +1282,7 @@ HINTERNET FTP_FtpOpenFileW(ftp_session_t *lpwfs, /* Get data socket to server */ if (bSuccess && FTP_GetDataSocket(lpwfs, &nDataSocket)) { - lpwh = HeapAlloc(GetProcessHeap(), 0, sizeof(WININETFTPFILE)); + lpwh = HeapAlloc(GetProcessHeap(), 0, sizeof(ftp_file_t)); lpwh->hdr.htype = WH_HFILE; lpwh->hdr.vtbl = &FTPFILEVtbl; lpwh->hdr.dwFlags = dwFlags;

1 0

Jacek Caban : wininet: Rename WININETFTPSESSIONW to ftp_session_t.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 8adbf8ce0185e842c8110503038b2f18d3a0c74b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8adbf8ce0185e842c81105030… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 01:45:53 2009 +0200 wininet: Rename WININETFTPSESSIONW to ftp_session_t. --- dlls/wininet/ftp.c | 189 ++++++++++++++++++++++++++-------------------------- 1 files changed, 94 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8adbf8ce0185e842c8110…

1 0

Jacek Caban : wininet: Rename WININETAPPINFOW to appinfo_t.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 6d1601a850d15d8f2da229c0247c29a3d456f025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1601a850d15d8f2da229c02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 01:45:06 2009 +0200 wininet: Rename WININETAPPINFOW to appinfo_t. --- dlls/wininet/dialogs.c | 4 ++-- dlls/wininet/ftp.c | 44 ++++++++++++++++++++++---------------------- dlls/wininet/http.c | 15 +++++++-------- dlls/wininet/internet.c | 27 +++++++++++++-------------- dlls/wininet/internet.h | 8 ++++---- 5 files changed, 48 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d1601a850d15d8f2da22…

1 0

Jacek Caban : wininet: Rename WININETHTTPREQW to http_request_t.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 34abacde71097339a4d876f3c8634b45250d64b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34abacde71097339a4d876f3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 01:41:50 2009 +0200 wininet: Rename WININETHTTPREQW to http_request_t. --- dlls/wininet/dialogs.c | 8 +- dlls/wininet/http.c | 163 +++++++++++++++++++++++------------------------ dlls/wininet/internet.h | 4 +- 3 files changed, 87 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34abacde71097339a4d87…

1 0

Jacek Caban : wininet: Rename WININETHTTPSESSIONW to http_session_t.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: e9f4a4058414b8445a81ee74523af9438ac59e23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9f4a4058414b8445a81ee745… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 01:41:18 2009 +0200 wininet: Rename WININETHTTPSESSIONW to http_session_t. --- dlls/wininet/dialogs.c | 4 ++-- dlls/wininet/http.c | 34 +++++++++++++++++----------------- dlls/wininet/internet.h | 6 +++--- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 41494a6..a8d071e 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -63,7 +63,7 @@ struct WININET_ErrorDlgParams static BOOL WININET_GetProxyServer( HINTERNET hRequest, LPWSTR szBuf, DWORD sz ) { LPWININETHTTPREQW lpwhr; - LPWININETHTTPSESSIONW lpwhs = NULL; + http_session_t *lpwhs = NULL; LPWININETAPPINFOW hIC = NULL; LPWSTR p; @@ -204,7 +204,7 @@ static BOOL WININET_SetProxyAuthorization( HINTERNET hRequest, LPWSTR username, LPWSTR password ) { LPWININETHTTPREQW lpwhr; - LPWININETHTTPSESSIONW lpwhs; + http_session_t *lpwhs; LPWININETAPPINFOW hIC; LPWSTR p; diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 5832a5c..d35784e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1018,7 +1018,7 @@ HINTERNET WINAPI HttpOpenRequestW(HINTERNET hHttpSession, LPCWSTR lpszReferrer , LPCWSTR *lpszAcceptTypes, DWORD dwFlags, DWORD_PTR dwContext) { - LPWININETHTTPSESSIONW lpwhs; + http_session_t *lpwhs; HINTERNET handle = NULL; TRACE("(%p, %s, %s, %s, %s, %p, %08x, %08lx)\n", hHttpSession, @@ -1032,7 +1032,7 @@ HINTERNET WINAPI HttpOpenRequestW(HINTERNET hHttpSession, TRACE("\taccept type: %s\n",debugstr_w(lpszAcceptTypes[i])); } - lpwhs = (LPWININETHTTPSESSIONW) WININET_GetObject( hHttpSession ); + lpwhs = (http_session_t*) WININET_GetObject( hHttpSession ); if (NULL == lpwhs || lpwhs->hdr.htype != WH_HHTTPSESSION) { INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); @@ -1388,7 +1388,7 @@ static WCHAR *HTTP_BuildProxyRequestUrl(WININETHTTPREQW *req) static const WCHAR slash[] = { '/',0 }; static const WCHAR format[] = { 'h','t','t','p',':','/','/','%','s',':','%','d',0 }; static const WCHAR formatSSL[] = { 'h','t','t','p','s',':','/','/','%','s',':','%','d',0 }; - WININETHTTPSESSIONW *session = req->lpHttpSession; + http_session_t *session = req->lpHttpSession; size = 16; /* "https://" + sizeof(port#) + ":/\0" */ size += strlenW( session->lpszHostName ) + strlenW( req->lpszPath ); @@ -1410,7 +1410,7 @@ static WCHAR *HTTP_BuildProxyRequestUrl(WININETHTTPREQW *req) * HTTP_DealWithProxy */ static BOOL HTTP_DealWithProxy( LPWININETAPPINFOW hIC, - LPWININETHTTPSESSIONW lpwhs, LPWININETHTTPREQW lpwhr) + http_session_t *lpwhs, LPWININETHTTPREQW lpwhr) { WCHAR buf[MAXHOSTNAME]; WCHAR proxy[MAXHOSTNAME + 15]; /* 15 == "http://" + sizeof(port#) + ":/\0" */ @@ -1455,7 +1455,7 @@ static BOOL HTTP_DealWithProxy( LPWININETAPPINFOW hIC, static BOOL HTTP_ResolveName(LPWININETHTTPREQW lpwhr) { char szaddr[INET6_ADDRSTRLEN]; - LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; + http_session_t *lpwhs = lpwhr->lpHttpSession; const void *addr; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, @@ -1604,7 +1604,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe switch(option) { case INTERNET_OPTION_SECURITY_FLAGS: { - LPWININETHTTPSESSIONW lpwhs; + http_session_t *lpwhs; lpwhs = req->lpHttpSession; if (*size < sizeof(ULONG)) @@ -2392,7 +2392,7 @@ static const object_vtbl_t HTTPREQVtbl = { * NULL on failure * */ -HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, +HINTERNET WINAPI HTTP_HttpOpenRequestW(http_session_t *lpwhs, LPCWSTR lpszVerb, LPCWSTR lpszObjectName, LPCWSTR lpszVersion, LPCWSTR lpszReferrer , LPCWSTR *lpszAcceptTypes, DWORD dwFlags, DWORD_PTR dwContext) @@ -3134,7 +3134,7 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET hRequest, { BOOL ret = FALSE; LPWININETHTTPREQW lpwhr; - LPWININETHTTPSESSIONW lpwhs; + http_session_t *lpwhs; LPWININETAPPINFOW hIC; TRACE("(%p, %p, %p, %08x, %08lx)\n", hRequest, lpBuffersIn, @@ -3222,7 +3222,7 @@ BOOL WINAPI HttpSendRequestW(HINTERNET hHttpRequest, LPCWSTR lpszHeaders, DWORD dwHeaderLength, LPVOID lpOptional ,DWORD dwOptionalLength) { LPWININETHTTPREQW lpwhr; - LPWININETHTTPSESSIONW lpwhs = NULL; + http_session_t *lpwhs = NULL; LPWININETAPPINFOW hIC = NULL; BOOL r; @@ -3332,7 +3332,7 @@ static LPWSTR HTTP_GetRedirectURL(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) { static WCHAR szHttp[] = {'h','t','t','p',0}; static WCHAR szHttps[] = {'h','t','t','p','s',0}; - LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; + http_session_t *lpwhs = lpwhr->lpHttpSession; URL_COMPONENTSW urlComponents; DWORD url_length = 0; LPWSTR orig_url; @@ -3392,7 +3392,7 @@ static LPWSTR HTTP_GetRedirectURL(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) */ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) { - LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; + http_session_t *lpwhs = lpwhr->lpHttpSession; LPWININETAPPINFOW hIC = lpwhs->lpAppInfo; BOOL using_proxy = hIC->lpszProxy && hIC->lpszProxy[0]; WCHAR path[INTERNET_MAX_URL_LENGTH]; @@ -3575,7 +3575,7 @@ static BOOL HTTP_SecureProxyConnect(LPWININETHTTPREQW lpwhr) BOOL ret; static const WCHAR szConnect[] = {'C','O','N','N','E','C','T',0}; static const WCHAR szFormat[] = {'%','s',':','%','d',0}; - LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; + http_session_t *lpwhs = lpwhr->lpHttpSession; TRACE("\n"); @@ -3944,7 +3944,7 @@ lend: */ static void HTTPSESSION_Destroy(object_header_t *hdr) { - LPWININETHTTPSESSIONW lpwhs = (LPWININETHTTPSESSIONW) hdr; + http_session_t *lpwhs = (http_session_t*) hdr; TRACE("%p\n", lpwhs); @@ -3976,7 +3976,7 @@ static DWORD HTTPSESSION_QueryOption(object_header_t *hdr, DWORD option, void *b static DWORD HTTPSESSION_SetOption(object_header_t *hdr, DWORD option, void *buffer, DWORD size) { - WININETHTTPSESSIONW *ses = (WININETHTTPSESSIONW*)hdr; + http_session_t *ses = (http_session_t*)hdr; switch(option) { case INTERNET_OPTION_USERNAME: @@ -4025,7 +4025,7 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext, DWORD dwInternalFlags) { - LPWININETHTTPSESSIONW lpwhs = NULL; + http_session_t *lpwhs = NULL; HINTERNET handle = NULL; TRACE("-->\n"); @@ -4038,7 +4038,7 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, assert( hIC->hdr.htype == WH_HINIT ); - lpwhs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WININETHTTPSESSIONW)); + lpwhs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(http_session_t)); if (NULL == lpwhs) { INTERNET_SetLastError(ERROR_OUTOFMEMORY); @@ -4122,7 +4122,7 @@ lerror: static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr) { BOOL bSuccess = FALSE; - LPWININETHTTPSESSIONW lpwhs; + http_session_t *lpwhs; LPWININETAPPINFOW hIC = NULL; char szaddr[INET6_ADDRSTRLEN]; const void *addr; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 4cd22d6..527e785 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -167,7 +167,7 @@ typedef struct INTERNET_PORT nServerPort; /* the port of the server we directly connect to */ struct sockaddr_storage socketAddress; socklen_t sa_len; -} WININETHTTPSESSIONW, *LPWININETHTTPSESSIONW; +} http_session_t; #define HDR_ISREQUEST 0x0001 #define HDR_COMMADELIMITED 0x0002 @@ -189,7 +189,7 @@ typedef struct gzip_stream_t gzip_stream_t; typedef struct { object_header_t hdr; - WININETHTTPSESSIONW *lpHttpSession; + http_session_t *lpHttpSession; LPWSTR lpszPath; LPWSTR lpszVerb; LPWSTR lpszRawHeaders; @@ -393,7 +393,7 @@ LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen); BOOLAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, DWORD dwHeaderLength, LPVOID lpOptional, DWORD dwOptionalLength, DWORD dwContentLength, BOOL bEndRequest); -INTERNETAPI HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, +INTERNETAPI HINTERNET WINAPI HTTP_HttpOpenRequestW(http_session_t *session, LPCWSTR lpszVerb, LPCWSTR lpszObjectName, LPCWSTR lpszVersion, LPCWSTR lpszReferrer , LPCWSTR *lpszAcceptTypes, DWORD dwFlags, DWORD_PTR dwContext);

1 0

Alexander Nicolaysen Sørnes : taskmgr: Update Norwegian Bokmål translation.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 0e85dec8b6ceacc9eebf29a1d8d85ec2f15be621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e85dec8b6ceacc9eebf29a1d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jul 12 17:48:47 2009 +0200 taskmgr: Update Norwegian Bokmål translation. --- programs/taskmgr/No.rc | 172 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 130 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e85dec8b6ceacc9eebf2…

1 0

Alexander Nicolaysen Sørnes : crypt32: Update Norwegian Bokmål translation.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: de8099fcc37241f5ea2efe23dc509c1c3755763d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8099fcc37241f5ea2efe23d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jul 12 17:24:19 2009 +0200 crypt32: Update Norwegian Bokmål translation. --- dlls/crypt32/crypt32_No.rc | 123 ++++++++++++++++++++++++++++++++++---------- 1 files changed, 95 insertions(+), 28 deletions(-) diff --git a/dlls/crypt32/crypt32_No.rc b/dlls/crypt32/crypt32_No.rc index 2665286..b9edbff 100644 --- a/dlls/crypt32/crypt32_No.rc +++ b/dlls/crypt32/crypt32_No.rc @@ -1,7 +1,7 @@ /* * crypt32 dll resources * - * Copyright (C) 2006 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright (C) 2006-2009 Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,22 +20,24 @@ #include "cryptres.h" +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE { - IDS_AUTHORITY_KEY_ID "Identifiserer for autentiseringsn�kkel" - IDS_KEY_ATTRIBUTES "N�kkelegenskaper" - IDS_KEY_USAGE_RESTRICTION "Begrensning av n�kkelbruk" + IDS_AUTHORITY_KEY_ID "Identifiserer for autentiseringsnøkkel" + IDS_KEY_ATTRIBUTES "Nøkkelegenskaper" + IDS_KEY_USAGE_RESTRICTION "Begrensning av nøkkelbruk" IDS_SUBJECT_ALT_NAME "Alternativt navn for emne" IDS_ISSUER_ALT_NAME "Alternativt navn for utsteder" IDS_BASIC_CONSTRAINTS "Basisbegrensninger" - IDS_KEY_USAGE "N�kkelbruk" + IDS_KEY_USAGE "Nøkkelbruk" IDS_CERT_POLICIES "Sertifikatholdninger" - IDS_SUBJECT_KEY_IDENTIFIER "Identifiserer for emnen�kkel" + IDS_SUBJECT_KEY_IDENTIFIER "Identifiserer for emnenøkkel" IDS_CRL_REASON_CODE "CRL-grunnkode" IDS_CRL_DIST_POINTS "CRL-distribusjonspunkter" - IDS_ENHANCED_KEY_USAGE "Forbedret n�kkelbruk" + IDS_ENHANCED_KEY_USAGE "Forbedret nøkkelbruk" IDS_AUTHORITY_INFO_ACCESS "Myndighet-informasjonstilgang" IDS_CERT_EXTENSIONS "Sertifikatutvidelser" IDS_NEXT_UPDATE_LOCATION "Neste oppdateringsplassering" @@ -54,7 +56,7 @@ STRINGTABLE DISCARDABLE IDS_USER_NOTICE "Brukervarsel" IDS_OCSP "On-line Certificate Status Protocol" IDS_CA_ISSUER "Utsteder for sertifiseringsautoritet" - IDS_CERT_TEMPLATE_NAME "Navn p� sertifiseringsmal" + IDS_CERT_TEMPLATE_NAME "Navn på sertifiseringsmal" IDS_CERT_TYPE "Sertifikattype" IDS_CERT_MANIFOLD "Sertifikatmangfold" IDS_NETSCAPE_CERT_TYPE "Netscape-sertifikattype" @@ -94,15 +96,15 @@ STRINGTABLE DISCARDABLE IDS_ISSUING_DIST_POINT "Utsteder distribusjonspunkt" IDS_FRESHEST_CRL "Nyeste CRL" IDS_NAME_CONSTRAINTS "Navnebegrensninger" - IDS_POLICY_MAPPINGS "Framgangsm�tekartlegginger" - IDS_POLICY_CONSTRAINTS "Framgangsm�tebegresninger" + IDS_POLICY_MAPPINGS "Framgangsmåtekartlegginger" + IDS_POLICY_CONSTRAINTS "Framgangsmåtebegresninger" IDS_CROSS_CERT_DIST_POINTS "Distribusjonspunkter for kryss-sertifikat" - IDS_APPLICATION_POLICIES "Framgangsm�ter for programmers" - IDS_APPLICATION_POLICY_MAPPINGS "Framgangsm�tekartlegginger for programmer" - IDS_APPLICATION_POLICY_CONSTRAINTS "Framgangsm�tebegrensninger for programmer" + IDS_APPLICATION_POLICIES "Framgangsmåter for programmers" + IDS_APPLICATION_POLICY_MAPPINGS "Framgangsmåtekartlegginger for programmer" + IDS_APPLICATION_POLICY_CONSTRAINTS "Framgangsmåtebegrensninger for programmer" IDS_CMC_DATA "CMC-data" IDS_CMC_RESPONSE "CMS-svar" - IDS_UNSIGNED_CMC_REQUEST "Usignert CMC-foresp�rsel" + IDS_UNSIGNED_CMC_REQUEST "Usignert CMC-forespørsel" IDS_CMC_STATUS_INFO "CMC-statusinformasjon" IDS_CMC_EXTENSIONS "CMC-utvidelser" IDS_CMC_ATTRIBUTES "CMC-egenskaper" @@ -110,30 +112,30 @@ STRINGTABLE DISCARDABLE IDS_PKCS_7_SIGNED "PKCS 7 Signert" IDS_PKCS_7_ENVELOPED "PKCS 7 Innpakket" IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 Signert Innpakket" - IDS_PKCS_7_DIGESTED "PKCS 7 Ford�yet" + IDS_PKCS_7_DIGESTED "PKCS 7 Fordøyet" IDS_PKCS_7_ENCRYPTED "PKCS 7 Kryptert" IDS_PREVIOUS_CA_CERT_HASH "Forrige CA-sertifikatlappskaus" IDS_CRL_VIRTUAL_BASE "Virtuelt basis-CRL-nummer" IDS_CRL_NEXT_PUBLISH "Neste CRL-utgiving" IDS_CA_EXCHANGE "CA-krypteringssertifikat" - IDS_KEY_RECOVERY_AGENT "Agent for n�kkelgjenoppretting" + IDS_KEY_RECOVERY_AGENT "Agent for nøkkelgjenoppretting" IDS_CERTIFICATE_TEMPLATE "Informasjon om sertifikatmal" IDS_ENTERPRISE_ROOT_OID "Storselskap-rot-OID" IDS_RDN_DUMMY_SIGNER "Tullesignerer" - IDS_ARCHIVED_KEY_ATTR "Kryptert privat n�kkel" + IDS_ARCHIVED_KEY_ATTR "Kryptert privat nøkkel" IDS_CRL_SELF_CDP "Publisert CRL-plasseringer" - IDS_REQUIRE_CERT_CHAIN_POLICY "H�ndhev sertifikatlenkepolitikk" + IDS_REQUIRE_CERT_CHAIN_POLICY "Håndhev sertifikatlenkepolitikk" IDS_TRANSACTION_ID "Transaksjons-id" IDS_SENDER_NONCE "Gjeldende sender" IDS_RECIPIENT_NONCE "Gjeldende mottaker" IDS_REG_INFO "Reg info" IDS_GET_CERTIFICATE "Hent sertifikat" IDS_GET_CRL "Hent CRL" - IDS_REVOKE_REQUEST "Gjenoppliv foresp�rsel" - IDS_QUERY_PENDING "Sp�rring venter" + IDS_REVOKE_REQUEST "Gjenoppliv forespørsel" + IDS_QUERY_PENDING "Spørring venter" IDS_SORTED_CTL "Tillitsliste for sertifikater" - IDS_ARCHIVED_KEY_CERT_HASH "Arkivert n�kkelsertifikatlappskaus" - IDS_PRIVATE_KEY_USAGE_PERIOD "Privat n�kkelbrukperiode" + IDS_ARCHIVED_KEY_CERT_HASH "Arkivert nøkkelsertifikatlappskaus" + IDS_PRIVATE_KEY_USAGE_PERIOD "Privat nøkkelbrukperiode" IDS_CLIENT_INFORMATION "Klientinformasjon" IDS_SERVER_AUTHENTICATION "Tjenerautentisering" IDS_CLIENT_AUTHENTICATION "Klientautentisering" @@ -150,21 +152,21 @@ STRINGTABLE DISCARDABLE IDS_NT5_CRYPTO "Windows sytemkomponent-godkjenning" IDS_OEM_WHQL_CRYPTO "OEM Windows systemkomponent-godkjenning" IDS_EMBEDDED_NT_CRYPTO "Innebygget Windows systemkomponent-godkjenning" - IDS_KEY_PACK_LICENSES "N�kkelpakkelisenser" + IDS_KEY_PACK_LICENSES "Nøkkelpakkelisenser" IDS_LICENSE_SERVER "Lisenstjener-verifisering" - IDS_SMART_CARD_LOGON "Smart Card-p�logging" + IDS_SMART_CARD_LOGON "Smart Card-pålogging" IDS_DIGITAL_RIGHTS "Digitale rettigheter" IDS_QUALIFIED_SUBORDINATION "Kvalifisert underordinering" - IDS_KEY_RECOVERY "N�kkelgjenoppretting" + IDS_KEY_RECOVERY "Nøkkelgjenoppretting" IDS_DOCUMENT_SIGNING "Dokumentsignering" IDS_IPSEC_IKE_INTERMEDIATE "IP-sikkerhet IKE viderekommen" IDS_FILE_RECOVERY "Filgjenoppretting" IDS_ROOT_LIST_SIGNER "Rotlistesignerer" - IDS_ANY_APPLICATION_POLICIES "Alle framgangsm�ter for programmer" + IDS_ANY_APPLICATION_POLICIES "Alle framgangsmåter for programmer" IDS_DS_EMAIL_REPLICATION "Katalogtjeneste e-postreplikering" - IDS_ENROLLMENT_AGENT "Agent for sertifikatforesp�rsler" + IDS_ENROLLMENT_AGENT "Agent for sertifikatforespørsler" IDS_LIFETIME_SIGNING "Livstidsignering" - IDS_ANY_CERT_POLICY "Alle framgangsm�ter for utsteding" + IDS_ANY_CERT_POLICY "Alle framgangsmåter for utsteding" } STRINGTABLE DISCARDABLE @@ -173,4 +175,69 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_MY "Personlig" IDS_LOCALIZEDNAME_CA "Mellomliggende sertifiseringsinstanser" IDS_LOCALIZEDNAME_ADDRESSBOOK "Andre personer" + IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Betrodde utgivere" + IDS_LOCALIZEDNAME_DISALLOWED "Mistrodde sertifikater" +} + +STRINGTABLE DISCARDABLE +{ + IDS_KEY_ID "NøkkelID=" + IDS_CERT_ISSUER "Utsteder" + IDS_CERT_SERIAL_NUMBER "Serienummer=" + IDS_ALT_NAME_OTHER_NAME "Annet navn=" + IDS_ALT_NAME_RFC822_NAME "E-postadresse=" + IDS_ALT_NAME_DNS_NAME "DNS-navn=" + IDS_ALT_NAME_DIRECTORY_NAME "Katalogadresse" + IDS_ALT_NAME_URL "URL=" + IDS_ALT_NAME_IP_ADDRESS "IP-adresse=" + IDS_ALT_NAME_MASK "Mask=" + IDS_ALT_NAME_REGISTERED_ID "Registrert ID=" + IDS_USAGE_UNKNOWN "Ukjent nøkkelbruk" + IDS_SUBJECT_TYPE "Emnetype=" + IDS_SUBJECT_TYPE_CA "CA" + IDS_SUBJECT_TYPE_END_CERT "Sluttenhet" + IDS_PATH_LENGTH "Begrensning på stilengde=" + IDS_PATH_LENGTH_NONE "Ingen" + IDS_INFO_NOT_AVAILABLE "Informasjonen er utilgjengelig" + IDS_AIA "Tilgang til autoritetsinfo" + IDS_ACCESS_METHOD "Tilgangsmetode=" + IDS_ACCESS_METHOD_OCSP "OCSP" + IDS_ACCESS_METHOD_CA_ISSUERS "CA-utstedere" + IDS_ACCESS_METHOD_UNKNOWN "Ukjent tilgangsmetode" + IDS_ACCESS_LOCATION "Alternativt navn" + IDS_CRL_DIST_POINT "Distribusjonspunkt for CRL" + IDS_CRL_DIST_POINT_NAME "Navn på distribusjonspunkt" + IDS_CRL_DIST_POINT_FULL_NAME "Fult navn" + IDS_CRL_DIST_POINT_RDN_NAME "RDN-navn" + IDS_CRL_DIST_POINT_REASON "CRL-årsak=" + IDS_CRL_DIST_POINT_ISSUER "CRL-utsteder" + IDS_REASON_KEY_COMPROMISE "Nøkellkompromiss" + IDS_REASON_CA_COMPROMISE "CA-kompromiss" + IDS_REASON_AFFILIATION_CHANGED "Tilslutning endret" + IDS_REASON_SUPERSEDED "Erstattet" + IDS_REASON_CESSATION_OF_OPERATION "Operasjonen opphørte" + IDS_REASON_CERTIFICATE_HOLD "Sertifikatet er holdt tilbake" + IDS_FINANCIAL_CRITERIA "Finansiell informasjon=" + IDS_FINANCIAL_CRITERIA_AVAILABLE "Tilgjengelig" + IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "Ikke tilgjengelig" + IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "Møter kriterier=" + IDS_YES "Ja" + IDS_NO "Nei" + IDS_DIGITAL_SIGNATURE "Digital signatur" + IDS_NON_REPUDIATION "Kan ikke tilbakekalles" + IDS_KEY_ENCIPHERMENT "Nøkkelkryptering" + IDS_DATA_ENCIPHERMENT "Datakryptering" + IDS_KEY_AGREEMENT "Nøkkel-avtale" + IDS_CERT_SIGN "Sertifikatsignering" + IDS_OFFLINE_CRL_SIGN "Lokal CRL-signering" + IDS_CRL_SIGN "CRL-signering" + IDS_ENCIPHER_ONLY "Kun kryptering" + IDS_DECIPHER_ONLY "Kun dekryptering" + IDS_NETSCAPE_SSL_CLIENT "Autentisering av SSL-klient" + IDS_NETSCAPE_SSL_SERVER "Autentisering av SSL-tjener" + IDS_NETSCAPE_SMIME "S/MIME" + IDS_NETSCAPE_SIGN "Signatur" + IDS_NETSCAPE_SSL_CA "SSL CA" + IDS_NETSCAPE_SMIME_CA "S/MIME CA" + IDS_NETSCAPE_SIGN_CA "Signatur CA" }

1 0

Rein Klazes : comdlg32/tests: Remove file dialog resize tests that rely on CDN_SELCHANGE notifications.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 36d5265aee92837d217fdc3d6fbf315ba05a4b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36d5265aee92837d217fdc3d6… Author: Rein Klazes <wijn(a)online.nl> Date: Sun Jul 12 14:36:10 2009 +0200 comdlg32/tests: Remove file dialog resize tests that rely on CDN_SELCHANGE notifications. These notifications are not always sent on some (but not all) win2k3/vista/win2k8 machines. --- dlls/comdlg32/tests/filedlg.c | 35 +++++++++++++---------------------- 1 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 63375bb..2bef8ce 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -273,23 +273,20 @@ static void test_create_view_template(void) /* test cases for resizing of the file dialog */ struct { DWORD flags; - int resize_folderchange; /* change in CDN_FOLDERCHANGE handler */ - int resize_selchange; /* change in CDN_SELCHANGE handler */ - int resize_timer1; /* change in first WM_TIMER handler */ - int resize_check; /* expected change (in second WM_TIMER handler) */ - BOOL todo; /* mark that test todo_wine */ - BOOL testcontrols; /* test resizing and moving of the controls */ + int resize_folderchange;/* change in CDN_FOLDERCHANGE handler */ + int resize_timer1; /* change in first WM_TIMER handler */ + int resize_check; /* expected change (in second WM_TIMER handler) */ + BOOL todo; /* mark that test todo_wine */ + BOOL testcontrols; /* test resizing and moving of the controls */ } resize_testcases[] = { - { 0 , 10, 10, 10, 30,FALSE,FALSE}, /* 0 */ - { 0 ,-10,-10,-10,-30,FALSE,FALSE}, - { OFN_ENABLESIZING , 0, 0, 0, 0,FALSE,FALSE}, - { OFN_ENABLESIZING , 0, 0,-10, 0,FALSE,FALSE}, - { OFN_ENABLESIZING , 0, 0, 10, 10,FALSE, TRUE}, - { OFN_ENABLESIZING , 0,-10, 0, 0,FALSE,FALSE}, /* 5 */ - { OFN_ENABLESIZING , 0, 10, 0, 10,FALSE,FALSE}, - { OFN_ENABLESIZING ,-10, 0, 0, 10,FALSE,FALSE}, - { OFN_ENABLESIZING , 10, 0, 0, 10,FALSE,FALSE}, - { OFN_ENABLESIZING , 0, 0, 10, 20,FALSE,FALSE}, + { 0 , 10, 10, 20,FALSE,FALSE}, /* 0 */ + { 0 ,-10,-10,-20,FALSE,FALSE}, + { OFN_ENABLESIZING , 0, 0, 0,FALSE,FALSE}, + { OFN_ENABLESIZING , 0,-10, 0,FALSE,FALSE}, + { OFN_ENABLESIZING , 0, 10, 10,FALSE, TRUE}, + { OFN_ENABLESIZING ,-10, 0, 10,FALSE,FALSE}, /* 5 */ + { OFN_ENABLESIZING , 10, 0, 10,FALSE,FALSE}, + { OFN_ENABLESIZING , 0, 10, 20,FALSE,FALSE}, /* mark the end */ { 0xffffffff } }; @@ -338,12 +335,6 @@ static LONG_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L MoveWindow( parent, initrc.left,initrc.top, initrc.right - initrc.left + resize, initrc.bottom - initrc.top + resize, TRUE); } - } else if(( (LPNMHDR)lParam)->code == CDN_SELCHANGE){ - if( (resize = resize_testcases[index].resize_selchange)){ - GetWindowRect( parent, &rc); - MoveWindow( parent, rc.left,rc.top, rc.right - rc.left + resize, - rc.bottom - rc.top + resize, TRUE); - } SetTimer( dlg, 0, 100, 0); } break;

1 0

Nikolay Sivov : comctl32/header: Update item bounds on WM_SIZE.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: fdb7412725d492442d02de70637eadc0314ecfa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdb7412725d492442d02de706… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jul 12 04:40:58 2009 +0400 comctl32/header: Update item bounds on WM_SIZE. --- dlls/comctl32/header.c | 3 +-- dlls/comctl32/tests/header.c | 32 ++++++++++---------------------- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index aa68102..1ee58cd 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -247,8 +247,7 @@ HEADER_SetItemBounds (HEADER_INFO *infoPtr) static LRESULT HEADER_Size (HEADER_INFO *infoPtr) { - infoPtr->bRectsValid = FALSE; - + HEADER_SetItemBounds(infoPtr); return 0; } diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 3b6aa30..bf3960e 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -819,10 +819,8 @@ static void test_hdm_getitemrect(HWND hParent) expect(80, rect.left); expect(0, rect.top); expect(160, rect.right); - todo_wine - { - expect(g_customheight, rect.bottom); - } + expect(g_customheight, rect.bottom); + retVal = SendMessage(hChild, HDM_GETITEMRECT, 0, (LPARAM) &rect); ok(retVal == TRUE, "Getting item rect should TRUE, got %d\n", retVal); @@ -831,10 +829,8 @@ static void test_hdm_getitemrect(HWND hParent) expect(0, rect.top); expect(80, rect.right); - todo_wine - { - expect(g_customheight, rect.bottom); - } + expect(g_customheight, rect.bottom); + retVal = SendMessage(hChild, HDM_GETITEMRECT, 10, (LPARAM) &rect); ok(retVal == 0, "Getting rect of nonexistent item should return 0, got %d\n", retVal); @@ -906,20 +902,14 @@ static void test_hdm_hittest(HWND hParent) flush_sequences(sequences, NUM_MSG_SEQUENCES); retVal = SendMessage(hChild, HDM_HITTEST, 0, (LPARAM) &hdHitTestInfo); - todo_wine - { - expect(0, retVal); - expect(0, hdHitTestInfo.iItem); - } + expect(0, retVal); + expect(0, hdHitTestInfo.iItem); pt.x = secondItemRightBoundary - 1; pt.y = bottomBoundary - 1; hdHitTestInfo.pt = pt; retVal = SendMessage(hChild, HDM_HITTEST, 1, (LPARAM) &hdHitTestInfo); - todo_wine - { - expect(1, retVal); - } + expect(1, retVal); expect(1, hdHitTestInfo.iItem); pt.x = secondItemRightBoundary; @@ -950,11 +940,9 @@ static void test_hdm_sethotdivider(HWND hParent) "adder header control to parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); - todo_wine - { - retVal = SendMessage(hChild, HDM_SETHOTDIVIDER, TRUE, MAKELPARAM(5, 5)); - expect(0, retVal); - } + retVal = SendMessage(hChild, HDM_SETHOTDIVIDER, TRUE, MAKELPARAM(5, 5)); + expect(0, retVal); + retVal = SendMessage(hChild, HDM_SETHOTDIVIDER, FALSE, 100); expect(100, retVal); retVal = SendMessage(hChild, HDM_SETHOTDIVIDER, FALSE, 1);

1 0

Nikolay Sivov : comctl32/header: Use macro to define LPARAM value.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: fac7daf098398bd0d73142e1bc6595a9482d7d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac7daf098398bd0d73142e1b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jul 12 02:48:38 2009 +0400 comctl32/header: Use macro to define LPARAM value. --- dlls/comctl32/tests/header.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index e357f9d..3b6aa30 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -952,7 +952,7 @@ static void test_hdm_sethotdivider(HWND hParent) flush_sequences(sequences, NUM_MSG_SEQUENCES); todo_wine { - retVal = SendMessage(hChild, HDM_SETHOTDIVIDER, TRUE, 0X00050005); + retVal = SendMessage(hChild, HDM_SETHOTDIVIDER, TRUE, MAKELPARAM(5, 5)); expect(0, retVal); } retVal = SendMessage(hChild, HDM_SETHOTDIVIDER, FALSE, 100);

1 0

Eric Pouech : winedbg: 'Int XX' is not a function call, so don' t try to handle it as such on i386.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 28dd48227978d7aabfad018c6d9a428a08cba240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28dd48227978d7aabfad018c6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jul 11 21:19:05 2009 +0200 winedbg: 'Int XX' is not a function call, so don't try to handle it as such on i386. --- programs/winedbg/be_i386.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index ce2076c..c22ef14 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -543,9 +543,6 @@ static unsigned be_i386_is_func_call(const void* insn, ADDRESS64* callee) } return TRUE; - case 0xCD: - WINE_FIXME("Unsupported yet call insn (0x%02x) at %p\n", ch, insn); - /* fall through */ default: return FALSE; }

1 0

Vincent Povirk : gdiplus: Implement GdipSetLineLinearBlend.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 2cdc48a4e5e532ae46d7951908b61d63cf2842f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cdc48a4e5e532ae46d795190… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Sat Jul 11 11:49:44 2009 -0500 gdiplus: Implement GdipSetLineLinearBlend. --- dlls/gdiplus/brush.c | 29 ++++++++++++++++-- dlls/gdiplus/tests/brush.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 92 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 824ece0..bb19e43 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1531,12 +1531,33 @@ GpStatus WINGDIPAPI GdipRotateTextureTransform(GpTexture* brush, REAL angle, GpStatus WINGDIPAPI GdipSetLineLinearBlend(GpLineGradient *brush, REAL focus, REAL scale) { - static int calls; + REAL factors[3]; + REAL positions[3]; + int num_points = 0; - if(!(calls++)) - FIXME("not implemented\n"); + TRACE("(%p,%.2f,%.2f)\n", brush, focus, scale); - return NotImplemented; + if (!brush) return InvalidParameter; + + if (focus != 0.0) + { + factors[num_points] = 0.0; + positions[num_points] = 0.0; + num_points++; + } + + factors[num_points] = scale; + positions[num_points] = focus; + num_points++; + + if (focus != 1.0) + { + factors[num_points] = 0.0; + positions[num_points] = 1.0; + num_points++; + } + + return GdipSetLineBlend(brush, factors, positions, num_points); } GpStatus WINGDIPAPI GdipSetLinePresetBlend(GpLineGradient *brush, diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index b6fbe30..7993d60 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -493,6 +493,71 @@ static void test_lineblend(void) expect(Ok, status); } +static void test_linelinearblend(void) +{ + GpLineGradient *brush; + GpStatus status; + GpPointF pt1, pt2; + INT count=10; + REAL res_factors[3] = {0.3f}; + REAL res_positions[3] = {0.3f}; + + status = GdipSetLineLinearBlend(NULL, 0.6, 0.8); + expect(InvalidParameter, status); + + pt1.X = pt1.Y = 1.0; + pt2.X = pt2.Y = 100.0; + status = GdipCreateLineBrush(&pt1, &pt2, 0, 0, WrapModeTile, &brush); + expect(Ok, status); + + + status = GdipSetLineLinearBlend(brush, 0.6, 0.8); + expect(Ok, status); + + status = GdipGetLineBlendCount(brush, &count); + expect(Ok, status); + expect(3, count); + + status = GdipGetLineBlend(brush, res_factors, res_positions, 3); + expect(Ok, status); + expectf(0.0, res_factors[0]); + expectf(0.0, res_positions[0]); + expectf(0.8, res_factors[1]); + expectf(0.6, res_positions[1]); + expectf(0.0, res_factors[2]); + expectf(1.0, res_positions[2]); + + + status = GdipSetLineLinearBlend(brush, 0.0, 0.8); + expect(Ok, status); + + status = GdipGetLineBlendCount(brush, &count); + expect(Ok, status); + expect(2, count); + + status = GdipGetLineBlend(brush, res_factors, res_positions, 3); + expect(Ok, status); + expectf(0.8, res_factors[0]); + expectf(0.0, res_positions[0]); + expectf(0.0, res_factors[1]); + expectf(1.0, res_positions[1]); + + + status = GdipSetLineLinearBlend(brush, 1.0, 0.8); + expect(Ok, status); + + status = GdipGetLineBlendCount(brush, &count); + expect(Ok, status); + expect(2, count); + + status = GdipGetLineBlend(brush, res_factors, res_positions, 3); + expect(Ok, status); + expectf(0.0, res_factors[0]); + expectf(0.0, res_positions[0]); + expectf(0.8, res_factors[1]); + expectf(1.0, res_positions[1]); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -515,6 +580,7 @@ START_TEST(brush) test_texturewrap(); test_gradientgetrect(); test_lineblend(); + test_linelinearblend(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 0c1e54f..2ee24bd 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -409,6 +409,7 @@ GpStatus WINGDIPAPI GdipGetLineBlendCount(GpLineGradient*,INT*); GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient*,ARGB,ARGB); GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient*,BOOL); GpStatus WINGDIPAPI GdipSetLineSigmaBlend(GpLineGradient*,REAL,REAL); +GpStatus WINGDIPAPI GdipSetLineLinearBlend(GpLineGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetLineWrapMode(GpLineGradient*,GpWrapMode); /* Matrix */

1 0

Vincent Povirk : gdiplus: Use brush_fill_path in GdipFillRectangleI.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 849af30eb82aa3307d6c78f926ff2dfa5c760e3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=849af30eb82aa3307d6c78f92… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Sat Jul 11 10:38:47 2009 -0500 gdiplus: Use brush_fill_path in GdipFillRectangleI. --- dlls/gdiplus/graphics.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 595fc24..58ca2e6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2786,12 +2786,14 @@ GpStatus WINGDIPAPI GdipFillRectangleI(GpGraphics *graphics, GpBrush *brush, save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); - SelectObject(graphics->hdc, brush->gdibrush); - SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); transform_and_round_points(graphics, pti, ptf, 4); + BeginPath(graphics->hdc); Polygon(graphics->hdc, pti, 4); + EndPath(graphics->hdc); + + brush_fill_path(graphics, brush); RestoreDC(graphics->hdc, save_state);

1 0

Vincent Povirk : gdiplus: Use brush_fill_path in GdipFillRegion.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 6a8a770c76fb530b98dd18064f9dd40f9e159218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8a770c76fb530b98dd18064… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Sat Jul 11 10:57:07 2009 -0500 gdiplus: Use brush_fill_path in GdipFillRegion. --- dlls/gdiplus/graphics.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2912416..595fc24 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2855,6 +2855,7 @@ GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, INT save_state; GpStatus status; HRGN hrgn; + RECT rc; TRACE("(%p, %p, %p)\n", graphics, brush, region); @@ -2870,9 +2871,17 @@ GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); - SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); - FillRgn(graphics->hdc, hrgn, brush->gdibrush); + ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); + + if (GetClipBox(graphics->hdc, &rc) != NULLREGION) + { + BeginPath(graphics->hdc); + Rectangle(graphics->hdc, rc.left, rc.top, rc.right, rc.bottom); + EndPath(graphics->hdc); + + brush_fill_path(graphics, brush); + } RestoreDC(graphics->hdc, save_state);

1 0

Vincent Povirk : gdiplus: Use brush_fill_path in GdipFillPolygonI.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 38fc894c966442cc952bcdcdedc97fa0fc44f84c URL: http://source.winehq.org/git/wine.git/?a=commit;h=38fc894c966442cc952bcdcde… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Sat Jul 11 10:37:22 2009 -0500 gdiplus: Use brush_fill_path in GdipFillPolygonI. --- dlls/gdiplus/graphics.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e0fbf8a..2912416 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2684,13 +2684,16 @@ GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics *graphics, GpBrush *brush, save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); - SelectObject(graphics->hdc, brush->gdibrush); - SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); SetPolyFillMode(graphics->hdc, (fillMode == FillModeAlternate ? ALTERNATE : WINDING)); transform_and_round_points(graphics, pti, ptf, count); + + BeginPath(graphics->hdc); Polygon(graphics->hdc, pti, count); + EndPath(graphics->hdc); + + brush_fill_path(graphics, brush); RestoreDC(graphics->hdc, save_state);

1 0

Vincent Povirk : gdiplus: Use brush_fill_path in GdipFillPolygon.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 15fef07887b7c9dcd6f092d843a26d24131f21d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15fef07887b7c9dcd6f092d84… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Sat Jul 11 10:35:40 2009 -0500 gdiplus: Use brush_fill_path in GdipFillPolygon. --- dlls/gdiplus/graphics.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 160b7f8..e0fbf8a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2634,13 +2634,16 @@ GpStatus WINGDIPAPI GdipFillPolygon(GpGraphics *graphics, GpBrush *brush, save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); - SelectObject(graphics->hdc, brush->gdibrush); - SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); SetPolyFillMode(graphics->hdc, (fillMode == FillModeAlternate ? ALTERNATE : WINDING)); transform_and_round_points(graphics, pti, ptf, count); + + BeginPath(graphics->hdc); Polygon(graphics->hdc, pti, count); + EndPath(graphics->hdc); + + brush_fill_path(graphics, brush); RestoreDC(graphics->hdc, save_state);

1 0

Vincent Povirk : gdiplus: Use brush_fill_path in GdipFillPie.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: bedbd40f5ebb5ad0d648b1bdc4001639025c6ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bedbd40f5ebb5ad0d648b1bdc… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Sat Jul 11 10:32:34 2009 -0500 gdiplus: Use brush_fill_path in GdipFillPie. --- dlls/gdiplus/graphics.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e8777e9..160b7f8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2586,10 +2586,12 @@ GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); - SelectObject(graphics->hdc, brush->gdibrush); - SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); + BeginPath(graphics->hdc); draw_pie(graphics, x, y, width, height, startAngle, sweepAngle); + EndPath(graphics->hdc); + + brush_fill_path(graphics, brush); RestoreDC(graphics->hdc, save_state);

1 0

Vincent Povirk : gdiplus: Use brush_fill_path in GdipFillEllipse.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: e306316c7dd390358e93f435b3add19833d2ba04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e306316c7dd390358e93f435b… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Sat Jul 11 10:29:44 2009 -0500 gdiplus: Use brush_fill_path in GdipFillEllipse. --- dlls/gdiplus/graphics.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b59814e..e8777e9 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2512,12 +2512,14 @@ GpStatus WINGDIPAPI GdipFillEllipse(GpGraphics *graphics, GpBrush *brush, REAL x save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); - SelectObject(graphics->hdc, brush->gdibrush); - SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); transform_and_round_points(graphics, pti, ptf, 2); + BeginPath(graphics->hdc); Ellipse(graphics->hdc, pti[0].x, pti[0].y, pti[1].x, pti[1].y); + EndPath(graphics->hdc); + + brush_fill_path(graphics, brush); RestoreDC(graphics->hdc, save_state);

1 0

Andrew Talbot : dbghelp: Constify some variables.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 41ca9b0ffd48765e34a886d08435bbfe5b477ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41ca9b0ffd48765e34a886d08… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jul 11 16:13:17 2009 +0100 dbghelp: Constify some variables. --- dlls/dbghelp/elf_module.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 12754dd..6c79c8b 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -237,7 +237,7 @@ static void elf_end_find(struct elf_file_map* fmap) * * Get the size of an ELF section */ -static inline unsigned elf_get_map_size(struct elf_section_map* esm) +static inline unsigned elf_get_map_size(const struct elf_section_map* esm) { if (esm->sidx < 0 || esm->sidx >= esm->fmap->elfhdr.e_shnum) return 0; @@ -473,7 +473,7 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, */ static const Elf32_Sym* elf_lookup_symtab(const struct module* module, const struct hash_table* ht_symtab, - const char* name, struct symt* compiland) + const char* name, const struct symt* compiland) { struct symtab_elt* weak_result = NULL; /* without compiland name */ struct symtab_elt* result = NULL; @@ -490,7 +490,7 @@ static const Elf32_Sym* elf_lookup_symtab(const struct module* module, if (compiland) { compiland_name = source_get(module, - ((struct symt_compiland*)compiland)->source); + ((const struct symt_compiland*)compiland)->source); compiland_basename = strrchr(compiland_name, '/'); if (!compiland_basename++) compiland_basename = compiland_name; } @@ -542,7 +542,7 @@ static const Elf32_Sym* elf_lookup_symtab(const struct module* module, * - get any relevant information (address & size) from the bits we got from the * stabs debugging information */ -static void elf_finish_stabs_info(struct module* module, struct hash_table* symtab) +static void elf_finish_stabs_info(struct module* module, const struct hash_table* symtab) { struct hash_table_iter hti; void* ptr; @@ -623,7 +623,7 @@ static void elf_finish_stabs_info(struct module* module, struct hash_table* symt * * creating the thunk objects for a wine native DLL */ -static int elf_new_wine_thunks(struct module* module, struct hash_table* ht_symtab, +static int elf_new_wine_thunks(struct module* module, const struct hash_table* ht_symtab, const struct elf_thunk_area* thunks) { int j; @@ -716,7 +716,7 @@ static int elf_new_wine_thunks(struct module* module, struct hash_table* ht_symt * * Creates a set of public symbols from an ELF symtab */ -static int elf_new_public_symbols(struct module* module, struct hash_table* symtab) +static int elf_new_public_symbols(struct module* module, const struct hash_table* symtab) { struct hash_table_iter hti; struct symtab_elt* ste; @@ -830,7 +830,7 @@ found: * Parses a .gnu_debuglink section and loads the debug info from * the external file specified there. */ -static BOOL elf_debuglink_parse(struct elf_file_map* fmap, struct module* module, +static BOOL elf_debuglink_parse(struct elf_file_map* fmap, const struct module* module, const BYTE* debuglink) { /* The content of a debug link section is:

1 0

Alexandre Julliard : widl: Take into account the alignment of conformant arrays to pad a structure.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: f21eab110127a27855db84b5a7d53f2c44984a0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21eab110127a27855db84b5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 13 09:23:06 2009 +0200 widl: Take into account the alignment of conformant arrays to pad a structure. --- tools/widl/typegen.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 3a5e2e5..d297eb2 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2208,11 +2208,12 @@ static void write_struct_members(FILE *file, const type_t *type, if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) { type_t *ft = field->type; + unsigned int align = 0; + unsigned int size = type_memsize(ft, &align); + if (salign < align) salign = align; + if (!is_conformant_array(ft) || type_array_is_decl_as_ptr(ft)) { - unsigned int align = 0; - unsigned int size = type_memsize(ft, &align); - if (salign < align) salign = align; if ((align - 1) & offset) { unsigned char fc = 0;

1 0

Alexandre Julliard : ddraw/tests: Fix a few tests that fail on Win64.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 5622f74486eb560f38867655f9f754c0c5b21cb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5622f74486eb560f38867655f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 10 20:52:33 2009 +0200 ddraw/tests: Fix a few tests that fail on Win64. --- dlls/ddraw/tests/d3d.c | 1 + dlls/ddraw/tests/dsurface.c | 3 ++- dlls/ddraw/tests/overlay.c | 3 ++- dlls/ddraw/tests/refcount.c | 12 +++++++++++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 57e1da0..f4cd07b 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -951,6 +951,7 @@ static BOOL D3D1_createObjects(void) ok(hr==DD_OK, "SetCooperativeLevel returned: %x\n", hr); hr = IDirectDraw_QueryInterface(DirectDraw1, &IID_IDirect3D, (void**) &Direct3D1); + if (hr == E_NOINTERFACE) return FALSE; ok(hr==DD_OK, "QueryInterface returned: %x\n", hr); if (!Direct3D1) { return FALSE; diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index c3280fb..a73c34c 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1029,7 +1029,8 @@ static void IFaceRefCount(void) todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); /* IDirect3DTexture interface (unlike the others) alters the original IDirectDrawSurface ref count */ - IDirectDrawSurface_QueryInterface(surf, &IID_IDirect3DTexture, (void **) &tex); + ret = IDirectDrawSurface_QueryInterface(surf, &IID_IDirect3DTexture, (void **) &tex); + if (ret == E_NOINTERFACE) return; /* win64 */ ref = getRefcount((IUnknown *) tex); todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); ref = getRefcount((IUnknown *) surf); diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index d1edc1d..55c4989 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -200,7 +200,8 @@ static void yv12_test(void) ok(desc.dwFlags == (DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_PITCH), "Unexpected desc.dwFlags 0x%08x\n", desc.dwFlags); - ok(desc.ddsCaps.dwCaps == (DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM), + ok(desc.ddsCaps.dwCaps == (DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM) || + desc.ddsCaps.dwCaps == (DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_HWCODEC), "Unexpected desc.ddsCaps.dwCaps 0x%08x\n", desc.ddsCaps.dwCaps); ok(desc.dwWidth == 256 && desc.dwHeight == 256, "Expected size 64x64, got %ux%u\n", desc.dwWidth, desc.dwHeight); diff --git a/dlls/ddraw/tests/refcount.c b/dlls/ddraw/tests/refcount.c index bfff64a..f0496e3 100644 --- a/dlls/ddraw/tests/refcount.c +++ b/dlls/ddraw/tests/refcount.c @@ -237,7 +237,17 @@ static void test_iface_refcnt(void) ok(ref == 1, "IDirectDraw reference count is %ld\n", ref); hr = IDirectDraw7_QueryInterface(DDraw7, &IID_IDirect3D7, (void **) &D3D7); - ok(hr == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", hr); + ok(hr == DD_OK || hr == E_NOINTERFACE, /* win64 */ + "IDirectDraw7_QueryInterface returned %08x\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(DDraw7); + IDirectDraw4_Release(DDraw4); + IDirectDraw2_Release(DDraw2); + IDirectDraw_Release(DDraw1); + skip( "no IDirect3D7 support\n" ); + return; + } /* Apparently IDirectDrawX and IDirect3DX are linked together */ ref = getRefcount( (IUnknown *) D3D7);

1 0

Alexandre Julliard : oleaut32: Fix safe array marshalling on 64-bit.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 74c985aad16e802f30d9d329c67dc58f56fa3008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c985aad16e802f30d9d329c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 10 19:13:27 2009 +0200 oleaut32: Fix safe array marshalling on 64-bit. --- dlls/oleaut32/usrmarshal.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 1e20c3c..3172eba 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -232,7 +232,7 @@ static unsigned int get_type_size(ULONG *pFlags, VARTYPE vt) case VT_DECIMAL: return sizeof(DECIMAL); case VT_BSTR: - return sizeof(BSTR); + return sizeof(ULONG); case VT_VARIANT: return sizeof(VARIANT); case VT_UNKNOWN: @@ -764,7 +764,7 @@ ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY HRESULT hr; size += sizeof(ULONG); - size += FIELD_OFFSET(struct _wireSAFEARRAY, uArrayStructs); + size += 2 * sizeof(USHORT) + 2 * sizeof(ULONG); sftype = SAFEARRAY_GetUnionType(psa); size += sizeof(ULONG); @@ -850,23 +850,23 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf VARTYPE vt; SAFEARRAY *psa = *ppsa; ULONG ulCellCount = SAFEARRAY_GetCellCount(psa); - wireSAFEARRAY wiresa; SF_TYPE sftype; GUID guid; *(ULONG *)Buffer = psa->cDims; Buffer += sizeof(ULONG); - wiresa = (wireSAFEARRAY)Buffer; - wiresa->cDims = psa->cDims; - wiresa->fFeatures = psa->fFeatures; - wiresa->cbElements = psa->cbElements; + *(USHORT *)Buffer = psa->cDims; + Buffer += sizeof(USHORT); + *(USHORT *)Buffer = psa->fFeatures; + Buffer += sizeof(USHORT); + *(ULONG *)Buffer = psa->cbElements; + Buffer += sizeof(ULONG); hr = SafeArrayGetVartype(psa, &vt); if (FAILED(hr)) vt = 0; - wiresa->cLocks = (USHORT)psa->cLocks | (vt << 16); - - Buffer += FIELD_OFFSET(struct _wireSAFEARRAY, uArrayStructs); + *(ULONG *)Buffer = (USHORT)psa->cLocks | (vt << 16); + Buffer += sizeof(ULONG); sftype = SAFEARRAY_GetUnionType(psa); *(ULONG *)Buffer = sftype; @@ -987,7 +987,7 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B Buffer += sizeof(ULONG); wiresa = (wireSAFEARRAY)Buffer; - Buffer += FIELD_OFFSET(struct _wireSAFEARRAY, uArrayStructs); + Buffer += 2 * sizeof(USHORT) + 2 * sizeof(ULONG); if (cDims != wiresa->cDims) RpcRaiseException(RPC_S_INVALID_BOUND);

1 0