April 2018 - Wine-Commits - list.winehq.org

Sven Hesse : d3d11: Implement d3d10_texture1d_Unmap().
by Alexandre Julliard April 3, 2018

April 3, 2018

Module: wine Branch: master Commit: bc808acfb579482a7212427970551e726006902c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc808acfb579482a72124279… Author: Sven Hesse <shesse(a)codeweavers.com> Date: Tue Apr 3 01:46:27 2018 +0430 d3d11: Implement d3d10_texture1d_Unmap(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/texture.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 58f822c..9bda6b0 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -355,7 +355,13 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture1d_Map(ID3D10Texture1D *iface, UIN static void STDMETHODCALLTYPE d3d10_texture1d_Unmap(ID3D10Texture1D *iface, UINT sub_resource_idx) { - FIXME("iface %p, sub_resource_idx %u stub!\n", iface, sub_resource_idx); + struct d3d_texture1d *texture = impl_from_ID3D10Texture1D(iface); + + TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); + + wined3d_mutex_lock(); + wined3d_resource_unmap(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_texture1d_GetDesc(ID3D10Texture1D *iface, D3D10_TEXTURE1D_DESC *desc)

1 0

Sven Hesse : wined3d: Implement support for 1D textures.
by Alexandre Julliard April 3, 2018

April 3, 2018

Module: wine Branch: master Commit: 0e9f94ec1c201c56442124eb8754be1e30840299 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e9f94ec1c201c56442124eb… Author: Sven Hesse <shesse(a)codeweavers.com> Date: Tue Apr 3 01:46:23 2018 +0430 wined3d: Implement support for 1D textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 20 ++- dlls/wined3d/device.c | 17 +++ dlls/wined3d/directx.c | 14 ++ dlls/wined3d/glsl_shader.c | 7 + dlls/wined3d/nvidia_texture_shader.c | 3 + dlls/wined3d/resource.c | 1 + dlls/wined3d/shader.c | 3 +- dlls/wined3d/texture.c | 284 ++++++++++++++++++++++++++++------- dlls/wined3d/utils.c | 1 + dlls/wined3d/view.c | 5 + dlls/wined3d/wined3d_private.h | 2 + include/wine/wined3d.h | 5 +- 12 files changed, 306 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0e9f94ec1c201c564421…

1 0

Sven Hesse : d3d11: Create wined3d textures for 1D textures.
by Alexandre Julliard April 3, 2018

April 3, 2018

Module: wine Branch: master Commit: fce60001c085582af69808872122bd201d09c37b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fce60001c085582af6980887… Author: Sven Hesse <shesse(a)codeweavers.com> Date: Tue Apr 3 01:46:24 2018 +0430 d3d11: Create wined3d textures for 1D textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 530 ++++++++++++++++++++++++++++++++++++++++- dlls/d3d11/d3d11_private.h | 3 + dlls/d3d11/tests/d3d11.c | 534 +++++++++++++++++++++++++++++++++++++++++- dlls/d3d11/texture.c | 89 ++++++- dlls/d3d11/utils.c | 8 + 5 files changed, 1155 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fce60001c085582af698…

1 0

Sven Hesse : d3d11: Implement d3d10_texture1d_Map().
by Alexandre Julliard April 3, 2018

April 3, 2018

Module: wine Branch: master Commit: 66aaaed3394ab82bae58e43426b3b8e92bdd6679 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66aaaed3394ab82bae58e434… Author: Sven Hesse <shesse(a)codeweavers.com> Date: Tue Apr 3 01:46:28 2018 +0430 d3d11: Implement d3d10_texture1d_Map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/texture.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 9bda6b0..0730dbc 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -347,10 +347,25 @@ static UINT STDMETHODCALLTYPE d3d10_texture1d_GetEvictionPriority(ID3D10Texture1 static HRESULT STDMETHODCALLTYPE d3d10_texture1d_Map(ID3D10Texture1D *iface, UINT sub_resource_idx, D3D10_MAP map_type, UINT map_flags, void **data) { - FIXME("iface %p, sub_resource_idx %u, map_type %u, map_flags %#x, data %p stub!\n", + struct d3d_texture1d *texture = impl_from_ID3D10Texture1D(iface); + struct wined3d_map_desc wined3d_map_desc; + HRESULT hr; + + TRACE("iface %p, sub_resource_idx %u, map_type %u, map_flags %#x, data %p.\n", iface, sub_resource_idx, map_type, map_flags, data); - return E_NOTIMPL; + if (map_flags) + FIXME("Ignoring map_flags %#x.\n", map_flags); + + wined3d_mutex_lock(); + if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx, + &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)))) + { + *data = wined3d_map_desc.data; + } + wined3d_mutex_unlock(); + + return hr; } static void STDMETHODCALLTYPE d3d10_texture1d_Unmap(ID3D10Texture1D *iface, UINT sub_resource_idx)

1 0

Jactry Zeng : riched20: Get ITextRange interface from QueryInterface instead of casting.
by Alexandre Julliard April 3, 2018

April 3, 2018

Module: wine Branch: master Commit: 5e81e917a194b281479ead6ca7a4ee1a5b79f180 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e81e917a194b281479ead6c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Apr 3 17:57:50 2018 +0800 riched20: Get ITextRange interface from QueryInterface instead of casting. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index a52cd52..c19a2e7 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -4455,6 +4455,8 @@ static HRESULT WINAPI ITextSelection_fnSetEnd(ITextSelection *me, LONG value) static HRESULT WINAPI ITextSelection_fnGetFont(ITextSelection *me, ITextFont **font) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + ITextRange *range = NULL; + HRESULT hr; TRACE("(%p)->(%p)\n", This, font); @@ -4464,12 +4466,16 @@ static HRESULT WINAPI ITextSelection_fnGetFont(ITextSelection *me, ITextFont **f if (!font) return E_INVALIDARG; - return create_textfont((ITextRange*)me, NULL, font); + ITextSelection_QueryInterface(me, &IID_ITextRange, (void**)&range); + hr = create_textfont(range, NULL, font); + ITextRange_Release(range); + return hr; } static HRESULT WINAPI ITextSelection_fnSetFont(ITextSelection *me, ITextFont *font) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + ITextRange *range = NULL; TRACE("(%p)->(%p)\n", This, font); @@ -4479,13 +4485,17 @@ static HRESULT WINAPI ITextSelection_fnSetFont(ITextSelection *me, ITextFont *fo if (!This->reOle) return CO_E_RELEASED; - textrange_set_font((ITextRange*)me, font); + ITextSelection_QueryInterface(me, &IID_ITextRange, (void**)&range); + textrange_set_font(range, font); + ITextRange_Release(range); return S_OK; } static HRESULT WINAPI ITextSelection_fnGetPara(ITextSelection *me, ITextPara **para) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + ITextRange *range = NULL; + HRESULT hr; TRACE("(%p)->(%p)\n", This, para); @@ -4495,7 +4505,10 @@ static HRESULT WINAPI ITextSelection_fnGetPara(ITextSelection *me, ITextPara **p if (!para) return E_INVALIDARG; - return create_textpara((ITextRange*)me, para); + ITextSelection_QueryInterface(me, &IID_ITextRange, (void**)&range); + hr = create_textpara(range, para); + ITextRange_Release(range); + return hr; } static HRESULT WINAPI ITextSelection_fnSetPara(ITextSelection *me, ITextPara *para) @@ -4560,13 +4573,18 @@ static HRESULT WINAPI ITextSelection_fnCollapse(ITextSelection *me, LONG bStart) static HRESULT WINAPI ITextSelection_fnExpand(ITextSelection *me, LONG unit, LONG *delta) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + ITextRange *range = NULL; + HRESULT hr; TRACE("(%p)->(%d %p)\n", This, unit, delta); if (!This->reOle) return CO_E_RELEASED; - return textrange_expand((ITextRange*)me, unit, delta); + ITextSelection_QueryInterface(me, &IID_ITextRange, (void**)&range); + hr = textrange_expand(range, unit, delta); + ITextRange_Release(range); + return hr; } static HRESULT WINAPI ITextSelection_fnGetIndex(ITextSelection *me, LONG unit, LONG *index)

