December 2017 - Wine-commits

Józef Kucia : d3d11: Implement depth bias.
by Alexandre Julliard 06 Dec '17

06 Dec '17

Module: wine Branch: master Commit: b2b03085dc5b43c558e4464dc28294404b1eb889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2b03085dc5b43c558e4464dc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 6 11:00:35 2017 +0100 d3d11: Implement depth bias. 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/device.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5281792..7ae9073 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -907,6 +907,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); struct d3d_rasterizer_state *rasterizer_state_impl; const D3D11_RASTERIZER_DESC *desc; + union + { + DWORD d; + float f; + } scale_bias, const_bias; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); @@ -916,6 +921,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon wined3d_device_set_rasterizer_state(device->wined3d_device, NULL); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, WINED3D_FILL_SOLID); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, WINED3D_CULL_BACK); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, 0); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, FALSE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, FALSE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ANTIALIASEDLINEENABLE, FALSE); @@ -928,9 +935,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon desc = &rasterizer_state_impl->desc; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, desc->FillMode); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, desc->CullMode); - /* OpenGL style depth bias. */ - if (desc->DepthBias || desc->SlopeScaledDepthBias) - FIXME("Ignoring depth bias.\n"); + scale_bias.f = desc->SlopeScaledDepthBias; + const_bias.f = desc->DepthBias; + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, scale_bias.d); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, const_bias.d); /* GL_DEPTH_CLAMP */ if (!desc->DepthClipEnable) FIXME("Ignoring DepthClipEnable %#x.\n", desc->DepthClipEnable);

1 0

Józef Kucia : d3d8: Toggle depth test state based on auto depth stencil.
by Alexandre Julliard 06 Dec '17

06 Dec '17

Module: wine Branch: master Commit: cf86309c588dfca29ef5c291cc6d607678308489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf86309c588dfca29ef5c291c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 6 11:00:36 2017 +0100 d3d8: Toggle depth test state based on auto depth stencil. wined3d will not do this anymore 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/d3d8/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 8b6bd3f..f77fb27 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3271,8 +3271,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine return D3DERR_INVALIDCALL; } - hr = wined3d_device_init_3d(device->wined3d_device, &swapchain_desc); - if (FAILED(hr)) + if (FAILED(hr = wined3d_device_init_3d(device->wined3d_device, &swapchain_desc))) { WARN("Failed to initialize 3D, hr %#x.\n", hr); wined3d_device_release_focus_window(device->wined3d_device); @@ -3282,6 +3281,8 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine return hr; } + wined3d_device_set_render_state(device->wined3d_device, + WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); wined3d_mutex_unlock();

1 0

Józef Kucia : d3d9: Toggle depth test state based on auto depth stencil.
by Alexandre Julliard 06 Dec '17

06 Dec '17

