December 2022 - Wine-commits

Zebediah Figura : ntoskrnl/tests: Ignore CONFIGFLAG_FINISH_INSTALL on the child device.
by Alexandre Julliard 13 Dec '22

13 Dec '22

Module: wine Branch: master Commit: 5e3e0a519de9004f39ca8be8f3f833fe54bdeeb9 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e3e0a519de9004f39ca8be8f3f833… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 17:23:32 2022 -0600 ntoskrnl/tests: Ignore CONFIGFLAG_FINISH_INSTALL on the child device. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53976 --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 02af7ca230b..ff93cfc98ec 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -36,6 +36,7 @@ #include "setupapi.h" #include "cfgmgr32.h" #include "newdev.h" +#include "regstr.h" #include "dbt.h" #include "initguid.h" #include "devguid.h" @@ -1634,7 +1635,8 @@ static void test_pnp_devices(void) ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CONFIGFLAGS, &type, (BYTE *)&dword, sizeof(dword), NULL); ok(ret, "got error %#lx\n", GetLastError()); - ok(!dword, "got flags %#lx\n", dword); + /* windows 7 sets CONFIGFLAG_FINISH_INSTALL; it's not clear what this means */ + ok(!(dword & ~CONFIGFLAG_FINISH_INSTALL), "got flags %#lx\n", dword); ok(type == REG_DWORD, "got type %lu\n", type); ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_DEVTYPE,

1 0

Zebediah Figura : ws2_32/tests: Add tests for state inherited by accept().
by Alexandre Julliard 13 Dec '22

13 Dec '22

Module: wine Branch: master Commit: 96e5157f2a1d1a83698df6a727c2723a8a742351 URL: https://gitlab.winehq.org/wine/wine/-/commit/96e5157f2a1d1a83698df6a727c272… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 17:05:24 2022 -0600 ws2_32/tests: Add tests for state inherited by accept(). --- dlls/ws2_32/tests/sock.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index bcccaef9bc6..32c2172f0db 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4761,6 +4761,89 @@ done: closesocket(server_socket); } +/* Test what socket state is inherited from the listening socket by accept(). */ +static void test_accept_inheritance(void) +{ + struct sockaddr_in addr, destaddr; + SOCKET listener, server, client; + struct linger linger; + int ret, len, value; + unsigned int i; + + static const struct + { + int optname; + int optval; + int value; + } + int_tests[] = + { + {SOL_SOCKET, SO_REUSEADDR, 1}, + {SOL_SOCKET, SO_KEEPALIVE, 1}, + {SOL_SOCKET, SO_OOBINLINE, 1}, + {SOL_SOCKET, SO_SNDBUF, 0x123}, + {SOL_SOCKET, SO_RCVBUF, 0x123}, + {SOL_SOCKET, SO_SNDTIMEO, 0x123}, + {SOL_SOCKET, SO_RCVTIMEO, 0x123}, + {IPPROTO_TCP, TCP_NODELAY, 1}, + }; + + listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(listener != -1, "failed to create socket, error %u\n", WSAGetLastError()); + + for (i = 0; i < ARRAY_SIZE(int_tests); ++i) + { + ret = setsockopt(listener, int_tests[i].optname, int_tests[i].optval, + (char *)&int_tests[i].value, sizeof(int_tests[i].value)); + ok(!ret, "test %u: got error %u\n", i, WSAGetLastError()); + } + + linger.l_onoff = 1; + linger.l_linger = 555; + ret = setsockopt(listener, SOL_SOCKET, SO_LINGER, (char *)&linger, sizeof(linger)); + ok(!ret, "got error %u\n", WSAGetLastError()); + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr("127.0.0.1"); + ret = bind(listener, (struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); + len = sizeof(destaddr); + ret = getsockname(listener, (struct sockaddr *)&destaddr, &len); + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); + + ret = listen(listener, 1); + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + + for (i = 0; i < ARRAY_SIZE(int_tests); ++i) + { + value = 0; + len = sizeof(value); + ret = getsockopt(server, int_tests[i].optname, int_tests[i].optval, (char *)&value, &len); + ok(!ret, "test %u: got error %u\n", i, WSAGetLastError()); + todo_wine_if (i == 0 || (i >= 3 && i <= 6)) + ok(value == int_tests[i].value, "test %u: got value %#x\n", i, value); + } + + len = sizeof(linger); + memset(&linger, 0, sizeof(linger)); + ret = getsockopt(server, SOL_SOCKET, SO_LINGER, (char *)&linger, &len); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(linger.l_onoff == 1, "got on/off %u\n", linger.l_onoff); + ok(linger.l_linger == 555, "got linger %u\n", linger.l_onoff); + + close(server); + close(client); + close(listener); +} + static void test_extendedSocketOptions(void) { WSADATA wsa; @@ -13607,6 +13690,7 @@ START_TEST( sock ) test_listen(); test_select(); test_accept(); + test_accept_inheritance(); test_getpeername(); test_getsockname();

