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

Józef Kucia : d3d11/tests: Add test for index buffer offset.
by Alexandre Julliard July 27, 2016

July 27, 2016

Module: wine Branch: master Commit: ff0f902aa9612b50fc7123af8249916c7b9caf74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0f902aa9612b50fc7123af8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 26 12:16:34 2016 +0200 d3d11/tests: Add test for index buffer offset. 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 | 179 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 179 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3faa941..d7cda84 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9826,6 +9826,184 @@ static void test_uint_shader_instructions(void) release_test_context(&test_context); } +static void test_index_buffer_offset(void) +{ + struct d3d11_test_context test_context; + ID3D11Buffer *vb, *ib, *so_buffer; + ID3D11InputLayout *input_layout; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11GeometryShader *gs; + const struct vec4 *data; + ID3D11VertexShader *vs; + ID3D11Device *device; + UINT stride, offset; + unsigned int i; + HRESULT hr; + + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + static const DWORD vs_code[] = + { +#if 0 + void main(float4 position : SV_POSITION, float4 attrib : ATTRIB, + out float4 out_position : SV_Position, out float4 out_attrib : ATTRIB) + { + out_position = position; + out_attrib = attrib; + } +#endif + 0x43425844, 0xd7716716, 0xe23207f3, 0xc8af57c0, 0x585e2919, 0x00000001, 0x00000144, 0x00000003, + 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52545441, 0xab004249, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x7469736f, 0x006e6f69, 0x52545441, 0xab004249, 0x52444853, 0x00000068, 0x00010040, + 0x0000001a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x04000067, + 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001, + 0x0100003e, + }; + static const DWORD gs_code[] = + { +#if 0 + struct vertex + { + float4 position : SV_POSITION; + float4 attrib : ATTRIB; + }; + + [maxvertexcount(1)] + void main(point vertex input[1], inout PointStream<vertex> output) + { + output.Append(input[0]); + output.RestartStrip(); + } +#endif + 0x43425844, 0x3d1dc497, 0xdf450406, 0x284ab03b, 0xa4ec0fd6, 0x00000001, 0x00000170, 0x00000003, + 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52545441, 0xab004249, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x52545441, 0xab004249, 0x52444853, 0x00000094, 0x00020040, + 0x00000025, 0x05000061, 0x002010f2, 0x00000001, 0x00000000, 0x00000001, 0x0400005f, 0x002010f2, + 0x00000001, 0x00000001, 0x0100085d, 0x0100085c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x03000065, 0x001020f2, 0x00000001, 0x0200005e, 0x00000001, 0x06000036, 0x001020f2, 0x00000000, + 0x00201e46, 0x00000000, 0x00000000, 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, 0x00000000, + 0x00000001, 0x01000013, 0x01000009, 0x0100003e, + }; + static const D3D11_INPUT_ELEMENT_DESC input_desc[] = + { + {"SV_POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"ATTRIB", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 16, D3D11_INPUT_PER_VERTEX_DATA, 0}, + }; + static const D3D11_SO_DECLARATION_ENTRY so_declaration[] = + { + {0, "SV_Position", 0, 0, 4, 0}, + {0, "ATTRIB", 0, 0, 4, 0}, + }; + static const struct + { + struct vec4 position; + struct vec4 attrib; + } + vertices[] = + { + {{-1.0f, -1.0f, 0.0f, 1.0f}, {1.0f}}, + {{-1.0f, 1.0f, 0.0f, 1.0f}, {2.0f}}, + {{ 1.0f, -1.0f, 0.0f, 1.0f}, {3.0f}}, + {{ 1.0f, 1.0f, 0.0f, 1.0f}, {4.0f}}, + }; + static const unsigned int indices[] = + { + 0, 1, 2, 3, + 3, 2, 1, 0, + 1, 3, 2, 0, + }; + static const struct vec4 expected_data[] = + { + {-1.0f, -1.0f, 0.0f, 1.0f}, {1.0f}, + {-1.0f, 1.0f, 0.0f, 1.0f}, {2.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f}, {3.0f}, + { 1.0f, 1.0f, 0.0f, 1.0f}, {4.0f}, + + { 1.0f, 1.0f, 0.0f, 1.0f}, {4.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f}, {3.0f}, + {-1.0f, 1.0f, 0.0f, 1.0f}, {2.0f}, + {-1.0f, -1.0f, 0.0f, 1.0f}, {1.0f}, + + {-1.0f, 1.0f, 0.0f, 1.0f}, {2.0f}, + { 1.0f, 1.0f, 0.0f, 1.0f}, {4.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f}, {3.0f}, + {-1.0f, -1.0f, 0.0f, 1.0f}, {1.0f}, + }; + + if (!init_test_context(&test_context, &feature_level)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreateInputLayout(device, input_desc, sizeof(input_desc) / sizeof(*input_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + stride = 32; + hr = ID3D11Device_CreateGeometryShaderWithStreamOutput(device, gs_code, sizeof(gs_code), + so_declaration, sizeof(so_declaration) / sizeof(*so_declaration), + &stride, 1, D3D11_SO_NO_RASTERIZED_STREAM, NULL, &gs); + todo_wine ok(SUCCEEDED(hr), "Failed to create geometry shader with stream output, hr %#x.\n", hr); + if (FAILED(hr)) goto cleanup; + + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + + vb = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(vertices), vertices); + ib = create_buffer(device, D3D11_BIND_INDEX_BUFFER, sizeof(indices), indices); + so_buffer = create_buffer(device, D3D11_BIND_STREAM_OUTPUT, 1024, NULL); + + ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); + ID3D11DeviceContext_GSSetShader(context, gs, NULL, 0); + + ID3D11DeviceContext_IASetInputLayout(context, input_layout); + ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_POINTLIST); + stride = sizeof(*vertices); + offset = 0; + ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &vb, &stride, &offset); + + offset = 0; + ID3D11DeviceContext_SOSetTargets(context, 1, &so_buffer, &offset); + + ID3D11DeviceContext_IASetIndexBuffer(context, ib, DXGI_FORMAT_R32_UINT, 0); + ID3D11DeviceContext_DrawIndexed(context, 4, 0, 0); + + ID3D11DeviceContext_IASetIndexBuffer(context, ib, DXGI_FORMAT_R32_UINT, 4 * sizeof(*indices)); + ID3D11DeviceContext_DrawIndexed(context, 4, 0, 0); + + ID3D11DeviceContext_IASetIndexBuffer(context, ib, DXGI_FORMAT_R32_UINT, 8 * sizeof(*indices)); + ID3D11DeviceContext_DrawIndexed(context, 4, 0, 0); + + get_buffer_readback(so_buffer, &rb); + for (i = 0; i < sizeof(expected_data) / sizeof(*expected_data); ++i) + { + data = get_readback_vec4(&rb, i, 0); + ok(compare_vec4(data, &expected_data[i], 0), + "Got unexpected result {%.8e, %.8e, %.8e, %.8e} at %u.\n", + data->x, data->y, data->z, data->w, i); + } + release_resource_readback(&rb); + + ID3D11Buffer_Release(so_buffer); + ID3D11Buffer_Release(ib); + ID3D11Buffer_Release(vb); + ID3D11VertexShader_Release(vs); + ID3D11GeometryShader_Release(gs); +cleanup: + ID3D11InputLayout_Release(input_layout); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -9879,4 +10057,5 @@ START_TEST(d3d11) test_immediate_constant_buffer(); test_fp_specials(); test_uint_shader_instructions(); + test_index_buffer_offset(); }

1 0

Francois Gouget : d3drm/tests: Spelling fixes for a couple of ok() messages.
by Alexandre Julliard July 27, 2016

July 27, 2016

Module: wine Branch: master Commit: 429e5325f3dae24f8fa0aa3eef4789a36ca490e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=429e5325f3dae24f8fa0aa3ee… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 26 16:52:35 2016 +0200 d3drm/tests: Spelling fixes for a couple of ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 76e4fb4..db9a774 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -4487,7 +4487,7 @@ static void test_create_device_from_d3d2(void) hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3drm_d3ddevice2); ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface (hr = %#x).\n", hr); - ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode deivce created == %p, got %p.\n", d3ddevice2, + ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2); /* Check properties of render target and depth surfaces */ @@ -4768,7 +4768,7 @@ static void test_create_device_from_d3d3(void) hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3drm_d3ddevice2); ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface (hr = %#x).\n", hr); - ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode deivce created == %p, got %p.\n", d3ddevice2, + ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2); /* Check properties of render target and depth surfaces */

1 0

Andrey Gusev : wined3d: Fix a typo in state_zwriteenable() function name.
by Alexandre Julliard July 27, 2016

July 27, 2016

Module: wine Branch: master Commit: cf69c12c544ba2f2ddeadcbbb316145f7ecab258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf69c12c544ba2f2ddeadcbbb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jul 27 11:08:06 2016 +0300 wined3d: Fix a typo in state_zwriteenable() function name. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a35f9c8..42416a1 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -204,7 +204,7 @@ static void state_ditherenable(struct wined3d_context *context, const struct win } } -static void state_zwritenable(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void state_zwriteenable(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -4962,7 +4962,7 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_RENDER(WINED3D_RS_MONOENABLE), { STATE_RENDER(WINED3D_RS_MONOENABLE), state_monoenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ROP2), { STATE_RENDER(WINED3D_RS_ROP2), state_rop2 }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_PLANEMASK), { STATE_RENDER(WINED3D_RS_PLANEMASK), state_planemask }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_ZWRITEENABLE), { STATE_RENDER(WINED3D_RS_ZWRITEENABLE), state_zwritenable }, WINED3D_GL_EXT_NONE }, + { STATE_RENDER(WINED3D_RS_ZWRITEENABLE), { STATE_RENDER(WINED3D_RS_ZWRITEENABLE), state_zwriteenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LASTPIXEL), { STATE_RENDER(WINED3D_RS_LASTPIXEL), state_lastpixel }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_CULLMODE), { STATE_RENDER(WINED3D_RS_CULLMODE), state_cullmode }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ZFUNC), { STATE_RENDER(WINED3D_RS_ZFUNC), state_zfunc }, WINED3D_GL_EXT_NONE },

