December 2022 - Wine-Commits

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

Dec. 13, 2022

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 Dec. 13, 2022

Dec. 13, 2022

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 : ntoskrnl/tests: Ignore CONFIGFLAG_FINISH_INSTALL on the child device.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

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 Dec. 13, 2022

Dec. 13, 2022

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 : include: Add CONFIGFLAG_* definitions.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: 760788557c7322f5480ea67e94097f9112d86d54 URL: https://gitlab.winehq.org/wine/wine/-/commit/760788557c7322f5480ea67e94097f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 17:23:09 2022 -0600 include: Add CONFIGFLAG_* definitions. --- include/regstr.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/regstr.h b/include/regstr.h index 0be6c9ac5f1..850d16133a9 100644 --- a/include/regstr.h +++ b/include/regstr.h @@ -30,5 +30,25 @@ /* UninstallString <= 63 chars in Windows (otherwise problems) */ #define REGSTR_VAL_UNINSTALLER_COMMANDLINE TEXT("UninstallString") +#define CONFIGFLAG_DISABLED 0x00000001 +#define CONFIGFLAG_REMOVED 0x00000002 +#define CONFIGFLAG_MANUAL_INSTALL 0x00000004 +#define CONFIGFLAG_IGNORE_BOOT_LC 0x00000008 +#define CONFIGFLAG_NET_BOOT 0x00000010 +#define CONFIGFLAG_REINSTALL 0x00000020 +#define CONFIGFLAG_FAILEDINSTALL 0x00000040 +#define CONFIGFLAG_CANTSTOPACHILD 0x00000080 +#define CONFIGFLAG_OKREMOVEROM 0x00000100 +#define CONFIGFLAG_NOREMOVEEXIT 0x00000200 +#define CONFIGFLAG_FINISH_INSTALL 0x00000400 +#define CONFIGFLAG_NEEDS_FORCED_CONFIG 0x00000800 +#define CONFIGFLAG_NETBOOT_CARD 0x00001000 +#define CONFIGFLAG_PARTIAL_LOG_CONF 0x00002000 +#define CONFIGFLAG_SUPPRESS_SURPRISE 0x00004000 +#define CONFIGFLAG_VERIFY_HARDWARE 0x00008000 +#define CONFIGFLAG_FINISHINSTALL_UI 0x00010000 +#define CONFIGFLAG_FINISHINSTALL_ACTION 0x00020000 +#define CONFIGFLAG_BOOT_DEVICE 0x00040000 +#define CONFIGFLAG_NEEDS_CLASS_CONFIG 0x00080000 #endif /* _INC_REGSTR_H */

1 0

