November 2016 - Wine-Commits

Vincent Povirk : mscoree: Update Wine Mono to 4.6.4.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: 2390219555b0936adc2e5b07d98dd7e79f772ed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2390219555b0936adc2e5b07d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 30 15:08:17 2016 -0600 mscoree: Update Wine Mono to 4.6.4. This release contains many small bug fixes. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index cee96d9..b4eb12f 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -64,8 +64,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.6.3" -#define MONO_SHA "c1d6d223c99c41a9d4e674e967042f10bfe02b8b" +#define MONO_VERSION "4.6.4" +#define MONO_SHA "d58509c3a4e5fa88c56c14e0413a803aa82f6118" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 8e158e2..67f4259 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -675,7 +675,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.6.3"; + static const char* mono_version = "4.6.4"; static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0

Andrew Wesie : d3d11/tests: Add test for two sided stencil.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: ef8e2f2e75957c82ae2b4a4f5d0d23e9a69a3faf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef8e2f2e75957c82ae2b4a4f5… Author: Andrew Wesie <awesie(a)gmail.com> Date: Wed Nov 30 12:47:37 2016 +0100 d3d11/tests: Add test for two sided stencil. 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 | 109 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 57742db..0a31f96 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11262,6 +11262,114 @@ static void test_shader_input_registers_limits(void) release_test_context(&test_context); } +static void test_stencil_separate(void) +{ + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + D3D11_DEPTH_STENCIL_DESC ds_desc; + ID3D11DepthStencilState *ds_state; + ID3D11DepthStencilView *ds_view; + D3D11_RASTERIZER_DESC rs_desc; + ID3D11DeviceContext *context; + ID3D11RasterizerState *rs; + ID3D11Texture2D *texture; + ID3D11Device *device; + HRESULT hr; + + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; + static const struct vec2 ccw_quad[] = + { + {-1.0f, -1.0f}, + { 1.0f, -1.0f}, + {-1.0f, 1.0f}, + { 1.0f, 1.0f}, + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + texture_desc.Width = 640; + texture_desc.Height = 480; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + 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, &ds_view); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + + ds_desc.DepthEnable = TRUE; + ds_desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL; + ds_desc.DepthFunc = D3D11_COMPARISON_LESS; + ds_desc.StencilEnable = TRUE; + ds_desc.StencilReadMask = D3D11_DEFAULT_STENCIL_READ_MASK; + ds_desc.StencilWriteMask = D3D11_DEFAULT_STENCIL_WRITE_MASK; + ds_desc.FrontFace.StencilFailOp = D3D11_STENCIL_OP_ZERO; + ds_desc.FrontFace.StencilDepthFailOp = D3D11_STENCIL_OP_ZERO; + ds_desc.FrontFace.StencilPassOp = D3D11_STENCIL_OP_ZERO; + ds_desc.FrontFace.StencilFunc = D3D11_COMPARISON_NEVER; + ds_desc.BackFace.StencilFailOp = D3D11_STENCIL_OP_ZERO; + ds_desc.BackFace.StencilDepthFailOp = D3D11_STENCIL_OP_ZERO; + ds_desc.BackFace.StencilPassOp = D3D11_STENCIL_OP_ZERO; + ds_desc.BackFace.StencilFunc = D3D11_COMPARISON_ALWAYS; + hr = ID3D11Device_CreateDepthStencilState(device, &ds_desc, &ds_state); + ok(SUCCEEDED(hr), "Failed to create depth stencil state, hr %#x.\n", hr); + + rs_desc.FillMode = D3D11_FILL_SOLID; + rs_desc.CullMode = D3D11_CULL_NONE; + rs_desc.FrontCounterClockwise = FALSE; + rs_desc.DepthBias = 0; + rs_desc.DepthBiasClamp = 0.0f; + rs_desc.SlopeScaledDepthBias = 0.0f; + rs_desc.DepthClipEnable = TRUE; + rs_desc.ScissorEnable = FALSE; + rs_desc.MultisampleEnable = FALSE; + rs_desc.AntialiasedLineEnable = FALSE; + ID3D11Device_CreateRasterizerState(device, &rs_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); + ID3D11DeviceContext_ClearDepthStencilView(context, ds_view, D3D11_CLEAR_DEPTH | D3D11_CLEAR_STENCIL, 1.0f, 0); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &test_context.backbuffer_rtv, ds_view); + ID3D11DeviceContext_OMSetDepthStencilState(context, ds_state, 0); + ID3D11DeviceContext_RSSetState(context, rs); + + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0xff0000ff, 1); + + ID3D11Buffer_Release(test_context.vb); + test_context.vb = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(ccw_quad), ccw_quad); + + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + + ID3D11RasterizerState_Release(rs); + rs_desc.FrontCounterClockwise = TRUE; + ID3D11Device_CreateRasterizerState(device, &rs_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + ID3D11DeviceContext_RSSetState(context, rs); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0xff0000ff, 1); + + ID3D11DepthStencilState_Release(ds_state); + ID3D11DepthStencilView_Release(ds_view); + ID3D11RasterizerState_Release(rs); + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); +} + static void test_uav_load(void) { struct shader @@ -11631,5 +11739,6 @@ START_TEST(d3d11) run_for_each_9_x_feature_level(test_fl9_draw); test_ddy(); test_shader_input_registers_limits(); + test_stencil_separate(); test_uav_load(); }

