June 2023 - Wine-Commits - list.winehq.org

Andrey Gusev : include: Add flags in D3D11_RESOURCE_MISC_FLAG.
by Alexandre Julliard June 19, 2023

June 19, 2023

Module: wine Branch: master Commit: a5ea2c57c9acabbd368a2d0f78c9d2b3270c7edc URL: https://gitlab.winehq.org/wine/wine/-/commit/a5ea2c57c9acabbd368a2d0f78c9d2… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Jun 17 15:05:28 2023 +0300 include: Add flags in D3D11_RESOURCE_MISC_FLAG. --- include/d3d11.idl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/d3d11.idl b/include/d3d11.idl index 3aff03448c4..7a2a84a8b77 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -1036,7 +1036,9 @@ typedef enum D3D11_RESOURCE_MISC_FLAG D3D11_RESOURCE_MISC_GUARDED = 0x00008000L, D3D11_RESOURCE_MISC_TILE_POOL = 0x00020000L, D3D11_RESOURCE_MISC_TILED = 0x00040000L, - D3D11_RESOURCE_MISC_HW_PROTECTED = 0x00080000L + D3D11_RESOURCE_MISC_HW_PROTECTED = 0x00080000L, + D3D11_RESOURCE_MISC_SHARED_DISPLAYABLE = 0x00100000L, + D3D11_RESOURCE_MISC_SHARED_EXCLUSIVE_WRITER = 0x00200000L } D3D11_RESOURCE_MISC_FLAG; typedef struct D3D11_QUERY_DESC

1 0

Zebediah Figura : xaudio2/tests: Fix the IID_IXAudio28 declaration.
by Alexandre Julliard June 19, 2023

June 19, 2023

Module: wine Branch: master Commit: e8b0e7c1fcf090ba80c543f68b0bdae185316327 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8b0e7c1fcf090ba80c543f68b0bda… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 16 15:13:14 2023 -0500 xaudio2/tests: Fix the IID_IXAudio28 declaration. This was accidentally copied from the 2.9 version instead in 14c44d0b0. --- dlls/xaudio2_7/tests/xaudio2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index f72350494a5..759bf5b00af 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -38,7 +38,7 @@ #include "ksmedia.h" static const GUID IID_IXAudio27 = {0x8bcf1f58, 0x9fe7, 0x4583, {0x8a, 0xc6, 0xe2, 0xad, 0xc4, 0x65, 0xc8, 0xbb}}; -static const GUID IID_IXAudio28 = {0x2b02e3cf, 0x2e0b, 0x4ec3, {0xbe, 0x45, 0x1b, 0x2a, 0x3f, 0xe7, 0x21, 0x0d}}; +static const GUID IID_IXAudio28 = {0x60d8dac8, 0x5aa1, 0x4e8e, {0xb5, 0x97, 0x2f, 0x5e, 0x28, 0x83, 0xd4, 0x84}}; static const GUID CLSID_AudioVolumeMeter20 = {0xc0c56f46, 0x29b1, 0x44e9, {0x99, 0x39, 0xa3, 0x2c, 0xe8, 0x68, 0x67, 0xe2}}; static const GUID CLSID_AudioVolumeMeter21 = {0xc1e3f122, 0xa2ea, 0x442c, {0x85, 0x4f, 0x20, 0xd9, 0x8f, 0x83, 0x57, 0xa1}}; @@ -1214,8 +1214,7 @@ START_TEST(xaudio2) if (hr == S_OK) IXAudio2_Release(audio2); hr = IXAudio2_QueryInterface(audio, &IID_IXAudio28, (void **)&audio2); - todo_wine_if (!xaudio27) - ok(hr == (xaudio27 ? E_NOINTERFACE : S_OK), "Got hr %#lx.\n", hr); + ok(hr == (xaudio27 ? E_NOINTERFACE : S_OK), "Got hr %#lx.\n", hr); if (hr == S_OK) IXAudio2_Release(audio2);

1 0

Conor McCarthy : vkd3d-shader/spirv: Take ownership of the shader signatures in spirv_compiler_create().
by Alexandre Julliard June 19, 2023

June 19, 2023

