February 2016 - Wine-Commits

Vincent Povirk : gdiplus/tests: Add test for GdipWidenPath.
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: b9e58dd7cc7281cdad65f6404b8bc62cef1cbda2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9e58dd7cc7281cdad65f6404… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 10 16:02:47 2016 -0600 gdiplus/tests: Add test for GdipWidenPath. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphicspath.c | 57 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 6d4171c..aa44911 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1055,6 +1055,62 @@ static void test_flatten(void) GdipDeletePath(path); } +static path_test_t widenline_path[] = { + {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {50.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ + {50.0, 15.0, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0} /*3*/ + }; + +static void test_widen(void) +{ + GpStatus status; + GpPath *path; + GpPen *pen; + GpMatrix *m; + + status = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, status); + status = GdipCreatePen1(0xffffffff, 10.0, UnitPixel, &pen); + expect(Ok, status); + status = GdipCreateMatrix(&m); + expect(Ok, status); + + /* NULL arguments */ + status = GdipAddPathLine(path, 5.0, 10.0, 50.0, 10.0); + expect(Ok, status); + status = GdipWidenPath(NULL, NULL, NULL, 0.0); + expect(InvalidParameter, status); + status = GdipWidenPath(path, pen, m, 0.0); + expect(Ok, status); + status = GdipWidenPath(path, pen, NULL, 1.0); + expect(Ok, status); + status = GdipWidenPath(path, NULL, m, 1.0); + expect(InvalidParameter, status); + status = GdipWidenPath(NULL, pen, m, 1.0); + expect(InvalidParameter, status); + + /* widen empty path */ + status = GdipResetPath(path); + expect(Ok, status); + status = GdipWidenPath(path, pen, m, 1.0); + expect(OutOfMemory, status); + + /* horizontal line */ + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathLine(path, 5.0, 10.0, 50.0, 10.0); + expect(Ok, status); + + status = GdipWidenPath(path, pen, m, 1.0); + expect(Ok, status); + ok_path(path, widenline_path, sizeof(widenline_path)/sizeof(path_test_t), FALSE); + + GdipDeleteMatrix(m); + GdipDeletePen(pen); + GdipDeletePath(path); +} + static void test_isvisible(void) { GpPath *path; @@ -1163,6 +1219,7 @@ START_TEST(graphicspath) test_reverse(); test_addpie(); test_flatten(); + test_widen(); test_isvisible(); test_empty_rect();

1 0

Nikolay Sivov : dwrite: Add support for PFM files in Analyze().
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: 38a99b2f25faf2bf483d59b10a780ad7d842042c URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a99b2f25faf2bf483d59b10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 11 04:50:07 2016 +0300 dwrite: Add support for PFM files in Analyze(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index a913dc9..5b29c21 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -811,6 +811,16 @@ static HRESULT opentype_otf_analyzer(IDWriteFontFileStream *stream, UINT32 *font static HRESULT opentype_type1_analyzer(IDWriteFontFileStream *stream, UINT32 *font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type) { +#include "pshpack1.h" + /* Specified in Adobe TechNote #5178 */ + struct pfm_header { + WORD dfVersion; + DWORD dfSize; + char data0[95]; + DWORD dfDevice; + char data1[12]; + }; +#include "poppack.h" struct type1_header { WORD tag; char data[14]; @@ -834,6 +844,44 @@ static HRESULT opentype_type1_analyzer(IDWriteFontFileStream *stream, UINT32 *fo IDWriteFontFileStream_ReleaseFileFragment(stream, context); + /* let's see if it's a .pfm metrics file */ + if (*file_type == DWRITE_FONT_FILE_TYPE_UNKNOWN) { + const struct pfm_header *pfm_header; + UINT64 filesize; + DWORD offset; + BOOL header_checked; + + hr = IDWriteFontFileStream_GetFileSize(stream, &filesize); + if (FAILED(hr)) + return hr; + + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&pfm_header, 0, sizeof(*pfm_header), &context); + if (FAILED(hr)) + return hr; + + offset = pfm_header->dfDevice; + header_checked = pfm_header->dfVersion == 0x100 && pfm_header->dfSize == filesize; + IDWriteFontFileStream_ReleaseFileFragment(stream, context); + + /* as a last test check static string in PostScript information section */ + if (header_checked) { + static const char postscript[] = "PostScript"; + char *devtype_name; + + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&devtype_name, offset, sizeof(postscript), &context); + if (FAILED(hr)) + return hr; + + if (!memcmp(devtype_name, postscript, sizeof(postscript))) { + *font_count = 1; + *file_type = DWRITE_FONT_FILE_TYPE_TYPE1_PFM; + *face_type = DWRITE_FONT_FACE_TYPE_TYPE1; + } + + IDWriteFontFileStream_ReleaseFileFragment(stream, context); + } + } + return *file_type != DWRITE_FONT_FILE_TYPE_UNKNOWN ? S_OK : S_FALSE; }

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in surface_upload_from_surface().
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: bb385366a110a8223667a3fbbc8f5960a4cca321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb385366a110a8223667a3fbb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 19:29:59 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in surface_upload_from_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 820fbfa..95ee255 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1590,6 +1590,7 @@ static BOOL surface_check_block_align_rect(struct wined3d_surface *surface, cons HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) { + unsigned int src_row_pitch, src_slice_pitch; const struct wined3d_format *src_format; const struct wined3d_format *dst_format; unsigned int src_fmt_flags, dst_fmt_flags; @@ -1599,7 +1600,6 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P UINT update_w, update_h; UINT dst_w, dst_h; RECT r, dst_rect; - UINT src_pitch; POINT p; TRACE("dst_surface %p, dst_point %s, src_surface %p, src_rect %s.\n", @@ -1687,10 +1687,10 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P wined3d_texture_bind_and_dirtify(dst_surface->container, context, FALSE); surface_get_memory(src_surface, &data, src_surface->locations); - src_pitch = wined3d_surface_get_pitch(src_surface); + wined3d_texture_get_pitch(src_surface->container, src_surface->texture_level, &src_row_pitch, &src_slice_pitch); wined3d_surface_upload_data(dst_surface, gl_info, src_format, src_rect, - src_pitch, dst_point, FALSE, wined3d_const_bo_address(&data)); + src_row_pitch, dst_point, FALSE, wined3d_const_bo_address(&data)); context_release(context);

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in wined3d_volume_map().
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: 7f69a345748daea05581f48c089012481b6a2820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f69a345748daea05581f48c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 19:29:56 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in wined3d_volume_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 8 ++------ dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 16b6555..75585d8 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -40,11 +40,6 @@ BOOL volume_prepare_system_memory(struct wined3d_volume *volume) return TRUE; } -void wined3d_volume_get_pitch(const struct wined3d_volume *volume, UINT *row_pitch, UINT *slice_pitch) -{ - wined3d_texture_get_pitch(volume->container, volume->texture_level, row_pitch, slice_pitch); -} - /* This call just uploads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ @@ -588,7 +583,8 @@ HRESULT wined3d_volume_map(struct wined3d_volume *volume, } else { - wined3d_volume_get_pitch(volume, &map_desc->row_pitch, &map_desc->slice_pitch); + wined3d_texture_get_pitch(volume->container, volume->texture_level, + &map_desc->row_pitch, &map_desc->slice_pitch); } if (!box) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 470db1f..56ca786 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2444,7 +2444,6 @@ BOOL volume_prepare_system_memory(struct wined3d_volume *volume) DECLSPEC_HIDDEN HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, unsigned int level, struct wined3d_volume **volume) DECLSPEC_HIDDEN; void wined3d_volume_destroy(struct wined3d_volume *volume) DECLSPEC_HIDDEN; -void wined3d_volume_get_pitch(const struct wined3d_volume *volume, UINT *row_pitch, UINT *slice_pitch) DECLSPEC_HIDDEN; void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in surface_create_dib_section().
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: fdecf9e452042be81f86aa9ec3de49a65d06759d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdecf9e452042be81f86aa9ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 19:29:57 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in surface_create_dib_section(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bd8cf45..b31e2ea 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -360,6 +360,7 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface) { const struct wined3d_format *format = surface->resource.format; unsigned int format_flags = surface->container->resource.format_flags; + unsigned int row_pitch, slice_pitch; SYSTEM_INFO sysInfo; BITMAPINFO *b_info; int extraline = 0; @@ -409,10 +410,10 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface) b_info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); /* TODO: Is there a nicer way to force a specific alignment? (8 byte for ddraw) */ - b_info->bmiHeader.biWidth = wined3d_surface_get_pitch(surface) / format->byte_count; + wined3d_texture_get_pitch(surface->container, surface->texture_level, &row_pitch, &slice_pitch); + b_info->bmiHeader.biWidth = row_pitch / format->byte_count; b_info->bmiHeader.biHeight = 0 - surface->resource.height - extraline; - b_info->bmiHeader.biSizeImage = (surface->resource.height + extraline) - * wined3d_surface_get_pitch(surface); + b_info->bmiHeader.biSizeImage = (surface->resource.height + extraline) * row_pitch; b_info->bmiHeader.biPlanes = 1; b_info->bmiHeader.biBitCount = format->byte_count * 8;

1 0

Nikolay Sivov : usp10: Use memcpy() to return ScriptLayout() results.
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: a8c6c9f49a8c49a6e14fd4dc6a71f9ef7726180e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8c6c9f49a8c49a6e14fd4dc6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 10 13:09:44 2016 +0300 usp10: Use memcpy() to return ScriptLayout() results. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 253177a..3b31867 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3645,7 +3645,6 @@ HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *log if (!indexs) return E_OUTOFMEMORY; - if (vistolog) { for( ich = 0; ich < runs; ich++) @@ -3654,11 +3653,9 @@ HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *log ich = 0; while (ich < runs) ich += BIDI_ReorderV2lLevel(0, indexs+ich, level+ich, runs - ich, FALSE); - for (ich = 0; ich < runs; ich++) - vistolog[ich] = indexs[ich]; + memcpy(vistolog, indexs, runs * sizeof(*vistolog)); } - if (logtovis) { for( ich = 0; ich < runs; ich++) @@ -3667,8 +3664,7 @@ HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *log ich = 0; while (ich < runs) ich += BIDI_ReorderL2vLevel(0, indexs+ich, level+ich, runs - ich, FALSE); - for (ich = 0; ich < runs; ich++) - logtovis[ich] = indexs[ich]; + memcpy(logtovis, indexs, runs * sizeof(*logtovis)); } heap_free(indexs);

1 0

Nikolay Sivov : gdi32/tests: Simplify tests using todo_wine_if().
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: 10437c027fa6527f2f0609951aa100b06c805a48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10437c027fa6527f2f0609951… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 11 05:02:14 2016 +0300 gdi32/tests: Simplify tests using todo_wine_if(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dc.c | 28 +++++----------------------- dlls/gdi32/tests/dib.c | 5 +---- dlls/gdi32/tests/font.c | 49 +++++++++++++++++-------------------------------- dlls/gdi32/tests/path.c | 10 ++-------- 4 files changed, 25 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10437c027fa6527f2f060…

1 0

Jacek Caban : winetest: Added hello.php, a copy of hello.html that avoids caching.
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: tools Branch: master Commit: be8034671e4a9849a8a32f49221dd50c421c6900 URL: http://source.winehq.org/git/tools.git/?a=commit;h=be8034671e4a9849a8a32f49… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 11 15:20:24 2016 +0100 winetest: Added hello.php, a copy of hello.html that avoids caching. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/tests/hello.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/winetest/tests/hello.php b/winetest/tests/hello.php new file mode 100644 index 0000000..bed858b --- /dev/null +++ b/winetest/tests/hello.php @@ -0,0 +1,4 @@ +<html><body> +<h1>Hello world!</h1> +This is a test page for the Wine regression test suite. +</body></html>

1 0

Józef Kucia : wined3d: Add remaining sRGB formats.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: 9c98d632779862aae15e9e3a25f59065fae03386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c98d632779862aae15e9e3a2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 10 02:14:26 2016 +0100 wined3d: Add remaining sRGB formats. 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/utils.c | 14 +++++++++++++- include/wine/wined3d.h | 7 +++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9f21be6..d355ee1 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -85,7 +85,9 @@ static const struct wined3d_format_channels formats[] = /* Standard ARGB formats. */ {WINED3DFMT_B8G8R8_UNORM, 8, 8, 8, 0, 16, 8, 0, 0, 3, 0, 0}, {WINED3DFMT_B8G8R8A8_UNORM, 8, 8, 8, 8, 16, 8, 0, 24, 4, 0, 0}, + {WINED3DFMT_B8G8R8A8_UNORM_SRGB, 8, 8, 8, 8, 16, 8, 0, 24, 4, 0, 0}, {WINED3DFMT_B8G8R8X8_UNORM, 8, 8, 8, 0, 16, 8, 0, 0, 4, 0, 0}, + {WINED3DFMT_B8G8R8X8_UNORM_SRGB, 8, 8, 8, 0, 16, 8, 0, 0, 4, 0, 0}, {WINED3DFMT_B5G6R5_UNORM, 5, 6, 5, 0, 11, 5, 0, 0, 2, 0, 0}, {WINED3DFMT_B5G5R5X1_UNORM, 5, 5, 5, 0, 10, 5, 0, 0, 2, 0, 0}, {WINED3DFMT_B5G5R5A1_UNORM, 5, 5, 5, 1, 10, 5, 0, 15, 2, 0, 0}, @@ -1414,10 +1416,13 @@ struct wined3d_format_srgb_info static const struct wined3d_format_srgb_info format_srgb_info[] = { + {WINED3DFMT_R8G8B8A8_UNORM_SRGB, WINED3DFMT_R8G8B8A8_UNORM}, {WINED3DFMT_BC1_UNORM_SRGB, WINED3DFMT_BC1_UNORM}, {WINED3DFMT_BC2_UNORM_SRGB, WINED3DFMT_BC2_UNORM}, {WINED3DFMT_BC3_UNORM_SRGB, WINED3DFMT_BC3_UNORM}, - {WINED3DFMT_R8G8B8A8_UNORM_SRGB, WINED3DFMT_R8G8B8A8_UNORM}, + {WINED3DFMT_B8G8R8A8_UNORM_SRGB, WINED3DFMT_B8G8R8A8_UNORM}, + {WINED3DFMT_B8G8R8X8_UNORM_SRGB, WINED3DFMT_B8G8R8X8_UNORM}, + {WINED3DFMT_BC7_UNORM_SRGB, WINED3DFMT_BC7_UNORM}, }; static inline int getFmtIdx(enum wined3d_format_id format_id) @@ -3276,6 +3281,13 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_B5G5R5A1_UNORM); FMT_TO_STR(WINED3DFMT_B8G8R8A8_UNORM); FMT_TO_STR(WINED3DFMT_B8G8R8X8_UNORM); + FMT_TO_STR(WINED3DFMT_B8G8R8A8_TYPELESS); + FMT_TO_STR(WINED3DFMT_B8G8R8A8_UNORM_SRGB); + FMT_TO_STR(WINED3DFMT_B8G8R8X8_TYPELESS); + FMT_TO_STR(WINED3DFMT_B8G8R8X8_UNORM_SRGB); + FMT_TO_STR(WINED3DFMT_BC7_TYPELESS); + FMT_TO_STR(WINED3DFMT_BC7_UNORM); + FMT_TO_STR(WINED3DFMT_BC7_UNORM_SRGB); FMT_TO_STR(WINED3DFMT_INTZ); FMT_TO_STR(WINED3DFMT_RESZ); FMT_TO_STR(WINED3DFMT_NULL); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index df95da9..f314af3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -214,6 +214,13 @@ enum wined3d_format_id WINED3DFMT_B5G5R5A1_UNORM, WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8X8_UNORM, + WINED3DFMT_B8G8R8A8_TYPELESS, + WINED3DFMT_B8G8R8A8_UNORM_SRGB, + WINED3DFMT_B8G8R8X8_TYPELESS, + WINED3DFMT_B8G8R8X8_UNORM_SRGB, + WINED3DFMT_BC7_TYPELESS, + WINED3DFMT_BC7_UNORM, + WINED3DFMT_BC7_UNORM_SRGB, /* FOURCC formats. */ WINED3DFMT_UYVY = WINEMAKEFOURCC('U','Y','V','Y'), WINED3DFMT_YUY2 = WINEMAKEFOURCC('Y','U','Y','2'),

1 0

Hans Leidekker : webservices: Implement WS_MOVE_TO_END_ELEMENT in the reader.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: 88e53782e8a48108618935f0b7539846fcd638a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88e53782e8a48108618935f0b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 15:02:06 2016 +0100 webservices: Implement WS_MOVE_TO_END_ELEMENT in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 5b0217f..1979ad7 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1405,6 +1405,25 @@ static BOOL move_to_child_element( struct reader *reader ) return FALSE; } +static BOOL move_to_end_element( struct reader *reader ) +{ + struct list *ptr; + struct node *node = reader->current; + + if (node->hdr.node.nodeType != WS_XML_NODE_TYPE_ELEMENT) return FALSE; + + if ((ptr = list_tail( &node->children ))) + { + struct node *tail = LIST_ENTRY( ptr, struct node, entry ); + if (tail->hdr.node.nodeType == WS_XML_NODE_TYPE_END_ELEMENT) + { + reader->current = tail; + return TRUE; + } + } + return FALSE; +} + static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found ) { struct list *ptr; @@ -1434,6 +1453,10 @@ static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found success = move_to_child_element( reader ); break; + case WS_MOVE_TO_END_ELEMENT: + success = move_to_end_element( reader ); + break; + case WS_MOVE_TO_FIRST_NODE: if ((ptr = list_head( &reader->current->parent->children ))) {

1 0