Module: wine Branch: master Commit: ad0ad75b5d421b582e170208ba9e56610983e68e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad0ad75b5d421b582e170208b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 6 11:00:37 2017 +0100 d3d9: Toggle depth test state based on auto depth stencil. wined3d will not do this anymore 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/d3d9/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 655318e..20f73c0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4092,8 +4092,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine } } - hr = wined3d_device_init_3d(device->wined3d_device, swapchain_desc); - if (FAILED(hr)) + if (FAILED(hr = wined3d_device_init_3d(device->wined3d_device, swapchain_desc))) { WARN("Failed to initialize 3D, hr %#x.\n", hr); wined3d_device_release_focus_window(device->wined3d_device); @@ -4103,6 +4102,9 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine return hr; } + wined3d_device_set_render_state(device->wined3d_device, + WINED3D_RS_ZENABLE, !!swapchain_desc->enable_auto_depth_stencil); + if (FAILED(hr = d3d9_device_get_swapchains(device))) { wined3d_device_uninit_3d(device->wined3d_device);

1 0

Józef Kucia : wined3d: Do not modify depth test state in wined3d_device_init_3d().
by Alexandre Julliard 06 Dec '17

06 Dec '17

Module: wine Branch: master Commit: 15824c0704d4de54959218a94bc001ddde5aa91d URL: http://source.winehq.org/git/wine.git/?a=commit;h=15824c0704d4de54959218a94… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 6 11:00:38 2017 +0100 wined3d: Do not modify depth test state in wined3d_device_init_3d(). We do not want to automagically disable depth test for D3D10+. 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/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d57758d..2655702 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -949,7 +949,7 @@ void CDECL wined3d_device_release_focus_window(struct wined3d_device *device) static void device_init_swapchain_state(struct wined3d_device *device, struct wined3d_swapchain *swapchain) { - BOOL ds_enable = !!swapchain->desc.enable_auto_depth_stencil; + BOOL ds_enable = swapchain->desc.enable_auto_depth_stencil; unsigned int i; if (device->fb.render_targets) @@ -963,7 +963,6 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi } wined3d_device_set_depth_stencil_view(device, ds_enable ? device->auto_depth_stencil_view : NULL); - wined3d_device_set_render_state(device, WINED3D_RS_ZENABLE, ds_enable); } static void wined3d_device_delete_opengl_contexts_cs(void *object) @@ -4881,6 +4880,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, device->update_state = &device->state; device_init_swapchain_state(device, swapchain); + wined3d_device_set_render_state(device, + WINED3D_RS_ZENABLE, !!swapchain->desc.enable_auto_depth_stencil); if (wined3d_settings.logo) device_load_logo(device, wined3d_settings.logo); }

1 0

Józef Kucia : d3d11: Fix initial depth stencil state.
by Alexandre Julliard 06 Dec '17

06 Dec '17

Module: wine Branch: master Commit: dd60c65f4b1a270a236ea470100f3ae885f33486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd60c65f4b1a270a236ea4701… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 6 11:00:39 2017 +0100 d3d11: Fix initial depth stencil state. The initial WINED3D_RS_ZFUNC state is different in wined3d. 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/device.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7ae9073..820463c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -745,6 +745,14 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi wined3d_mutex_unlock(); } +static void set_default_depth_stencil_state(struct wined3d_device *wined3d_device) +{ + wined3d_device_set_render_state(wined3d_device, WINED3D_RS_ZENABLE, TRUE); + wined3d_device_set_render_state(wined3d_device, WINED3D_RS_ZWRITEENABLE, D3D11_DEPTH_WRITE_MASK_ALL); + wined3d_device_set_render_state(wined3d_device, WINED3D_RS_ZFUNC, WINED3D_CMP_LESS); + wined3d_device_set_render_state(wined3d_device, WINED3D_RS_STENCILENABLE, FALSE); +} + static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3D11DeviceContext *iface, ID3D11DepthStencilState *depth_stencil_state, UINT stencil_ref) { @@ -759,10 +767,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 device->stencil_ref = stencil_ref; if (!(device->depth_stencil_state = unsafe_impl_from_ID3D11DepthStencilState(depth_stencil_state))) { - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, TRUE); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZWRITEENABLE, D3D11_DEPTH_WRITE_MASK_ALL); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZFUNC, D3D11_COMPARISON_LESS); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILENABLE, FALSE); + set_default_depth_stencil_state(device->wined3d_device); wined3d_mutex_unlock(); return; } @@ -5727,6 +5732,8 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par wined3d_device_incref(wined3d_device); device->wined3d_device = wined3d_device; + + set_default_depth_stencil_state(wined3d_device); } static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent)

1 0

Józef Kucia : d3d11/tests: Add test for initial depth stencil state.
by Alexandre Julliard 06 Dec '17

06 Dec '17