1 0

Zebediah Figura : server: Inherit address reuse flags in accept_socket().
by Alexandre Julliard 13 Dec '22

13 Dec '22

Module: wine Branch: master Commit: ddc6c3fb23ae9a6ad584b596e8c5a7ff8ef1b4c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/ddc6c3fb23ae9a6ad584b596e8c5a7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 17:08:10 2022 -0600 server: Inherit address reuse flags in accept_socket(). --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 32c2172f0db..d8500144bd0 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4828,7 +4828,7 @@ static void test_accept_inheritance(void) len = sizeof(value); ret = getsockopt(server, int_tests[i].optname, int_tests[i].optval, (char *)&value, &len); ok(!ret, "test %u: got error %u\n", i, WSAGetLastError()); - todo_wine_if (i == 0 || (i >= 3 && i <= 6)) + todo_wine_if (i >= 3 && i <= 6) ok(value == int_tests[i].value, "test %u: got value %#x\n", i, value); } diff --git a/server/sock.c b/server/sock.c index c130821b7f4..8fe6086b8f6 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1988,16 +1988,19 @@ static struct sock *accept_socket( struct sock *sock ) } /* newly created socket gets the same properties of the listening socket */ - acceptsock->state = SOCK_CONNECTED; - acceptsock->bound = 1; - acceptsock->nonblocking = sock->nonblocking; - acceptsock->mask = sock->mask; - acceptsock->proto = sock->proto; - acceptsock->type = sock->type; - acceptsock->family = sock->family; - acceptsock->window = sock->window; - acceptsock->message = sock->message; - acceptsock->connect_time = current_time; + acceptsock->state = SOCK_CONNECTED; + acceptsock->bound = 1; + acceptsock->nonblocking = sock->nonblocking; + acceptsock->mask = sock->mask; + acceptsock->proto = sock->proto; + acceptsock->type = sock->type; + acceptsock->family = sock->family; + acceptsock->window = sock->window; + acceptsock->message = sock->message; + acceptsock->reuseaddr = sock->reuseaddr; + acceptsock->exclusiveaddruse = sock->exclusiveaddruse; + acceptsock->connect_time = current_time; + if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event ); if (!(acceptsock->fd = create_anonymous_fd( &sock_fd_ops, acceptfd, &acceptsock->obj, get_fd_options( sock->fd ) )))

1 0

Zebediah Figura : server: Inherit the SO_SNDBUF value in accept_socket().
by Alexandre Julliard 13 Dec '22

13 Dec '22

