March 2018 - Wine-Commits - list.winehq.org

Alexandre Julliard : kernel32/tests: Remove some win9x workarounds.
by Alexandre Julliard March 2, 2018

March 2, 2018

Module: wine Branch: master Commit: be8affc4bd92f16b6387150902c0f19c3336e1f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be8affc4bd92f16b63871509… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 2 10:39:50 2018 +0100 kernel32/tests: Remove some win9x workarounds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 195 ++++++++++++++++----------------------------- 1 file changed, 67 insertions(+), 128 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be8affc4bd92f16b6387…

1 0

Alexandre Julliard : kernel32: Move the mapping object functions to sync.c.
by Alexandre Julliard March 2, 2018

March 2, 2018

Module: wine Branch: master Commit: c52e3ff24999ab93d837bc6af21152e647ef540a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c52e3ff24999ab93d837bc6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 2 10:51:31 2018 +0100 kernel32: Move the mapping object functions to sync.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel_private.h | 3 - dlls/kernel32/sync.c | 141 +++++++++++++++++++++++++++++- dlls/kernel32/virtual.c | 190 ----------------------------------------- 3 files changed, 140 insertions(+), 194 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c52e3ff24999ab93d837…

1 0

Józef Kucia : wined3d: Implement draw calls with no attachments.
by Alexandre Julliard March 2, 2018

March 2, 2018