1 0

Huw Davies : gdi32: Pass a DC pointer to get_device_rect() to avoid accesses via the handle.
by Alexandre Julliard July 27, 2016

July 27, 2016

Module: wine Branch: master Commit: 7fa6dfecc9980bbc2c67ee1ae39a80d149c72bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fa6dfecc9980bbc2c67ee1ae… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 27 09:59:27 2016 +0100 gdi32: Pass a DC pointer to get_device_rect() to avoid accesses via the handle. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/graphics.c | 47 ++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 64f6d15..f0880cf 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -92,7 +92,7 @@ static BOOL pen_region( dibdrv_physdev *pdev, HRGN region ) return brush_rect( pdev, &pdev->pen_brush, NULL, region ); } -static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom, BOOL rtl_correction ) +static RECT get_device_rect( DC *dc, int left, int top, int right, int bottom, BOOL rtl_correction ) { RECT rect; @@ -100,21 +100,22 @@ static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom, rect.top = top; rect.right = right; rect.bottom = bottom; - if (rtl_correction && GetLayout( hdc ) & LAYOUT_RTL) + if (rtl_correction && dc->layout & LAYOUT_RTL) { /* shift the rectangle so that the right border is included after mirroring */ /* it would be more correct to do this after LPtoDP but that's not what Windows does */ rect.left--; rect.right--; } - LPtoDP( hdc, (POINT *)&rect, 2 ); + lp_to_dp( dc, (POINT *)&rect, 2 ); order_rect( &rect ); return rect; } -static BOOL get_pen_device_rect( dibdrv_physdev *dev, RECT *rect, int left, int top, int right, int bottom ) +static BOOL get_pen_device_rect( DC *dc, dibdrv_physdev *dev, RECT *rect, + int left, int top, int right, int bottom ) { - *rect = get_device_rect( dev->dev.hdc, left, top, right, bottom, TRUE ); + *rect = get_device_rect( dc, left, top, right, bottom, TRUE ); if (rect->left == rect->right || rect->top == rect->bottom) return FALSE; if (dev->pen_style == PS_INSIDEFRAME) @@ -234,7 +235,7 @@ static int find_intersection( const POINT *points, int x, int y, int count ) return 2 * count + i; } -static int get_arc_points( PHYSDEV dev, const RECT *rect, POINT start, POINT end, POINT *points ) +static int get_arc_points( int arc_dir, const RECT *rect, POINT start, POINT end, POINT *points ) { int i, pos, count, start_pos, end_pos; int width = rect->right - rect->left; @@ -246,7 +247,7 @@ static int get_arc_points( PHYSDEV dev, const RECT *rect, POINT start, POINT end points[i].x -= width / 2; points[i].y -= height / 2; } - if (GetArcDirection( dev->hdc ) != AD_CLOCKWISE) + if (arc_dir != AD_CLOCKWISE) { start.y = -start.y; end.y = -end.y; @@ -256,7 +257,7 @@ static int get_arc_points( PHYSDEV dev, const RECT *rect, POINT start, POINT end if (end_pos <= start_pos) end_pos += 4 * count; pos = count; - if (GetArcDirection( dev->hdc ) == AD_CLOCKWISE) + if (arc_dir == AD_CLOCKWISE) { for (i = start_pos; i < end_pos; i++, pos++) { @@ -316,13 +317,14 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT start_x, INT start_y, INT end_x, INT end_y, INT extra_lines ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); + DC *dc = get_physdev_dc( dev ); RECT rect; POINT pt[2], *points; int width, height, count; BOOL ret = TRUE; HRGN outline = 0, interior = 0; - if (!get_pen_device_rect( pdev, &rect, left, top, right, bottom )) return TRUE; + if (!get_pen_device_rect( dc, pdev, &rect, left, top, right, bottom )) return TRUE; width = rect.right - rect.left; height = rect.bottom - rect.top; @@ -331,7 +333,7 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, pt[0].y = start_y; pt[1].x = end_x; pt[1].y = end_y; - LPtoDP( dev->hdc, pt, 2 ); + lp_to_dp( dc, pt, 2 ); /* make them relative to the ellipse center */ pt[0].x -= rect.left + width / 2; pt[0].y -= rect.top + height / 2; @@ -343,11 +345,11 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, if (extra_lines == -1) { - GetCurrentPositionEx( dev->hdc, points ); - LPtoDP( dev->hdc, points, 1 ); - count = 1 + get_arc_points( dev, &rect, pt[0], pt[1], points + 1 ); + points[0] = dc->cur_pos; + lp_to_dp( dc, points, 1 ); + count = 1 + get_arc_points( dc->ArcDirection, &rect, pt[0], pt[1], points + 1 ); } - else count = get_arc_points( dev, &rect, pt[0], pt[1], points ); + else count = get_arc_points( dc->ArcDirection, &rect, pt[0], pt[1], points ); if (extra_lines == 2) { @@ -1199,6 +1201,7 @@ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) const WINEREGION *region; int i; RECT rect, bounds; + DC *dc = get_physdev_dc( dev ); TRACE("%p, %p\n", dev, rgn); @@ -1209,7 +1212,7 @@ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) for(i = 0; i < region->numRects; i++) { - rect = get_device_rect( dev->hdc, region->rects[i].left, region->rects[i].top, + rect = get_device_rect( dc, region->rects[i].left, region->rects[i].top, region->rects[i].right, region->rects[i].bottom, FALSE ); add_bounds_rect( &bounds, &rect ); brush_rect( pdev, &pdev->brush, &rect, pdev->clip ); @@ -1355,6 +1358,7 @@ BOOL dibdrv_Polyline( PHYSDEV dev, const POINT* pt, INT count ) BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + DC *dc = get_physdev_dc( dev ); RECT rect; POINT pts[4]; BOOL ret; @@ -1362,7 +1366,7 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) TRACE("(%p, %d, %d, %d, %d)\n", dev, left, top, right, bottom); - if (GetGraphicsMode( dev->hdc ) == GM_ADVANCED) + if (dc->GraphicsMode == GM_ADVANCED) { pts[0].x = pts[3].x = left; pts[0].y = pts[1].y = top; @@ -1371,7 +1375,7 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) return dibdrv_Polygon( dev, pts, 4 ); } - if (!get_pen_device_rect( pdev, &rect, left, top, right, bottom )) return TRUE; + if (!get_pen_device_rect( dc, pdev, &rect, left, top, right, bottom )) return TRUE; if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE; @@ -1379,7 +1383,7 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) rect.bottom--; reset_dash_origin(pdev); - if (GetArcDirection( dev->hdc ) == AD_CLOCKWISE) + if (dc->ArcDirection == AD_CLOCKWISE) { /* 4 pts going clockwise starting from bottom-right */ pts[0].x = pts[3].x = rect.right; @@ -1430,18 +1434,19 @@ BOOL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT ellipse_width, INT ellipse_height ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); + DC *dc = get_physdev_dc( dev ); RECT rect; POINT pt[2], *points; int i, end, count; BOOL ret = TRUE; HRGN outline = 0, interior = 0; - if (!get_pen_device_rect( pdev, &rect, left, top, right, bottom )) return TRUE; + if (!get_pen_device_rect( dc, pdev, &rect, left, top, right, bottom )) return TRUE; pt[0].x = pt[0].y = 0; pt[1].x = ellipse_width; pt[1].y = ellipse_height; - LPtoDP( dev->hdc, pt, 2 ); + lp_to_dp( dc, pt, 2 ); ellipse_width = min( rect.right - rect.left, abs( pt[1].x - pt[0].x )); ellipse_height = min( rect.bottom - rect.top, abs( pt[1].y - pt[0].y )); if (ellipse_width <= 2|| ellipse_height <= 2) @@ -1475,7 +1480,7 @@ BOOL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, count = ellipse_first_quadrant( ellipse_width, ellipse_height, points ); - if (GetArcDirection( dev->hdc ) == AD_CLOCKWISE) + if (dc->ArcDirection == AD_CLOCKWISE) { for (i = 0; i < count; i++) {

1 0

Alexandre Julliard : server: Avoid rounding mapping sizes on the server side.
by Alexandre Julliard July 27, 2016

July 27, 2016

Module: wine Branch: master Commit: 32c7153fdbca10398242a5e1600548c59927e4e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c7153fdbca10398242a5e16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 27 16:49:37 2016 +0900 server: Avoid rounding mapping sizes on the server side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 41 ++++++++++++++++++++++++++++++++++++++++- dlls/kernel32/tests/virtual.c | 25 ++++++++++++++++++++++--- dlls/ntdll/virtual.c | 17 +++++++++++------ include/wine/server_protocol.h | 3 ++- server/mapping.c | 22 +++++++++++++--------- server/protocol.def | 1 + server/trace.c | 6 ++++++ 7 files changed, 95 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32c7153fdbca10398242a…

1 0

Akihiro Sagawa : include: Add definition of GetProcessIdOfThread.
by Alexandre Julliard July 27, 2016

July 27, 2016

Module: wine Branch: master Commit: 719d86b70e593bedc300fd350fedea2587624e66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=719d86b70e593bedc300fd350… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jul 27 00:47:45 2016 +0900 include: Add definition of GetProcessIdOfThread. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index c5332c0..5d8b1ff 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2085,6 +2085,7 @@ WINBASEAPI BOOL WINAPI GetLogicalProcessorInformation(PSYSTEM_LOGICAL_PRO WINBASEAPI BOOL WINAPI GetLogicalProcessorInformationEx(LOGICAL_PROCESSOR_RELATIONSHIP,PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX,PDWORD); WINBASEAPI DWORD WINAPI GetProcessHeaps(DWORD,PHANDLE); WINBASEAPI DWORD WINAPI GetProcessId(HANDLE); +WINBASEAPI DWORD WINAPI GetProcessIdOfThread(HANDLE); WINBASEAPI BOOL WINAPI GetProcessIoCounters(HANDLE,PIO_COUNTERS); WINBASEAPI BOOL WINAPI GetProcessPriorityBoost(HANDLE,PBOOL); WINBASEAPI BOOL WINAPI GetProcessShutdownParameters(LPDWORD,LPDWORD);

1 0

Huw Davies : gdi32: Use lp_to_dp() instead of LPtoDP() in the dib driver.
by Alexandre Julliard July 27, 2016

July 27, 2016

Module: wine Branch: master Commit: 9efe66a83abeaddccb9e861eb2a7d50cedba1cf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9efe66a83abeaddccb9e861eb… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 27 09:59:28 2016 +0100 gdi32: Use lp_to_dp() instead of LPtoDP() in the dib driver. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/bitblt.c | 3 ++- dlls/gdi32/dibdrv/graphics.c | 19 ++++++++++++------- dlls/gdi32/dibdrv/objects.c | 7 ++++--- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 12e4cd8..41311fa 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1416,6 +1416,7 @@ BOOL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, void *grad_array, ULONG ngrad, ULONG mode ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); + DC *dc = get_physdev_dc( dev ); const GRADIENT_TRIANGLE *tri = grad_array; const GRADIENT_RECT *rect = grad_array; unsigned int i; @@ -1430,7 +1431,7 @@ BOOL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, pts[i].x = vert_array[i].x; pts[i].y = vert_array[i].y; } - LPtoDP( dev->hdc, pts, nvert ); + lp_to_dp( dc, pts, nvert ); switch (mode) { diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index f0880cf..6a99544 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -1097,6 +1097,7 @@ COLORREF dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); + DC *dc = get_physdev_dc( dev ); POINT pt; DWORD pixel; @@ -1104,7 +1105,7 @@ COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) pt.x = x; pt.y = y; - LPtoDP( dev->hdc, &pt, 1 ); + lp_to_dp( dc, &pt, 1 ); if (pt.x < 0 || pt.x >= pdev->dib.rect.right - pdev->dib.rect.left || pt.y < 0 || pt.y >= pdev->dib.rect.bottom - pdev->dib.rect.top) @@ -1120,15 +1121,16 @@ COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + DC *dc = get_physdev_dc( dev ); POINT pts[2]; HRGN region = 0; BOOL ret; - GetCurrentPositionEx(dev->hdc, pts); + pts[0] = dc->cur_pos; pts[1].x = x; pts[1].y = y; - LPtoDP(dev->hdc, pts, 2); + lp_to_dp(dc, pts, 2); if (pdev->pen_uses_region && !(region = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE; @@ -1229,6 +1231,7 @@ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD polygons ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + DC *dc = get_physdev_dc( dev ); DWORD total, i, pos; BOOL ret = TRUE; POINT *points; @@ -1243,10 +1246,10 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD points = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*pt) ); if (!points) return FALSE; memcpy( points, pt, total * sizeof(*pt) ); - LPtoDP( dev->hdc, points, total ); + lp_to_dp( dc, points, total ); if (pdev->brush.style != BS_NULL && - !(interior = CreatePolyPolygonRgn( points, counts, polygons, GetPolyFillMode( dev->hdc )))) + !(interior = CreatePolyPolygonRgn( points, counts, polygons, dc->polyFillMode ))) { HeapFree( GetProcessHeap(), 0, points ); return FALSE; @@ -1291,6 +1294,7 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polylines ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + DC *dc = get_physdev_dc( dev ); DWORD total, pos, i; POINT *points; BOOL ret = TRUE; @@ -1305,7 +1309,7 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO points = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*pt) ); if (!points) return FALSE; memcpy( points, pt, total * sizeof(*pt) ); - LPtoDP( dev->hdc, points, total ); + lp_to_dp( dc, points, total ); if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 ))) { @@ -1555,6 +1559,7 @@ BOOL dibdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, COLORREF dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); + DC *dc = get_physdev_dc( dev ); struct clipped_rects clipped_rects; RECT rect; POINT pt; @@ -1564,7 +1569,7 @@ COLORREF dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) pt.x = x; pt.y = y; - LPtoDP( dev->hdc, &pt, 1 ); + lp_to_dp( dc, &pt, 1 ); rect.left = pt.x; rect.top = pt.y; rect.right = rect.left + 1; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index a14c062..53ea889 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1726,14 +1726,14 @@ static inline void scale_dash_pattern( dash_pattern *pattern, DWORD scale, DWORD } } -static inline int get_pen_device_width( dibdrv_physdev *pdev, int width ) +static inline int get_pen_device_width( DC *dc, int width ) { POINT pts[2]; if (!width) return 1; pts[0].x = pts[0].y = pts[1].y = 0; pts[1].x = width; - LPtoDP( pdev->dev.hdc, pts, 2 ); + lp_to_dp( dc, pts, 2 ); width = floor( hypot( pts[1].x - pts[0].x, pts[1].y - pts[0].y )); return max( width, 1 ); } @@ -2113,6 +2113,7 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_patter HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + DC *dc = get_physdev_dc( dev ); LOGPEN logpen; LOGBRUSH logbrush; EXTLOGPEN *elp = NULL; @@ -2147,7 +2148,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte pdev->pen_join = logpen.lopnStyle & PS_JOIN_MASK; pdev->pen_endcap = logpen.lopnStyle & PS_ENDCAP_MASK; - pdev->pen_width = get_pen_device_width( pdev, logpen.lopnWidth.x ); + pdev->pen_width = get_pen_device_width( dc, logpen.lopnWidth.x ); if (hpen == GetStockObject( DC_PEN )) logbrush.lbColor = GetDCPenColor( dev->hdc );