1 0

Alexandre Julliard : user32: Try to load libpng only once.
by Alexandre Julliard April 3, 2018

April 3, 2018

Module: wine Branch: master Commit: b1631d69da38a2820db6b500e1c0cb9a9b7d0263 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1631d69da38a2820db6b500… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 3 20:41:37 2018 +0200 user32: Try to load libpng only once. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 65 ++++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 6304192..7730736 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -144,42 +144,42 @@ MAKE_FUNCPTR(png_set_gray_to_rgb); MAKE_FUNCPTR(png_set_read_fn); #undef MAKE_FUNCPTR -static BOOL load_libpng(void) -{ - USER_Lock(); +static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; - if (!libpng_handle && (libpng_handle = wine_dlopen(SONAME_LIBPNG, RTLD_NOW, NULL, 0)) != NULL) +static BOOL WINAPI load_libpng( INIT_ONCE *once, void *param, void **context ) +{ + if (!(libpng_handle = wine_dlopen(SONAME_LIBPNG, RTLD_NOW, NULL, 0))) { + WARN( "failed to load %s\n", SONAME_LIBPNG ); + return TRUE; + } #define LOAD_FUNCPTR(f) \ if ((p##f = wine_dlsym(libpng_handle, #f, NULL, 0)) == NULL) \ { \ + WARN( "%s not found in %s\n", #f, SONAME_LIBPNG ); \ libpng_handle = NULL; \ - USER_Unlock(); \ - return FALSE; \ - } - LOAD_FUNCPTR(png_create_read_struct); - LOAD_FUNCPTR(png_create_info_struct); - LOAD_FUNCPTR(png_destroy_read_struct); - LOAD_FUNCPTR(png_error); - LOAD_FUNCPTR(png_get_bit_depth); - LOAD_FUNCPTR(png_get_color_type); - LOAD_FUNCPTR(png_get_error_ptr); - LOAD_FUNCPTR(png_get_image_height); - LOAD_FUNCPTR(png_get_image_width); - LOAD_FUNCPTR(png_get_io_ptr); - LOAD_FUNCPTR(png_read_image); - LOAD_FUNCPTR(png_read_info); - LOAD_FUNCPTR(png_read_update_info); - LOAD_FUNCPTR(png_set_bgr); - LOAD_FUNCPTR(png_set_crc_action); - LOAD_FUNCPTR(png_set_error_fn); - LOAD_FUNCPTR(png_set_expand); - LOAD_FUNCPTR(png_set_gray_to_rgb); - LOAD_FUNCPTR(png_set_read_fn); + return TRUE; \ + } + LOAD_FUNCPTR(png_create_read_struct); + LOAD_FUNCPTR(png_create_info_struct); + LOAD_FUNCPTR(png_destroy_read_struct); + LOAD_FUNCPTR(png_error); + LOAD_FUNCPTR(png_get_bit_depth); + LOAD_FUNCPTR(png_get_color_type); + LOAD_FUNCPTR(png_get_error_ptr); + LOAD_FUNCPTR(png_get_image_height); + LOAD_FUNCPTR(png_get_image_width); + LOAD_FUNCPTR(png_get_io_ptr); + LOAD_FUNCPTR(png_read_image); + LOAD_FUNCPTR(png_read_info); + LOAD_FUNCPTR(png_read_update_info); + LOAD_FUNCPTR(png_set_bgr); + LOAD_FUNCPTR(png_set_crc_action); + LOAD_FUNCPTR(png_set_error_fn); + LOAD_FUNCPTR(png_set_expand); + LOAD_FUNCPTR(png_set_gray_to_rgb); + LOAD_FUNCPTR(png_set_read_fn); #undef LOAD_FUNCPTR - } - - USER_Unlock(); return TRUE; } @@ -233,6 +233,11 @@ static unsigned be_uint(unsigned val) return (u.c[0] << 24) | (u.c[1] << 16) | (u.c[2] << 8) | u.c[3]; } +static BOOL have_libpng(void) +{ + return InitOnceExecuteOnce( &init_once, load_libpng, NULL, NULL ) && libpng_handle; +} + static BOOL get_png_info(const void *png_data, DWORD size, int *width, int *height, int *bpp) { static const char png_sig[8] = { 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a }; @@ -271,7 +276,7 @@ static BITMAPINFO *load_png(const char *png_data, DWORD *size) if (!get_png_info(png_data, *size, &width, &height, &bpp)) return NULL; - if (!load_libpng()) return NULL; + if (!have_libpng()) return NULL; png.buffer = png_data; png.size = *size;

