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

Józef Kucia : d3d11: Partially implement d3d11_device_CheckFeatureSupport().
by Alexandre Julliard June 24, 2016

June 24, 2016

Module: wine Branch: master Commit: 60a799f422551f941a421887e3dc9e6a71eb0f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60a799f422551f941a421887e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 24 11:46:01 2016 +0200 d3d11: Partially implement d3d11_device_CheckFeatureSupport(). 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 | 23 +++++++++++++++++++++-- dlls/d3d11/tests/d3d11.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ include/d3d11.idl | 6 ++++++ 3 files changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index dfdd0d2..03fafc6 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2689,10 +2689,29 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckCounter(ID3D11Device *iface, static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device *iface, D3D11_FEATURE feature, void *feature_support_data, UINT feature_support_data_size) { - FIXME("iface %p, feature %u, feature_support_data %p, feature_support_data_size %u stub!\n", + TRACE("iface %p, feature %u, feature_support_data %p, feature_support_data_size %u.\n", iface, feature, feature_support_data, feature_support_data_size); - return E_NOTIMPL; + switch (feature) + { + case D3D11_FEATURE_THREADING: + { + D3D11_FEATURE_DATA_THREADING *threading_data = feature_support_data; + if (feature_support_data_size != sizeof(*threading_data)) + { + WARN("Invalid data size.\n"); + return E_INVALIDARG; + } + + threading_data->DriverConcurrentCreates = FALSE; + threading_data->DriverCommandLists = FALSE; + return S_OK; + } + + default: + FIXME("Unhandled feature %#x.\n", feature); + return E_NOTIMPL; + } } static HRESULT STDMETHODCALLTYPE d3d11_device_GetPrivateData(ID3D11Device *iface, REFGUID guid, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 8626b68..62c119a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -8468,6 +8468,54 @@ static void test_null_sampler(void) release_test_context(&test_context); } +static void test_check_feature_support(void) +{ + D3D11_FEATURE_DATA_THREADING threading[2]; + ID3D11Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + memset(threading, 0xef, sizeof(threading)); + + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_THREADING, NULL, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_THREADING, threading, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_THREADING, threading, sizeof(*threading) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_THREADING, threading, sizeof(*threading) / 2); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_THREADING, threading, sizeof(*threading) + 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_THREADING, threading, sizeof(*threading) * 2); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + ok(threading[0].DriverConcurrentCreates == 0xefefefef, + "Got unexpected concurrent creates %#x.\n", threading[0].DriverConcurrentCreates); + ok(threading[0].DriverCommandLists == 0xefefefef, + "Got unexpected command lists %#x.\n", threading[0].DriverCommandLists); + ok(threading[1].DriverConcurrentCreates == 0xefefefef, + "Got unexpected concurrent creates %#x.\n", threading[1].DriverConcurrentCreates); + ok(threading[1].DriverCommandLists == 0xefefefef, + "Got unexpected command lists %#x.\n", threading[1].DriverCommandLists); + + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_THREADING, threading, sizeof(*threading)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(threading->DriverConcurrentCreates == TRUE || threading->DriverConcurrentCreates == FALSE, + "Got unexpected concurrent creates %#x.\n", threading->DriverConcurrentCreates); + ok(threading->DriverCommandLists == TRUE || threading->DriverCommandLists == FALSE, + "Got unexpected command lists %#x.\n", threading->DriverCommandLists); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -8513,4 +8561,5 @@ START_TEST(d3d11) test_sm4_breakc_instruction(); test_input_assembler(); test_null_sampler(); + test_check_feature_support(); } diff --git a/include/d3d11.idl b/include/d3d11.idl index 9d4d8fd..cd177c2 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -439,6 +439,12 @@ typedef enum D3D11_FEATURE D3D11_FEATURE_D3D9_SHADOW_SUPPORT } D3D11_FEATURE; +typedef struct D3D11_FEATURE_DATA_THREADING +{ + BOOL DriverConcurrentCreates; + BOOL DriverCommandLists; +} D3D11_FEATURE_DATA_THREADING; + typedef struct D3D11_FEATURE_DATA_D3D11_OPTIONS { BOOL OutputMergerLogicOp;

1 0

Alexandre Julliard : gdi32/tests: Add a test to run once through all functions supported on paths.
by Alexandre Julliard June 24, 2016

June 24, 2016

Module: wine Branch: master Commit: b70cda9a1ef8b351d0b6b994952382e932b0dc7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b70cda9a1ef8b351d0b6b9949… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 24 14:09:36 2016 +0900 gdi32/tests: Add a test to run once through all functions supported on paths. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/path.c | 184 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 184 insertions(+) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 79a537b..48ef4f0 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -1708,6 +1708,189 @@ static void test_ellipse(void) EndPath( hdc ); SetMapMode( hdc, MM_TEXT ); ok_path( hdc, "ellipse_path", ellipse_path, sizeof(ellipse_path)/sizeof(path_test_t) ); +} + +static const path_test_t all_funcs_path[] = +{ + {0, 0, PT_MOVETO}, /* 0 */ + {50, 150, PT_LINETO}, /* 1 */ + {50, 50, PT_MOVETO}, /* 2 */ + {150, 150, PT_LINETO}, /* 3 */ + {150, 50, PT_LINETO}, /* 4 */ + {50, 50, PT_LINETO}, /* 5 */ + {37, 13, PT_LINETO}, /* 6 */ + {24, 13, PT_BEZIERTO}, /* 7 */ + {14, 23, PT_BEZIERTO}, /* 8 */ + {14, 36, PT_BEZIERTO}, /* 9 */ + {14, 49, PT_BEZIERTO}, /* 10 */ + {24, 59, PT_BEZIERTO}, /* 11 */ + {37, 59, PT_BEZIERTO}, /* 12 */ + {37, 59, PT_BEZIERTO}, /* 13 */ + {37, 59, PT_BEZIERTO}, /* 14 */ + {37, 59, PT_BEZIERTO}, /* 15 */ + {10, 10, PT_MOVETO}, /* 16 */ + {20, 10, PT_LINETO}, /* 17 */ + {10, 20, PT_LINETO}, /* 18 */ + {20, 20, PT_LINETO}, /* 19 */ + {36, 27, PT_MOVETO}, /* 20 */ + {37, 26, PT_BEZIERTO}, /* 21 */ + {38, 25, PT_BEZIERTO}, /* 22 */ + {38, 25, PT_BEZIERTO}, /* 23 */ + {38, 23, PT_BEZIERTO}, /* 24 */ + {34, 21, PT_BEZIERTO}, /* 25 */ + {30, 21, PT_BEZIERTO}, /* 26 */ + {27, 21, PT_BEZIERTO}, /* 27 */ + {25, 21, PT_BEZIERTO}, /* 28 */ + {24, 22, PT_BEZIERTO}, /* 29 */ + {37, 59, PT_MOVETO}, /* 30 */ + {10, 10, PT_LINETO}, /* 31 */ + {20, 10, PT_LINETO}, /* 32 */ + {10, 20, PT_LINETO}, /* 33 */ + {20, 20, PT_LINETO}, /* 34 */ + {34, 26, PT_LINETO}, /* 35 */ + {35, 25, PT_BEZIERTO}, /* 36 */ + {36, 25, PT_BEZIERTO}, /* 37 */ + {36, 25, PT_BEZIERTO}, /* 38 */ + {36, 24, PT_BEZIERTO}, /* 39 */ + {33, 23, PT_BEZIERTO}, /* 40 */ + {30, 23, PT_BEZIERTO}, /* 41 */ + {28, 23, PT_BEZIERTO}, /* 42 */ + {26, 23, PT_BEZIERTO}, /* 43 */ + {25, 23, PT_BEZIERTO}, /* 44 */ + {10, 10, PT_MOVETO}, /* 45 */ + {20, 10, PT_LINETO}, /* 46 */ + {10, 20, PT_LINETO}, /* 47 */ + {20, 20, PT_LINETO}, /* 48 */ + {30, 30, PT_MOVETO}, /* 49 */ + {40, 20, PT_LINETO}, /* 50 */ + {20, 30, PT_LINETO}, /* 51 */ + {30, 40, PT_LINETO}, /* 52 */ + {10, 50, PT_LINETO}, /* 53 */ + {45, 45, PT_MOVETO}, /* 54 */ + {45, 45, PT_BEZIERTO}, /* 55 */ + {44, 46, PT_BEZIERTO}, /* 56 */ + {43, 47, PT_BEZIERTO | PT_CLOSEFIGURE}, /* 57 */ + {10, 10, PT_MOVETO}, /* 58 */ + {20, 10, PT_LINETO}, /* 59 */ + {10, 20, PT_BEZIERTO}, /* 60 */ + {20, 20, PT_BEZIERTO}, /* 61 */ + {30, 30, PT_BEZIERTO}, /* 62 */ + {40, 20, PT_LINETO}, /* 63 */ + {20, 30, PT_LINETO | PT_CLOSEFIGURE}, /* 64 */ + {30, 40, PT_MOVETO}, /* 65 */ + {10, 50, PT_LINETO}, /* 66 */ + {55, 55, PT_MOVETO}, /* 67 */ + {54, 55, PT_BEZIERTO}, /* 68 */ + {54, 56, PT_BEZIERTO}, /* 69 */ + {54, 56, PT_BEZIERTO}, /* 70 */ + {58, 61, PT_LINETO | PT_CLOSEFIGURE}, /* 71 */ + {10, 10, PT_MOVETO}, /* 72 */ + {20, 10, PT_LINETO}, /* 73 */ + {10, 20, PT_LINETO}, /* 74 */ + {20, 20, PT_LINETO}, /* 75 */ + {30, 30, PT_LINETO}, /* 76 */ + {40, 20, PT_LINETO}, /* 77 */ + {20, 30, PT_LINETO}, /* 78 */ + {30, 40, PT_LINETO}, /* 79 */ + {10, 50, PT_LINETO | PT_CLOSEFIGURE}, /* 80 */ + {43, 49, PT_MOVETO}, /* 81 */ + {43, 40, PT_BEZIERTO}, /* 82 */ + {38, 33, PT_BEZIERTO}, /* 83 */ + {33, 33, PT_BEZIERTO}, /* 84 */ + {27, 33, PT_BEZIERTO}, /* 85 */ + {22, 40, PT_BEZIERTO}, /* 86 */ + {22, 49, PT_BEZIERTO}, /* 87 */ + {22, 58, PT_BEZIERTO}, /* 88 */ + {27, 65, PT_BEZIERTO}, /* 89 */ + {33, 65, PT_BEZIERTO}, /* 90 */ + {38, 65, PT_BEZIERTO}, /* 91 */ + {43, 58, PT_BEZIERTO}, /* 92 */ + {43, 49, PT_BEZIERTO | PT_CLOSEFIGURE}, /* 93 */ + {79, 70, PT_MOVETO}, /* 94 */ + {60, 70, PT_LINETO}, /* 95 */ + {60, 89, PT_LINETO}, /* 96 */ + {79, 89, PT_LINETO | PT_CLOSEFIGURE}, /* 97 */ + {199, 122, PT_MOVETO}, /* 98 */ + {199, 110, PT_BEZIERTO}, /* 99 */ + {191, 100, PT_BEZIERTO}, /* 100 */ + {182, 100, PT_BEZIERTO}, /* 101 */ + {117, 100, PT_LINETO}, /* 102 */ + {108, 100, PT_BEZIERTO}, /* 103 */ + {100, 110, PT_BEZIERTO}, /* 104 */ + {100, 122, PT_BEZIERTO}, /* 105 */ + {100, 177, PT_LINETO}, /* 106 */ + {100, 189, PT_BEZIERTO}, /* 107 */ + {108, 199, PT_BEZIERTO}, /* 108 */ + {117, 199, PT_BEZIERTO}, /* 109 */ + {182, 199, PT_LINETO}, /* 110 */ + {191, 199, PT_BEZIERTO}, /* 111 */ + {199, 189, PT_BEZIERTO}, /* 112 */ + {199, 177, PT_BEZIERTO | PT_CLOSEFIGURE}, /* 113 */ + {10, 10, PT_MOVETO}, /* 114 */ + {20, 10, PT_BEZIERTO}, /* 115 */ + {10, 20, PT_BEZIERTO}, /* 116 */ + {20, 20, PT_BEZIERTO}, /* 117 */ + {30, 30, PT_BEZIERTO}, /* 118 */ + {40, 20, PT_BEZIERTO}, /* 119 */ + {20, 30, PT_BEZIERTO}, /* 120 */ + {10, 10, PT_MOVETO}, /* 121 */ + {20, 10, PT_LINETO}, /* 122 */ + {10, 20, PT_LINETO}, /* 123 */ + {20, 20, PT_LINETO | PT_CLOSEFIGURE}, /* 124 */ + {30, 30, PT_MOVETO}, /* 125 */ + {40, 20, PT_LINETO}, /* 126 */ + {20, 30, PT_LINETO}, /* 127 */ + {30, 40, PT_LINETO}, /* 128 */ + {10, 50, PT_LINETO | PT_CLOSEFIGURE}, /* 129 */ + {10, 50, PT_MOVETO}, /* 130 */ + {10, 10, PT_BEZIERTO}, /* 131 */ + {20, 10, PT_BEZIERTO}, /* 132 */ + {10, 20, PT_BEZIERTO}, /* 133 */ + {20, 20, PT_BEZIERTO}, /* 134 */ + {30, 30, PT_BEZIERTO}, /* 135 */ + {40, 20, PT_BEZIERTO}, /* 136 */ + {20, 30, PT_BEZIERTO}, /* 137 */ + {30, 40, PT_BEZIERTO}, /* 138 */ + {10, 50, PT_BEZIERTO}, /* 139 */ + {150, 150, PT_LINETO}, /* 140 */ +}; + +/* run once through all functions that support paths */ +static void test_all_functions(void) +{ + POINT pts[9] = {{10, 10}, {20, 10}, {10, 20}, {20, 20}, {30, 30}, {40, 20}, + {20, 30}, {30, 40}, {10, 50}}; + DWORD counts[5] = {4, 5, 0, 1, 2}; + BYTE types[9] = { PT_MOVETO, PT_LINETO, PT_BEZIERTO, PT_BEZIERTO, PT_BEZIERTO, PT_LINETO, + PT_LINETO | PT_CLOSEFIGURE, PT_MOVETO, PT_LINETO }; + HDC hdc = GetDC( 0 ); + + BeginPath( hdc ); + LineTo( hdc, 50, 150 ); + MoveToEx( hdc, 50, 50, NULL ); + LineTo( hdc, 150, 150 ); + LineTo( hdc, 150, 50 ); + LineTo( hdc, 50, 50 ); + AngleArc( hdc, 37, 36, 23, 90, 180 ); + Polyline( hdc, pts, 4 ); + Arc( hdc, 21, 21, 39, 29, 39, 29, 21, 21 ); + PolylineTo( hdc, pts, 4 ); + ArcTo( hdc, 23, 23, 37, 27, 37, 27, 23, 23 ); + PolyPolyline( hdc, pts, counts, 2 ); + Chord( hdc, 42, 43, 57, 66, 39, 29, 21, 21 ); + PolyDraw( hdc, pts, types, 9 ); + Pie( hdc, 52, 54, 65, 68, 39, 29, 21, 21 ); + Polygon( hdc, pts, 9 ); + Ellipse( hdc, 22, 33, 44, 66 ); + Rectangle( hdc, 60, 70, 80, 90 ); + RoundRect( hdc, 100, 100, 200, 200, 35, 45 ); + PolyBezier( hdc, pts, 7 ); + PolyPolygon( hdc, pts, (int *)counts, 2 ); + PolyBezierTo( hdc, pts, 9 ); + LineTo( hdc, 150, 150 ); + /* FIXME: ExtTextOut */ + EndPath( hdc ); + ok_path( hdc, "all_funcs_path", all_funcs_path, sizeof(all_funcs_path)/sizeof(path_test_t) ); ReleaseDC( 0, hdc ); } @@ -1723,4 +1906,5 @@ START_TEST(path) test_rectangle(); test_roundrect(); test_ellipse(); + test_all_functions(); }

