November 2015 - Wine-Commits

Henri Verbeet : d2d1: Add a pixel shader for triangle/solid/bitmap draws.
by Alexandre Julliard Nov. 19, 2015

Nov. 19, 2015

Module: wine Branch: master Commit: b5685efc80a33dfe2b7facb581432f5e94ea455b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5685efc80a33dfe2b7facb58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 18 22:23:22 2015 +0100 d2d1: Add a pixel shader for triangle/solid/bitmap draws. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 691af5a..9142bf1 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1622,6 +1622,50 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, 0x00000010, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, }; + static const DWORD ps_code_triangle_solid_bitmap[] = + { +#if 0 + float4 color; + + float3x2 transform; + float opacity; + bool ignore_alpha; + + SamplerState s; + Texture2D t; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + float2 texcoord; + float4 ret; + + texcoord.x = position.x * transform._11 + position.y * transform._21 + transform._31; + texcoord.y = position.x * transform._12 + position.y * transform._22 + transform._32; + ret = t.Sample(s, texcoord) * opacity; + if (ignore_alpha) + ret.a = opacity; + + return color * ret.a; + } +#endif + 0x43425844, 0x2260a2ae, 0x81907b3e, 0xcaf27063, 0xccb83ef2, 0x00000001, 0x00000208, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x0000016c, 0x00000040, + 0x0000005b, 0x04000059, 0x00208e46, 0x00000000, 0x00000004, 0x0300005a, 0x00106000, 0x00000000, + 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0800000f, 0x00100012, 0x00000000, + 0x00101046, 0x00000000, 0x00208046, 0x00000000, 0x00000001, 0x08000000, 0x00100012, 0x00000000, + 0x0010000a, 0x00000000, 0x0020802a, 0x00000000, 0x00000001, 0x0800000f, 0x00100042, 0x00000000, + 0x00101046, 0x00000000, 0x00208046, 0x00000000, 0x00000002, 0x08000000, 0x00100022, 0x00000000, + 0x0010002a, 0x00000000, 0x0020802a, 0x00000000, 0x00000002, 0x09000045, 0x001000f2, 0x00000000, + 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x08000038, 0x00100012, + 0x00000000, 0x0010003a, 0x00000000, 0x0020803a, 0x00000000, 0x00000002, 0x0b000037, 0x00100012, + 0x00000000, 0x0020800a, 0x00000000, 0x00000003, 0x0020803a, 0x00000000, 0x00000002, 0x0010000a, + 0x00000000, 0x08000038, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x00208e46, 0x00000000, + 0x00000000, 0x0100003e, + }; static const DWORD ps_code_triangle_bitmap[] = { #if 0 @@ -1805,6 +1849,8 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, { {ps_code_triangle_solid, sizeof(ps_code_triangle_solid), D2D_SHAPE_TYPE_TRIANGLE, D2D_BRUSH_TYPE_SOLID, D2D_BRUSH_TYPE_COUNT}, + {ps_code_triangle_solid_bitmap, sizeof(ps_code_triangle_solid_bitmap), + D2D_SHAPE_TYPE_TRIANGLE, D2D_BRUSH_TYPE_SOLID, D2D_BRUSH_TYPE_BITMAP}, {ps_code_triangle_bitmap, sizeof(ps_code_triangle_bitmap), D2D_SHAPE_TYPE_TRIANGLE, D2D_BRUSH_TYPE_BITMAP, D2D_BRUSH_TYPE_COUNT}, {ps_code_triangle_bitmap_solid, sizeof(ps_code_triangle_bitmap_solid),

1 0

Jacek Caban : ntdll: Added more NtOpenKey tests.
by Alexandre Julliard Nov. 19, 2015

Nov. 19, 2015

Module: wine Branch: master Commit: 26df0863ca6d57c2d5ce24b79a5cd9f5e711ae83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26df0863ca6d57c2d5ce24b79… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 19 12:48:22 2015 +0100 ntdll: Added more NtOpenKey tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 0e00f99..e688fd2 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -340,6 +340,7 @@ static void test_NtOpenKey(void) NTSTATUS status; OBJECT_ATTRIBUTES attr; ACCESS_MASK am = KEY_READ; + UNICODE_STRING str; /* All NULL */ status = pNtOpenKey(NULL, 0, NULL); @@ -361,6 +362,27 @@ static void test_NtOpenKey(void) status = pNtOpenKey(&key, am, &attr); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got: 0x%08x\n", status); + /* Calling without parent key requres full registry path. */ + pRtlCreateUnicodeStringFromAsciiz( &str, "Machine" ); + InitializeObjectAttributes(&attr, &str, 0, 0, 0); + status = pNtOpenKey(&key, KEY_READ, &attr); + todo_wine ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenKey Failed: 0x%08x\n", status); + if (!status) + pNtClose(key); + + /* Open is case sensitive unless OBJ_CASE_INSENSITIVE is specified. */ + pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine" ); + status = pNtOpenKey(&key, KEY_READ, &attr); + todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND, "NtOpenKey Failed: 0x%08x\n", status); + if (!status) + pNtClose(key); + + attr.Attributes = OBJ_CASE_INSENSITIVE; + status = pNtOpenKey(&key, KEY_READ, &attr); + ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); + if (!status) + pNtClose(key); + if (!pNtOpenKeyEx) { win_skip("NtOpenKeyEx not available\n");