1 0

Huw Davies : gdi32: Use POINT and SIZE to hold positions and extents.
by Alexandre Julliard July 27, 2016

July 27, 2016

Module: wine Branch: master Commit: 6a8cfea99bebd381d4938305cb498d22c84a993f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8cfea99bebd381d4938305c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 27 09:59:25 2016 +0100 gdi32: Use POINT and SIZE to hold positions and extents. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/brush.c | 10 ++-- dlls/gdi32/clipping.c | 4 +- dlls/gdi32/dc.c | 86 +++++++++++---------------- dlls/gdi32/font.c | 2 +- dlls/gdi32/gdi_private.h | 18 ++---- dlls/gdi32/mapping.c | 152 +++++++++++++++++++++-------------------------- dlls/gdi32/painting.c | 51 ++++++++-------- dlls/gdi32/path.c | 3 +- dlls/gdi32/tests/brush.c | 19 ++++++ 9 files changed, 159 insertions(+), 186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a8cfea99bebd381d4938…

1 0

Alexandre Julliard : ntoskrnl.exe: Fix ZwQuerySection spec file entry.
by Alexandre Julliard July 27, 2016

July 27, 2016

Module: wine Branch: master Commit: 82ca87bc2d4805ddb728a08d065c6370db745bc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82ca87bc2d4805ddb728a08d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 27 22:19:38 2016 +0900 ntoskrnl.exe: Fix ZwQuerySection spec file entry. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 406c626..778c3ae 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1351,7 +1351,7 @@ @ stdcall ZwQueryInstallUILanguage(ptr) ntdll.ZwQueryInstallUILanguage @ stdcall ZwQueryKey(long long ptr long ptr) ntdll.ZwQueryKey @ stdcall ZwQueryObject(long long long long long) ntdll.ZwQueryObject -@ stdcall ZwQuerySection(long long long long long) ntdll.ZwQuerySection +@ stdcall ZwQuerySection(long long ptr long ptr) ntdll.ZwQuerySection @ stdcall ZwQuerySecurityObject(long long long long long) ntdll.ZwQuerySecurityObject @ stdcall ZwQuerySymbolicLinkObject(long ptr ptr) ntdll.ZwQuerySymbolicLinkObject @ stdcall ZwQuerySystemInformation(long long long long) ntdll.ZwQuerySystemInformation

