December 2016 - Wine-commits

Henri Verbeet : d2d1/tests: Make the window client rect match the DXGI swapchain dimensions.
by Alexandre Julliard 06 Dec '16

06 Dec '16

Module: wine Branch: master Commit: 70e68e12342953b8a8c279906b9070378b71cc1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=70e68e12342953b8a8c279906… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 5 13:16:03 2016 +0100 d2d1/tests: Make the window client rect match the DXGI swapchain dimensions. Similar to e.g. commit 65f20ffc50d6f346628338da40b375790bfca217. There's no compelling reason for the tests themselves, but it does simplify debugging them a little. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 52 +++++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a8f24f9..1653e68 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -463,6 +463,16 @@ static ID3D10Device1 *create_device(void) return NULL; } +static HWND create_window(void) +{ + RECT r = {0, 0, 640, 480}; + + AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); + + return CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); +} + static IDXGISwapChain *create_swapchain(ID3D10Device1 *device, HWND window, BOOL windowed) { IDXGISwapChain *swapchain; @@ -562,8 +572,7 @@ static void test_clip(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -714,8 +723,7 @@ static void test_state_block(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -910,8 +918,7 @@ static void test_color_brush(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -1045,8 +1052,7 @@ static void test_bitmap_brush(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -1333,8 +1339,7 @@ static void test_path_geometry(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -1942,8 +1947,7 @@ static void test_bitmap_formats(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -2012,8 +2016,7 @@ static void test_alpha_mode(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -2234,10 +2237,8 @@ static void test_shared_bitmap(void) return; } - window1 = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); - window2 = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window1 = create_window(); + window2 = create_window(); swapchain1 = create_swapchain(device1, window1, TRUE); swapchain2 = create_swapchain(device1, window2, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain1, 0, &IID_IDXGISurface, (void **)&surface1); @@ -2436,8 +2437,7 @@ static void test_bitmap_updates(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -2545,8 +2545,7 @@ static void test_opacity_brush(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -2724,8 +2723,7 @@ static void test_create_target(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -2797,8 +2795,7 @@ static void test_draw_text_layout(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -3494,8 +3491,7 @@ static void test_gradient(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr);

1 0

Henri Verbeet : d2d1/tests: Introduce a helper function to add lines to a geometry sink.
by Alexandre Julliard 06 Dec '16

06 Dec '16

