August 2017 - Wine-Commits - list.winehq.org

Alexandre Julliard : winex11: If importing an X11 clipboard format fails, try other candidate formats for the target.
by Alexandre Julliard Aug. 25, 2017

Aug. 25, 2017

Module: wine Branch: master Commit: 401ccc73e204522278d1d0426af008a1b89c8bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=401ccc73e204522278d1d0426… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 25 08:08:13 2017 +0200 winex11: If importing an X11 clipboard format fails, try other candidate formats for the target. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 8e6e05b..c55a266 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1087,8 +1087,9 @@ static HANDLE render_format( UINT id ) for (i = 0; i < nb_current_x11_formats; i++) { if (current_x11_formats[i]->id != id) continue; - handle = import_selection( display, import_window, current_selection, current_x11_formats[i] ); - if (handle) SetClipboardData( id, handle ); + if (!(handle = import_selection( display, import_window, + current_selection, current_x11_formats[i] ))) continue; + SetClipboardData( id, handle ); break; } return handle;

1 0

Nikolay Sivov : dwrite: Remove unused call.
by Alexandre Julliard Aug. 25, 2017

Aug. 25, 2017

Module: wine Branch: master Commit: 1b16af0062fdbcf003e6b12d3e00b9dc53fecf11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b16af0062fdbcf003e6b12d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 25 08:29:45 2017 +0300 dwrite: Remove unused call. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 4e901fa..c04738a 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -5030,14 +5030,13 @@ static HRESULT WINAPI dwritetrimmingsign_Draw(IDWriteInlineObject *iface, void * FLOAT originX, FLOAT originY, BOOL is_sideways, BOOL is_rtl, IUnknown *effect) { struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); - DWRITE_TEXT_METRICS metrics; DWRITE_LINE_METRICS line; UINT32 line_count; - TRACE("(%p)->(%p %p %.2f %.2f %d %d %p)\n", This, context, renderer, originX, originY, is_sideways, is_rtl, effect); + TRACE("(%p)->(%p %p %.2f %.2f %d %d %p)\n", This, context, renderer, originX, originY, + is_sideways, is_rtl, effect); IDWriteTextLayout_GetLineMetrics(This->layout, &line, 1, &line_count); - IDWriteTextLayout_GetMetrics(This->layout, &metrics); return IDWriteTextLayout_Draw(This->layout, context, renderer, originX, originY - line.baseline); }

1 0

Alexandre Julliard : gdi32/tests: Run DIB tests also against a monochrome DDB.
by Alexandre Julliard Aug. 25, 2017

Aug. 25, 2017

Module: wine Branch: master Commit: 593def1756a07a9588aa9cd1273e56d9e9c1006f URL: http://source.winehq.org/git/wine.git/?a=commit;h=593def1756a07a9588aa9cd12… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 25 12:46:48 2017 +0200 gdi32/tests: Run DIB tests also against a monochrome DDB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dib.c | 384 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 306 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=593def1756a07a9588aa9…

1 0

Hugh McMaster : reg/tests: Add some mixed key creation and deletion tests.
by Alexandre Julliard Aug. 25, 2017

Aug. 25, 2017

Module: wine Branch: master Commit: b7c838bf98ce8e6b313ff4d2a11fbed8832b09a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c838bf98ce8e6b313ff4d2a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 25 05:36:58 2017 +0000 reg/tests: Add some mixed key creation and deletion tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index f6a7ce1..8a9d12a 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1734,6 +1734,28 @@ static void test_import(void) verify_key_nonexist(hkey, "Subkey3a"); verify_key_nonexist(hkey, "Subkey3b"); + /* Test mixed key creation and deletion. We start by creating a subkey. */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4a]\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey4a"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n" + "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4a]\n" + "\"Wine46a\"=dword:12345678\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey4a"); + todo_wine verify_reg_nonexist(hkey, "Wine46a"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n" + "[HKEY_CURRENT_USERS\\" KEY_BASE "\\Subkey4b]\n" + "\"Wine46b\"=dword:12345678\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey4b"); + verify_reg_nonexist(hkey, "Wine46b"); + /* Test value deletion. We start by creating some registry values. */ test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -3190,6 +3212,28 @@ static void test_unicode_import(void) verify_key_nonexist(hkey, "Subkey3a"); verify_key_nonexist(hkey, "Subkey3b"); + /* Test mixed key creation and deletion. We start by creating a subkey. */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4a]\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey4a"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n" + "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4a]\n" + "\"Wine46a\"=dword:12345678\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey4a"); + todo_wine verify_reg_nonexist(hkey, "Wine46a"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n" + "[HKEY_CURRENT_USERS\\" KEY_BASE "\\Subkey4b]\n" + "\"Wine46b\"=dword:12345678\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey4b"); + verify_reg_nonexist(hkey, "Wine46b"); + /* Test value deletion. We start by creating some registry values. */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : regedit: Close any open registry keys before starting the key deletion process.
by Alexandre Julliard Aug. 25, 2017