1 0

Henri Verbeet : d2d1: Calculate intersections in a more robust way in d2d_geometry_intersect_self ().
by Alexandre Julliard Nov. 19, 2015

Nov. 19, 2015

Module: wine Branch: master Commit: 3fb1fb96162fd2a403f0ce4b8ef40dacd2c19487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fb1fb96162fd2a403f0ce4b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 18 22:23:24 2015 +0100 d2d1: Calculate intersections in a more robust way in d2d_geometry_intersect_self(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 109 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 83 insertions(+), 26 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index ed69a1e..9fa1783 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -82,6 +82,21 @@ struct d2d_cdt const D2D1_POINT_2F *vertices; }; +struct d2d_geometry_intersection +{ + size_t figure_idx; + size_t segment_idx; + float t; + D2D1_POINT_2F p; +}; + +struct d2d_geometry_intersections +{ + struct d2d_geometry_intersection *intersections; + size_t intersections_size; + size_t intersection_count; +}; + struct d2d_fp_two_vec2 { float x[2]; @@ -1458,6 +1473,41 @@ static BOOL d2d_cdt_insert_segments(struct d2d_cdt *cdt, struct d2d_geometry *ge return TRUE; } +static BOOL d2d_geometry_intersections_add(struct d2d_geometry_intersections *i, + size_t figure_idx, size_t segment_idx, float t, D2D1_POINT_2F p) +{ + struct d2d_geometry_intersection *intersection; + + if (!d2d_array_reserve((void **)&i->intersections, &i->intersections_size, + i->intersection_count + 1, sizeof(*i->intersections))) + { + ERR("Failed to grow intersections array.\n"); + return FALSE; + } + + intersection = &i->intersections[i->intersection_count++]; + intersection->figure_idx = figure_idx; + intersection->segment_idx = segment_idx; + intersection->t = t; + intersection->p = p; + + return TRUE; +} + +static int d2d_geometry_intersections_compare(const void *a, const void *b) +{ + const struct d2d_geometry_intersection *i0 = a; + const struct d2d_geometry_intersection *i1 = b; + + if (i0->figure_idx != i1->figure_idx) + return i0->figure_idx - i1->figure_idx; + if (i0->segment_idx != i1->segment_idx) + return i0->segment_idx - i1->segment_idx; + if (i0->t != i1->t) + return i0->t > i1->t ? 1 : -1; + return 0; +} + /* Intersect the geometry's segments with themselves. This uses the * straightforward approach of testing everything against everything, but * there certainly exist more scalable algorithms for this. */ @@ -1465,21 +1515,21 @@ static BOOL d2d_cdt_insert_segments(struct d2d_cdt *cdt, struct d2d_geometry *ge static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) { D2D1_POINT_2F p0, p1, q0, q1, v_p, v_q, v_qp, intersection; + struct d2d_geometry_intersections intersections = {0}; struct d2d_figure *figure_p, *figure_q; - size_t i, j, k, l, min_j, min_l, max_l; + size_t i, j, k, l, max_l; + BOOL ret = FALSE; float s, t, det; for (i = 0; i < geometry->u.path.figure_count; ++i) { figure_p = &geometry->u.path.figures[i]; p0 = figure_p->vertices[figure_p->vertex_count - 1]; - min_j = 0; - min_l = 0; for (k = 0; k < figure_p->vertex_count; p0 = p1, ++k) { p1 = figure_p->vertices[k]; d2d_point_subtract(&v_p, &p1, &p0); - for (j = min_j, min_j = 0, l = min_l, min_l = 0; j u.path.figures[j]; @@ -1490,8 +1540,8 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) continue; max_l = j == i ? k - 1 : figure_q->vertex_count; - q0 = figure_q->vertices[l == 0 ? figure_q->vertex_count - 1 : l - 1]; - for (; l < max_l; q0 = q1, ++l) + q0 = figure_q->vertices[figure_q->vertex_count - 1]; + for (l = 0; l < max_l; q0 = q1, ++l) { q1 = figure_q->vertices[l]; d2d_point_subtract(&v_q, &q1, &q0); @@ -1510,31 +1560,38 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) intersection.x = p0.x + v_p.x * s; intersection.y = p0.y + v_p.y * s; - if (t > 0.0f && t < 1.0f) - { - if (!d2d_figure_insert_vertex(figure_q, l, intersection)) - return FALSE; - if (j == i) - ++k; - ++max_l; - ++l; - } - - if (s > 0.0f && s < 1.0f) - { - if (!d2d_figure_insert_vertex(figure_p, k, intersection)) - return FALSE; - min_j = j; - min_l = l+1; - p1 = intersection; - d2d_point_subtract(&v_p, &p1, &p0); - } + if (t > 0.0f && t < 1.0f + && !d2d_geometry_intersections_add(&intersections, j, l, t, intersection)) + goto done; + + if (s > 0.0f && s < 1.0f + && !d2d_geometry_intersections_add(&intersections, i, k, s, intersection)) + goto done; } } } } - return TRUE; + qsort(intersections.intersections, intersections.intersection_count, + sizeof(*intersections.intersections), d2d_geometry_intersections_compare); + for (i = 0; i < intersections.intersection_count; ++i) + { + const struct d2d_geometry_intersection *inter = &intersections.intersections[i]; + + if (!i || inter->figure_idx != intersections.intersections[i - 1].figure_idx) + j = 0; + + if (!d2d_figure_insert_vertex(&geometry->u.path.figures[inter->figure_idx], + inter->segment_idx + j, inter->p)) + goto done; + ++j; + } + + ret = TRUE; + +done: + HeapFree(GetProcessHeap(), 0, intersections.intersections); + return ret; } static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry)