1 0

Alexandre Julliard : server: Don' t grow the mapped file for read-only mappings.
by Alexandre Julliard July 27, 2016

July 27, 2016

Module: wine Branch: master Commit: ef716e9d1eb3c0a46582d1ef28f6ca13d5af56dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef716e9d1eb3c0a46582d1ef2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 27 22:20:31 2016 +0900 server: Don't grow the mapped file for read-only mappings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 2 -- server/mapping.c | 10 +++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 26cf09f..583abf6 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1014,9 +1014,7 @@ static void test_MapViewOfFile(void) map_size.QuadPart = 0x3457; status = pNtCreateSection( &mapping, SECTION_QUERY | SECTION_MAP_READ, NULL, &map_size, PAGE_READONLY, SEC_COMMIT, file ); - todo_wine ok( status == STATUS_SECTION_TOO_BIG, "NtCreateSection failed %x\n", status ); - if (!status) CloseHandle( mapping ); status = pNtCreateSection( &mapping, SECTION_QUERY | SECTION_MAP_READ, NULL, &map_size, PAGE_READONLY, SEC_IMAGE, file ); ok( status == STATUS_INVALID_IMAGE_NOT_MZ, "NtCreateSection failed %x\n", status ); diff --git a/server/mapping.c b/server/mapping.c index 1015a23..b68f281 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -574,7 +574,15 @@ static struct object *create_mapping( struct object *root, const struct unicode_ goto error; } } - else if (st.st_size < mapping->size && !grow_file( unix_fd, mapping->size )) goto error; + else if (st.st_size < mapping->size) + { + if (!(access & FILE_WRITE_DATA)) + { + set_error( STATUS_SECTION_TOO_BIG ); + goto error; + } + if (!grow_file( unix_fd, mapping->size )) goto error; + } } else /* Anonymous mapping (no associated file) */ {

1 0