Aug. 25, 2017

Module: wine Branch: master Commit: 60e771e686a9424efaf0bdfa90d4fb8d7255da04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60e771e686a9424efaf0bdfa9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 25 05:36:49 2017 +0000 regedit: Close any open registry keys before starting the key deletion process. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 ++ programs/regedit/tests/regedit.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 58ca5ac..162d088 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -708,6 +708,8 @@ static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos) { WCHAR *p = pos; + close_key(parser); + if (*p == 'H' || *p == 'h') delete_registry_key(p); diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 9b2f1fb..5e895ab 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -3016,7 +3016,7 @@ static void test_key_creation_and_deletion(void) "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4a]\n" "\"Wine1a\"=dword:12345678\n\n"); verify_key_nonexist(hkey, "Subkey4a"); - todo_wine verify_reg_nonexist(hkey, "Wine1a"); + verify_reg_nonexist(hkey, "Wine1a"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n" @@ -3166,7 +3166,7 @@ static void test_key_creation_and_deletion_unicode(void) "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4a]\n" "\"Wine1a\"=dword:12345678\n\n"); verify_key_nonexist(hkey, "Subkey4a"); - todo_wine verify_reg_nonexist(hkey, "Wine1a"); + verify_reg_nonexist(hkey, "Wine1a"); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"

1 0

Hugh McMaster : reg: Close any open registry keys before starting the key deletion process.
by Alexandre Julliard Aug. 25, 2017

Aug. 25, 2017