Module: wine Branch: master Commit: 7096e1e02d900bb47c819fde223ec91dd7dbb733 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7096e1e02d900bb47c819fde… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 1 19:36:52 2018 +0100 wined3d: Implement draw calls with no attachments. Supported when ARB_framebuffer_no_attachments is available. It was reported that no attachments framebuffers trigger GPU hangs in The Witcher 3 on some system configurations with radeonsi driver. MESA_EXTENSION_OVERRIDE=-GL_ARB_framebuffer_no_attachments can be used as a workaround until it's fixed. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 35 ++++++++++++++++++++++++++++------- dlls/wined3d/directx.c | 13 +++++++++++++ dlls/wined3d/state.c | 13 ++++--------- dlls/wined3d/wined3d_private.h | 3 +++ 4 files changed, 48 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 975a79c..c73e4d1 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -700,8 +700,8 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, static void context_apply_fbo_entry(struct wined3d_context *context, GLenum target, struct fbo_entry *entry) { const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int i; GLuint read_binding, draw_binding; + unsigned int i; if (entry->flags & WINED3D_FBO_ENTRY_FLAG_ATTACHED) { @@ -713,6 +713,16 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ draw_binding = context->fbo_draw_binding; context_bind_fbo(context, GL_FRAMEBUFFER, entry->id); + if (gl_info->supported[ARB_FRAMEBUFFER_NO_ATTACHMENTS]) + { + GL_EXTCALL(glFramebufferParameteri(GL_FRAMEBUFFER, + GL_FRAMEBUFFER_DEFAULT_WIDTH, gl_info->limits.framebuffer_width)); + GL_EXTCALL(glFramebufferParameteri(GL_FRAMEBUFFER, + GL_FRAMEBUFFER_DEFAULT_HEIGHT, gl_info->limits.framebuffer_height)); + GL_EXTCALL(glFramebufferParameteri(GL_FRAMEBUFFER, GL_FRAMEBUFFER_DEFAULT_LAYERS, 1)); + GL_EXTCALL(glFramebufferParameteri(GL_FRAMEBUFFER, GL_FRAMEBUFFER_DEFAULT_SAMPLES, 1)); + } + /* Apply render targets */ for (i = 0; i < gl_info->limits.buffers; ++i) { @@ -2996,12 +3006,13 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine context_invalidate_state(context, STATE_FRAMEBUFFER); } -static BOOL context_validate_rt_config(UINT rt_count, struct wined3d_rendertarget_view * const *rts, +static BOOL have_framebuffer_attachment(unsigned int rt_count, struct wined3d_rendertarget_view * const *rts, const struct wined3d_rendertarget_view *ds) { unsigned int i; - if (ds) return TRUE; + if (ds) + return TRUE; for (i = 0; i < rt_count; ++i) { @@ -3009,7 +3020,6 @@ static BOOL context_validate_rt_config(UINT rt_count, struct wined3d_rendertarge return TRUE; } - WARN("Invalid render target config, need at least one attachment.\n"); return FALSE; } @@ -3026,8 +3036,11 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win if (isStateDirty(context, STATE_FRAMEBUFFER) || fb != state->fb || rt_count != gl_info->limits.buffers) { - if (!context_validate_rt_config(rt_count, rts, dsv)) + if (!have_framebuffer_attachment(rt_count, rts, dsv)) + { + WARN("Invalid render target config, need at least one attachment.\n"); return FALSE; + } if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { @@ -3908,8 +3921,16 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, unsigned int i; WORD map; - if (!context_validate_rt_config(gl_info->limits.buffers, fb->render_targets, fb->depth_stencil)) - return FALSE; + if (!have_framebuffer_attachment(gl_info->limits.buffers, fb->render_targets, fb->depth_stencil)) + { + if (!gl_info->supported[ARB_FRAMEBUFFER_NO_ATTACHMENTS]) + { + FIXME("OpenGL implementation does not support framebuffers with no attachments.\n"); + return FALSE; + } + + context_set_render_offscreen(context, TRUE); + } if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && isStateDirty(context, STATE_FRAMEBUFFER)) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a95ded3..b73966a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3779,6 +3779,19 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.samples = gl_max; } + if (gl_info->supported[ARB_FRAMEBUFFER_NO_ATTACHMENTS]) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_FRAMEBUFFER_WIDTH, &gl_max); + gl_info->limits.framebuffer_width = gl_max; + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_FRAMEBUFFER_HEIGHT, &gl_max); + gl_info->limits.framebuffer_height = gl_max; + } + else + { + gl_info->limits.framebuffer_width = gl_info->limits.texture_size; + gl_info->limits.framebuffer_height = gl_info->limits.texture_size; + } + gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL] = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], MAX_GL_FRAGMENT_SAMPLERS); sampler_count = 0; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 407ad62..fd858c5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4671,17 +4671,15 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine } else if (depth_stencil) { - width = depth_stencil->width; height = depth_stencil->height; } else { - FIXME("No attachments draw calls not supported.\n"); - return; + height = gl_info->limits.framebuffer_height; } gl_info->gl_ops.gl.p_glDepthRange(vp.min_z, vp.max_z); - checkGLcall("glDepthRange"); + /* Note: GL requires lower left, DirectX supplies upper left. This is * reversed when using offscreen rendering. */ y = context->render_offscreen ? vp.y : height - (vp.y + vp.height); @@ -4690,7 +4688,7 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine GL_EXTCALL(glViewportIndexedf(0, vp.x, y, vp.width, vp.height)); else gl_info->gl_ops.gl.p_glViewport(vp.x, y, vp.width, vp.height); - checkGLcall("glViewport"); + checkGLcall("setting clip space and viewport"); } static void viewport_miscpart_cc(struct wined3d_context *context, @@ -4717,17 +4715,14 @@ static void viewport_miscpart_cc(struct wined3d_context *context, } else if (depth_stencil) { - width = depth_stencil->width; height = depth_stencil->height; } else { - FIXME("No attachments draw calls not supported.\n"); - return; + height = gl_info->limits.framebuffer_height; } gl_info->gl_ops.gl.p_glDepthRange(vp.min_z, vp.max_z); - checkGLcall("glDepthRange"); if (context->render_offscreen) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f085f2d..1c4c3ef 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2533,6 +2533,9 @@ struct wined3d_gl_limits unsigned int texture_buffer_offset_alignment; + unsigned int framebuffer_width; + unsigned int framebuffer_height; + UINT glsl_varyings; UINT glsl_vs_float_constants; UINT glsl_ps_float_constants;

1 0

Józef Kucia : wined3d: Factor out get_viewport() function.
by Alexandre Julliard March 2, 2018

March 2, 2018

