March 2022 - Wine-Commits - list.winehq.org

Hugh McMaster : conhost: Reimplement font dialog handling.
by Alexandre Julliard March 11, 2022

March 11, 2022

Module: wine Branch: master Commit: da854c537d887fd275b71153a67cf5c43a27cd58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da854c537d887fd275b71153… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 3 22:37:05 2022 +1100 conhost: Reimplement font dialog handling. Much of the existing font dialog code is overly complicated and difficult to follow. There are also bugs in the code, which cannot be fixed with minimal changes due to the complexity of the existing source. For example, changing the font face via the listbox unexpectedly changes the font size. It is also unnecessary to recreate the list of available font sizes each font face selection if the font type remains unchanged. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 227 +++++++++++----------------------------------- 1 file changed, 55 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da854c537d887fd275b7…

1 0

Rémi Bernon : windows.gaming.input: Return correct error from DllGetActivationFactory.
by Alexandre Julliard March 11, 2022

March 11, 2022

Module: wine Branch: master Commit: 6ebdf1bab9eafb039078916bbc244b674423d6f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ebdf1bab9eafb039078916b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 11 09:43:47 2022 +0100 windows.gaming.input: Return correct error from DllGetActivationFactory. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index c5b7f19c987..1ddd3a8fd23 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -169,7 +169,6 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory ** { static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; const WCHAR *buffer = WindowsGetStringRawBuffer( class_str, NULL ); - HRESULT hr = REGDB_E_CLASSNOTREG; TRACE( "class %s, factory %p.\n", debugstr_w(buffer), factory ); @@ -178,13 +177,14 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory ** *factory = NULL; if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_RawGameController )) - hr = ICustomGameControllerFactory_QueryInterface( controller_factory, &IID_IActivationFactory, (void **)factory ); + ICustomGameControllerFactory_QueryInterface( controller_factory, &IID_IActivationFactory, (void **)factory ); if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Gamepad )) - hr = ICustomGameControllerFactory_QueryInterface( gamepad_factory, &IID_IActivationFactory, (void **)factory ); + ICustomGameControllerFactory_QueryInterface( gamepad_factory, &IID_IActivationFactory, (void **)factory ); if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Custom_GameControllerFactoryManager )) - hr = IGameControllerFactoryManagerStatics2_QueryInterface( manager_factory, &IID_IActivationFactory, (void **)factory ); + IGameControllerFactoryManagerStatics2_QueryInterface( manager_factory, &IID_IActivationFactory, (void **)factory ); - return hr; + if (*factory) return S_OK; + return CLASS_E_CLASSNOTAVAILABLE; } BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved )

1 0

Stefan Dösinger : wined3d: Replace the GE_WRAP macro with a function.
by Alexandre Julliard March 11, 2022

March 11, 2022

