June 2020 - Wine-Commits - list.winehq.org

Torge Matthies : joy.cpl: Fix pulsing buttons in joystick button state display.
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: 25e9e91c3a4f6c1c134d96a5c11517178e31f111 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25e9e91c3a4f6c1c134d96a5… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Fri Jun 5 18:37:30 2020 +0200 joy.cpl: Fix pulsing buttons in joystick button state display. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 4ad9cf848c..3921f59cbb 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -404,8 +404,7 @@ static DWORD WINAPI input_thread(void *param) /* Indicate pressed buttons */ for (i = 0; i < data->joysticks[data->chosen_joystick].num_buttons; i++) - if (state.rgbButtons[i]) - SendMessageW(data->graphics.buttons[i], BM_SETSTATE, TRUE, 0); + SendMessageW(data->graphics.buttons[i], BM_SETSTATE, !!state.rgbButtons[i], 0); /* Indicate axis positions, axes showing are hardcoded for now */ axes_pos[0][0] = state.lX; @@ -438,10 +437,6 @@ static DWORD WINAPI input_thread(void *param) } Sleep(TEST_POLL_TIME); - - /* Reset button state */ - for (i = 0; i < data->joysticks[data->chosen_joystick].num_buttons; i++) - SendMessageW(data->graphics.buttons[i], BM_SETSTATE, FALSE, 0); } return 0;

1 0