1 0

Francois Gouget : configure: Clean up the winmm module checks.
by Alexandre Julliard Nov. 19, 2015

Nov. 19, 2015

Module: wine Branch: master Commit: be78f79eda3d7973319c9fbc34387843a090a131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be78f79eda3d7973319c9fbc3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 18 15:03:50 2015 +0100 configure: Clean up the winmm module checks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 15 +++++++-------- configure.ac | 16 +++++++--------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/configure b/configure index 67a1c3b..a35d96c 100755 --- a/configure +++ b/configure @@ -8087,6 +8087,7 @@ done COREAUDIO_LIBS="-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI" fi + enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-yes} ac_save_LIBS="$LIBS" LIBS="$LIBS $COREAUDIO_LIBS" for ac_func in AUGraphAddNode @@ -8747,8 +8748,10 @@ $as_echo "$ac_cv_c_dll_unixware" >&6; } ;; esac +enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} enable_wineqtdecoder=${enable_wineqtdecoder:-no} enable_winemac_drv=${enable_winemac_drv:-no} +test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} CROSSTARGET="" @@ -12582,6 +12585,7 @@ if test -z "$PULSE_LIBS"; then : This is an error since --with-pulse was requested." "$LINENO" 5 ;; esac fi +test -n "$PULSE_LIBS" || enable_winepulse_drv=${enable_winepulse_drv:-no} if test "x$with_gstreamer" != "xno" then @@ -12801,6 +12805,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi fi +test -n "$ALSA_LIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} if test "x$with_oss" != xno then @@ -12834,6 +12839,7 @@ fi as_fn_append wine_notices "|OSS sound system found but too old (OSSv4 needed), OSS won't be supported." fi fi +test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no} if test "x$with_capi" != "xno" then @@ -13927,14 +13933,7 @@ _ACEOF fi fi -test -n "$ALSA_LIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} -test -n "$COREAUDIO_LIBS" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} -test -n "$PULSE_LIBS" || enable_winepulse_drv=${enable_winepulse_drv:-no} -test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no} -test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} - -if test "x$ALSA_LIBS$COREAUDIO_LIBS$PULSE_LIBS" = "x" -a \ - "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \ +if test "x$enable_winealsa_drv$enable_winecoreaudio_drv$enable_winepulse_drv$enable_wineoss_drv" = xnononono -a \ "x$with_alsa$with_coreaudio$with_oss$with_pulse" != xnononono then as_fn_append wine_warnings "|No sound system was found. Windows applications will be silent." diff --git a/configure.ac b/configure.ac index 7a08154..cd97d62 100644 --- a/configure.ac +++ b/configure.ac @@ -765,6 +765,7 @@ case $host_os in dnl CoreServices needed by AudioUnit AC_SUBST(COREAUDIO_LIBS,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI") fi + enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-yes} dnl Check for the AUGraphAddNode function ac_save_LIBS="$LIBS" LIBS="$LIBS $COREAUDIO_LIBS" @@ -932,8 +933,10 @@ case $host_os in ;; esac +enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} enable_wineqtdecoder=${enable_wineqtdecoder:-no} enable_winemac_drv=${enable_winemac_drv:-no} +test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} dnl Check for cross compiler to build test programs AC_SUBST(CROSSTARGET,"") @@ -1448,6 +1451,7 @@ then fi WINE_NOTICE_WITH(pulse, [test -z "$PULSE_LIBS"], [libpulse ${notice_platform}development files not found or too old, Pulse won't be supported.]) +test -n "$PULSE_LIBS" || enable_winepulse_drv=${enable_winepulse_drv:-no} dnl **** Check for gstreamer **** if test "x$with_gstreamer" != "xno" @@ -1489,6 +1493,7 @@ then #endif]], [[snd_pcm_hw_params_get_access_mask(NULL, NULL)]])], [ALSA_LIBS="-lasound"])]) fi +test -n "$ALSA_LIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} dnl **** Check for OSSv4 **** if test "x$with_oss" != xno @@ -1510,6 +1515,7 @@ then WINE_NOTICE([OSS sound system found but too old (OSSv4 needed), OSS won't be supported.]) fi fi +test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no} dnl **** Check for capi4linux **** if test "x$with_capi" != "xno" @@ -1678,16 +1684,8 @@ then WINE_CHECK_SONAME(netapi,libnetapi_init,,[AC_DEFINE_UNQUOTED(SONAME_LIBNETAPI,["libnetapi.$LIBEXT"])]) fi -dnl **** Disable unsupported winmm drivers **** -test -n "$ALSA_LIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} -test -n "$COREAUDIO_LIBS" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} -test -n "$PULSE_LIBS" || enable_winepulse_drv=${enable_winepulse_drv:-no} -test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no} -test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} - dnl **** Check for any sound system **** -if test "x$ALSA_LIBS$COREAUDIO_LIBS$PULSE_LIBS" = "x" -a \ - "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \ +if test "x$enable_winealsa_drv$enable_winecoreaudio_drv$enable_winepulse_drv$enable_wineoss_drv" = xnononono -a \ "x$with_alsa$with_coreaudio$with_oss$with_pulse" != xnononono then WINE_WARNING([No sound system was found. Windows applications will be silent.])

1 0

Nikolay Sivov : d2d1: Properly free brush data buffer is created from.
by Alexandre Julliard Nov. 19, 2015

Nov. 19, 2015

Module: wine Branch: master Commit: 39f2ed321d87d888ac3f81e764d0e5c661db74ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f2ed321d87d888ac3f81e76… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 19 15:08:40 2015 +0300 d2d1: Properly free brush data buffer is created from. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 2014f47..aa92318 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -860,8 +860,7 @@ HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_b HeapFree(GetProcessHeap(), 0, cb_data); return E_NOTIMPL; } - cb_data += brush_sizes[brush->type]; - if (opacity_brush && !d2d_brush_fill_cb(opacity_brush, render_target, cb_data)) + if (opacity_brush && !d2d_brush_fill_cb(opacity_brush, render_target, cb_data + brush_sizes[brush->type])) { HeapFree(GetProcessHeap(), 0, cb_data); return E_NOTIMPL;

1 0

Piotr Caban : msxml3/tests: Show that sub-elements should not be divided with ' ' in IXMLDOMNode_get_text.
by Alexandre Julliard Nov. 19, 2015

Nov. 19, 2015

Module: wine Branch: master Commit: fa01cd0880c7499f7bd6723b27f3c3816f027835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa01cd0880c7499f7bd6723b2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 18 12:55:48 2015 +0100 msxml3/tests: Show that sub-elements should not be divided with ' ' in IXMLDOMNode_get_text. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 835ddd5..10e5d55 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -481,7 +481,7 @@ static const char szExampleXML[] = " <d>D1 field</d>\n" " <description xmlns:foo='http://www.winehq.org' xmlns:bar='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n" " <html xmlns='http://www.w3.org/1999/xhtml'>\n" -" This is a description. <bar:x/>\n" +" This is a description<dot>. </dot><bar:x/>\n" " </html>\n" " <html xml:space='preserve' xmlns='http://www.w3.org/1999/xhtml'>\n" " This is a description with preserved whitespace. <bar:x/>\n" @@ -4163,11 +4163,11 @@ static inline void _check_ws_ignored(int line, IXMLDOMDocument2* doc, char const helper_expect_list_and_release(list, "E1.E5.E1.E2.D1 E2.E5.E1.E2.D1"); helper_ole_check(IXMLDOMNode_get_childNodes(node1, &list)); - helper_expect_list_and_release(list, "T1.E1.E5.E1.E2.D1 E2.E1.E5.E1.E2.D1 E3.E1.E5.E1.E2.D1 T4.E1.E5.E1.E2.D1 E5.E1.E5.E1.E2.D1"); + helper_expect_list_and_release(list, "T1.E1.E5.E1.E2.D1 E2.E1.E5.E1.E2.D1 E3.E1.E5.E1.E2.D1 E4.E1.E5.E1.E2.D1 E5.E1.E5.E1.E2.D1"); helper_ole_check(IXMLDOMNode_get_text(node1, &bstr)); if (str) { - helper_expect_bstr_and_release(bstr, str); + todo_wine helper_expect_bstr_and_release(bstr, str); } else { @@ -4196,7 +4196,7 @@ static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char con helper_expect_list_and_release(list, "E2.E10.E2.E2.D1 E4.E10.E2.E2.D1"); helper_ole_check(IXMLDOMNode_get_childNodes(node1, &list)); - helper_expect_list_and_release(list, "T1.E2.E10.E2.E2.D1 E2.E2.E10.E2.E2.D1 T3.E2.E10.E2.E2.D1 E4.E2.E10.E2.E2.D1 T5.E2.E10.E2.E2.D1 E6.E2.E10.E2.E2.D1 T7.E2.E10.E2.E2.D1"); + helper_expect_list_and_release(list, "T1.E2.E10.E2.E2.D1 E2.E2.E10.E2.E2.D1 T3.E2.E10.E2.E2.D1 E4.E2.E10.E2.E2.D1 E5.E2.E10.E2.E2.D1 E6.E2.E10.E2.E2.D1 T7.E2.E10.E2.E2.D1"); helper_ole_check(IXMLDOMNode_get_text(node1, &bstr)); if (str) { @@ -4204,7 +4204,7 @@ static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char con } else { - helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); + todo_wine helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); } IXMLDOMNode_Release(node1);

1 0

Piotr Caban : msxml3/tests: Add more IXMLDOMNode_get_text tests.
by Alexandre Julliard Nov. 19, 2015

Nov. 19, 2015

Module: wine Branch: master Commit: 4386cac6cad601fb8afb97b65ebc08d9f6151dd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4386cac6cad601fb8afb97b65… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 18 12:55:21 2015 +0100 msxml3/tests: Add more IXMLDOMNode_get_text tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b563a80..5518494 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -481,7 +481,7 @@ static const char szExampleXML[] = " <d>D1 field</d>\n" " <description xmlns:foo='http://www.winehq.org' xmlns:bar='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n" " <html xmlns='http://www.w3.org/1999/xhtml'>\n" -" This is a description. <bar:x/>\n" +" This is a description. <bar:x/>\n" " </html>\n" " <html xml:space='preserve' xmlns='http://www.w3.org/1999/xhtml'>\n" " This is a description with preserved whitespace. <bar:x/>\n" @@ -4200,11 +4200,11 @@ static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char con helper_ole_check(IXMLDOMNode_get_text(node1, &bstr)); if (str) { - helper_expect_bstr_and_release(bstr, str); + todo_wine helper_expect_bstr_and_release(bstr, str); } else { - helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); + helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); } IXMLDOMNode_Release(node1);