Module: wine Branch: master Commit: a58cd78ca9efa160ea13783839c461b8d3c65bec URL: https://gitlab.winehq.org/wine/wine/-/commit/a58cd78ca9efa160ea13783839c461… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 17:08:54 2022 -0600 server: Inherit the SO_SNDBUF value in accept_socket(). --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d8500144bd0..974cf087778 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4828,7 +4828,7 @@ static void test_accept_inheritance(void) len = sizeof(value); ret = getsockopt(server, int_tests[i].optname, int_tests[i].optval, (char *)&value, &len); ok(!ret, "test %u: got error %u\n", i, WSAGetLastError()); - todo_wine_if (i >= 3 && i <= 6) + todo_wine_if (i >= 4 && i <= 6) ok(value == int_tests[i].value, "test %u: got value %#x\n", i, value); } diff --git a/server/sock.c b/server/sock.c index 8fe6086b8f6..e84b3c68017 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1999,6 +1999,7 @@ static struct sock *accept_socket( struct sock *sock ) acceptsock->message = sock->message; acceptsock->reuseaddr = sock->reuseaddr; acceptsock->exclusiveaddruse = sock->exclusiveaddruse; + acceptsock->sndbuf = sock->sndbuf; acceptsock->connect_time = current_time; if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event );

1 0

Zebediah Figura : server: Inherit the SO_RCVBUF value in accept_socket().
by Alexandre Julliard 13 Dec '22

13 Dec '22

Module: wine Branch: master Commit: 1ef2cc0f643ba0614d189708b7a7af4bccee389f URL: https://gitlab.winehq.org/wine/wine/-/commit/1ef2cc0f643ba0614d189708b7a7af… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 17:09:08 2022 -0600 server: Inherit the SO_RCVBUF value in accept_socket(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53911 --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 974cf087778..f32776de17f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4828,7 +4828,7 @@ static void test_accept_inheritance(void) len = sizeof(value); ret = getsockopt(server, int_tests[i].optname, int_tests[i].optval, (char *)&value, &len); ok(!ret, "test %u: got error %u\n", i, WSAGetLastError()); - todo_wine_if (i >= 4 && i <= 6) + todo_wine_if (i >= 5 && i <= 6) ok(value == int_tests[i].value, "test %u: got value %#x\n", i, value); } diff --git a/server/sock.c b/server/sock.c index e84b3c68017..4a16180a960 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2000,6 +2000,7 @@ static struct sock *accept_socket( struct sock *sock ) acceptsock->reuseaddr = sock->reuseaddr; acceptsock->exclusiveaddruse = sock->exclusiveaddruse; acceptsock->sndbuf = sock->sndbuf; + acceptsock->rcvbuf = sock->rcvbuf; acceptsock->connect_time = current_time; if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event );

1 0

Zebediah Figura : server: Inherit the SO_SNDTIMEO value in accept_socket().
by Alexandre Julliard 13 Dec '22

13 Dec '22

Module: wine Branch: master Commit: 418dff0c0122655aa6bf505333860b9e785c732a URL: https://gitlab.winehq.org/wine/wine/-/commit/418dff0c0122655aa6bf505333860b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 17:09:48 2022 -0600 server: Inherit the SO_SNDTIMEO value in accept_socket(). --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f32776de17f..cb99ceb4b24 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4828,7 +4828,7 @@ static void test_accept_inheritance(void) len = sizeof(value); ret = getsockopt(server, int_tests[i].optname, int_tests[i].optval, (char *)&value, &len); ok(!ret, "test %u: got error %u\n", i, WSAGetLastError()); - todo_wine_if (i >= 5 && i <= 6) + todo_wine_if (i == 6) ok(value == int_tests[i].value, "test %u: got value %#x\n", i, value); } diff --git a/server/sock.c b/server/sock.c index 4a16180a960..a64ea8f7e56 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2001,6 +2001,7 @@ static struct sock *accept_socket( struct sock *sock ) acceptsock->exclusiveaddruse = sock->exclusiveaddruse; acceptsock->sndbuf = sock->sndbuf; acceptsock->rcvbuf = sock->rcvbuf; + acceptsock->sndtimeo = sock->sndtimeo; acceptsock->connect_time = current_time; if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event );

1 0

Zebediah Figura : server: Inherit the SO_RCVTIMEO value in accept_socket().
by Alexandre Julliard 13 Dec '22

