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

Jacek Caban : winex11: Avoid using sprintfW.
by Alexandre Julliard May 4, 2022

May 4, 2022

Module: wine Branch: master Commit: 30d5a04f6d8dd74c2a390e3bf9569ad6d5b9c01c URL: https://source.winehq.org/git/wine.git/?a=commit;h=30d5a04f6d8dd74c2a390e3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 00:43:14 2022 +0200 winex11: Avoid using sprintfW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 8 ++++++-- dlls/winex11.drv/settings.c | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 3d68dc80b3e..7133f2e2694 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1053,7 +1053,6 @@ static int find_fallback_shape( const char *name ) */ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) { - static const WCHAR idW[] = {'%','h','u',0}; const struct system_cursors *cursors; unsigned int i; Cursor cursor = 0; @@ -1070,7 +1069,12 @@ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) p = name + strlenW( name ); *p++ = ','; if (info->szResName[0]) strcpyW( p, info->szResName ); - else sprintfW( p, idW, info->wResID ); + else + { + char buf[16]; + sprintf( buf, "%hu", info->wResID ); + asciiz_to_unicode( p, buf ); + } valueA[0] = 0; /* @@ Wine registry key: HKCU\Software\Wine\X11 Driver\Cursors */ diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 44c61776b4b..1e8868acc6c 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -217,8 +217,6 @@ void init_registry_display_settings(void) static HKEY get_display_device_reg_key( const WCHAR *device_name ) { static const WCHAR display[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; - static const WCHAR video_value_fmt[] = {'\\','D','e','v','i','c','e','\\', - 'V','i','d','e','o','%','d',0}; static const WCHAR video_key[] = { '\\','R','e','g','i','s','t','r','y', '\\','M','a','c','h','i','n','e', @@ -235,6 +233,7 @@ static HKEY get_display_device_reg_key( const WCHAR *device_name ) WCHAR value_name[MAX_PATH], buffer[4096], *end_ptr; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; DWORD adapter_index, size; + char adapter_name[100]; HKEY hkey; /* Device name has to be \\.\DISPLAY%d */ @@ -248,7 +247,8 @@ static HKEY get_display_device_reg_key( const WCHAR *device_name ) /* Open \Device\Video* in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ if (!(hkey = reg_open_key( NULL, video_key, sizeof(video_key) ))) return FALSE; - sprintfW(value_name, video_value_fmt, adapter_index); + sprintf( adapter_name, "\\Device\\Video%d", adapter_index ); + asciiz_to_unicode( value_name, adapter_name ); size = query_reg_value( hkey, value_name, value, sizeof(buffer) ); NtClose( hkey ); if (!size || value->Type != REG_SZ) return FALSE;

1 0

Jacek Caban : winex11: Avoid using kernel32 functions in get_config_key.
by Alexandre Julliard May 4, 2022

May 4, 2022

