November 2016 - Wine-Commits

Józef Kucia : wined3d: Get rid of WINED3DFMT_VERTEXDATA.
by Alexandre Julliard Nov. 3, 2016

Nov. 3, 2016

Module: wine Branch: master Commit: aa11efc4af2cdd34bf0c11da0121b15ba4cebc33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa11efc4af2cdd34bf0c11da0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 3 12:21:11 2016 +0100 wined3d: Get rid of WINED3DFMT_VERTEXDATA. 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/d3d8/device.c | 4 +--- dlls/d3d9/device.c | 4 +--- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/utils.c | 2 -- include/wine/wined3d.h | 1 - 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 33ff7a5..fae5610 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -83,7 +83,6 @@ D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_X8D24_UNORM: return D3DFMT_D24X8; case WINED3DFMT_S4X4_UINT_D24_UNORM: return D3DFMT_D24X4S4; case WINED3DFMT_D16_UNORM: return D3DFMT_D16; - case WINED3DFMT_VERTEXDATA: return D3DFMT_VERTEXDATA; case WINED3DFMT_R16_UINT: return D3DFMT_INDEX16; case WINED3DFMT_R32_UINT: return D3DFMT_INDEX32; default: @@ -134,11 +133,10 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) case D3DFMT_D24X8: return WINED3DFMT_X8D24_UNORM; case D3DFMT_D24X4S4: return WINED3DFMT_S4X4_UINT_D24_UNORM; case D3DFMT_D16: return WINED3DFMT_D16_UNORM; - case D3DFMT_VERTEXDATA: return WINED3DFMT_VERTEXDATA; case D3DFMT_INDEX16: return WINED3DFMT_R16_UINT; case D3DFMT_INDEX32: return WINED3DFMT_R32_UINT; default: - FIXME("Unhandled D3DFORMAT %#x\n", format); + FIXME("Unhandled D3DFORMAT %#x.\n", format); return WINED3DFMT_UNKNOWN; } } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b8c4638..dab19ab 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -80,7 +80,6 @@ D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_L16_UNORM: return D3DFMT_L16; case WINED3DFMT_D32_FLOAT: return D3DFMT_D32F_LOCKABLE; case WINED3DFMT_S8_UINT_D24_FLOAT: return D3DFMT_D24FS8; - case WINED3DFMT_VERTEXDATA: return D3DFMT_VERTEXDATA; case WINED3DFMT_R16_UINT: return D3DFMT_INDEX16; case WINED3DFMT_R32_UINT: return D3DFMT_INDEX32; case WINED3DFMT_R16G16B16A16_SNORM: return D3DFMT_Q16W16V16U16; @@ -145,7 +144,6 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) case D3DFMT_L16: return WINED3DFMT_L16_UNORM; case D3DFMT_D32F_LOCKABLE: return WINED3DFMT_D32_FLOAT; case D3DFMT_D24FS8: return WINED3DFMT_S8_UINT_D24_FLOAT; - case D3DFMT_VERTEXDATA: return WINED3DFMT_VERTEXDATA; case D3DFMT_INDEX16: return WINED3DFMT_R16_UINT; case D3DFMT_INDEX32: return WINED3DFMT_R32_UINT; case D3DFMT_Q16W16V16U16: return WINED3DFMT_R16G16B16A16_SNORM; @@ -157,7 +155,7 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) case D3DFMT_A32B32G32R32F: return WINED3DFMT_R32G32B32A32_FLOAT; case D3DFMT_CxV8U8: return WINED3DFMT_R8G8_SNORM_Cx; default: - FIXME("Unhandled D3DFORMAT %#x\n", format); + FIXME("Unhandled D3DFORMAT %#x.\n", format); return WINED3DFMT_UNKNOWN; } } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 25c1853..202ce32 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1578,7 +1578,7 @@ HRESULT CDECL wined3d_buffer_create_vb(struct wined3d_device *device, UINT size, return WINED3DERR_OUTOFVIDEOMEMORY; } - hr = buffer_init(object, device, size, usage, WINED3DFMT_VERTEXDATA, + hr = buffer_init(object, device, size, usage, WINED3DFMT_UNKNOWN, pool, WINED3D_BIND_VERTEX_BUFFER, NULL, parent, parent_ops); if (FAILED(hr)) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2171611..6ab851d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -136,7 +136,6 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_D16_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 2, 16, 0}, {WINED3DFMT_D32_FLOAT, 0, 0, 0, 0, 0, 0, 0, 0, 4, 32, 0}, {WINED3DFMT_S8_UINT_D24_FLOAT, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 8}, - {WINED3DFMT_VERTEXDATA, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, /* Vendor-specific formats */ {WINED3DFMT_ATI1N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_ATI2N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, @@ -3664,7 +3663,6 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_S4X4_UINT_D24_UNORM); FMT_TO_STR(WINED3DFMT_L16_UNORM); FMT_TO_STR(WINED3DFMT_S8_UINT_D24_FLOAT); - FMT_TO_STR(WINED3DFMT_VERTEXDATA); FMT_TO_STR(WINED3DFMT_R8G8_SNORM_Cx); FMT_TO_STR(WINED3DFMT_ATI1N); FMT_TO_STR(WINED3DFMT_ATI2N); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9d234d6..c7ecef1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -123,7 +123,6 @@ enum wined3d_format_id WINED3DFMT_S4X4_UINT_D24_UNORM, WINED3DFMT_L16_UNORM, WINED3DFMT_S8_UINT_D24_FLOAT, - WINED3DFMT_VERTEXDATA, WINED3DFMT_R8G8_SNORM_Cx, WINED3DFMT_R32G32B32A32_TYPELESS, WINED3DFMT_R32G32B32A32_FLOAT,

1 0

Nikolay Sivov : resend patch 1/2: Gdiplus: Implement GdipBitmapGetHistogramSize.
by Alexandre Julliard Nov. 3, 2016

Nov. 3, 2016

Module: wine Branch: master Commit: 8de0275e48d9b64adc6c29f2df347b94e2cb1ce8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de0275e48d9b64adc6c29f2d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 2 12:56:30 2016 +0300 resend patch 1/2: Gdiplus: Implement GdipBitmapGetHistogramSize. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 14 +++++++++++++ dlls/gdiplus/tests/image.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ include/gdipluscolormatrix.h | 13 ++++++++++++ include/gdiplusflat.h | 1 + 5 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index db0a49a..92251a7 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -619,7 +619,7 @@ 619 stdcall GdipBitmapCreateApplyEffect(ptr long ptr ptr ptr ptr long ptr ptr) 620 stdcall GdipBitmapApplyEffect(ptr ptr ptr long ptr ptr) 621 stub GdipBitmapGetHistogram -622 stub GdipBitmapGetHistogramSize +622 stdcall GdipBitmapGetHistogramSize(long ptr) 623 stdcall GdipBitmapConvertFormat(ptr long long long ptr float) 624 stdcall GdipImageSetAbort(ptr ptr) 625 stub GdipGraphicsSetAbort diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 74fad29..672b2e5 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -5386,3 +5386,17 @@ GpStatus WINGDIPAPI GdipBitmapConvertFormat(GpBitmap *bitmap, PixelFormat format FIXME("(%p, 0x%08x, %d, %d, %p, %f): stub\n", bitmap, format, dithertype, palettetype, palette, alphathreshold); return NotImplemented; } + +/***************************************************************************** + * GdipBitmapGetHistogramSize [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipBitmapGetHistogramSize(HistogramFormat format, UINT *num_of_entries) +{ + TRACE("(%d, %p)\n", format, num_of_entries); + + if (!num_of_entries) + return InvalidParameter; + + *num_of_entries = 256; + return Ok; +} diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 8c123b9..baf5c3b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -30,6 +30,8 @@ #include "gdiplus.h" #include "wine/test.h" +static GpStatus (WINAPI *pGdipBitmapGetHistogramSize)(HistogramFormat,UINT*); + #define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (UINT)(expected), (UINT)(got)) #define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got)) @@ -4785,8 +4787,51 @@ static void test_getadjustedpalette(void) GdipDisposeImageAttributes(imageattributes); } +static void test_histogramsize(void) +{ + HistogramFormat test_formats[] = + { + HistogramFormatARGB, + HistogramFormatPARGB, + HistogramFormatRGB, + HistogramFormatGray, + HistogramFormatB, + HistogramFormatG, + HistogramFormatR, + HistogramFormatA, + }; + GpStatus stat; + UINT num, i; + + if (!pGdipBitmapGetHistogramSize) + { + win_skip("GdipBitmapGetHistogramSize is not supported\n"); + return; + } + + stat = pGdipBitmapGetHistogramSize(HistogramFormatARGB, NULL); + expect(InvalidParameter, stat); + + stat = pGdipBitmapGetHistogramSize(0xff, NULL); + expect(InvalidParameter, stat); + + num = 123; + stat = pGdipBitmapGetHistogramSize(10, &num); + expect(Ok, stat); + expect(256, num); + + for (i = 0; i < sizeof(test_formats)/sizeof(test_formats[0]); i++) + { + num = 0; + stat = pGdipBitmapGetHistogramSize(test_formats[i], &num); + expect(Ok, stat); + expect(256, num); + } +} + START_TEST(image) { + HMODULE mod = GetModuleHandleA("gdiplus.dll"); struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; @@ -4797,6 +4842,8 @@ START_TEST(image) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + pGdipBitmapGetHistogramSize = (void*)GetProcAddress(mod, "GdipBitmapGetHistogramSize"); + test_supported_encoders(); test_CloneBitmapArea(); test_ARGB_conversion(); @@ -4843,6 +4890,7 @@ START_TEST(image) test_dispose(); test_createeffect(); test_getadjustedpalette(); + test_histogramsize(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdipluscolormatrix.h b/include/gdipluscolormatrix.h index fbf1b2a..44016ff 100644 --- a/include/gdipluscolormatrix.h +++ b/include/gdipluscolormatrix.h @@ -48,10 +48,23 @@ struct ColorMap Color newColor; }; +enum HistogramFormat +{ + HistogramFormatARGB, + HistogramFormatPARGB, + HistogramFormatRGB, + HistogramFormatGray, + HistogramFormatB, + HistogramFormatG, + HistogramFormatR, + HistogramFormatA, +}; + #ifndef __cplusplus typedef enum ColorAdjustType ColorAdjustType; typedef enum ColorMatrixFlags ColorMatrixFlags; +typedef enum HistogramFormat HistogramFormat; typedef struct ColorMatrix ColorMatrix; typedef struct ColorMap ColorMap; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index c6f16c4..824b460 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -41,6 +41,7 @@ GpStatus WINGDIPAPI GdipSetAdjustableArrowCapWidth(GpAdjustableArrowCap*,REAL); /* Bitmap */ GpStatus WINGDIPAPI GdipBitmapApplyEffect(GpBitmap*,CGpEffect*,RECT*,BOOL,VOID**,INT*); GpStatus WINGDIPAPI GdipBitmapCreateApplyEffect(GpBitmap**,INT,CGpEffect*,RECT*,RECT*,GpBitmap**,BOOL,VOID**,INT*); +GpStatus WINGDIPAPI GdipBitmapGetHistogramSize(HistogramFormat,UINT*); GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap*,INT,INT,ARGB*); GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap*,GDIPCONST GpRect*,UINT, PixelFormat,BitmapData*);