Module: wine Branch: master Commit: 82fc4c8c62b2e72e749a709352048de48dd274e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82fc4c8c62b2e72e749a70935… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 25 05:37:06 2017 +0000 reg: Close any open registry keys before starting the key deletion process. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/import.c | 2 ++ programs/reg/tests/reg.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index b9900b3..a39e1db 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -600,6 +600,8 @@ static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos) { WCHAR *p = pos; + close_key(parser); + if (*p == 'H' || *p == 'h') { HKEY root; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 8a9d12a..a373805 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1746,7 +1746,7 @@ static void test_import(void) "\"Wine46a\"=dword:12345678\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_key_nonexist(hkey, "Subkey4a"); - todo_wine verify_reg_nonexist(hkey, "Wine46a"); + verify_reg_nonexist(hkey, "Wine46a"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n" @@ -3224,7 +3224,7 @@ static void test_unicode_import(void) "\"Wine46a\"=dword:12345678\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_key_nonexist(hkey, "Subkey4a"); - todo_wine verify_reg_nonexist(hkey, "Wine46a"); + verify_reg_nonexist(hkey, "Wine46a"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"

1 0

Dmitry Timoshkov : gdiplus: Force conversion of 8 bpp grayscale PNG images to 32 bpp BGRA.
by Alexandre Julliard Aug. 25, 2017

Aug. 25, 2017

Module: wine Branch: master Commit: 5870431ad97173925a50561221669e6d75be6043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5870431ad97173925a5056122… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 24 11:19:01 2017 -0500 gdiplus: Force conversion of 8 bpp grayscale PNG images to 32 bpp BGRA. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 32 +++++++++++++++++++++++++++++++- dlls/gdiplus/tests/image.c | 1 - 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 0821658..e3bc70e 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3961,7 +3961,37 @@ static GpStatus decode_image_jpeg(IStream* stream, GpImage **image) static GpStatus decode_image_png(IStream* stream, GpImage **image) { - return decode_image_wic(stream, &GUID_ContainerFormatPng, png_metadata_reader, image); + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + GpStatus status; + HRESULT hr; + GUID format; + BOOL force_conversion = FALSE; + + status = initialize_decoder_wic(stream, &GUID_ContainerFormatPng, &decoder); + if (status != Ok) + return status; + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + if (hr == S_OK) + { + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + if (hr == S_OK) + { + if (IsEqualGUID(&format, &GUID_WICPixelFormat8bppGray)) + force_conversion = TRUE; + status = decode_frame_wic(decoder, force_conversion, 0, png_metadata_reader, image); + } + else + status = hresult_to_status(hr); + + IWICBitmapFrameDecode_Release(frame); + } + else + status = hresult_to_status(hr); + + IWICBitmapDecoder_Release(decoder); + return status; } static GpStatus decode_image_gif(IStream* stream, GpImage **image) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 989c217..b9685c3 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5014,7 +5014,6 @@ static void test_png_color_formats(void) status = GdipGetImagePixelFormat(image, &format); expect(Ok, status); -todo_wine_if(td[i].bit_depth == 8 && td[i].color_type == 0) ok(format == td[i].format || broken(td[i].bit_depth == 1 && td[i].color_type == 0 && format == PixelFormat32bppARGB), /* XP */ "%d: expected %#x, got %#x\n", i, td[i].format, format);

1 0

Hugh McMaster : regedit/tests: Add some mixed key creation and deletion tests.
by Alexandre Julliard Aug. 25, 2017

Aug. 25, 2017

Module: wine Branch: master Commit: 484f88080d385dfa85e5da4f1180a44fa6e58997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=484f88080d385dfa85e5da4f1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 25 05:36:40 2017 +0000 regedit/tests: Add some mixed key creation and deletion tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 8a828d7..9b2f1fb 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -3006,6 +3006,25 @@ static void test_key_creation_and_deletion(void) verify_key_nonexist(hkey, "Subkey3a"); verify_key_nonexist(hkey, "Subkey3b"); + /* Test mixed key creation and deletion. We start by creating a subkey. */ + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4a]\n\n"); + verify_key(hkey, "Subkey4a"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n" + "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4a]\n" + "\"Wine1a\"=dword:12345678\n\n"); + verify_key_nonexist(hkey, "Subkey4a"); + todo_wine verify_reg_nonexist(hkey, "Wine1a"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n" + "[HKEY_CURRENT_USERS\\" KEY_BASE "\\Subkey4b]\n" + "\"Wine1b\"=dword:12345678\n\n"); + verify_key_nonexist(hkey, "Subkey4b"); + verify_reg_nonexist(hkey, "Wine1b"); + lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); @@ -3137,6 +3156,25 @@ static void test_key_creation_and_deletion_unicode(void) verify_key_nonexist(hkey, "Subkey3a"); verify_key_nonexist(hkey, "Subkey3b"); + /* Test mixed key creation and deletion. We start by creating a subkey. */ + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4a]\n\n"); + verify_key(hkey, "Subkey4a"); + + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n" + "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4a]\n" + "\"Wine1a\"=dword:12345678\n\n"); + verify_key_nonexist(hkey, "Subkey4a"); + todo_wine verify_reg_nonexist(hkey, "Wine1a"); + + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n" + "[HKEY_CURRENT_USERS\\" KEY_BASE "\\Subkey4b]\n" + "\"Wine1b\"=dword:12345678\n\n"); + verify_key_nonexist(hkey, "Subkey4b"); + verify_reg_nonexist(hkey, "Wine1b"); + lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);

1 0

Nikolay Sivov : dwrite: Improve empty contours handling in GetGlyphRunOutline().
by Alexandre Julliard Aug. 25, 2017

Aug. 25, 2017