Module: wine Branch: master Commit: b854c12a3eb65f0f26279e73ee1f31941d9fa341 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b854c12a3eb65f0f26279e73… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 11 15:02:54 2022 +0300 wined3d: Replace the GE_WRAP macro with a function. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4492ce6ef42..9fb3b27444e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5087,6 +5087,12 @@ static inline void wined3d_resource_reference(struct wined3d_resource *resource) resource->access_time = cs->queue[WINED3D_CS_QUEUE_DEFAULT].head; } +static inline BOOL wined3d_ge_wrap(ULONG x, ULONG y) +{ + return (x - y) < UINT_MAX / 2; +} +C_ASSERT(WINED3D_CS_QUEUE_SIZE < UINT_MAX / 4); + static inline void wined3d_resource_wait_idle(const struct wined3d_resource *resource) { const struct wined3d_cs *cs = resource->device->cs; @@ -5100,11 +5106,11 @@ static inline void wined3d_resource_wait_idle(const struct wined3d_resource *res /* The basic idea is that a resource is busy if tail < access_time <= head. * But we have to be careful about wrap-around of the head and tail. The - * GE_WRAP macro below considers x >= y if x - y is smaller than half the + * wined3d_ge_wrap function considers x >= y if x - y is smaller than half the * UINT range. Head is at most WINED3D_CS_QUEUE_SIZE ahead of tail, because * otherwise the queue memory is considered full and queue_require_space - * stalls. Thus GE_WRAP(head, tail) is always true. The C_ASSERT below ensures - * this in case we decide to grow the queue size in the future. + * stalls. Thus wined3d_ge_wrap(head, tail) is always true. The C_ASSERT above + * ensures this in case we decide to grow the queue size in the future. * * It is possible that a resource has not been used for a long time and is idle, but the head and * tail wrapped around in such a way that the previously set access time falls between head and tail. @@ -5117,8 +5123,7 @@ static inline void wined3d_resource_wait_idle(const struct wined3d_resource *res * Note that the access time is set before the command is submitted, so we have to wait until the * tail is bigger than access_time, not equal. */ -#define GE_WRAP(x, y) (((x)-(y)) < (UINT_MAX / 2)) - if (!GE_WRAP(head, access_time)) + if (!wined3d_ge_wrap(head, access_time)) return; while (1) @@ -5127,14 +5132,12 @@ static inline void wined3d_resource_wait_idle(const struct wined3d_resource *res if (head == tail) /* Queue empty. */ break; - if (!GE_WRAP(access_time, tail) && access_time != tail) + if (!wined3d_ge_wrap(access_time, tail) && access_time != tail) break; YieldProcessor(); } -#undef GE_WRAP } -C_ASSERT(WINED3D_CS_QUEUE_SIZE < UINT_MAX / 4); /* TODO: Add tests and support for FLOAT16_4 POSITIONT, D3DCOLOR position, other * fixed function semantics as D3DCOLOR or FLOAT16 */

1 0

Paul Gofman : ws2_32: Manage shorter length for IPV6_UNICAST_HOPS.
by Alexandre Julliard March 11, 2022

March 11, 2022

Module: wine Branch: master Commit: ed09d9a4c0f80758e80f0c133bca491f4852edf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed09d9a4c0f80758e80f0c13… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 11 13:29:52 2022 +0300 ws2_32: Manage shorter length for IPV6_UNICAST_HOPS. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 14 +++++++++++++- dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4bb852cc103..7a4a60df8d6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1878,6 +1878,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVTCLASS, optval, optlen ); case IPV6_UNICAST_HOPS: + if (*optlen < 1 || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + if (*optlen < sizeof(DWORD)) *optlen = 1; return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS, optval, optlen ); case IPV6_UNICAST_IF: @@ -3259,7 +3265,13 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_RECVTCLASS, optval, optlen ); case IPV6_UNICAST_HOPS: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS, optval, optlen ); + if (!optlen || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + memcpy( &value, optval, min( optlen, sizeof(value) )); + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS, (char *)&value, sizeof(value) ); case IPV6_UNICAST_IF: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_UNICAST_IF, optval, optlen ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 87ae422f9f1..0746b07f4f1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1195,6 +1195,7 @@ static void test_set_getsockopt(void) {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_PKTINFO, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_RECVTCLASS, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, + {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_UNICAST_HOPS, TRUE, {1, 1, 4}, {0}, FALSE}, }; SOCKET s, s2; int i, j, err, lasterr;

1 0

Paul Gofman : ws2_32: Manage shorter length for IPV6_PKTINFO.
by Alexandre Julliard March 11, 2022

March 11, 2022