1 0

Nikolay Sivov : d2d1: Implement FillContainsPoint() for rectangle geometry.
by Alexandre Julliard Nov. 3, 2016

Nov. 3, 2016

Module: wine Branch: master Commit: 97e52ab67312a565f3d8c31288ea9bb94edf212a URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e52ab67312a565f3d8c3128… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 2 16:12:39 2016 +0300 d2d1: Implement FillContainsPoint() for rectangle geometry. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 24 +++++++++++++++++-- dlls/d2d1/tests/d2d1.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++-- include/d2d1.idl | 2 ++ 3 files changed, 86 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 4abe9bc..afbf339 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2390,10 +2390,30 @@ static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_StrokeContainsPoint(ID2D static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_FillContainsPoint(ID2D1RectangleGeometry *iface, D2D1_POINT_2F point, const D2D1_MATRIX_3X2_F *transform, float tolerance, BOOL *contains) { - FIXME("iface %p, point {%.8e, %.8e}, transform %p, tolerance %.8e, contains %p stub!\n", + struct d2d_geometry *geometry = impl_from_ID2D1RectangleGeometry(iface); + D2D1_RECT_F *rect = &geometry->u.rectangle.rect; + float dx, dy; + + TRACE("iface %p, point {%.8e, %.8e}, transform %p, tolerance %.8e, contains %p.\n", iface, point.x, point.y, transform, tolerance, contains); - return E_NOTIMPL; + if (transform) + { + D2D1_MATRIX_3X2_F g_i; + + if (!d2d_matrix_invert(&g_i, transform)) + return D2DERR_UNSUPPORTED_OPERATION; + d2d_point_transform(&point, &g_i, point.x, point.y); + } + + if (tolerance == 0.0f) + tolerance = D2D1_DEFAULT_FLATTENING_TOLERANCE; + + dx = max(fabsf((rect->right + rect->left) / 2.0f - point.x) - (rect->right - rect->left) / 2.0f, 0.0f); + dy = max(fabsf((rect->bottom + rect->top) / 2.0f - point.y) - (rect->bottom - rect->top) / 2.0f, 0.0f); + + *contains = tolerance * tolerance > (dx * dx + dy * dy); + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_CompareWithGeometry(ID2D1RectangleGeometry *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 4409bb8..721afa4 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1749,6 +1749,66 @@ static void test_path_geometry(void) DestroyWindow(window); } +static void test_rectangle_geometry(void) +{ + ID2D1RectangleGeometry *geometry; + ID2D1Factory *factory; + D2D1_POINT_2F point; + D2D1_RECT_F rect; + BOOL contains; + HRESULT hr; + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + set_rect(&rect, 0.0f, 0.0f, 10.0f, 20.0f); + hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + /* Edge. */ + contains = FALSE; + set_point(&point, 0.0f, 0.0f); + hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains); + ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr); + ok(!!contains, "Got wrong hit test result %d.\n", contains); + + /* Within tolerance limit around corner. */ + contains = TRUE; + set_point(&point, -D2D1_DEFAULT_FLATTENING_TOLERANCE, 0.0f); + hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains); + ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr); + ok(!contains, "Got wrong hit test result %d.\n", contains); + + contains = FALSE; + set_point(&point, -D2D1_DEFAULT_FLATTENING_TOLERANCE + 0.01f, 0.0f); + hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains); + ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr); + ok(!!contains, "Got wrong hit test result %d.\n", contains); + + contains = TRUE; + set_point(&point, -D2D1_DEFAULT_FLATTENING_TOLERANCE - 0.01f, 0.0f); + hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains); + ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr); + ok(!contains, "Got wrong hit test result %d.\n", contains); + + contains = TRUE; + set_point(&point, -D2D1_DEFAULT_FLATTENING_TOLERANCE, -D2D1_DEFAULT_FLATTENING_TOLERANCE); + hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains); + ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr); + ok(!contains, "Got wrong hit test result %d.\n", contains); + + /* Inside. */ + contains = FALSE; + set_point(&point, 5.0f, 5.0f); + hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains); + ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr); + ok(!!contains, "Got wrong hit test result %d.\n", contains); + + ID2D1RectangleGeometry_Release(geometry); + + ID2D1Factory_Release(factory); +} + static void test_bitmap_formats(void) { D2D1_BITMAP_PROPERTIES bitmap_desc; @@ -2705,8 +2765,7 @@ todo_wine ok(hr == D2DERR_WRONG_FACTORY, "EndDraw failure expected, hr %#x.\n", hr); /* Effect is d2d resource, but not a brush. */ - rect.left = rect.top = 0.0f; - rect.right = rect.bottom = 10.0f; + set_rect(&rect, 0.0f, 0.0f, 10.0f, 10.0f); hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); ok(SUCCEEDED(hr), "Failed to geometry, hr %#x.\n", hr); @@ -3189,6 +3248,7 @@ START_TEST(d2d1) test_color_brush(); test_bitmap_brush(); test_path_geometry(); + test_rectangle_geometry(); test_bitmap_formats(); test_alpha_mode(); test_shared_bitmap(); diff --git a/include/d2d1.idl b/include/d2d1.idl index 6d39e88..cb07cfa 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -50,6 +50,8 @@ typedef D2D_POINT_2U D2D1_POINT_2U; typedef D2D_RECT_U D2D1_RECT_U; typedef D2D_COLOR_F D2D1_COLOR_F; +cpp_quote("#define D2D1_DEFAULT_FLATTENING_TOLERANCE (0.25f)") + enum { D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR = 0,

1 0

Nikolay Sivov : gdiplus: Implement GdipBitmapGetHistogram().
by Alexandre Julliard Nov. 3, 2016

Nov. 3, 2016

Module: wine Branch: master Commit: 509ba80bcbd502fa98ad189d5ae26627f9606757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=509ba80bcbd502fa98ad189d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 2 21:24:21 2016 +0300 gdiplus: Implement GdipBitmapGetHistogram(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 123 +++++++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/image.c | 94 ++++++++++++++++++++++++++++++++-- include/gdiplusflat.h | 1 + 4 files changed, 216 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=509ba80bcbd502fa98ad1…

1 0

Huw Davies : rpcrt4/tests: Extend the tests for NdrDllGetClassObject().
by Alexandre Julliard Nov. 3, 2016

Nov. 3, 2016

Module: wine Branch: master Commit: f4d598ae0844c3a8f6fdc532080e9c014135c4b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4d598ae0844c3a8f6fdc5320… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 3 17:49:21 2016 +0000 rpcrt4/tests: Extend the tests for NdrDllGetClassObject(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/cstub.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index d098d60..7c71d60 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -44,6 +44,7 @@ static GUID IID_if1 = {0x12345678, 1234, 5678, {12,34,56,78,90,0xab,0xcd,0xef}}; static GUID IID_if2 = {0x12345679, 1234, 5678, {12,34,56,78,90,0xab,0xcd,0xef}}; static GUID IID_if3 = {0x1234567a, 1234, 5678, {12,34,56,78,90,0xab,0xcd,0xef}}; static GUID IID_if4 = {0x1234567b, 1234, 5678, {12,34,56,78,90,0xab,0xcd,0xef}}; +static CLSID CLSID_psfact = {0x1234567c, 1234, 5678, {12,34,56,78,90,0xab,0xcd,0xef}}; static int my_alloc_called; static int my_free_called; @@ -458,7 +459,6 @@ static IPSFactoryBuffer *test_NdrDllGetClassObject(void) IPSFactoryBuffer *ppsf = NULL; const PCInterfaceProxyVtblList* proxy_vtbl; const PCInterfaceStubVtblList* stub_vtbl; - const CLSID PSDispatch = {0x20420, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46}}; const CLSID CLSID_Unknown = {0x45678, 0x1234, 0x6666, {0xff, 0x67, 0x45, 0x98, 0x76, 0x12, 0x34, 0x56}}; static const GUID * const interfaces[] = { &IID_if1, &IID_if2, &IID_if3, &IID_if4 }; UINT i; @@ -475,13 +475,13 @@ static IPSFactoryBuffer *test_NdrDllGetClassObject(void) void *CStd_DebugServerQueryInterface = GetProcAddress(hmod, "CStdStubBuffer_DebugServerQueryInterface"); void *CStd_DebugServerRelease = GetProcAddress(hmod, "CStdStubBuffer_DebugServerRelease"); - r = NdrDllGetClassObject(&PSDispatch, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, - &CLSID_Unknown, &PSFactoryBuffer); + r = NdrDllGetClassObject(&CLSID_Unknown, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, + &CLSID_psfact, &PSFactoryBuffer); ok(r == CLASS_E_CLASSNOTAVAILABLE, "NdrDllGetClassObject with unknown clsid should have returned CLASS_E_CLASSNOTAVAILABLE instead of 0x%x\n", r); ok(ppsf == NULL, "NdrDllGetClassObject should have set ppsf to NULL on failure\n"); - r = NdrDllGetClassObject(&PSDispatch, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, - &PSDispatch, &PSFactoryBuffer); + r = NdrDllGetClassObject(&CLSID_psfact, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, + &CLSID_psfact, &PSFactoryBuffer); ok(r == S_OK, "ret %08x\n", r); ok(ppsf != NULL, "ppsf == NULL\n"); @@ -603,10 +603,29 @@ static IPSFactoryBuffer *test_NdrDllGetClassObject(void) ok(PSFactoryBuffer.RefCount == 1, "ref count %d\n", PSFactoryBuffer.RefCount); IPSFactoryBuffer_Release(ppsf); + /* One can also search by IID */ + r = NdrDllGetClassObject(&IID_if3, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, + &CLSID_psfact, &PSFactoryBuffer); + ok(r == S_OK, "ret %08x\n", r); + ok(ppsf != NULL, "ppsf == NULL\n"); + IPSFactoryBuffer_Release(ppsf); + r = NdrDllGetClassObject(&IID_if3, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, NULL, &PSFactoryBuffer); ok(r == S_OK, "ret %08x\n", r); ok(ppsf != NULL, "ppsf == NULL\n"); + IPSFactoryBuffer_Release(ppsf); + + /* but only if the PS factory implements it */ + r = NdrDllGetClassObject(&IID_IDispatch, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, + &CLSID_psfact, &PSFactoryBuffer); + ok(r == CLASS_E_CLASSNOTAVAILABLE, "ret %08x\n", r); + + /* Create it again to return */ + r = NdrDllGetClassObject(&CLSID_psfact, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, + &CLSID_psfact, &PSFactoryBuffer); + ok(r == S_OK, "ret %08x\n", r); + ok(ppsf != NULL, "ppsf == NULL\n"); return ppsf; }

1 0

Donat Enikeev : secur32: AddSecurityPackage stub.
by Alexandre Julliard Nov. 3, 2016

Nov. 3, 2016

Module: wine Branch: master Commit: ede761b166e3ea56418ff3c1f3565f35ea9481b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ede761b166e3ea56418ff3c1f… Author: Donat Enikeev <donat(a)enikeev.net> Date: Tue Nov 1 13:21:52 2016 +0300 secur32: AddSecurityPackage stub. Signed-off-by: Donat Enikeev <donat(a)enikeev.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/secur32.c | 12 ++++++++++++ dlls/secur32/secur32.spec | 4 ++-- include/sspi.h | 12 ++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 5035ec36..c7e353f 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -1057,6 +1057,18 @@ BOOLEAN WINAPI GetComputerObjectNameW( return status; } +SECURITY_STATUS WINAPI AddSecurityPackageA(LPSTR name, SECURITY_PACKAGE_OPTIONS *options) +{ + FIXME("(%s %p)\n", debugstr_a(name), options); + return E_NOTIMPL; +} + +SECURITY_STATUS WINAPI AddSecurityPackageW(LPWSTR name, SECURITY_PACKAGE_OPTIONS *options) +{ + FIXME("(%s %p)\n", debugstr_w(name), options); + return E_NOTIMPL; +} + /*********************************************************************** * GetUserNameExA (SECUR32.@) */ diff --git a/dlls/secur32/secur32.spec b/dlls/secur32/secur32.spec index 623ffe5..8135958 100644 --- a/dlls/secur32/secur32.spec +++ b/dlls/secur32/secur32.spec @@ -6,8 +6,8 @@ @ stdcall AcquireCredentialsHandleW(wstr wstr long ptr ptr ptr ptr ptr ptr) @ stdcall AddCredentialsA(ptr str str long ptr ptr ptr ptr) @ stdcall AddCredentialsW(ptr wstr wstr long ptr ptr ptr ptr) -@ stub AddSecurityPackageA -@ stub AddSecurityPackageW +@ stdcall AddSecurityPackageA(str ptr) +@ stdcall AddSecurityPackageW(wstr ptr) @ stdcall ApplyControlToken(ptr ptr) @ stdcall CompleteAuthToken(ptr ptr) @ stdcall DecryptMessage(ptr ptr long ptr) diff --git a/include/sspi.h b/include/sspi.h index 501406f..9e44a6d 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -130,6 +130,18 @@ typedef struct _SecPkgInfoW SEC_WCHAR *Comment; } SecPkgInfoW, *PSecPkgInfoW; +typedef struct _SECURITY_PACKAGE_OPTIONS { + ULONG Size; + ULONG Type; + ULONG Flags; + ULONG SignatureSize; + void *Signature; +} SECURITY_PACKAGE_OPTIONS, *PSECURITY_PACKAGE_OPTIONS; + +SECURITY_STATUS WINAPI AddSecurityPackageA(LPSTR,SECURITY_PACKAGE_OPTIONS*); +SECURITY_STATUS WINAPI AddSecurityPackageW(LPWSTR,SECURITY_PACKAGE_OPTIONS*); +#define AddSecurityPackage WINELIB_NAME_AW(AddSecurityPackage) + #define SecPkgInfo WINELIB_NAME_AW(SecPkgInfo) #define PSecPkgInfo WINELIB_NAME_AW(PSecPkgInfo)