Huw Davies : winemac: Fix printf format warnings in window.c.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: abec83e50979d7c5ed0f2b99a52a361d3db96dc2 URL: https://gitlab.winehq.org/wine/wine/-/commit/abec83e50979d7c5ed0f2b99a52a36… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 12 16:18:53 2022 +0000 winemac: Fix printf format warnings in window.c. --- dlls/winemac.drv/window.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 37696f02d25..896efb6a68e 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(macdrv); static pthread_mutex_t win_data_mutex; static CFMutableDictionaryRef win_datas; -static DWORD activate_on_focus_time; +static unsigned int activate_on_focus_time; /*********************************************************************** @@ -129,10 +129,10 @@ static void get_cocoa_window_state(struct macdrv_win_data *data, * * Helper for macdrv_window_to_mac_rect and macdrv_mac_to_window_rect. */ -static void get_mac_rect_offset(struct macdrv_win_data *data, DWORD style, RECT *rect, +static void get_mac_rect_offset(struct macdrv_win_data *data, unsigned int style, RECT *rect, const RECT *window_rect, const RECT *client_rect) { - DWORD ex_style, style_mask = 0, ex_style_mask = 0; + unsigned int ex_style, style_mask = 0, ex_style_mask = 0; rect->top = rect->bottom = rect->left = rect->right = 0; @@ -1309,7 +1309,7 @@ static LRESULT move_window(HWND hwnd, WPARAM wparam) { MSG msg; RECT origRect, movedRect, desktopRect; - LONG hittest = (LONG)(wparam & 0x0f); + int hittest = (int)(wparam & 0x0f); POINT capturePoint; LONG style = NtUserGetWindowLongW(hwnd, GWL_STYLE); BOOL moved = FALSE; @@ -1325,7 +1325,7 @@ static LRESULT move_window(HWND hwnd, WPARAM wparam) capturePoint.y = (short)HIWORD(dwPoint); NtUserClipCursor(NULL); - TRACE("hwnd %p hittest %d, pos %d,%d\n", hwnd, hittest, capturePoint.x, capturePoint.y); + TRACE("hwnd %p hittest %d, pos %d,%d\n", hwnd, hittest, (int)capturePoint.x, (int)capturePoint.y); origRect.left = origRect.right = origRect.top = origRect.bottom = 0; if (AdjustWindowRectEx(&origRect, style, FALSE, NtUserGetWindowLongW(hwnd, GWL_EXSTYLE))) @@ -1486,9 +1486,9 @@ static LRESULT move_window(HWND hwnd, WPARAM wparam) /*********************************************************************** * perform_window_command */ -static void perform_window_command(HWND hwnd, DWORD style_any, DWORD style_none, WORD command, WORD hittest) +static void perform_window_command(HWND hwnd, unsigned int style_any, unsigned int style_none, WORD command, WORD hittest) { - DWORD style; + unsigned int style; TRACE("win %p style_any 0x%08x style_none 0x%08x command 0x%04x hittest 0x%04x\n", hwnd, style_any, style_none, command, hittest); @@ -1668,7 +1668,7 @@ void macdrv_SetLayeredWindowAttributes(HWND hwnd, COLORREF key, BYTE alpha, DWOR { struct macdrv_win_data *data = get_win_data(hwnd); - TRACE("hwnd %p key %#08x alpha %#02x flags %x\n", hwnd, key, alpha, flags); + TRACE("hwnd %p key %#08x alpha %#02x flags %x\n", hwnd, (unsigned int)key, alpha, (unsigned int)flags); if (data) { @@ -1757,7 +1757,7 @@ void macdrv_SetWindowStyle(HWND hwnd, INT offset, STYLESTRUCT *style) { struct macdrv_win_data *data; - TRACE("hwnd %p offset %d styleOld 0x%08x styleNew 0x%08x\n", hwnd, offset, style->styleOld, style->styleNew); + TRACE("hwnd %p offset %d styleOld 0x%08x styleNew 0x%08x\n", hwnd, offset, (unsigned int)style->styleOld, (unsigned int)style->styleNew); if (hwnd == NtUserGetDesktopWindow()) return; if (!(data = get_win_data(hwnd))) return; @@ -1865,7 +1865,7 @@ LRESULT macdrv_SysCommand(HWND hwnd, WPARAM wparam, LPARAM lparam) !NtUserGetWindowLongPtrW(hwnd, GWLP_ID) && (NtUserGetWindowLongW(hwnd, GWL_STYLE) & WS_SYSMENU)) { - TRACE("ignoring SC_KEYMENU wp %lx lp %lx\n", wparam, lparam); + TRACE("ignoring SC_KEYMENU wp %lx lp %lx\n", (unsigned long)wparam, lparam); ret = 0; } @@ -2022,7 +2022,7 @@ LRESULT macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) return 0; } - FIXME("unrecognized window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp); + FIXME("unrecognized window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, (unsigned long)wp, lp); return 0; } @@ -2104,7 +2104,7 @@ void macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, { struct macdrv_thread_data *thread_data; struct macdrv_win_data *data; - DWORD new_style = NtUserGetWindowLongW(hwnd, GWL_STYLE); + unsigned int new_style = NtUserGetWindowLongW(hwnd, GWL_STYLE); RECT old_window_rect, old_whole_rect, old_client_rect; if (!(data = get_win_data(hwnd))) return; @@ -2298,16 +2298,16 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) if (data->window_rect.left == rect.left && data->window_rect.top == rect.top) flags |= SWP_NOMOVE; else - TRACE("%p moving from (%d,%d) to (%d,%d)\n", hwnd, data->window_rect.left, - data->window_rect.top, rect.left, rect.top); + TRACE("%p moving from (%d,%d) to (%d,%d)\n", hwnd, (int)data->window_rect.left, + (int)data->window_rect.top, (int)rect.left, (int)rect.top); if ((data->window_rect.right - data->window_rect.left == width && data->window_rect.bottom - data->window_rect.top == height) || (IsRectEmpty(&data->window_rect) && width == 1 && height == 1)) flags |= SWP_NOSIZE; else - TRACE("%p resizing from (%dx%d) to (%dx%d)\n", hwnd, data->window_rect.right - data->window_rect.left, - data->window_rect.bottom - data->window_rect.top, width, height); + TRACE("%p resizing from (%dx%d) to (%dx%d)\n", hwnd, (int)(data->window_rect.right - data->window_rect.left), + (int)(data->window_rect.bottom - data->window_rect.top), width, height); being_dragged = data->drag_event != NULL; release_win_data(data); @@ -2333,7 +2333,7 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) */ void macdrv_window_got_focus(HWND hwnd, const macdrv_event *event) { - LONG style = NtUserGetWindowLongW(hwnd, GWL_STYLE); + unsigned int style = NtUserGetWindowLongW(hwnd, GWL_STYLE); if (!hwnd) return; @@ -2455,7 +2455,7 @@ void macdrv_window_did_minimize(HWND hwnd) void macdrv_window_did_unminimize(HWND hwnd) { struct macdrv_win_data *data; - DWORD style; + unsigned int style; TRACE("win %p\n", hwnd);

