wine-commits January 2017

wine-commits@winehq.org

2 participants
492 discussions

Huw Davies : gdi32: Add the ability to disable a DC.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 0805b0d56750637619529e91c301fb5e94d47564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0805b0d56750637619529e91c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 26 09:30:19 2017 +0000 gdi32: Add the ability to disable a DC. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 10 ++++++++++ dlls/gdi32/gdi_private.h | 1 + include/wine/gdi_driver.h | 2 ++ 3 files changed, 13 insertions(+) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 27e89ae..892d3e9 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -203,6 +203,11 @@ DC *get_dc_ptr( HDC hdc ) { DC *dc = get_dc_obj( hdc ); if (!dc) return NULL; + if (dc->disabled) + { + GDI_ReleaseObj( hdc ); + return NULL; + } if (!InterlockedCompareExchange( &dc->refcount, 1, 0 )) { @@ -1269,6 +1274,11 @@ WORD WINAPI SetHookFlags( HDC hdc, WORD flags ) else if (flags & DCHF_VALIDATEVISRGN || !flags) ret = InterlockedExchange( &dc->dirty, 0 ); + if (flags & DCHF_DISABLEDC) + ret = InterlockedExchange( &dc->disabled, 1 ); + else if (flags & DCHF_ENABLEDC) + ret = InterlockedExchange( &dc->disabled, 0 ); + GDI_ReleaseObj( hdc ); if (flags & DCHF_RESETDC) ret = reset_dc_state( hdc ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index e4633d1..ab3c9bb 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -65,6 +65,7 @@ typedef struct tagDC DWORD thread; /* thread owning the DC */ LONG refcount; /* thread refcount */ LONG dirty; /* dirty flag */ + LONG disabled; /* get_dc_ptr() will return NULL. Controlled by DCHF_(DISABLE|ENABLE)DC */ INT saveLevel; struct tagDC *saved_dc; DWORD_PTR dwHookData; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 6f67653..32d17f7 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -266,6 +266,8 @@ static inline ULONG window_surface_release( struct window_surface *surface ) #define DCHF_INVALIDATEVISRGN 0x0001 #define DCHF_VALIDATEVISRGN 0x0002 #define DCHF_RESETDC 0x0004 /* Wine extension */ +#define DCHF_DISABLEDC 0x0008 /* Wine extension */ +#define DCHF_ENABLEDC 0x0010 /* Wine extension */ typedef BOOL (CALLBACK *DCHOOKPROC)(HDC,WORD,DWORD_PTR,LPARAM);

1 0

Nikolay Sivov : dwrite: Initial support for line trimming signs.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 1e8f554ef911e5b961b8e4576f51b19931538196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e8f554ef911e5b961b8e4576… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 26 07:41:50 2017 +0300 dwrite: Initial support for line trimming signs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 82 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 64 insertions(+), 18 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index f400671..0d1ffb4 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -193,8 +193,9 @@ struct layout_effective_run { struct layout_effective_inline { struct list entry; - const struct layout_run *run; /* nominal run this one is based on */ + IDWriteInlineObject *object; /* inline object, set explicitly or added when trimming a line */ IUnknown *effect; /* original reference is kept only at range level */ + FLOAT baseline; FLOAT origin_x; /* left X position */ FLOAT origin_y; /* left top corner Y position */ FLOAT align_dx; /* adjustment from text alignment */ @@ -1205,11 +1206,12 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const if (!inlineobject) return E_OUTOFMEMORY; - inlineobject->run = r; + inlineobject->object = r->u.object.object; inlineobject->width = get_cluster_range_width(layout, first_cluster, first_cluster + cluster_count); inlineobject->origin_x = is_rtl ? origin_x - inlineobject->width : origin_x; inlineobject->origin_y = 0.0f; /* set after line is built */ inlineobject->align_dx = 0.0f; + inlineobject->baseline = r->baseline; /* It's not clear how these two are set, possibly directionality is derived from surrounding text (replaced text could have @@ -1585,7 +1587,7 @@ static void layout_apply_par_alignment(struct dwrite_textlayout *layout) } while (inrun && inrun->line == line) { - inrun->origin_y = origin_y - inrun->run->baseline; + inrun->origin_y = origin_y - inrun->baseline; inrun = layout_get_next_inline_run(layout, inrun); } } @@ -1722,10 +1724,12 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust { BOOL is_rtl = layout->format.readingdir == DWRITE_READING_DIRECTION_RIGHT_TO_LEFT; struct layout_final_splitting_params params, prev_params; - UINT32 strlength, index, start, pos = *textpos; + DWRITE_INLINE_OBJECT_METRICS sign_metrics = { 0 }; UINT32 line = layout->metrics.lineCount, i; DWRITE_LINE_METRICS1 metrics = { 0 }; + UINT32 index, start, pos = *textpos; FLOAT descent, trailingspacewidth; + BOOL append_trimming_run = FALSE; const struct layout_run *run; FLOAT width, origin_x; HRESULT hr; @@ -1766,6 +1770,26 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust /* Does not include trailing space width */ width = get_cluster_range_width(layout, first_cluster, last_cluster + 1); + /* Append trimming run if necessary */ + if (width > layout->metrics.layoutWidth && layout->format.trimmingsign != NULL && + layout->format.trimming.granularity != DWRITE_TRIMMING_GRANULARITY_NONE) { + FLOAT trimmed_width = width; + + hr = IDWriteInlineObject_GetMetrics(layout->format.trimmingsign, &sign_metrics); + if (SUCCEEDED(hr)) { + while (last_cluster > first_cluster) { + if (trimmed_width + sign_metrics.width <= layout->metrics.layoutWidth) + break; + trimmed_width -= layout->clustermetrics[last_cluster--].width; + } + append_trimming_run = TRUE; + } + else + WARN("Failed to get trimming sign metrics, lines won't be trimmed, hr %#x.\n", hr); + + width = trimmed_width + sign_metrics.width; + } + layout_splitting_params_from_pos(layout, pos, &params); prev_params = params; run = layout->clusters[first_cluster].run; @@ -1795,24 +1819,39 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust if (FAILED(hr)) return; + if (append_trimming_run) { + struct layout_effective_inline *trimming_sign; + + trimming_sign = heap_alloc(sizeof(*trimming_sign)); + if (!trimming_sign) + return; + + trimming_sign->object = layout->format.trimmingsign; + trimming_sign->width = sign_metrics.width; + origin_x += is_rtl ? -get_cluster_range_width(layout, start, i) : get_cluster_range_width(layout, start, i); + trimming_sign->origin_x = is_rtl ? origin_x - trimming_sign->width : origin_x; + trimming_sign->origin_y = 0.0f; /* set after line is built */ + trimming_sign->align_dx = 0.0f; + trimming_sign->baseline = sign_metrics.baseline; + + trimming_sign->is_sideways = FALSE; + trimming_sign->is_rtl = FALSE; + trimming_sign->line = line; + + trimming_sign->effect = NULL; /* FIXME */ + + list_add_tail(&layout->inlineobjects, &trimming_sign->entry); + } + /* Look for max baseline and descent for this line */ - strlength = metrics.length - metrics.trailingWhitespaceLength; - index = last_cluster; - metrics.baseline = 0.0f; - descent = 0.0f; - while (strlength) { - DWRITE_CLUSTER_METRICS *cluster = &layout->clustermetrics[index]; + for (index = first_cluster, metrics.baseline = 0.0f, descent = 0.0f; index <= last_cluster; index++) { const struct layout_run *cur = layout->clusters[index].run; FLOAT cur_descent = cur->height - cur->baseline; if (cur->baseline > metrics.baseline) metrics.baseline = cur->baseline; - if (cur_descent > descent) descent = cur_descent; - - strlength -= cluster->length; - index--; } layout->metrics.width = max(width, layout->metrics.width); @@ -1820,7 +1859,7 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust layout->metrics.widthIncludingTrailingWhitespace); metrics.height = descent + metrics.baseline; - metrics.isTrimmed = width > layout->metrics.layoutWidth; + metrics.isTrimmed = append_trimming_run || width > layout->metrics.layoutWidth; layout_set_line_metrics(layout, &metrics); *textpos += metrics.length; @@ -1937,10 +1976,11 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) /* Same for inline runs */ while (inrun && inrun->line == line) { - inrun->origin_y = origin_y - inrun->run->baseline; + inrun->origin_y = origin_y - inrun->baseline; inrun = layout_get_next_inline_run(layout, inrun); } } + /* Use last line origin y + line descent as total content height */ line--; layout->metrics.height = origin_y + layout->lines[line].height - layout->lines[line].baseline; @@ -3360,7 +3400,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout3 *iface, context, inlineobject->origin_x + inlineobject->align_dx + origin_x, SNAP_COORD(inlineobject->origin_y + origin_y), - inlineobject->run->u.object.object, + inlineobject->object, inlineobject->is_sideways, inlineobject->is_rtl, inlineobject->effect); @@ -4728,12 +4768,17 @@ static HRESULT WINAPI dwritetrimmingsign_Draw(IDWriteInlineObject *iface, void * { struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); DWRITE_TEXT_RANGE range = { 0, ~0u }; + DWRITE_TEXT_METRICS metrics; + DWRITE_LINE_METRICS line; + UINT32 line_count; HRESULT hr; TRACE("(%p)->(%p %p %.2f %.2f %d %d %p)\n", This, context, renderer, originX, originY, is_sideways, is_rtl, effect); IDWriteTextLayout_SetDrawingEffect(This->layout, effect, range); - hr = IDWriteTextLayout_Draw(This->layout, context, renderer, originX, originY); + IDWriteTextLayout_GetLineMetrics(This->layout, &line, 1, &line_count); + IDWriteTextLayout_GetMetrics(This->layout, &metrics); + hr = IDWriteTextLayout_Draw(This->layout, context, renderer, originX, originY - line.baseline); IDWriteTextLayout_SetDrawingEffect(This->layout, NULL, range); return hr; } @@ -4844,6 +4889,7 @@ HRESULT create_trimmingsign(IDWriteFactory4 *factory, IDWriteTextFormat *format, } IDWriteTextLayout_SetWordWrapping(This->layout, DWRITE_WORD_WRAPPING_NO_WRAP); + IDWriteTextLayout_SetParagraphAlignment(This->layout, DWRITE_PARAGRAPH_ALIGNMENT_NEAR); *sign = &This->IDWriteInlineObject_iface; return S_OK;

1 0

Nikolay Sivov : dwrite: Restructure line wrapping logic, fix the way breaking position is selected.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 82d73733182a489f31508d9f2a97056c84661a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d73733182a489f31508d9f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 26 07:41:49 2017 +0300 dwrite: Restructure line wrapping logic, fix the way breaking position is selected. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 301 ++++++++++++++++++++++++--------------------- dlls/dwrite/tests/layout.c | 1 - 2 files changed, 161 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82d73733182a489f31508…

1 0

Nikolay Sivov : dwrite: Invalidate layout on box changes.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 3871981e3abf0d494e9c3811e2ff1d405535f95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3871981e3abf0d494e9c3811e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 26 07:41:48 2017 +0300 dwrite: Invalidate layout on box changes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 7ef050e..a80c49e 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2833,26 +2833,36 @@ static HRESULT WINAPI dwritetextlayout_GetLocaleName(IDWriteTextLayout3 *iface, static HRESULT WINAPI dwritetextlayout_SetMaxWidth(IDWriteTextLayout3 *iface, FLOAT maxWidth) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); + BOOL changed; TRACE("(%p)->(%.2f)\n", This, maxWidth); if (maxWidth < 0.0f) return E_INVALIDARG; + changed = This->metrics.layoutWidth != maxWidth; This->metrics.layoutWidth = maxWidth; + + if (changed) + This->recompute |= RECOMPUTE_LINES; return S_OK; } static HRESULT WINAPI dwritetextlayout_SetMaxHeight(IDWriteTextLayout3 *iface, FLOAT maxHeight) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); + BOOL changed; TRACE("(%p)->(%.2f)\n", This, maxHeight); if (maxHeight < 0.0f) return E_INVALIDARG; + changed = This->metrics.layoutHeight != maxHeight; This->metrics.layoutHeight = maxHeight; + + if (changed) + This->recompute |= RECOMPUTE_LINES; return S_OK; }

