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

Rosanne DiMesio : Fix submitTime field
by Jeremy Newman 28 Aug '17

28 Aug '17

Module: appdb Branch: master Commit: 0888cc3467295c03ac169d6e0304656a334ad482 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0888cc3467295c03ac169d6e… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Aug 28 07:41:50 2017 -0500 Fix submitTime field Supersedes 136700, which was incompatible with mySQL 5.5. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/testData.php b/include/testData.php index 49cfa69..7f05db2 100644 --- a/include/testData.php +++ b/include/testData.php @@ -103,7 +103,7 @@ class testData{ $this->shWorkarounds, $this->sTestedRating, $this->sComments, - "NOW()", + date("Y-m-d H:i:s"), $_SESSION['current']->iUserId, $this->sState, $this->sGpuMfr,

1 0

Rosanne DiMesio : Add fixInvalidTestSubmitTime to admin control center
by Jeremy Newman 28 Aug '17

28 Aug '17

Module: appdb Branch: master Commit: 7021b123e6c8723fe45fd18e4b1fea0ce9eb2e0b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7021b123e6c8723fe45fd18e… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Aug 28 08:12:41 2017 -0500 Add fixInvalidTestSubmitTime to admin control center Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- admin.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/admin.php b/admin.php index 5f89a4b..11e3aba 100644 --- a/admin.php +++ b/admin.php @@ -221,6 +221,14 @@ function fixNoteLinks() } +function fixInvalidTestSubmitTime() +{ + $sQuery = "UPDATE testResults SET submitTime = testedDate WHERE submitTime = '0000-00-00 00:00:00'"; + $hResult = query_parameters($sQuery); + + echo "Updated ".query_affected_rows()." test reports with invalid submit times.<br>"; +} + function deleteOrphanComments() { $sQuery = "DELETE FROM appComments WHERE NOT EXISTS( SELECT appVersion.versionId FROM appVersion"; @@ -312,6 +320,8 @@ function showChoices() echo '<div class="list-group">'; echo '<a href="admin.php?sAction=fixNoteLinks" class="list-group-item"><h4>Fix/Show note links</h4></a>'; + + echo '<a href="admin.php?sAction=fixInvalidTestSubmitTime" class="list-group-item"><h4>Fix Invalid Test Submission Times</h4></a>'; echo '<a href="admin.php?sAction=updateAppMaintainerStates" class="list-group-item"><h4>Update application maintainer states</h4></a>'; @@ -354,6 +364,10 @@ switch(getInput('sAction', $aClean)) case 'fixNoteLinks': fixNoteLinks(); break; + + case 'fixInvalidTestSubmitTime'; + fixInvalidTestSubmitTime(); + break; case 'deleteOrphanComments': deleteOrphanComments();

1 0

Hans Leidekker : webservices: Create a new HTTP request for each message.
by Alexandre Julliard 25 Aug '17

25 Aug '17

Module: wine Branch: master Commit: c94ccee16af71d8cfcfa157fc804e4998eb5a71a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94ccee16af71d8cfcfa157fc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 25 11:51:40 2017 +0200 webservices: Create a new HTTP request for each message. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 49 +++++++++++++++++++++++++--------------------- dlls/webservices/msg.c | 14 ++++++++----- 2 files changed, 36 insertions(+), 27 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 09cfd80..3451bea 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -113,6 +113,8 @@ struct channel HINTERNET session; HINTERNET connect; HINTERNET request; + WCHAR *path; + DWORD flags; } http; struct { @@ -169,6 +171,9 @@ static void reset_channel( struct channel *channel ) channel->u.http.connect = NULL; WinHttpCloseHandle( channel->u.http.session ); channel->u.http.session = NULL; + heap_free( channel->u.http.path ); + channel->u.http.path = NULL; + channel->u.http.flags = 0; break; case WS_TCP_CHANNEL_BINDING: @@ -587,34 +592,29 @@ static HRESULT connect_channel_http( struct channel *channel ) { static const WCHAR agentW[] = {'M','S','-','W','e','b','S','e','r','v','i','c','e','s','/','1','.','0',0}; - static const WCHAR postW[] = - {'P','O','S','T',0}; - HINTERNET ses = NULL, con = NULL, req = NULL; - WCHAR *path; + HINTERNET ses = NULL, con = NULL; URL_COMPONENTS uc; - DWORD flags = 0; HRESULT hr; - if (channel->u.http.request) return S_OK; + if (channel->u.http.connect) return S_OK; if ((hr = parse_http_url( channel->addr.url.chars, channel->addr.url.length, &uc )) != S_OK) return hr; - if (!uc.dwExtraInfoLength) path = uc.lpszUrlPath; - else if (!(path = heap_alloc( (uc.dwUrlPathLength + uc.dwExtraInfoLength + 1) * sizeof(WCHAR) ))) + if (!(channel->u.http.path = heap_alloc( (uc.dwUrlPathLength + uc.dwExtraInfoLength + 1) * sizeof(WCHAR) ))) { hr = E_OUTOFMEMORY; goto done; } else { - strcpyW( path, uc.lpszUrlPath ); - strcatW( path, uc.lpszExtraInfo ); + strcpyW( channel->u.http.path, uc.lpszUrlPath ); + if (uc.dwExtraInfoLength) strcatW( channel->u.http.path, uc.lpszExtraInfo ); } switch (uc.nScheme) { case INTERNET_SCHEME_HTTP: break; case INTERNET_SCHEME_HTTPS: - flags |= WINHTTP_FLAG_SECURE; + channel->u.http.flags |= WINHTTP_FLAG_SECURE; break; default: @@ -632,29 +632,19 @@ static HRESULT connect_channel_http( struct channel *channel ) hr = HRESULT_FROM_WIN32( GetLastError() ); goto done; } - if (!(req = WinHttpOpenRequest( con, postW, path, NULL, NULL, NULL, flags ))) - { - hr = HRESULT_FROM_WIN32( GetLastError() ); - goto done; - } - - if ((hr = message_insert_http_headers( channel->msg, req )) != S_OK) goto done; channel->u.http.session = ses; channel->u.http.connect = con; - channel->u.http.request = req; done: if (hr != S_OK) { - WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); } heap_free( uc.lpszHostName ); heap_free( uc.lpszUrlPath ); heap_free( uc.lpszExtraInfo ); - if (path != uc.lpszUrlPath) heap_free( path ); return hr; } @@ -762,7 +752,7 @@ static HRESULT write_message( WS_MESSAGE *handle, WS_XML_WRITER *writer, const W return WsWriteEnvelopeEnd( handle, NULL ); } -static HRESULT send_message_http( HANDLE request, BYTE *data, ULONG len ) +static HRESULT send_message_http( HINTERNET request, BYTE *data, ULONG len ) { if (!WinHttpSendRequest( request, NULL, 0, data, len, len, 0 )) return HRESULT_FROM_WIN32( GetLastError() ); @@ -984,6 +974,14 @@ static HRESULT send_sized_envelope( struct channel *channel, BYTE *data, ULONG l return send_bytes( channel->u.tcp.socket, data, len ); } +static HRESULT open_http_request( struct channel *channel, HINTERNET *req ) +{ + static const WCHAR postW[] = {'P','O','S','T',0}; + if ((*req = WinHttpOpenRequest( channel->u.http.connect, postW, channel->u.http.path, + NULL, NULL, NULL, channel->u.http.flags ))) return S_OK; + return HRESULT_FROM_WIN32( GetLastError() ); +} + static HRESULT send_message( struct channel *channel, WS_MESSAGE *msg ) { WS_XML_WRITER *writer; @@ -999,6 +997,13 @@ static HRESULT send_message( struct channel *channel, WS_MESSAGE *msg ) switch (channel->binding) { case WS_HTTP_CHANNEL_BINDING: + if (channel->u.http.request) + { + WinHttpCloseHandle( channel->u.http.request ); + channel->u.http.request = NULL; + } + if ((hr = open_http_request( channel, &channel->u.http.request )) != S_OK) return hr; + if ((hr = message_insert_http_headers( msg, channel->u.http.request )) != S_OK) return hr; return send_message_http( channel->u.http.request, buf.bytes, buf.length ); case WS_TCP_CHANNEL_BINDING: diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 02cb22b..d6f0144 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -1610,9 +1610,13 @@ HRESULT WINAPI WsRemoveCustomHeader( WS_MESSAGE *handle, const WS_XML_STRING *na static WCHAR *build_http_header( const WCHAR *name, const WCHAR *value, ULONG *ret_len ) { - static const WCHAR fmtW[] = {'%','s',':',' ','%','s',0}; - WCHAR *ret = heap_alloc( (strlenW(name) + strlenW(value) + 3) * sizeof(WCHAR) ); - if (ret) *ret_len = sprintfW( ret, fmtW, name, value ); + int len_name = strlenW( name ), len_value = strlenW( value ); + WCHAR *ret = heap_alloc( (len_name + len_value) * sizeof(WCHAR) ); + + if (!ret) return NULL; + memcpy( ret, name, len_name * sizeof(WCHAR) ); + memcpy( ret + len_name, value, len_value * sizeof(WCHAR) ); + *ret_len = len_name + len_value; return ret; } @@ -1625,7 +1629,7 @@ static inline HRESULT insert_http_header( HINTERNET req, const WCHAR *header, UL HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) { static const WCHAR contenttypeW[] = - {'C','o','n','t','e','n','t','-','T','y','p','e',0}; + {'C','o','n','t','e','n','t','-','T','y','p','e',':',' ',0}; static const WCHAR soapxmlW[] = {'a','p','p','l','i','c','a','t','i','o','n','/','s','o','a','p','+','x','m','l',0}; static const WCHAR textxmlW[] = @@ -1675,7 +1679,7 @@ HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) { case WS_ENVELOPE_VERSION_SOAP_1_1: { - static const WCHAR soapactionW[] = {'S','O','A','P','A','c','t','i','o','n',0}; + static const WCHAR soapactionW[] = {'S','O','A','P','A','c','t','i','o','n',':',' ',0}; if (!(len = msg->action.length)) break;

1 0

Hans Leidekker : webservices: Set cache control headers.
by Alexandre Julliard 25 Aug '17

25 Aug '17

Module: wine Branch: master Commit: c51b41f905ab750d6eadca1f7dc73ec3238fccce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51b41f905ab750d6eadca1f7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 25 11:51:41 2017 +0200 webservices: Set cache control headers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 3451bea..5db6f1d 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -610,6 +610,7 @@ static HRESULT connect_channel_http( struct channel *channel ) if (uc.dwExtraInfoLength) strcatW( channel->u.http.path, uc.lpszExtraInfo ); } + channel->u.http.flags = WINHTTP_FLAG_REFRESH; switch (uc.nScheme) { case INTERNET_SCHEME_HTTP: break;

1 0

Andrew Eikum : gdiplus: Don' t call PlayEnhMetaFileRecord for records handled by gdiplus.
by Alexandre Julliard 25 Aug '17

25 Aug '17

Module: wine Branch: master Commit: 7860d11e6cd93d8a1c463be79f783385dcda45eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7860d11e6cd93d8a1c463be79… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 25 08:10:38 2017 -0500 gdiplus: Don't call PlayEnhMetaFileRecord for records handled by gdiplus. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 0bd3033..6260cb3 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1423,8 +1423,6 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, /* regular EMF record */ if (metafile->playback_dc) { - ENHMETARECORD *record; - switch (recordType) { case EMR_SETMAPMODE: @@ -1469,24 +1467,27 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, return Ok; } default: - break; - } + { + ENHMETARECORD *record = heap_alloc_zero(dataSize + 8); - record = heap_alloc_zero(dataSize + 8); + if (record) + { + record->iType = recordType; + record->nSize = dataSize + 8; + memcpy(record->dParm, data, dataSize); - if (record) - { - record->iType = recordType; - record->nSize = dataSize + 8; - memcpy(record->dParm, data, dataSize); + if(PlayEnhMetaFileRecord(metafile->playback_dc, metafile->handle_table, + record, metafile->handle_count) == 0) + ERR("PlayEnhMetaFileRecord failed\n"); - PlayEnhMetaFileRecord(metafile->playback_dc, metafile->handle_table, - record, metafile->handle_count); + heap_free(record); + } + else + return OutOfMemory; - heap_free(record); + break; + } } - else - return OutOfMemory; } } else

1 0

Andrew Eikum : gdi32: Update metafile world transform immediately in winnt mode.
by Alexandre Julliard 25 Aug '17

25 Aug '17

Module: wine Branch: master Commit: 083e61fddf90ade32a119d5b6bf84d27adefc589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=083e61fddf90ade32a119d5b6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 25 08:10:44 2017 -0500 gdi32: Update metafile world transform immediately in winnt mode. The Chrome browser print function implements their own handling for EMR_MODIFYWORLDTRANSFORM which calls ModifyWorldTransform on the HDC directly without ever calling PlayEnhMetaFileRecord. In Wine, this transformation would get discarded when the callback function returned, causing the page to be printed at the wrong scale. Tests show that the transform is updated immediately during PlayEnhMetaFileRecord. In addition, a modified transform persists between callbacks until PlayEnhMetaFileRecord is called on a relevant type of callback, at which point the transform is reverted before playing back the record. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 41 ++++++- dlls/gdi32/tests/metafile.c | 253 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 289 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=083e61fddf90ade32a119…

1 0

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

25 Aug '17

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

Nikolay Sivov : dwrite: Remove unused call.
by Alexandre Julliard 25 Aug '17

25 Aug '17

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

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

25 Aug '17

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

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

25 Aug '17

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