Module: wine Branch: master Commit: 1df4e64bbff142a613787fcab9d68d21b3055822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1df4e64bbff142a613787fcab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 25 08:29:46 2017 +0300 dwrite: Improve empty contours handling in GetGlyphRunOutline(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/freetype.c | 57 ++++++++++++++++++++++------------------ dlls/dwrite/tests/font.c | 16 +++++++++-- dlls/dwrite/tests/wine_test.sfd | 20 +++++++++++--- dlls/dwrite/tests/wine_test.ttf | Bin 1776 -> 1812 bytes 4 files changed, 61 insertions(+), 32 deletions(-) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 934ca80..571fa24 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -320,7 +320,6 @@ struct decompose_context { FLOAT xoffset; FLOAT yoffset; BOOL figure_started; - BOOL figure_closed; BOOL move_to; /* last call was 'move_to' */ FT_Vector origin; /* 'pen' position from last call */ }; @@ -331,21 +330,29 @@ static inline void ft_vector_to_d2d_point(const FT_Vector *v, FLOAT xoffset, FLO p->y = (v->y / 64.0f) + yoffset; } +static void decompose_beginfigure(struct decompose_context *ctxt) +{ + D2D1_POINT_2F point; + + if (!ctxt->move_to) + return; + + ft_vector_to_d2d_point(&ctxt->origin, ctxt->xoffset, ctxt->yoffset, &point); + ID2D1SimplifiedGeometrySink_BeginFigure(ctxt->sink, point, D2D1_FIGURE_BEGIN_FILLED); + + ctxt->figure_started = TRUE; + ctxt->move_to = FALSE; +} + static int decompose_move_to(const FT_Vector *to, void *user) { struct decompose_context *ctxt = (struct decompose_context*)user; - D2D1_POINT_2F point; if (ctxt->figure_started) { ID2D1SimplifiedGeometrySink_EndFigure(ctxt->sink, D2D1_FIGURE_END_CLOSED); - ctxt->figure_closed = TRUE; + ctxt->figure_started = FALSE; } - else - ctxt->figure_closed = FALSE; - ctxt->figure_started = TRUE; - ft_vector_to_d2d_point(to, ctxt->xoffset, ctxt->yoffset, &point); - ID2D1SimplifiedGeometrySink_BeginFigure(ctxt->sink, point, D2D1_FIGURE_BEGIN_FILLED); ctxt->move_to = TRUE; ctxt->origin = *to; return 0; @@ -354,18 +361,17 @@ static int decompose_move_to(const FT_Vector *to, void *user) static int decompose_line_to(const FT_Vector *to, void *user) { struct decompose_context *ctxt = (struct decompose_context*)user; - /* special case for empty contours, in a way freetype returns them */ - if (ctxt->move_to && !memcmp(to, &ctxt->origin, sizeof(*to))) { - ID2D1SimplifiedGeometrySink_EndFigure(ctxt->sink, D2D1_FIGURE_END_CLOSED); - ctxt->figure_closed = TRUE; - } - else { - D2D1_POINT_2F point; - ft_vector_to_d2d_point(to, ctxt->xoffset, ctxt->yoffset, &point); - ID2D1SimplifiedGeometrySink_AddLines(ctxt->sink, &point, 1); - ctxt->figure_closed = FALSE; - } - ctxt->move_to = FALSE; + D2D1_POINT_2F point; + + /* Special case for empty contours, in a way freetype returns them. */ + if (ctxt->move_to && !memcmp(to, &ctxt->origin, sizeof(*to))) + return 0; + + decompose_beginfigure(ctxt); + + ft_vector_to_d2d_point(to, ctxt->xoffset, ctxt->yoffset, &point); + ID2D1SimplifiedGeometrySink_AddLines(ctxt->sink, &point, 1); + ctxt->origin = *to; return 0; } @@ -376,6 +382,8 @@ static int decompose_conic_to(const FT_Vector *control, const FT_Vector *to, voi D2D1_POINT_2F points[3]; FT_Vector cubic[3]; + decompose_beginfigure(ctxt); + /* convert from quadratic to cubic */ /* @@ -410,8 +418,6 @@ static int decompose_conic_to(const FT_Vector *control, const FT_Vector *to, voi ft_vector_to_d2d_point(cubic + 1, ctxt->xoffset, ctxt->yoffset, points + 1); ft_vector_to_d2d_point(cubic + 2, ctxt->xoffset, ctxt->yoffset, points + 2); ID2D1SimplifiedGeometrySink_AddBeziers(ctxt->sink, (D2D1_BEZIER_SEGMENT*)points, 1); - ctxt->figure_closed = FALSE; - ctxt->move_to = FALSE; ctxt->origin = *to; return 0; } @@ -422,12 +428,12 @@ static int decompose_cubic_to(const FT_Vector *control1, const FT_Vector *contro struct decompose_context *ctxt = (struct decompose_context*)user; D2D1_POINT_2F points[3]; + decompose_beginfigure(ctxt); + ft_vector_to_d2d_point(control1, ctxt->xoffset, ctxt->yoffset, points); ft_vector_to_d2d_point(control2, ctxt->xoffset, ctxt->yoffset, points + 1); ft_vector_to_d2d_point(to, ctxt->xoffset, ctxt->yoffset, points + 2); ID2D1SimplifiedGeometrySink_AddBeziers(ctxt->sink, (D2D1_BEZIER_SEGMENT*)points, 1); - ctxt->figure_closed = FALSE; - ctxt->move_to = FALSE; ctxt->origin = *to; return 0; } @@ -448,14 +454,13 @@ static void decompose_outline(FT_Outline *outline, FLOAT xoffset, FLOAT yoffset, context.xoffset = xoffset; context.yoffset = yoffset; context.figure_started = FALSE; - context.figure_closed = FALSE; context.move_to = FALSE; context.origin.x = 0; context.origin.y = 0; pFT_Outline_Decompose(outline, &decompose_funcs, &context); - if (!context.figure_closed && outline->n_points) + if (context.figure_started) ID2D1SimplifiedGeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 417cc21..54dcc75 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3061,7 +3061,7 @@ if (face2) { hr = IDWriteFontFace_GetGlyphIndices(face, codePoints, 1, indices); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(indices[0] == 6, "got index %i\n", indices[0]); + ok(indices[0] == 7, "Unexpected glyph index, %u.\n", indices[0]); IDWriteFontFace_Release(face); IDWriteFontFile_Release(file); @@ -4420,6 +4420,18 @@ static void test_GetGlyphRunOutline(void) hr = IDWriteFontFace_GetGlyphRunOutline(face, 1024.0, glyphs, NULL, NULL, 0, FALSE, FALSE, &test_geomsink2); ok(hr == S_OK, "got 0x%08x\n", hr); + /* Glyph with open figure, single contour point. */ + codepoint = 'B'; + glyphs[0] = 0; + hr = IDWriteFontFace_GetGlyphIndices(face, &codepoint, 1, glyphs); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(glyphs[0] > 0, "got %u\n", glyphs[0]); + + SET_EXPECT(setfillmode); + hr = IDWriteFontFace_GetGlyphRunOutline(face, 1024.0, glyphs, NULL, NULL, 1, FALSE, FALSE, &test_geomsink2); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(setfillmode); + IDWriteFactory_Release(factory); IDWriteFontFace_Release(face); DELETE_FONTFILE(path); @@ -4578,7 +4590,7 @@ static void test_GetGlyphCount(void) IDWriteFontFile_Release(file); count = IDWriteFontFace_GetGlyphCount(fontface); - ok(count == 7, "got %u\n", count); + ok(count == 8, "got %u\n", count); IDWriteFontFace_Release(fontface); ref = IDWriteFactory_Release(factory); diff --git a/dlls/dwrite/tests/wine_test.sfd b/dlls/dwrite/tests/wine_test.sfd index c985b43..e533323 100644 --- a/dlls/dwrite/tests/wine_test.sfd +++ b/dlls/dwrite/tests/wine_test.sfd @@ -83,10 +83,10 @@ NameList: Adobe Glyph List DisplaySize: -24 AntiAlias: 1 FitToEm: 1 -WinInfo: 48 16 4 +WinInfo: 47 47 13 BeginPrivate: 0 EndPrivate -BeginChars: 65539 7 +BeginChars: 65539 8 StartChar: .notdef Encoding: 65536 -1 0 @@ -207,7 +207,7 @@ StartChar: A Encoding: 65 65 5 Width: 1000 VWidth: 0 -Flags: WO +Flags: W LayerCount: 2 Fore SplineSet @@ -226,7 +226,7 @@ StartChar: D Encoding: 68 68 6 Width: 1000 VWidth: 0 -Flags: WO +Flags: W LayerCount: 2 Fore SplineSet @@ -240,5 +240,17 @@ SplineSet 461 -30.7998 l 25,0,-1 EndSplineSet EndChar + +StartChar: B +Encoding: 66 66 7 +Width: 2048 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +SplineSet +500 500 m 24,0,-1 +EndSplineSet +EndChar EndChars EndSplineFont diff --git a/dlls/dwrite/tests/wine_test.ttf b/dlls/dwrite/tests/wine_test.ttf index 1562a32..72dadf5 100644 Binary files a/dlls/dwrite/tests/wine_test.ttf and b/dlls/dwrite/tests/wine_test.ttf differ

1 0

Rosanne DiMesio : Use form-control-inline for distributions dropdown list
by Jeremy Newman Aug. 25, 2017

Aug. 25, 2017

Module: appdb Branch: master Commit: b76031ac4a7293e2add90706710719b62d9b8ce8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b76031ac4a7293e2add90706… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Aug 23 15:13:15 2017 -0500 Use form-control-inline for distributions dropdown list Matches the style of the other dropdown lists in the test report form. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> --- include/distribution.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/distribution.php b/include/distribution.php index 40eeb7c..8e5ca35 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -454,7 +454,7 @@ class distribution { $hResult = query_parameters($sQuery); if(!$hResult) return; - echo "<select name='$varname'>\n"; + echo "<select name='$varname' class='form-control form-control-inline'>\n"; echo "<option value=\"\">Choose your operating system</option>\n"; while(list($name, $value) = query_fetch_row($hResult)) {

1 0