Module: wine Branch: master Commit: a7461d38e2db43c0fb2e287555cfa5381b308b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7461d38e2db43c0fb2e28755… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 6 11:00:40 2017 +0100 d3d11/tests: Add test for initial depth stencil state. 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 | 77 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 55 insertions(+), 22 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 330f201..705be4f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11788,10 +11788,61 @@ static void test_clear_buffer_unordered_access_view(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_initial_depth_stencil_state(void) +{ + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11DeviceContext *context; + ID3D11DepthStencilView *dsv; + ID3D11Texture2D *texture; + ID3D11Device *device; + unsigned int count; + D3D11_VIEWPORT vp; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_D32_FLOAT; + texture_desc.BindFlags = D3D11_BIND_DEPTH_STENCIL; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &test_context.backbuffer_rtv, dsv); + + count = 1; + ID3D11DeviceContext_RSGetViewports(context, &count, &vp); + + /* check if depth function is D3D11_COMPARISON_LESS */ + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 0.5f, 0); + vp.MinDepth = vp.MaxDepth = 0.4f; + ID3D11DeviceContext_RSSetViewports(context, 1, &vp); + draw_color_quad(&test_context, &green); + draw_color_quad(&test_context, &red); + vp.MinDepth = vp.MaxDepth = 0.6f; + ID3D11DeviceContext_RSSetViewports(context, 1, &vp); + draw_color_quad(&test_context, &red); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + check_texture_float(texture, 0.4f, 1); + + ID3D11DepthStencilView_Release(dsv); + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); +} + static void test_draw_depth_only(void) { - ID3D11DepthStencilState *depth_stencil_state; - D3D11_DEPTH_STENCIL_DESC depth_stencil_desc; struct d3d11_test_context test_context; ID3D11PixelShader *ps_color, *ps_depth; D3D11_TEXTURE2D_DESC texture_desc; @@ -11848,32 +11899,15 @@ static void test_draw_depth_only(void) cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(depth), NULL); - texture_desc.Width = 640; - texture_desc.Height = 480; - texture_desc.MipLevels = 1; - texture_desc.ArraySize = 1; + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); texture_desc.Format = DXGI_FORMAT_D32_FLOAT; - texture_desc.SampleDesc.Count = 1; - texture_desc.SampleDesc.Quality = 0; - texture_desc.Usage = D3D11_USAGE_DEFAULT; texture_desc.BindFlags = D3D11_BIND_DEPTH_STENCIL; - 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_CreateDepthStencilView(device, (ID3D11Resource *)texture, NULL, &dsv); ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); - depth_stencil_desc.DepthEnable = TRUE; - depth_stencil_desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL; - depth_stencil_desc.DepthFunc = D3D11_COMPARISON_LESS; - depth_stencil_desc.StencilEnable = FALSE; - - hr = ID3D11Device_CreateDepthStencilState(device, &depth_stencil_desc, &depth_stencil_state); - ok(SUCCEEDED(hr), "Failed to create depth stencil state, hr %#x.\n", hr); - hr = ID3D11Device_CreatePixelShader(device, ps_color_code, sizeof(ps_color_code), NULL, &ps_color); ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); hr = ID3D11Device_CreatePixelShader(device, ps_depth_code, sizeof(ps_depth_code), NULL, &ps_depth); @@ -11882,7 +11916,6 @@ static void test_draw_depth_only(void) ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); ID3D11DeviceContext_PSSetShader(context, ps_color, NULL, 0); ID3D11DeviceContext_OMSetRenderTargets(context, 0, NULL, dsv); - ID3D11DeviceContext_OMSetDepthStencilState(context, depth_stencil_state, 0); ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); check_texture_float(texture, 1.0f, 1); @@ -11947,7 +11980,6 @@ static void test_draw_depth_only(void) ID3D11PixelShader_Release(ps_color); ID3D11PixelShader_Release(ps_depth); ID3D11DepthStencilView_Release(dsv); - ID3D11DepthStencilState_Release(depth_stencil_state); ID3D11Texture2D_Release(texture); release_test_context(&test_context); } @@ -23384,6 +23416,7 @@ START_TEST(d3d11) test_clear_render_target_view(); test_clear_depth_stencil_view(); test_clear_buffer_unordered_access_view(); + test_initial_depth_stencil_state(); test_draw_depth_only(); test_draw_uav_only(); test_cb_relative_addressing();

1 0

Stefan Dösinger : msvcp: Use int64 for byval _Thrd_t parameters.
by Alexandre Julliard 06 Dec '17

06 Dec '17