Module: wine Branch: master Commit: 1a89cea4f6ccc153bb9030dae940ac8a1a9352ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a89cea4f6ccc153bb9030da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 15:36:18 2022 +0200 winex11: Avoid using kernel32 functions in get_config_key. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/x11drv_main.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 22f0f0a729f..f05885c316a 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -422,7 +422,7 @@ static inline DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, static void setup_options(void) { static const WCHAR x11driverW[] = {'\\','X','1','1',' ','D','r','i','v','e','r',0}; - WCHAR buffer[MAX_PATH+16]; + WCHAR buffer[MAX_PATH+16], *p, *appname; HKEY hkey, appkey = 0; DWORD len; @@ -431,18 +431,21 @@ static void setup_options(void) /* open the app-specific key */ - len = GetModuleFileNameW( 0, buffer, MAX_PATH ); + appname = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; + if ((p = strrchrW( appname, '/' ))) appname = p + 1; + if ((p = strrchrW( appname, '\\' ))) appname = p + 1; + len = lstrlenW( appname ); + if (len && len < MAX_PATH) { HKEY tmpkey; - WCHAR *p, *appname = buffer; - if ((p = strrchrW( appname, '/' ))) appname = p + 1; - if ((p = strrchrW( appname, '\\' ))) appname = p + 1; - CharLowerW(appname); - len = WideCharToMultiByte( CP_UNIXCP, 0, appname, -1, NULL, 0, NULL, NULL ); - if ((process_name = malloc( len ))) - WideCharToMultiByte( CP_UNIXCP, 0, appname, -1, process_name, len, NULL, NULL ); - strcatW( appname, x11driverW ); + int i; + for (i = 0; appname[i]; i++) buffer[i] = RtlDowncaseUnicodeChar( appname[i] ); + buffer[i] = 0; + appname = buffer; + if ((process_name = malloc( len * 3 + 1 ))) + ntdll_wcstoumbs( appname, len + 1, process_name, len * 3 + 1, FALSE ); + memcpy( appname + i, x11driverW, sizeof(x11driverW) ); /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\X11 Driver */ if ((tmpkey = open_hkcu_key( "Software\\Wine\\AppDefaults" ))) {

1 0

Zebediah Figura : server: Clear only returned events in IOCTL_AFD_GET_EVENTS.
by Alexandre Julliard May 4, 2022

May 4, 2022

Module: wine Branch: master Commit: 683d46a2cdf08d999f07d13e048ac6bca98b46fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=683d46a2cdf08d999f07d13e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 3 17:56:27 2022 -0500 server: Clear only returned events in IOCTL_AFD_GET_EVENTS. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 6 +++--- server/sock.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c88016c5404..7bc2b2474ca 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5659,7 +5659,7 @@ static void test_connect_events(struct event_test_ctx *ctx) if (ctx->is_message) check_events(ctx, FD_WRITE, 0, 200); else - check_events_todo(ctx, FD_CONNECT, 0, 200); + check_events(ctx, FD_CONNECT, 0, 200); closesocket(client); closesocket(server); @@ -5896,7 +5896,7 @@ static void test_read_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 0); select_events(ctx, server, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); - check_events_todo_event(ctx, FD_READ, FD_WRITE, 200); + check_events(ctx, FD_READ, FD_WRITE, 200); check_events(ctx, 0, 0, 0); ret = sync_recv(server, buffer, 5, 0); @@ -6111,7 +6111,7 @@ static void test_close_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 200); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); - check_events_todo_event(ctx, FD_CLOSE, 0, 200); + check_events(ctx, FD_CLOSE, 0, 200); closesocket(server); } diff --git a/server/sock.c b/server/sock.c index 9f9b9bdfcd9..29dd1ca7fa8 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2516,7 +2516,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) for (i = 0; i < ARRAY_SIZE( params.status ); ++i) params.status[i] = sock_get_ntstatus( sock->errors[i] ); - sock->pending_events = 0; + sock->pending_events &= ~sock->mask; sock_reselect( sock ); set_reply_data( &params, sizeof(params) );

1 0

Brendan Shanks : include: Add WINE_ALLOC_SIZE attribute to heap_calloc().
by Alexandre Julliard May 4, 2022

May 4, 2022