1 0

Alexandre Julliard : gdi32: Reimplement Ellipse in paths to avoid calling imprecise arc helper functions.
by Alexandre Julliard June 24, 2016

June 24, 2016

Module: wine Branch: master Commit: 06234a081a867b7030ff5f872f158757e1e16fcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=06234a081a867b7030ff5f872… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 24 14:05:21 2016 +0900 gdi32: Reimplement Ellipse in paths to avoid calling imprecise arc helper functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 65 ++++++-- dlls/gdi32/tests/metafile.c | 2 +- dlls/gdi32/tests/path.c | 381 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 438 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06234a081a867b7030ff5…

1 0

Alexandre Julliard : gdi32: Reimplement RoundRect in paths to avoid calling imprecise arc helper functions.
by Alexandre Julliard June 24, 2016

June 24, 2016

Module: wine Branch: master Commit: 0b38f167677f5611296214d021ff11a41bc55075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b38f167677f5611296214d02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 24 13:53:03 2016 +0900 gdi32: Reimplement RoundRect in paths to avoid calling imprecise arc helper functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 127 ++++++++++------- dlls/gdi32/tests/path.c | 362 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 436 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b38f167677f561129621…

1 0

Alexandre Julliard : gdi32: Compatibility fixes for Rectangle in paths, with tests.
by Alexandre Julliard June 24, 2016