Module: wine Branch: master Commit: a8dc7cc1d6adc00e08e6ad0aaed18ef51a785bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8dc7cc1d6adc00e08e6ad0aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 5 13:16:04 2016 +0100 d2d1/tests: Introduce a helper function to add lines to a geometry sink. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 134 ++++++++++++++++++------------------------------- 1 file changed, 50 insertions(+), 84 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 1653e68..3635131 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -130,6 +130,14 @@ static void translate_matrix(D2D1_MATRIX_3X2_F *matrix, float x, float y) matrix->_32 += x * matrix->_12 + y * matrix->_22; } +static void line_to(ID2D1GeometrySink *sink, float x, float y) +{ + D2D1_POINT_2F point; + + set_point(&point, x, y); + ID2D1GeometrySink_AddLine(sink, point); +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -1187,99 +1195,61 @@ static void fill_geometry_sink(ID2D1GeometrySink *sink) set_point(&point, 15.0f, 20.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_point(&point, 55.0f, 20.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 55.0f, 220.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 25.0f, 220.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 25.0f, 100.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 75.0f, 100.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 75.0f, 300.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 5.0f, 300.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 5.0f, 60.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 45.0f, 60.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 45.0f, 180.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 35.0f, 180.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 35.0f, 140.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 65.0f, 140.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 65.0f, 260.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 15.0f, 260.0f); - ID2D1GeometrySink_AddLine(sink, point); + line_to(sink, 55.0f, 20.0f); + line_to(sink, 55.0f, 220.0f); + line_to(sink, 25.0f, 220.0f); + line_to(sink, 25.0f, 100.0f); + line_to(sink, 75.0f, 100.0f); + line_to(sink, 75.0f, 300.0f); + line_to(sink, 5.0f, 300.0f); + line_to(sink, 5.0f, 60.0f); + line_to(sink, 45.0f, 60.0f); + line_to(sink, 45.0f, 180.0f); + line_to(sink, 35.0f, 180.0f); + line_to(sink, 35.0f, 140.0f); + line_to(sink, 65.0f, 140.0f); + line_to(sink, 65.0f, 260.0f); + line_to(sink, 15.0f, 260.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); set_point(&point, 155.0f, 300.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_point(&point, 155.0f, 160.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 85.0f, 160.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 85.0f, 300.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 120.0f, 300.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 120.0f, 20.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 155.0f, 20.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 155.0f, 160.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 85.0f, 160.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 85.0f, 20.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 120.0f, 20.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 120.0f, 300.0f); - ID2D1GeometrySink_AddLine(sink, point); + line_to(sink, 155.0f, 160.0f); + line_to(sink, 85.0f, 160.0f); + line_to(sink, 85.0f, 300.0f); + line_to(sink, 120.0f, 300.0f); + line_to(sink, 120.0f, 20.0f); + line_to(sink, 155.0f, 20.0f); + line_to(sink, 155.0f, 160.0f); + line_to(sink, 85.0f, 160.0f); + line_to(sink, 85.0f, 20.0f); + line_to(sink, 120.0f, 20.0f); + line_to(sink, 120.0f, 300.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); set_point(&point, 165.0f, 20.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_point(&point, 165.0f, 300.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 235.0f, 300.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 235.0f, 20.0f); - ID2D1GeometrySink_AddLine(sink, point); + line_to(sink, 165.0f, 300.0f); + line_to(sink, 235.0f, 300.0f); + line_to(sink, 235.0f, 20.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); set_point(&point, 225.0f, 60.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_point(&point, 225.0f, 260.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 175.0f, 260.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 175.0f, 60.0f); - ID2D1GeometrySink_AddLine(sink, point); + line_to(sink, 225.0f, 260.0f); + line_to(sink, 175.0f, 260.0f); + line_to(sink, 175.0f, 60.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); set_point(&point, 215.0f, 220.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_point(&point, 185.0f, 220.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 185.0f, 100.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 215.0f, 100.0f); - ID2D1GeometrySink_AddLine(sink, point); + line_to(sink, 185.0f, 220.0f); + line_to(sink, 185.0f, 100.0f); + line_to(sink, 215.0f, 100.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); set_point(&point, 195.0f, 180.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_point(&point, 205.0f, 180.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 205.0f, 140.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 195.0f, 140.0f); - ID2D1GeometrySink_AddLine(sink, point); + line_to(sink, 205.0f, 180.0f); + line_to(sink, 205.0f, 140.0f); + line_to(sink, 195.0f, 140.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); } @@ -1719,18 +1689,14 @@ static void test_path_geometry(void) set_point(&point, 40.0f, 20.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_point(&point, 75.0f, 300.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 5.0f, 300.0f); - ID2D1GeometrySink_AddLine(sink, point); + line_to(sink, 75.0f, 300.0f); + line_to(sink, 5.0f, 300.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); set_point(&point, 40.0f, 290.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_point(&point, 55.0f, 160.0f); - ID2D1GeometrySink_AddLine(sink, point); - set_point(&point, 25.0f, 160.0f); - ID2D1GeometrySink_AddLine(sink, point); + line_to(sink, 55.0f, 160.0f); + line_to(sink, 25.0f, 160.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); hr = ID2D1GeometrySink_Close(sink);

1 0

Henri Verbeet : d2d1/tests: Introduce a helper function to add quadratic bezier curves to a geometry sink.
by Alexandre Julliard 06 Dec '16

06 Dec '16

Module: wine Branch: master Commit: 3d51a7164bde6604a11ccc53181e30cd7cf4a9a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d51a7164bde6604a11ccc531… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 5 13:16:05 2016 +0100 d2d1/tests: Introduce a helper function to add quadratic bezier curves to a geometry sink. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3635131..f271103 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -138,6 +138,14 @@ static void line_to(ID2D1GeometrySink *sink, float x, float y) ID2D1GeometrySink_AddLine(sink, point); } +static void quadratic_to(ID2D1GeometrySink *sink, float x1, float y1, float x2, float y2) +{ + D2D1_QUADRATIC_BEZIER_SEGMENT quadratic; + + set_quadratic(&quadratic, x1, y1, x2, y2); + ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -1255,31 +1263,22 @@ static void fill_geometry_sink(ID2D1GeometrySink *sink) static void fill_geometry_sink_bezier(ID2D1GeometrySink *sink) { - D2D1_QUADRATIC_BEZIER_SEGMENT quadratic; D2D1_POINT_2F point; set_point(&point, 5.0f, 160.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_quadratic(&quadratic, 40.0f, 160.0f, 40.0f, 20.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); - set_quadratic(&quadratic, 40.0f, 160.0f, 75.0f, 160.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); - set_quadratic(&quadratic, 40.0f, 160.0f, 40.0f, 300.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); - set_quadratic(&quadratic, 40.0f, 160.0f, 5.0f, 160.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); + quadratic_to(sink, 40.0f, 160.0f, 40.0f, 20.0f); + quadratic_to(sink, 40.0f, 160.0f, 75.0f, 160.0f); + quadratic_to(sink, 40.0f, 160.0f, 40.0f, 300.0f); + quadratic_to(sink, 40.0f, 160.0f, 5.0f, 160.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); set_point(&point, 20.0f, 160.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_quadratic(&quadratic, 20.0f, 80.0f, 40.0f, 80.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); - set_quadratic(&quadratic, 60.0f, 80.0f, 60.0f, 160.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); - set_quadratic(&quadratic, 60.0f, 240.0f, 40.0f, 240.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); - set_quadratic(&quadratic, 20.0f, 240.0f, 20.0f, 160.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); + quadratic_to(sink, 20.0f, 80.0f, 40.0f, 80.0f); + quadratic_to(sink, 60.0f, 80.0f, 60.0f, 160.0f); + quadratic_to(sink, 60.0f, 240.0f, 40.0f, 240.0f); + quadratic_to(sink, 20.0f, 240.0f, 20.0f, 160.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); }

1 0

Henri Verbeet : d2d1: Properly test which side of a bezier curve is the inside.
by Alexandre Julliard 06 Dec '16

06 Dec '16

Module: wine Branch: master Commit: e9fc8c7c52db5fb1bf48420e5d6ee433661fd7e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9fc8c7c52db5fb1bf48420e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 5 13:16:06 2016 +0100 d2d1: Properly test which side of a bezier curve is the inside. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 230 ++++++++++++++++++++++++++++++++----------------- dlls/d2d1/tests/d2d1.c | 110 ++++++++++++++++++----- 2 files changed, 238 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9fc8c7c52db5fb1bf484…

1 0

André Hentschel : WWN 403: Add Aric's Video
by Jeremy Newman 05 Dec '16

05 Dec '16

Module: website Branch: master Commit: c41ba1ed8a733c1d8b48ed6977515075af2e86f1 URL: http://source.winehq.org/git/website.git/?a=commit;h=c41ba1ed8a733c1d8b48ed… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 5 17:45:49 2016 +0100 WWN 403: Add Aric's Video Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- wwn/en/wn20161202_403.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wwn/en/wn20161202_403.xml b/wwn/en/wn20161202_403.xml index 16c264b..342b28e 100644 --- a/wwn/en/wn20161202_403.xml +++ b/wwn/en/wn20161202_403.xml @@ -55,7 +55,7 @@ The expected main areas of development after 2.0 will be Aric’s HID support, t Aric Stewart presented his work on supporting the Windows human interface device layer in Wine. This is a low level interface that allows applications to talk to devices like joysticks, keyboards, gamepads, etc. Few applications use it to use joysticks, instead they use higher level libraries like DirectInput or XInput, which then talk to this lower level layer. Wine currently supports DirectInput, so joysticks and gamepads work in many games. Unfortunately XInput is missing. Aric’s plan is to provide the low level hid.dll and (re-)implement dinput and xinput on top of it. This puts all operating system abstraction code (Linux, OSX, Android specific joystick handling) into hid.dll and allows applications that talk directly to hid.dll to work. Those applications are rare, but they exist. -Aric’s presentation video will be uploaded soon... +You can see Aric’s <a href="https://youtu.be/VcW_et0GC5Q">full presentation here</a>! Aric also sent a mail explaining the current status to <a href="https://www.winehq.org/pipermail/wine-devel/2016-November/115142.html">wine-devel</a>: <quote>

1 0

Jeremy Newman : remove scroll class
by Jeremy Newman 05 Dec '16

05 Dec '16

Module: appdb Branch: master Commit: d0c61b7b970e191a6e88cb6aaf3041cd403f5e88 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d0c61b7b970e191a6e88cb6a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 5 08:34:45 2016 -0600 remove scroll class --- include/note.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/note.php b/include/note.php index ca914ac..0e43cce 100644 --- a/include/note.php +++ b/include/note.php @@ -296,7 +296,7 @@ class Note { $shOutput .= '</form>'; } - echo html_note("{$sTitle}", $this->shDescription, $shOutput, 'default panel-scroll'); + echo html_note("{$sTitle}", $this->shDescription, $shOutput, 'default'); } public static function displayNotesForEntry($iVersionId, $iAppId = null)

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.24
by Jeremy Newman 05 Dec '16

05 Dec '16

Module: website Branch: master Commit: 779f3804a4ac9507177bd02363c0b3cf3fe42fa0 URL: http://source.winehq.org/git/website.git/?a=commit;h=779f3804a4ac9507177bd0… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Dec 4 08:22:56 2016 +0100 Polish translation for release 1.9.24 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016112501.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/pl/2016112501.xml b/news/pl/2016112501.xml new file mode 100644 index 0000000..7c710e3 --- /dev/null +++ b/news/pl/2016112501.xml @@ -0,0 +1,15 @@ +<news> +<date>Listopad 25, 2016</date> +<title>Wydano Wine 1.9.24</title> +<body> + Wydanie rozwojowe Wine 1.9.24 jest już dostępne. + <a href="{$root}/announce/1.9.24">Co nowego</a> w tym wydaniu: +<ul> + <li>Obsługa dla nieuszeregowanych widoków dostępu w Direct3D.</li> + <li>Wiele poprawek w testach regresji.</li> + <li>Kilka ulepszeń w obsłudze HID.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.24.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_D32_FLOAT_S8X24_UINT format.
by Alexandre Julliard 02 Dec '16

02 Dec '16

Module: wine Branch: master Commit: 7c9dbd789aed14100fb4d6eb4db1859ce5921dd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c9dbd789aed14100fb4d6eb4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 1 13:56:35 2016 +0100 wined3d: Add support for WINED3DFMT_D32_FLOAT_S8X24_UINT format. 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 | 2 +- dlls/d3d11/tests/d3d11.c | 2 +- dlls/wined3d/utils.c | 144 ++++++++++++++++++++++-------------------- 3 files changed, 78 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c9dbd789aed14100fb4d…

1 0

Józef Kucia : wined3d: Fix depth/ stencil shader resource views.
by Alexandre Julliard 02 Dec '16

02 Dec '16

Module: wine Branch: master Commit: af1be967a0b0262a980e9bfbdff107c1d6db7e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=af1be967a0b0262a980e9bfbd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 1 13:56:36 2016 +0100 wined3d: Fix depth/stencil shader resource views. The WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, WINED3DFMT_X32_TYPELESS_G8X24_UINT, WINED3DFMT_R24_UNORM_X8_TYPELESS, WINED3DFMT_X24_TYPELESS_G8_UINT formats were not initialized. 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/utils.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 609f415..00899a1 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -276,6 +276,19 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_B8G8R8X8_TYPELESS, "uuuX"}, }; +struct wined3d_format_typeless_depth_stencil_info +{ + enum wined3d_format_id depth_stencil_id; + enum wined3d_format_id depth_view_id; + enum wined3d_format_id stencil_view_id; +}; + +static const struct wined3d_format_typeless_depth_stencil_info typeless_depth_stencil_formats[] = +{ + {WINED3DFMT_D32_FLOAT_S8X24_UINT, WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, WINED3DFMT_X32_TYPELESS_G8X24_UINT}, + {WINED3DFMT_D24_UNORM_S8_UINT, WINED3DFMT_R24_UNORM_X8_TYPELESS, WINED3DFMT_X24_TYPELESS_G8_UINT}, +}; + struct wined3d_format_ddi_info { enum wined3d_format_id id; @@ -1665,6 +1678,13 @@ static inline int get_format_idx(enum wined3d_format_id format_id) return -1; } +static void copy_format(struct wined3d_format *dst_format, const struct wined3d_format *src_format) +{ + enum wined3d_format_id id = dst_format->id; + *dst_format = *src_format; + dst_format->id = id; +} + static void format_set_flag(struct wined3d_format *format, unsigned int flag) { unsigned int i; @@ -2912,8 +2932,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win srgb_format = &gl_info->formats[srgb_fmt_idx]; - *srgb_format = *format; - srgb_format->id = format_srgb_info[j].srgb_format_id; + copy_format(srgb_format, format); if (gl_info->supported[EXT_TEXTURE_SRGB] && !(adapter->d3d_info.wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL)) @@ -3460,12 +3479,51 @@ static BOOL init_typeless_formats(struct wined3d_gl_info *gl_info) typeless_format = &gl_info->formats[typeless_fmt_idx]; memcpy(flags, typeless_format->flags, sizeof(flags)); - *typeless_format = *format; - typeless_format->id = typed_formats[i].typeless_id; + copy_format(typeless_format, format); for (j = 0; j < ARRAY_SIZE(typeless_format->flags); ++j) typeless_format->flags[j] |= flags[j]; } + for (i = 0; i < ARRAY_SIZE(typeless_depth_stencil_formats); ++i) + { + struct wined3d_format *ds_format, *depth_view_format, *stencil_view_format; + int ds_fmt_idx, depth_view_fmt_idx, stencil_view_fmt_idx; + + ds_fmt_idx = get_format_idx(typeless_depth_stencil_formats[i].depth_stencil_id); + if (ds_fmt_idx == -1) + { + ERR("Format %s (%#x) not found.\n", + debug_d3dformat(typeless_depth_stencil_formats[i].depth_stencil_id), + typeless_depth_stencil_formats[i].depth_stencil_id); + return FALSE; + } + + depth_view_fmt_idx = get_format_idx(typeless_depth_stencil_formats[i].depth_view_id); + if (depth_view_fmt_idx == -1) + { + ERR("Format %s (%#x) not found.\n", + debug_d3dformat(typeless_depth_stencil_formats[i].depth_view_id), + typeless_depth_stencil_formats[i].depth_view_id); + return FALSE; + } + + stencil_view_fmt_idx = get_format_idx(typeless_depth_stencil_formats[i].stencil_view_id); + if (stencil_view_fmt_idx == -1) + { + ERR("Format %s (%#x) not found.\n", + debug_d3dformat(typeless_depth_stencil_formats[i].stencil_view_id), + typeless_depth_stencil_formats[i].stencil_view_id); + return FALSE; + } + + ds_format = &gl_info->formats[ds_fmt_idx]; + depth_view_format = &gl_info->formats[depth_view_fmt_idx]; + stencil_view_format = &gl_info->formats[stencil_view_fmt_idx]; + + copy_format(depth_view_format, ds_format); + copy_format(stencil_view_format, ds_format); + } + return TRUE; }

1 0

Józef Kucia : wined3d: Introduce get_format_internal( ) helper function.
by Alexandre Julliard 02 Dec '16

02 Dec '16

Module: wine Branch: master Commit: e59ad5d1362d9aba2e07ed357cd70b7a7f4e2717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e59ad5d1362d9aba2e07ed357… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 1 13:56:37 2016 +0100 wined3d: Introduce get_format_internal() helper function. 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/utils.c | 173 +++++++++++++-------------------------------------- 1 file changed, 43 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e59ad5d1362d9aba2e07e…

1 0