Module: wine Branch: master Commit: 1c4131ba788579f511318270410734d73575caa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c4131ba788579f511318270… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Apr 28 21:13:16 2022 -0700 include: Add WINE_ALLOC_SIZE attribute to heap_calloc(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/heap.h | 2 +- include/winnt.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wine/heap.h b/include/wine/heap.h index 97d3a5662be..fb687c92393 100644 --- a/include/wine/heap.h +++ b/include/wine/heap.h @@ -46,7 +46,7 @@ static inline void heap_free(void *mem) HeapFree(GetProcessHeap(), 0, mem); } -static inline void *heap_calloc(SIZE_T count, SIZE_T size) +static inline void * __WINE_ALLOC_SIZE(1,2) heap_calloc(SIZE_T count, SIZE_T size) { SIZE_T len = count * size; diff --git a/include/winnt.h b/include/winnt.h index e853ddbc7ae..79df4259f59 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -199,9 +199,9 @@ extern "C" { #endif #if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) -#define __WINE_ALLOC_SIZE(x) __attribute__((__alloc_size__(x))) +#define __WINE_ALLOC_SIZE(...) __attribute__((__alloc_size__(__VA_ARGS__))) #else -#define __WINE_ALLOC_SIZE(x) +#define __WINE_ALLOC_SIZE(...) #endif /* Anonymous union/struct handling */

1 0

Zebediah Figura : server: Send AFD_POLL_READ messages before AFD_POLL_WRITE.
by Alexandre Julliard May 4, 2022

May 4, 2022

Module: wine Branch: master Commit: ad078be430615b9ae6911b61d6fdc8e1bf5bf6ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad078be430615b9ae6911b61… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 3 17:56:26 2022 -0500 server: Send AFD_POLL_READ messages before AFD_POLL_WRITE. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f85b79611bd..c88016c5404 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5896,7 +5896,7 @@ static void test_read_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 0); select_events(ctx, server, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); - check_events_todo(ctx, FD_READ, FD_WRITE, 200); + check_events_todo_event(ctx, FD_READ, FD_WRITE, 200); check_events(ctx, 0, 0, 0); ret = sync_recv(server, buffer, 5, 0); diff --git a/server/sock.c b/server/sock.c index a9d8d2ca2bd..9f9b9bdfcd9 100644 --- a/server/sock.c +++ b/server/sock.c @@ -505,8 +505,8 @@ static const enum afd_poll_bit event_bitorder[] = AFD_POLL_BIT_CONNECT_ERR, AFD_POLL_BIT_ACCEPT, AFD_POLL_BIT_OOB, - AFD_POLL_BIT_WRITE, AFD_POLL_BIT_READ, + AFD_POLL_BIT_WRITE, AFD_POLL_BIT_RESET, AFD_POLL_BIT_HUP, AFD_POLL_BIT_CLOSE,

1 0

Zebediah Figura : ws2_32/tests: Test that sockets returned from accept() don't return FD_CONNECT from WSAEnumNetworkEvents().
by Alexandre Julliard May 4, 2022

May 4, 2022

Module: wine Branch: master Commit: a321a6721704183ff4495bb01545a3068c68f514 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a321a6721704183ff4495bb0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 3 17:56:24 2022 -0500 ws2_32/tests: Test that sockets returned from accept() don't return FD_CONNECT from WSAEnumNetworkEvents(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 12 ++++++++++++ dlls/ws2_32/tests/sock.c | 3 +++ 2 files changed, 15 insertions(+) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 43c401c940a..184c7e0725a 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1819,6 +1819,18 @@ static void test_get_events(void) ok(!ret, "got error %lu\n", GetLastError()); ok(!events.lNetworkEvents, "got events %#lx\n", events.lNetworkEvents); + ret = WSAEventSelect(server, event, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + ok(!ret, "got error %lu\n", GetLastError()); + + memset(&params, 0xcc, sizeof(params)); + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)server, NULL, NULL, NULL, &io, + IOCTL_AFD_GET_EVENTS, NULL, 0, &params, sizeof(params)); + ok(!ret, "got %#x\n", ret); + ok(params.flags == AFD_POLL_WRITE, "got flags %#x\n", params.flags); + for (i = 0; i < ARRAY_SIZE(params.status); ++i) + ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]); + closesocket(client); closesocket(server); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f17b4bb0ffa..5b3cc75f18c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5599,6 +5599,9 @@ static void test_connect_events(struct event_test_ctx *ctx) server = accept(listener, NULL, NULL); ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + select_events(ctx, server, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + check_events(ctx, FD_WRITE, 0, 200); + closesocket(client); closesocket(server);

1 0

Alistair Leslie-Hughes : msado15: Implement _Recordset get_EditMode.
by Alexandre Julliard May 4, 2022

May 4, 2022

Module: wine Branch: master Commit: d106b3c450cfa4af2a9fbcca4c640536ebd34bc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d106b3c450cfa4af2a9fbcca… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 3 11:11:53 2022 +1000 msado15: Implement _Recordset get_EditMode. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 12 ++++++++++-- dlls/msado15/tests/msado15.c | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 766c17598ce..6d3b3ca352f 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -48,6 +48,7 @@ struct recordset CursorLocationEnum cursor_location; CursorTypeEnum cursor_type; IRowset *row_set; + EditModeEnum editmode; }; struct fields @@ -1575,8 +1576,14 @@ static HRESULT WINAPI recordset_put_AbsolutePage( _Recordset *iface, PositionEnu static HRESULT WINAPI recordset_get_EditMode( _Recordset *iface, EditModeEnum *mode ) { - FIXME( "%p, %p\n", iface, mode ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %p\n", iface, mode ); + + if (recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (recordset->index < 0) return MAKE_ADO_HRESULT( adErrNoCurrentRecord ); + + *mode = recordset->editmode; + return S_OK; } static HRESULT WINAPI recordset_get_Filter( _Recordset *iface, VARIANT *criteria ) @@ -2123,6 +2130,7 @@ HRESULT Recordset_create( void **obj ) recordset->cursor_location = adUseServer; recordset->cursor_type = adOpenForwardOnly; recordset->row_set = NULL; + recordset->editmode = adEditNone; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 94e9ae4fa09..b39adf58b22 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -60,6 +60,7 @@ static void test_Recordset(void) BSTR name; HRESULT hr; VARIANT bookmark; + EditModeEnum editmode; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08lx\n", hr ); @@ -110,6 +111,10 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08lx\n", hr ); ok( cursor == adOpenForwardOnly, "got %d\n", cursor ); + editmode = -1; + hr = _Recordset_get_EditMode( recordset, &editmode ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr ); + VariantInit( &bookmark ); hr = _Recordset_get_Bookmark( recordset, &bookmark ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr ); @@ -197,6 +202,10 @@ static void test_Recordset(void) ok( is_eof( recordset ), "not eof\n" ); ok( is_bof( recordset ), "not bof\n" ); + editmode = -1; + hr = _Recordset_get_EditMode( recordset, &editmode ); + ok( hr == MAKE_ADO_HRESULT( adErrNoCurrentRecord ), "got %08lx\n", hr ); + hr = _Recordset_Open( recordset, missing, missing, adOpenStatic, adLockBatchOptimistic, adCmdUnspecified ); ok( hr == MAKE_ADO_HRESULT( adErrObjectOpen ), "got %08lx\n", hr ); @@ -223,6 +232,11 @@ static void test_Recordset(void) ok( !is_eof( recordset ), "eof\n" ); ok( !is_bof( recordset ), "bof\n" ); + editmode = -1; + hr = _Recordset_get_EditMode( recordset, &editmode ); + ok( hr == S_OK, "got %08lx\n", hr ); + todo_wine ok( editmode == adEditAdd, "got %d\n", editmode ); + rec_count = -1; hr = _Recordset_get_RecordCount( recordset, &rec_count ); ok( hr == S_OK, "got %08lx\n", hr );

1 0

Jacek Caban : winex11: Call create_tooltip from WM_CREATE handler.
by Alexandre Julliard May 4, 2022

May 4, 2022

Module: wine Branch: master Commit: 17afa305777a2cced2fa77f937ecb2216fda3e3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=17afa305777a2cced2fa77f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 29 15:53:02 2022 +0200 winex11: Call create_tooltip from WM_CREATE handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/systray.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index c6d12b21c28..45ad0617246 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -322,14 +322,13 @@ static void add_to_standalone_tray( struct tray_icon *icon ) icon->display = nb_displayed; pos = get_icon_pos( icon ); - icon->window = CreateWindowW( icon_classname, NULL, WS_CHILD | WS_VISIBLE, - pos.x, pos.y, icon_cx, icon_cy, standalone_tray, NULL, NULL, icon ); + CreateWindowW( icon_classname, NULL, WS_CHILD | WS_VISIBLE, + pos.x, pos.y, icon_cx, icon_cy, standalone_tray, NULL, NULL, icon ); if (!icon->window) { icon->display = -1; return; } - create_tooltip( icon ); nb_displayed++; size = get_window_size(); @@ -474,6 +473,11 @@ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR switch (msg) { + case WM_CREATE: + icon->window = hwnd; + create_tooltip( icon ); + break; + case WM_SIZE: if (icon->window && icon->layered) repaint_tray_icon( icon ); break; @@ -643,10 +647,10 @@ static void dock_systray_icon( Display *display, struct tray_icon *icon, Window get_systray_visual_info( display, systray_window, &visual ); icon->layered = (visual.depth == 32); - icon->window = CreateWindowExW( icon->layered ? WS_EX_LAYERED : 0, - icon_classname, NULL, WS_CLIPSIBLINGS | WS_POPUP, - CW_USEDEFAULT, CW_USEDEFAULT, icon_cx, icon_cy, - NULL, NULL, NULL, icon ); + CreateWindowExW( icon->layered ? WS_EX_LAYERED : 0, + icon_classname, NULL, WS_CLIPSIBLINGS | WS_POPUP, + CW_USEDEFAULT, CW_USEDEFAULT, icon_cx, icon_cy, + NULL, NULL, NULL, icon ); if (!(data = get_win_data( icon->window ))) return; if (icon->layered) set_window_visual( data, &visual, TRUE ); @@ -654,7 +658,6 @@ static void dock_systray_icon( Display *display, struct tray_icon *icon, Window window = data->whole_window; release_win_data( data ); - create_tooltip( icon ); ShowWindow( icon->window, SW_SHOWNA ); TRACE( "icon window %p/%lx\n", icon->window, window );

1 0

Eric Pouech : dbghelp: Introduce symt_find_symbol_at().
by Alexandre Julliard May 4, 2022

May 4, 2022

Module: wine Branch: master Commit: 99c78180979b32678bbd9395d00739108d73a87a URL: https://source.winehq.org/git/wine.git/?a=commit;h=99c78180979b32678bbd9395… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Apr 29 11:08:31 2022 +0200 dbghelp: Introduce symt_find_symbol_at(). To be used in place of symt_find_nearest(). symt_find_symbol_at() ensures that the address passed is within the boundaries of the returned symbol (while find_nearest() doesn't). This fixes erroneous backtraces in debugger like: $ ./wine winedbg notepad WineDbg starting on pid 0104 RtlDefaultNpAcl () at Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731 0x00000170054805 ntdll+0x54805 [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731]: ret 1731 } Wine-dbg>bt Backtrace: =>0 0x00000170054805 RtlDefaultNpAcl+0x2d5(pAcl=<internal error>) [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731] in ntdll (0x000001700701a4) 1 0x0000017002d6c4 __wine_pop_frame(pAcl=<internal error>) [Z:\home\eric\work\wine\include\wine\exception.h:273] in ntdll (0x000001700701a4) 2 0x0000017002d6c4 process_breakpoint+0x84() [Z:\home\eric\work\wine\dlls\ntdll\loader.c:3912] in ntdll (0x000001700701a4) 3 0x000001700354c9 LdrInitializeThunk+0x509(context=<register R13 not accessible in this frame>, unknown2=<internal error>, unknown3=<internal error>, unknown4=<internal error>) [Z:\home\eric\work\wine\dlls\ntdll\loader.c:4200] in ntdll (0x000001700701a4) where RtlDefaultNpAcl() has nothing to do here (it's the symbol below RIP and we don't have a symbol with debug information for that address). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 2 +- dlls/dbghelp/dbghelp_private.h | 2 ++ dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/msc.c | 8 ++++---- dlls/dbghelp/symbol.c | 24 +++++++++++++++++++----- 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 6d775b633f8..c154d8d9713 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -672,7 +672,7 @@ BOOL WINAPI SymSetScopeFromAddr(HANDLE hProcess, ULONG64 addr) if (!module_init_pair(&pair, hProcess, addr)) return FALSE; pair.pcs->localscope_pc = addr; - if ((sym = symt_find_nearest(pair.effective, addr)) != NULL && sym->symt.tag == SymTagFunction) + if ((sym = symt_find_symbol_at(pair.effective, addr)) != NULL && sym->symt.tag == SymTagFunction) pair.pcs->localscope_symt = &sym->symt; else pair.pcs->localscope_symt = NULL; diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index c9de237c4b9..507724414a5 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -811,6 +811,8 @@ extern void copy_symbolW(SYMBOL_INFOW* siw, const SYMBOL_INFO* si) DECLS extern void symbol_setname(SYMBOL_INFO* si, const char* name) DECLSPEC_HIDDEN; extern struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) DECLSPEC_HIDDEN; +extern struct symt_ht* + symt_find_symbol_at(struct module* module, DWORD_PTR addr) DECLSPEC_HIDDEN; extern struct symt_module* symt_new_module(struct module* module) DECLSPEC_HIDDEN; extern struct symt_compiland* diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 0076b19e5cb..b81f83ac90b 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2584,7 +2584,7 @@ static void dwarf2_set_line_number(struct module* module, ULONG_PTR address, TRACE("%s %Ix %s %u\n", debugstr_w(module->modulename), address, debugstr_a(source_get(module, *psrc)), line); - symt = symt_find_nearest(module, address); + symt = symt_find_symbol_at(module, address); if (symt_check_tag(&symt->symt, SymTagFunction)) { func = (struct symt_function*)symt; diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 28b6bd12f2e..22ab1ecb230 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1461,7 +1461,7 @@ static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const B */ if (!func || addr >= func->address + func->size) { - func = (struct symt_function*)symt_find_nearest(msc_dbg->module, addr); + func = (struct symt_function*)symt_find_symbol_at(msc_dbg->module, addr); /* FIXME: at least labels support line numbers */ if (!symt_check_tag(&func->symt, SymTagFunction) && !symt_check_tag(&func->symt, SymTagInlineSite)) { @@ -1534,7 +1534,7 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const lines = CV_RECORD_AFTER(files_hdr); for (i = 0; i < files_hdr->nLines; i++) { - func = (struct symt_function*)symt_find_nearest(msc_dbg->module, lineblk_base + lines[i].offset); + func = (struct symt_function*)symt_find_symbol_at(msc_dbg->module, lineblk_base + lines[i].offset); /* FIXME: at least labels support line numbers */ if (!symt_check_tag(&func->symt, SymTagFunction) && !symt_check_tag(&func->symt, SymTagInlineSite)) { @@ -1619,7 +1619,7 @@ static inline void codeview_add_variable(const struct msc_debug_info* msc_dbg, loc.kind = in_tls ? loc_tlsrel : loc_absolute; loc.reg = 0; loc.offset = in_tls ? offset : codeview_get_address(msc_dbg, segment, offset); - if (force || in_tls || !symt_find_nearest(msc_dbg->module, loc.offset)) + if (force || in_tls || !symt_find_symbol_at(msc_dbg->module, loc.offset)) { symt_new_global_variable(msc_dbg->module, compiland, name, is_local, loc, 0, @@ -2501,7 +2501,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, if (!top_func) { ULONG_PTR parent_addr = codeview_get_address(msc_dbg, sym->sepcode_v3.sectParent, sym->sepcode_v3.offParent); - struct symt_ht* parent = symt_find_nearest(msc_dbg->module, parent_addr); + struct symt_ht* parent = symt_find_symbol_at(msc_dbg->module, parent_addr); if (symt_check_tag(&parent->symt, SymTagFunction)) { struct symt_function* pfunc = (struct symt_function*)parent; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 64f376b42f0..a81feb56b8d 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1027,7 +1027,7 @@ static void symt_get_length(struct module* module, const struct symt* symt, ULON if (symt_get_info(module, symt, TI_GET_TYPE, &type_index) && symt_get_info(module, symt_index2ptr(module, type_index), TI_GET_LENGTH, size)) return; - *size = 0x1000; /* arbitrary value */ + *size = 1; /* no size info */ } /* needed by symt_find_nearest */ @@ -1104,6 +1104,20 @@ struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) return module->addr_sorttab[low]; } +struct symt_ht* symt_find_symbol_at(struct module* module, DWORD_PTR addr) +{ + struct symt_ht* nearest = symt_find_nearest(module, addr); + if (nearest) + { + ULONG64 symaddr, symsize; + symt_get_address(&nearest->symt, &symaddr); + symt_get_length(module, &nearest->symt, &symsize); + if (addr < symaddr || addr >= symaddr + symsize) + nearest = NULL; + } + return nearest; +} + static BOOL symt_enum_locals_helper(struct module_pair* pair, const WCHAR* match, const struct sym_enum* se, struct symt_function* func, const struct vector* v) @@ -1262,7 +1276,7 @@ struct symt* symt_get_upper_inlined(struct symt_inlinesite* inlined) /* lookup in module for an inline site (from addr and inline_ctx) */ struct symt_inlinesite* symt_find_inlined_site(struct module* module, DWORD64 addr, DWORD inline_ctx) { - struct symt_ht* symt = symt_find_nearest(module, addr); + struct symt_ht* symt = symt_find_symbol_at(module, addr); if (symt_check_tag(&symt->symt, SymTagFunction)) { @@ -1284,7 +1298,7 @@ DWORD symt_get_inlinesite_depth(HANDLE hProcess, DWORD64 addr) if (module_init_pair(&pair, hProcess, addr)) { - struct symt_ht* symt = symt_find_nearest(pair.effective, addr); + struct symt_ht* symt = symt_find_symbol_at(pair.effective, addr); if (symt_check_tag(&symt->symt, SymTagFunction)) { struct symt_inlinesite* inlined = symt_find_lowest_inlined((struct symt_function*)symt, addr); @@ -1518,7 +1532,7 @@ BOOL WINAPI SymFromAddr(HANDLE hProcess, DWORD64 Address, struct symt_ht* sym; if (!module_init_pair(&pair, hProcess, Address)) return FALSE; - if ((sym = symt_find_nearest(pair.effective, Address)) == NULL) return FALSE; + if ((sym = symt_find_symbol_at(pair.effective, Address)) == NULL) return FALSE; symt_fill_sym_info(&pair, NULL, &sym->symt, Symbol); if (Displacement) @@ -1905,7 +1919,7 @@ static BOOL get_line_from_addr(HANDLE hProcess, DWORD64 addr, struct symt_ht* symt; if (!module_init_pair(&pair, hProcess, addr)) return FALSE; - if ((symt = symt_find_nearest(pair.effective, addr)) == NULL) return FALSE; + if ((symt = symt_find_symbol_at(pair.effective, addr)) == NULL) return FALSE; if (symt->symt.tag != SymTagFunction && symt->symt.tag != SymTagInlineSite) return FALSE; return get_line_from_function(&pair, (struct symt_function*)symt, addr, pdwDisplacement, intl);

1 0

Zebediah Figura : ws2_32/tests: Add more tests for selecting for events after they are signaled.
by Alexandre Julliard May 4, 2022

May 4, 2022

Module: wine Branch: master Commit: 934023d15ef05afdf3e800a032ef4edaf8f9f605 URL: https://source.winehq.org/git/wine.git/?a=commit;h=934023d15ef05afdf3e800a0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 3 17:56:25 2022 -0500 ws2_32/tests: Add more tests for selecting for events after they are signaled. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5b3cc75f18c..f85b79611bd 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -219,6 +219,17 @@ static void check_poll_(int line, SOCKET s, short mask, short expect, BOOL todo) todo_wine_if (todo) ok_(__FILE__, line)(pollfd.revents == expect, "got wrong events %#x\n", pollfd.revents); } +static DWORD WINAPI poll_async_thread(void *arg) +{ + WSAPOLLFD *pollfd = arg; + int ret; + + ret = pWSAPoll(pollfd, 1, 500); + ok(ret == (pollfd->revents ? 1 : 0), "WSAPoll() returned %d\n", ret); + + return 0; +} + static void set_so_opentype ( BOOL overlapped ) { int optval = !overlapped, newval, len = sizeof (int); @@ -5740,6 +5751,26 @@ static void test_write_events(struct event_test_ctx *ctx) closesocket(server); closesocket(client); + /* Select on a subset not containing FD_WRITE first. */ + + tcp_socketpair(&client, &server); + set_blocking(client, FALSE); + + ret = send(client, "data", 5, 0); + ok(ret == 5, "got %d\n", ret); + + select_events(ctx, client, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ); + if (!ctx->is_message) + check_events(ctx, FD_CONNECT, 0, 200); + check_events(ctx, 0, 0, 0); + + select_events(ctx, client, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + check_events(ctx, FD_WRITE, 0, 200); + check_events(ctx, 0, 0, 0); + + closesocket(client); + closesocket(server); + /* Despite the documentation, and unlike FD_ACCEPT and FD_RECV, calling * send() doesn't clear the FD_WRITE bit. */ @@ -5763,9 +5794,11 @@ static void test_read_events(struct event_test_ctx *ctx) OVERLAPPED overlapped = {0}; SOCKET server, client; DWORD size, flags = 0; + WSAPOLLFD pollfd; unsigned int i; char buffer[8]; WSABUF wsabuf; + HANDLE thread; int ret; overlapped.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); @@ -5844,6 +5877,31 @@ static void test_read_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 200); + /* Send data while we're polling for data but not selecting for FD_READ. */ + + pollfd.fd = server; + pollfd.events = POLLIN; + thread = CreateThread(NULL, 0, poll_async_thread, &pollfd, 0, NULL); + + select_events(ctx, server, 0); + ret = send(client, "data", 5, 0); + ok(ret == 5, "got %d\n", ret); + + ret = WaitForSingleObject(thread, 1000); + ok(!ret, "wait timed out\n"); + CloseHandle(thread); + + /* And check events, to show that WSAEnumNetworkEvents() should not clear + * events we are not currently selecting for. */ + check_events(ctx, 0, 0, 0); + + select_events(ctx, server, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + check_events_todo(ctx, FD_READ, FD_WRITE, 200); + check_events(ctx, 0, 0, 0); + + ret = sync_recv(server, buffer, 5, 0); + ok(ret == 5, "got %d\n", ret); + /* Send data while there is a pending WSARecv(). */ select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ);

1 0