June 2016 - Wine-Commits - list.winehq.org

Aaryaman Vasishta : d3drm/tests: Fix some missing HRESULT returns in test_frame_qi.
by Alexandre Julliard June 9, 2016

June 9, 2016

Module: wine Branch: master Commit: 431f613beb2cf5590c6d3706d5e50fea2fe876b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=431f613beb2cf5590c6d3706d… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Jun 9 03:37:29 2016 +0530 d3drm/tests: Fix some missing HRESULT returns in test_frame_qi. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f279314..5cd6a11 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2566,7 +2566,7 @@ static void test_frame_qi(void) hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame1); ok(hr == D3DRM_OK, "Failed to create frame1 (hr = %x)\n", hr); - IDirect3DRMFrame_QueryInterface(frame1, &IID_IUnknown, (void **)&unknown); + hr = IDirect3DRMFrame_QueryInterface(frame1, &IID_IUnknown, (void **)&unknown); ok(hr == D3DRM_OK, "Failed to create IUnknown from frame1 (hr = %x)\n", hr); IDirect3DRMFrame_Release(frame1); test_qi("frame1_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); @@ -2576,7 +2576,7 @@ static void test_frame_qi(void) ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr); hr = IDirect3DRM2_CreateFrame(d3drm2, NULL, &frame2); ok(hr == D3DRM_OK, "Failed to create frame2 (hr = %x)\n", hr); - IDirect3DRMFrame2_QueryInterface(frame2, &IID_IUnknown, (void **)&unknown); + hr = IDirect3DRMFrame2_QueryInterface(frame2, &IID_IUnknown, (void **)&unknown); ok(hr == D3DRM_OK, "Failed to create IUnknown from frame2 (hr = %x)\n", hr); IDirect3DRMFrame2_Release(frame2); test_qi("frame2_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); @@ -2586,7 +2586,7 @@ static void test_frame_qi(void) ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr); hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3); ok(hr == D3DRM_OK, "Failed to create frame3 (hr = %x)\n", hr); - IDirect3DRMFrame3_QueryInterface(frame3, &IID_IUnknown, (void **)&unknown); + hr = IDirect3DRMFrame3_QueryInterface(frame3, &IID_IUnknown, (void **)&unknown); ok(hr == D3DRM_OK, "Failed to create IUnknown from frame3 (hr = %x)\n", hr); IDirect3DRMFrame3_Release(frame3); test_qi("frame3_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests));

1 0

Michael Stefaniuc : ddraw/tests: Use wine_dbgstr_rect() in the ddraw7 tests.
by Alexandre Julliard June 9, 2016

June 9, 2016

Module: wine Branch: master Commit: a602e2f69aec83598824ae92cdebd48523203a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a602e2f69aec83598824ae92c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 22:37:13 2016 +0200 ddraw/tests: Use wine_dbgstr_rect() in the ddraw7 tests. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 164 ++++++++++++++++++---------------------------- 1 file changed, 65 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a602e2f69aec83598824a…

1 0

Michael Stefaniuc : ddraw/tests: Use wine_dbgstr_rect() in the ddraw4 tests.
by Alexandre Julliard June 9, 2016

June 9, 2016

Module: wine Branch: master Commit: 7d74583e8ae420daaa73bf664763bbb0deea9009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d74583e8ae420daaa73bf664… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 22:35:25 2016 +0200 ddraw/tests: Use wine_dbgstr_rect() in the ddraw4 tests. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 164 ++++++++++++++++++---------------------------- 1 file changed, 65 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d74583e8ae420daaa73b…

1 0

Michael Stefaniuc : ddraw/tests: Use wine_dbgstr_rect() in the ddraw2 tests.
by Alexandre Julliard June 9, 2016

June 9, 2016

Module: wine Branch: master Commit: bfe3475d5a42129bf3b77234ffb4ad744310d924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe3475d5a42129bf3b77234f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 22:24:47 2016 +0200 ddraw/tests: Use wine_dbgstr_rect() in the ddraw2 tests. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 164 ++++++++++++++++++---------------------------- 1 file changed, 65 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bfe3475d5a42129bf3b77…

1 0

Józef Kucia : d3d11: Normalize SRV descriptions for remaining view dimensions.
by Alexandre Julliard June 9, 2016

June 9, 2016

Module: wine Branch: master Commit: 026d5839ba9198fa0acc198a5d196f5f6298155a URL: http://source.winehq.org/git/wine.git/?a=commit;h=026d5839ba9198fa0acc198a5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 8 14:55:02 2016 +0200 d3d11: Normalize SRV descriptions for remaining view dimensions. 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 | 24 +++++++++- dlls/d3d11/tests/d3d11.c | 104 +++++++++++++++++++++++++++++++++--------- dlls/d3d11/view.c | 19 ++++++++ 3 files changed, 125 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=026d5839ba9198fa0acc1…

1 0

Józef Kucia : d3d11/tests: Add more tests for creating depth stencil views.
by Alexandre Julliard June 9, 2016

June 9, 2016

Module: wine Branch: master Commit: d5f383ca53c3d8fcce56e2f34a0570b6a601c5fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f383ca53c3d8fcce56e2f34… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 8 14:55:01 2016 +0200 d3d11/tests: Add more tests for creating depth stencil views. 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 | 168 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 136 insertions(+), 32 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b519e39..0f811ec 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -279,6 +279,72 @@ static void check_rtv_desc_(unsigned int line, const D3D11_RENDER_TARGET_VIEW_DE } } +struct dsv_desc +{ + DXGI_FORMAT format; + D3D11_DSV_DIMENSION dimension; + unsigned int miplevel_idx; + unsigned int layer_idx; + unsigned int layer_count; +}; + +static void get_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *d3d11_desc, const struct dsv_desc *desc) +{ + d3d11_desc->Format = desc->format; + d3d11_desc->ViewDimension = desc->dimension; + d3d11_desc->Flags = 0; + if (desc->dimension == D3D11_DSV_DIMENSION_TEXTURE2D) + { + U(*d3d11_desc).Texture2D.MipSlice = desc->miplevel_idx; + } + else if (desc->dimension == D3D11_DSV_DIMENSION_TEXTURE2DARRAY) + { + U(*d3d11_desc).Texture2DArray.MipSlice = desc->miplevel_idx; + U(*d3d11_desc).Texture2DArray.FirstArraySlice = desc->layer_idx; + U(*d3d11_desc).Texture2DArray.ArraySize = desc->layer_count; + } + else + { + trace("Unhandled view dimension %#x.\n", desc->dimension); + } +} + +#define check_dsv_desc(a, b) check_dsv_desc_(__LINE__, a, b) +static void check_dsv_desc_(unsigned int line, const D3D11_DEPTH_STENCIL_VIEW_DESC *desc, + const struct dsv_desc *expected_desc) +{ + ok_(__FILE__, line)(desc->Format == expected_desc->format, + "Got format %#x, expected %#x.\n", desc->Format, expected_desc->format); + ok_(__FILE__, line)(desc->ViewDimension == expected_desc->dimension, + "Got view dimension %#x, expected %#x.\n", desc->ViewDimension, expected_desc->dimension); + + if (desc->ViewDimension != expected_desc->dimension) + return; + + if (desc->ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2D) + { + ok_(__FILE__, line)(U(*desc).Texture2D.MipSlice == expected_desc->miplevel_idx, + "Got MipSlice %u, expected %u.\n", + U(*desc).Texture2D.MipSlice, expected_desc->miplevel_idx); + } + else if (desc->ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2DARRAY) + { + ok_(__FILE__, line)(U(*desc).Texture2DArray.MipSlice == expected_desc->miplevel_idx, + "Got MipSlice %u, expected %u.\n", + U(*desc).Texture2DArray.MipSlice, expected_desc->miplevel_idx); + ok_(__FILE__, line)(U(*desc).Texture2DArray.FirstArraySlice == expected_desc->layer_idx, + "Got FirstArraySlice %u, expected %u.\n", + U(*desc).Texture2DArray.FirstArraySlice, expected_desc->layer_idx); + ok_(__FILE__, line)(U(*desc).Texture2DArray.ArraySize == expected_desc->layer_count, + "Got ArraySize %u, expected %u.\n", + U(*desc).Texture2DArray.ArraySize, expected_desc->layer_count); + } + else + { + trace("Unhandled view dimension %#x.\n", desc->ViewDimension); + } +} + #define create_buffer(a, b, c, d) create_buffer_(__LINE__, a, b, c, d) static ID3D11Buffer *create_buffer_(unsigned int line, ID3D11Device *device, unsigned int bind_flags, unsigned int size, const void *data) @@ -1948,8 +2014,48 @@ static void test_create_depthstencil_view(void) ID3D11DepthStencilView *dsview; ID3D11Device *device, *tmp; ID3D11Texture2D *texture; + IUnknown *iface; + unsigned int i; HRESULT hr; + static const struct + { + struct + { + unsigned int miplevel_count; + unsigned int array_size; + DXGI_FORMAT format; + } texture; + struct dsv_desc dsv_desc; + struct dsv_desc expected_dsv_desc; + } + tests[] = + { +#define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN +#define D24_S8 DXGI_FORMAT_D24_UNORM_S8_UINT +#define TEX_2D D3D11_DSV_DIMENSION_TEXTURE2D +#define TEX_2D_ARRAY D3D11_DSV_DIMENSION_TEXTURE2DARRAY + {{ 1, 1, D24_S8}, {0}, {D24_S8, TEX_2D, 0}}, + {{10, 1, D24_S8}, {0}, {D24_S8, TEX_2D, 0}}, + {{10, 1, D24_S8}, {FMT_UNKNOWN, TEX_2D, 0}, {D24_S8, TEX_2D, 0}}, + {{10, 1, D24_S8}, {FMT_UNKNOWN, TEX_2D, 1}, {D24_S8, TEX_2D, 1}}, + {{10, 1, D24_S8}, {FMT_UNKNOWN, TEX_2D, 9}, {D24_S8, TEX_2D, 9}}, + {{ 1, 4, D24_S8}, {0}, {D24_S8, TEX_2D_ARRAY, 0, 0, 4}}, + {{10, 4, D24_S8}, {0}, {D24_S8, TEX_2D_ARRAY, 0, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 0, -1}, {D24_S8, TEX_2D_ARRAY, 0, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 1, 0, -1}, {D24_S8, TEX_2D_ARRAY, 1, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 3, 0, -1}, {D24_S8, TEX_2D_ARRAY, 3, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 5, 0, -1}, {D24_S8, TEX_2D_ARRAY, 5, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 9, 0, -1}, {D24_S8, TEX_2D_ARRAY, 9, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 1, -1}, {D24_S8, TEX_2D_ARRAY, 0, 1, 3}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 2, -1}, {D24_S8, TEX_2D_ARRAY, 0, 2, 2}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 3, -1}, {D24_S8, TEX_2D_ARRAY, 0, 3, 1}}, +#undef FMT_UNKNOWN +#undef D24_S8 +#undef TEX_2D +#undef TEX_2D_ARRAY + }; + if (!(device = create_device(NULL))) { skip("Failed to create device.\n"); @@ -1993,46 +2099,44 @@ static void test_create_depthstencil_view(void) ok(!U(dsv_desc).Texture2D.MipSlice, "Got unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); ID3D11DepthStencilView_Release(dsview); + ID3D11Texture2D_Release(texture); - dsv_desc.Format = DXGI_FORMAT_UNKNOWN; - - hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, &dsv_desc, &dsview); - ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x.\n", hr); + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + D3D11_DEPTH_STENCIL_VIEW_DESC *current_desc; - memset(&dsv_desc, 0, sizeof(dsv_desc)); - ID3D11DepthStencilView_GetDesc(dsview, &dsv_desc); - ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); - ok(dsv_desc.ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2D, - "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); - ok(!dsv_desc.Flags, "Got unexpected flags %#x.\n", dsv_desc.Flags); - ok(!U(dsv_desc).Texture2D.MipSlice, "Got unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); + texture_desc.MipLevels = tests[i].texture.miplevel_count; + texture_desc.ArraySize = tests[i].texture.array_size; + texture_desc.Format = tests[i].texture.format; - ID3D11DepthStencilView_Release(dsview); - ID3D11Texture2D_Release(texture); + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Test %u: Failed to create 2d texture, hr %#x.\n", i, hr); - texture_desc.ArraySize = 4; + if (tests[i].dsv_desc.dimension == D3D11_DSV_DIMENSION_UNKNOWN) + { + current_desc = NULL; + } + else + { + current_desc = &dsv_desc; + get_dsv_desc(current_desc, &tests[i].dsv_desc); + } - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, current_desc, &dsview); + ok(SUCCEEDED(hr), "Test %u: Failed to create depth stencil view, hr %#x.\n", i, hr); - hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, NULL, &dsview); - ok(SUCCEEDED(hr), "Failed to create depthstencil view, hr %#x.\n", hr); + hr = ID3D11DepthStencilView_QueryInterface(dsview, &IID_ID3D10DepthStencilView, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Test %u: Depth stencil view should implement ID3D10DepthStencilView.\n", i); + if (SUCCEEDED(hr)) IUnknown_Release(iface); - memset(&dsv_desc, 0, sizeof(dsv_desc)); - ID3D11DepthStencilView_GetDesc(dsview, &dsv_desc); - ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); - ok(dsv_desc.ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2DARRAY, - "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); - ok(!dsv_desc.Flags, "Got unexpected flags %#x.\n", dsv_desc.Flags); - ok(!U(dsv_desc).Texture2DArray.MipSlice, "Got unexpected mip slice %u.\n", - U(dsv_desc).Texture2DArray.MipSlice); - ok(!U(dsv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n", - U(dsv_desc).Texture2DArray.FirstArraySlice); - ok(U(dsv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, - "Got unexpected array size %u.\n", U(dsv_desc).Texture2DArray.ArraySize); + memset(&dsv_desc, 0, sizeof(dsv_desc)); + ID3D11DepthStencilView_GetDesc(dsview, &dsv_desc); + check_dsv_desc(&dsv_desc, &tests[i].expected_dsv_desc); - ID3D11DepthStencilView_Release(dsview); - ID3D11Texture2D_Release(texture); + ID3D11DepthStencilView_Release(dsview); + ID3D11Texture2D_Release(texture); + } refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Józef Kucia : d3d11/tests: Add more tests for creating render target views.
by Alexandre Julliard June 9, 2016