June 24, 2016

Module: wine Branch: master Commit: 1fcf8f547ab9d05f62ce033d315252061ca0cd86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fcf8f547ab9d05f62ce033d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 24 13:25:02 2016 +0900 gdi32: Compatibility fixes for Rectangle in paths, with tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 11 +++- dlls/gdi32/tests/path.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 59d46c3..f69627d 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -357,7 +357,7 @@ static HRGN path_to_region( const struct gdi_path *path, int mode ) * * Helper function for RoundRect() and Rectangle() */ -static void PATH_CheckCorners( HDC hdc, POINT corners[], INT x1, INT y1, INT x2, INT y2 ) +static BOOL PATH_CheckCorners( HDC hdc, POINT corners[], INT x1, INT y1, INT x2, INT y2 ) { INT temp; @@ -385,9 +385,12 @@ static void PATH_CheckCorners( HDC hdc, POINT corners[], INT x1, INT y1, INT x2, /* In GM_COMPATIBLE, don't include bottom and right edges */ if (GetGraphicsMode( hdc ) == GM_COMPATIBLE) { + if (corners[0].x == corners[1].x) return FALSE; + if (corners[0].y == corners[1].y) return FALSE; corners[1].x--; corners[1].y--; } + return TRUE; } /* PATH_AddFlatBezier @@ -954,7 +957,7 @@ static BOOL pathdrv_Rectangle( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 ) POINT corners[2], points[4]; BYTE *type; - PATH_CheckCorners(dev->hdc,corners,x1,y1,x2,y2); + if (!PATH_CheckCorners( dev->hdc, corners, x1, y1, x2, y2 )) return TRUE; points[0].x = corners[1].x; points[0].y = corners[0].y; @@ -962,9 +965,11 @@ static BOOL pathdrv_Rectangle( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 ) points[2].x = corners[0].x; points[2].y = corners[1].y; points[3] = corners[1]; + if (GetArcDirection( dev->hdc ) == AD_CLOCKWISE) reverse_points( points, 4 ); + if (!(type = add_points( physdev->path, points, 4, PT_LINETO ))) return FALSE; type[0] = PT_MOVETO; - type[3] |= PT_CLOSEFIGURE; + close_figure( physdev->path ); return TRUE; } diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index de3c08b..986fdda 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -815,6 +815,161 @@ static void test_linedda(void) ok(pt->x == -1 && pt->y == -1, "didn't find terminator\n"); } +static const path_test_t rectangle_path[] = +{ + {39, 20, PT_MOVETO}, /* 0 */ + {20, 20, PT_LINETO}, /* 1 */ + {20, 39, PT_LINETO}, /* 2 */ + {39, 39, PT_LINETO | PT_CLOSEFIGURE}, /* 3 */ + {54, 35, PT_MOVETO}, /* 4 */ + {30, 35, PT_LINETO}, /* 5 */ + {30, 49, PT_LINETO}, /* 6 */ + {54, 49, PT_LINETO | PT_CLOSEFIGURE}, /* 7 */ + {59, 45, PT_MOVETO}, /* 8 */ + {35, 45, PT_LINETO}, /* 9 */ + {35, 59, PT_LINETO}, /* 10 */ + {59, 59, PT_LINETO | PT_CLOSEFIGURE}, /* 11 */ + {80, 80, PT_MOVETO}, /* 12 */ + {80, 80, PT_LINETO}, /* 13 */ + {80, 80, PT_LINETO}, /* 14 */ + {80, 80, PT_LINETO | PT_CLOSEFIGURE}, /* 15 */ + {39, 39, PT_MOVETO}, /* 16 */ + {20, 39, PT_LINETO}, /* 17 */ + {20, 20, PT_LINETO}, /* 18 */ + {39, 20, PT_LINETO | PT_CLOSEFIGURE}, /* 19 */ + {54, 49, PT_MOVETO}, /* 20 */ + {30, 49, PT_LINETO}, /* 21 */ + {30, 35, PT_LINETO}, /* 22 */ + {54, 35, PT_LINETO | PT_CLOSEFIGURE}, /* 23 */ + {59, 59, PT_MOVETO}, /* 24 */ + {35, 59, PT_LINETO}, /* 25 */ + {35, 45, PT_LINETO}, /* 26 */ + {59, 45, PT_LINETO | PT_CLOSEFIGURE}, /* 27 */ + {80, 80, PT_MOVETO}, /* 28 */ + {80, 80, PT_LINETO}, /* 29 */ + {80, 80, PT_LINETO}, /* 30 */ + {80, 80, PT_LINETO | PT_CLOSEFIGURE}, /* 31 */ + {-41, 40, PT_MOVETO}, /* 32 */ + {-80, 40, PT_LINETO}, /* 33 */ + {-80, 79, PT_LINETO}, /* 34 */ + {-41, 79, PT_LINETO | PT_CLOSEFIGURE}, /* 35 */ + {-61, 70, PT_MOVETO}, /* 36 */ + {-110, 70, PT_LINETO}, /* 37 */ + {-110, 99, PT_LINETO}, /* 38 */ + {-61, 99, PT_LINETO | PT_CLOSEFIGURE}, /* 39 */ + {119, -120, PT_MOVETO}, /* 40 */ + {60, -120, PT_LINETO}, /* 41 */ + {60, -61, PT_LINETO}, /* 42 */ + {119, -61, PT_LINETO | PT_CLOSEFIGURE}, /* 43 */ + {164, -150, PT_MOVETO}, /* 44 */ + {90, -150, PT_LINETO}, /* 45 */ + {90, -106, PT_LINETO}, /* 46 */ + {164, -106, PT_LINETO | PT_CLOSEFIGURE}, /* 47 */ + {-4, -6, PT_MOVETO}, /* 48 */ + {-6, -6, PT_LINETO}, /* 49 */ + {-6, -4, PT_LINETO}, /* 50 */ + {-4, -4, PT_LINETO | PT_CLOSEFIGURE}, /* 51 */ + {40, 20, PT_MOVETO}, /* 52 */ + {20, 20, PT_LINETO}, /* 53 */ + {20, 40, PT_LINETO}, /* 54 */ + {40, 40, PT_LINETO | PT_CLOSEFIGURE}, /* 55 */ + {55, 35, PT_MOVETO}, /* 56 */ + {30, 35, PT_LINETO}, /* 57 */ + {30, 50, PT_LINETO}, /* 58 */ + {55, 50, PT_LINETO | PT_CLOSEFIGURE}, /* 59 */ + {60, 45, PT_MOVETO}, /* 60 */ + {35, 45, PT_LINETO}, /* 61 */ + {35, 60, PT_LINETO}, /* 62 */ + {60, 60, PT_LINETO | PT_CLOSEFIGURE}, /* 63 */ + {70, 70, PT_MOVETO}, /* 64 */ + {50, 70, PT_LINETO}, /* 65 */ + {50, 70, PT_LINETO}, /* 66 */ + {70, 70, PT_LINETO | PT_CLOSEFIGURE}, /* 67 */ + {75, 75, PT_MOVETO}, /* 68 */ + {75, 75, PT_LINETO}, /* 69 */ + {75, 85, PT_LINETO}, /* 70 */ + {75, 85, PT_LINETO | PT_CLOSEFIGURE}, /* 71 */ + {81, 80, PT_MOVETO}, /* 72 */ + {80, 80, PT_LINETO}, /* 73 */ + {80, 81, PT_LINETO}, /* 74 */ + {81, 81, PT_LINETO | PT_CLOSEFIGURE}, /* 75 */ + {40, 40, PT_MOVETO}, /* 76 */ + {20, 40, PT_LINETO}, /* 77 */ + {20, 20, PT_LINETO}, /* 78 */ + {40, 20, PT_LINETO | PT_CLOSEFIGURE}, /* 79 */ + {55, 50, PT_MOVETO}, /* 80 */ + {30, 50, PT_LINETO}, /* 81 */ + {30, 35, PT_LINETO}, /* 82 */ + {55, 35, PT_LINETO | PT_CLOSEFIGURE}, /* 83 */ + {60, 60, PT_MOVETO}, /* 84 */ + {35, 60, PT_LINETO}, /* 85 */ + {35, 45, PT_LINETO}, /* 86 */ + {60, 45, PT_LINETO | PT_CLOSEFIGURE}, /* 87 */ + {70, 70, PT_MOVETO}, /* 88 */ + {50, 70, PT_LINETO}, /* 89 */ + {50, 70, PT_LINETO}, /* 90 */ + {70, 70, PT_LINETO | PT_CLOSEFIGURE}, /* 91 */ + {75, 85, PT_MOVETO}, /* 92 */ + {75, 85, PT_LINETO}, /* 93 */ + {75, 75, PT_LINETO}, /* 94 */ + {75, 75, PT_LINETO | PT_CLOSEFIGURE}, /* 95 */ + {81, 81, PT_MOVETO}, /* 96 */ + {80, 81, PT_LINETO}, /* 97 */ + {80, 80, PT_LINETO}, /* 98 */ + {81, 80, PT_LINETO | PT_CLOSEFIGURE}, /* 99 */ +}; + +static void test_rectangle(void) +{ + HDC hdc = GetDC( 0 ); + + BeginPath( hdc ); + Rectangle( hdc, 20, 20, 40, 40 ); + Rectangle( hdc, 30, 50, 55, 35 ); + Rectangle( hdc, 60, 60, 35, 45 ); + Rectangle( hdc, 70, 70, 50, 70 ); + Rectangle( hdc, 75, 75, 75, 85 ); + Rectangle( hdc, 80, 80, 81, 81 ); + SetArcDirection( hdc, AD_CLOCKWISE ); + Rectangle( hdc, 20, 20, 40, 40 ); + Rectangle( hdc, 30, 50, 55, 35 ); + Rectangle( hdc, 60, 60, 35, 45 ); + Rectangle( hdc, 70, 70, 50, 70 ); + Rectangle( hdc, 75, 75, 75, 85 ); + Rectangle( hdc, 80, 80, 81, 81 ); + SetArcDirection( hdc, AD_COUNTERCLOCKWISE ); + SetMapMode( hdc, MM_ANISOTROPIC ); + SetViewportExtEx( hdc, -2, 2, NULL ); + Rectangle( hdc, 20, 20, 40, 40 ); + Rectangle( hdc, 30, 50, 55, 35 ); + SetViewportExtEx( hdc, 3, -3, NULL ); + Rectangle( hdc, 20, 20, 40, 40 ); + Rectangle( hdc, 30, 50, 55, 35 ); + SetWindowExtEx( hdc, -20, 20, NULL ); + Rectangle( hdc, 20, 20, 40, 40 ); + Rectangle( hdc, 24, 22, 21, 20 ); + SetMapMode( hdc, MM_TEXT ); + SetGraphicsMode( hdc, GM_ADVANCED ); + Rectangle( hdc, 20, 20, 40, 40 ); + Rectangle( hdc, 30, 50, 55, 35 ); + Rectangle( hdc, 60, 60, 35, 45 ); + Rectangle( hdc, 70, 70, 50, 70 ); + Rectangle( hdc, 75, 75, 75, 85 ); + Rectangle( hdc, 80, 80, 81, 81 ); + SetArcDirection( hdc, AD_CLOCKWISE ); + Rectangle( hdc, 20, 20, 40, 40 ); + Rectangle( hdc, 30, 50, 55, 35 ); + Rectangle( hdc, 60, 60, 35, 45 ); + Rectangle( hdc, 70, 70, 50, 70 ); + Rectangle( hdc, 75, 75, 75, 85 ); + Rectangle( hdc, 80, 80, 81, 81 ); + SetArcDirection( hdc, AD_COUNTERCLOCKWISE ); + EndPath( hdc ); + SetMapMode( hdc, MM_TEXT ); + ok_path( hdc, "rectangle_path", rectangle_path, sizeof(rectangle_path)/sizeof(path_test_t) ); + ReleaseDC( 0, hdc ); +} + START_TEST(path) { test_path_state(); @@ -824,4 +979,5 @@ START_TEST(path) test_polydraw(); test_closefigure(); test_linedda(); + test_rectangle(); }