1 0

Andrew Wesie : d3d10core/tests: Add test for two sided stencil.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: 076c2f783df48359f92955fb6794f80ddf12ca9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=076c2f783df48359f92955fb6… Author: Andrew Wesie <awesie(a)gmail.com> Date: Wed Nov 30 12:47:36 2016 +0100 d3d10core/tests: Add test for two sided stencil. 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/d3d10core/tests/device.c | 107 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 3db875c..eb61adb 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9864,6 +9864,112 @@ static void test_shader_input_registers_limits(void) release_test_context(&test_context); } +static void test_stencil_separate(void) +{ + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + D3D10_DEPTH_STENCIL_DESC ds_desc; + ID3D10DepthStencilState *ds_state; + ID3D10DepthStencilView *ds_view; + D3D10_RASTERIZER_DESC rs_desc; + ID3D10RasterizerState *rs; + ID3D10Texture2D *texture; + ID3D10Device *device; + HRESULT hr; + + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; + static const struct vec2 ccw_quad[] = + { + {-1.0f, -1.0f}, + { 1.0f, -1.0f}, + {-1.0f, 1.0f}, + { 1.0f, 1.0f}, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + texture_desc.Width = 640; + texture_desc.Height = 480; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, NULL, &ds_view); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + + ds_desc.DepthEnable = TRUE; + ds_desc.DepthWriteMask = D3D10_DEPTH_WRITE_MASK_ALL; + ds_desc.DepthFunc = D3D10_COMPARISON_LESS; + ds_desc.StencilEnable = TRUE; + ds_desc.StencilReadMask = D3D10_DEFAULT_STENCIL_READ_MASK; + ds_desc.StencilWriteMask = D3D10_DEFAULT_STENCIL_WRITE_MASK; + ds_desc.FrontFace.StencilFailOp = D3D10_STENCIL_OP_ZERO; + ds_desc.FrontFace.StencilDepthFailOp = D3D10_STENCIL_OP_ZERO; + ds_desc.FrontFace.StencilPassOp = D3D10_STENCIL_OP_ZERO; + ds_desc.FrontFace.StencilFunc = D3D10_COMPARISON_NEVER; + ds_desc.BackFace.StencilFailOp = D3D10_STENCIL_OP_ZERO; + ds_desc.BackFace.StencilDepthFailOp = D3D10_STENCIL_OP_ZERO; + ds_desc.BackFace.StencilPassOp = D3D10_STENCIL_OP_ZERO; + ds_desc.BackFace.StencilFunc = D3D10_COMPARISON_ALWAYS; + hr = ID3D10Device_CreateDepthStencilState(device, &ds_desc, &ds_state); + ok(SUCCEEDED(hr), "Failed to create depth stencil state, hr %#x.\n", hr); + + rs_desc.FillMode = D3D10_FILL_SOLID; + rs_desc.CullMode = D3D10_CULL_NONE; + rs_desc.FrontCounterClockwise = FALSE; + rs_desc.DepthBias = 0; + rs_desc.DepthBiasClamp = 0.0f; + rs_desc.SlopeScaledDepthBias = 0.0f; + rs_desc.DepthClipEnable = TRUE; + rs_desc.ScissorEnable = FALSE; + rs_desc.MultisampleEnable = FALSE; + rs_desc.AntialiasedLineEnable = FALSE; + ID3D10Device_CreateRasterizerState(device, &rs_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red); + ID3D10Device_ClearDepthStencilView(device, ds_view, D3D10_CLEAR_DEPTH | D3D10_CLEAR_STENCIL, 1.0f, 0); + ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, ds_view); + ID3D10Device_OMSetDepthStencilState(device, ds_state, 0); + ID3D10Device_RSSetState(device, rs); + + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0xff0000ff, 1); + + ID3D10Buffer_Release(test_context.vb); + test_context.vb = create_buffer(device, D3D10_BIND_VERTEX_BUFFER, sizeof(ccw_quad), ccw_quad); + + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + + ID3D10RasterizerState_Release(rs); + rs_desc.FrontCounterClockwise = TRUE; + ID3D10Device_CreateRasterizerState(device, &rs_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + ID3D10Device_RSSetState(device, rs); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red); + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0xff0000ff, 1); + + ID3D10DepthStencilState_Release(ds_state); + ID3D10DepthStencilView_Release(ds_view); + ID3D10RasterizerState_Release(rs); + ID3D10Texture2D_Release(texture); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -9919,4 +10025,5 @@ START_TEST(device) test_required_format_support(); test_ddy(); test_shader_input_registers_limits(); + test_stencil_separate(); }

