October 2017 - Wine-Commits

Hans Leidekker : webservices: Fix handling of namespace attributes in WsWriteNode.
by Alexandre Julliard Oct. 17, 2017

Oct. 17, 2017

Module: wine Branch: master Commit: 6d2f4471ed541abeb3c8377a74b7736c5517f494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d2f4471ed541abeb3c8377a7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 17 11:37:27 2017 +0200 webservices: Fix handling of namespace attributes in WsWriteNode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 1baac07..f6917c6 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -4472,9 +4472,20 @@ static HRESULT write_set_attributes( struct writer *writer, WS_XML_ATTRIBUTE **a for (i = 0; i < count; i++) { - if ((hr = write_add_attribute( writer, attrs[i]->prefix, attrs[i]->localName, attrs[i]->ns, - attrs[i]->singleQuote )) != S_OK) return hr; - if ((hr = write_set_attribute_value( writer, attrs[i]->value )) != S_OK) return hr; + const WS_XML_STRING *prefix = attrs[i]->prefix; + const WS_XML_STRING *localname = attrs[i]->localName; + const WS_XML_STRING *ns = attrs[i]->ns; + BOOL single = attrs[i]->singleQuote; + + if (attrs[i]->isXmlNs) + { + if ((hr = add_namespace_attribute( writer, prefix, ns, single )) != S_OK) return hr; + } + else + { + if ((hr = write_add_attribute( writer, prefix, localname, ns, single )) != S_OK) return hr; + if ((hr = write_set_attribute_value( writer, attrs[i]->value )) != S_OK) return hr; + } } return S_OK; }

1 0

Jacek Caban : mshtml: Fire message event with window as a target.
by Alexandre Julliard Oct. 17, 2017

Oct. 17, 2017

Module: wine Branch: master Commit: d054357cbfdd88f1df94ff672f2e357ae1fefbc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d054357cbfdd88f1df94ff672… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 16 22:31:50 2017 +0200 mshtml: Fire message event with window as a target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 4084a18..1c27c13 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -153,7 +153,7 @@ static const event_info_t event_info[] = { {loadW, EVENTT_HTML, DISPID_EVMETH_ONLOAD, EVENT_BIND_TO_BODY}, {messageW, EVENTT_NONE, DISPID_EVMETH_ONMESSAGE, - EVENT_BUBBLE /* FIXME: remove when we get the target right */ }, + 0}, {mousedownW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEDOWN, EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE}, {mousemoveW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEMOVE, diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index b366534..13963da 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2155,7 +2155,7 @@ static HRESULT WINAPI HTMLWindow6_postMessage(IHTMLWindow6 *iface, BSTR msg, VAR return E_FAIL; } - fire_event(This->inner_window->doc, EVENTID_MESSAGE, TRUE, &This->inner_window->doc->node, NULL, NULL); + fire_event(This->inner_window->doc, EVENTID_MESSAGE, TRUE, NULL, NULL, NULL); return S_OK; }

1 0

Jacek Caban : mshtml: Use window event target instead of body only for selected event properties.
by Alexandre Julliard Oct. 17, 2017

Oct. 17, 2017

Module: wine Branch: master Commit: e38c2ceb51f29d8fcba610ed027a44cb44ac521f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e38c2ceb51f29d8fcba610ed0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 16 22:31:42 2017 +0200 mshtml: Use window event target instead of body only for selected event properties. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlbody.c | 19 ++++++++++++---- dlls/mshtml/htmldoc.c | 1 - dlls/mshtml/htmlelem.c | 9 -------- dlls/mshtml/htmlevent.c | 53 +++++++++++++++---------------------------- dlls/mshtml/htmlevent.h | 13 +++++++---- dlls/mshtml/htmlwindow.c | 7 ------ dlls/mshtml/mshtml_private.h | 3 +-- dlls/mshtml/nsevents.c | 17 ++------------ dlls/mshtml/tests/events.html | 12 +++++++++- dlls/mshtml/xmlhttprequest.c | 1 - 10 files changed, 55 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e38c2ceb51f29d8fcba61…

1 0

Alex Henrie : comctl32/tests: Fix treeview test failures on French Windows XP.
by Alexandre Julliard Oct. 16, 2017

Oct. 16, 2017

