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

Jacek Caban : mshtml: Added HTMLElement::onkeypress implementation.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 6942dd0862f487e3228fc6aa8c4be161d36dd5cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6942dd0862f487e3228fc6aa8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 13 14:44:59 2012 +0200 mshtml: Added HTMLElement::onkeypress implementation. --- dlls/mshtml/htmlelem.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 62df8b8..82967d8 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -568,15 +568,19 @@ static HRESULT WINAPI HTMLElement_get_onkeyup(IHTMLElement *iface, VARIANT *p) static HRESULT WINAPI HTMLElement_put_onkeypress(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_KEYPRESS, &v); } static HRESULT WINAPI HTMLElement_get_onkeypress(IHTMLElement *iface, VARIANT *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_KEYPRESS, p); } static HRESULT WINAPI HTMLElement_put_onmouseout(IHTMLElement *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Added HTMLInputElement::onchange implementation.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 9caf3431cdc73cf69f967dcc45757f389a34e065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9caf3431cdc73cf69f967dcc4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 13 14:45:19 2012 +0200 mshtml: Added HTMLInputElement::onchange implementation. --- dlls/mshtml/htmlinput.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 27b1b47..f4f513c 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -303,15 +303,19 @@ static HRESULT WINAPI HTMLInputElement_select(IHTMLInputElement *iface) static HRESULT WINAPI HTMLInputElement_put_onchange(IHTMLInputElement *iface, VARIANT v) { HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return set_node_event(&This->element.node, EVENTID_CHANGE, &v); } static HRESULT WINAPI HTMLInputElement_get_onchange(IHTMLInputElement *iface, VARIANT *p) { HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->element.node, EVENTID_CHANGE, p); } static HRESULT WINAPI HTMLInputElement_put_onselect(IHTMLInputElement *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Added IHTMLInputElement::maxLength implementation.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 4c96957fc6768ef1fbb8801b4a17682dc59db34c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c96957fc6768ef1fbb8801b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 13 14:45:46 2012 +0200 mshtml: Added IHTMLInputElement::maxLength implementation. --- dlls/mshtml/htmlinput.c | 28 ++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 27 ++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index f4f513c..ba6e98f 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -18,6 +18,7 @@ #include <stdarg.h> #include <assert.h> +#include <limits.h> #define COBJMACROS @@ -273,15 +274,34 @@ static HRESULT WINAPI HTMLInputElement_get_size(IHTMLInputElement *iface, LONG * static HRESULT WINAPI HTMLInputElement_put_maxLength(IHTMLInputElement *iface, LONG v) { HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - FIXME("(%p)->(%d)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%d)\n", This, v); + + nsres = nsIDOMHTMLInputElement_SetMaxLength(This->nsinput, v); + if(NS_FAILED(nsres)) { + /* FIXME: Gecko throws an error on negative values, while MSHTML should accept them */ + FIXME("SetMaxLength failed\n"); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLInputElement_get_maxLength(IHTMLInputElement *iface, LONG *p) { HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRInt32 max_length; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLInputElement_GetMaxLength(This->nsinput, &max_length); + assert(nsres == NS_OK); + + /* Gecko reports -1 as default value, while MSHTML uses INT_MAX */ + *p = max_length == -1 ? INT_MAX : max_length; + return S_OK; } static HRESULT WINAPI HTMLInputElement_select(IHTMLInputElement *iface) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b40fe5d..8940627 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2704,11 +2704,33 @@ static void _test_input_set_checked(unsigned line, IHTMLInputElement *input, VAR HRESULT hres; hres = IHTMLInputElement_put_checked(input, b); - ok_(__FILE__,line) (hres == S_OK, "get_checked failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "put_checked failed: %08x\n", hres); _test_input_get_checked(line, input, b); } +#define test_input_maxlength(i,b) _test_input_maxlength(__LINE__,i,b) +static void _test_input_maxlength(unsigned line, IHTMLInputElement *input, LONG exl) +{ + LONG maxlength = 0xdeadbeef; + HRESULT hres; + + hres = IHTMLInputElement_get_maxLength(input, &maxlength); + ok_(__FILE__,line) (hres == S_OK, "get_maxLength failed: %08x\n", hres); + ok_(__FILE__,line) (maxlength == exl, "maxLength=%x, expected %d\n", maxlength, exl); +} + +#define test_input_set_maxlength(i,b) _test_input_set_maxlength(__LINE__,i,b) +static void _test_input_set_maxlength(unsigned line, IHTMLInputElement *input, LONG l) +{ + HRESULT hres; + + hres = IHTMLInputElement_put_maxLength(input, l); + ok_(__FILE__,line) (hres == S_OK, "put_maxLength failed: %08x\n", hres); + + _test_input_maxlength(line, input, l); +} + #define test_input_value(o,t) _test_input_value(__LINE__,o,t) static void _test_input_value(unsigned line, IUnknown *unk, const char *exval) { @@ -5295,6 +5317,9 @@ static void test_elems(IHTMLDocument2 *doc) test_input_set_checked(input, VARIANT_TRUE); test_input_set_checked(input, VARIANT_FALSE); + test_input_maxlength(input, 0x7fffffff); + test_input_set_maxlength(input, 30); + test_input_name(input, NULL); test_input_set_name(input, "test");

1 0

Jacek Caban : mshtml: Added IHTMLAnchorElement::name implementation.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: e140cd338d1827ed41b36347124ffd206eeecfab URL: http://source.winehq.org/git/wine.git/?a=commit;h=e140cd338d1827ed41b363471… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 13 14:46:08 2012 +0200 mshtml: Added IHTMLAnchorElement::name implementation. --- dlls/mshtml/htmlanchor.c | 25 +++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 6e0fc71..4575d14 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -314,15 +314,32 @@ static HRESULT WINAPI HTMLAnchorElement_get_Methods(IHTMLAnchorElement *iface, B static HRESULT WINAPI HTMLAnchorElement_put_name(IHTMLAnchorElement *iface, BSTR v) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLAnchorElement_SetName(This->nsanchor, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) + return E_FAIL; + + return S_OK; } static HRESULT WINAPI HTMLAnchorElement_get_name(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString name_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&name_str, NULL); + nsres = nsIDOMHTMLAnchorElement_GetName(This->nsanchor, &name_str); + + return return_nsstr(nsres, &name_str, p); } static HRESULT WINAPI HTMLAnchorElement_put_host(IHTMLAnchorElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8940627..1eed229 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1296,6 +1296,37 @@ static void _test_anchor_put_target(unsigned line, IUnknown *unk, const char *ta SysFreeString(str); } +#define test_anchor_name(a,h) _test_anchor_name(__LINE__,a,h) +static void _test_anchor_name(unsigned line, IUnknown *unk, const char *name) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); + BSTR str; + HRESULT hres; + + hres = IHTMLAnchorElement_get_name(anchor, &str); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + if(name) + ok_(__FILE__,line)(!strcmp_wa(str, name), "name = %s, expected %s\n", wine_dbgstr_w(str), name); + else + ok_(__FILE__,line)(str == NULL, "name = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + +#define test_anchor_put_name(a,h) _test_anchor_put_name(__LINE__,a,h) +static void _test_anchor_put_name(unsigned line, IUnknown *unk, const char *name) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); + BSTR str; + HRESULT hres; + + str = name ? a2bstr(name) : NULL; + hres = IHTMLAnchorElement_put_name(anchor, str); + ok_(__FILE__,line)(hres == S_OK, "put_name failed: %08x\n", hres); + SysFreeString(str); + + _test_anchor_name(line, unk, name); +} + #define test_option_text(o,t) _test_option_text(__LINE__,o,t) static void _test_option_text(unsigned line, IHTMLOptionElement *option, const char *text) @@ -5408,6 +5439,11 @@ static void test_elems(IHTMLDocument2 *doc) test_anchor_put_target((IUnknown*)elem, NULL); test_anchor_get_target((IUnknown*)elem, NULL); + test_anchor_name((IUnknown*)elem, "x"); + test_anchor_put_name((IUnknown*)elem, "anchor name"); + test_anchor_put_name((IUnknown*)elem, NULL); + test_anchor_put_name((IUnknown*)elem, "x"); + IHTMLElement_Release(elem); }

1 0

Jacek Caban : mshtml: Moved invoking DISPID_VALUE to separated function.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 01af42a4270d67027ba44cb93e39f16aa4a5e4ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=01af42a4270d67027ba44cb93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 13 14:46:26 2012 +0200 mshtml: Moved invoking DISPID_VALUE to separated function. --- dlls/mshtml/dispex.c | 77 ++++++++++++++++++++++++++++---------------------- 1 files changed, 43 insertions(+), 34 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 66dad69..39dfa64 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -646,6 +646,47 @@ static func_disp_t *create_func_disp(DispatchEx *obj, func_info_t *info) return ret; } +static HRESULT invoke_disp_value(DispatchEx *This, IDispatch *func_disp, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + DISPID named_arg = DISPID_THIS; + DISPPARAMS new_dp = {NULL, &named_arg, 0, 1}; + IDispatchEx *dispex; + HRESULT hres; + + if(dp->cNamedArgs) { + FIXME("named args not supported\n"); + return E_NOTIMPL; + } + + new_dp.rgvarg = heap_alloc((dp->cArgs+1)*sizeof(VARIANTARG)); + if(!new_dp.rgvarg) + return E_OUTOFMEMORY; + + new_dp.cArgs = dp->cArgs+1; + memcpy(new_dp.rgvarg+1, dp->rgvarg, dp->cArgs*sizeof(VARIANTARG)); + + V_VT(new_dp.rgvarg) = VT_DISPATCH; + V_DISPATCH(new_dp.rgvarg) = (IDispatch*)&This->IDispatchEx_iface; + + hres = IDispatch_QueryInterface(func_disp, &IID_IDispatchEx, (void**)&dispex); + TRACE(">>>\n"); + if(SUCCEEDED(hres)) { + hres = IDispatchEx_InvokeEx(dispex, DISPID_VALUE, lcid, flags, &new_dp, res, ei, caller); + IDispatchEx_Release(dispex); + }else { + ULONG err = 0; + hres = IDispatch_Invoke(func_disp, DISPID_VALUE, &IID_NULL, lcid, flags, &new_dp, res, ei, &err); + } + if(SUCCEEDED(hres)) + TRACE("<<< %s\n", debugstr_variant(res)); + else + WARN("<<< %08x\n", hres); + + heap_free(new_dp.rgvarg); + return hres; +} + static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei) { @@ -1108,45 +1149,13 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc if(!pvarRes) return E_INVALIDARG; /* fall through */ - case DISPATCH_METHOD: { - DISPID named_arg = DISPID_THIS; - DISPPARAMS dp = {NULL, &named_arg, 0, 1}; - IDispatchEx *dispex; - + case DISPATCH_METHOD: if(V_VT(&prop->var) != VT_DISPATCH) { FIXME("invoke %s\n", debugstr_variant(&prop->var)); return E_NOTIMPL; } - if(pdp->cNamedArgs) { - FIXME("named args not supported\n"); - return E_NOTIMPL; - } - - dp.rgvarg = heap_alloc((pdp->cArgs+1)*sizeof(VARIANTARG)); - if(!dp.rgvarg) - return E_OUTOFMEMORY; - - dp.cArgs = pdp->cArgs+1; - memcpy(dp.rgvarg+1, pdp->rgvarg, pdp->cArgs*sizeof(VARIANTARG)); - - V_VT(dp.rgvarg) = VT_DISPATCH; - V_DISPATCH(dp.rgvarg) = (IDispatch*)&This->IDispatchEx_iface; - - hres = IDispatch_QueryInterface(V_DISPATCH(&prop->var), &IID_IDispatchEx, (void**)&dispex); - TRACE("%s call\n", debugstr_w(This->dynamic_data->props[idx].name)); - if(SUCCEEDED(hres)) { - hres = IDispatchEx_InvokeEx(dispex, DISPID_VALUE, lcid, wFlags, &dp, pvarRes, pei, pspCaller); - IDispatchEx_Release(dispex); - }else { - ULONG err = 0; - hres = IDispatch_Invoke(V_DISPATCH(&prop->var), DISPID_VALUE, &IID_NULL, lcid, wFlags, pdp, pvarRes, pei, &err); - } - TRACE("%s ret %08x\n", debugstr_w(This->dynamic_data->props[idx].name), hres); - - heap_free(dp.rgvarg); - return hres; - } + return invoke_disp_value(This, V_DISPATCH(&prop->var), lcid, wFlags, pdp, pvarRes, pei, pspCaller); case DISPATCH_PROPERTYGET: if(prop->flags & DYNPROP_DELETED) return DISP_E_UNKNOWNNAME;

1 0

Jacek Caban : mshtml: Added support for calling functions returned by builtin getters.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 61ded412a2ced9ee7af7b50ad393ad2c23170e58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ded412a2ced9ee7af7b50ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 13 14:46:41 2012 +0200 mshtml: Added support for calling functions returned by builtin getters. --- dlls/mshtml/dispex.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 39dfa64..bbe6098 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -849,7 +849,7 @@ static HRESULT builtin_propget(DispatchEx *This, func_info_t *func, DISPPARAMS * IUnknown *iface; HRESULT hres; - if(dp->cArgs) { + if(dp && dp->cArgs) { FIXME("cArgs %d\n", dp->cArgs); return E_NOTIMPL; } @@ -961,7 +961,25 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD hres = builtin_propget(This, func, dp, res); break; default: - hres = typeinfo_invoke(This, func, flags, dp, res, ei); + if(!func->get_vtbl_off) { + hres = typeinfo_invoke(This, func, flags, dp, res, ei); + }else { + VARIANT v; + + hres = builtin_propget(This, func, NULL, &v); + if(FAILED(hres)) + return hres; + + if(V_VT(&v) != VT_DISPATCH) { + FIXME("Not a function %s\n", debugstr_variant(&v)); + VariantClear(&v); + return E_FAIL; + } + + hres = invoke_disp_value(This, V_DISPATCH(&v), lcid, flags, dp, res, ei, caller); + + IDispatch_Release(V_DISPATCH(&v)); + } } return hres;

1 0

Jacek Caban : mshtml: Added test of calling IDispatchEx properties.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 4f1a71ab0db92826bc3ffbdb6b62a018efef1868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f1a71ab0db92826bc3ffbdb6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 13 14:46:55 2012 +0200 mshtml: Added test of calling IDispatchEx properties. --- dlls/mshtml/tests/jstest.html | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index e61ee85..99eca1a 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -91,6 +91,20 @@ function test_clone_node() { ok(cloned.style.filter === "alpha(opacity=50)", "cloned.style.filter = " + cloned.style.filter); } +function test_getter_call() { + document.body.innerHTML = '<div id="divid"></div>'; + + var e = document.getElementById("divid"); + + e.myfunc = function(x) { this.myfinc_called = x; }; + e.myfunc("test"); + ok(e.myfinc_called === "test", "e.myfinc_called = " + e.myfinc_called); + + e.onmousedown = function(x) { this.onmousedown_called = x; }; + e.onmousedown("test"); + ok(e.onmousedown_called === "test", "e.onmousedown_called = " + e.onmousedown_called); +} + var globalVar = false; function runTest() { @@ -106,6 +120,7 @@ function runTest() { test_createDocumentFragment(); test_document_name_as_index(); test_remove_style_attribute(); + test_getter_call(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r);

1 0

Jacek Caban : jscript: Prefer builtin version.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 8613d5e9ccfabcff1ba7054b981a027a904f79ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=8613d5e9ccfabcff1ba7054b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 13 16:10:13 2012 +0200 jscript: Prefer builtin version. --- dlls/jscript/jscript_main.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c index c7419fc..bc1aa6a 100644 --- a/dlls/jscript/jscript_main.c +++ b/dlls/jscript/jscript_main.c @@ -136,10 +136,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); - switch(fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ + switch(fdwReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); jscript_hinstance = hInstDLL;

1 0

Dmitry Timoshkov : windowscodecs: Use predefined WICBitmapPaletteTypeFixedGray4 palette instead of a handmade one .
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 045ac64c1a65a59ddda67d190ab821680175d068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=045ac64c1a65a59ddda67d190… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 13 10:07:37 2012 +0900 windowscodecs: Use predefined WICBitmapPaletteTypeFixedGray4 palette instead of a handmade one. --- dlls/windowscodecs/converter.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index e404464..bd83be3 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -185,21 +185,19 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe IWICPalette *palette; UINT actualcolors; - if (source_format == format_2bppIndexed) - { - res = PaletteImpl_Create(&palette); - if (FAILED(res)) return res; + res = PaletteImpl_Create(&palette); + if (FAILED(res)) return res; + if (source_format == format_2bppIndexed) res = IWICBitmapSource_CopyPalette(This->source, palette); - if (SUCCEEDED(res)) - res = IWICPalette_GetColors(palette, 4, colors, &actualcolors); + else + res = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedGray4, FALSE); - IWICPalette_Release(palette); + if (SUCCEEDED(res)) + res = IWICPalette_GetColors(palette, 4, colors, &actualcolors); - if (FAILED(res)) return res; - } - else - make_grayscale_palette(colors, 4); + IWICPalette_Release(palette); + if (FAILED(res)) return res; srcstride = (prc->Width+3)/4; srcdatasize = srcstride * prc->Height;

1 0

Dmitry Timoshkov : windowscodecs: Use predefined WICBitmapPaletteTypeFixedGray16 palette instead of a handmade one .
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: b82023b7c280e7becfb208ddfd7b83797e70df77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b82023b7c280e7becfb208ddf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 13 10:08:58 2012 +0900 windowscodecs: Use predefined WICBitmapPaletteTypeFixedGray16 palette instead of a handmade one. --- dlls/windowscodecs/converter.c | 30 +++++++++--------------------- 1 files changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index bd83be3..98e727e 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -82,16 +82,6 @@ static inline FormatConverter *impl_from_IWICFormatConverter(IWICFormatConverter return CONTAINING_RECORD(iface, FormatConverter, IWICFormatConverter_iface); } -static void make_grayscale_palette(WICColor *colors, UINT num_colors) -{ - int i, v; - for (i=0; i<num_colors; i++) - { - v = i * 255 / (num_colors-1); - colors[i] = 0xff000000 | v<<16 | v<<8 | v; - } -} - static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) { @@ -248,21 +238,19 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe IWICPalette *palette; UINT actualcolors; - if (source_format == format_4bppIndexed) - { - res = PaletteImpl_Create(&palette); - if (FAILED(res)) return res; + res = PaletteImpl_Create(&palette); + if (FAILED(res)) return res; + if (source_format == format_4bppIndexed) res = IWICBitmapSource_CopyPalette(This->source, palette); - if (SUCCEEDED(res)) - res = IWICPalette_GetColors(palette, 16, colors, &actualcolors); + else + res = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedGray16, FALSE); - IWICPalette_Release(palette); + if (SUCCEEDED(res)) + res = IWICPalette_GetColors(palette, 16, colors, &actualcolors); - if (FAILED(res)) return res; - } - else - make_grayscale_palette(colors, 16); + IWICPalette_Release(palette); + if (FAILED(res)) return res; srcstride = (prc->Width+1)/2; srcdatasize = srcstride * prc->Height;

1 0