June 9, 2016

Module: wine Branch: master Commit: 6252bd2b63164c64a644153cce9dc5469531c9a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6252bd2b63164c64a644153cc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 8 14:54:59 2016 +0200 d3d11/tests: Add more tests for creating render target views. 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 | 264 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 202 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6252bd2b63164c64a6441…

1 0

Józef Kucia : wined3d: Fix wined3d_rendertarget_view_desc validation for 3D textures.
by Alexandre Julliard June 9, 2016

June 9, 2016

Module: wine Branch: master Commit: 6c39a1aeab074fce870f4a27273bffe9ad53c121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c39a1aeab074fce870f4a272… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 8 14:54:58 2016 +0200 wined3d: Fix wined3d_rendertarget_view_desc validation for 3D textures. 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/view.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 1604443..95e1162 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -109,12 +109,21 @@ static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view * else { struct wined3d_texture *texture = texture_from_resource(resource); + unsigned int depth_or_layer_count; + + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + depth_or_layer_count = wined3d_texture_get_level_depth(texture, desc->u.texture.level_idx); + else + depth_or_layer_count = texture->layer_count; if (desc->u.texture.level_idx >= texture->level_count - || desc->u.texture.layer_idx >= texture->layer_count - || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) + || desc->u.texture.layer_idx >= depth_or_layer_count + || desc->u.texture.layer_count > depth_or_layer_count - desc->u.texture.layer_idx) return WINED3DERR_INVALIDCALL; - view->sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; + + view->sub_resource_idx = desc->u.texture.level_idx; + if (resource->type != WINED3D_RTYPE_TEXTURE_3D) + view->sub_resource_idx += desc->u.texture.layer_idx * texture->level_count; view->buffer_offset = 0; view->width = wined3d_texture_get_level_width(texture, desc->u.texture.level_idx); view->height = wined3d_texture_get_level_height(texture, desc->u.texture.level_idx);