13 Dec '22

Module: wine Branch: master Commit: 03391aab2457d8e4341339ba619acd8a2f071654 URL: https://gitlab.winehq.org/wine/wine/-/commit/03391aab2457d8e4341339ba619acd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 17:10:06 2022 -0600 server: Inherit the SO_RCVTIMEO value in accept_socket(). --- dlls/ws2_32/tests/sock.c | 3 +-- server/sock.c | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cb99ceb4b24..6f2bcb73a06 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4828,8 +4828,7 @@ static void test_accept_inheritance(void) len = sizeof(value); ret = getsockopt(server, int_tests[i].optname, int_tests[i].optval, (char *)&value, &len); ok(!ret, "test %u: got error %u\n", i, WSAGetLastError()); - todo_wine_if (i == 6) - ok(value == int_tests[i].value, "test %u: got value %#x\n", i, value); + ok(value == int_tests[i].value, "test %u: got value %#x\n", i, value); } len = sizeof(linger); diff --git a/server/sock.c b/server/sock.c index a64ea8f7e56..a64cb22404e 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2002,6 +2002,7 @@ static struct sock *accept_socket( struct sock *sock ) acceptsock->sndbuf = sock->sndbuf; acceptsock->rcvbuf = sock->rcvbuf; acceptsock->sndtimeo = sock->sndtimeo; + acceptsock->rcvtimeo = sock->rcvtimeo; acceptsock->connect_time = current_time; if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event );

1 0

Alex Henrie : include: Add _recalloc.
by Alexandre Julliard 13 Dec '22

13 Dec '22

Module: wine Branch: master Commit: 3ffc42044032f7c8198c33ee1b17a7f79eb7af51 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ffc42044032f7c8198c33ee1b17a7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 11 19:27:38 2022 -0700 include: Add _recalloc. --- include/msvcrt/corecrt_malloc.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/corecrt_malloc.h b/include/msvcrt/corecrt_malloc.h index 1478a6a6c89..4c0d35f7e08 100644 --- a/include/msvcrt/corecrt_malloc.h +++ b/include/msvcrt/corecrt_malloc.h @@ -30,6 +30,7 @@ _ACRTIMP void* __cdecl calloc(size_t,size_t); _ACRTIMP void __cdecl free(void*); _ACRTIMP void* __cdecl malloc(size_t); _ACRTIMP void* __cdecl realloc(void*,size_t); +_ACRTIMP void* __cdecl _recalloc(void*,size_t,size_t); _ACRTIMP void* __cdecl _expand(void*,size_t); _ACRTIMP size_t __cdecl _msize(void*);

1 0

Huw Davies : winemac: Fix printf format warnings in keyboard.c.
by Alexandre Julliard 13 Dec '22

13 Dec '22

Module: wine Branch: master Commit: 0553cbe7c98ec95f239d135596e9cae6b7d007c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/0553cbe7c98ec95f239d135596e9ca… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 12 13:38:22 2022 +0000 winemac: Fix printf format warnings in keyboard.c. --- dlls/winemac.drv/keyboard.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 1592bcad1a2..76c038caf02 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -898,7 +898,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) from the default map, if it's still available. */ for (keyc = 0; keyc < ARRAY_SIZE(default_map); keyc++) { - DWORD vkey = default_map[keyc].vkey; + unsigned int vkey = default_map[keyc].vkey; if (!thread_data->keyc2scan[keyc]) continue; /* not a known Mac key code */ if (thread_data->keyc2vkey[keyc]) continue; /* already assigned */ @@ -988,7 +988,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) /*********************************************************************** * macdrv_send_keyboard_input */ -static void macdrv_send_keyboard_input(HWND hwnd, WORD vkey, WORD scan, DWORD flags, DWORD time) +static void macdrv_send_keyboard_input(HWND hwnd, WORD vkey, WORD scan, unsigned int flags, unsigned int time) { INPUT input; @@ -1307,7 +1307,7 @@ INT macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) UInt32 deadKeyState = 0; UniCharCount len; OSStatus status; - DWORD vkey; + unsigned int vkey; int i; uchr = (const UCKeyboardLayout*)CFDataGetBytePtr(thread_data->keyboard_layout_uchr); @@ -1368,12 +1368,12 @@ INT macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) len = wcslen(buffer); } - TRACE("lparam 0x%08x -> %s\n", lparam, debugstr_w(buffer)); + TRACE("lparam 0x%08x -> %s\n", (unsigned int)lparam, debugstr_w(buffer)); return len; } } - WARN("found no name for lparam 0x%08x\n", lparam); + WARN("found no name for lparam 0x%08x\n", (unsigned int)lparam); return 0; }