1 0

Hugh McMaster : regedit: Accept /C as a valid switch.
by Alexandre Julliard June 24, 2016

June 24, 2016

Module: wine Branch: master Commit: 1df0b0f986d028e83f88d09f3fc9e7d602cc7a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1df0b0f986d028e83f88d09f3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 24 07:56:19 2016 +0000 regedit: Accept /C as a valid switch. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 5e873e1..20a66ba 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -231,6 +231,7 @@ BOOL ProcessCmdLine(LPSTR lpCmdLine) case 'E': action = ACTION_EXPORT; break; + case 'C': case 'L': case 'R': /* unhandled */;

1 0

Hugh McMaster : regedit: Import multiple files in one command.
by Alexandre Julliard June 24, 2016

June 24, 2016

Module: wine Branch: master Commit: 0df9480d2da35608323acc595fb5b05fc356de15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df9480d2da35608323acc595… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 24 07:56:29 2016 +0000 regedit: Import multiple files in one command. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 20a66ba..f57f427 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -262,7 +262,8 @@ BOOL ProcessCmdLine(LPSTR lpCmdLine) exit(1); } - PerformRegAction(action, argv, &i); + for (; i < argc; i++) + PerformRegAction(action, argv, &i); for (i = 0; i < argc; i++) HeapFree(GetProcessHeap(), 0, argv[i]);