Module: wine Branch: master Commit: 25e20ac8eb24cea9678b8a523165eb0ed48026d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e20ac8eb24cea9678b8a523… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 6 13:50:20 2017 +0100 msvcp: Use int64 for byval _Thrd_t parameters. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 8 ++++---- dlls/msvcp120/msvcp120.spec | 8 ++++---- dlls/msvcp120_app/msvcp120_app.spec | 8 ++++---- dlls/msvcp140/msvcp140.spec | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 7cf350e..001b9ad 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3858,11 +3858,11 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) @ cdecl _Thrd_current() -@ cdecl _Thrd_detach(ptr) -@ cdecl _Thrd_equal(ptr ptr) +@ cdecl _Thrd_detach(int64) +@ cdecl _Thrd_equal(int64 int64) @ stub _Thrd_exit -@ cdecl _Thrd_join(ptr long) -@ cdecl _Thrd_lt(ptr ptr) +@ cdecl _Thrd_join(int64 long) +@ cdecl _Thrd_lt(int64 int64) @ cdecl _Thrd_sleep(ptr) @ cdecl _Thrd_start(ptr ptr ptr) @ cdecl _Thrd_yield() diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 5285ada..729657c 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3805,11 +3805,11 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) @ cdecl _Thrd_current() -@ cdecl _Thrd_detach(ptr) -@ cdecl _Thrd_equal(ptr ptr) +@ cdecl _Thrd_detach(int64) +@ cdecl _Thrd_equal(int64 int64) @ stub _Thrd_exit -@ cdecl _Thrd_join(ptr long) -@ cdecl _Thrd_lt(ptr ptr) +@ cdecl _Thrd_join(int64 long) +@ cdecl _Thrd_lt(int64 int64) @ cdecl _Thrd_sleep(ptr) @ cdecl _Thrd_start(ptr ptr ptr) @ cdecl _Thrd_yield() diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index f33a2ec..62668d2 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3805,11 +3805,11 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) msvcp120._Thrd_create @ cdecl _Thrd_current() msvcp120._Thrd_current -@ cdecl _Thrd_detach(ptr) msvcp120._Thrd_detach -@ cdecl _Thrd_equal(ptr ptr) msvcp120._Thrd_equal +@ cdecl _Thrd_detach(int64) msvcp120._Thrd_detach +@ cdecl _Thrd_equal(int64 int64) msvcp120._Thrd_equal @ stub _Thrd_exit -@ cdecl _Thrd_join(ptr long) msvcp120._Thrd_join -@ cdecl _Thrd_lt(ptr ptr) msvcp120._Thrd_lt +@ cdecl _Thrd_join(int64 long) msvcp120._Thrd_join +@ cdecl _Thrd_lt(int64 int64) msvcp120._Thrd_lt @ cdecl _Thrd_sleep(ptr) msvcp120._Thrd_sleep @ cdecl _Thrd_start(ptr ptr ptr) msvcp120._Thrd_start @ cdecl _Thrd_yield() msvcp120._Thrd_yield diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 1f61afb..5d55181 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3722,12 +3722,12 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) _Thrd_create @ cdecl _Thrd_current() _Thrd_current -@ cdecl _Thrd_detach(ptr) _Thrd_detach -@ cdecl _Thrd_equal(ptr ptr) _Thrd_equal +@ cdecl _Thrd_detach(int64) _Thrd_detach +@ cdecl _Thrd_equal(int64 int64) _Thrd_equal @ stub _Thrd_exit @ cdecl _Thrd_hardware_concurrency() _Thrd_hardware_concurrency @ cdecl _Thrd_id() _Thrd_id -@ cdecl _Thrd_join(ptr long) _Thrd_join +@ cdecl _Thrd_join(int64 long) _Thrd_join @ cdecl _Thrd_sleep(ptr) _Thrd_sleep @ cdecl _Thrd_start(ptr ptr ptr) _Thrd_start @ cdecl _Thrd_yield() _Thrd_yield

1 0

Stefan Dösinger : msvcp: Cast the wait time in _Cnd_timedwait to ULONG.
by Alexandre Julliard 06 Dec '17

06 Dec '17