Module: vkd3d Branch: master Commit: bce2a898b3a61e1bbff97d047f9edb56ed46bd49 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bce2a898b3a61e1bbff97d047f9ed… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jun 16 21:44:50 2023 +1000 vkd3d-shader/spirv: Take ownership of the shader signatures in spirv_compiler_create(). Fixes leakage of the replacement elements in shader_signature_merge(). --- libs/vkd3d-shader/ir.c | 3 +-- libs/vkd3d-shader/spirv.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index d542fbb0..9eefb82c 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -715,8 +715,7 @@ static bool shader_signature_merge(struct shader_signature *s, uint8_t range_map } } element_count = new_count; - /* Signature 's' is a copy of the original signature struct, so we can replace - * the 'elements' pointer without freeing it. */ + vkd3d_free(s->elements); s->elements = elements; s->element_count = element_count; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a6700e66..080b2204 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2324,11 +2324,15 @@ static void spirv_compiler_destroy(struct spirv_compiler *compiler) vkd3d_string_buffer_cache_cleanup(&compiler->string_buffers); + shader_signature_cleanup(&compiler->input_signature); + shader_signature_cleanup(&compiler->output_signature); + shader_signature_cleanup(&compiler->patch_constant_signature); + vkd3d_free(compiler); } static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_version *shader_version, - const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info, struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_location *location) { @@ -2428,6 +2432,9 @@ static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_ve compiler->input_signature = shader_desc->input_signature; compiler->output_signature = shader_desc->output_signature; compiler->patch_constant_signature = shader_desc->patch_constant_signature; + memset(&shader_desc->input_signature, 0, sizeof(shader_desc->input_signature)); + memset(&shader_desc->output_signature, 0, sizeof(shader_desc->output_signature)); + memset(&shader_desc->patch_constant_signature, 0, sizeof(shader_desc->patch_constant_signature)); if ((shader_interface = vkd3d_find_struct(compile_info->next, INTERFACE_INFO))) { @@ -9451,7 +9458,7 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, && (result = instruction_array_flatten_hull_shader_phases(&instructions)) >= 0) { result = instruction_array_normalise_hull_shader_control_point_io(&instructions, - &parser->shader_desc.input_signature); + &compiler->input_signature); } if (result >= 0) result = instruction_array_normalise_io_registers(&instructions, parser->shader_version.type,

1 0

Rémi Bernon : server: Pass set_cursor flags in WM_WINE_CLIPCURSOR wparam.
by Alexandre Julliard June 16, 2023

June 16, 2023

Module: wine Branch: master Commit: ab9b99c4a51afa36fdbec950aee1abbdc2fe28a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab9b99c4a51afa36fdbec950aee1ab… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 16 08:54:43 2023 +0200 server: Pass set_cursor flags in WM_WINE_CLIPCURSOR wparam. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55047 --- dlls/win32u/input.c | 6 +++--- dlls/win32u/message.c | 4 +++- dlls/win32u/sysparams.c | 2 +- dlls/win32u/win32u_private.h | 2 +- server/queue.c | 12 ++++++------ server/user.h | 3 ++- server/window.c | 2 +- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 2311fb359af..8010183d97c 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2544,13 +2544,13 @@ BOOL get_clip_cursor( RECT *rect ) return ret; } -BOOL process_wine_clipcursor( HWND hwnd, BOOL empty, BOOL reset ) +BOOL process_wine_clipcursor( HWND hwnd, UINT flags, BOOL reset ) { struct user_thread_info *thread_info = get_user_thread_info(); RECT rect, virtual_rect = NtUserGetVirtualScreenRect(); - BOOL was_clipping; + BOOL was_clipping, empty = !!(flags & SET_CURSOR_NOCLIP); - TRACE( "hwnd %p, empty %u, reset %u\n", hwnd, empty, reset ); + TRACE( "hwnd %p, flags %#x, reset %u\n", hwnd, flags, reset ); if ((was_clipping = thread_info->clipping_cursor)) InterlockedDecrement( &clipping_cursor ); thread_info->clipping_cursor = FALSE; diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index cb44e0037d9..687caef9bfc 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -1272,7 +1272,9 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR return call_current_hook( h_extra->handle, HC_ACTION, wparam, h_extra->lparam ); } case WM_WINE_CLIPCURSOR: - if (wparam && lparam) return clip_fullscreen_window( hwnd, FALSE ); + /* non-hardware message, posted on display mode change to trigger fullscreen + clipping or to the desktop window to forcefully release the cursor grabs */ + if (!wparam) return clip_fullscreen_window( hwnd, FALSE ); return process_wine_clipcursor( hwnd, wparam, lparam ); case WM_WINE_SETCURSOR: FIXME( "Unexpected non-hardware WM_WINE_SETCURSOR message\n" ); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 4f69cac7040..59f624214b7 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2929,7 +2929,7 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod MAKELPARAM( current_mode.dmPelsWidth, current_mode.dmPelsHeight ), SMTO_ABORTIFHUNG, 2000, FALSE ); /* post clip_fullscreen_window request to the foreground window */ - NtUserPostMessage( NtUserGetForegroundWindow(), WM_WINE_CLIPCURSOR, TRUE, TRUE ); + NtUserPostMessage( NtUserGetForegroundWindow(), WM_WINE_CLIPCURSOR, 0, 0 ); } return ret; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 3bd41a4ffa8..ee117ed2637 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -104,7 +104,7 @@ extern BOOL set_foreground_window( HWND hwnd, BOOL mouse ) DECLSPEC_HIDDEN; extern void toggle_caret( HWND hwnd ) DECLSPEC_HIDDEN; extern void update_mouse_tracking_info( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL get_clip_cursor( RECT *rect ) DECLSPEC_HIDDEN; -extern BOOL process_wine_clipcursor( HWND hwnd, BOOL empty, BOOL reset ) DECLSPEC_HIDDEN; +extern BOOL process_wine_clipcursor( HWND hwnd, UINT flags, BOOL reset ) DECLSPEC_HIDDEN; extern BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) DECLSPEC_HIDDEN; /* menu.c */ diff --git a/server/queue.c b/server/queue.c index ec8ddcbee5c..fcc946ff0cb 100644 --- a/server/queue.c +++ b/server/queue.c @@ -508,7 +508,7 @@ static void get_message_defaults( struct msg_queue *queue, int *x, int *y, unsig } /* set the cursor clip rectangle */ -void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, int reset ) +void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, unsigned int flags, int reset ) { rectangle_t top_rect; int x, y; @@ -532,17 +532,17 @@ void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, int r if (x != desktop->cursor.x || y != desktop->cursor.y) set_cursor_pos( desktop, x, y ); /* request clip cursor rectangle reset to the desktop thread */ - if (reset) post_desktop_message( desktop, WM_WINE_CLIPCURSOR, TRUE, FALSE ); + if (reset) post_desktop_message( desktop, WM_WINE_CLIPCURSOR, flags, FALSE ); /* notify foreground thread, of reset, or to apply new cursor clipping rect */ - queue_cursor_message( desktop, 0, WM_WINE_CLIPCURSOR, rect == NULL, reset ); + queue_cursor_message( desktop, 0, WM_WINE_CLIPCURSOR, flags, reset ); } /* change the foreground input and reset the cursor clip rect */ static void set_foreground_input( struct desktop *desktop, struct thread_input *input ) { if (desktop->foreground_input == input) return; - set_clip_rectangle( desktop, NULL, 1 ); + set_clip_rectangle( desktop, NULL, SET_CURSOR_NOCLIP, 1 ); desktop->foreground_input = input; } @@ -3383,8 +3383,8 @@ DECL_HANDLER(set_cursor) input->cursor_count += req->show_count; } if (req->flags & SET_CURSOR_POS) set_cursor_pos( desktop, req->x, req->y ); - if (req->flags & SET_CURSOR_CLIP) set_clip_rectangle( desktop, &req->clip, 0 ); - if (req->flags & SET_CURSOR_NOCLIP) set_clip_rectangle( desktop, NULL, 0 ); + if (req->flags & SET_CURSOR_CLIP) set_clip_rectangle( desktop, &req->clip, req->flags, 0 ); + if (req->flags & SET_CURSOR_NOCLIP) set_clip_rectangle( desktop, NULL, SET_CURSOR_NOCLIP, 0 ); if (req->flags & (SET_CURSOR_HANDLE | SET_CURSOR_COUNT)) { diff --git a/server/user.h b/server/user.h index f67e710938f..b6f47bcac1c 100644 --- a/server/user.h +++ b/server/user.h @@ -110,7 +110,8 @@ extern void queue_cleanup_window( struct thread *thread, user_handle_t win ); extern int init_thread_queue( struct thread *thread ); extern int attach_thread_input( struct thread *thread_from, struct thread *thread_to ); extern void detach_thread_input( struct thread *thread_from ); -extern void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, int reset ); +extern void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, + unsigned int flags, int reset ); extern void post_message( user_handle_t win, unsigned int message, lparam_t wparam, lparam_t lparam ); extern void send_notify_message( user_handle_t win, unsigned int message, diff --git a/server/window.c b/server/window.c index 9db8ccbe27e..328e3dfc64c 100644 --- a/server/window.c +++ b/server/window.c @@ -1829,7 +1829,7 @@ static void set_window_pos( struct window *win, struct window *previous, } /* reset cursor clip rectangle when the desktop changes size */ - if (win == win->desktop->top_window) set_clip_rectangle( win->desktop, NULL, 1 ); + if (win == win->desktop->top_window) set_clip_rectangle( win->desktop, NULL, SET_CURSOR_NOCLIP, 1 ); /* if the window is not visible, everything is easy */ if (!visible) return;

1 0

Rémi Bernon : win32u: Use a specific flag instead of shrinking the clip rect.
by Alexandre Julliard June 16, 2023

June 16, 2023

Module: wine Branch: master Commit: 8d2de5dbe1f317ba8f9f7e2f88fb3a0629e5e174 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d2de5dbe1f317ba8f9f7e2f88fb3a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 16 08:58:48 2023 +0200 win32u: Use a specific flag instead of shrinking the clip rect. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55047 --- dlls/win32u/input.c | 22 ++++++++++++++++------ dlls/win32u/message.c | 2 +- dlls/win32u/sysparams.c | 2 +- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 8010183d97c..1dcc439e560 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2470,9 +2470,10 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) { struct user_thread_info *thread_info = get_user_thread_info(); MONITORINFO monitor_info = {.cbSize = sizeof(MONITORINFO)}; - RECT rect, virtual_rect = NtUserGetVirtualScreenRect(); + RECT rect; HMONITOR monitor; DWORD style; + BOOL ret; if (hwnd == NtUserGetDesktopWindow()) return FALSE; if (hwnd != NtUserGetForegroundWindow()) return FALSE; @@ -2497,11 +2498,20 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) if (is_virtual_desktop()) return FALSE; } - /* shrink the clipping rect to make sure it is not ignored for being fullscreen */ - if (EqualRect( &monitor_info.rcMonitor, &virtual_rect )) InflateRect( &monitor_info.rcMonitor, -1, -1 ); - TRACE( "win %p clipping fullscreen\n", hwnd ); - return NtUserClipCursor( &monitor_info.rcMonitor ); + + SERVER_START_REQ( set_cursor ) + { + req->flags = SET_CURSOR_CLIP | SET_CURSOR_FSCLIP; + req->clip.left = monitor_info.rcMonitor.left; + req->clip.top = monitor_info.rcMonitor.top; + req->clip.right = monitor_info.rcMonitor.right; + req->clip.bottom = monitor_info.rcMonitor.bottom; + ret = !wine_server_call( req ); + } + SERVER_END_REQ; + + return ret; } /********************************************************************** @@ -2567,7 +2577,7 @@ BOOL process_wine_clipcursor( HWND hwnd, UINT flags, BOOL reset ) get_clip_cursor( &rect ); intersect_rect( &rect, &rect, &virtual_rect ); if (EqualRect( &rect, &virtual_rect )) empty = TRUE; - if (empty) + if (empty && !(flags & SET_CURSOR_FSCLIP)) { /* if currently clipping, check if we should switch to fullscreen clipping */ if (was_clipping && clip_fullscreen_window( hwnd, TRUE )) return TRUE; diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 687caef9bfc..7c90935390f 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -1274,7 +1274,7 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR case WM_WINE_CLIPCURSOR: /* non-hardware message, posted on display mode change to trigger fullscreen clipping or to the desktop window to forcefully release the cursor grabs */ - if (!wparam) return clip_fullscreen_window( hwnd, FALSE ); + if (wparam & SET_CURSOR_FSCLIP) return clip_fullscreen_window( hwnd, FALSE ); return process_wine_clipcursor( hwnd, wparam, lparam ); case WM_WINE_SETCURSOR: FIXME( "Unexpected non-hardware WM_WINE_SETCURSOR message\n" ); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 59f624214b7..b941d01e3b7 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2929,7 +2929,7 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod MAKELPARAM( current_mode.dmPelsWidth, current_mode.dmPelsHeight ), SMTO_ABORTIFHUNG, 2000, FALSE ); /* post clip_fullscreen_window request to the foreground window */ - NtUserPostMessage( NtUserGetForegroundWindow(), WM_WINE_CLIPCURSOR, 0, 0 ); + NtUserPostMessage( NtUserGetForegroundWindow(), WM_WINE_CLIPCURSOR, SET_CURSOR_FSCLIP, 0 ); } return ret; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1af69c90b55..d765697277b 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5357,6 +5357,7 @@ struct set_cursor_reply #define SET_CURSOR_POS 0x04 #define SET_CURSOR_CLIP 0x08 #define SET_CURSOR_NOCLIP 0x10 +#define SET_CURSOR_FSCLIP 0x20 struct get_cursor_history_request @@ -6417,7 +6418,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 776 +#define SERVER_PROTOCOL_VERSION 777 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index cd96858dea9..54059b6b580 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3719,6 +3719,7 @@ struct handle_info #define SET_CURSOR_POS 0x04 #define SET_CURSOR_CLIP 0x08 #define SET_CURSOR_NOCLIP 0x10 +#define SET_CURSOR_FSCLIP 0x20 /* Get the history of the 64 last cursor positions */ @REQ(get_cursor_history)