Module: wine Branch: master Commit: 544a7daaebcdd329517854b32c4f8f42374cde4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=544a7daaebcdd329517854b3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 1 19:36:53 2018 +0100 wined3d: Factor out get_viewport() function. No attachment draw calls are always offscreen. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 89 +++++++++++++++++++++++----------------------------- 1 file changed, 39 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index fd858c5..e3c39f6 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4651,22 +4651,32 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine } } -static void viewport_miscpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void get_viewport(struct wined3d_context *context, const struct wined3d_state *state, + struct wined3d_viewport *viewport) { const struct wined3d_rendertarget_view *depth_stencil = state->fb->depth_stencil; const struct wined3d_rendertarget_view *target = state->fb->render_targets[0]; - const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_viewport vp = state->viewport; unsigned int width, height; - float y; + + *viewport = state->viewport; if (target) { - if (vp.width > target->width) - vp.width = target->width; - if (vp.height > target->height) - vp.height = target->height; + if (viewport->width > target->width) + viewport->width = target->width; + if (viewport->height > target->height) + viewport->height = target->height; + } + + /* + * Note: GL requires lower left, DirectX supplies upper left. This is + * reversed when using offscreen rendering. + */ + if (context->render_offscreen) + return; + if (target) + { wined3d_rendertarget_view_get_drawable_size(target, context, &width, &height); } else if (depth_stencil) @@ -4675,67 +4685,46 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine } else { - height = gl_info->limits.framebuffer_height; + FIXME("Could not get the height of render targets.\n"); + return; } - gl_info->gl_ops.gl.p_glDepthRange(vp.min_z, vp.max_z); + viewport->y = height - (viewport->y + viewport->height); +} + +static void viewport_miscpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_viewport vp; - /* Note: GL requires lower left, DirectX supplies upper left. This is - * reversed when using offscreen rendering. */ - y = context->render_offscreen ? vp.y : height - (vp.y + vp.height); + get_viewport(context, state, &vp); + + gl_info->gl_ops.gl.p_glDepthRange(vp.min_z, vp.max_z); if (gl_info->supported[ARB_VIEWPORT_ARRAY]) - GL_EXTCALL(glViewportIndexedf(0, vp.x, y, vp.width, vp.height)); + GL_EXTCALL(glViewportIndexedf(0, vp.x, vp.y, vp.width, vp.height)); else - gl_info->gl_ops.gl.p_glViewport(vp.x, y, vp.width, vp.height); + gl_info->gl_ops.gl.p_glViewport(vp.x, vp.y, vp.width, vp.height); checkGLcall("setting clip space and viewport"); } static void viewport_miscpart_cc(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - const struct wined3d_rendertarget_view *depth_stencil = state->fb->depth_stencil; - const struct wined3d_rendertarget_view *target = state->fb->render_targets[0]; - /* See get_projection_matrix() in utils.c for a discussion about those - * values. */ + /* See get_projection_matrix() in utils.c for a discussion about those values. */ float pixel_center_offset = context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER ? 63.0f / 128.0f : -1.0f / 128.0f; const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_viewport vp = state->viewport; - unsigned int width, height; - - if (target) - { - if (vp.width > target->width) - vp.width = target->width; - if (vp.height > target->height) - vp.height = target->height; + struct wined3d_viewport vp; - wined3d_rendertarget_view_get_drawable_size(target, context, &width, &height); - } - else if (depth_stencil) - { - height = depth_stencil->height; - } - else - { - height = gl_info->limits.framebuffer_height; - } + get_viewport(context, state, &vp); + vp.x += pixel_center_offset; + vp.y += pixel_center_offset; gl_info->gl_ops.gl.p_glDepthRange(vp.min_z, vp.max_z); - if (context->render_offscreen) - { - GL_EXTCALL(glClipControl(GL_UPPER_LEFT, GL_ZERO_TO_ONE)); - GL_EXTCALL(glViewportIndexedf(0, vp.x + pixel_center_offset, vp.y + pixel_center_offset, - vp.width, vp.height)); - } - else - { - GL_EXTCALL(glClipControl(GL_LOWER_LEFT, GL_ZERO_TO_ONE)); - GL_EXTCALL(glViewportIndexedf(0, vp.x + pixel_center_offset, - (height - (vp.y + vp.height)) + pixel_center_offset, vp.width, vp.height)); - } + GL_EXTCALL(glClipControl(context->render_offscreen ? GL_UPPER_LEFT : GL_LOWER_LEFT, GL_ZERO_TO_ONE)); + GL_EXTCALL(glViewportIndexedf(0, vp.x, vp.y, vp.width, vp.height)); checkGLcall("setting clip space and viewport"); }

1 0

Józef Kucia : d3d11/tests: Use no attachments draw calls.
by Alexandre Julliard March 2, 2018

March 2, 2018