1 0

Dmitry Timoshkov : user32: Add support for PNG icons.
by Alexandre Julliard April 3, 2018

April 3, 2018

Module: wine Branch: master Commit: 728255cf2ceca073e0818a310b62864d1b3725a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=728255cf2ceca073e0818a31… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 3 13:50:03 2018 +0800 user32: Add support for PNG icons. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/Makefile.in | 1 + dlls/user32/cursoricon.c | 341 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 334 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=728255cf2ceca073e081…

1 0

Jactry Zeng : riched20: Implement {ITextRange, ITextSelection}::MoveEnd.
by Alexandre Julliard April 3, 2018

April 3, 2018

Module: wine Branch: master Commit: 125fbf7b2fe3c4ec99673cf2088d835353f60951 URL: https://source.winehq.org/git/wine.git/?a=commit;h=125fbf7b2fe3c4ec99673cf2… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Apr 3 17:57:43 2018 +0800 riched20: Implement {ITextRange,ITextSelection}::MoveEnd. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 59 ++++++++++++++++++++-- dlls/riched20/tests/richole.c | 115 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 170 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 3033157..a52cd52 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2139,17 +2139,63 @@ static HRESULT WINAPI ITextRange_fnMoveStart(ITextRange *me, LONG unit, LONG cou return E_NOTIMPL; } +static HRESULT textrange_moveend(ITextRange *range, LONG unit, LONG count, LONG *delta) +{ + LONG old_start, old_end, new_start, new_end; + HRESULT hr = S_OK; + + if (!count) + { + if (delta) + *delta = 0; + return S_FALSE; + } + + ITextRange_GetStart(range, &old_start); + ITextRange_GetEnd(range, &old_end); + switch (unit) + { + case tomStory: + if (count < 0) + new_start = new_end = 0; + else + { + new_start = old_start; + ITextRange_GetStoryLength(range, &new_end); + } + if (delta) + { + if (new_end < old_end) + *delta = -1; + else if (new_end == old_end) + *delta = 0; + else + *delta = 1; + } + break; + default: + FIXME("unit %d is not supported\n", unit); + return E_NOTIMPL; + } + if (new_end == old_end) + hr = S_FALSE; + ITextRange_SetStart(range, new_start); + ITextRange_SetEnd(range, new_end); + + return hr; +} + static HRESULT WINAPI ITextRange_fnMoveEnd(ITextRange *me, LONG unit, LONG count, LONG *delta) { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%d %d %p): stub\n", This, unit, count, delta); + TRACE("(%p)->(%d %d %p)\n", This, unit, count, delta); if (!This->child.reole) return CO_E_RELEASED; - return E_NOTIMPL; + return textrange_moveend(me, unit, count, delta); } static HRESULT WINAPI ITextRange_fnMoveWhile(ITextRange *me, VARIANT *charset, LONG count, @@ -4694,13 +4740,18 @@ static HRESULT WINAPI ITextSelection_fnMoveEnd(ITextSelection *me, LONG unit, LO LONG *delta) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + ITextRange *range = NULL; + HRESULT hr; - FIXME("(%p)->(%d %d %p): stub\n", This, unit, count, delta); + TRACE("(%p)->(%d %d %p)\n", This, unit, count, delta); if (!This->reOle) return CO_E_RELEASED; - return E_NOTIMPL; + ITextSelection_QueryInterface(me, &IID_ITextRange, (void**)&range); + hr = textrange_moveend(range, unit, count, delta); + ITextRange_Release(range); + return hr; } static HRESULT WINAPI ITextSelection_fnMoveWhile(ITextSelection *me, VARIANT *charset, LONG count, diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 5ba1794..97f8e46 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3427,6 +3427,120 @@ static void test_Expand(void) ITextRange_Release(range); } +static void test_MoveEnd(void) +{ + static const char test_text1[] = "Word1 Word2"; + IRichEditOle *reole = NULL; + ITextDocument *doc = NULL; + ITextSelection *selection; + ITextRange *range; + LONG delta; + HRESULT hr; + HWND hwnd; + + create_interfaces(&hwnd, &reole, &doc, &selection); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); + SendMessageA(hwnd, EM_SETSEL, 1, 2); + + hr = ITextDocument_Range(doc, 1, 2, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextRange_MoveEnd(range, tomStory, 0, &delta); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(delta == 0, "got %d\n", delta); + CHECK_RANGE(range, 1, 2); + + hr = ITextRange_MoveEnd(range, tomStory, -1, &delta); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(delta == -1, "got %d\n", delta); + CHECK_RANGE(range, 0, 0); + + hr = ITextRange_MoveEnd(range, tomStory, 1, &delta); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(delta == 1, "got %d\n", delta); + CHECK_RANGE(range, 0, 12); + + hr = ITextRange_MoveEnd(range, tomStory, 1, &delta); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(delta == 0, "got %d\n", delta); + CHECK_RANGE(range, 0, 12); + + RESET_RANGE(range, 1, 2); + + hr = ITextRange_MoveEnd(range, tomStory, 3, &delta); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(delta == 1, "got %d\n", delta); + CHECK_RANGE(range, 1, 12); + + RESET_RANGE(range, 2, 3); + + hr = ITextRange_MoveEnd(range, tomStory, -3, &delta); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(delta == -1, "got %d\n", delta); + CHECK_RANGE(range, 0, 0); + + hr = ITextRange_MoveEnd(range, tomStory, -1, &delta); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(delta == 0, "got %d\n", delta); + CHECK_RANGE(range, 0, 0); + + hr = ITextSelection_MoveEnd(selection, tomStory, 0, &delta); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(delta == 0, "got %d\n", delta); + CHECK_SELECTION(selection, 1, 2); + + hr = ITextSelection_MoveEnd(selection, tomStory, -1, &delta); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(delta == -1, "got %d\n", delta); + CHECK_SELECTION(selection, 0, 0); + + hr = ITextSelection_MoveEnd(selection, tomStory, 1, &delta); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(delta == 1, "got %d\n", delta); + CHECK_SELECTION(selection, 0, 12); + + hr = ITextSelection_MoveEnd(selection, tomStory, 1, &delta); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(delta == 0, "got %d\n", delta); + CHECK_SELECTION(selection, 0, 12); + + RESET_SELECTION(selection, 1, 2); + + hr = ITextSelection_MoveEnd(selection, tomStory, 3, &delta); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(delta == 1, "got %d\n", delta); + CHECK_SELECTION(selection, 1, 12); + + RESET_SELECTION(selection, 2, 3); + + hr = ITextSelection_MoveEnd(selection, tomStory, -3, &delta); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(delta == -1, "got %d\n", delta); + CHECK_SELECTION(selection, 0, 0); + + hr = ITextSelection_MoveEnd(selection, tomStory, -1, &delta); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(delta == 0, "got %d\n", delta); + CHECK_SELECTION(selection, 0, 0); + + release_interfaces(&hwnd, &reole, &doc, NULL); + + hr = ITextRange_MoveEnd(range, tomStory, 1, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + hr = ITextRange_MoveEnd(range, tomStory, 1, &delta); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + hr = ITextSelection_MoveEnd(selection, tomStory, 1, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + hr = ITextSelection_MoveEnd(selection, tomStory, 1, &delta); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + ITextSelection_Release(selection); + ITextRange_Release(range); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -3464,4 +3578,5 @@ START_TEST(richole) test_GetStoryLength(); test_ITextSelection_GetDuplicate(); test_Expand(); + test_MoveEnd(); }