Module: wine Branch: master Commit: 33e275a1d02a397228e856f2222d3b2f4067e424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e275a1d02a397228e856f22… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 15 23:00:05 2017 -0600 comctl32/tests: Fix treeview test failures on French Windows XP. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index e7ce92c..a014625 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -220,6 +220,9 @@ static const struct message test_right_click_seq[] = { { WM_RBUTTONDOWN, sent|wparam, MK_RBUTTON }, { WM_CAPTURECHANGED, sent|defwinproc }, { TVM_GETNEXTITEM, sent|wparam|lparam|defwinproc, TVGN_CARET, 0 }, + { WM_NCHITTEST, sent|optional }, + { WM_SETCURSOR, sent|optional }, + { WM_MOUSEMOVE, sent|optional }, { 0 } }; @@ -367,6 +370,8 @@ static const struct message parent_vk_return_seq[] = { static const struct message parent_right_click_seq[] = { { WM_NOTIFY, sent|id, 0, 0, NM_RCLICK }, { WM_CONTEXTMENU, sent }, + { WM_NOTIFY, sent|optional }, + { WM_SETCURSOR, sent|optional }, { 0 } };

1 0

Nikolay Sivov : gdiplus/metafile: Support serialized brushes in EmfPlusFillRects.
by Alexandre Julliard Oct. 16, 2017

Oct. 16, 2017

Module: wine Branch: master Commit: 57ca6b90bb7337cb90465b3bf1f147e3d2564f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=57ca6b90bb7337cb90465b3bf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 16 10:12:25 2017 +0300 gdiplus/metafile: Support serialized brushes in EmfPlusFillRects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 43d2d8c..1fd4db2 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1852,8 +1852,12 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, } else { - FIXME("brush deserialization not implemented\n"); - return NotImplemented; + if (record->BrushID >= EmfPlusObjectTableSize || + real_metafile->objtable[record->BrushID].type != ObjectTypeBrush) + return InvalidParameter; + + brush = real_metafile->objtable[record->BrushID].u.brush; + stat = Ok; } if (stat == Ok)

1 0

Stefan Dösinger : d3d9/tests: Use a borderless window for test_cursor_pos.
by Alexandre Julliard Oct. 16, 2017

Oct. 16, 2017

Module: wine Branch: master Commit: 56b223adfa8c4f403f827644371af0090e798caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b223adfa8c4f403f8276443… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 12 17:14:30 2017 +0200 d3d9/tests: Use a borderless window for test_cursor_pos. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index b24136a..3580a22 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4723,7 +4723,7 @@ static void test_cursor_pos(void) wc.lpfnWndProc = test_cursor_proc; wc.lpszClassName = "d3d9_test_cursor_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); - window = CreateWindowA("d3d9_test_cursor_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + window = CreateWindowA("d3d9_test_cursor_wc", "d3d9_test", WS_POPUP | WS_SYSMENU, 0, 0, 320, 240, NULL, NULL, NULL, NULL); ShowWindow(window, SW_SHOW); d3d9 = Direct3DCreate9(D3D_SDK_VERSION);

1 0

Stefan Dösinger : d3d8/tests: Use a borderless window for test_cursor_pos.
by Alexandre Julliard Oct. 16, 2017

Oct. 16, 2017

Module: wine Branch: master Commit: 8daf3fb5e0577f4f9c3d803e7019ae280d319884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8daf3fb5e0577f4f9c3d803e7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 12 17:14:29 2017 +0200 d3d8/tests: Use a borderless window for test_cursor_pos. The mouse positions are wrong on KDE otherwise, even for the initial SetCursorPos call that doesn't go through d3d8/9. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2c0565a..b35de66 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1052,7 +1052,7 @@ static void test_cursor_pos(void) wc.lpfnWndProc = test_cursor_proc; wc.lpszClassName = "d3d8_test_cursor_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); - window = CreateWindowA("d3d8_test_cursor_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + window = CreateWindowA("d3d8_test_cursor_wc", "d3d8_test", WS_POPUP | WS_SYSMENU, 0, 0, 320, 240, NULL, NULL, NULL, NULL); ShowWindow(window, SW_SHOW); d3d8 = Direct3DCreate8(D3D_SDK_VERSION);

1 0

Józef Kucia : wined3d: Use correct data type for immediate constants.
by Alexandre Julliard Oct. 16, 2017

Oct. 16, 2017