Module: wine Branch: master Commit: 27f18f82a762d240110dd26e87f1671171ec5e56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27f18f82a762d240110dd26e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 1 19:36:56 2018 +0100 d3d11/tests: Use no attachments draw calls. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 38 +++++++------------------------------- 1 file changed, 7 insertions(+), 31 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1826114..6d7fccd 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12614,14 +12614,13 @@ static void test_draw_uav_only(void) ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); - /* FIXME: Set the render targets to NULL when no attachment draw calls are supported in wined3d. */ - ID3D11DeviceContext_OMSetRenderTargetsAndUnorderedAccessViews(context, 1, &test_context.backbuffer_rtv, NULL, + ID3D11DeviceContext_OMSetRenderTargetsAndUnorderedAccessViews(context, 0, NULL, NULL, 0, 1, &uav, NULL); ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, values); memset(&vp, 0, sizeof(vp)); - vp.Width = 1.0f; - vp.Height = 100.0f; + vp.Width = 10.0f; + vp.Height = 10.0f; ID3D11DeviceContext_RSSetViewports(context, 1, &vp); ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, values); draw_quad(&test_context); @@ -17685,9 +17684,8 @@ static void test_ps_cs_uav_binding(void) ID3D11DeviceContext_CSSetConstantBuffers(context, 0, 1, &cs_cb); ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &cs_uav, NULL); ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &ps_cb); - /* FIXME: Set the render targets to NULL when no attachment draw calls are supported in wined3d. */ ID3D11DeviceContext_OMSetRenderTargetsAndUnorderedAccessViews(context, - 1, &test_context.backbuffer_rtv, NULL, 1, 1, &ps_uav, NULL); + 0, NULL, NULL, 1, 1, &ps_uav, NULL); ID3D11DeviceContext_ClearUnorderedAccessViewFloat(context, cs_uav, zero); check_texture_float(cs_texture, 0.0f, 2); @@ -17749,11 +17747,8 @@ static void test_atomic_instructions(void) D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; struct d3d11_test_context test_context; struct resource_readback rb, out_rb; - D3D11_TEXTURE2D_DESC texture_desc; D3D11_BUFFER_DESC buffer_desc; ID3D11DeviceContext *context; - ID3D11RenderTargetView *rtv; - ID3D11Texture2D *texture; ID3D11ComputeShader *cs; ID3D11PixelShader *ps; ID3D11Device *device; @@ -17883,22 +17878,6 @@ static void test_atomic_instructions(void) device = test_context.device; context = test_context.immediate_context; - texture_desc.Width = 1; - texture_desc.Height = 1; - texture_desc.MipLevels = 1; - texture_desc.ArraySize = 1; - texture_desc.Format = DXGI_FORMAT_R32_FLOAT; - texture_desc.SampleDesc.Count = 1; - texture_desc.SampleDesc.Quality = 0; - texture_desc.Usage = D3D11_USAGE_DEFAULT; - texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; - texture_desc.CPUAccessFlags = 0; - texture_desc.MiscFlags = 0; - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); - ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); - cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, 2 * sizeof(struct uvec4), NULL); ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); ID3D11DeviceContext_CSSetConstantBuffers(context, 0, 1, &cb); @@ -17925,8 +17904,8 @@ static void test_atomic_instructions(void) vp.TopLeftX = 0.0f; vp.TopLeftY = 0.0f; - vp.Width = texture_desc.Width; - vp.Height = texture_desc.Height; + vp.Width = 1.0f; + vp.Height = 1.0f; vp.MinDepth = 0.0f; vp.MaxDepth = 1.0f; ID3D11DeviceContext_RSSetViewports(context, 1, &vp); @@ -17949,8 +17928,7 @@ static void test_atomic_instructions(void) ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)in_buffer, 0, NULL, test->input, 0, 0); - /* FIXME: Set the render targets to NULL when no attachment draw calls are supported in wined3d. */ - ID3D11DeviceContext_OMSetRenderTargetsAndUnorderedAccessViews(context, 1, &rtv, NULL, + ID3D11DeviceContext_OMSetRenderTargetsAndUnorderedAccessViews(context, 0, NULL, NULL, 0, 1, &in_uav, NULL); draw_quad(&test_context); @@ -18007,8 +17985,6 @@ static void test_atomic_instructions(void) ID3D11Buffer_Release(out_buffer); ID3D11ComputeShader_Release(cs); ID3D11PixelShader_Release(ps); - ID3D11RenderTargetView_Release(rtv); - ID3D11Texture2D_Release(texture); ID3D11UnorderedAccessView_Release(in_uav); ID3D11UnorderedAccessView_Release(out_uav); release_test_context(&test_context);

1 0

Zebediah Figura : quartz/tests: Expand and separate media event tests.
by Alexandre Julliard March 2, 2018

March 2, 2018

Module: wine Branch: master Commit: 4df4aaab920eb25077776ff6f7a8be45c343edd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4df4aaab920eb25077776ff6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 1 13:19:20 2018 -0600 quartz/tests: Expand and separate media event tests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 107 +++++++++++++++++++++++++++++----------- 1 file changed, 78 insertions(+), 29 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 8dd70a2..4a7735b 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -398,49 +398,98 @@ static void test_state_change(IFilterGraph2 *graph) IMediaControl_Release(control); } -static void rungraph(IFilterGraph2 *graph) +static void test_media_event(IFilterGraph2 *graph) { + IMediaEvent *media_event; + IMediaSeeking *seeking; + IMediaControl *control; + IMediaFilter *filter; + LONG_PTR lparam1, lparam2; + LONGLONG current, stop; + OAFilterState state; + int got_eos = 0; + HANDLE event; HRESULT hr; - IMediaControl* pmc; - IMediaEvent* pme; - IMediaFilter* pmf; - HANDLE hEvent; + LONG code; - test_basic_video(graph); - test_mediacontrol(graph); - test_state_change(graph); + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaFilter, (void **)&filter); + ok(hr == S_OK, "QueryInterface(IMediaFilter) failed: %#x\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + ok(hr == S_OK, "QueryInterface(IMediaControl) failed: %#x\n", hr); - hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&pmc); - ok(hr==S_OK, "Cannot get IMediaControl interface returned: %x\n", hr); + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&media_event); + ok(hr == S_OK, "QueryInterface(IMediaEvent) failed: %#x\n", hr); - hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaFilter, (void **)&pmf); - ok(hr==S_OK, "Cannot get IMediaFilter interface returned: %x\n", hr); + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaSeeking, (void **)&seeking); + ok(hr == S_OK, "QueryInterface(IMediaEvent) failed: %#x\n", hr); - IMediaControl_Stop(pmc); + hr = IMediaControl_Stop(control); + ok(SUCCEEDED(hr), "Stop() failed: %#x\n", hr); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "GetState() timed out\n"); - IMediaFilter_SetSyncSource(pmf, NULL); + hr = IMediaSeeking_GetDuration(seeking, &stop); + ok(hr == S_OK, "GetDuration() failed: %#x\n", hr); + current = 0; + hr = IMediaSeeking_SetPositions(seeking, &current, AM_SEEKING_AbsolutePositioning, &stop, AM_SEEKING_AbsolutePositioning); + ok(hr == S_OK, "SetPositions() failed: %#x\n", hr); - IMediaFilter_Release(pmf); + hr = IMediaFilter_SetSyncSource(filter, NULL); + ok(hr == S_OK, "SetSyncSource() failed: %#x\n", hr); - hr = IMediaControl_Run(pmc); - ok(hr==S_FALSE, "Cannot run the graph returned: %x\n", hr); + hr = IMediaEvent_GetEventHandle(media_event, (OAEVENT *)&event); + ok(hr == S_OK, "GetEventHandle() failed: %#x\n", hr); - hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (LPVOID*)&pme); - ok(hr==S_OK, "Cannot get IMediaEvent interface returned: %x\n", hr); + /* flush existing events */ + while ((hr = IMediaEvent_GetEvent(media_event, &code, &lparam1, &lparam2, 0)) == S_OK); - hr = IMediaEvent_GetEventHandle(pme, (OAEVENT*)&hEvent); - ok(hr==S_OK, "Cannot get event handle returned: %x\n", hr); + ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "event should not be signaled\n"); - ok(WaitForSingleObject(hEvent, 2000) == WAIT_OBJECT_0, "Wait failed\n"); + hr = IMediaControl_Run(control); + ok(SUCCEEDED(hr), "Run() failed: %#x\n", hr); - hr = IMediaEvent_Release(pme); - ok(hr==2, "Releasing mediaevent returned: %x\n", hr); + while (!got_eos) + { + if (WaitForSingleObject(event, 1000) == WAIT_TIMEOUT) + break; - hr = IMediaControl_Stop(pmc); - ok(hr==S_OK, "Cannot stop the graph returned: %x\n", hr); - - hr = IMediaControl_Release(pmc); - ok(hr==1, "Releasing mediacontrol returned: %x\n", hr); + while ((hr = IMediaEvent_GetEvent(media_event, &code, &lparam1, &lparam2, 0)) == S_OK) + { + if (code == EC_COMPLETE) + { + got_eos = 1; + break; + } + } + } + ok(got_eos, "didn't get EOS\n"); + + hr = IMediaSeeking_GetCurrentPosition(seeking, &current); + ok(hr == S_OK, "GetCurrentPosition() failed: %#x\n", hr); +todo_wine + ok(current == stop, "expected %s, got %s\n", wine_dbgstr_longlong(stop), wine_dbgstr_longlong(current)); + + hr = IMediaControl_Stop(control); + ok(SUCCEEDED(hr), "Run() failed: %#x\n", hr); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "GetState() timed out\n"); + + hr = IFilterGraph2_SetDefaultSyncSource(graph); + ok(hr == S_OK, "SetDefaultSinkSource() failed: %#x\n", hr); + + IMediaSeeking_Release(seeking); + IMediaEvent_Release(media_event); + IMediaControl_Release(control); + IMediaFilter_Release(filter); +} + +static void rungraph(IFilterGraph2 *graph) +{ + test_basic_video(graph); + test_mediacontrol(graph); + test_state_change(graph); + test_media_event(graph); } static HRESULT test_graph_builder_connect(WCHAR *filename)

1 0

Zebediah Figura : quartz/tests: Simply test_render_with_multithread().
by Alexandre Julliard March 2, 2018

March 2, 2018

Module: wine Branch: master Commit: 55d1323546910fc198bb2476d02e4658fb4d33ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=55d1323546910fc198bb2476… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 1 13:19:21 2018 -0600 quartz/tests: Simply test_render_with_multithread(). Use CoCreateInstance directly, and try to run the graph on a real file. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 67 ++++++++--------------------------------- 1 file changed, 12 insertions(+), 55 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 4a7735b..8b3f7d5 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -588,78 +588,35 @@ todo_wine static DWORD WINAPI call_RenderFile_multithread(LPVOID lParam) { - IFilterGraph2 *filter_graph = lParam; + WCHAR *filename = load_resource(avifile); + IFilterGraph2 *graph = lParam; HRESULT hr; - WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; - HANDLE handle; - handle = CreateFileW(mp3file, 0, 0, NULL, CREATE_ALWAYS, 0, NULL); - if (handle == INVALID_HANDLE_VALUE) - { - skip("Could not read test file %s, skipping test\n", wine_dbgstr_w(mp3file)); - return 1; - } - CloseHandle(handle); + hr = IFilterGraph2_RenderFile(graph, filename, NULL); +todo_wine + ok(SUCCEEDED(hr), "RenderFile failed: %x\n", hr); - hr = IFilterGraph2_RenderFile(filter_graph, mp3file, NULL); - todo_wine ok(hr == VFW_E_CANNOT_RENDER || /* xp or older + DirectX 9 */ - hr == VFW_E_NO_TRANSPORT || /* win7 or newer */ - broken(hr == CLASS_E_CLASSNOTAVAILABLE), /* xp or older + DirectX 8 or older */ - "Expected 0x%08x or 0x%08x, returned 0x%08x\n", VFW_E_CANNOT_RENDER, VFW_E_NO_TRANSPORT, hr); + if (SUCCEEDED(hr)) + rungraph(graph); - DeleteFileW(mp3file); return 0; } static void test_render_with_multithread(void) { - HRESULT hr; - HMODULE hmod; - static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, void **out); - IClassFactory *classfactory = NULL; - static IGraphBuilder *graph_builder; - static IFilterGraph2 *filter_graph; + IFilterGraph2 *graph; HANDLE thread; CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - hmod = LoadLibraryA("quartz.dll"); - if (!hmod) - { - skip("Fail to load quartz.dll.\n"); - return; - } - - pDllGetClassObject = (void*)GetProcAddress(hmod, "DllGetClassObject"); - if (!pDllGetClassObject) - { - skip("Fail to get DllGetClassObject.\n"); - return; - } - - hr = pDllGetClassObject(&CLSID_FilterGraph, &IID_IClassFactory, (void **)&classfactory); - ok(hr == S_OK, "DllGetClassObject failed 0x%08x\n", hr); - if (FAILED(hr)) - { - skip("Can't create IClassFactory 0x%08x.\n", hr); - return; - } - - hr = IClassFactory_CreateInstance(classfactory, NULL, &IID_IUnknown, (LPVOID*)&graph_builder); - ok(hr == S_OK, "IClassFactory_CreateInstance failed 0x%08x\n", hr); - - hr = IGraphBuilder_QueryInterface(graph_builder, &IID_IFilterGraph2, (void**)&filter_graph); - ok(hr == S_OK, "IGraphBuilder_QueryInterface failed 0x%08x\n", hr); + graph = create_graph(); - thread = CreateThread(NULL, 0, call_RenderFile_multithread, filter_graph, 0, NULL); + thread = CreateThread(NULL, 0, call_RenderFile_multithread, graph, 0, NULL); - WaitForSingleObject(thread, 1000); - IFilterGraph2_Release(filter_graph); - IGraphBuilder_Release(graph_builder); - IClassFactory_Release(classfactory); + ok(WaitForSingleObject(thread, 1000) == WAIT_OBJECT_0, "wait failed\n"); + IFilterGraph2_Release(graph); CloseHandle(thread); CoUninitialize(); - return; } static void test_graph_builder(void)