Module: wine Branch: master Commit: adcff74cd2b00f45888b4f48bc26bf92590c9ca6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adcff74cd2b00f45888b4f48… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 11 13:29:50 2022 +0300 ws2_32: Manage shorter length for IPV6_PKTINFO. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 11 +++++++++++ dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 12 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 07f9d5b3d3d..06b489ffd52 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1860,6 +1860,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return 0; case IPV6_PKTINFO: + if (*optlen < sizeof(DWORD) || !optval) + { + *optlen = 0; + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVPKTINFO, optval, optlen ); case IPV6_RECVTCLASS: @@ -3227,6 +3233,11 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP, (char *)&value, sizeof(value) ); case IPV6_PKTINFO: + if (optlen < sizeof(DWORD) || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_RECVPKTINFO, optval, optlen ); case IPV6_PROTECTION_LEVEL: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3f01c54c307..f58e86869f0 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1193,6 +1193,7 @@ static void test_set_getsockopt(void) {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_HOPLIMIT, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, TRUE, {1, 1, 4}, {0}, FALSE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE}, + {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_PKTINFO, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, }; SOCKET s, s2; int i, j, err, lasterr;

1 0

Stefan Dösinger : wined3d: Rename resource_acquire to resource_reference.
by Alexandre Julliard March 11, 2022

March 11, 2022

Module: wine Branch: master Commit: bff2bbc904966d284591bcd1564964316c6f8acc URL: https://source.winehq.org/git/wine.git/?a=commit;h=bff2bbc904966d284591bcd1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 11 15:02:53 2022 +0300 wined3d: Rename resource_acquire to resource_reference. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 106 ++++++++++++++++++++--------------------- dlls/wined3d/resource.c | 2 +- dlls/wined3d/wined3d_private.h | 6 +-- 3 files changed, 57 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bff2bbc904966d284591…

1 0

Stefan Dösinger : wined3d: Replace while (1) with for (;;).
by Alexandre Julliard March 11, 2022

March 11, 2022

Module: wine Branch: master Commit: 50b6b72d305758e5adfb936dda912e2d2cb3496f URL: https://source.winehq.org/git/wine.git/?a=commit;h=50b6b72d305758e5adfb936d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 11 15:02:55 2022 +0300 wined3d: Replace while (1) with for (;;). Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9fb3b27444e..bc3b9699fa6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5126,7 +5126,7 @@ static inline void wined3d_resource_wait_idle(const struct wined3d_resource *res if (!wined3d_ge_wrap(head, access_time)) return; - while (1) + for (;;) { tail = *(volatile ULONG *)&cs->queue[WINED3D_CS_QUEUE_DEFAULT].tail; if (head == tail) /* Queue empty. */

1 0

Jacek Caban : win32u: Move NtUserSetFocus implementation from user32.
by Alexandre Julliard March 11, 2022

March 11, 2022

Module: wine Branch: master Commit: d5fd27761fee7da0b4291e02ef9bc8ef8d7aec32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5fd27761fee7da0b4291e02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 11 14:21:45 2022 +0100 win32u: Move NtUserSetFocus implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 2 +- dlls/user32/combo.c | 6 ++--- dlls/user32/defdlg.c | 4 +-- dlls/user32/defwnd.c | 2 +- dlls/user32/dialog.c | 10 ++++---- dlls/user32/edit.c | 4 +-- dlls/user32/focus.c | 60 -------------------------------------------- dlls/user32/listbox.c | 4 +-- dlls/user32/mdi.c | 6 ++--- dlls/user32/msgbox.c | 2 +- dlls/user32/scroll.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/win.c | 2 +- dlls/user32/winpos.c | 8 +++--- dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 59 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 ++ dlls/win32u/window.c | 2 +- dlls/win32u/wrappers.c | 6 +++++ include/ntuser.h | 1 + 21 files changed, 98 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d5fd27761fee7da0b429…

1 0

Zhiyi Zhang : d2d1/tests: Add d2d_transformed_geometry_StrokeContainsPoint() tests.
by Alexandre Julliard March 11, 2022

March 11, 2022