1 0

Alexandre Julliard : user32/tests: Fix a test that assumes that a menu handle is invalid.
by Alexandre Julliard Nov. 19, 2015

Nov. 19, 2015

Module: wine Branch: master Commit: 869380543192f12fb565d55f09e481ff302c5817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=869380543192f12fb565d55f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 19 20:03:20 2015 +0900 user32/tests: Fix a test that assumes that a menu handle is invalid. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/menu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 7599431..00fcfc1 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -3789,6 +3789,8 @@ static void test_AppendMenu(void) mii.cbSize = sizeof(mii); mii.fMask = MIIM_SUBMENU; mii.hSubMenu = (HMENU)204; + /* make sure the menu handle is truly invalid */ + while (IsMenu( mii.hSubMenu )) mii.hSubMenu = (HMENU)((ULONG_PTR)mii.hSubMenu + 1); ret = InsertMenuItemA(hmenu, 0, TRUE, &mii); ok(!ret, "InsertMenuItem should fail\n"); ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii);

1 0

Alexandre Julliard : user32: Add workaround for removed SC_TASKLIST system menu item.
by Alexandre Julliard Nov. 19, 2015

Nov. 19, 2015

Module: wine Branch: master Commit: c82626a4c1fe8e941ab1dc61053d98dcb8e16887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c82626a4c1fe8e941ab1dc610… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 19 20:54:34 2015 +0900 user32: Add workaround for removed SC_TASKLIST system menu item. Word 95 assumes that the item exists. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 27 +++++-- dlls/user32/tests/menu.c | 189 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 209 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c82626a4c1fe8e941ab1d…