1 0

Józef Kucia : wined3d: Mark buffers as used in wined3d_buffer_copy().
by Alexandre Julliard Nov. 3, 2016

Nov. 3, 2016

Module: wine Branch: master Commit: 20b989ef86de7e36b7ec9feee49b0bfa9f284b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b989ef86de7e36b7ec9feee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 3 12:21:13 2016 +0100 wined3d: Mark buffers as used in wined3d_buffer_copy(). 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/buffer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 202ce32..564b1fc 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1264,6 +1264,9 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ DWORD dst_location; HRESULT hr; + buffer_mark_used(dst_buffer); + buffer_mark_used(src_buffer); + device = dst_buffer->resource.device; context = context_acquire(device, NULL);

1 0

Józef Kucia : d3d9/tests: Add test for checking buffer resource format support.
by Alexandre Julliard Nov. 3, 2016

Nov. 3, 2016

Module: wine Branch: master Commit: 89ba45701149af27bab2eca4c0794c667d4c39bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ba45701149af27bab2eca4c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 3 12:21:09 2016 +0100 d3d9/tests: Add test for checking buffer resource format support. 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/d3d9/tests/device.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 9f1d39b..4ea5e6c 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11022,6 +11022,26 @@ static void test_check_device_format(void) ok(FAILED(hr), "Got unexpected hr %#x.\n", hr); } + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_VERTEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_INDEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_VERTEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + IDirect3D9_Release(d3d); }