Module: wine Branch: master Commit: f2dbb0b41030aeb2b7c19478fd842b70efa0ce49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2dbb0b41030aeb2b7c19478… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 11 14:32:05 2022 +0800 d2d1/tests: Add d2d_transformed_geometry_StrokeContainsPoint() tests. Signed-off-by: Zhiyi Zhang <zzhang(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 | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d1e8b97ed7d..731ef6e0807 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10352,7 +10352,9 @@ static void test_effect_crop(BOOL d3d11) static void test_stroke_contains_point(BOOL d3d11) { + ID2D1TransformedGeometry *transformed_geometry; ID2D1RectangleGeometry *rectangle; + D2D1_MATRIX_3X2_F matrix; ID2D1GeometrySink *sink; ID2D1PathGeometry *path; ID2D1Factory *factory; @@ -10370,6 +10372,7 @@ static void test_stroke_contains_point(BOOL d3d11) float stroke_width; BOOL matrix; BOOL contains; + BOOL todo; } rectangle_tests[] = { @@ -10527,6 +10530,24 @@ static void test_stroke_contains_point(BOOL d3d11) {{{{1.0f, 0.0f, 1.0f, 1.0f}}}, {1425.0f, 827.6f}, 0.1f, 5.0f, TRUE, FALSE}, {{{{1.0f, 0.0f, 1.0f, 1.0f}}}, {1620.1f, 800.0f}, 0.1f, 5.0f, TRUE, FALSE}, {{{{1.0f, 0.0f, 1.0f, 1.0f}}}, {1620.4f, 800.0f}, 0.1f, 5.0f, TRUE, TRUE}, + }, + transformed_tests[] = + { + /* 0. Stroked area hittesting. Edge. Tolerance is 0.0f */ + {{{{0.0f}}}, {0.74f, 2.5f}, 0.0f, 1.0f, FALSE, TRUE}, + {{{{0.0f}}}, {0.75f, 2.5f}, 0.0f, 1.0f, FALSE, FALSE, TRUE}, + + /* 2. Stroked area hittesting. Edge. Tolerance is negative */ + {{{{0.0f}}}, {0.74f, 2.5f}, -1.0f, 1.0f, FALSE, TRUE}, + {{{{0.0f}}}, {0.75f, 2.5f}, -1.0f, 1.0f, FALSE, FALSE, TRUE}, + + /* 4. Stroked area hittesting. Edge. Tolerance is close to zero */ + {{{{0.0f}}}, {0.501f, 2.5f}, 0.001f, 1.0f, FALSE, TRUE}, + {{{{0.0f}}}, {0.502f, 2.5f}, 0.001f, 1.0f, FALSE, FALSE, TRUE}, + + /* 6. Stroked area hittesting. Edge. Tolerance is D2D1_DEFAULT_FLATTENING_TOLERANCE */ + {{{{0.0f}}}, {0.74f, 2.5f}, 0.25f, 1.0f, FALSE, TRUE}, + {{{{0.0f}}}, {0.75f, 2.5f}, 0.25f, 1.0f, FALSE, FALSE, TRUE}, }; hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); @@ -10616,6 +10637,34 @@ static void test_stroke_contains_point(BOOL d3d11) ID2D1PathGeometry_Release(path); + set_rect(&rect, 0.0f, 0.0f, 5.0f, 5.0f); + hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &rectangle); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + set_matrix_identity(&matrix); + scale_matrix(&matrix, 2.0f, 4.0f); + hr = ID2D1Factory_CreateTransformedGeometry(factory, (ID2D1Geometry *)rectangle, &matrix, + &transformed_geometry); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + for (i = 0; i < ARRAY_SIZE(transformed_tests); ++i) + { + const struct contains_point_test *test = &transformed_tests[i]; + + winetest_push_context("Test %u", i); + + contains = !test->contains; + hr = ID2D1TransformedGeometry_StrokeContainsPoint(transformed_geometry, test->point, + test->stroke_width, NULL, test->matrix ? &test->transform : NULL, test->tolerance, + &contains); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + todo_wine_if(test->todo) + ok(contains == test->contains, "Got unexpected result %#x.\n", contains); + + winetest_pop_context(); + } + ID2D1TransformedGeometry_Release(transformed_geometry); + ID2D1RectangleGeometry_Release(rectangle); + ID2D1Factory_Release(factory); }

