November 2016 - Wine-commits

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

30 Nov '16

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

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

30 Nov '16

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/tests: Add test for two sided stencil.
by Alexandre Julliard 30 Nov '16

30 Nov '16

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

Alex Henrie : winegstreamer: Avoid double initialization.
by Alexandre Julliard 30 Nov '16

30 Nov '16

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

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

30 Nov '16

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

Vincent Povirk : mscoree: Update Wine Mono to 4.6.4.
by Alexandre Julliard 30 Nov '16

30 Nov '16

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

Hans Leidekker : winhttp/tests: Properly restore proxy settings on 64-bit.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: 2b09cfe9288cbd23fe78952e605fdca924a4d19d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b09cfe9288cbd23fe78952e6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 30 10:58:57 2016 +0100 winhttp/tests: Properly restore proxy settings on 64-bit. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 61c4acf..1b9ccc4 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1217,21 +1217,28 @@ static DWORD get_default_proxy_reg_value( BYTE *buf, DWORD len, DWORD *type ) return ret; } -static void set_default_proxy_reg_value( BYTE *buf, DWORD len, DWORD type ) +static void set_proxy( REGSAM access, BYTE *buf, DWORD len, DWORD type ) { - LONG l; - HKEY key; + HKEY hkey; + if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, Connections, 0, NULL, 0, access, NULL, &hkey, NULL )) + { + if (len) RegSetValueExW( hkey, WinHttpSettings, 0, type, buf, len ); + else RegDeleteValueW( hkey, WinHttpSettings ); + RegCloseKey( hkey ); + } +} - l = RegCreateKeyExW( HKEY_LOCAL_MACHINE, Connections, 0, NULL, 0, - KEY_WRITE, NULL, &key, NULL ); - if (!l) +static void set_default_proxy_reg_value( BYTE *buf, DWORD len, DWORD type ) +{ + BOOL wow64; + IsWow64Process( GetCurrentProcess(), &wow64 ); + if (sizeof(void *) > sizeof(int) || wow64) { - if (len) - RegSetValueExW( key, WinHttpSettings, 0, type, buf, len ); - else - RegDeleteValueW( key, WinHttpSettings ); - RegCloseKey( key ); + set_proxy( KEY_WRITE|KEY_WOW64_64KEY, buf, len, type ); + set_proxy( KEY_WRITE|KEY_WOW64_32KEY, buf, len, type ); } + else + set_proxy( KEY_WRITE, buf, len, type ); } static void test_set_default_proxy_config(void)

1 0