1 0

Nikolay Sivov : dwrite: Remove existing effective runs before evaluating them again.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: e9ff71f62beb4841700b1d35185783df9d776354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ff71f62beb4841700b1d351… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 26 07:41:47 2017 +0300 dwrite: Remove existing effective runs before evaluating them again. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 706ed4e..7ef050e 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1740,6 +1740,8 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) if (!(layout->recompute & RECOMPUTE_LINES)) return S_OK; + free_layout_eruns(layout); + hr = layout_compute(layout); if (FAILED(hr)) return hr;

1 0

Nikolay Sivov : dwrite: Implement another variant of CreateGlyphRunAnalysis().
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: c32a19f198c7b68ff21c56f1869dc6d4bac689e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c32a19f198c7b68ff21c56f18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 26 07:41:46 2017 +0300 dwrite: Implement another variant of CreateGlyphRunAnalysis(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 55 +++++++++++++++++++++++++++++--------------- dlls/dwrite/main.c | 14 +++++++++-- 3 files changed, 49 insertions(+), 22 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 7d1cfa8..882567c 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -143,7 +143,7 @@ struct glyphrunanalysis_desc { const DWRITE_GLYPH_RUN *run; const DWRITE_MATRIX *transform; - DWRITE_RENDERING_MODE rendering_mode; + DWRITE_RENDERING_MODE1 rendering_mode; DWRITE_MEASURING_MODE measuring_mode; DWRITE_GRID_FIT_MODE gridfit_mode; DWRITE_TEXT_ANTIALIAS_MODE aa_mode; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d9ddce0..01719a3 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -166,7 +166,7 @@ struct dwrite_glyphrunanalysis { IDWriteGlyphRunAnalysis IDWriteGlyphRunAnalysis_iface; LONG ref; - DWRITE_RENDERING_MODE rendering_mode; + DWRITE_RENDERING_MODE1 rendering_mode; DWRITE_GLYPH_RUN run; /* glyphAdvances and glyphOffsets are not used */ DWRITE_MATRIX m; FLOAT ppdip; @@ -1167,7 +1167,7 @@ static HRESULT WINAPI dwritefontface3_GetRecommendedRenderingMode(IDWriteFontFac emSize *= max(dpiX, dpiY) / 96.0f; - *rendering_mode = DWRITE_RENDERING_MODE_DEFAULT; + *rendering_mode = DWRITE_RENDERING_MODE1_DEFAULT; *gridfit_mode = DWRITE_GRID_FIT_MODE_DEFAULT; if (params) { IDWriteRenderingParams3 *params3; @@ -4757,6 +4757,19 @@ static ULONG WINAPI glyphrunanalysis_Release(IDWriteGlyphRunAnalysis *iface) return ref; } +static BOOL is_natural_rendering_mode(DWRITE_RENDERING_MODE1 mode) +{ + switch (mode) + { + case DWRITE_RENDERING_MODE1_NATURAL: + case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC: + case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED: + return TRUE; + default: + return FALSE; + } +} + static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *analysis, RECT *bounds) { struct dwrite_glyphbitmap glyph_bitmap; @@ -4787,8 +4800,7 @@ static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *a memset(&glyph_bitmap, 0, sizeof(glyph_bitmap)); glyph_bitmap.fontface = fontface3; glyph_bitmap.emsize = analysis->run.fontEmSize * analysis->ppdip; - glyph_bitmap.nohint = analysis->rendering_mode == DWRITE_RENDERING_MODE_NATURAL || - analysis->rendering_mode == DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC; + glyph_bitmap.nohint = is_natural_rendering_mode(analysis->rendering_mode); if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) glyph_bitmap.m = &analysis->m; @@ -4836,8 +4848,8 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaTextureBounds(IDWriteGlyphRunAnal return E_INVALIDARG; } - if ((type == DWRITE_TEXTURE_ALIASED_1x1 && This->rendering_mode != DWRITE_RENDERING_MODE_ALIASED) || - (type == DWRITE_TEXTURE_CLEARTYPE_3x1 && This->rendering_mode == DWRITE_RENDERING_MODE_ALIASED)) { + if ((type == DWRITE_TEXTURE_ALIASED_1x1 && This->rendering_mode != DWRITE_RENDERING_MODE1_ALIASED) || + (type == DWRITE_TEXTURE_CLEARTYPE_3x1 && This->rendering_mode == DWRITE_RENDERING_MODE1_ALIASED)) { memset(bounds, 0, sizeof(*bounds)); return S_OK; } @@ -4889,8 +4901,7 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW memset(&glyph_bitmap, 0, sizeof(glyph_bitmap)); glyph_bitmap.fontface = fontface2; glyph_bitmap.emsize = analysis->run.fontEmSize * analysis->ppdip; - glyph_bitmap.nohint = analysis->rendering_mode == DWRITE_RENDERING_MODE_NATURAL || - analysis->rendering_mode == DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC; + glyph_bitmap.nohint = is_natural_rendering_mode(analysis->rendering_mode); glyph_bitmap.type = type; if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) glyph_bitmap.m = &analysis->m; @@ -5018,14 +5029,15 @@ static HRESULT WINAPI glyphrunanalysis_CreateAlphaTexture(IDWriteGlyphRunAnalysi /* validate requested texture type with rendering mode */ switch (This->rendering_mode) { - case DWRITE_RENDERING_MODE_ALIASED: + case DWRITE_RENDERING_MODE1_ALIASED: if (type != DWRITE_TEXTURE_ALIASED_1x1) return DWRITE_E_UNSUPPORTEDOPERATION; break; - case DWRITE_RENDERING_MODE_GDI_CLASSIC: - case DWRITE_RENDERING_MODE_GDI_NATURAL: - case DWRITE_RENDERING_MODE_NATURAL: - case DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC: + case DWRITE_RENDERING_MODE1_GDI_CLASSIC: + case DWRITE_RENDERING_MODE1_GDI_NATURAL: + case DWRITE_RENDERING_MODE1_NATURAL: + case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC: + case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED: if (type != DWRITE_TEXTURE_CLEARTYPE_3x1) return DWRITE_E_UNSUPPORTEDOPERATION; break; @@ -5071,8 +5083,8 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaBlendParams(IDWriteGlyphRunAnalys switch (This->rendering_mode) { - case DWRITE_RENDERING_MODE_GDI_CLASSIC: - case DWRITE_RENDERING_MODE_GDI_NATURAL: + case DWRITE_RENDERING_MODE1_GDI_CLASSIC: + case DWRITE_RENDERING_MODE1_GDI_NATURAL: { UINT value = 0; SystemParametersInfoW(SPI_GETFONTSMOOTHINGCONTRAST, 0, &value, 0); @@ -5081,9 +5093,12 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaBlendParams(IDWriteGlyphRunAnalys *cleartypelevel = 1.0f; break; } - case DWRITE_RENDERING_MODE_ALIASED: - case DWRITE_RENDERING_MODE_NATURAL: - case DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC: + case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED: + WARN("Downsampled mode is ignored.\n"); + /* fallthrough */ + case DWRITE_RENDERING_MODE1_ALIASED: + case DWRITE_RENDERING_MODE1_NATURAL: + case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC: *gamma = IDWriteRenderingParams_GetGamma(params); *contrast = IDWriteRenderingParams_GetEnhancedContrast(params); *cleartypelevel = IDWriteRenderingParams_GetClearTypeLevel(params); @@ -5133,7 +5148,9 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit *ret = NULL; /* check for valid rendering mode */ - if ((UINT32)desc->rendering_mode >= DWRITE_RENDERING_MODE_OUTLINE || desc->rendering_mode == DWRITE_RENDERING_MODE_DEFAULT) + if ((UINT32)desc->rendering_mode >= DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED || + desc->rendering_mode == DWRITE_RENDERING_MODE1_OUTLINE || + desc->rendering_mode == DWRITE_RENDERING_MODE1_DEFAULT) return E_INVALIDARG; analysis = heap_alloc(sizeof(*analysis)); diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 50a4c1c..a493578 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1291,11 +1291,21 @@ static HRESULT WINAPI dwritefactory3_CreateGlyphRunAnalysis(IDWriteFactory4 *ifa IDWriteGlyphRunAnalysis **analysis) { struct dwritefactory *This = impl_from_IDWriteFactory4(iface); + struct glyphrunanalysis_desc desc; - FIXME("(%p)->(%p %p %d %d %d %d %.2f %.2f %p): stub\n", This, run, transform, rendering_mode, measuring_mode, + TRACE("(%p)->(%p %p %d %d %d %d %.2f %.2f %p)\n", This, run, transform, rendering_mode, measuring_mode, gridfit_mode, aa_mode, originX, originY, analysis); - return E_NOTIMPL; + desc.run = run; + desc.ppdip = 1.0f; + desc.transform = transform; + desc.rendering_mode = rendering_mode; + desc.measuring_mode = measuring_mode; + desc.gridfit_mode = gridfit_mode; + desc.aa_mode = aa_mode; + desc.origin_x = originX; + desc.origin_y = originY; + return create_glyphrunanalysis(&desc, analysis); } static HRESULT WINAPI dwritefactory3_CreateCustomRenderingParams(IDWriteFactory4 *iface, FLOAT gamma, FLOAT contrast,

1 0

André Hentschel : winebus.sys: Fix compilation on systems that don't support nameless structs.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 1afcfc77d376916466035ab5c085dcb8201ecd03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1afcfc77d376916466035ab5c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 25 22:14:58 2017 +0100 winebus.sys: Fix compilation on systems that don't support nameless structs. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index ed95435..978540b 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -21,6 +21,7 @@ #include <stdarg.h> #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS @@ -303,7 +304,7 @@ void bus_remove_hid_device(DEVICE_OBJECT *device) EnterCriticalSection(&ext->report_cs); while ((entry = RemoveHeadList(&ext->irp_queue)) != &ext->irp_queue) { - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); irp->IoStatus.u.Status = STATUS_CANCELLED; irp->IoStatus.Information = 0; IoCompleteRequest(irp, IO_NO_INCREMENT); @@ -525,7 +526,7 @@ NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) } else { - InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.ListEntry); + InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.s.ListEntry); status = STATUS_PENDING; } LeaveCriticalSection(&ext->report_cs); @@ -613,7 +614,7 @@ void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) { IO_STACK_LOCATION *irpsp; TRACE_(hid_report)("Processing Request\n"); - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); irpsp = IoGetCurrentIrpStackLocation(irp); irp->IoStatus.u.Status = deliver_last_report(ext, irpsp->Parameters.DeviceIoControl.OutputBufferLength,

1 0

André Hentschel : hidclass.sys: Fix compilation on systems that don't support nameless structs.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 902b8a2b6d3393c5af52af5b84166634153436a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=902b8a2b6d3393c5af52af5b8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 25 22:14:54 2017 +0100 hidclass.sys: Fix compilation on systems that don't support nameless structs. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index b241016..fe79212 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -22,6 +22,7 @@ #include <stdarg.h> #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "hid.h" #include "wine/unicode.h" #include "winreg.h" @@ -184,7 +185,7 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device entry = RemoveHeadList(&ext->irp_queue); while(entry != &ext->irp_queue) { - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); irp->IoStatus.u.Status = STATUS_DEVICE_REMOVED; IoCompleteRequest(irp, IO_NO_INCREMENT); entry = RemoveHeadList(&ext->irp_queue); @@ -237,7 +238,7 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) while(entry != &ext->irp_queue) { int ptr; - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext ); RingBuffer_Read(ext->ring_buffer, ptr, packet, &buffer_size); @@ -680,7 +681,7 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) else { TRACE_(hid_report)("Queue irp\n"); - InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.ListEntry); + InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.s.ListEntry); rc = STATUS_PENDING; } HeapFree(GetProcessHeap(), 0, packet);

1 0

Andrew Eikum : quartz: Downgrade FIXME->WARN.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: e2a4974f399df7e3a4c97b3bd1348ea8fb9d5930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2a4974f399df7e3a4c97b3bd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jan 25 15:13:01 2017 -0600 quartz: Downgrade FIXME->WARN. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 2bd08f1..92c30c1 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2379,7 +2379,7 @@ static HRESULT WINAPI MediaSeeking_IsFormatSupported(IMediaSeeking *iface, const if (!IsEqualGUID(&TIME_FORMAT_MEDIA_TIME, pFormat)) { - FIXME("Unhandled time format %s\n", debugstr_guid(pFormat)); + WARN("Unhandled time format %s\n", debugstr_guid(pFormat)); return S_FALSE; }

1 0

Andrew Eikum : quartz: Clean up another trace for consistency.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: c6a4811edfa97331939e3b71f34970fcd263b41b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a4811edfa97331939e3b71f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jan 25 15:12:55 2017 -0600 quartz: Clean up another trace for consistency. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 97c049d..2bd08f1 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -730,6 +730,9 @@ static HRESULT WINAPI FilterGraph2_Reconnect(IFilterGraph2 *iface, IPin *ppin) IPin_QueryDirection(ppin, &pindir); hr = IPin_ConnectedTo(ppin, &pConnectedTo); + + TRACE("(%p/%p)->(%p) -- %p\n", This, iface, ppin, pConnectedTo); + if (FAILED(hr)) { TRACE("Querying connected to failed: %x\n", hr); return hr; @@ -743,7 +746,7 @@ static HRESULT WINAPI FilterGraph2_Reconnect(IFilterGraph2 *iface, IPin *ppin) IPin_Release(pConnectedTo); if (FAILED(hr)) WARN("Reconnecting pins failed, pins are not connected now..\n"); - TRACE("(%p->%p) -- %p %p -> %x\n", iface, This, ppin, pConnectedTo, hr); + TRACE("-> %08x\n", hr); return hr; }

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2017