1 0

Eric Pouech : user32/tests: Enable compilation with long types in resource.c.
by Alexandre Julliard March 11, 2022

March 11, 2022

Module: wine Branch: master Commit: da8e060db2638473370d04fad77aea0beb67952a URL: https://source.winehq.org/git/wine.git/?a=commit;h=da8e060db2638473370d04fa… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 11 09:12:34 2022 +0100 user32/tests: Enable compilation with long types in resource.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/resource.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 5d4c4e2f968..904a1f43fab 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <assert.h> #include <windows.h> @@ -51,10 +52,10 @@ static void test_LoadStringW(void) return; } length2 = LoadStringW(hInst, 2, returnedstringw, ARRAY_SIZE(returnedstringw)); /* get resource string */ - ok(length2 > 0, "LoadStringW failed to load resource 2, ret %d, err %d\n", length2, GetLastError()); + ok(length2 > 0, "LoadStringW failed to load resource 2, ret %d, err %ld\n", length2, GetLastError()); ok(length1 == length2, "LoadStringW returned different values dependent on buflen. ret1 %d, ret2 %d\n", length1, length2); - ok(length1 > 0 && resourcepointer != NULL, "LoadStringW failed to get pointer to resource 2, ret %d, err %d\n", + ok(length1 > 0 && resourcepointer != NULL, "LoadStringW failed to get pointer to resource 2, ret %d, err %ld\n", length1, GetLastError()); /* Copy the resource since it is not '\0' terminated, and add '\0' to the end */ @@ -109,22 +110,22 @@ static void test_LoadStringA (void) } ret = LoadStringA(hInst, 1, buf, sizeof(buf) ); - ok( ret > 0, "LoadString failed: ret %d err %d\n", ret, GetLastError()); + ok( ret > 0, "LoadString failed: ret %d err %ld\n", ret, GetLastError()); ret2 = LoadStringA( hInst, MAKELONG( 1, 0x8000 ), buf, sizeof(buf)); - ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError()); + ok( ret2 == ret, "LoadString failed: ret %d err %ld\n", ret, GetLastError()); ret2 = LoadStringA( hInst, MAKELONG( 1, 0xffff ), buf, sizeof(buf)); - ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError()); + ok( ret2 == ret, "LoadString failed: ret %d err %ld\n", ret, GetLastError()); ret = LoadStringA(hInst, 65534, buf, sizeof(buf) ); - ok( ret > 0, "LoadString failed: ret %d err %d\n", ret, GetLastError()); + ok( ret > 0, "LoadString failed: ret %d err %ld\n", ret, GetLastError()); ret2 = LoadStringA( hInst, MAKELONG( 65534, 0x8000 ), buf, sizeof(buf)); - ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError()); + ok( ret2 == ret, "LoadString failed: ret %d err %ld\n", ret, GetLastError()); ret2 = LoadStringA( hInst, MAKELONG( 65534, 0xffff ), buf, sizeof(buf)); - ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError()); + ok( ret2 == ret, "LoadString failed: ret %d err %ld\n", ret, GetLastError()); ret = LoadStringA(hInst, 0, buf, 0); ok( ret == -1 || broken(ret == 0), - "LoadStringA did not return -1 when called with buflen = 0, got %d, err %d\n", + "LoadStringA did not return -1 when called with buflen = 0, got %d, err %ld\n", ret, GetLastError()); SetLastError(0xdeadbeef); @@ -132,7 +133,7 @@ static void test_LoadStringA (void) ret = LoadStringA(hInst, 1, buf, 1); ok( !ret, "LoadString returned %d\n", ret); ok( buf[0] == 0, "buf[0] = %c (%x)\n", buf[0], buf[0]); - ok( GetLastError() == 0xdeadbeef, "GetLastError() = %d\n", GetLastError()); + ok( GetLastError() == 0xdeadbeef, "GetLastError() = %ld\n", GetLastError()); } static void test_accel1(void)

1 0