Module: wine Branch: master Commit: 033df637578ba76201a7ab6d4de1f506108f27b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=033df637578ba76201a7ab6d4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Oct 14 17:36:26 2017 +0200 wined3d: Use correct data type for immediate constants. In order to generate correct GLSL for image stores. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 39d2276..6a4d32a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2723,7 +2723,8 @@ static void shader_glsl_fixup_scalar_register_variable(char *register_name, /** Writes the GLSL variable name that corresponds to the register that the * DX opcode parameter is trying to access */ static void shader_glsl_get_register_name(const struct wined3d_shader_register *reg, - char *register_name, BOOL *is_color, const struct wined3d_shader_instruction *ins) + enum wined3d_data_type data_type, char *register_name, BOOL *is_color, + const struct wined3d_shader_instruction *ins) { /* oPos, oFog and oPts in D3D */ static const char * const hwrastout_reg_names[] = {"vs_out[10]", "vs_out[11].x", "vs_out[11].y"}; @@ -2948,7 +2949,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->immconst_type) { case WINED3D_IMMCONST_SCALAR: - switch (reg->data_type) + switch (data_type) { case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) @@ -2965,13 +2966,13 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * sprintf(register_name, "%#xu", reg->u.immconst_data[0]); break; default: - sprintf(register_name, "<unhandled data type %#x>", reg->data_type); + sprintf(register_name, "<unhandled data type %#x>", data_type); break; } break; case WINED3D_IMMCONST_VEC4: - switch (reg->data_type) + switch (data_type) { case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) @@ -3003,7 +3004,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * reg->u.immconst_data[2], reg->u.immconst_data[3]); break; default: - sprintf(register_name, "<unhandled data type %#x>", reg->data_type); + sprintf(register_name, "<unhandled data type %#x>", data_type); break; } break; @@ -3247,7 +3248,7 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio glsl_src->param_str[0] = '\0'; swizzle_str[0] = '\0'; - shader_glsl_get_register_name(&wined3d_src->reg, glsl_src->reg_name, &is_color, ins); + shader_glsl_get_register_name(&wined3d_src->reg, data_type, glsl_src->reg_name, &is_color, ins); shader_glsl_get_swizzle(wined3d_src, is_color, mask, swizzle_str); switch (wined3d_src->reg.type) @@ -3294,7 +3295,8 @@ static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction * glsl_dst->mask_str[0] = '\0'; glsl_dst->reg_name[0] = '\0'; - shader_glsl_get_register_name(&wined3d_dst->reg, glsl_dst->reg_name, &is_color, ins); + shader_glsl_get_register_name(&wined3d_dst->reg, wined3d_dst->reg.data_type, + glsl_dst->reg_name, &is_color, ins); return shader_glsl_get_write_mask(wined3d_dst, glsl_dst->mask_str); } @@ -3586,7 +3588,7 @@ static void shader_glsl_color_correction(const struct wined3d_shader_instruction char reg_name[256]; BOOL is_color; - shader_glsl_get_register_name(&ins->dst[0].reg, reg_name, &is_color, ins); + shader_glsl_get_register_name(&ins->dst[0].reg, ins->dst[0].reg.data_type, reg_name, &is_color, ins); shader_glsl_color_correction_ext(ins->ctx->buffer, reg_name, ins->dst[0].write_mask, fixup); }

1 0

Gijs Vermeulen : msvcrt: Add vf[w]printf_p & vf[w]printf_p_l.
by Alexandre Julliard Oct. 16, 2017

Oct. 16, 2017

Module: wine Branch: master Commit: 7f9c2dabc3e9920c46019948b77f45bd717693d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9c2dabc3e9920c46019948b… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Oct 13 20:23:29 2017 +0200 msvcrt: Add vf[w]printf_p & vf[w]printf_p_l. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 8 ++--- dlls/msvcr110/msvcr110.spec | 8 ++--- dlls/msvcr120/msvcr120.spec | 8 ++--- dlls/msvcr120_app/msvcr120_app.spec | 8 ++--- dlls/msvcr80/msvcr80.spec | 8 ++--- dlls/msvcr90/msvcr90.spec | 8 ++--- dlls/msvcrt/file.c | 68 +++++++++++++++++++++++++++++++++++-- dlls/msvcrt/msvcrt.h | 3 ++ dlls/msvcrt/msvcrt.spec | 8 ++--- dlls/msvcrt/printf.h | 2 +- dlls/msvcrt/wcs.c | 2 +- 11 files changed, 99 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f9c2dabc3e9920c46019…

1 0

Hans Leidekker : secur32: Don' t allocate a context handle in AcceptSecurityContext if new and passed in context are the same.
by Alexandre Julliard Oct. 16, 2017

Oct. 16, 2017

Module: wine Branch: master Commit: 4467fd6d232cd715cd63b1ebf74c6013e19563b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4467fd6d232cd715cd63b1ebf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 16 10:08:49 2017 +0200 secur32: Don't allocate a context handle in AcceptSecurityContext if new and passed in context are the same. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/wrapper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/wrapper.c b/dlls/secur32/wrapper.c index 06a3674..dba6754 100644 --- a/dlls/secur32/wrapper.c +++ b/dlls/secur32/wrapper.c @@ -399,7 +399,8 @@ SECURITY_STATUS WINAPI AcceptSecurityContext( ret = package->provider->fnTableW.AcceptSecurityContext( cred, phContext ? &myCtxt : NULL, pInput, fContextReq, TargetDataRep, &myCtxt, pOutput, pfContextAttr, ptsExpiry); - if (ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && + phNewContext && phNewContext != phContext) { SECURITY_STATUS ret2; ret2 = SECUR32_makeSecHandle(phNewContext, package, &myCtxt);

1 0