January 2017 - Wine-Commits

Henri Verbeet : wined3d: Get rid of surface_modify_ds_location().
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 41738baea205bb308fced32db979de8b55d7d1e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41738baea205bb308fced32db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 26 13:25:19 2017 +0100 wined3d: Get rid of surface_modify_ds_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 3 ++- dlls/wined3d/device.c | 7 ++++--- dlls/wined3d/drawprim.c | 7 ++++--- dlls/wined3d/surface.c | 17 ++++------------- dlls/wined3d/swapchain.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 - 6 files changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index f1aef77..6a366b8 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -632,7 +632,8 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const if (prev_surface && (device->swapchains[0]->desc.flags & WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL || prev_surface->container->flags & WINED3D_TEXTURE_DISCARD)) { - surface_modify_ds_location(prev_surface, WINED3D_LOCATION_DISCARDED); + wined3d_texture_validate_location(prev_surface->container, + prev->sub_resource_idx, WINED3D_LOCATION_DISCARDED); if (prev_surface == device->onscreen_depth_stencil) { wined3d_texture_decref(device->onscreen_depth_stencil->container); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 302df96..10c5df1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -204,8 +204,8 @@ void device_switch_onscreen_ds(struct wined3d_device *device, if (device->onscreen_depth_stencil) { surface_load_location(device->onscreen_depth_stencil, context, WINED3D_LOCATION_TEXTURE_RGB); - - surface_modify_ds_location(device->onscreen_depth_stencil, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(device->onscreen_depth_stencil->container, + surface_get_sub_resource_idx(device->onscreen_depth_stencil), ~WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_decref(device->onscreen_depth_stencil->container); } device->onscreen_depth_stencil = depth_stencil; @@ -331,7 +331,8 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c { DWORD location = render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; - surface_modify_ds_location(depth_stencil, location); + wined3d_texture_validate_location(depth_stencil->container, dsv->sub_resource_idx, location); + wined3d_texture_invalidate_location(depth_stencil->container, dsv->sub_resource_idx, ~location); gl_info->gl_ops.gl.p_glDepthMask(GL_TRUE); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ZWRITEENABLE)); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index d846b8f..ddeb238 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -483,12 +483,13 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s return; } - if (fb->depth_stencil && state->render_states[WINED3D_RS_ZWRITEENABLE]) + if (dsv && state->render_states[WINED3D_RS_ZWRITEENABLE]) { - struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(fb->depth_stencil); + struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(dsv); DWORD location = context->render_offscreen ? ds->container->resource.draw_binding : WINED3D_LOCATION_DRAWABLE; - surface_modify_ds_location(ds, location); + wined3d_texture_validate_location(ds->container, dsv->sub_resource_idx, location); + wined3d_texture_invalidate_location(ds->container, dsv->sub_resource_idx, ~location); } if ((!gl_info->supported[WINED3D_GL_VERSION_2_0] diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ad02a20..b4e2025 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -712,6 +712,7 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DW struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_device *device = src_texture->resource.device; + unsigned int dst_sub_resource_idx; if (!fbo_blit_supported(&device->adapter->gl_info, WINED3D_BLIT_OP_DEPTH_BLIT, src_rect, src_texture->resource.usage, src_texture->resource.pool, src_texture->resource.format, @@ -720,7 +721,9 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DW surface_depth_blt_fbo(device, src_surface, src_location, src_rect, dst_surface, dst_location, dst_rect); - surface_modify_ds_location(dst_surface, dst_location); + dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); + wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, dst_location); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_location); return WINED3D_OK; } @@ -2488,18 +2491,6 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE return WINED3DERR_INVALIDCALL; } -void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location) -{ - struct wined3d_texture *texture = surface->container; - unsigned int sub_resource_idx; - - TRACE("surface %p, new location %#x.\n", surface, location); - - sub_resource_idx = surface_get_sub_resource_idx(surface); - wined3d_texture_validate_location(texture, sub_resource_idx, location); - wined3d_texture_invalidate_location(texture, sub_resource_idx, ~location); -} - static DWORD resource_access_from_location(DWORD location) { switch (location) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index cb704cd..30f6c7d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -622,7 +622,8 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, if (ds && (swapchain->desc.flags & WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL || ds->container->flags & WINED3D_TEXTURE_DISCARD)) { - surface_modify_ds_location(ds, WINED3D_LOCATION_DISCARDED); + wined3d_texture_validate_location(ds->container, + fb->depth_stencil->sub_resource_idx, WINED3D_LOCATION_DISCARDED); if (ds == swapchain->device->onscreen_depth_stencil) { wined3d_texture_decref(swapchain->device->onscreen_depth_stencil->container); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 31c6c0d..338aef0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2983,7 +2983,6 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; -void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_surface *rt) DECLSPEC_HIDDEN; void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Get rid of the "ds_current_size" field from struct wined3d_surface.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 35e651caf130e1370c3fa7866ce0e1d29aa2aacd URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e651caf130e1370c3fa7866… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 26 13:25:18 2017 +0100 wined3d: Get rid of the "ds_current_size" field from struct wined3d_surface. This should be unused now that surface_load_ds_location() is gone. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 2 +- dlls/wined3d/device.c | 66 ++---------------------------------------- dlls/wined3d/drawprim.c | 17 ++--------- dlls/wined3d/surface.c | 23 +++------------ dlls/wined3d/swapchain.c | 3 +- dlls/wined3d/wined3d_private.h | 3 +- 6 files changed, 12 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35e651caf130e1370c3fa…

1 0

Henri Verbeet : wined3d: Simplify shader_glsl_load_np2fixup_constants().
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: adf849356615a36e19ebc17c322e5ad19dae94e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf849356615a36e19ebc17c3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 26 13:25:17 2017 +0100 wined3d: Simplify shader_glsl_load_np2fixup_constants(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8bd4cb5..7196cc6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -887,7 +887,11 @@ static void reset_program_constant_version(struct wine_rb_entry *entry, void *co static void shader_glsl_load_np2fixup_constants(const struct glsl_ps_program *ps, const struct wined3d_gl_info *gl_info, const struct wined3d_state *state) { - GLfloat np2fixup_constants[4 * MAX_FRAGMENT_SAMPLERS]; + struct + { + float sx, sy; + } + np2fixup_constants[MAX_FRAGMENT_SAMPLERS]; UINT fixup = ps->np2_fixup_info->active; UINT i; @@ -895,7 +899,6 @@ static void shader_glsl_load_np2fixup_constants(const struct glsl_ps_program *ps { const struct wined3d_texture *tex = state->textures[i]; unsigned char idx = ps->np2_fixup_info->idx[i]; - GLfloat *tex_dim = &np2fixup_constants[(idx >> 1) * 4]; if (!tex) { @@ -903,19 +906,11 @@ static void shader_glsl_load_np2fixup_constants(const struct glsl_ps_program *ps continue; } - if (idx % 2) - { - tex_dim[2] = tex->pow2_matrix[0]; - tex_dim[3] = tex->pow2_matrix[5]; - } - else - { - tex_dim[0] = tex->pow2_matrix[0]; - tex_dim[1] = tex->pow2_matrix[5]; - } + np2fixup_constants[idx].sx = tex->pow2_matrix[0]; + np2fixup_constants[idx].sy = tex->pow2_matrix[5]; } - GL_EXTCALL(glUniform4fv(ps->np2_fixup_location, ps->np2_fixup_info->num_consts, np2fixup_constants)); + GL_EXTCALL(glUniform4fv(ps->np2_fixup_location, ps->np2_fixup_info->num_consts, &np2fixup_constants[0].sx)); } /* Taken and adapted from Mesa. */

1 0

Vincent Povirk : kernel32: DETACHED_PROCESS prevents automatic std handle inheritance.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: b1b4de5d6bf0dbe73b12b6b16e9442dbcdec7290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1b4de5d6bf0dbe73b12b6b16… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 25 15:04:13 2017 -0600 kernel32: DETACHED_PROCESS prevents automatic std handle inheritance. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 6 +++++ dlls/kernel32/tests/process.c | 53 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 17cb1db..aaa1058 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1696,6 +1696,12 @@ static startup_info_t *create_startup_info( LPCWSTR filename, LPCWSTR cmdline, hstdout = startup->hStdOutput; hstderr = startup->hStdError; } + else if (flags & DETACHED_PROCESS) + { + hstdin = INVALID_HANDLE_VALUE; + hstdout = INVALID_HANDLE_VALUE; + hstderr = INVALID_HANDLE_VALUE; + } else { hstdin = GetStdHandle( STD_INPUT_HANDLE ); diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index a36ecd6..9b429b8 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2895,6 +2895,58 @@ static void test_StartupNoConsole(void) #endif } +static void test_DetachStdHandles(void) +{ +#ifndef _WIN64 + char buffer[MAX_PATH], tempfile[MAX_PATH]; + STARTUPINFOA startup; + PROCESS_INFORMATION info; + HANDLE hstdin, hstdout, hstderr, htemp; + BOOL res; + + hstdin = GetStdHandle(STD_INPUT_HANDLE); + hstdout = GetStdHandle(STD_OUTPUT_HANDLE); + hstderr = GetStdHandle(STD_ERROR_HANDLE); + + get_file_name(tempfile); + htemp = CreateFileA(tempfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(htemp != INVALID_HANDLE_VALUE, "failed opening temporary file\n"); + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + get_file_name(resfile); + sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + + SetStdHandle(STD_INPUT_HANDLE, htemp); + SetStdHandle(STD_OUTPUT_HANDLE, htemp); + SetStdHandle(STD_ERROR_HANDLE, htemp); + + res = CreateProcessA(NULL, buffer, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &startup, + &info); + + SetStdHandle(STD_INPUT_HANDLE, hstdin); + SetStdHandle(STD_OUTPUT_HANDLE, hstdout); + SetStdHandle(STD_ERROR_HANDLE, hstderr); + + ok(res, "CreateProcess failed\n"); + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + okChildInt("StartupInfoA", "hStdInput", (UINT)INVALID_HANDLE_VALUE); + okChildInt("StartupInfoA", "hStdOutput", (UINT)INVALID_HANDLE_VALUE); + okChildInt("StartupInfoA", "hStdError", (UINT)INVALID_HANDLE_VALUE); + okChildInt("TEB", "hStdInput", 0); + okChildInt("TEB", "hStdOutput", 0); + okChildInt("TEB", "hStdError", 0); + release_memory(); + DeleteFileA(resfile); + + CloseHandle(htemp); + DeleteFileA(tempfile); +#endif +} + static void test_GetNumaProcessorNode(void) { SYSTEM_INFO si; @@ -3328,6 +3380,7 @@ START_TEST(process) test_RegistryQuota(); test_DuplicateHandle(); test_StartupNoConsole(); + test_DetachStdHandles(); test_GetNumaProcessorNode(); test_session_info(); test_GetLogicalProcessorInformationEx();

1 0

Huw Davies : user32: Disable cached DCs once they are released.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: a60144ee74e1db170f04edeb8cfd3a5a17d36d46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a60144ee74e1db170f04edeb8… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 26 09:30:20 2017 +0000 user32: Disable cached DCs once they are released. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 13 ++++++++++--- dlls/user32/tests/dce.c | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 622dcad..7a6b0dc 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -476,7 +476,11 @@ static INT release_dc( HWND hwnd, HDC hdc, BOOL end_paint ) { if (!(dce->flags & DCX_NORESETATTRS)) SetHookFlags( dce->hdc, DCHF_RESETDC ); if (end_paint || (dce->flags & DCX_CACHE)) delete_clip_rgn( dce ); - if (dce->flags & DCX_CACHE) dce->count = 0; + if (dce->flags & DCX_CACHE) + { + dce->count = 0; + SetHookFlags( dce->hdc, DCHF_DISABLEDC ); + } ret = TRUE; } USER_Unlock(); @@ -1007,8 +1011,11 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) if (!found && count >= DCE_CACHE_SIZE) found = dceUnused; dce = found; - if (dce) dce->count = 1; - + if (dce) + { + dce->count = 1; + SetHookFlags( dce->hdc, DCHF_ENABLEDC ); + } USER_Unlock(); /* if there's no dce empty or unused, allocate a new one */ diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index b5f9722..382d10a 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -112,9 +112,9 @@ static void test_dc_attributes(void) /* Released cache DCs are 'disabled' */ rop = SetROP2( old_hdc, R2_BLACK ); - todo_wine ok( rop == 0, "got %d\n", rop ); + ok( rop == 0, "got %d\n", rop ); rop = GetROP2( old_hdc ); - todo_wine ok( rop == 0, "got %d\n", rop ); + ok( rop == 0, "got %d\n", rop ); /* test own DC */

1 0

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

Jan. 26, 2017

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

Henri Verbeet : wined3d: Get rid of the "onscreen_depth_stencil" field from struct wined3d_device.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 7c5fd62efc095adc449fad558b003fb7cc3587b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5fd62efc095adc449fad558… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 26 13:25:20 2017 +0100 wined3d: Get rid of the "onscreen_depth_stencil" field from struct wined3d_device. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 5 ----- dlls/wined3d/device.c | 31 ------------------------------- dlls/wined3d/drawprim.c | 5 ----- dlls/wined3d/swapchain.c | 7 ------- dlls/wined3d/wined3d_private.h | 3 --- 5 files changed, 51 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 6a366b8..c030d35 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -634,11 +634,6 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const { wined3d_texture_validate_location(prev_surface->container, prev->sub_resource_idx, WINED3D_LOCATION_DISCARDED); - if (prev_surface == device->onscreen_depth_stencil) - { - wined3d_texture_decref(device->onscreen_depth_stencil->container); - device->onscreen_depth_stencil = NULL; - } } } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 10c5df1..75a939e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -198,20 +198,6 @@ void device_context_remove(struct wined3d_device *device, struct wined3d_context device->contexts = new_array; } -void device_switch_onscreen_ds(struct wined3d_device *device, - struct wined3d_context *context, struct wined3d_surface *depth_stencil) -{ - if (device->onscreen_depth_stencil) - { - surface_load_location(device->onscreen_depth_stencil, context, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_invalidate_location(device->onscreen_depth_stencil->container, - surface_get_sub_resource_idx(device->onscreen_depth_stencil), ~WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_decref(device->onscreen_depth_stencil->container); - } - device->onscreen_depth_stencil = depth_stencil; - wined3d_texture_incref(device->onscreen_depth_stencil->container); -} - static BOOL is_full_clear(const struct wined3d_surface *target, const RECT *draw_rect, const RECT *clear_rect) { unsigned int height = wined3d_texture_get_level_height(target->container, target->texture_level); @@ -300,8 +286,6 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c { DWORD location = render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; - if (!render_offscreen && depth_stencil != device->onscreen_depth_stencil) - device_switch_onscreen_ds(device, context, depth_stencil); surface_load_location(depth_stencil, context, location); } @@ -1086,7 +1070,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) struct wined3d_resource *resource, *cursor; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - struct wined3d_surface *surface; UINT i; TRACE("device %p.\n", device); @@ -1133,14 +1116,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) context_release(context); - /* Release the buffers (with sanity checks) */ - if (device->onscreen_depth_stencil) - { - surface = device->onscreen_depth_stencil; - device->onscreen_depth_stencil = NULL; - wined3d_texture_decref(surface->container); - } - if (device->fb.depth_stencil) { struct wined3d_rendertarget_view *view = device->fb.depth_stencil; @@ -4636,12 +4611,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } wined3d_device_set_depth_stencil_view(device, NULL); - if (device->onscreen_depth_stencil) - { - wined3d_texture_decref(device->onscreen_depth_stencil->container); - device->onscreen_depth_stencil = NULL; - } - if (reset_state) { LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index ddeb238..a3d88b9 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -466,12 +466,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(dsv); if (state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]) - { - if (!context->render_offscreen && ds != device->onscreen_depth_stencil) - device_switch_onscreen_ds(device, context, ds); - wined3d_texture_load_location(ds->container, dsv->sub_resource_idx, context, location); - } else wined3d_texture_prepare_location(ds->container, dsv->sub_resource_idx, context, location); } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 30f6c7d..62589c1 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -621,15 +621,8 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, if (ds && (swapchain->desc.flags & WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL || ds->container->flags & WINED3D_TEXTURE_DISCARD)) - { wined3d_texture_validate_location(ds->container, fb->depth_stencil->sub_resource_idx, WINED3D_LOCATION_DISCARDED); - if (ds == swapchain->device->onscreen_depth_stencil) - { - wined3d_texture_decref(swapchain->device->onscreen_depth_stencil->container); - swapchain->device->onscreen_depth_stencil = NULL; - } - } } context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 338aef0..9f061bf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2560,7 +2560,6 @@ struct wined3d_device /* Render Target Support */ struct wined3d_fb_state fb; - struct wined3d_surface *onscreen_depth_stencil; struct wined3d_rendertarget_view *auto_depth_stencil_view; /* For rendering to a texture using glCopyTexImage */ @@ -2612,8 +2611,6 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; -void device_switch_onscreen_ds(struct wined3d_device *device, struct wined3d_context *context, - struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state)

1 0

Vincent Povirk : kernel32: DETACHED_PROCESS doesn' t affect STARTUPINFO console handles.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 0ad641af9cf83b89eeead95e6a476d53a75e803d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ad641af9cf83b89eeead95e6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 25 15:04:14 2017 -0600 kernel32: DETACHED_PROCESS doesn't affect STARTUPINFO console handles. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 2 +- dlls/kernel32/tests/process.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index aaa1058..5a9fea2 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1711,7 +1711,7 @@ static startup_info_t *create_startup_info( LPCWSTR filename, LPCWSTR cmdline, info->hstdin = wine_server_obj_handle( hstdin ); info->hstdout = wine_server_obj_handle( hstdout ); info->hstderr = wine_server_obj_handle( hstderr ); - if ((flags & (CREATE_NEW_CONSOLE | DETACHED_PROCESS)) != 0) + if ((flags & CREATE_NEW_CONSOLE) != 0) { /* this is temporary (for console handles). We have no way to control that the handle is invalid in child process otherwise */ if (is_console_handle(hstdin)) info->hstdin = wine_server_obj_handle( INVALID_HANDLE_VALUE ); diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 9b429b8..f66ab45 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2895,6 +2895,46 @@ static void test_StartupNoConsole(void) #endif } +static void test_DetachConsoleHandles(void) +{ +#ifndef _WIN64 + char buffer[MAX_PATH]; + STARTUPINFOA startup; + PROCESS_INFORMATION info; + UINT result; + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW|STARTF_USESTDHANDLES; + startup.wShowWindow = SW_SHOWNORMAL; + startup.hStdInput = GetStdHandle(STD_INPUT_HANDLE); + startup.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); + startup.hStdError = GetStdHandle(STD_ERROR_HANDLE); + get_file_name(resfile); + sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &startup, + &info), "CreateProcess\n"); + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + + result = GetPrivateProfileIntA("StartupInfoA", "hStdInput", 0, resfile); + ok(result != 0 && result != (UINT)INVALID_HANDLE_VALUE, "bad handle %x\n", result); + result = GetPrivateProfileIntA("StartupInfoA", "hStdOutput", 0, resfile); + ok(result != 0 && result != (UINT)INVALID_HANDLE_VALUE, "bad handle %x\n", result); + result = GetPrivateProfileIntA("StartupInfoA", "hStdError", 0, resfile); + ok(result != 0 && result != (UINT)INVALID_HANDLE_VALUE, "bad handle %x\n", result); + result = GetPrivateProfileIntA("TEB", "hStdInput", 0, resfile); + ok(result != 0 && result != (UINT)INVALID_HANDLE_VALUE, "bad handle %x\n", result); + result = GetPrivateProfileIntA("TEB", "hStdOutput", 0, resfile); + ok(result != 0 && result != (UINT)INVALID_HANDLE_VALUE, "bad handle %x\n", result); + result = GetPrivateProfileIntA("TEB", "hStdError", 0, resfile); + ok(result != 0 && result != (UINT)INVALID_HANDLE_VALUE, "bad handle %x\n", result); + + release_memory(); + DeleteFileA(resfile); +#endif +} + static void test_DetachStdHandles(void) { #ifndef _WIN64 @@ -3380,6 +3420,7 @@ START_TEST(process) test_RegistryQuota(); test_DuplicateHandle(); test_StartupNoConsole(); + test_DetachConsoleHandles(); test_DetachStdHandles(); test_GetNumaProcessorNode(); test_session_info();

1 0

Marcus Meissner : maintainers: Add myself for gphoto2.ds.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 356a5261e1e20393ce1c7f535c5849abeb58ddb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=356a5261e1e20393ce1c7f535… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Jan 26 13:29:57 2017 +0100 maintainers: Add myself for gphoto2.ds. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 46e4273..f936afe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -118,6 +118,10 @@ GDIPlus M: Vincent Povirk <vincent(a)codeweavers.com> F: dlls/gdiplus/ +GPhoto Driver +M: Marcus Meissner <marcus(a)jet.franken.de> +F: dlls/gphoto2.ds/ + HID support M: Aric Stewart <aric(a)codeweavers.com> F: dlls/hid/

1 0

Henri Verbeet : wined3d: Only store light type counts in struct wined3d_ffp_vs_settings.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 7757ecfc702c243028e5bfd1a95955ed08f16164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7757ecfc702c243028e5bfd1a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 26 13:25:21 2017 +0100 wined3d: Only store light type counts in struct wined3d_ffp_vs_settings. The ordering doesn't matter, so this avoids creating some redundant shader variants. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 308 ++++++++++++++++++++++++----------------- dlls/wined3d/utils.c | 24 +++- dlls/wined3d/wined3d_private.h | 12 +- 3 files changed, 207 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7757ecfc702c243028e5b…

1 0