Jacek Caban : mshtml: Add IHTMLCSSStyleDeclaration2::transition property implementation.
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: ed1a4087e8295a675939fdedc2309e40051dcbd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed1a4087e8295a675939fded… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 5 18:29:11 2020 +0200 mshtml: Add IHTMLCSSStyleDeclaration2::transition property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 17 +++++++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 339220016d..845eeb1da1 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -801,6 +801,10 @@ static const style_tbl_entry_t style_tbl[] = { L"transform", DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSFORM }, + { + L"transition", + DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSITION + }, { vertical_alignW, DISPID_IHTMLCSSSTYLEDECLARATION_VERTICALALIGN, @@ -9725,15 +9729,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_transitionDelay(IHTMLCSSStyle static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_transition(IHTMLCSSStyleDeclaration2 *iface, BSTR v) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + return set_style_property(This, STYLEID_TRANSITION, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_transition(IHTMLCSSStyleDeclaration2 *iface, BSTR *p) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_property(This, STYLEID_TRANSITION, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_fontFeatureSettings(IHTMLCSSStyleDeclaration2 *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 60f099cc65..662227cd99 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -128,6 +128,7 @@ typedef enum { STYLEID_TEXT_TRANSFORM, STYLEID_TOP, STYLEID_TRANSFORM, + STYLEID_TRANSITION, STYLEID_VERTICAL_ALIGN, STYLEID_VISIBILITY, STYLEID_WHITE_SPACE, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 5b0c553a2b..e8771838f4 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -872,6 +872,23 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style) ok(hres == S_OK, "get_animationName failed: %08x\n", hres); ok(!lstrcmpW(str, L"none"), "animationName = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + + str = NULL; + hres = IHTMLCSSStyleDeclaration2_get_transition(css_style, &str); + ok(hres == S_OK, "get_transition failed: %08x\n", hres); + ok(!str, "transition = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = SysAllocString(L"marigin-right 1s ease-out"); + hres = IHTMLCSSStyleDeclaration2_put_transition(css_style, str); + ok(hres == S_OK, "put_transition failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLCSSStyleDeclaration2_get_transition(css_style, &str); + ok(hres == S_OK, "get_transition failed: %08x\n", hres); + ok(!wcsncmp(str, L"marigin-right 1s", wcslen(L"marigin-right 1s")), "transition = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); } static void test_body_style(IHTMLStyle *style)

1 0

Jacek Caban : mshtml: Use return_nsstr_variant in IHTMLBodyElement::get_bgColor.
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: 7f465761c2f898ca5dde5a357576b44ba47b8bc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f465761c2f898ca5dde5a35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 5 18:27:01 2020 +0200 mshtml: Use return_nsstr_variant in IHTMLBodyElement::get_bgColor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlbody.c | 21 ++++----------------- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 22 +++++++++++++--------- 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 981d93f9b4..a49f8162c0 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -407,27 +407,14 @@ static HRESULT WINAPI HTMLBodyElement_put_bgColor(IHTMLBodyElement *iface, VARIA static HRESULT WINAPI HTMLBodyElement_get_bgColor(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - nsAString strColor; + nsAString nsstr; nsresult nsres; - HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - nsAString_Init(&strColor, NULL); - nsres = nsIDOMHTMLBodyElement_GetBgColor(This->nsbody, &strColor); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *color; - - nsAString_GetData(&strColor, &color); - V_VT(p) = VT_BSTR; - hres = nscolor_to_str(color, &V_BSTR(p)); - }else { - ERR("SetBgColor failed: %08x\n", nsres); - hres = E_FAIL; - } - - nsAString_Finish(&strColor); - return hres; + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLBodyElement_GetBgColor(This->nsbody, &nsstr); + return return_nsstr_variant(nsres, &nsstr, NSSTR_COLOR, p); } static HRESULT WINAPI HTMLBodyElement_put_text(IHTMLBodyElement *iface, VARIANT v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 565a2428ba..7b2f927e19 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -982,6 +982,7 @@ UINT32 nsAString_GetData(const nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; void nsAString_Finish(nsAString*) DECLSPEC_HIDDEN; #define NSSTR_IMPLICIT_PX 0x01 +#define NSSTR_COLOR 0x02 HRESULT map_nsresult(nsresult) DECLSPEC_HIDDEN; HRESULT return_nsstr(nsresult,nsAString*,BSTR*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 2d1eb817dc..9a23785ca6 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -964,14 +964,15 @@ HRESULT return_nsstr(nsresult nsres, nsAString *nsstr, BSTR *p) HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, unsigned flags, VARIANT *p) { + HRESULT hres = S_OK; + if(NS_FAILED(nsres)) { ERR("failed: %08x\n", nsres); nsAString_Finish(nsstr); - return E_FAIL; + return map_nsresult(nsres); } if(NS_StringGetIsVoid(nsstr)) { - TRACE("ret null\n"); V_VT(p) = VT_NULL; }else { const WCHAR *str; @@ -989,20 +990,23 @@ HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, unsigned flags, V if(iter == str + len && dot) len = dot - str; } } - TRACE("ret %s\n", debugstr_wn(str, len)); - if(*str) { + if(flags & NSSTR_COLOR) { + hres = nscolor_to_str(str, &V_BSTR(p)); + }else if(*str) { V_BSTR(p) = SysAllocStringLen(str, len); - if(!V_BSTR(p)) { - nsAString_Finish(nsstr); - return E_OUTOFMEMORY; - } + if(!V_BSTR(p)) + hres = E_OUTOFMEMORY; }else { V_BSTR(p) = NULL; } - V_VT(p) = VT_BSTR; + if(SUCCEEDED(hres)) + V_VT(p) = VT_BSTR; } nsAString_Finish(nsstr); + if(FAILED(hres)) + return hres; + TRACE("ret %s\n", debugstr_variant(p)); return S_OK; }

1 0

Tag wine-5.10 : Alexandre Julliard : Release 5.10
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: refs/tags/wine-5.10 Tag: 0842bd7bb0b936d6786337b83176cba557b97a6e URL: https://source.winehq.org/git/wine.git/?a=tag;h=0842bd7bb0b936d6786337b8317… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 21:15:16 2020 +0200 Release 5.10

1 0

Alexandre Julliard : Release 5.10.
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: 3cc3b445752902e07231900befc296f74ad6576e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cc3b445752902e07231900b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 21:15:16 2020 +0200 Release 5.10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 971 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 531 insertions(+), 462 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3cc3b445752902e07231…

1 0

Jacek Caban : jscript: Add Object.preventExtensions semi-stub implementation.
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: 2e767e81cc1682597b3d42a0ca1dcebdf909aaaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e767e81cc1682597b3d42a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 5 18:26:39 2020 +0200 jscript: Add Object.preventExtensions semi-stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 24 +++++++++++++++++++++++- dlls/mshtml/tests/es5.js | 23 ++++++++++++++++++++++- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index bac79ebde2..1e94f16344 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -671,13 +671,35 @@ static HRESULT Object_keys(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return hres; } +static HRESULT Object_preventExtensions(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +{ + jsdisp_t *obj; + + if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { + FIXME("invalid arguments\n"); + return E_NOTIMPL; + } + + FIXME("(%s) semi-stub\n", debugstr_jsval(argv[0])); + + obj = to_jsdisp(get_object(argv[0])); + if(!obj) { + FIXME("Non-JS object\n"); + return E_NOTIMPL; + } + + if(r) *r = jsval_obj(jsdisp_addref(obj)); + return S_OK; +} + static const builtin_prop_t ObjectConstr_props[] = { {L"create", Object_create, PROPF_ES5|PROPF_METHOD|2}, {L"defineProperties", Object_defineProperties, PROPF_ES5|PROPF_METHOD|2}, {L"defineProperty", Object_defineProperty, PROPF_ES5|PROPF_METHOD|2}, {L"getOwnPropertyDescriptor", Object_getOwnPropertyDescriptor, PROPF_ES5|PROPF_METHOD|2}, {L"getPrototypeOf", Object_getPrototypeOf, PROPF_ES5|PROPF_METHOD|1}, - {L"keys", Object_keys, PROPF_ES5|PROPF_METHOD|1} + {L"keys", Object_keys, PROPF_ES5|PROPF_METHOD|1}, + {L"preventExtensions", Object_preventExtensions, PROPF_ES5|PROPF_METHOD|1}, }; static const builtin_info_t ObjectConstr_info = { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index f268eba24c..ded25df512 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -924,7 +924,28 @@ sync_test("reduce", function() { try { [].reduce(function(a) { return 0; }); ok(false, "expected exception"); - }catch(e) {trace(e.message);} + }catch(e) {} ok(Array.prototype.reduce.length === 1, "Array.prototype.reduce.length = " + Array.prototype.reduce.length); }); + +sync_test("preventExtensions", function() { + var o = {}; + var r = Object.preventExtensions(o); + ok(r === o, "r != o"); + o.x = 1; + todo_wine. + ok(!("x" in o), "x property added to o"); + try { + Object.defineProperty(o, "y", { value: true }); + todo_wine. + ok(false, "expected exception"); + }catch(e) { + ok(e.name === "TypeError", "got " + e.name + " exception"); + } + + r = Object.preventExtensions(o); + ok(r === o, "r != o"); + + ok(Object.preventExtensions.length === 1, "Object.preventExtensions.length = " + Object.preventExtensions.length); +});

1 0

Biswapriyo Nath : include: Add include guard in d2dbasetypes.h.
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: 9dcfc596718a4c8acafc1009b90263bba5141c05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dcfc596718a4c8acafc1009… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Jun 5 12:57:09 2020 +0530 include: Add include guard in d2dbasetypes.h. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2dbasetypes.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/d2dbasetypes.h b/include/d2dbasetypes.h index a160a89021..93c99fcceb 100644 --- a/include/d2dbasetypes.h +++ b/include/d2dbasetypes.h @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _D2DBASETYPES_INCLUDED +#define _D2DBASETYPES_INCLUDED + #ifndef D3DCOLORVALUE_DEFINED typedef struct D3DCOLORVALUE { @@ -56,3 +59,5 @@ typedef struct D2D_RECT_U UINT32 right; UINT32 bottom; } D2D_RECT_U; + +#endif /* _D2DBASETYPES_INCLUDED */

1 0

Ziqing Hui : windowscodecs/tests: Add more tests for DdsFrameDecode_Dds_CopyBlocks().
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: ac1adfc512286e08e31da3e7abb26a66646423f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac1adfc512286e08e31da3e7… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Jun 5 11:53:29 2020 +0800 windowscodecs/tests: Add more tests for DdsFrameDecode_Dds_CopyBlocks(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 42 +++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 327701f22c..5195dada13 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -471,30 +471,52 @@ static void test_dds_decoder_frame_data(IWICDdsFrameDecode *dds_frame, UINT fram { HRESULT hr; WICDdsFormatInfo format_info; - WICRect rect = { 0, 0, 1, 1 }; + WICRect rect = { 0, 0, 1, 1 }, rect_test_a = { 0, 0, 0, 0 }, rect_test_b = { 0, 0, 0xdeadbeaf, 0xdeadbeaf }; + WICRect rect_test_c = { -0xdeadbeaf, -0xdeadbeaf, 1, 1 }, rect_test_d = { 1, 1, 1, 1 }; BYTE buffer[32]; UINT stride, width_in_blocks, height_in_blocks; UINT width, height, depth, array_index; UINT block_offset; int slice_index; - hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, &width_in_blocks, &height_in_blocks); - ok (hr == S_OK, "%d: [frame %d] GetSizeInBlocks failed, hr=%x\n", i, frame_index, hr); - if (hr != S_OK) return; hr = IWICDdsFrameDecode_GetFormatInfo(dds_frame, &format_info); ok (hr == S_OK, "%d: [frame %d] GetFormatInfo failed, hr=%x\n", i, frame_index, hr); if (hr != S_OK) return; - stride = width_in_blocks * format_info.BytesPerBlock; + stride = rect.Width * format_info.BytesPerBlock; - hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, 0, 0, NULL); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect_test_a, stride, sizeof(buffer), buffer); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect_test_b, stride, sizeof(buffer), buffer); todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); - hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, 0, 0, buffer); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect_test_c, stride, sizeof(buffer), buffer); todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); - hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, 0, 32, buffer); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect_test_d, stride, sizeof(buffer), buffer); todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); - hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, stride, 32, buffer); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, stride, sizeof(buffer), buffer); todo_wine ok (hr == S_OK, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); - hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, 32, buffer); + + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, 0, sizeof(buffer), buffer); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride - 1, sizeof(buffer), buffer); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride * 2, sizeof(buffer), buffer); + todo_wine ok (hr == S_OK, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, 0, buffer); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, 1, buffer); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, stride * rect.Height - 1, buffer); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, stride * rect.Height, buffer); + todo_wine ok (hr == S_OK, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, sizeof(buffer), NULL); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, 0, 0, NULL); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, sizeof(buffer), buffer); todo_wine ok (hr == S_OK, "%d: [frame %d] CopyBlocks failed, hr=%x\n", i, frame_index, hr); if (hr != S_OK) return;