1 0

Hugh McMaster : reg: Avoid possible out-of-bounds memory access when a switch is only a forward slash or hyphen.
by Alexandre Julliard June 9, 2016

June 9, 2016

Module: wine Branch: master Commit: 7d962327b12cc0f07681fe46c8d4c5715faeb819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d962327b12cc0f07681fe46c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 9 05:48:29 2016 +0000 reg: Avoid possible out-of-bounds memory access when a switch is only a forward slash or hyphen. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 7d9c972..20df2dd 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -937,7 +937,7 @@ int wmain(int argc, WCHAR *argvW[]) value_all = TRUE; continue; } - else if (ptr[1]) + else if (!ptr[0] || ptr[1]) { output_message(STRING_INVALID_CMDLINE); return 1;

1 0

Alex Henrie : ntdll: Skip synchronous read if a serial read interval timeout is set.
by Alexandre Julliard June 9, 2016

June 9, 2016

Module: wine Branch: master Commit: 84fcaafb895f08b3513486f7b687882a2ffca1f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84fcaafb895f08b3513486f7b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu May 26 23:34:26 2016 -0600 ntdll: Skip synchronous read if a serial read interval timeout is set. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 7d09c8f..7fbde50 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -904,6 +904,20 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, } } + if (type == FD_TYPE_SERIAL && async_read && length) + { + /* an asynchronous serial port read with a read interval timeout needs to + skip the synchronous read to make sure that the server starts the read + interval timer after the first read */ + if ((status = get_io_timeouts( hFile, type, length, TRUE, &timeouts ))) goto err; + if (timeouts.interval) + { + status = register_async_file_read( hFile, hEvent, apc, apc_user, io_status, + buffer, total, length, FALSE ); + goto err; + } + } + for (;;) { if ((result = read( unix_handle, (char *)buffer + total, length - total )) >= 0)

1 0