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

Nikolay Sivov : uxtheme: Fix buffer dc origin and clipping.
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: 849c4716c14507ab447f0ac5725b9636ee1a3094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=849c4716c14507ab447f0ac57… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 25 08:54:07 2017 +0300 uxtheme: Fix buffer dc origin and clipping. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/buffer.c | 4 +++- dlls/uxtheme/tests/system.c | 55 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index bbf4c9d..664515c 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -137,6 +137,8 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC targetdc, const RECT *rect, return NULL; } + SetWindowOrgEx(buffer->memorydc, rect->left, rect->top, NULL); + IntersectClipRect(buffer->memorydc, rect->left, rect->top, rect->right, rect->bottom); DeleteObject(SelectObject(buffer->memorydc, buffer->bitmap)); *retdc = buffer->memorydc; @@ -160,7 +162,7 @@ HRESULT WINAPI EndBufferedPaint(HPAINTBUFFER bufferhandle, BOOL update) { if (!BitBlt(buffer->targetdc, buffer->rect.left, buffer->rect.top, buffer->rect.right - buffer->rect.left, buffer->rect.bottom - buffer->rect.top, - buffer->memorydc, 0, 0, SRCCOPY)) + buffer->memorydc, buffer->rect.left, buffer->rect.top, SRCCOPY)) { WARN("BitBlt() failed\n"); } diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 2348a1d..1842be4 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -523,14 +523,42 @@ static void test_CloseThemeData(void) ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); } +static void test_buffer_dc_props(HDC hdc, const RECT *rect) +{ + static const XFORM ident = { 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f }; + XFORM xform; + POINT org; + RECT box; + BOOL ret; + + ret = GetWorldTransform(hdc, &xform); + ok(ret, "Failed to get world transform\n"); + ok(!memcmp(&xform, &ident, sizeof(xform)), "Unexpected world transform\n"); + + ret = GetViewportOrgEx(hdc, &org); + ok(ret, "Failed to get vport origin\n"); + ok(org.x == 0 && org.y == 0, "Unexpected vport origin\n"); + + ret = GetWindowOrgEx(hdc, &org); + ok(ret, "Failed to get vport origin\n"); + ok(org.x == rect->left && org.y == rect->top, "Unexpected window origin\n"); + + ret = GetClipBox(hdc, &box); + ok(ret, "Failed to get clip box\n"); + ok(box.left == rect->left && box.top == rect->top, "Unexpected clip box\n"); + + ok(GetGraphicsMode(hdc) == GM_COMPATIBLE, "wrong graphics mode\n"); +} + static void test_buffered_paint(void) { + HDC target, src, hdc, screen_dc; BP_PAINTPARAMS params = { 0 }; BP_BUFFERFORMAT format; - HDC target, src, hdc; HPAINTBUFFER buffer; RECT rect, rect2; RGBQUAD *bits; + HBITMAP hbm; HRESULT hr; int row; @@ -670,6 +698,31 @@ todo_wine hr = pGetBufferedPaintBits(NULL, NULL, &row); ok(hr == E_POINTER, "Unexpected return code %#x\n", hr); + screen_dc = GetDC(0); + + hdc = CreateCompatibleDC(screen_dc); + ok(hdc != NULL, "Failed to create a DC\n"); + hbm = CreateCompatibleBitmap(screen_dc, 64, 64); + ok(hbm != NULL, "Failed to create a bitmap\n"); + SelectObject(hdc, hbm); + + ReleaseDC(0, screen_dc); + + SetRect(&rect, 1, 2, 34, 56); + + buffer = pBeginBufferedPaint(hdc, &rect, BPBF_COMPATIBLEBITMAP, NULL, &src); + test_buffer_dc_props(src, &rect); + hr = pEndBufferedPaint(buffer, FALSE); + ok(hr == S_OK, "Unexpected return code %#x\n", hr); + + DeleteObject(hbm); + DeleteDC(hdc); + + buffer = pBeginBufferedPaint(target, &rect, BPBF_COMPATIBLEBITMAP, NULL, &src); + test_buffer_dc_props(src, &rect); + hr = pEndBufferedPaint(buffer, FALSE); + ok(hr == S_OK, "Unexpected return code %#x\n", hr); + /* access buffer bits */ for (format = BPBF_COMPATIBLEBITMAP; format <= BPBF_TOPDOWNMONODIB; format++) {

1 0

Nikolay Sivov : dwrite: Update overhangs rectangle on alignment changes.
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: ace830625d09dbb384cff19ff9723265357990a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ace830625d09dbb384cff19ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 25 08:54:43 2017 +0300 dwrite: Update overhangs rectangle on alignment changes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 51 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index c988c75..ab68ecf 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -188,6 +188,7 @@ struct layout_effective_run { UINT16 *clustermap; /* effective clustermap, allocated separately, is not reused from nominal map */ UINT32 line; /* 0-based line index in line metrics array */ BOOL underlined; /* set if this run is underlined */ + D2D1_RECT_F bbox; /* ink run box, top == bottom means it wasn't estimated yet */ }; struct layout_effective_inline { @@ -1249,6 +1250,7 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const run->start = start = layout->clusters[first_cluster].position; run->length = length; run->width = get_cluster_range_width(layout, first_cluster, first_cluster + cluster_count); + memset(&run->bbox, 0, sizeof(run->bbox)); /* Check if run direction matches paragraph direction, if it doesn't adjust by run width */ @@ -3581,25 +3583,28 @@ static void layout_get_erun_bbox(struct dwrite_textlayout *layout, struct layout D2D1_POINT_2F origin = { 0 }; UINT32 i; - IDWriteFontFace_GetMetrics(glyph_run->fontFace, &font_metrics); + if (run->bbox.top == run->bbox.bottom) { + IDWriteFontFace_GetMetrics(glyph_run->fontFace, &font_metrics); - origin.x = run->origin.x + run->align_dx; - origin.y = run->origin.y; - for (i = 0; i < run->glyphcount; i++) { - D2D1_RECT_F glyph_bbox; - RECT design_bbox; + for (i = 0; i < run->glyphcount; i++) { + D2D1_RECT_F glyph_bbox; + RECT design_bbox; - freetype_get_design_glyph_bbox((IDWriteFontFace4 *)glyph_run->fontFace, font_metrics.designUnitsPerEm, - glyph_run->glyphIndices[i + start_glyph], &design_bbox); + freetype_get_design_glyph_bbox((IDWriteFontFace4 *)glyph_run->fontFace, font_metrics.designUnitsPerEm, + glyph_run->glyphIndices[i + start_glyph], &design_bbox); - scale_glyph_bbox(&design_bbox, glyph_run->fontEmSize, font_metrics.designUnitsPerEm, &glyph_bbox); - d2d_rect_offset(&glyph_bbox, origin.x + glyph_run->glyphOffsets[i + start_glyph].advanceOffset, - origin.y + glyph_run->glyphOffsets[i + start_glyph].ascenderOffset); - d2d_rect_union(bbox, &glyph_bbox); + scale_glyph_bbox(&design_bbox, glyph_run->fontEmSize, font_metrics.designUnitsPerEm, &glyph_bbox); + d2d_rect_offset(&glyph_bbox, origin.x + glyph_run->glyphOffsets[i + start_glyph].advanceOffset, + origin.y + glyph_run->glyphOffsets[i + start_glyph].ascenderOffset); + d2d_rect_union(&run->bbox, &glyph_bbox); - /* FIXME: take care of vertical/rtl */ - origin.x += glyph_run->glyphAdvances[i + start_glyph]; + /* FIXME: take care of vertical/rtl */ + origin.x += glyph_run->glyphAdvances[i + start_glyph]; + } } + + *bbox = run->bbox; + d2d_rect_offset(bbox, run->origin.x + run->align_dx, run->origin.y); } static HRESULT WINAPI dwritetextlayout_GetOverhangMetrics(IDWriteTextLayout3 *iface, @@ -4091,9 +4096,12 @@ static HRESULT WINAPI dwritetextformat_layout_SetTextAlignment(IDWriteTextFormat if (FAILED(hr)) return hr; - /* if layout is not ready there's nothing to align */ - if (changed && !(This->recompute & RECOMPUTE_LINES)) - layout_apply_text_alignment(This); + if (changed) { + /* if layout is not ready there's nothing to align */ + if (!(This->recompute & RECOMPUTE_LINES)) + layout_apply_text_alignment(This); + This->recompute |= RECOMPUTE_OVERHANGS; + } return S_OK; } @@ -4110,9 +4118,12 @@ static HRESULT WINAPI dwritetextformat_layout_SetParagraphAlignment(IDWriteTextF if (FAILED(hr)) return hr; - /* if layout is not ready there's nothing to align */ - if (changed && !(This->recompute & RECOMPUTE_LINES)) - layout_apply_par_alignment(This); + if (changed) { + /* if layout is not ready there's nothing to align */ + if (!(This->recompute & RECOMPUTE_LINES)) + layout_apply_par_alignment(This); + This->recompute |= RECOMPUTE_OVERHANGS; + } return S_OK; }

1 0

Nikolay Sivov : dwrite: Extract supported image formats from 'sbix' table.
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: 7cb57e2ee852531110130e90c97280307f0584db URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb57e2ee852531110130e90c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 25 08:54:42 2017 +0300 dwrite: Extract supported image formats from 'sbix' table. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 199 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 99531a6..1651729 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -38,6 +38,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_CFF__TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F',' ') #define MS_COLR_TAG DWRITE_MAKE_OPENTYPE_TAG('C','O','L','R') #define MS_SVG__TAG DWRITE_MAKE_OPENTYPE_TAG('S','V','G',' ') +#define MS_SBIX_TAG DWRITE_MAKE_OPENTYPE_TAG('s','b','i','x') +#define MS_MAXP_TAG DWRITE_MAKE_OPENTYPE_TAG('m','a','x','p') + +/* 'sbix' formats */ +#define MS_PNG__TAG DWRITE_MAKE_OPENTYPE_TAG('p','n','g',' ') +#define MS_JPG__TAG DWRITE_MAKE_OPENTYPE_TAG('j','p','g',' ') +#define MS_TIFF_TAG DWRITE_MAKE_OPENTYPE_TAG('t','i','f','f') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -226,6 +233,31 @@ typedef struct { USHORT numberOfHMetrics; } TT_HHEA; +typedef struct { + WORD version; + WORD flags; + DWORD numStrikes; + DWORD strikeOffset[1]; +} sbix_header; + +typedef struct { + WORD ppem; + WORD ppi; + DWORD glyphDataOffsets[1]; +} sbix_strike; + +typedef struct { + WORD originOffsetX; + WORD originOffsetY; + DWORD graphicType; + BYTE data[1]; +} sbix_glyph_data; + +typedef struct { + DWORD version; + WORD numGlyphs; +} maxp; + #include "poppack.h" enum OS2_FSSELECTION { @@ -2057,6 +2089,71 @@ static BOOL opentype_has_font_table(IDWriteFontFace4 *fontface, UINT32 tag) return exists; } +static DWORD opentype_get_sbix_formats(IDWriteFontFace4 *fontface) +{ + UINT32 size, s, num_strikes; + const sbix_header *header; + UINT16 g, num_glyphs; + BOOL exists = FALSE; + const maxp *maxp; + const void *data; + DWORD ret = 0; + void *context; + HRESULT hr; + + hr = IDWriteFontFace4_TryGetFontTable(fontface, MS_MAXP_TAG, &data, &size, &context, &exists); + if (FAILED(hr) || !exists) + return 0; + + maxp = data; + num_glyphs = GET_BE_WORD(maxp->numGlyphs); + + IDWriteFontFace4_ReleaseFontTable(fontface, context); + + if (FAILED(IDWriteFontFace4_TryGetFontTable(fontface, MS_SBIX_TAG, &data, &size, &context, &exists))) { + WARN("Failed to get 'sbix' table, %#x\n", hr); + return 0; + } + + header = data; + num_strikes = GET_BE_DWORD(header->numStrikes); + + for (s = 0; s < num_strikes; s++) { + sbix_strike *strike = (sbix_strike *)((BYTE *)header + GET_BE_DWORD(header->strikeOffset[s])); + + for (g = 0; g < num_glyphs; g++) { + DWORD offset = GET_BE_DWORD(strike->glyphDataOffsets[g]); + DWORD offset_next = GET_BE_DWORD(strike->glyphDataOffsets[g + 1]); + sbix_glyph_data *glyph_data; + DWORD format; + + if (offset == offset_next) + continue; + + glyph_data = (sbix_glyph_data *)((BYTE *)strike + offset); + switch (format = glyph_data->graphicType) + { + case MS_PNG__TAG: + ret |= DWRITE_GLYPH_IMAGE_FORMATS_PNG; + break; + case MS_JPG__TAG: + ret |= DWRITE_GLYPH_IMAGE_FORMATS_JPEG; + break; + case MS_TIFF_TAG: + ret |= DWRITE_GLYPH_IMAGE_FORMATS_TIFF; + break; + default: + format = GET_BE_DWORD(format); + FIXME("unexpected bitmap format %s\n", debugstr_an((char *)&format, 4)); + } + } + } + + IDWriteFontFace4_ReleaseFontTable(fontface, context); + + return ret; +} + UINT32 opentype_get_glyph_image_formats(IDWriteFontFace4 *fontface) { UINT32 ret = DWRITE_GLYPH_IMAGE_FORMATS_NONE; @@ -2073,6 +2170,9 @@ UINT32 opentype_get_glyph_image_formats(IDWriteFontFace4 *fontface) if (opentype_has_font_table(fontface, MS_SVG__TAG)) ret |= DWRITE_GLYPH_IMAGE_FORMATS_SVG; + if (opentype_has_font_table(fontface, MS_SBIX_TAG)) + ret |= opentype_get_sbix_formats(fontface); + /* TODO: handle embedded bitmaps tables */ return ret; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9fd8258..980278e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -46,6 +46,13 @@ #define MS_CFF__TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F',' ') #define MS_COLR_TAG DWRITE_MAKE_OPENTYPE_TAG('C','O','L','R') #define MS_SVG__TAG DWRITE_MAKE_OPENTYPE_TAG('S','V','G',' ') +#define MS_SBIX_TAG DWRITE_MAKE_OPENTYPE_TAG('s','b','i','x') +#define MS_MAXP_TAG DWRITE_MAKE_OPENTYPE_TAG('m','a','x','p') + +/* 'sbix' formats */ +#define MS_PNG__TAG DWRITE_MAKE_OPENTYPE_TAG('p','n','g',' ') +#define MS_JPG__TAG DWRITE_MAKE_OPENTYPE_TAG('j','p','g',' ') +#define MS_TIFF_TAG DWRITE_MAKE_OPENTYPE_TAG('t','i','f','f') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -302,6 +309,31 @@ typedef struct { DWORD ExtensionOffset; } GSUB_ExtensionPosFormat1; +typedef struct { + WORD version; + WORD flags; + DWORD numStrikes; + DWORD strikeOffset[1]; +} sbix_header; + +typedef struct { + WORD ppem; + WORD ppi; + DWORD glyphDataOffsets[1]; +} sbix_strike; + +typedef struct { + WORD originOffsetX; + WORD originOffsetY; + DWORD graphicType; + BYTE data[1]; +} sbix_glyph_data; + +typedef struct { + DWORD version; + WORD numGlyphs; +} maxp; + #include "poppack.h" static IDWriteFactory *create_factory(void) @@ -7424,6 +7456,70 @@ static BOOL face_has_table(IDWriteFontFace4 *fontface, UINT32 tag) return exists; } +static DWORD get_sbix_formats(IDWriteFontFace4 *fontface) +{ + UINT32 size, s, num_strikes; + const sbix_header *header; + UINT16 g, num_glyphs; + BOOL exists = FALSE; + const maxp *maxp; + const void *data; + DWORD ret = 0; + void *context; + HRESULT hr; + + hr = IDWriteFontFace4_TryGetFontTable(fontface, MS_MAXP_TAG, &data, &size, &context, &exists); + ok(hr == S_OK, "TryGetFontTable() failed, %#x\n", hr); + ok(exists, "Expected maxp table\n"); + + if (!exists) + return 0; + + maxp = data; + num_glyphs = GET_BE_WORD(maxp->numGlyphs); + + hr = IDWriteFontFace4_TryGetFontTable(fontface, MS_SBIX_TAG, &data, &size, &context, &exists); + ok(hr == S_OK, "TryGetFontTable() failed, %#x\n", hr); + ok(exists, "Expected sbix table\n"); + + header = data; + num_strikes = GET_BE_DWORD(header->numStrikes); + + for (s = 0; s < num_strikes; s++) { + sbix_strike *strike = (sbix_strike *)((BYTE *)header + GET_BE_DWORD(header->strikeOffset[s])); + + for (g = 0; g < num_glyphs; g++) { + DWORD offset = GET_BE_DWORD(strike->glyphDataOffsets[g]); + DWORD offset_next = GET_BE_DWORD(strike->glyphDataOffsets[g + 1]); + sbix_glyph_data *glyph_data; + DWORD format; + + if (offset == offset_next) + continue; + + glyph_data = (sbix_glyph_data *)((BYTE *)strike + offset); + switch (format = glyph_data->graphicType) + { + case MS_PNG__TAG: + ret |= DWRITE_GLYPH_IMAGE_FORMATS_PNG; + break; + case MS_JPG__TAG: + ret |= DWRITE_GLYPH_IMAGE_FORMATS_JPEG; + break; + case MS_TIFF_TAG: + ret |= DWRITE_GLYPH_IMAGE_FORMATS_TIFF; + break; + default: + ok(0, "unexpected format, %#x\n", GET_BE_DWORD(format)); + } + } + } + + IDWriteFontFace4_ReleaseFontTable(fontface, context); + + return ret; +} + static DWORD get_face_glyph_image_formats(IDWriteFontFace4 *fontface) { DWORD ret = DWRITE_GLYPH_IMAGE_FORMATS_NONE; @@ -7440,6 +7536,9 @@ static DWORD get_face_glyph_image_formats(IDWriteFontFace4 *fontface) if (face_has_table(fontface, MS_SVG__TAG)) ret |= DWRITE_GLYPH_IMAGE_FORMATS_SVG; + if (face_has_table(fontface, MS_SBIX_TAG)) + ret |= get_sbix_formats(fontface); + /* TODO: handle embedded bitmaps tables */ return ret; }

1 0

Henri Verbeet : wined3d: Make blits asynchronous by default.
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: 5ff2fdc452c4b5560ab363e2c51f3ac6dba3c703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ff2fdc452c4b5560ab363e2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 24 23:31:31 2017 +0200 wined3d: Make blits asynchronous by default. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 11 ++++++++--- dlls/wined3d/surface.c | 20 +++----------------- include/wine/wined3d.h | 4 ++-- 3 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 90731f0..a780f1a 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1408,6 +1408,7 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT * { struct wined3d_device *wined3d_device = dst_surface->ddraw->wined3d_device; struct wined3d_color colour; + DWORD wined3d_flags; if (flags & DDBLT_COLORFILL) { @@ -1431,14 +1432,18 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT * dst_rect, WINED3DCLEAR_ZBUFFER, NULL, colour.r, 0); } - if (flags & ~WINED3D_BLT_MASK) + wined3d_flags = flags & ~DDBLT_ASYNC; + if (wined3d_flags & ~WINED3D_BLT_MASK) { FIXME("Unhandled flags %#x.\n", flags); return E_NOTIMPL; } + if (!(flags & DDBLT_ASYNC)) + wined3d_flags |= WINED3D_BLT_SYNCHRONOUS; + return wined3d_texture_blt(dst_surface->wined3d_texture, dst_surface->sub_resource_idx, dst_rect, - src_surface->wined3d_texture, src_surface->sub_resource_idx, src_rect, flags, fx, filter); + src_surface->wined3d_texture, src_surface->sub_resource_idx, src_rect, wined3d_flags, fx, filter); } static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, const RECT *dst_rect_in, @@ -4231,10 +4236,10 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltFast(IDirectDrawSurfac { struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface7(iface); struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface7(src_surface); + DWORD flags = WINED3D_BLT_SYNCHRONOUS; DWORD src_w, src_h, dst_w, dst_h; HRESULT hr = DD_OK; RECT dst_rect, s; - DWORD flags = 0; TRACE("iface %p, dst_x %u, dst_y %u, src_surface %p, src_rect %s, flags %#x.\n", iface, dst_x, dst_y, src_surface, wine_dbgstr_rect(src_rect), trans); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9760f72..a02b6f2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3564,11 +3564,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst BOOL scale, convert; DWORD dst_location; - static const DWORD simple_blit = WINED3D_BLT_ASYNC - | WINED3D_BLT_SRC_CKEY + static const DWORD simple_blit = WINED3D_BLT_SRC_CKEY | WINED3D_BLT_SRC_CKEY_OVERRIDE - | WINED3D_BLT_WAIT - | WINED3D_BLT_DO_NOT_WAIT | WINED3D_BLT_ALPHA_TEST; TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n", @@ -3590,18 +3587,6 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst if (!fx || !(fx->fx)) flags &= ~WINED3D_BLT_FX; - if (flags & WINED3D_BLT_WAIT) - flags &= ~WINED3D_BLT_WAIT; - - if (flags & WINED3D_BLT_ASYNC) - { - static unsigned int once; - - if (!once++) - FIXME("Can't handle WINED3D_BLT_ASYNC flag.\n"); - flags &= ~WINED3D_BLT_ASYNC; - } - /* WINED3D_BLT_DO_NOT_WAIT appeared in DX7. */ if (flags & WINED3D_BLT_DO_NOT_WAIT) { @@ -3609,9 +3594,10 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst if (!once++) FIXME("Can't handle WINED3D_BLT_DO_NOT_WAIT flag.\n"); - flags &= ~WINED3D_BLT_DO_NOT_WAIT; } + flags &= ~(WINED3D_BLT_SYNCHRONOUS | WINED3D_BLT_DO_NOT_WAIT | WINED3D_BLT_WAIT); + if (!device->d3d_initialized) { WARN("D3D not initialized, using fallback.\n"); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 05368bd..e1d7702 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1309,7 +1309,6 @@ enum wined3d_shader_byte_code_format /* add dwZBufferBaseDest to every source z value before compare */ #define WINEDDBLTFX_ZBUFFERBASEDEST 0x00000100 -#define WINED3D_BLT_ASYNC 0x00000200 #define WINED3D_BLT_FX 0x00000800 #define WINED3D_BLT_DST_CKEY 0x00002000 #define WINED3D_BLT_DST_CKEY_OVERRIDE 0x00004000 @@ -1317,8 +1316,9 @@ enum wined3d_shader_byte_code_format #define WINED3D_BLT_SRC_CKEY_OVERRIDE 0x00010000 #define WINED3D_BLT_WAIT 0x01000000 #define WINED3D_BLT_DO_NOT_WAIT 0x08000000 +#define WINED3D_BLT_SYNCHRONOUS 0x40000000 #define WINED3D_BLT_ALPHA_TEST 0x80000000 -#define WINED3D_BLT_MASK 0x0901ea00 +#define WINED3D_BLT_MASK 0x0901e800 /* dwFlags for GetBltStatus */ #define WINEDDGBS_CANBLT 0x00000001

1 0

Henri Verbeet : ddraw: Ignore unsupported blit flags.
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: 6b41501344ecedf12692902f08aada283847e8cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b41501344ecedf12692902f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 24 23:31:30 2017 +0200 ddraw: Ignore unsupported blit flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 24 +++++++++++++++++++++--- dlls/ddraw/tests/ddraw1.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6c4ed11..90731f0 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1570,6 +1570,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 * struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface7(iface); struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface7(src_surface); struct wined3d_blt_fx wined3d_fx; + DWORD unsupported_flags; DWORD fill_colour = 0; HRESULT hr = DD_OK; DDBLTFX rop_fx; @@ -1577,9 +1578,26 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 * TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx); - /* Check for validity of the flags here. WineD3D Has the software-opengl selection path and would have - * to check at 2 places, and sometimes do double checks. This also saves the call to wined3d :-) - */ + unsupported_flags = DDBLT_ALPHADEST + | DDBLT_ALPHADESTCONSTOVERRIDE + | DDBLT_ALPHADESTNEG + | DDBLT_ALPHADESTSURFACEOVERRIDE + | DDBLT_ALPHAEDGEBLEND + | DDBLT_ALPHASRC + | DDBLT_ALPHASRCCONSTOVERRIDE + | DDBLT_ALPHASRCNEG + | DDBLT_ALPHASRCSURFACEOVERRIDE + | DDBLT_ZBUFFER + | DDBLT_ZBUFFERDESTCONSTOVERRIDE + | DDBLT_ZBUFFERDESTOVERRIDE + | DDBLT_ZBUFFERSRCCONSTOVERRIDE + | DDBLT_ZBUFFERSRCOVERRIDE; + if (flags & unsupported_flags) + { + WARN("Ignoring unsupported flags %#x.\n", flags & unsupported_flags); + flags &= ~unsupported_flags; + } + if ((flags & DDBLT_KEYSRCOVERRIDE) && (!fx || flags & DDBLT_KEYSRC)) { WARN("Invalid source color key parameters, returning DDERR_INVALIDPARAMS\n"); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 68f56ff..ac4942d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -8959,10 +8959,10 @@ static void test_blt_z_alpha(void) ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDirectDrawSurface_Blt(dst_surface, NULL, src_surface, NULL, blt_flags[i] | DDBLT_WAIT, &fx); - todo_wine ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); color = get_surface_color(dst_surface, 32, 32); - todo_wine ok(compare_color(color, 0x0000ff00, 0), "Test %u: Got unexpected color 0x%08x.\n", i, color); + ok(compare_color(color, 0x0000ff00, 0), "Test %u: Got unexpected color 0x%08x.\n", i, color); } IDirectDrawSurface_Release(dst_surface); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index df734f1..67a2b06 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -10047,10 +10047,10 @@ static void test_blt_z_alpha(void) ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDirectDrawSurface_Blt(dst_surface, NULL, src_surface, NULL, blt_flags[i] | DDBLT_WAIT, &fx); - todo_wine ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); color = get_surface_color(dst_surface, 32, 32); - todo_wine ok(compare_color(color, 0x0000ff00, 0), "Test %u: Got unexpected color 0x%08x.\n", i, color); + ok(compare_color(color, 0x0000ff00, 0), "Test %u: Got unexpected color 0x%08x.\n", i, color); } IDirectDrawSurface_Release(dst_surface); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 8072bc9..948a1a5 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -11159,10 +11159,10 @@ static void test_blt_z_alpha(void) ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDirectDrawSurface4_Blt(dst_surface, NULL, src_surface, NULL, blt_flags[i] | DDBLT_WAIT, &fx); - todo_wine ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); color = get_surface_color(dst_surface, 32, 32); - todo_wine ok(compare_color(color, 0x0000ff00, 0), "Test %u: Got unexpected color 0x%08x.\n", i, color); + ok(compare_color(color, 0x0000ff00, 0), "Test %u: Got unexpected color 0x%08x.\n", i, color); } IDirectDrawSurface4_Release(dst_surface); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 601fcb3..79ce80f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -11485,10 +11485,10 @@ static void test_blt_z_alpha(void) ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDirectDrawSurface7_Blt(dst_surface, NULL, src_surface, NULL, blt_flags[i] | DDBLT_WAIT, &fx); - todo_wine ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); color = get_surface_color(dst_surface, 32, 32); - todo_wine ok(compare_color(color, 0x0000ff00, 0), "Test %u: Got unexpected color 0x%08x.\n", i, color); + ok(compare_color(color, 0x0000ff00, 0), "Test %u: Got unexpected color 0x%08x.\n", i, color); } IDirectDrawSurface7_Release(dst_surface);