1 0

Andrew Wesie : d3d11: Implement two-sided stencil testing.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: c17462800a5372c7a7865d233d92f88ad9227dc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c17462800a5372c7a7865d233… Author: Andrew Wesie <awesie(a)gmail.com> Date: Wed Nov 30 12:47:35 2016 +0100 d3d11: Implement two-sided stencil testing. 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 | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 16230c5..f5065a6 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -752,7 +752,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 ID3D11DepthStencilState *depth_stencil_state, UINT stencil_ref) { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); - const D3D11_DEPTH_STENCILOP_DESC *stencil_desc; + const D3D11_DEPTH_STENCILOP_DESC *front, *back; const D3D11_DEPTH_STENCIL_DESC *desc; TRACE("iface %p, depth_stencil_state %p, stencil_ref %u.\n", @@ -772,13 +772,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 desc = &device->depth_stencil_state->desc; - if (desc->FrontFace.StencilFailOp != desc->BackFace.StencilFailOp - || desc->FrontFace.StencilDepthFailOp != desc->BackFace.StencilDepthFailOp - || desc->FrontFace.StencilPassOp != desc->BackFace.StencilPassOp - || desc->FrontFace.StencilFunc != desc->BackFace.StencilFunc) - FIXME("Two-sided stencil testing not supported.\n"); - - stencil_desc = &desc->FrontFace; + front = &desc->FrontFace; + back = &desc->BackFace; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, desc->DepthEnable); if (desc->DepthEnable) @@ -792,12 +787,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 { wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILMASK, desc->StencilReadMask); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILWRITEMASK, desc->StencilWriteMask); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILFAIL, stencil_desc->StencilFailOp); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILZFAIL, - stencil_desc->StencilDepthFailOp); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILPASS, stencil_desc->StencilPassOp); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILFUNC, stencil_desc->StencilFunc); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILREF, stencil_ref); + + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILFAIL, front->StencilFailOp); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILZFAIL, front->StencilDepthFailOp); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILPASS, front->StencilPassOp); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILFUNC, front->StencilFunc); + if (front->StencilFailOp != back->StencilFailOp + || front->StencilDepthFailOp != back->StencilDepthFailOp + || front->StencilPassOp != back->StencilPassOp + || front->StencilFunc != back->StencilFunc) + { + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_TWOSIDEDSTENCILMODE, TRUE); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CCW_STENCILFAIL, back->StencilFailOp); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CCW_STENCILZFAIL, + back->StencilDepthFailOp); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CCW_STENCILPASS, back->StencilPassOp); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CCW_STENCILFUNC, back->StencilFunc); + } + else + { + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_TWOSIDEDSTENCILMODE, FALSE); + } } wined3d_mutex_unlock(); }

1 0