1 0

Alexandre Julliard : rpcrt4: Include ntstatus.h before headers that may need it.
by Alexandre Julliard Nov. 3, 2016

Nov. 3, 2016

Module: wine Branch: master Commit: 38b57b30fe2b0a0c7d5eb0e0f2222b1dec824167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38b57b30fe2b0a0c7d5eb0e0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 18:06:22 2016 +0100 rpcrt4: Include ntstatus.h before headers that may need it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 67a0220..2537a3f 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -33,6 +33,9 @@ #include <stdlib.h> #include <sys/types.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS + #if defined(__MINGW32__) || defined (_MSC_VER) # include <ws2tcpip.h> # ifndef EADDRINUSE @@ -77,8 +80,6 @@ # define ioctlsocket ioctl #endif /* defined(__MINGW32__) || defined (_MSC_VER) */ -#include "ntstatus.h" -#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winnls.h"

1 0

Alistair Leslie-Hughes : dpnet: Close resets back to an uninitialized state.
by Alexandre Julliard Nov. 3, 2016

Nov. 3, 2016

Module: wine Branch: master Commit: eef69511f5d1347af95ffb8556ec6e4712dd3afe URL: http://source.winehq.org/git/wine.git/?a=commit;h=eef69511f5d1347af95ffb855… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 2 09:13:37 2016 +0000 dpnet: Close resets back to an uninitialized state. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/client.c | 9 ++++++--- dlls/dpnet/tests/client.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 36df50d..de338d8 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -253,9 +253,12 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_GetServerAddress(IDirectPlay8Client static HRESULT WINAPI IDirectPlay8ClientImpl_Close(IDirectPlay8Client *iface, const DWORD dwFlags) { - IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; + IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); + FIXME("(%p):(%x): Stub\n", This, dwFlags); + + This->msghandler = NULL; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8ClientImpl_ReturnBuffer(IDirectPlay8Client *iface, diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index cfa7e10..4753d74 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -319,6 +319,33 @@ static void test_cleanup_dp(void) CoUninitialize(); } +static void test_close(void) +{ + HRESULT hr; + static IDirectPlay8Client* client2; + DPN_SP_CAPS caps; + + hr = CoCreateInstance(&CLSID_DirectPlay8Client, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Client, (void **)&client2); + ok(hr == S_OK, "got 0x%x\n", hr); + + memset(&caps, 0, sizeof(DPN_SP_CAPS)); + caps.dwSize = sizeof(DPN_SP_CAPS); + + hr = IDirectPlay8Client_Initialize(client2, NULL, DirectPlayMessageHandler, 0); + ok(hr == S_OK, "got %x\n", hr); + + hr = IDirectPlay8Client_GetSPCaps(client2, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "got %x\n", hr); + + hr = IDirectPlay8Client_Close(client2, 0); + ok(hr == DPN_OK, "got %x\n", hr); + + hr = IDirectPlay8Client_GetSPCaps(client2, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPNERR_UNINITIALIZED, "got %x\n", hr); + + IDirectPlay8Client_Release(client2); +} + START_TEST(client) { if(!test_init_dp()) @@ -329,5 +356,6 @@ START_TEST(client) test_get_sp_caps(); test_player_info(); test_lobbyclient(); + test_close(); test_cleanup_dp(); }

1 0