1 0

Alexandre Julliard : regedit: Use nameless unions/structs.
by Alexandre Julliard June 16, 2023

June 16, 2023

Module: wine Branch: master Commit: c2d1c8dcd3e8af7a3f927d21d6b88c7f74466b11 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2d1c8dcd3e8af7a3f927d21d6b88c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 17:58:16 2023 +0200 regedit: Use nameless unions/structs. --- programs/regedit/treeview.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 95e18571b86..e81e05def12 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -21,8 +21,6 @@ #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ -#define NONAMELESSUNION - #include <windows.h> #include <commctrl.h> #include <shlwapi.h> @@ -189,13 +187,13 @@ static HTREEITEM AddEntryToTree(HWND hwndTV, HTREEITEM hParent, LPWSTR label, HK } } - tvins.u.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM; - tvins.u.item.pszText = label; - tvins.u.item.cchTextMax = lstrlenW(label); - tvins.u.item.iImage = Image_Closed; - tvins.u.item.iSelectedImage = Image_Open; - tvins.u.item.cChildren = dwChildren; - tvins.u.item.lParam = (LPARAM)hKey; + tvins.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM; + tvins.item.pszText = label; + tvins.item.cchTextMax = lstrlenW(label); + tvins.item.iImage = Image_Closed; + tvins.item.iSelectedImage = Image_Open; + tvins.item.cChildren = dwChildren; + tvins.item.lParam = (LPARAM)hKey; tvins.hInsertAfter = hKey ? TVI_LAST : TVI_SORT; tvins.hParent = hParent; @@ -551,16 +549,16 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPWSTR pHostName) hkcc[] = L"HKEY_CURRENT_CONFIG", hkdd[] = L"HKEY_DYN_DATA"; - tvins.u.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM; + tvins.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM; /* Set the text of the item. */ - tvins.u.item.pszText = pHostName; - tvins.u.item.cchTextMax = lstrlenW(pHostName); + tvins.item.pszText = pHostName; + tvins.item.cchTextMax = lstrlenW(pHostName); /* Assume the item is not a parent item, so give it an image. */ - tvins.u.item.iImage = Image_Root; - tvins.u.item.iSelectedImage = Image_Root; - tvins.u.item.cChildren = 5; + tvins.item.iImage = Image_Root; + tvins.item.iSelectedImage = Image_Root; + tvins.item.cChildren = 5; /* Save the heading level in the item's application-defined data area. */ - tvins.u.item.lParam = 0; + tvins.item.lParam = 0; tvins.hInsertAfter = TVI_FIRST; tvins.hParent = TVI_ROOT; /* Add the item to the tree view control. */