1 0

Ken Thomases : winemac: Don' t define kVK_RightCommand when building against the macOS 10.12 SDK.
by Alexandre Julliard June 24, 2016

June 24, 2016

Module: wine Branch: master Commit: cac226200d88b7454747b5ee1016f06b89ce4aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac226200d88b7454747b5ee1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 23 16:53:04 2016 -0500 winemac: Don't define kVK_RightCommand when building against the macOS 10.12 SDK. Apple added the same enum declaration to their headers, causing a build failure. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d3b3c89..4f59121 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -43,10 +43,12 @@ enum { #endif +#if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 /* Additional Mac virtual keycode, to complement those in Carbon's <HIToolbox/Events.h>. */ enum { kVK_RightCommand = 0x36, /* Invented for Wine; was unused */ }; +#endif static NSUInteger style_mask_for_features(const struct macdrv_window_features* wf)

1 0

Alistair Leslie-Hughes : inetcomm: Implement IMimeBody GetPropInfo.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: 79762537a70f522f3f5e2cc21c62284ca4e1a9fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=79762537a70f522f3f5e2cc21… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 23 08:51:01 2016 +0000 inetcomm: Implement IMimeBody GetPropInfo. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 38 +++++++++++++++++- dlls/inetcomm/tests/mimeole.c | 91 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 8dfba6f..766503d 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -711,8 +711,42 @@ static HRESULT WINAPI MimeBody_GetPropInfo( LPMIMEPROPINFO pInfo) { MimeBody *This = impl_from_IMimeBody(iface); - FIXME("(%p)->(%s, %p) stub\n", This, debugstr_a(pszName), pInfo); - return E_NOTIMPL; + header_t *header; + HRESULT hr; + DWORD supported = PIM_PROPID | PIM_VTDEFAULT; + + TRACE("(%p)->(%s, %p) semi-stub\n", This, debugstr_a(pszName), pInfo); + + if(!pszName || !pInfo) + return E_INVALIDARG; + + TRACE("mask 0x%04x\n", pInfo->dwMask); + + if(pInfo->dwMask & ~supported) + FIXME("Unsupported mask flags 0x%04x\n", pInfo->dwMask & ~supported); + + hr = find_prop(This, pszName, &header); + if(hr == S_OK) + { + if(pInfo->dwMask & PIM_CHARSET) + pInfo->hCharset = 0; + if(pInfo->dwMask & PIM_FLAGS) + pInfo->dwFlags = 0x00000000; + if(pInfo->dwMask & PIM_ROWNUMBER) + pInfo->dwRowNumber = 0; + if(pInfo->dwMask & PIM_ENCODINGTYPE) + pInfo->ietEncoding = 0; + if(pInfo->dwMask & PIM_VALUES) + pInfo->cValues = 0; + if(pInfo->dwMask & PIM_PROPID) + pInfo->dwPropId = header->prop->id; + if(pInfo->dwMask & PIM_VTDEFAULT) + pInfo->vtDefault = header->prop->default_vt; + if(pInfo->dwMask & PIM_VTCURRENT) + pInfo->vtCurrent = 0; + } + + return hr; } static HRESULT WINAPI MimeBody_SetPropInfo( diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 29ab6d8..8063b86 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -424,6 +424,96 @@ static void test_MessageSetProp(void) IMimeMessage_Release(msg); } +static void test_MessageGetPropInfo(void) +{ + static const char topic[] = "wine topic"; + static const char subject[] = "wine testing"; + HRESULT hr; + IMimeMessage *msg; + IMimeBody *body; + PROPVARIANT prop; + MIMEPROPINFO info; + + hr = MimeOleCreateMessage(NULL, &msg); + ok(hr == S_OK, "ret %08x\n", hr); + + PropVariantInit(&prop); + + hr = IMimeMessage_BindToObject(msg, HBODY_ROOT, &IID_IMimeBody, (void**)&body); + ok(hr == S_OK, "ret %08x\n", hr); + + prop.vt = VT_LPSTR; + prop.u.pszVal = CoTaskMemAlloc(strlen(topic)+1); + strcpy(prop.u.pszVal, topic); + hr = IMimeBody_SetProp(body, "Thread-Topic", 0, &prop); + ok(hr == S_OK, "ret %08x\n", hr); + PropVariantClear(&prop); + + prop.vt = VT_LPSTR; + prop.u.pszVal = CoTaskMemAlloc(strlen(subject)+1); + strcpy(prop.u.pszVal, subject); + hr = IMimeBody_SetProp(body, PIDTOSTR(PID_HDR_SUBJECT), 0, &prop); + ok(hr == S_OK, "ret %08x\n", hr); + PropVariantClear(&prop); + + memset(&info, 0, sizeof(info)); + info.dwMask = PIM_ENCODINGTYPE | PIM_FLAGS | PIM_PROPID; + hr = IMimeBody_GetPropInfo(body, NULL, &info); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); + + memset(&info, 0, sizeof(info)); + info.dwMask = PIM_ENCODINGTYPE | PIM_FLAGS | PIM_PROPID; + hr = IMimeBody_GetPropInfo(body, "Subject", NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); + + memset(&info, 0xfe, sizeof(info)); + info.dwMask = PIM_ENCODINGTYPE | PIM_FLAGS | PIM_PROPID; + hr = IMimeBody_GetPropInfo(body, "Subject", &info); + ok(hr == S_OK, "ret %08x\n", hr); + if(hr == S_OK) + { + ok(info.dwMask & (PIM_ENCODINGTYPE | PIM_FLAGS| PIM_PROPID), "Invalid mask 0x%08x\n", info.dwFlags); + todo_wine ok(info.dwFlags & 0x10000000, "Invalid flags 0x%08x\n", info.dwFlags); + ok(info.ietEncoding == 0, "Invalid encoding %d\n", info.ietEncoding); + ok(info.dwPropId == PID_HDR_SUBJECT, "Invalid propid %d\n", info.dwPropId); + ok(info.cValues == 0xfefefefe, "Invalid cValues %d\n", info.cValues); + } + + memset(&info, 0xfe, sizeof(info)); + info.dwMask = 0; + hr = IMimeBody_GetPropInfo(body, "Subject", &info); + ok(hr == S_OK, "ret %08x\n", hr); + if(hr == S_OK) + { + ok(info.dwMask == 0, "Invalid mask 0x%08x\n", info.dwFlags); + ok(info.dwFlags == 0xfefefefe, "Invalid flags 0x%08x\n", info.dwFlags); + ok(info.ietEncoding == -16843010, "Invalid encoding %d\n", info.ietEncoding); + ok(info.dwPropId == -16843010, "Invalid propid %d\n", info.dwPropId); + } + + memset(&info, 0xfe, sizeof(info)); + info.dwMask = 0; + info.dwPropId = 1024; + info.ietEncoding = 99; + hr = IMimeBody_GetPropInfo(body, "Subject", &info); + ok(hr == S_OK, "ret %08x\n", hr); + if(hr == S_OK) + { + ok(info.dwMask == 0, "Invalid mask 0x%08x\n", info.dwFlags); + ok(info.dwFlags == 0xfefefefe, "Invalid flags 0x%08x\n", info.dwFlags); + ok(info.ietEncoding == 99, "Invalid encoding %d\n", info.ietEncoding); + ok(info.dwPropId == 1024, "Invalid propid %d\n", info.dwPropId); + } + + memset(&info, 0, sizeof(info)); + info.dwMask = PIM_ENCODINGTYPE | PIM_FLAGS | PIM_PROPID; + hr = IMimeBody_GetPropInfo(body, "Invalid Property", &info); + ok(hr == MIME_E_NOT_FOUND, "ret %08x\n", hr); + + IMimeBody_Release(body); + IMimeMessage_Release(msg); +} + static void test_MessageOptions(void) { static const char string[] = "XXXXX"; @@ -534,6 +624,7 @@ START_TEST(mimeole) test_Allocator(); test_CreateMessage(); test_MessageSetProp(); + test_MessageGetPropInfo(); test_MessageOptions(); test_BindToObject(); test_MimeOleGetPropertySchema();

1 0

Andrey Gusev : winemac.drv: Fix a typo in WARN() message.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: 82f3446c5d09aba0aa0cffcf7ece54d44d3b86ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f3446c5d09aba0aa0cffcf7… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 23 14:37:38 2016 +0300 winemac.drv: Fix a typo in WARN() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index a4b8e34..e1953dd 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -4058,7 +4058,7 @@ static BOOL macdrv_wglSetPbufferAttribARB(struct wgl_pbuffer *pbuffer, const int } break; default: - WARN("invalide attribute 0x%x\n", attr); + WARN("invalid attribute 0x%x\n", attr); SetLastError(ERROR_INVALID_DATA); return GL_FALSE; }

1 0