Daniel Lehman : shlwapi: Remove dot segments for URLs starting with /.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: 4eac6e84ba4b999c234215a28314074b9581266a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eac6e84ba4b999c234215a28… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Nov 23 14:20:24 2016 -0800 shlwapi: Remove dot segments for URLs starting with /. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 9 +++++++++ dlls/shlwapi/url.c | 3 +++ 2 files changed, 12 insertions(+) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 2cb6fea..f9fc79a 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -193,6 +193,15 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"res://c:\\tests/res\\foo%20bar/strange\\sth", 0, S_OK, "res://c:\\tests/res\\foo%20bar/strange\\sth", FALSE}, {"res://c:\\tests/res\\foo%20bar/strange\\sth", URL_FILE_USE_PATHURL, S_OK, "res://c:\\tests/res\\foo%20bar/strange\\sth", FALSE}, {"res://c:\\tests/res\\foo%20bar/strange\\sth", URL_UNESCAPE, S_OK, "res://c:\\tests/res\\foo bar/strange\\sth", FALSE}, + {"/A/../B/./C/../../test_remove_dot_segments", 0, S_OK, "/test_remove_dot_segments", FALSE}, + {"/A/../B/./C/../../test_remove_dot_segments", URL_FILE_USE_PATHURL, S_OK, "/test_remove_dot_segments", FALSE}, + {"/A/../B/./C/../../test_remove_dot_segments", URL_WININET_COMPATIBILITY, S_OK, "/test_remove_dot_segments", FALSE}, + {"/A/B\\C/D\\E", 0, S_OK, "/A/B\\C/D\\E", FALSE}, + {"/A/B\\C/D\\E", URL_FILE_USE_PATHURL, S_OK, "/A/B\\C/D\\E", FALSE}, + {"/A/B\\C/D\\E", URL_WININET_COMPATIBILITY, S_OK, "/A/B\\C/D\\E", FALSE}, + {"///A/../B", 0, S_OK, "///B", FALSE}, + {"///A/../B", URL_FILE_USE_PATHURL, S_OK, "///B", FALSE}, + {"///A/../B", URL_WININET_COMPATIBILITY, S_OK, "///B", FALSE}, {"A", 0, S_OK, "A", FALSE}, {"../A", 0, S_OK, "../A", FALSE}, {"A/../B", 0, S_OK, "B", TRUE}, diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 879a734..2caf998 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -372,6 +372,9 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, dwFlags |= URL_ESCAPE_UNSAFE; state = 5; is_file_url = TRUE; + } else if(url[0] == '/') { + state = 5; + is_file_url = TRUE; } while (*wk1) {

1 0

Daniel Lehman : wininet: Canonicalize URL in HttpOpenRequest.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: b3d12a16ce73c460166005f385530507b24e00dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3d12a16ce73c460166005f38… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Oct 26 12:17:17 2016 -0700 wininet: Canonicalize URL in HttpOpenRequest. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 7 ++++--- dlls/wininet/tests/http.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b51c6c9..b3c8e66 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3401,13 +3401,14 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, if (lpszObjectName && *lpszObjectName) { HRESULT rc; + WCHAR dummy; - len = 0; - rc = UrlEscapeW(lpszObjectName, NULL, &len, URL_ESCAPE_SPACES_ONLY); + len = 1; + rc = UrlCanonicalizeW(lpszObjectName, &dummy, &len, URL_ESCAPE_SPACES_ONLY); if (rc != E_POINTER) len = strlenW(lpszObjectName)+1; request->path = heap_alloc(len*sizeof(WCHAR)); - rc = UrlEscapeW(lpszObjectName, request->path, &len, + rc = UrlCanonicalizeW(lpszObjectName, request->path, &len, URL_ESCAPE_SPACES_ONLY); if (rc != S_OK) { diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index f2fe25c..9cda9c5 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2402,6 +2402,10 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, okmsg, sizeof(okmsg)-1, 0); send(c, buffer, strlen(buffer), 0); } + if (strstr(buffer, "GET /test_remove_dot_segments")) + { + send(c, okmsg, sizeof(okmsg)-1, 0); + } shutdown(c, 2); closesocket(c); c = -1; @@ -4851,6 +4855,20 @@ static void test_long_url(int port) close_request(&req); } +static void test_remove_dot_segments(int port) +{ + test_request_t req; + BOOL ret; + + open_simple_request(&req, "localhost", port, NULL, "/A/../B/./C/../../test_remove_dot_segments"); + + ret = HttpSendRequestA(req.request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req.request, 200); + + close_request(&req); +} + static void test_http_connection(void) { struct server_info si; @@ -4902,6 +4920,7 @@ static void test_http_connection(void) test_async_read(si.port); test_http_read(si.port); test_long_url(si.port); + test_remove_dot_segments(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Jacek Caban : rpcrt4: Store security package name in rpc_server_registered_auth_info.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: da05dfd151153fda5731ddcdbcdb951354b5da56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da05dfd151153fda5731ddcdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 30 12:08:51 2016 +0100 rpcrt4: Store security package name in rpc_server_registered_auth_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 73e9742..c3bc227 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1312,9 +1312,10 @@ struct rpc_server_registered_auth_info TimeStamp exp; BOOL cred_acquired; CredHandle cred; - ULONG max_token; USHORT auth_type; + WCHAR *package_name; WCHAR *principal; + ULONG max_token; }; static RPC_STATUS find_security_package(ULONG auth_type, SecPkgInfoW **packages_buf, SecPkgInfoW **ret) @@ -1361,17 +1362,11 @@ RPC_STATUS RPCRT4_ServerGetRegisteredAuthInfo( { if (!auth_info->cred_acquired) { - SecPkgInfoW *packages, *package; SECURITY_STATUS sec_status; - status = find_security_package(auth_info->auth_type, &packages, &package); - if (status != RPC_S_OK) - break; - - sec_status = AcquireCredentialsHandleW((SEC_WCHAR *)auth_info->principal, package->Name, + 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); - FreeContextBuffer(packages); if (sec_status != SEC_E_OK) { status = RPC_S_SEC_PKG_ERROR; @@ -1437,6 +1432,7 @@ RPC_STATUS WINAPI RpcServerRegisterAuthInfoW( RPC_WSTR ServerPrincName, ULONG Au { struct rpc_server_registered_auth_info *auth_info; SecPkgInfoW *packages, *package; + WCHAR *package_name; ULONG max_token; RPC_STATUS status; @@ -1446,20 +1442,27 @@ RPC_STATUS WINAPI RpcServerRegisterAuthInfoW( RPC_WSTR ServerPrincName, ULONG Au if (status != RPC_S_OK) return status; + package_name = RPCRT4_strdupW(package->Name); max_token = package->cbMaxToken; FreeContextBuffer(packages); + if (!package_name) + return RPC_S_OUT_OF_RESOURCES; auth_info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*auth_info)); - if (!auth_info) + if (!auth_info) { + HeapFree(GetProcessHeap(), 0, package_name); return RPC_S_OUT_OF_RESOURCES; + } if (ServerPrincName && !(auth_info->principal = RPCRT4_strdupW(ServerPrincName))) { + HeapFree(GetProcessHeap(), 0, package_name); HeapFree(GetProcessHeap(), 0, auth_info); return RPC_S_OUT_OF_RESOURCES; } - auth_info->max_token = max_token; auth_info->auth_type = AuthnSvc; + auth_info->package_name = package_name; + auth_info->max_token = max_token; EnterCriticalSection(&server_auth_info_cs); list_add_tail(&server_registered_auth_info, &auth_info->entry);

1 0