Alex Henrie : Revert "winegstreamer: Remove redundant null check before g_error_free.".
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: 5c54963482bcd701c825b7936056a49b113410e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c54963482bcd701c825b7936… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 28 22:35:53 2016 -0700 Revert "winegstreamer: Remove redundant null check before g_error_free.". This reverts commit 976ccb92ea745d8a79a2d0a25d37268bb4dc62a6. This is what I get for not reading the documentation...if you call g_error_free(NULL), it prints a nasty error message, which I am now getting frequently. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 20acd0e..03d8d5b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1083,7 +1083,8 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) WARN("%s: %s\n", GST_OBJECT_NAME(msg->src), err->message); WARN("%s\n", dbg_info); } - g_error_free(err); + if (err) + g_error_free(err); g_free(dbg_info); return GST_BUS_DROP; }

1 0

Alex Henrie : winegstreamer: Avoid double initialization.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: 424c86ad29cb66f28f7e5f03b764de710affbf49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=424c86ad29cb66f28f7e5f03b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 28 22:35:52 2016 -0700 winegstreamer: Avoid double initialization. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 6b005ed..20acd0e 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -120,7 +120,7 @@ static gboolean amt_from_gst_caps_audio(GstCaps *caps, AM_MEDIA_TYPE *amt) { WAVEFORMATEXTENSIBLE *wfe; WAVEFORMATEX *wfx; - gint32 depth = 0, bpp = 0; + gint32 depth, bpp; GstAudioInfo ainfo; if (!gst_audio_info_from_caps (&ainfo, caps)) @@ -181,7 +181,7 @@ static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) { VIDEOINFOHEADER *vih; BITMAPINFOHEADER *bih; - gint32 width = 0, height = 0, nom = 0, denom = 0; + gint32 width, height, nom, denom; GstVideoInfo vinfo; if (!gst_video_info_from_caps (&vinfo, caps))

1 0

Józef Kucia : include: Add missing D3D11_BUFFER_UAV_FLAG declaration.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: 2e8a5290885caa7644a85d682d7e2d15ff5f27d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e8a5290885caa7644a85d682… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 30 12:47:34 2016 +0100 include: Add missing D3D11_BUFFER_UAV_FLAG declaration. 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> --- include/d3d11.idl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 262c932..3ca697b 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -543,6 +543,13 @@ typedef enum D3D11_DSV_FLAG D3D11_DSV_READ_ONLY_STENCIL = 0x2, } D3D11_DSV_FLAG; +typedef enum D3D11_UAV_FLAG +{ + D3D11_BUFFER_UAV_FLAG_RAW = 0x1, + D3D11_BUFFER_UAV_FLAG_APPEND = 0x2, + D3D11_BUFFER_UAV_FLAG_COUNTER = 0x4, +} D3D11_UAV_FLAG; + typedef enum D3D11_INPUT_CLASSIFICATION { D3D11_INPUT_PER_VERTEX_DATA,

1 0

Daniel Lehman : gdi32: Trace more in CreateEnhMetaFileW.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: 0d9f044dcd62efdddb0c6c0af806e50b6e116e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d9f044dcd62efdddb0c6c0af… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Nov 29 11:13:37 2016 -0800 gdi32: Trace more in CreateEnhMetaFileW. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index fac100d..d241f21 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -319,7 +319,7 @@ HDC WINAPI CreateEnhMetaFileW( DWORD size = 0, length = 0; DWORD bytes_written; - TRACE("%s\n", debugstr_w(filename) ); + TRACE("(%p %s %s %s)\n", hdc, debugstr_w(filename), wine_dbgstr_rect(rect), debugstr_w(description) ); if (!(dc = alloc_dc_ptr( OBJ_ENHMETADC ))) return 0;

1 0

Huw Davies : shell32/tests: Updated Windows 7 has a new IShellDispatch6 in its typelib.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: b670fc2c6df15696d74af6eff48ac112a996583a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b670fc2c6df15696d74af6eff… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 30 11:28:04 2016 +0000 shell32/tests: Updated Windows 7 has a new IShellDispatch6 in its typelib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 70146cb..3f2d902 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -28,6 +28,8 @@ #include "winsvc.h" #include "wine/test.h" +#include "initguid.h" + #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) @@ -38,6 +40,9 @@ static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*); static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *); static DWORD (WINAPI *pGetLongPathNameW)(LPCWSTR, LPWSTR, DWORD); +/* Updated Windows 7 has a new IShellDispatch6 in its typelib */ +DEFINE_GUID(IID_IWin7ShellDispatch6, 0x34936ba1, 0x67ad, 0x4c41, 0x99,0xb8, 0x8c,0x12,0xdf,0xf1,0xe9,0x74); + static void init_function_pointers(void) { HMODULE hshell32, hkernel32; @@ -530,6 +535,7 @@ static void test_ShellFolderViewDual(void) &IID_IShellDispatch5, &IID_IShellDispatch4, &IID_IShellDispatch2, + &IID_IWin7ShellDispatch6, &IID_NULL }; IShellFolderViewDual *viewdual;

1 0

Jacek Caban : rpcrt4: Acquire new credential handle for each connection.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: c32cd1119cbebe7a8afaf45815cee5cfa949274c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c32cd1119cbebe7a8afaf4581… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 30 12:09:12 2016 +0100 rpcrt4: Acquire new credential handle for each connection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_message.c | 3 +++ dlls/rpcrt4/rpc_server.c | 28 ++++++++-------------------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 57781ce..9642213 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -1063,7 +1063,10 @@ RPC_STATUS RPCRT4_ServerConnectionAuth(RpcConnection* conn, auth_data_in->auth_type, cred, exp, max_token, NULL, &conn->AuthInfo); if (status != RPC_S_OK) + { + FreeCredentialsHandle(&cred); return status; + } /* FIXME: should auth_data_in->auth_context_id be checked in the !start case? */ conn->auth_context_id = auth_data_in->auth_context_id; diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index c3bc227..9e0426a 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1309,9 +1309,6 @@ RPC_STATUS WINAPI RpcObjectSetType( UUID* ObjUuid, UUID* TypeUuid ) struct rpc_server_registered_auth_info { struct list entry; - TimeStamp exp; - BOOL cred_acquired; - CredHandle cred; USHORT auth_type; WCHAR *package_name; WCHAR *principal; @@ -1354,30 +1351,22 @@ RPC_STATUS RPCRT4_ServerGetRegisteredAuthInfo( { RPC_STATUS status = RPC_S_UNKNOWN_AUTHN_SERVICE; struct rpc_server_registered_auth_info *auth_info; + SECURITY_STATUS sec_status; EnterCriticalSection(&server_auth_info_cs); LIST_FOR_EACH_ENTRY(auth_info, &server_registered_auth_info, struct rpc_server_registered_auth_info, entry) { if (auth_info->auth_type == auth_type) { - if (!auth_info->cred_acquired) + sec_status = AcquireCredentialsHandleW((SEC_WCHAR *)auth_info->principal, auth_info->package_name, + SECPKG_CRED_INBOUND, NULL, NULL, NULL, NULL, + cred, exp); + if (sec_status != SEC_E_OK) { - SECURITY_STATUS sec_status; - - sec_status = AcquireCredentialsHandleW((SEC_WCHAR *)auth_info->principal, auth_info->package_name, - SECPKG_CRED_INBOUND, NULL, NULL, NULL, NULL, - &auth_info->cred, &auth_info->exp); - if (sec_status != SEC_E_OK) - { - status = RPC_S_SEC_PKG_ERROR; - break; - } - - auth_info->cred_acquired = TRUE; + status = RPC_S_SEC_PKG_ERROR; + break; } - *cred = auth_info->cred; - *exp = auth_info->exp; *max_token = auth_info->max_token; status = RPC_S_OK; break; @@ -1395,8 +1384,7 @@ void RPCRT4_ServerFreeAllRegisteredAuthInfo(void) EnterCriticalSection(&server_auth_info_cs); LIST_FOR_EACH_ENTRY_SAFE(auth_info, cursor2, &server_registered_auth_info, struct rpc_server_registered_auth_info, entry) { - if (auth_info->cred_acquired) - FreeCredentialsHandle(&auth_info->cred); + HeapFree(GetProcessHeap(), 0, auth_info->package_name); HeapFree(GetProcessHeap(), 0, auth_info->principal); HeapFree(GetProcessHeap(), 0, auth_info); }

1 0