November 2016 - Wine-commits

Akihiro Sagawa : winegstreamer: Always pass non-NULL preferred allocator to IAsyncReader:: RequestAllocator.
by Alexandre Julliard 09 Nov '16

09 Nov '16

Module: wine Branch: master Commit: 8d3392a8ce4e75eaca858c2c96f666f1ab57834e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d3392a8ce4e75eaca858c2c9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Nov 9 22:28:20 2016 +0900 winegstreamer: Always pass non-NULL preferred allocator to IAsyncReader::RequestAllocator. This fixes video playback issue in a certain application. The approach is very similar to 068593b23826c995f03559128041b922b68a916b. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5db99c8..a6a41ab 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1963,6 +1963,7 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, EnterCriticalSection(This->pin.pCritSec); if (!This->pin.pConnectedTo) { ALLOCATOR_PROPERTIES props; + IMemAllocator *pAlloc = NULL; props.cBuffers = 8; props.cbBuffer = 16384; @@ -1986,8 +1987,19 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, hr = IPin_QueryInterface(pReceivePin, &IID_IAsyncReader, (LPVOID *)&This->pReader); if (SUCCEEDED(hr)) hr = GST_Connect(This, pReceivePin, &props); + + /* A certain IAsyncReader::RequestAllocator expects to be passed + non-NULL preferred allocator */ if (SUCCEEDED(hr)) - hr = IAsyncReader_RequestAllocator(This->pReader, NULL, &props, &This->pAlloc); + hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC, + &IID_IMemAllocator, (LPVOID *)&pAlloc); + if (SUCCEEDED(hr)) { + hr = IAsyncReader_RequestAllocator(This->pReader, pAlloc, &props, &This->pAlloc); + if (FAILED(hr)) + WARN("Can't get an allocator, got %08x\n", hr); + } + if (pAlloc) + IMemAllocator_Release(pAlloc); if (SUCCEEDED(hr)) { CopyMediaType(&This->pin.mtCurrent, pmt); This->pin.pConnectedTo = pReceivePin;

1 0

Thomas Faber : propsys/tests: Fix build with MSVC.
by Alexandre Julliard 09 Nov '16

09 Nov '16

Module: wine Branch: master Commit: 60fa2d7aa5a8558f28bcf03e631d3783c46822b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60fa2d7aa5a8558f28bcf03e6… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Wed Nov 9 12:08:06 2016 +0100 propsys/tests: Fix build with MSVC. VC2010 does not allow initializing a struct inside a struct with a variable. E.g. error C2440: 'initializing' : cannot convert from 'PROPERTYKEY' to 'unsigned long' Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propsys.c | 96 ++++++++++++++++++++++---------------------- 1 file changed, 49 insertions(+), 47 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index b658678..71b6a93 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -38,6 +38,8 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(dummy_guid, 0xdeadbeef, 0xdead, 0xbeef, 0xde, 0xad, 0xbe, 0xef, 0xca, 0xfe, 0xba, 0xbe); DEFINE_GUID(expect_guid, 0x12345678, 0x1234, 0x1234, 0x12, 0x34, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12); +#define GUID_MEMBERS(g) {(g).Data1, (g).Data2, (g).Data3, {(g).Data4[0], (g).Data4[1], (g).Data4[2], (g).Data4[3], (g).Data4[4], (g).Data4[5], (g).Data4[6], (g).Data4[7]}} + static const char topic[] = "wine topic"; static const WCHAR topicW[] = {'w','i','n','e',' ','t','o','p','i','c',0}; static const WCHAR emptyW[] = {0}; @@ -90,9 +92,9 @@ static void test_PSStringFromPropertyKey(void) static const WCHAR expected3W[] = {'{','0','0','0','0','0','0','0','0','-','0','0','0','0','-','0','0','0', '0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0','0','0', '0','}',' ','0','\0','X','X','X','X','X','X','X','X','X'}; - PROPERTYKEY prop = {GUID_NULL, ~0U}; - PROPERTYKEY prop2 = {GUID_NULL, 13579}; - PROPERTYKEY prop3 = {GUID_NULL, 0}; + PROPERTYKEY prop = {GUID_MEMBERS(GUID_NULL), ~0U}; + PROPERTYKEY prop2 = {GUID_MEMBERS(GUID_NULL), 13579}; + PROPERTYKEY prop3 = {GUID_MEMBERS(GUID_NULL), 0}; WCHAR out[PKEYSTR_MAX]; HRESULT ret; @@ -331,7 +333,7 @@ static void test_PSPropertyKeyFromString(void) static const WCHAR fmtid_normalpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-', '1','2','3','4','-','1','2','3','4','-', '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','1','3','5','7','9',0}; - PROPERTYKEY out_init = {dummy_guid, 0xdeadbeef}; + PROPERTYKEY out_init = {GUID_MEMBERS(dummy_guid), 0xdeadbeef}; PROPERTYKEY out; HRESULT ret; @@ -344,15 +346,15 @@ static void test_PSPropertyKeyFromString(void) } testcases[] = { {NULL, NULL, E_POINTER}, - {NULL, &out, E_POINTER, out_init}, + {NULL, &out, E_POINTER, {GUID_MEMBERS(out_init.fmtid), out_init.pid}}, {emptyW, NULL, E_POINTER}, - {emptyW, &out, E_INVALIDARG, {GUID_NULL, 0}}, - {fmtid_clsidW, &out, E_INVALIDARG, {GUID_NULL, 0}}, + {emptyW, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0}}, + {fmtid_clsidW, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0}}, {fmtid_truncatedW, &out, E_INVALIDARG, { {0x12345678,0x1234,0x1234,{0,0,0,0,0,0,0,0}}, 0}}, - {fmtid_nobracketsW, &out, E_INVALIDARG, {GUID_NULL, 0}}, - {fmtid_badbracketW, &out, E_INVALIDARG, {GUID_NULL, 0}}, - {fmtid_badcharW, &out, E_INVALIDARG, {GUID_NULL, 0}}, - {fmtid_badchar2W, &out, E_INVALIDARG, {GUID_NULL, 0}}, + {fmtid_nobracketsW, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0}}, + {fmtid_badbracketW, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0}}, + {fmtid_badcharW, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0}}, + {fmtid_badchar2W, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0}}, {fmtid_baddashW, &out, E_INVALIDARG, { {0x12345678,0,0,{0,0,0,0,0,0,0,0}}, 0}}, {fmtid_badchar3W, &out, E_INVALIDARG, { {0x12345678,0,0,{0,0,0,0,0,0,0,0}}, 0}}, {fmtid_badchar4W, &out, E_INVALIDARG, { {0x12345678,0,0,{0,0,0,0,0,0,0,0}}, 0}}, @@ -371,42 +373,42 @@ static void test_PSPropertyKeyFromString(void) {fmtid_badchar13W, &out, E_INVALIDARG, { {0x12345678,0x1234,0x1234,{0x12,0x34,0x12,0x34,0x56,0x78,0,0}}, 0}}, {fmtid_badchar14W, &out, E_INVALIDARG, { {0x12345678,0x1234,0x1234,{0x12,0x34,0x12,0x34,0x56,0x78,0x90,0}}, 0}}, {fmtid_badbracket2W, &out, E_INVALIDARG, { {0x12345678,0x1234,0x1234,{0x12,0x34,0x12,0x34,0x56,0x78,0x90,0x00}}, 0 }}, - {fmtid_spaceW, &out, E_INVALIDARG, {GUID_NULL, 0 }}, - {fmtid_spaceendW, &out, E_INVALIDARG, {expect_guid, 0}}, - {fmtid_spacesendW, &out, E_INVALIDARG, {expect_guid, 0}}, - {fmtid_nopidW, &out, E_INVALIDARG, {expect_guid, 0}}, - {fmtid_badpidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_adjpidW, &out, S_OK, {expect_guid, 13579}}, - {fmtid_spacespidW, &out, S_OK, {expect_guid, 13579}}, - {fmtid_negpidW, &out, S_OK, {expect_guid, 13579}}, - {fmtid_negnegpidW, &out, S_OK, {expect_guid, 4294953717U}}, - {fmtid_negnegnegpidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_negspacepidW, &out, S_OK, {expect_guid, 13579}}, - {fmtid_negspacenegpidW, &out, S_OK, {expect_guid, 4294953717U}}, - {fmtid_negspacespidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_pospidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_posnegpidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_symbolpidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_letterpidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_spacepadpidW, &out, S_OK, {expect_guid, 13579}}, - {fmtid_spacemixpidW, &out, S_OK, {expect_guid, 1}}, - {fmtid_tabpidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_hexpidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_mixedpidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_overflowpidW, &out, S_OK, {expect_guid, 3755744309U}}, - {fmtid_commapidW, &out, S_OK, {expect_guid, 13579}}, - {fmtid_commaspidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_commaspacepidW, &out, S_OK, {expect_guid, 13579}}, - {fmtid_spacecommapidW, &out, S_OK, {expect_guid, 13579}}, - {fmtid_spccommaspcpidW, &out, S_OK, {expect_guid, 13579}}, - {fmtid_spacescommaspidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_commanegpidW, &out, S_OK, {expect_guid, 4294953717U}}, - {fmtid_spccommanegpidW, &out, S_OK, {expect_guid, 4294953717U}}, - {fmtid_commaspcnegpidW, &out, S_OK, {expect_guid, 4294953717U}}, - {fmtid_spccommaspcnegpidW, &out, S_OK, {expect_guid, 4294953717U}}, - {fmtid_commanegspcpidW, &out, S_OK, {expect_guid, 0U}}, - {fmtid_negcommapidW, &out, S_OK, {expect_guid, 0}}, - {fmtid_normalpidW, &out, S_OK, {expect_guid, 13579}}, + {fmtid_spaceW, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0 }}, + {fmtid_spaceendW, &out, E_INVALIDARG, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_spacesendW, &out, E_INVALIDARG, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_nopidW, &out, E_INVALIDARG, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_badpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_adjpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, + {fmtid_spacespidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, + {fmtid_negpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, + {fmtid_negnegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 4294953717U}}, + {fmtid_negnegnegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_negspacepidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, + {fmtid_negspacenegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 4294953717U}}, + {fmtid_negspacespidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_pospidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_posnegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_symbolpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_letterpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_spacepadpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, + {fmtid_spacemixpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 1}}, + {fmtid_tabpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_hexpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_mixedpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_overflowpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 3755744309U}}, + {fmtid_commapidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, + {fmtid_commaspidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_commaspacepidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, + {fmtid_spacecommapidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, + {fmtid_spccommaspcpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, + {fmtid_spacescommaspidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_commanegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 4294953717U}}, + {fmtid_spccommanegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 4294953717U}}, + {fmtid_commaspcnegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 4294953717U}}, + {fmtid_spccommaspcnegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 4294953717U}}, + {fmtid_commanegspcpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0U}}, + {fmtid_negcommapidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}}, + {fmtid_normalpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}}, }; int i;

1 0

Alistair Leslie-Hughes : advapi32/test: Stop crash when ReadEventLog returns an unexpected error.
by Alexandre Julliard 09 Nov '16

09 Nov '16

Module: wine Branch: master Commit: d0350eef1eda55f6326f09dfabf88196fc724a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0350eef1eda55f6326f09dfa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 9 02:00:40 2016 +0000 advapi32/test: Stop crash when ReadEventLog returns an unexpected error. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/eventlog.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 3ca59c3..7daaeaf 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -909,6 +909,7 @@ static void test_readwrite(void) /* Read all events from our created eventlog, one by one */ handle = OpenEventLogA(NULL, eventlogname); + ok(handle != NULL, "Failed to open Event Log, got %d\n", GetLastError()); i = 0; for (;;) { @@ -924,14 +925,13 @@ static void test_readwrite(void) SetLastError(0xdeadbeef); ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, 0, buf, sizeof(EVENTLOGRECORD), &read, &needed); - if (!ret && GetLastError() == ERROR_HANDLE_EOF) + ok(!ret, "Expected failure\n"); + if (!ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { HeapFree(GetProcessHeap(), 0, buf); + ok(GetLastError() == ERROR_HANDLE_EOF, "record %d, got %d\n", i, GetLastError()); break; } - ok(!ret, "Expected failure\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected ERROR_INVALID_PARAMETER, got %d\n",GetLastError()); buf = HeapReAlloc(GetProcessHeap(), 0, buf, needed); ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, @@ -1010,6 +1010,7 @@ static void test_readwrite(void) /* Test clearing a real eventlog */ handle = OpenEventLogA(NULL, eventlogname); + ok(handle != NULL, "Failed to open Event Log, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = ClearEventLogA(handle, NULL);

1 0

Akihiro Sagawa : include: Fix a typo in DriverStringOptions flag.
by Alexandre Julliard 09 Nov '16

09 Nov '16

Module: wine Branch: master Commit: 838c5e0eeb9cd4535fed3baaff002db2956d8b47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=838c5e0eeb9cd4535fed3baaf… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Nov 9 22:00:19 2016 +0900 include: Fix a typo in DriverStringOptions flag. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/gdiplusenums.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 3223d2b..1b1db6f 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -47,7 +47,7 @@ enum DriverStringOptions DriverStringOptionsCmapLookup = 1, DriverStringOptionsVertical = 2, DriverStringOptionsRealizedAdvance = 4, - DriverStringOptionsLimitSubpixel = 4 + DriverStringOptionsLimitSubpixel = 8 }; enum FillMode

1 0

Nikolay Sivov : d2d1/tests: Some tests for GetRect() and GetRoundedRect().
by Alexandre Julliard 09 Nov '16

09 Nov '16

Module: wine Branch: master Commit: adfdfe79b2183c35b16e761ac7bdd3ed924f40db URL: http://source.winehq.org/git/wine.git/?a=commit;h=adfdfe79b2183c35b16e761ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 8 20:14:22 2016 +0300 d2d1/tests: Some tests for GetRect() and GetRoundedRect(). 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/tests/d2d1.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 94 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 721afa4..04ce2b5 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -55,6 +55,14 @@ static void set_rect(D2D1_RECT_F *rect, float left, float top, float right, floa rect->bottom = bottom; } +static void set_rounded_rect(D2D1_ROUNDED_RECT *rect, float left, float top, float right, float bottom, + float radius_x, float radius_y) +{ + set_rect(&rect->rect, left, top, right, bottom); + rect->radiusX = radius_x; + rect->radiusY = radius_y; +} + static void set_rect_u(D2D1_RECT_U *rect, UINT32 left, UINT32 top, UINT32 right, UINT32 bottom) { rect->left = left; @@ -1752,15 +1760,47 @@ static void test_path_geometry(void) static void test_rectangle_geometry(void) { ID2D1RectangleGeometry *geometry; + D2D1_RECT_F rect, rect2; 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, 0.0f, 0.0f); + hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + ID2D1RectangleGeometry_GetRect(geometry, &rect2); + ok(!memcmp(&rect, &rect2, sizeof(rect)), "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + rect2.left, rect2.top, rect2.right, rect2.bottom); + ID2D1RectangleGeometry_Release(geometry); + + set_rect(&rect, 50.0f, 0.0f, 40.0f, 100.0f); + hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + ID2D1RectangleGeometry_GetRect(geometry, &rect2); + ok(!memcmp(&rect, &rect2, sizeof(rect)), "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + rect2.left, rect2.top, rect2.right, rect2.bottom); + ID2D1RectangleGeometry_Release(geometry); + + set_rect(&rect, 0.0f, 100.0f, 40.0f, 50.0f); + hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + ID2D1RectangleGeometry_GetRect(geometry, &rect2); + ok(!memcmp(&rect, &rect2, sizeof(rect)), "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + rect2.left, rect2.top, rect2.right, rect2.bottom); + ID2D1RectangleGeometry_Release(geometry); + + set_rect(&rect, 50.0f, 100.0f, 40.0f, 50.0f); + hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + ID2D1RectangleGeometry_GetRect(geometry, &rect2); + ok(!memcmp(&rect, &rect2, sizeof(rect)), "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + rect2.left, rect2.top, rect2.right, rect2.bottom); + ID2D1RectangleGeometry_Release(geometry); + 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); @@ -1809,6 +1849,58 @@ static void test_rectangle_geometry(void) ID2D1Factory_Release(factory); } +static void test_rounded_rectangle_geometry(void) +{ + ID2D1RoundedRectangleGeometry *geometry; + D2D1_ROUNDED_RECT rect, rect2; + ID2D1Factory *factory; + 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_rounded_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); + hr = ID2D1Factory_CreateRoundedRectangleGeometry(factory, &rect, &geometry); +todo_wine + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + if (FAILED(hr)) + { + ID2D1Factory_Release(factory); + return; + } + + ID2D1RoundedRectangleGeometry_GetRoundedRect(geometry, &rect2); + ok(!memcmp(&rect, &rect2, sizeof(rect)), "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + rect2.rect.left, rect2.rect.top, rect2.rect.right, rect2.rect.bottom, rect2.radiusX, rect2.radiusY); + ID2D1RoundedRectangleGeometry_Release(geometry); + + /* X radius larger than half width. */ + set_rounded_rect(&rect, 0.0f, 0.0f, 50.0f, 40.0f, 30.0f, 5.0f); + hr = ID2D1Factory_CreateRoundedRectangleGeometry(factory, &rect, &geometry); + ID2D1RoundedRectangleGeometry_GetRoundedRect(geometry, &rect2); + ok(!memcmp(&rect, &rect2, sizeof(rect)), "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + rect2.rect.left, rect2.rect.top, rect2.rect.right, rect2.rect.bottom, rect2.radiusX, rect2.radiusY); + ID2D1RoundedRectangleGeometry_Release(geometry); + + /* Y radius larger than half height. */ + set_rounded_rect(&rect, 0.0f, 0.0f, 50.0f, 40.0f, 5.0f, 30.0f); + hr = ID2D1Factory_CreateRoundedRectangleGeometry(factory, &rect, &geometry); + ID2D1RoundedRectangleGeometry_GetRoundedRect(geometry, &rect2); + ok(!memcmp(&rect, &rect2, sizeof(rect)), "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + rect2.rect.left, rect2.rect.top, rect2.rect.right, rect2.rect.bottom, rect2.radiusX, rect2.radiusY); + ID2D1RoundedRectangleGeometry_Release(geometry); + + /* Both exceed rectangle size. */ + set_rounded_rect(&rect, 0.0f, 0.0f, 50.0f, 40.0f, 30.0f, 25.0f); + hr = ID2D1Factory_CreateRoundedRectangleGeometry(factory, &rect, &geometry); + ID2D1RoundedRectangleGeometry_GetRoundedRect(geometry, &rect2); + ok(!memcmp(&rect, &rect2, sizeof(rect)), "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + rect2.rect.left, rect2.rect.top, rect2.rect.right, rect2.rect.bottom, rect2.radiusX, rect2.radiusY); + ID2D1RoundedRectangleGeometry_Release(geometry); + + ID2D1Factory_Release(factory); +} + static void test_bitmap_formats(void) { D2D1_BITMAP_PROPERTIES bitmap_desc; @@ -3249,6 +3341,7 @@ START_TEST(d2d1) test_bitmap_brush(); test_path_geometry(); test_rectangle_geometry(); + test_rounded_rectangle_geometry(); test_bitmap_formats(); test_alpha_mode(); test_shared_bitmap();

1 0

Aric Stewart : winebus.sys: IOCTL_HID_GET_STRING for iohid.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: 0d96ffbca924f6ba69a05375f2d43d0de3d7e47c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d96ffbca924f6ba69a05375f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 7 13:42:34 2016 -0600 winebus.sys: IOCTL_HID_GET_STRING for iohid. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 50b5d76..954b021 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -88,6 +88,7 @@ #include "winternl.h" #include "winioctl.h" #include "ddk/wdm.h" +#include "ddk/hidtypes.h" #include "wine/debug.h" #include "bus.h" @@ -156,7 +157,37 @@ static NTSTATUS get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD static NTSTATUS get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length) { - return STATUS_NOT_IMPLEMENTED; + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + CFStringRef str; + switch (index) + { + case HID_STRING_ID_IPRODUCT: + str = IOHIDDeviceGetProperty(private->device, CFSTR(kIOHIDProductKey)); + break; + case HID_STRING_ID_IMANUFACTURER: + str = IOHIDDeviceGetProperty(private->device, CFSTR(kIOHIDManufacturerKey)); + break; + case HID_STRING_ID_ISERIALNUMBER: + str = IOHIDDeviceGetProperty(private->device, CFSTR(kIOHIDSerialNumberKey)); + break; + default: + ERR("Unknown string index\n"); + return STATUS_NOT_IMPLEMENTED; + } + + if (str) + { + if (length < CFStringGetLength(str) + 1) + return STATUS_BUFFER_TOO_SMALL; + CFStringToWSTR(str, buffer, length); + } + else + { + if (!length) return STATUS_BUFFER_TOO_SMALL; + buffer[0] = 0; + } + + return STATUS_SUCCESS; } static NTSTATUS begin_report_processing(DEVICE_OBJECT *device)

1 0

Aric Stewart : winebus.sys: Reports for iohid.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: 2b568a1148607dbd8f6259e7db3443af4aa1bdf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b568a1148607dbd8f6259e7d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 7 13:42:37 2016 -0600 winebus.sys: Reports for iohid. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 954b021..e728b34 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -107,6 +107,7 @@ DEFINE_GUID(GUID_DEVCLASS_IOHID, 0x989D309D,0x0470,0x4E1A,0x89,0x38,0x50,0x1F,0x struct platform_private { IOHIDDeviceRef device; + uint8_t *buffer; }; static inline struct platform_private *impl_from_DEVICE_OBJECT(DEVICE_OBJECT *device) @@ -129,6 +130,14 @@ static DWORD CFNumberToDWORD(CFNumberRef num) return dwNum; } +static void handle_IOHIDDeviceIOHIDReportCallback(void *context, + IOReturn result, void *sender, IOHIDReportType type, + uint32_t reportID, uint8_t *report, CFIndex report_length) +{ + DEVICE_OBJECT *device = (DEVICE_OBJECT*)context; + process_hid_report(device, report, report_length); +} + static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev) { struct platform_private *private = impl_from_DEVICE_OBJECT(device); @@ -192,7 +201,19 @@ static NTSTATUS get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DW static NTSTATUS begin_report_processing(DEVICE_OBJECT *device) { - return STATUS_NOT_IMPLEMENTED; + DWORD length; + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + CFNumberRef num; + + if (private->buffer) + return STATUS_SUCCESS; + + num = IOHIDDeviceGetProperty(private->device, CFSTR(kIOHIDMaxInputReportSizeKey)); + length = CFNumberToDWORD(num); + private->buffer = HeapAlloc(GetProcessHeap(), 0, length); + + IOHIDDeviceRegisterInputReportCallback(private->device, private->buffer, length, handle_IOHIDDeviceIOHIDReportCallback, device); + return STATUS_SUCCESS; } static NTSTATUS set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) @@ -250,6 +271,7 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * { struct platform_private *private = impl_from_DEVICE_OBJECT(device); private->device = IOHIDDevice; + private->buffer = NULL; IoInvalidateDeviceRelations(device, BusRelations); } } @@ -258,6 +280,9 @@ static void handle_RemovalCallback(void *context, IOReturn result, void *sender, { DEVICE_OBJECT *device; TRACE("OS/X IOHID Device Removed %p\n", IOHIDDevice); + IOHIDDeviceRegisterInputReportCallback(IOHIDDevice, NULL, 0, NULL, NULL); + /* Note: Yes, we leak the buffer. But according to research there is no + safe way to deallocate that buffer. */ device = bus_find_hid_device(&iohid_vtbl, IOHIDDevice); if (device) {

1 0

Aric Stewart : winebus.sys: IOCTL_HID_SET_OUTPUTREPORT for iohid.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: 45a7f9f04713b09c93f3b0dc1e7ceca39dae40cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a7f9f04713b09c93f3b0dc1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 7 13:42:41 2016 -0600 winebus.sys: IOCTL_HID_SET_OUTPUTREPORT for iohid. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index e728b34..3b4b0a9 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -218,8 +218,19 @@ static NTSTATUS begin_report_processing(DEVICE_OBJECT *device) static NTSTATUS set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) { - *written = 0; - return STATUS_NOT_IMPLEMENTED; + IOReturn result; + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + result = IOHIDDeviceSetReport(private->device, kIOHIDReportTypeOutput, id, report, length); + if (result == kIOReturnSuccess) + { + *written = length; + return STATUS_SUCCESS; + } + else + { + *written = 0; + return STATUS_UNSUCCESSFUL; + } } static NTSTATUS get_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *read)

1 0

Aric Stewart : winebus.sys: IOCTL_HID_GET_FEATURE for iohid.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: 11a5964d3a1b51656a9f269bef9ae037948c1bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11a5964d3a1b51656a9f269be… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 7 13:42:45 2016 -0600 winebus.sys: IOCTL_HID_GET_FEATURE for iohid. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 3b4b0a9..10635f8 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -235,14 +235,39 @@ static NTSTATUS set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, static NTSTATUS get_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *read) { - *read = 0; - return STATUS_NOT_IMPLEMENTED; + IOReturn ret; + CFIndex report_length = length; + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + + ret = IOHIDDeviceGetReport(private->device, kIOHIDReportTypeFeature, id, report, &report_length); + if (ret == kIOReturnSuccess) + { + *read = report_length; + return STATUS_SUCCESS; + } + else + { + *read = 0; + return STATUS_UNSUCCESSFUL; + } } static NTSTATUS set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) { - *written = 0; - return STATUS_NOT_IMPLEMENTED; + IOReturn result; + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + + result = IOHIDDeviceSetReport(private->device, kIOHIDReportTypeFeature, id, report, length); + if (result == kIOReturnSuccess) + { + *written = length; + return STATUS_SUCCESS; + } + else + { + *written = 0; + return STATUS_UNSUCCESSFUL; + } } static const platform_vtbl iohid_vtbl =

1 0

Jacek Caban : rpcrt4: Initialize all rpc_server_registered_auth_info fields in RpcServerRegisterAuthInfoW.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: ad77b4c5fdaaa782c3787388d2496ece74e0213b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad77b4c5fdaaa782c3787388d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 8 17:29:53 2016 +0100 rpcrt4: Initialize all rpc_server_registered_auth_info fields in RpcServerRegisterAuthInfoW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index d77354d..73e9742 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1449,13 +1449,11 @@ RPC_STATUS WINAPI RpcServerRegisterAuthInfoW( RPC_WSTR ServerPrincName, ULONG Au max_token = package->cbMaxToken; FreeContextBuffer(packages); - auth_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*auth_info)); + auth_info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*auth_info)); if (!auth_info) return RPC_S_OUT_OF_RESOURCES; - if (!ServerPrincName) { - auth_info->principal = NULL; - }else if (!(auth_info->principal = RPCRT4_strdupW(ServerPrincName))) { + if (ServerPrincName && !(auth_info->principal = RPCRT4_strdupW(ServerPrincName))) { HeapFree(GetProcessHeap(), 0, auth_info); return RPC_S_OUT_OF_RESOURCES; }

1 0