Module: wine Branch: master Commit: 3ea7102cbe4a365f4364bc633f4b7f31f168c1ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea7102cbe4a365f4364bc633… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 6 13:50:21 2017 +0100 msvcp: Cast the wait time in _Cnd_timedwait to ULONG. This prevents sign extending it when promoting it to ULONGLONG. This fixes high CPU usage in Wargaming Game Center that was caused by _Cnd_timedwait instantly returning timeout instead of waiting for the requested 30 days. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 901930b..159e9d6 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -635,7 +635,7 @@ int __cdecl _Cnd_timedwait(_Cnd_arg_t cnd, _Mtx_arg_t mtx, const xtime *xt) InterlockedExchangeAdd( (LONG *)&cv->Ptr, 1 ); _Mtx_unlock(mtx); - timeout.QuadPart = (ULONGLONG)_Xtime_diff_to_millis(xt) * -10000; + timeout.QuadPart = (ULONGLONG)(ULONG)_Xtime_diff_to_millis(xt) * -10000; status = NtWaitForKeyedEvent(keyed_event, &cv->Ptr, FALSE, &timeout); if (status) {

1 0

Nikolay Sivov : user32/tests: Remove runtime check for EndMenu().
by Alexandre Julliard 06 Dec '17

06 Dec '17

Module: wine Branch: master Commit: 84a35f532fcad8d40525a7562f414f19fdc1ba0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a35f532fcad8d40525a7562… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 6 15:23:38 2017 +0300 user32/tests: Remove runtime check for EndMenu(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 12 +++--------- dlls/user32/tests/menu.c | 9 ++------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 9372c48..79c0010 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -38,14 +38,12 @@ struct edit_notify { static struct edit_notify notifications; -static BOOL (WINAPI *pEndMenu) (void); static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO); static void init_function_pointers(void) { HMODULE hdll = GetModuleHandleA("user32"); - pEndMenu = (void*)GetProcAddress(hdll, "EndMenu"); pGetMenuBarInfo = (void*)GetProcAddress(hdll, "GetMenuBarInfo"); } @@ -2294,7 +2292,7 @@ static LRESULT CALLBACK edit4_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPAR if (hWnd != (HWND)lParam) { got_wm_capturechanged = TRUE; - pEndMenu(); + EndMenu(); } break; } @@ -2337,7 +2335,7 @@ static LRESULT CALLBACK edit_proc_proxy(HWND hWnd, UINT msg, WPARAM wParam, LPAR ok(!mbi.fFocused, "mbi.fFocused = TRUE\n"); } - pEndMenu(); + EndMenu(); break; } } @@ -2985,11 +2983,7 @@ START_TEST(edit) test_child_edit_wmkeydown(); test_fontsize(); test_dialogmode(); - if (pEndMenu) - test_contextmenu(); - else - win_skip("EndMenu is not available\n"); - + test_contextmenu(); test_EM_GETHANDLE(); test_paste(); diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 03454fe..f99cd94 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -41,7 +41,6 @@ static BOOL (WINAPI *pGetMenuInfo)(HMENU,LPCMENUINFO); static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO); static UINT (WINAPI *pSendInput)(UINT, INPUT*, size_t); static BOOL (WINAPI *pSetMenuInfo)(HMENU,LPCMENUINFO); -static BOOL (WINAPI *pEndMenu) (void); static void init_function_pointers(void) { @@ -56,7 +55,6 @@ static void init_function_pointers(void) GET_PROC(GetMenuBarInfo) GET_PROC(SendInput) GET_PROC(SetMenuInfo) - GET_PROC(EndMenu) #undef GET_PROC } @@ -3518,7 +3516,7 @@ static LRESULT WINAPI menu_cancelmode_wnd_proc(HWND hwnd, UINT msg, PostMessageA( hwnd, WM_MOUSEMOVE, 0, 0); return SendMessageA( g_hwndtosend, WM_CANCELMODE, 0, 0); } - pEndMenu(); + EndMenu(); return TRUE; } } @@ -3531,10 +3529,7 @@ static void test_menu_cancelmode(void) HWND hwnd, hwndchild; HMENU menu, menubar; MSG msg; - if( !pEndMenu) { /* win95 */ - win_skip( "EndMenu is not available\n"); - return; - } + hwnd = CreateWindowExA( 0, (LPCSTR)MAKEINTATOM(atomMenuCheckClass), NULL, WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 200, 200, NULL, NULL, NULL, NULL);

1 0

Alistair Leslie-Hughes : winegstreamer: Remove redundant check.
by Alexandre Julliard 06 Dec '17

06 Dec '17

Module: wine Branch: master Commit: 5f5f9974f555430bf7f9796c402bba1c2426d368 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f5f9974f555430bf7f9796c4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Dec 5 00:15:01 2017 +0000 winegstreamer: Remove redundant check. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3ef2324..95a1630 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1158,10 +1158,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI WaitForSingleObject(This->event, -1); gst_element_get_state(This->container, NULL, NULL, -1); - if (ret < 0) { - WARN("Ret: %i\n", ret); - hr = E_FAIL; - } else if (!This->cStreams) { + if (!This->cStreams) { FIXME("GStreamer could not find any streams\n"); hr = E_FAIL; } else {

1 0