1 0

Matteo Bruni : user32: Add missing WM_WINE_CLIPCURSOR message type name.
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: 61ff6c306d23ce3f2af23cda614231ded4539e65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61ff6c306d23ce3f2af23cda… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 5 11:47:29 2020 +0200 user32: Add missing WM_WINE_CLIPCURSOR message type name. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/spy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index ddd90e664f..8a2fa430b5 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -1150,7 +1150,7 @@ static const char * const CCMMessageTypeNames[SPY_MAX_CCMMSGNUM + 1] = "CCM_SETNOTIFYWINDOW" }; -#define SPY_MAX_WINEMSGNUM (WM_WINE_MOUSE_LL_HOOK - WM_WINE_DESTROYWINDOW) +#define SPY_MAX_WINEMSGNUM (WM_WINE_CLIPCURSOR - WM_WINE_DESTROYWINDOW) static const char * const WINEMessageTypeNames[SPY_MAX_WINEMSGNUM + 1] = { "WM_WINE_DESTROYWINDOW", @@ -1162,6 +1162,7 @@ static const char * const WINEMessageTypeNames[SPY_MAX_WINEMSGNUM + 1] = "WM_WINE_SETACTIVEWINDOW", "WM_WINE_KEYBOARD_LL_HOOK", "WM_WINE_MOUSE_LL_HOOK", + "WM_WINE_CLIPCURSOR", }; /* Virtual key names */