1 0

Henri Verbeet : ddraw/tests: Add a test for the alpha and z-buffer blit flags.
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: 45b01908da378f16a2612a012c52205daca0bbb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b01908da378f16a2612a012… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 24 23:31:29 2017 +0200 ddraw/tests: Add a test for the alpha and z-buffer blit flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 400 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45b01908da378f16a2612…

1 0

Ken Thomases : gdiplus: Avoid infinite recursion in flatten_bezier().
by Alexandre Julliard April 25, 2017

April 25, 2017

Module: wine Branch: master Commit: a3f0a5913299d675426e039b5f1d794993144fbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f0a5913299d675426e039b5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 24 13:16:08 2017 -0500 gdiplus: Avoid infinite recursion in flatten_bezier(). If either of the recursive calls would have the same x2, y2, x3, and y3 arguments as the current call, the path is as flat as the precision of floats allows. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 5a3356a..4d70796 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -142,6 +142,10 @@ static BOOL flatten_bezier(path_list_node_t *start, REAL x2, REAL y2, REAL x3, R mp[2].X = (mp[1].X + mp[3].X) / 2.0; mp[2].Y = (mp[1].Y + mp[3].Y) / 2.0; + if ((x2 == mp[0].X && y2 == mp[0].Y && x3 == mp[1].X && y3 == mp[1].Y) || + (x2 == mp[3].X && y2 == mp[3].Y && x3 == mp[4].X && y3 == mp[4].Y)) + return TRUE; + pt = end->pt; pt_st = start->pt; /* check flatness as a half of distance between middle point and a linearized path */

1 0

Ken Thomases : winemac: Use the -close method rather than -orderOut: for full-screen windows.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: ff3766c7594128f981daf441990302e54f4a26db URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3766c7594128f981daf4419… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 24 13:07:14 2017 -0500 winemac: Use the -close method rather than -orderOut: for full-screen windows. Simply ordering them out leaves the user on the full-screen space, which is now an empty black screen. Closing the window closes the space, too. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 7fa432a..9ca40f9 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1673,7 +1673,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [parent grabDockIconSnapshotFromWindow:self force:NO]; [self becameIneligibleParentOrChild]; - if ([self isMiniaturized]) + if ([self isMiniaturized] || [self styleMask] & NSFullScreenWindowMask) { fakingClose = TRUE; [self close];

1 0

Ken Thomases : winemac: Defer ordering a window out if it' s in the process of entering or exiting Cocoa full-screen mode.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: 5ebb83ad4eba70e034ef8ee03fdddbe72b10a648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ebb83ad4eba70e034ef8ee03… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 24 13:07:13 2017 -0500 winemac: Defer ordering a window out if it's in the process of entering or exiting Cocoa full-screen mode. Cocoa doesn't handle the window being ordered out or closed during the animation well and leaves a ghost window around. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index b4cc018..f9c3902 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -33,6 +33,7 @@ BOOL maximized; BOOL fullscreen; BOOL pendingMinimize; + BOOL pendingOrderOut; BOOL savedVisibleState; BOOL drawnSinceShown; WineWindow* latentParentWindow; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 0823aee..7fa432a 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1614,6 +1614,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self checkWineDisplayLink]; needAdjustWindowLevels = TRUE; } + pendingOrderOut = FALSE; if ([self becameEligibleParentOrChild]) needAdjustWindowLevels = TRUE; @@ -1649,6 +1650,21 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi BOOL wasVisible = [self isVisible]; BOOL wasOnActiveSpace = [self isOnActiveSpace]; + if (enteringFullScreen || exitingFullScreen) + { + pendingOrderOut = TRUE; + [queue discardEventsMatchingMask:event_mask_for_type(WINDOW_BROUGHT_FORWARD) | + event_mask_for_type(WINDOW_GOT_FOCUS) | + event_mask_for_type(WINDOW_LOST_FOCUS) | + event_mask_for_type(WINDOW_MAXIMIZE_REQUESTED) | + event_mask_for_type(WINDOW_MINIMIZE_REQUESTED) | + event_mask_for_type(WINDOW_RESTORE_REQUESTED) + forWindow:self]; + return; + } + + pendingOrderOut = FALSE; + if ([self isMiniaturized]) pendingMinimize = TRUE; @@ -2707,6 +2723,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { enteringFullScreen = FALSE; enteredFullScreenTime = [[NSProcessInfo processInfo] systemUptime]; + if (pendingOrderOut) + [self doOrderOut]; } - (void) windowDidExitFullScreen:(NSNotification*)notification @@ -2714,18 +2732,24 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi exitingFullScreen = FALSE; [self setFrameAndWineFrame:nonFullscreenFrame]; [self windowDidResize:nil]; + if (pendingOrderOut) + [self doOrderOut]; } - (void) windowDidFailToEnterFullScreen:(NSWindow*)window { enteringFullScreen = FALSE; enteredFullScreenTime = 0; + if (pendingOrderOut) + [self doOrderOut]; } - (void) windowDidFailToExitFullScreen:(NSWindow*)window { exitingFullScreen = FALSE; [self windowDidResize:nil]; + if (pendingOrderOut) + [self doOrderOut]; } - (void)windowDidMiniaturize:(NSNotification *)notification

1 0

Ken Thomases : winemac: Add a category on NSEvent to simplify checking if the Command key ( and only that modifier) is pressed for an event.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: af2690ab0664a9dfbad69fd6905d3a15dc8a499a URL: http://source.winehq.org/git/wine.git/?a=commit;h=af2690ab0664a9dfbad69fd69… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 24 13:07:09 2017 -0500 winemac: Add a category on NSEvent to simplify checking if the Command key (and only that modifier) is pressed for an event. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 2 +- dlls/winemac.drv/cocoa_event.h | 6 ++++++ dlls/winemac.drv/cocoa_event.m | 20 ++++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 6d1473a..f13e496 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1653,7 +1653,7 @@ static NSString* WineLocalizedString(unsigned int stringID) if ([window isKindOfClass:[WineWindow class]] && type == NSLeftMouseDown && - (([theEvent modifierFlags] & (NSShiftKeyMask | NSControlKeyMask| NSAlternateKeyMask | NSCommandKeyMask)) != NSCommandKeyMask)) + ![theEvent wine_commandKeyDown]) { NSWindowButton windowButton; diff --git a/dlls/winemac.drv/cocoa_event.h b/dlls/winemac.drv/cocoa_event.h index 4d814a2..72ff8f9 100644 --- a/dlls/winemac.drv/cocoa_event.h +++ b/dlls/winemac.drv/cocoa_event.h @@ -28,6 +28,12 @@ enum { }; +(a)interface NSEvent (WineExtensions) + + (BOOL) wine_commandKeyDown; + - (BOOL) wine_commandKeyDown; +(a)end + + @class WineWindow; diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 08a706f..40066ff 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -40,6 +40,26 @@ static NSString* const WineHotKeyCarbonRefKey = @"hotKeyRef"; static const OSType WineHotKeySignature = 'Wine'; +(a)implementation NSEvent (WineExtensions) + + static BOOL wine_commandKeyDown(NSUInteger flags) + { + return ((flags & (NSShiftKeyMask | NSControlKeyMask | NSAlternateKeyMask | NSCommandKeyMask)) == NSCommandKeyMask); + } + + + (BOOL) wine_commandKeyDown + { + return wine_commandKeyDown([self modifierFlags]); + } + + - (BOOL) wine_commandKeyDown + { + return wine_commandKeyDown([self modifierFlags]); + } + +(a)end + + @interface MacDrvEvent : NSObject { @public

1 0