1 0

Jacek Caban : mshtml: Added support for getElementsByTagName in document fragment nodes.
by Alexandre Julliard Nov. 19, 2015

Nov. 19, 2015

Module: wine Branch: master Commit: 808c2d6c7fefb38fe50357749439ea9af9c2cf48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=808c2d6c7fefb38fe50357749… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 19 12:14:59 2015 +0100 mshtml: Added support for getElementsByTagName in document fragment nodes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 46 +++++++++++++++++++++++++++++++++++---------- dlls/mshtml/tests/dom.c | 50 +++++++++++++++++++++++++++++++++++-------------- 2 files changed, 72 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 8e53b8b..cdeb371 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2371,19 +2371,45 @@ static HRESULT WINAPI HTMLDocument3_getElementsByTagName(IHTMLDocument3 *iface, TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pelColl); - if(!This->doc_node->nsdoc) { - WARN("NULL nsdoc\n"); - return E_UNEXPECTED; - } + if(This->doc_node->nsdoc) { + nsAString_InitDepend(&id_str, v); + nsres = nsIDOMHTMLDocument_GetElementsByTagName(This->doc_node->nsdoc, &id_str, &nslist); + nsAString_Finish(&id_str); + if(FAILED(nsres)) { + ERR("GetElementByName failed: %08x\n", nsres); + return E_FAIL; + } + }else { + nsIDOMDocumentFragment *docfrag; + nsAString nsstr; + + if(v) { + const WCHAR *ptr; + for(ptr=v; *ptr; ptr++) { + if(!isalnumW(*ptr)) { + FIXME("Unsupported invalid tag %s\n", debugstr_w(v)); + return E_NOTIMPL; + } + } + } - nsAString_InitDepend(&id_str, v); - nsres = nsIDOMHTMLDocument_GetElementsByTagName(This->doc_node->nsdoc, &id_str, &nslist); - nsAString_Finish(&id_str); - if(FAILED(nsres)) { - ERR("GetElementByName failed: %08x\n", nsres); - return E_FAIL; + nsres = nsIDOMNode_QueryInterface(This->doc_node->node.nsnode, &IID_nsIDOMDocumentFragment, (void**)&docfrag); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMDocumentFragment iface: %08x\n", nsres); + return E_UNEXPECTED; + } + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMDocumentFragment_QuerySelectorAll(docfrag, &nsstr, &nslist); + nsAString_Finish(&nsstr); + nsIDOMDocumentFragment_Release(docfrag); + if(NS_FAILED(nsres)) { + ERR("QuerySelectorAll failed: %08x\n", nsres); + return E_FAIL; + } } + *pelColl = create_collection_from_nodelist(This->doc_node, nslist); nsIDOMNodeList_Release(nslist); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 896e6ad..bc60ff0 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2693,6 +2693,35 @@ static void _test_elem_getelembytag(unsigned line, IUnknown *unk, elem_type_t ty IHTMLElementCollection_Release(col); } +#define test_doc_getelembytag(a,b,c,d) _test_doc_getelembytag(__LINE__,a,b,c,d) +static void _test_doc_getelembytag(unsigned line, IHTMLDocument2 *unk, const char *tag, elem_type_t type, LONG exlen) +{ + IHTMLDocument3 *doc = _get_doc3_iface(line, unk); + IHTMLElementCollection *col = NULL; + elem_type_t *types = NULL; + BSTR tmp; + int i; + HRESULT hres; + + tmp = a2bstr(elem_type_infos[type].tag); + hres = IHTMLDocument3_getElementsByTagName(doc, tmp, &col); + SysFreeString(tmp); + ok_(__FILE__,line) (hres == S_OK, "getElementByTagName failed: %08x\n", hres); + ok_(__FILE__,line) (col != NULL, "col == NULL\n"); + + if(exlen) { + types = HeapAlloc(GetProcessHeap(), 0, exlen*sizeof(elem_type_t)); + for(i=0; i<exlen; i++) + types[i] = type; + } + + _test_elem_collection(line, (IUnknown*)col, types, exlen); + + HeapFree(GetProcessHeap(), 0, types); + IHTMLElementCollection_Release(col); + IHTMLDocument3_Release(doc); +} + #define test_elem_innertext(e,t) _test_elem_innertext(__LINE__,e,t) static void _test_elem_innertext(unsigned line, IHTMLElement *elem, const char *extext) { @@ -8283,20 +8312,7 @@ static void test_elems(IHTMLDocument2 *doc) } IDispatch_Release(disp); - hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); - ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); - - str = a2bstr("Img"); - hres = IHTMLDocument3_getElementsByTagName(doc3, str, &col); - ok(hres == S_OK, "getElementsByTagName(%s) failed: %08x\n", wine_dbgstr_w(str), hres); - SysFreeString(str); - if(hres == S_OK) - { - static const elem_type_t img_types[] = { ET_IMG }; - - test_elem_collection((IUnknown*)col, img_types, sizeof(img_types)/sizeof(img_types[0])); - IHTMLElementCollection_Release(col); - } + test_doc_getelembytag(doc, "Img", ET_IMG, 1); elem = get_doc_elem_by_id(doc, "y"); test_elem_set_innerhtml((IUnknown*)elem, "inner html"); @@ -8313,6 +8329,9 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem2); IHTMLElement_Release(elem); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); + ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); + hres = IHTMLDocument3_recalc(doc3, VARIANT_TRUE); ok(hres == S_OK, "recalc failed: %08x\n", hres); @@ -9263,6 +9282,9 @@ static void test_docfrag(IHTMLDocument2 *doc) test_elem_source_index(br, 0); IHTMLElement_Release(br); + test_doc_getelembytag(frag, "a", ET_A, 0); + test_doc_getelembytag(frag, "Br", ET_BR, 1); + div = get_elem_by_id(doc, "divid", TRUE); test_node_append_child((IUnknown*)div, (IUnknown*)frag); IHTMLElement_Release(div);

1 0