1 0

Henri Verbeet : wined3d: Clear WINED3DFMT_FLAG_DEPTH_STENCIL if the format is not supported as FBO attachment.
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: c6f94cc87b95511cae2910b61585822acd7e7d31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6f94cc87b95511cae2910b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 16:37:29 2020 +0430 wined3d: Clear WINED3DFMT_FLAG_DEPTH_STENCIL if the format is not supported as FBO attachment. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/resource.c | 7 ------- dlls/wined3d/utils.c | 11 ++++++----- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 8f9a11ea2a..15e4a45ea5 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -135,13 +135,6 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * WARN("Format %s cannot be used for depth/stencil buffers.\n", debug_d3dformat(format->id)); continue; } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO - && bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL) - && !(format->flags[gl_type] & WINED3DFMT_FLAG_FBO_ATTACHABLE)) - { - WARN("Render target or depth stencil is not FBO attachable.\n"); - continue; - } if ((bind_flags & WINED3D_BIND_SHADER_RESOURCE) && !(format->flags[gl_type] & WINED3DFMT_FLAG_TEXTURE)) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 55ee0ede33..d078c503df 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2515,11 +2515,11 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for { if (!rt_internal) { - if (format->f.flags[type] & WINED3DFMT_FLAG_RENDERTARGET) + if (format->f.flags[type] & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_DEPTH_STENCIL)) { WARN("Format %s with rendertarget flag is not supported as FBO color attachment (type %u)," " and no fallback specified.\n", debug_d3dformat(format->f.id), type); - format->f.flags[type] &= ~WINED3DFMT_FLAG_RENDERTARGET; + format->f.flags[type] &= ~(WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_DEPTH_STENCIL); } else { @@ -2552,7 +2552,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for { WARN("Format %s rtInternal format is not supported as FBO %s attachment, type %u.\n", debug_d3dformat(format->f.id), type_string, type); - format->f.flags[type] &= ~WINED3DFMT_FLAG_RENDERTARGET; + format->f.flags[type] &= ~(WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_DEPTH_STENCIL); } } } @@ -2725,8 +2725,9 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for { FIXME("Format %s needs different render target formats for different resource types.\n", debug_d3dformat(format->f.id)); - format_clear_flag(&format->f, WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FBO_ATTACHABLE - | WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING); + format_clear_flag(&format->f, WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_DEPTH_STENCIL + | WINED3DFMT_FLAG_FBO_ATTACHABLE | WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB + | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING); } }

1 0