1 0

Alexandre Julliard : netstat: Use nameless union/structs.
by Alexandre Julliard June 16, 2023

June 16, 2023

Module: wine Branch: master Commit: 52a868a8feda29ef14a93e410fc79ae81ad813a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/52a868a8feda29ef14a93e410fc79a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 17:57:36 2023 +0200 netstat: Use nameless union/structs. --- programs/netstat/netstat.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index 2c1ef89c231..6e771776b38 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION #include <stdio.h> #include "netstat.h" #include <winsock2.h> @@ -256,9 +255,9 @@ static void NETSTAT_tcp_table(void) for (i = 0; i < table->dwNumEntries; i++) { - if ((table->table[i].u.dwState == MIB_TCP_STATE_CLOSE_WAIT) || - (table->table[i].u.dwState == MIB_TCP_STATE_ESTAB) || - (table->table[i].u.dwState == MIB_TCP_STATE_TIME_WAIT)) + if ((table->table[i].dwState == MIB_TCP_STATE_CLOSE_WAIT) || + (table->table[i].dwState == MIB_TCP_STATE_ESTAB) || + (table->table[i].dwState == MIB_TCP_STATE_TIME_WAIT)) { NETSTAT_host_name(table->table[i].dwLocalAddr, HostIp); NETSTAT_port_name(table->table[i].dwLocalPort, HostPort); @@ -267,7 +266,7 @@ static void NETSTAT_tcp_table(void) swprintf(Host, ARRAY_SIZE(Host), fmtcolon, HostIp, HostPort); swprintf(Remote, ARRAY_SIZE(Remote), fmtcolon, RemoteIp, RemotePort); - NETSTAT_wprintf(fmttcpout, tcpW, Host, Remote, tcpstatesW[table->table[i].u.dwState]); + NETSTAT_wprintf(fmttcpout, tcpW, Host, Remote, tcpstatesW[table->table[i].dwState]); } } HeapFree(GetProcessHeap(), 0, table);