1 0

Huw Davies : winemac: Fix remaining printf format warnings.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: 027bd21b0c2b7d1f4560cccc4a00213a4167be8d URL: https://gitlab.winehq.org/wine/wine/-/commit/027bd21b0c2b7d1f4560cccc4a0021… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 12 16:22:56 2022 +0000 winemac: Fix remaining printf format warnings. --- dlls/winemac.drv/macdrv_main.c | 10 +++++----- dlls/winemac.drv/opengl.c | 4 ++-- dlls/winemac.drv/unixlib.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 39bd66f3211..eeed9a4bcbe 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -132,12 +132,12 @@ HKEY open_hkcu_key(const char *name) sid = ((TOKEN_USER *)sid_data)->User.Sid; len = sprintf(buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, - MAKELONG(MAKEWORD(sid->IdentifierAuthority.Value[5], - sid->IdentifierAuthority.Value[4]), - MAKEWORD(sid->IdentifierAuthority.Value[3], - sid->IdentifierAuthority.Value[2]))); + (unsigned int)MAKELONG(MAKEWORD(sid->IdentifierAuthority.Value[5], + sid->IdentifierAuthority.Value[4]), + MAKEWORD(sid->IdentifierAuthority.Value[3], + sid->IdentifierAuthority.Value[2]))); for (i = 0; i < sid->SubAuthorityCount; i++) - len += sprintf(buffer + len, "-%u", sid->SubAuthority[i]); + len += sprintf(buffer + len, "-%u", (unsigned int)sid->SubAuthority[i]); ascii_to_unicode(bufferW, buffer, len); hkcu = reg_open_key(NULL, bufferW, len * sizeof(WCHAR)); diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index e1da34892ba..ff78b183360 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -76,7 +76,7 @@ struct wgl_context BOOL sharing; LONG update_swap_interval; LONG view_moved; - DWORD last_flush_time; + unsigned int last_flush_time; UINT major; }; @@ -2222,7 +2222,7 @@ static void macdrv_glFlush(void) if (skip_single_buffer_flushes) { const pixel_format *pf = &pixel_formats[context->format - 1]; - DWORD now = NtGetTickCount(); + unsigned int now = NtGetTickCount(); TRACE("double buffer %d last flush time %d now %d\n", (int)pf->double_buffer, context->last_flush_time, now); diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h index 614e3ddb11a..07f0da4a6f3 100644 --- a/dlls/winemac.drv/unixlib.h +++ b/dlls/winemac.drv/unixlib.h @@ -87,7 +87,7 @@ struct init_params /* macdrv_notify_icon params */ struct notify_icon_params { - DWORD msg; + unsigned int msg; struct _NOTIFYICONDATAW *data; };

1 0

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

Dec. 13, 2022

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

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

Dec. 13, 2022

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

Alex Henrie : include: Add _recalloc.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

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