1 0

Huw Davies : winemac: Fix printf format warnings in mouse.c.
by Alexandre Julliard 13 Dec '22

13 Dec '22

Module: wine Branch: master Commit: 262b3bb507cdd97ba5ed41d8c8f736835691db2a URL: https://gitlab.winehq.org/wine/wine/-/commit/262b3bb507cdd97ba5ed41d8c8f736… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 12 16:20:44 2022 +0000 winemac: Fix printf format warnings in mouse.c. --- dlls/winemac.drv/mouse.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 6dd90978a93..cb194095d55 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -274,7 +274,7 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, CFArrayRef frames; TRACE("hdc %p icon->hbmMask %p icon->xHotspot %d icon->yHotspot %d width %d height %d\n", - hdc, icon->hbmMask, icon->xHotspot, icon->yHotspot, width, height); + hdc, icon->hbmMask, (int)icon->xHotspot, (int)icon->yHotspot, width, height); info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info->bmiHeader.biWidth = width; @@ -484,7 +484,7 @@ static CFDictionaryRef create_cursor_frame(HDC hdc, const ICONINFOEXW *iinfo, HA TRACE("hdc %p iinfo->xHotspot %d iinfo->yHotspot %d icon %p hbmColor %p color_bits %p color_size %d" " hbmMask %p mask_bits %p mask_size %d width %d height %d istep %d\n", - hdc, iinfo->xHotspot, iinfo->yHotspot, icon, hbmColor, color_bits, color_size, + hdc, (int)iinfo->xHotspot, (int)iinfo->yHotspot, icon, hbmColor, color_bits, color_size, hbmMask, mask_bits, mask_size, width, height, istep); frame = CFDictionaryCreateMutable(NULL, 0, &kCFCopyStringDictionaryKeyCallBacks, @@ -631,7 +631,7 @@ cleanup: frames = NULL; } else - TRACE("returning cursor with %d frames\n", nFrames); + TRACE("returning cursor with %d frames\n", (int)nFrames); /* Cleanup all of the resources used to obtain the frame data */ if (hbmColor) NtGdiDeleteObjectApp(hbmColor); if (hbmMask) NtGdiDeleteObjectApp(hbmMask); @@ -691,7 +691,7 @@ BOOL macdrv_GetCursorPos(LPPOINT pos) ret = macdrv_get_cursor_position(&pt); if (ret) { - TRACE("pointer at (%g,%g) server pos %d,%d\n", pt.x, pt.y, pos->x, pos->y); + TRACE("pointer at (%g,%g) server pos %d,%d\n", pt.x, pt.y, (int)pos->x, (int)pos->y); pos->x = floor(pt.x); pos->y = floor(pt.y); } @@ -957,6 +957,6 @@ void macdrv_release_capture(HWND hwnd, const macdrv_event *event) { NtUserReleaseCapture(); if (!NtUserPostMessage(capture, WM_CANCELMODE, 0, 0)) - WARN("failed to post WM_CANCELMODE; error 0x%08x\n", RtlGetLastWin32Error()); + WARN("failed to post WM_CANCELMODE; error 0x%08x\n", (unsigned int)RtlGetLastWin32Error()); } }

1 0