1 0

Alexandre Julliard : oleview: Use nameless unions/structs.
by Alexandre Julliard June 16, 2023

June 16, 2023

Module: wine Branch: master Commit: 5d9ea809dad3276aede0879782988f707acd0e56 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d9ea809dad3276aede0879782988f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 17:58:03 2023 +0200 oleview: Use nameless unions/structs. --- programs/oleview/details.c | 16 +++---- programs/oleview/interface.c | 2 +- programs/oleview/main.h | 6 --- programs/oleview/tree.c | 102 +++++++++++++++++++++---------------------- programs/oleview/typelib.c | 70 ++++++++++++++--------------- 5 files changed, 95 insertions(+), 101 deletions(-)

1 0

Alexandre Julliard : services: Use nameless unions/structs.
by Alexandre Julliard June 16, 2023

June 16, 2023

Module: wine Branch: master Commit: f5784e2fd1b7243639bbd6b1d190247c2901ff68 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5784e2fd1b7243639bbd6b1d19024… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 17:58:37 2023 +0200 services: Use nameless unions/structs. --- programs/services/rpc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index b3d5c9403fe..b8e42f13938 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -19,8 +19,6 @@ */ #define WIN32_LEAN_AND_MEAN -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include <stdarg.h> #include <windows.h> @@ -1143,8 +1141,8 @@ static BOOL process_send_command(struct process_entry *process, const void *data DWORD count, ret; BOOL r; - overlapped.u.s.Offset = 0; - overlapped.u.s.OffsetHigh = 0; + overlapped.Offset = 0; + overlapped.OffsetHigh = 0; overlapped.hEvent = process->overlapped_event; r = WriteFile(process->control_pipe, data, size, &count, &overlapped); if (!r && GetLastError() == ERROR_IO_PENDING)

1 0

Rémi Bernon : win32u: Remove unnecessary set_cursor new_clip rect copy.
by Alexandre Julliard June 16, 2023

June 16, 2023

Module: wine Branch: master Commit: 56e2a08dae6ead7738488c0b33832abb7b3a91d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/56e2a08dae6ead7738488c0b33832a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 16 08:42:52 2023 +0200 win32u: Remove unnecessary set_cursor new_clip rect copy. --- dlls/win32u/input.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 205b792d784..2311fb359af 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2614,13 +2614,7 @@ BOOL WINAPI NtUserClipCursor( const RECT *rect ) } else req->flags = SET_CURSOR_NOCLIP; - if ((ret = !wine_server_call( req ))) - { - new_rect.left = reply->new_clip.left; - new_rect.top = reply->new_clip.top; - new_rect.right = reply->new_clip.right; - new_rect.bottom = reply->new_clip.bottom; - } + ret = !wine_server_call( req ); } SERVER_END_REQ;

1 0