1 0

Alexandre Julliard : kernel32: Add a helper function to fill object attributes in Create* functions.
by Alexandre Julliard March 2, 2018

March 2, 2018

Module: wine Branch: master Commit: 808693102e15025d1a08cbc2e27be7441e98aa75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=808693102e15025d1a08cbc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 2 10:41:12 2018 +0100 kernel32: Add a helper function to fill object attributes in Create* functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 82 ++++++++++++++-------------------------------------- 1 file changed, 22 insertions(+), 60 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index fbe5c3b..c8dcdfc 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -81,6 +81,23 @@ HANDLE get_BaseNamedObjects_handle(void) return handle; } +static void get_create_object_attributes( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *nameW, + SECURITY_ATTRIBUTES *sa, const WCHAR *name ) +{ + attr->Length = sizeof(*attr); + attr->RootDirectory = 0; + attr->ObjectName = NULL; + attr->Attributes = OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); + attr->SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; + attr->SecurityQualityOfService = NULL; + if (name) + { + RtlInitUnicodeString( nameW, name ); + attr->ObjectName = nameW; + attr->RootDirectory = get_BaseNamedObjects_handle(); + } +} + static BOOL get_open_object_attributes( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *nameW, BOOL inherit, const WCHAR *name ) { @@ -490,18 +507,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateEventExW( SECURITY_ATTRIBUTES *sa, LPCWSTR return 0; } - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = NULL; - attr.Attributes = OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); - attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; - attr.SecurityQualityOfService = NULL; - if (name) - { - RtlInitUnicodeString( &nameW, name ); - attr.ObjectName = &nameW; - attr.RootDirectory = get_BaseNamedObjects_handle(); - } + get_create_object_attributes( &attr, &nameW, sa, name ); status = NtCreateEvent( &ret, access, &attr, (flags & CREATE_EVENT_MANUAL_RESET) ? NotificationEvent : SynchronizationEvent, @@ -643,18 +649,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateMutexExW( SECURITY_ATTRIBUTES *sa, LPCWSTR OBJECT_ATTRIBUTES attr; NTSTATUS status; - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = NULL; - attr.Attributes = OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); - attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; - attr.SecurityQualityOfService = NULL; - if (name) - { - RtlInitUnicodeString( &nameW, name ); - attr.ObjectName = &nameW; - attr.RootDirectory = get_BaseNamedObjects_handle(); - } + get_create_object_attributes( &attr, &nameW, sa, name ); status = NtCreateMutant( &ret, access, &attr, (flags & CREATE_MUTEX_INITIAL_OWNER) != 0 ); if (status == STATUS_OBJECT_NAME_EXISTS) @@ -777,18 +772,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateSemaphoreExW( SECURITY_ATTRIBUTES *sa, LON OBJECT_ATTRIBUTES attr; NTSTATUS status; - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = NULL; - attr.Attributes = OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); - attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; - attr.SecurityQualityOfService = NULL; - if (name) - { - RtlInitUnicodeString( &nameW, name ); - attr.ObjectName = &nameW; - attr.RootDirectory = get_BaseNamedObjects_handle(); - } + get_create_object_attributes( &attr, &nameW, sa, name ); status = NtCreateSemaphore( &ret, access, &attr, initial, max ); if (status == STATUS_OBJECT_NAME_EXISTS) @@ -866,18 +850,7 @@ HANDLE WINAPI CreateJobObjectW( LPSECURITY_ATTRIBUTES sa, LPCWSTR name ) OBJECT_ATTRIBUTES attr; NTSTATUS status; - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = NULL; - attr.Attributes = OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); - attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; - attr.SecurityQualityOfService = NULL; - if (name) - { - RtlInitUnicodeString( &nameW, name ); - attr.ObjectName = &nameW; - attr.RootDirectory = get_BaseNamedObjects_handle(); - } + get_create_object_attributes( &attr, &nameW, sa, name ); status = NtCreateJobObject( &ret, JOB_OBJECT_ALL_ACCESS, &attr ); if (status == STATUS_OBJECT_NAME_EXISTS) @@ -1057,18 +1030,7 @@ HANDLE WINAPI CreateWaitableTimerExW( SECURITY_ATTRIBUTES *sa, LPCWSTR name, DWO UNICODE_STRING nameW; OBJECT_ATTRIBUTES attr; - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = NULL; - attr.Attributes = OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); - attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; - attr.SecurityQualityOfService = NULL; - if (name) - { - RtlInitUnicodeString( &nameW, name ); - attr.ObjectName = &nameW; - attr.RootDirectory = get_BaseNamedObjects_handle(); - } + get_create_object_attributes( &attr, &nameW, sa, name ); status = NtCreateTimer( &handle, access, &attr, (flags & CREATE_WAITABLE_TIMER_MANUAL_RESET) ? NotificationTimer : SynchronizationTimer );

