wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Henri Verbeet : wined3d: Add support for half-integer pixel centers.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 94967c28b94318ccb58836f30eba706d24dca8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94967c28b94318ccb58836f30… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 09:17:05 2015 +0200 wined3d: Add support for half-integer pixel centers. Like in OpenGL and Direct3D 10+. --- dlls/d3d8/directx.c | 3 ++- dlls/d3d9/directx.c | 2 +- dlls/ddraw/ddraw.c | 7 ++----- dlls/ddraw/ddraw_private.h | 3 +++ dlls/ddraw/main.c | 4 ++-- dlls/wined3d/utils.c | 21 ++++++++++++++------- dlls/wined3d/wined3d_private.h | 11 +++++++++-- include/wine/wined3d.h | 1 + 8 files changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 75c8218..132a56f 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -402,7 +402,8 @@ static const struct IDirect3D8Vtbl d3d8_vtbl = BOOL d3d8_init(struct d3d8 *d3d8) { - DWORD flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING | WINED3D_HANDLE_RESTORE; + DWORD flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING + | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER; d3d8->IDirect3D8_iface.lpVtbl = &d3d8_vtbl; d3d8->refcount = 1; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 6059890..58c4d44 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -636,7 +636,7 @@ static const struct IDirect3D9ExVtbl d3d9_vtbl = BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) { - DWORD flags = WINED3D_PRESENT_CONVERSION | WINED3D_HANDLE_RESTORE; + DWORD flags = WINED3D_PRESENT_CONVERSION | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER; if (!extended) flags |= WINED3D_VIDMEM_ACCOUNTING; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 02b2f6e..31ec6bf 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4835,7 +4835,6 @@ static const struct wined3d_device_parent_ops ddraw_wined3d_device_parent_ops = HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) { WINED3DCAPS caps; - DWORD flags; HRESULT hr; ddraw->IDirectDraw7_iface.lpVtbl = &ddraw7_vtbl; @@ -4850,11 +4849,9 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) ddraw->numIfaces = 1; ddraw->ref7 = 1; - flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING - | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES; - if (!(ddraw->wined3d = wined3d_create(flags))) + if (!(ddraw->wined3d = wined3d_create(DDRAW_WINED3D_FLAGS))) { - if (!(ddraw->wined3d = wined3d_create(flags | WINED3D_NO3D))) + if (!(ddraw->wined3d = wined3d_create(DDRAW_WINED3D_FLAGS | WINED3D_NO3D))) { WARN("Failed to create a wined3d object.\n"); return E_FAIL; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 4a883b9..650b2c7 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -59,6 +59,9 @@ struct FvfToDecl #define DDRAW_STRIDE_ALIGNMENT 8 +#define DDRAW_WINED3D_FLAGS (WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING \ + | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER) + enum ddraw_device_state { DDRAW_DEVICE_STATE_OK, diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 021c2b9..2f5d113 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -405,9 +405,9 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex FIXME("flags 0x%08x not handled\n", flags & ~DDENUM_ATTACHEDSECONDARYDEVICES); TRACE("Enumerating ddraw interfaces\n"); - if (!(wined3d = wined3d_create(WINED3D_LEGACY_DEPTH_BIAS))) + if (!(wined3d = wined3d_create(DDRAW_WINED3D_FLAGS))) { - if (!(wined3d = wined3d_create(WINED3D_LEGACY_DEPTH_BIAS | WINED3D_NO3D))) + if (!(wined3d = wined3d_create(DDRAW_WINED3D_FLAGS | WINED3D_NO3D))) { WARN("Failed to create a wined3d object.\n"); return E_FAIL; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a772af8..468aea9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3155,6 +3155,8 @@ void get_modelview_matrix(const struct wined3d_context *context, const struct wi void get_projection_matrix(const struct wined3d_context *context, const struct wined3d_state *state, struct wined3d_matrix *mat) { + float center_offset; + /* There are a couple of additional things we have to take into account * here besides the projection transformation itself: * - We need to flip along the y-axis in case of offscreen rendering. @@ -3170,6 +3172,11 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w * driver, but small enough to prevent it from interfering with any * anti-aliasing. */ + if (context->swapchain->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) + center_offset = 63.0f / 64.0f; + else + center_offset = -1.0f / 64.0f; + if (context->last_was_rhw) { /* Transform D3D RHW coordinates to OpenGL clip coordinates. */ @@ -3178,11 +3185,11 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w float w = state->viewport.width; float h = state->viewport.height; float x_scale = 2.0f / w; - float x_offset = (float)((63.0 / 64.0 - (2.0 * x) - w) / w); + float x_offset = (center_offset - (2.0f * x) - w) / w; float y_scale = context->render_offscreen ? 2.0f / h : 2.0f / -h; - float y_offset = (float)(context->render_offscreen - ? (63.0 / 64.0 - (2.0 * y) - h) / h - : (63.0 / 64.0 - (2.0 * y) - h) / -h); + float y_offset = context->render_offscreen + ? (center_offset - (2.0f * y) - h) / h + : (center_offset - (2.0f * y) - h) / -h; enum wined3d_depth_buffer_type zenable = state->fb->depth_stencil ? state->render_states[WINED3D_RS_ZENABLE] : WINED3D_ZB_FALSE; float z_scale = zenable ? 2.0f : 0.0f; @@ -3200,10 +3207,10 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w else { float y_scale = context->render_offscreen ? -1.0f : 1.0f; - float x_offset = 63.0f / 64.0f * (1.0f / state->viewport.width); + float x_offset = center_offset / state->viewport.width; float y_offset = context->render_offscreen - ? 63.0f / 64.0f * (1.0f / state->viewport.height) - : -63.0f / 64.0f * (1.0f / state->viewport.height); + ? center_offset / state->viewport.height + : -center_offset / state->viewport.height; const struct wined3d_matrix projection = { 1.0f, 0.0f, 0.0f, 0.0f, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 96b8244..9287fd7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3009,10 +3009,17 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) static inline void shader_get_position_fixup(const struct wined3d_context *context, const struct wined3d_state *state, float *position_fixup) { + float center_offset; + + if (context->swapchain->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) + center_offset = 63.0f / 64.0f; + else + center_offset = -1.0f / 64.0f; + position_fixup[0] = 1.0f; position_fixup[1] = 1.0f; - position_fixup[2] = (63.0f / 64.0f) / state->viewport.width; - position_fixup[3] = -(63.0f / 64.0f) / state->viewport.height; + position_fixup[2] = center_offset / state->viewport.width; + position_fixup[3] = -center_offset / state->viewport.height; if (context->render_offscreen) { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0f70848..8bc4c25 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1247,6 +1247,7 @@ enum wined3d_display_rotation #define WINED3D_RESTORE_MODE_ON_ACTIVATE 0x00000010 #define WINED3D_FOCUS_MESSAGES 0x00000020 #define WINED3D_HANDLE_RESTORE 0x00000040 +#define WINED3D_PIXEL_CENTER_INTEGER 0x00000080 #define WINED3D_RESZ_CODE 0x7fa05000

1 0

Henri Verbeet : d2d1: Do not multiply color brush RGB values with the brush opacity.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: d9fbb3f847ed7ef050820348a130299953571c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9fbb3f847ed7ef050820348a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 09:17:04 2015 +0200 d2d1: Do not multiply color brush RGB values with the brush opacity. --- dlls/d2d1/render_target.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index da8937c..c078989 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -636,9 +636,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar ps = render_target->rect_solid_ps; color = brush_impl->u.solid.color; - color.r *= brush_impl->opacity; - color.g *= brush_impl->opacity; - color.b *= brush_impl->opacity; color.a *= brush_impl->opacity; buffer_desc.ByteWidth = sizeof(color);

1 0

Henri Verbeet : d2d1/tests: Add a test for ID2D1DrawingStateBlock.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 7baf2a0f5542cae3608fdb89ee35a378e0d6bb93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7baf2a0f5542cae3608fdb89e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 09:17:03 2015 +0200 d2d1/tests: Add a test for ID2D1DrawingStateBlock. --- dlls/d2d1/tests/Makefile.in | 2 +- dlls/d2d1/tests/d2d1.c | 216 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 217 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7baf2a0f5542cae3608fd…

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_RestoreDrawingState( ).
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 59e641aa70c280209f104656b69c6b68a1cc70bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e641aa70c280209f104656b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 09:17:02 2015 +0200 d2d1: Implement d2d_d3d_render_target_RestoreDrawingState(). --- dlls/d2d1/render_target.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 3b15e22..da8937c 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -949,7 +949,17 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SaveDrawingState(ID2D1Render static void STDMETHODCALLTYPE d2d_d3d_render_target_RestoreDrawingState(ID2D1RenderTarget *iface, ID2D1DrawingStateBlock *state_block) { - FIXME("iface %p, state_block %p stub!\n", iface, state_block); + struct d2d_state_block *state_block_impl = unsafe_impl_from_ID2D1DrawingStateBlock(state_block); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, state_block %p.\n", iface, state_block); + + render_target->drawing_state = state_block_impl->drawing_state; + if (state_block_impl->text_rendering_params) + IDWriteRenderingParams_AddRef(state_block_impl->text_rendering_params); + if (render_target->text_rendering_params) + IDWriteRenderingParams_Release(render_target->text_rendering_params); + render_target->text_rendering_params = state_block_impl->text_rendering_params; } static void STDMETHODCALLTYPE d2d_d3d_render_target_PushAxisAlignedClip(ID2D1RenderTarget *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_SaveDrawingState().
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 3f97056424b191e079bae037a6a8353423388642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f97056424b191e079bae037a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 09:17:01 2015 +0200 d2d1: Implement d2d_d3d_render_target_SaveDrawingState(). --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/render_target.c | 12 +++++++++++- dlls/d2d1/state_block.c | 8 ++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 0e0fa9f..48465f2 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -184,5 +184,6 @@ struct d2d_state_block void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWING_STATE_DESCRIPTION *desc, IDWriteRenderingParams *text_rendering_params) DECLSPEC_HIDDEN; +struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStateBlock *iface) DECLSPEC_HIDDEN; #endif /* __WINE_D2D1_PRIVATE_H */ diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index c241df2..3b15e22 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -933,7 +933,17 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_Flush(ID2D1RenderTarget * static void STDMETHODCALLTYPE d2d_d3d_render_target_SaveDrawingState(ID2D1RenderTarget *iface, ID2D1DrawingStateBlock *state_block) { - FIXME("iface %p, state_block %p stub!\n", iface, state_block); + struct d2d_state_block *state_block_impl = unsafe_impl_from_ID2D1DrawingStateBlock(state_block); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, state_block %p.\n", iface, state_block); + + state_block_impl->drawing_state = render_target->drawing_state; + if (render_target->text_rendering_params) + IDWriteRenderingParams_AddRef(render_target->text_rendering_params); + if (state_block_impl->text_rendering_params) + IDWriteRenderingParams_Release(state_block_impl->text_rendering_params); + state_block_impl->text_rendering_params = render_target->text_rendering_params; } static void STDMETHODCALLTYPE d2d_d3d_render_target_RestoreDrawingState(ID2D1RenderTarget *iface, diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index 28da331..83fd162 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -157,3 +157,11 @@ void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWIN if ((state_block->text_rendering_params = text_rendering_params)) IDWriteRenderingParams_AddRef(state_block->text_rendering_params); } + +struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStateBlock *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d2d_state_block_vtbl); + return CONTAINING_RECORD(iface, struct d2d_state_block, ID2D1DrawingStateBlock_iface); +}

1 0

Nikolay Sivov : dwrite: Initial implementation of DetermineMinWidth().
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 8303199cbe4e0e2a645fe45161fb36922753bc68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8303199cbe4e0e2a645fe4516… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 30 10:15:48 2015 +0300 dwrite: Initial implementation of DetermineMinWidth(). --- dlls/dwrite/layout.c | 73 +++++++++++++++++++++++++++++++++++++++++----- dlls/dwrite/tests/layout.c | 33 ++++++++++++++++++++- 2 files changed, 97 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 054aae7..28889a7 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1,7 +1,7 @@ /* * Text format and layout * - * Copyright 2012, 2014 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2015 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -121,6 +121,12 @@ struct layout_run { DWRITE_GLYPH_OFFSET *offsets; }; +enum layout_recompute_mask { + RECOMPUTE_NOMINAL_RUNS = 1 << 0, + RECOMPUTE_MINIMAL_WIDTH = 1 << 1, + RECOMPUTE_EVERYTHING = 0xffff +}; + struct dwrite_textlayout { IDWriteTextLayout2 IDWriteTextLayout2_iface; IDWriteTextFormat1 IDWriteTextFormat1_iface; @@ -135,13 +141,14 @@ struct dwrite_textlayout { FLOAT maxheight; struct list ranges; struct list runs; - BOOL recompute; + USHORT recompute; DWRITE_LINE_BREAKPOINT *nominal_breakpoints; DWRITE_LINE_BREAKPOINT *actual_breakpoints; DWRITE_CLUSTER_METRICS *clusters; UINT32 clusters_count; + FLOAT minwidth; /* gdi-compatible layout specifics */ BOOL gdicompatible; @@ -586,7 +593,7 @@ static HRESULT layout_compute(struct dwrite_textlayout *layout) { HRESULT hr; - if (!layout->recompute) + if (!(layout->recompute & RECOMPUTE_NOMINAL_RUNS)) return S_OK; /* nominal breakpoints are evaluated only once, because string never changes */ @@ -618,7 +625,7 @@ static HRESULT layout_compute(struct dwrite_textlayout *layout) } } - layout->recompute = FALSE; + layout->recompute &= ~RECOMPUTE_NOMINAL_RUNS; return hr; } @@ -998,7 +1005,7 @@ done: if (changed) { struct list *next, *i; - layout->recompute = TRUE; + layout->recompute = RECOMPUTE_EVERYTHING; i = list_head(ranges); while ((next = list_next(ranges, i))) { struct layout_range *next_range = LIST_ENTRY(next, struct layout_range, entry); @@ -1743,11 +1750,60 @@ static HRESULT WINAPI dwritetextlayout_GetClusterMetrics(IDWriteTextLayout2 *ifa return max_count >= This->clusters_count ? S_OK : E_NOT_SUFFICIENT_BUFFER; } +/* Only to be used with DetermineMinWidth() to find the longest cluster sequence that we don't want to try + too hard to break. */ +static inline BOOL is_terminal_cluster(struct dwrite_textlayout *layout, UINT32 index) +{ + if (layout->clusters[index].isWhitespace || layout->clusters[index].isNewline || + (index == layout->clusters_count - 1)) + return TRUE; + /* check next one */ + return (index < layout->clusters_count - 1) && layout->clusters[index+1].isWhitespace; +} + static HRESULT WINAPI dwritetextlayout_DetermineMinWidth(IDWriteTextLayout2 *iface, FLOAT* min_width) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%p): stub\n", This, min_width); - return E_NOTIMPL; + FLOAT width; + HRESULT hr; + UINT32 i; + + TRACE("(%p)->(%p)\n", This, min_width); + + if (!min_width) + return E_INVALIDARG; + + if (!(This->recompute & RECOMPUTE_MINIMAL_WIDTH)) + goto width_done; + + *min_width = 0.0; + hr = layout_compute(This); + if (FAILED(hr)) + return hr; + + for (i = 0; i < This->clusters_count;) { + if (is_terminal_cluster(This, i)) { + width = This->clusters[i].width; + i++; + } + else { + width = 0.0; + while (!is_terminal_cluster(This, i)) { + width += This->clusters[i].width; + i++; + } + /* count last one too */ + width += This->clusters[i].width; + } + + if (width > This->minwidth) + This->minwidth = width; + } + This->recompute &= ~RECOMPUTE_MINIMAL_WIDTH; + +width_done: + *min_width = This->minwidth; + return S_OK; } static HRESULT WINAPI dwritetextlayout_HitTestPoint(IDWriteTextLayout2 *iface, @@ -2579,11 +2635,12 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * layout->len = len; layout->maxwidth = maxwidth; layout->maxheight = maxheight; - layout->recompute = TRUE; + layout->recompute = RECOMPUTE_EVERYTHING; layout->nominal_breakpoints = NULL; layout->actual_breakpoints = NULL; layout->clusters_count = 0; layout->clusters = NULL; + layout->minwidth = 0.0; list_init(&layout->runs); list_init(&layout->ranges); memset(&layout->format, 0, sizeof(layout->format)); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index bbfc7bc..f36c01e 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1,7 +1,7 @@ /* * Text layout/format tests * - * Copyright 2012, 2014 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2015 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1297,6 +1297,36 @@ if (hr == S_OK) { IDWriteFactory_Release(factory); } +static void test_DetermineMinWidth(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + IDWriteFactory *factory; + FLOAT minwidth; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, lstrlenW(strW), format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_DetermineMinWidth(layout, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + minwidth = 0.0; + hr = IDWriteTextLayout_DetermineMinWidth(layout, &minwidth); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(minwidth > 0.0, "got %.2f\n", minwidth); + + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); +} + START_TEST(layout) { IDWriteFactory *factory; @@ -1323,6 +1353,7 @@ START_TEST(layout) test_SetPairKerning(); test_SetVerticalGlyphOrientation(); test_fallback(); + test_DetermineMinWidth(); IDWriteFactory_Release(factory); }

1 0

Thomas Faber : wscript: Correctly use CommandLineToArgvW.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: ee698506c8d35131c389ce2f4e936be065653524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee698506c8d35131c389ce2f4… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Mar 29 08:25:41 2015 +0200 wscript: Correctly use CommandLineToArgvW. --- programs/wscript/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index d354c90..3537f9d 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -426,11 +426,11 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm WINE_TRACE("(%p %p %s %x)\n", hInst, hPrevInst, wine_dbgstr_w(cmdline), cmdshow); - argv = CommandLineToArgvW(cmdline, &argc); + argv = CommandLineToArgvW(GetCommandLineW(), &argc); if(!argv) return 1; - for(i=0; i<argc; i++) { + for(i=1; i<argc; i++) { if(*argv[i] == '/' || *argv[i] == '-') { if(!set_host_properties(argv[i])) return 1;

1 0

Nikolay Sivov : comctl32/listview: Remove outdated TODO comment.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: c4a3651e3489a91ff63ecf2e7889f2630b9f27f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4a3651e3489a91ff63ecf2e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 28 23:17:18 2015 +0300 comctl32/listview: Remove outdated TODO comment. --- dlls/comctl32/listview.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 44aaba0..861335b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6537,8 +6537,6 @@ static INT LISTVIEW_GetColumnWidth(const LISTVIEW_INFO *infoPtr, INT nColumn) /* We are not using LISTVIEW_GetHeaderRect as this data is updated only after a HDN_ITEMCHANGED. * There is an application that subclasses the listview, calls LVM_GETCOLUMNWIDTH in the * HDN_ITEMCHANGED handler and goes into infinite recursion if it receives old data. - * - * TODO: should we do the same in LVM_GETCOLUMN? */ hdItem.mask = HDI_WIDTH; if (!SendMessageW(infoPtr->hwndHeader, HDM_GETITEMW, nColumn, (LPARAM)&hdItem))

1 0

Nikolay Sivov : comctl32/listview: Always forward LVM_GETCOLUMNORDERARRAY to header.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 5c2e7075df45370c6d74b230a8531fcea2fd473f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c2e7075df45370c6d74b230a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 28 22:06:26 2015 +0300 comctl32/listview: Always forward LVM_GETCOLUMNORDERARRAY to header. --- dlls/comctl32/listview.c | 9 ++------- dlls/comctl32/tests/listview.c | 22 +++++++++++++++++++++- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 0b3439b..44aaba0 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6502,14 +6502,9 @@ static BOOL LISTVIEW_GetColumnT(const LISTVIEW_INFO *infoPtr, INT nColumn, LPLVC return TRUE; } - -static BOOL LISTVIEW_GetColumnOrderArray(const LISTVIEW_INFO *infoPtr, INT iCount, LPINT lpiArray) +static inline BOOL LISTVIEW_GetColumnOrderArray(const LISTVIEW_INFO *infoPtr, INT iCount, LPINT lpiArray) { - TRACE("iCount=%d, lpiArray=%p\n", iCount, lpiArray); - - if (!lpiArray) - return FALSE; - + if (!infoPtr->hwndHeader) return FALSE; return SendMessageW(infoPtr->hwndHeader, HDM_GETORDERARRAY, iCount, (LPARAM)lpiArray); } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 8ce1cfe..0947251 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -176,6 +176,8 @@ static const struct message listview_ownerdata_switchto_seq[] = { static const struct message listview_getorderarray_seq[] = { { LVM_GETCOLUMNORDERARRAY, sent|id|wparam, 2, 0, LISTVIEW_ID }, { HDM_GETORDERARRAY, sent|id|wparam, 2, 0, HEADER_ID }, + { LVM_GETCOLUMNORDERARRAY, sent|id|wparam, 0, 0, LISTVIEW_ID }, + { HDM_GETORDERARRAY, sent|id|wparam, 0, 0, HEADER_ID }, { 0 } }; @@ -1413,13 +1415,28 @@ static void test_items(void) static void test_columns(void) { - HWND hwnd; + HWND hwnd, header; LVCOLUMNA column; LVITEMA item; INT order[2]; CHAR buff[5]; DWORD rc; + hwnd = CreateWindowExA(0, "SysListView32", "foo", LVS_LIST, + 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); + ok(hwnd != NULL, "failed to create listview window\n"); + + header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); + ok(header == NULL, "got %p\n", header); + + rc = SendMessageA(hwnd, LVM_GETCOLUMNORDERARRAY, 2, (LPARAM)&order); + ok(rc == 0, "got %d\n", rc); + + header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); + ok(header == NULL, "got %p\n", header); + + DestroyWindow(hwnd); + hwnd = CreateWindowExA(0, "SysListView32", "foo", LVS_REPORT, 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); ok(hwnd != NULL, "failed to create listview window\n"); @@ -1457,6 +1474,9 @@ static void test_columns(void) ok(order[0] == 0, "Expected order 0, got %d\n", order[0]); ok(order[1] == 1, "Expected order 1, got %d\n", order[1]); + rc = SendMessageA(hwnd, LVM_GETCOLUMNORDERARRAY, 0, 0); + expect(0, rc); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_getorderarray_seq, "get order array", FALSE); /* after column added subitem is considered as present */

1 0

Nikolay Sivov : comctl32/listview: Fix scrolling in LV_VIEW_DETAILS view.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 3c9db1df604a0a56ddd769413f20053fa4cdbc4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c9db1df604a0a56ddd769413… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 28 18:35:07 2015 +0300 comctl32/listview: Fix scrolling in LV_VIEW_DETAILS view. --- dlls/comctl32/listview.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 3ac84a9..0b3439b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4565,13 +4565,22 @@ static void LISTVIEW_DrawItemPart(LISTVIEW_INFO *infoPtr, LVITEMW *item, const N OffsetRect(&rcIcon, pos->x, pos->y); OffsetRect(&rcStateIcon, pos->x, pos->y); OffsetRect(&rcLabel, pos->x, pos->y); - TRACE(" rcBox=%s, rcSelect=%s, rcIcon=%s. rcLabel=%s\n", + TRACE("%d: box=%s, select=%s, icon=%s. label=%s\n", item->iSubItem, wine_dbgstr_rect(&rcBox), wine_dbgstr_rect(&rcSelect), wine_dbgstr_rect(&rcIcon), wine_dbgstr_rect(&rcLabel)); /* FIXME: temporary hack */ rcSelect.left = rcLabel.left; + if (infoPtr->uView == LV_VIEW_DETAILS && item->iSubItem == 0) + { + if (!(infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) + OffsetRect(&rcSelect, LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left, 0); + OffsetRect(&rcIcon, LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left, 0); + OffsetRect(&rcStateIcon, LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left, 0); + OffsetRect(&rcLabel, LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left, 0); + } + /* in icon mode, the label rect is really what we want to draw the * background for */ /* in detail mode, we want to paint background for label rect when @@ -4900,9 +4909,9 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, { INT rgntype; RECT rcClip, rcItem; - POINT Origin, Position; + POINT Origin; RANGES colRanges; - INT col, index; + INT col; ITERATOR j; TRACE("()\n"); @@ -4919,7 +4928,7 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, /* narrow down the columns we need to paint */ for(col = 0; col < DPA_GetPtrCount(infoPtr->hdpaColumns); col++) { - index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, col, 0); + INT index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, col, 0); LISTVIEW_GetHeaderRect(infoPtr, index, &rcItem); if ((rcItem.right + Origin.x >= rcClip.left) && (rcItem.left + Origin.x < rcClip.right)) @@ -4935,10 +4944,12 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, while(iterator_next(i)) { RANGES subitems; + POINT Position; ITERATOR k; SelectObject(hdc, infoPtr->hFont); LISTVIEW_GetItemOrigin(infoPtr, i->nItem, &Position); + Position.x = Origin.x; Position.y += Origin.y; subitems = ranges_create(DPA_GetPtrCount(infoPtr->hdpaColumns)); @@ -4947,7 +4958,6 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, while(iterator_next(&j)) { LISTVIEW_GetHeaderRect(infoPtr, j.nItem, &rcItem); - Position.x = (j.nItem == 0) ? rcItem.left + Origin.x : Origin.x; if (rgntype == COMPLEXREGION && !((infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) && j.nItem == 0)) {

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
78
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 March 2015