1 0

Owen Rudge : wsdapi/tests: Add test for Hello message Any header element.
by Alexandre Julliard April 3, 2018

April 3, 2018

Module: wine Branch: master Commit: 9c7d128020124cfa561967c98f50279088ef018a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c7d128020124cfa561967c9… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Mar 29 23:11:58 2018 +0100 wsdapi/tests: Add test for Hello message Any header element. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/discovery.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 73fe22c..0f346aa 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -507,11 +507,18 @@ static void Publish_tests(void) messageStorage *msgStorage; WSADATA wsaData; BOOL messageOK, hello_message_seen = FALSE, endpoint_reference_seen = FALSE, app_sequence_seen = FALSE; - BOOL metadata_version_seen = FALSE; + BOOL metadata_version_seen = FALSE, any_header_seen = FALSE, wine_ns_seen = FALSE; int ret, i; HRESULT rc; ULONG ref; char *msg; + WSDXML_ELEMENT *header_any_element; + WSDXML_NAME header_any_name; + WSDXML_NAMESPACE ns; + WCHAR header_any_name_text[] = {'B','e','e','r',0}; + static const WCHAR header_any_text[] = {'P','u','b','l','i','s','h','T','e','s','t',0}; + static const WCHAR uri[] = {'h','t','t','p',':','/','/','w','i','n','e','.','t','e','s','t','/',0}; + static const WCHAR prefix[] = {'w','i','n','e',0}; rc = WSDCreateDiscoveryPublisher(NULL, &publisher); ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08x\n", rc); @@ -573,8 +580,22 @@ static void Publish_tests(void) ret = start_listening_on_all_addresses(msgStorage, AF_INET); ok(ret == TRUE, "Unable to listen on IPv4 addresses (ret == %d)\n", ret); + /* Create "any" elements for header */ + ns.Uri = uri; + ns.PreferredPrefix = prefix; + + header_any_name.LocalName = header_any_name_text; + header_any_name.Space = &ns; + + rc = WSDXMLBuildAnyForSingleElement(&header_any_name, header_any_text, &header_any_element); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + /* Publish the service */ - rc = IWSDiscoveryPublisher_Publish(publisher, publisherIdW, 1, 1, 1, sequenceIdW, NULL, NULL, NULL); + rc = IWSDiscoveryPublisher_PublishEx(publisher, publisherIdW, 1, 1, 1, sequenceIdW, NULL, NULL, NULL, + header_any_element, NULL, NULL, NULL, NULL); + + WSDFreeLinkedMemory(header_any_element); + ok(rc == S_OK, "Publish failed: %08x\n", rc); /* Wait up to 2 seconds for messages to be received */ @@ -606,7 +627,10 @@ static void Publish_tests(void) endpoint_reference_seen = (strstr(msg, endpointReferenceString) != NULL); app_sequence_seen = (strstr(msg, app_sequence_string) != NULL); metadata_version_seen = (strstr(msg, "<wsd:MetadataVersion>1</wsd:MetadataVersion>") != NULL); - messageOK = hello_message_seen && endpoint_reference_seen && app_sequence_seen && metadata_version_seen; + any_header_seen = (strstr(msg, "<wine:Beer>PublishTest</wine:Beer>") != NULL); + wine_ns_seen = (strstr(msg, "xmlns:wine=\"http://wine.test/\"") != NULL); + messageOK = hello_message_seen && endpoint_reference_seen && app_sequence_seen && metadata_version_seen && + any_header_seen && wine_ns_seen; if (messageOK) break; } @@ -623,6 +647,8 @@ static void Publish_tests(void) ok(app_sequence_seen == TRUE, "AppSequence not received\n"); todo_wine ok(metadata_version_seen == TRUE, "MetadataVersion not received\n"); todo_wine ok(messageOK == TRUE, "Hello message metadata not received\n"); + todo_wine ok(any_header_seen == TRUE, "Custom header not received\n"); + todo_wine ok(wine_ns_seen == TRUE, "Wine namespace not received\n"); after_publish_test:

1 0

Alexandre Julliard : ntoskrnl: Add emulation of CRn and DRn registers on x86-64.
by Alexandre Julliard April 3, 2018

April 3, 2018

Module: wine Branch: master Commit: ce09790d29630a6a4c0cd49459afc2097700ad10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce09790d29630a6a4c0cd494… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 3 11:46:01 2018 +0200 ntoskrnl: Add emulation of CRn and DRn registers on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/instr.c | 112 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 103 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index fdbe8bd..b2dac58 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -594,6 +594,8 @@ static BYTE *INSTR_GetOperandAddr( CONTEXT *context, BYTE *instr, */ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) { + static const char *reg_names[16] = { "rax", "rcx", "rdx", "rbx", "rsp", "rbp", "rsi", "rdi", + "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15" }; int prefix, segprefix, prefixlen, len, long_op, long_addr, rex; BYTE *instr; @@ -635,21 +637,34 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) case 0x67: long_addr = !long_addr; /* addr size prefix */ break; + case 0x40: /* rex */ + case 0x41: + case 0x42: + case 0x43: + case 0x44: + case 0x45: + case 0x46: + case 0x47: + case 0x48: + case 0x49: + case 0x4a: + case 0x4b: + case 0x4c: + case 0x4d: + case 0x4e: + case 0x4f: + rex = *instr; + break; case 0xf0: /* lock */ - break; + break; case 0xf2: /* repne */ - break; + break; case 0xf3: /* repe */ break; default: prefix = 0; /* no more prefixes */ break; } - if (*instr >= 0x40 && *instr < 0x50) /* rex */ - { - rex = *instr; - prefix = TRUE; - } if (prefix) { instr++; @@ -664,6 +679,84 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) case 0x0f: /* extended instruction */ switch(instr[1]) { + case 0x20: /* mov crX, Rd */ + { + int reg = REGMODRM_REG( instr[2], rex ); + int rm = REGMODRM_RM( instr[2], rex ); + DWORD64 *data = get_int_reg( context, rm ); + TRACE( "mov cr%u,%s at %lx\n", reg, reg_names[rm], context->Rip ); + switch (reg) + { + case 0: *data = 0x10; break; /* FIXME: set more bits ? */ + case 2: *data = 0; break; + case 3: *data = 0; break; + case 4: *data = 0; break; + case 8: *data = 0; break; + default: return ExceptionContinueSearch; + } + context->Rip += prefixlen + 3; + return ExceptionContinueExecution; + } + case 0x21: /* mov drX, Rd */ + { + int reg = REGMODRM_REG( instr[2], rex ); + int rm = REGMODRM_RM( instr[2], rex ); + DWORD64 *data = get_int_reg( context, rm ); + TRACE( "mov dr%u,%s at %lx\n", reg, reg_names[rm], context->Rip ); + switch (reg) + { + case 0: *data = context->Dr0; break; + case 1: *data = context->Dr1; break; + case 2: *data = context->Dr2; break; + case 3: *data = context->Dr3; break; + case 4: /* dr4 and dr5 are obsolete aliases for dr6 and dr7 */ + case 6: *data = context->Dr6; break; + case 5: + case 7: *data = 0x400; break; + default: return ExceptionContinueSearch; + } + context->Rip += prefixlen + 3; + return ExceptionContinueExecution; + } + case 0x22: /* mov Rd, crX */ + { + int reg = REGMODRM_REG( instr[2], rex ); + int rm = REGMODRM_RM( instr[2], rex ); + DWORD64 *data = get_int_reg( context, rm ); + TRACE( "mov %s,cr%u at %lx, %s=%lx\n", reg_names[rm], reg, context->Rip, reg_names[rm], *data ); + switch (reg) + { + case 0: break; + case 2: break; + case 3: break; + case 4: break; + case 8: break; + default: return ExceptionContinueSearch; + } + context->Rip += prefixlen + 3; + return ExceptionContinueExecution; + } + case 0x23: /* mov Rd, drX */ + { + int reg = REGMODRM_REG( instr[2], rex ); + int rm = REGMODRM_RM( instr[2], rex ); + DWORD64 *data = get_int_reg( context, rm ); + TRACE( "mov %s,dr%u at %lx, %s=%lx\n", reg_names[rm], reg, context->Rip, reg_names[rm], *data ); + switch (reg) + { + case 0: context->Dr0 = *data; break; + case 1: context->Dr1 = *data; break; + case 2: context->Dr2 = *data; break; + case 3: context->Dr3 = *data; break; + case 4: /* dr4 and dr5 are obsolete aliases for dr6 and dr7 */ + case 6: context->Dr6 = *data; break; + case 5: + case 7: context->Dr7 = *data; break; + default: return ExceptionContinueSearch; + } + context->Rip += prefixlen + 3; + return ExceptionContinueExecution; + } case 0xb6: /* movzx Eb, Gv */ case 0xb7: /* movzx Ew, Gv */ { @@ -738,8 +831,9 @@ LONG CALLBACK vectored_handler( EXCEPTION_POINTERS *ptrs ) EXCEPTION_RECORD *record = ptrs->ExceptionRecord; CONTEXT *context = ptrs->ContextRecord; - if (record->ExceptionCode == EXCEPTION_ACCESS_VIOLATION && - record->ExceptionInformation[0] == EXCEPTION_READ_FAULT) + if (record->ExceptionCode == EXCEPTION_PRIV_INSTRUCTION || + (record->ExceptionCode == EXCEPTION_ACCESS_VIOLATION && + record->ExceptionInformation[0] == EXCEPTION_READ_FAULT)) { if (emulate_instruction( record, context ) == ExceptionContinueExecution) {

1 0