1 0

Francois Gouget : testbot/web: Reuse $self-> {Job} instead of reloading the Job everywhere.
by Alexandre Julliard March 2, 2018

March 2, 2018

Module: tools Branch: master Commit: 5f98526e32fefd953fe7095a55693ebaedff93e8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5f98526e32fefd953fe7095… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 2 01:25:38 2018 +0100 testbot/web: Reuse $self->{Job} instead of reloading the Job everywhere. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 7ca7889..923ef97 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -91,8 +91,7 @@ sub CanCancel($) { my ($self) = @_; - my $Job = CreateJobs()->GetItem($self->{JobId}); - my $Status = $Job->Status; + my $Status = $self->{Job}->Status; if ($Status ne "queued" && $Status ne "running") { return "Job already $Status"; @@ -105,7 +104,7 @@ sub CanCancel($) } my $CurrentUser = $Session->User; if (! $CurrentUser->HasRole("admin") && - $Job->User->GetKey() ne $CurrentUser->GetKey()) + $self->{Job}->User->GetKey() ne $CurrentUser->GetKey()) { return "You are not authorized to cancel this job"; } @@ -117,8 +116,7 @@ sub CanRestart($) { my ($self) = @_; - my $Job = CreateJobs()->GetItem($self->{JobId}); - my $Status = $Job->Status; + my $Status = $self->{Job}->Status; if ($Status ne "boterror" && $Status ne "canceled") { return "Not a failed / canceled Job"; @@ -131,7 +129,7 @@ sub CanRestart($) } my $CurrentUser = $Session->User; if (! $CurrentUser->HasRole("admin") && - $Job->User->GetKey() ne $CurrentUser->GetKey()) # FIXME: Admin only? + $self->{Job}->User->GetKey() ne $CurrentUser->GetKey()) # FIXME: Admin only? { return "You are not authorized to restart this job"; }

1 0

Francois Gouget : testbot: Remove unneeded WineTestBot:: RecordGroups imports.
by Alexandre Julliard March 2, 2018

March 2, 2018

Module: tools Branch: master Commit: bec79d047b5ebf8ee895cfb9ba8bf785a858a92e URL: https://source.winehq.org/git/tools.git/?a=commit;h=bec79d047b5ebf8ee895cfb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 2 01:26:23 2018 +0100 testbot: Remove unneeded WineTestBot::RecordGroups imports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 1 - testbot/bin/WineRunReconfig.pl | 1 - testbot/bin/WineRunTask.pl | 1 - 3 files changed, 3 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index e4295c8..90c261b 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -45,7 +45,6 @@ use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; -use WineTestBot::RecordGroups; use WineTestBot::Engine::Notify; diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 4eefa17..77994a3 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -45,7 +45,6 @@ use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; -use WineTestBot::RecordGroups; use WineTestBot::Engine::Notify; diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 46b11f3..88c3b58 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -44,7 +44,6 @@ use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; -use WineTestBot::RecordGroups; use WineTestBot::Engine::Notify;

1 0