October 2021 - Wine-Devel - list.winehq.org

[PATCH] vbscript: Emit catch after enumnext in for each loops.
by Jacek Caban Oct. 14, 2021

Oct. 14, 2021

From: Robert Wilhelm <robert.wilhelm(a)gmx.net> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39463 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 4 ++++ dlls/vbscript/tests/error.vbs | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[PATCH vkd3d 1/5] vkd3d-shader/hlsl: Allocate textures for SM4.
by Zebediah Figura Oct. 14, 2021

Oct. 14, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 63 ++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 00fe76b2f..bf93a03df 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1197,6 +1197,64 @@ static void allocate_buffers(struct hlsl_ctx *ctx) } } +static const struct hlsl_ir_var *get_reserved_texture(struct hlsl_ctx *ctx, uint32_t index) +{ + const struct hlsl_ir_var *var; + + LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, const struct hlsl_ir_var, extern_entry) + { + if (var->has_resource_access && var->reg_reservation.type == 't' && var->reg_reservation.index == index) + return var; + } + return NULL; +} + +static void allocate_textures(struct hlsl_ctx *ctx) +{ + struct hlsl_ir_var *var; + uint32_t index = 0; + + LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) + { + if (!var->has_resource_access || var->data_type->type != HLSL_CLASS_OBJECT + || var->data_type->base_type != HLSL_TYPE_TEXTURE) + continue; + + if (var->reg_reservation.type == 't') + { + const struct hlsl_ir_var *reserved_texture = get_reserved_texture(ctx, var->reg_reservation.index); + + if (reserved_texture && reserved_texture != var) + { + hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS, + "Multiple textures bound to t%u.", var->reg_reservation.index); + hlsl_note(ctx, reserved_texture->loc, VKD3D_SHADER_LOG_ERROR, + "Texture '%s' is already bound to t%u.", reserved_texture->name, + var->reg_reservation.index); + } + + var->reg.id = var->reg_reservation.index; + var->reg.allocated = true; + TRACE("Allocated reserved %s to t%u.\n", var->name, index); + } + else if (!var->reg_reservation.type) + { + while (get_reserved_texture(ctx, index)) + ++index; + + var->reg.id = index; + var->reg.allocated = true; + TRACE("Allocated %s to t%u.\n", var->name, index); + ++index; + } + else + { + hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Textures must be bound to register type 't'."); + } + } +} + static bool type_is_single_reg(const struct hlsl_type *type) { return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; @@ -1315,9 +1373,14 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun allocate_temp_registers(ctx, entry_func); if (ctx->profile->major_version < 4) + { allocate_const_registers(ctx, entry_func); + } else + { allocate_buffers(ctx); + allocate_textures(ctx); + } allocate_semantic_registers(ctx); if (ctx->result) -- 2.33.0

5 22

[PATCH 5/6] win32u: Factor out reg_open_hkcu_key.
by Jacek Caban Oct. 14, 2021

Oct. 14, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/font.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)

2 1

[PATCH v2] winex11.drv: Destroy windows associated with X11 display when the display is closed.
by Paul Gofman Oct. 14, 2021

Oct. 14, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 217174. X11DRV_ThreadDetach() destroys thread data part of which (e. g., display) is still present in window data in winex11.drv and accessible through hwnd. That causes all sort of hangs and crashes when, for instance, the window is still used for Vulkan rendering (even if only to tear down the device and swapchain). dlls/winex11.drv/window.c | 66 ++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 6 ++++ dlls/winex11.drv/x11drv_main.c | 3 ++ 3 files changed, 75 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 0057a341525..3423f79f6f0 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -48,6 +48,7 @@ #include "x11drv.h" #include "wine/debug.h" #include "wine/server.h" +#include "wine/heap.h" #include "mwm.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); @@ -88,6 +89,9 @@ XContext winContext = 0; /* X context to associate a struct x11drv_win_data to an hwnd */ XContext win_data_context = 0; +/* X context to associate windows list with a display */ +XContext display_windows_context; + /* time of last user event and window where it's stored */ static Time last_user_time; static Window user_time_window; @@ -200,12 +204,30 @@ static BOOL has_owned_popups( HWND hwnd ) } +/*********************************************************************** + * init_display_window_list + */ +void init_display_window_list( Display *display ) +{ + struct list *window_list; + + if (!(window_list = heap_alloc( sizeof(*window_list) ))) + { + ERR( "No memory.\n" ); + return; + } + list_init( window_list ); + XSaveContext( gdi_display, (XID)display, display_windows_context, (char *)window_list ); +} + + /*********************************************************************** * alloc_win_data */ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) { struct x11drv_win_data *data; + struct list *window_list; if ((data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)))) { @@ -213,6 +235,17 @@ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) data->vis = default_visual; data->hwnd = hwnd; EnterCriticalSection( &win_data_section ); + if (display != gdi_display + && !XFindContext( gdi_display, (XID)display, display_windows_context, (char **)&window_list )) + { + list_add_head( window_list, &data->display_entry ); + } + else + { + list_init( &data->display_entry ); + if (display != gdi_display) + WARN( "No window list for display %p.\n", display ); + } XSaveContext( gdi_display, (XID)hwnd, win_data_context, (char *)data ); } return data; @@ -1764,6 +1797,7 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) if (data->client_colormap) XFreeColormap( data->display, data->client_colormap ); HeapFree( GetProcessHeap(), 0, data->icon_bits ); XDeleteContext( gdi_display, (XID)hwnd, win_data_context ); + list_remove( &data->display_entry ); release_win_data( data ); HeapFree( GetProcessHeap(), 0, data ); destroy_gl_drawable( hwnd ); @@ -1771,6 +1805,38 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) } +/*********************************************************************** + * destroy_display_windows + */ +void destroy_display_windows( Display *display ) +{ + struct list *window_list, *head; + HWND hwnd; + + if (XFindContext( gdi_display, (XID)display, display_windows_context, (char **)&window_list )) + { + WARN( "No windows list for display %p.\n", display ); + return; + } + + while (1) + { + EnterCriticalSection( &win_data_section ); + if ((head = list_head( window_list ))) + hwnd = LIST_ENTRY( head, struct x11drv_win_data, display_entry )->hwnd; + else + hwnd = NULL; + LeaveCriticalSection( &win_data_section ); + if (!hwnd) break; + TRACE( "Destroying data for hwnd %p.\n", hwnd ); + X11DRV_DestroyWindow( hwnd ); + } + + XDeleteContext( gdi_display, (XID)display, display_windows_context ); + heap_free( window_list ); +} + + /*********************************************************************** * X11DRV_DestroyNotify */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 5ed2fcf73fb..8e79bfd0d32 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -342,6 +342,7 @@ struct x11drv_thread_data struct x11drv_valuator_data y_rel_valuator; int xi2_core_pointer; /* XInput2 core pointer id */ int xi2_current_slave; /* Current slave driving the Core pointer */ + }; extern struct x11drv_thread_data *x11drv_init_thread_data(void) DECLSPEC_HIDDEN; @@ -555,6 +556,7 @@ enum x11drv_net_wm_state struct x11drv_win_data { Display *display; /* display connection for the thread owning the window */ + struct list display_entry; /* list entry in display window list */ XVisualInfo vis; /* X visual used by this window */ Colormap whole_colormap; /* colormap if non-default visual */ Colormap client_colormap; /* colormap for the client window */ @@ -583,6 +585,8 @@ struct x11drv_win_data unsigned int icon_size; }; +extern void init_display_window_list( Display *display ) DECLSPEC_HIDDEN; +extern void destroy_display_windows( Display *display ) DECLSPEC_HIDDEN; extern struct x11drv_win_data *get_win_data( HWND hwnd ) DECLSPEC_HIDDEN; extern void release_win_data( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; @@ -619,6 +623,8 @@ static inline void mirror_rect( const RECT *window_rect, RECT *rect ) extern XContext winContext DECLSPEC_HIDDEN; /* X context to associate a struct x11drv_win_data to an hwnd */ extern XContext win_data_context DECLSPEC_HIDDEN; +/* X context to associate windows list with a display */ +extern XContext display_windows_context DECLSPEC_HIDDEN; /* X context to associate an X cursor to a Win32 cursor handle */ extern XContext cursor_context DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e8b273d055e..4be1137dc03 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -608,6 +608,7 @@ static BOOL process_attach(void) winContext = XUniqueContext(); win_data_context = XUniqueContext(); + display_windows_context = XUniqueContext(); cursor_context = XUniqueContext(); if (TRACE_ON(synchronous)) XSynchronize( display, True ); @@ -645,6 +646,7 @@ void CDECL X11DRV_ThreadDetach(void) if (data) { + destroy_display_windows( data->display ); if (data->xim) XCloseIM( data->xim ); if (data->font_set) XFreeFontSet( data->display, data->font_set ); XCloseDisplay( data->display ); @@ -700,6 +702,7 @@ struct x11drv_thread_data *x11drv_init_thread_data(void) ERR_(winediag)( "x11drv: Can't open display: %s. Please ensure that your X server is running and that $DISPLAY is set correctly.\n", XDisplayName(NULL)); ExitProcess(1); } + init_display_window_list( data->display ); fcntl( ConnectionNumber(data->display), F_SETFD, 1 ); /* set close on exec flag */ -- 2.31.1

2 4

[PATCH] winex11.drv: Destroy windows associated with X11 display when the display is closed.
by Paul Gofman Oct. 14, 2021

Oct. 14, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 217174. X11DRV_ThreadDetach() destroys thread data part of which (e. g., display) is still present in window data in winex11.drv and accessible through hwnd. That causes all sort of hangs and crashes when, for instance, the window is still used for Vulkan rendering (even if only to tear down the device and swapchain). dlls/winex11.drv/window.c | 61 ++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 6 ++++ dlls/winex11.drv/x11drv_main.c | 3 ++ 3 files changed, 70 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 0057a341525..5255b9f8ca6 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -48,6 +48,7 @@ #include "x11drv.h" #include "wine/debug.h" #include "wine/server.h" +#include "wine/heap.h" #include "mwm.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); @@ -88,6 +89,9 @@ XContext winContext = 0; /* X context to associate a struct x11drv_win_data to an hwnd */ XContext win_data_context = 0; +/* X context to associate windows list with a display */ +XContext display_windows_context; + /* time of last user event and window where it's stored */ static Time last_user_time; static Window user_time_window; @@ -200,12 +204,30 @@ static BOOL has_owned_popups( HWND hwnd ) } +/*********************************************************************** + * init_display_window_list + */ +void init_display_window_list( Display *display ) +{ + struct list *window_list; + + if (!(window_list = heap_alloc( sizeof(*window_list) ))) + { + ERR( "No memory.\n" ); + return; + } + list_init( window_list ); + XSaveContext( gdi_display, (XID)display, display_windows_context, (char *)window_list ); +} + + /*********************************************************************** * alloc_win_data */ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) { struct x11drv_win_data *data; + struct list *window_list; if ((data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)))) { @@ -213,6 +235,12 @@ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) data->vis = default_visual; data->hwnd = hwnd; EnterCriticalSection( &win_data_section ); + if (display != gdi_display + && !XFindContext( gdi_display, (XID)display, display_windows_context, (char **)&window_list )) + list_add_tail( window_list, &data->display_entry ); + else if (display != gdi_display) + WARN( "No window list for display %p.\n", display ); + XSaveContext( gdi_display, (XID)hwnd, win_data_context, (char *)data ); } return data; @@ -1764,6 +1792,7 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) if (data->client_colormap) XFreeColormap( data->display, data->client_colormap ); HeapFree( GetProcessHeap(), 0, data->icon_bits ); XDeleteContext( gdi_display, (XID)hwnd, win_data_context ); + list_remove( &data->display_entry ); release_win_data( data ); HeapFree( GetProcessHeap(), 0, data ); destroy_gl_drawable( hwnd ); @@ -1771,6 +1800,38 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) } +/*********************************************************************** + * destroy_display_windows + */ +void destroy_display_windows( Display *display ) +{ + struct list *window_list, *head; + HWND hwnd; + + if (XFindContext( gdi_display, (XID)display, display_windows_context, (char **)&window_list )) + { + WARN( "No windows list for display %p.\n", display ); + return; + } + + while (1) + { + EnterCriticalSection( &win_data_section ); + if ((head = list_head( window_list ))) + hwnd = LIST_ENTRY( head, struct x11drv_win_data, display_entry )->hwnd; + else + hwnd = NULL; + LeaveCriticalSection( &win_data_section ); + if (!hwnd) break; + TRACE( "Destroying data for hwnd %p.\n", hwnd ); + X11DRV_DestroyWindow( hwnd ); + } + + XDeleteContext( gdi_display, (XID)display, display_windows_context ); + heap_free( window_list ); +} + + /*********************************************************************** * X11DRV_DestroyNotify */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 5ed2fcf73fb..8e79bfd0d32 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -342,6 +342,7 @@ struct x11drv_thread_data struct x11drv_valuator_data y_rel_valuator; int xi2_core_pointer; /* XInput2 core pointer id */ int xi2_current_slave; /* Current slave driving the Core pointer */ + }; extern struct x11drv_thread_data *x11drv_init_thread_data(void) DECLSPEC_HIDDEN; @@ -555,6 +556,7 @@ enum x11drv_net_wm_state struct x11drv_win_data { Display *display; /* display connection for the thread owning the window */ + struct list display_entry; /* list entry in display window list */ XVisualInfo vis; /* X visual used by this window */ Colormap whole_colormap; /* colormap if non-default visual */ Colormap client_colormap; /* colormap for the client window */ @@ -583,6 +585,8 @@ struct x11drv_win_data unsigned int icon_size; }; +extern void init_display_window_list( Display *display ) DECLSPEC_HIDDEN; +extern void destroy_display_windows( Display *display ) DECLSPEC_HIDDEN; extern struct x11drv_win_data *get_win_data( HWND hwnd ) DECLSPEC_HIDDEN; extern void release_win_data( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; @@ -619,6 +623,8 @@ static inline void mirror_rect( const RECT *window_rect, RECT *rect ) extern XContext winContext DECLSPEC_HIDDEN; /* X context to associate a struct x11drv_win_data to an hwnd */ extern XContext win_data_context DECLSPEC_HIDDEN; +/* X context to associate windows list with a display */ +extern XContext display_windows_context DECLSPEC_HIDDEN; /* X context to associate an X cursor to a Win32 cursor handle */ extern XContext cursor_context DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e8b273d055e..4be1137dc03 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -608,6 +608,7 @@ static BOOL process_attach(void) winContext = XUniqueContext(); win_data_context = XUniqueContext(); + display_windows_context = XUniqueContext(); cursor_context = XUniqueContext(); if (TRACE_ON(synchronous)) XSynchronize( display, True ); @@ -645,6 +646,7 @@ void CDECL X11DRV_ThreadDetach(void) if (data) { + destroy_display_windows( data->display ); if (data->xim) XCloseIM( data->xim ); if (data->font_set) XFreeFontSet( data->display, data->font_set ); XCloseDisplay( data->display ); @@ -700,6 +702,7 @@ struct x11drv_thread_data *x11drv_init_thread_data(void) ERR_(winediag)( "x11drv: Can't open display: %s. Please ensure that your X server is running and that $DISPLAY is set correctly.\n", XDisplayName(NULL)); ExitProcess(1); } + init_display_window_list( data->display ); fcntl( ConnectionNumber(data->display), F_SETFD, 1 ); /* set close on exec flag */ -- 2.31.1

1 0

[PATCH v3 1/3] nsiproxy: Convert the reply to ICMP_ECHO_REPLY in the output buffer.
by Gabriel Ivăncescu Oct. 14, 2021

Oct. 14, 2021

Because iphlpapi has no opportunity to convert the buffer in async mode. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Handles architecture differences and family (can be easily extended to support IPv6's struct). dlls/iphlpapi/iphlpapi_main.c | 44 ++---------- dlls/nsiproxy.sys/device.c | 103 ++++++++++++++++++++++++--- dlls/nsiproxy.sys/nsiproxy_private.h | 55 ++++++++++++++ include/wine/nsi.h | 21 +----- 4 files changed, 155 insertions(+), 68 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d9a85be..a024224 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -4579,33 +4579,6 @@ DWORD WINAPI IcmpParseReplies( void *reply, DWORD reply_size ) return num_pkts; } -/************************************************************************* - * icmpv4_echo_reply_fixup - * - * Convert struct nsiproxy_icmpv4_echo_reply into ICMP_ECHO_REPLY. - * - * This is necessary due to the different sizes of ICMP_ECHO_REPLY on - * 32 and 64-bits. Despite mention of ICMP_ECHO_REPLY32, 64-bit Windows - * actually does return a full 64-bit version. - */ -static void icmpv4_echo_reply_fixup( ICMP_ECHO_REPLY *dst, struct nsiproxy_icmp_echo_reply *reply ) -{ - dst->Address = reply->addr.Ipv4.sin_addr.s_addr; - dst->Status = reply->status; - dst->RoundTripTime = reply->round_trip_time; - dst->DataSize = reply->data_size; - dst->Reserved = reply->num_of_pkts; - dst->Data = (BYTE *)(dst + 1) + ((reply->opts.options_size + 3) & ~3); - dst->Options.Ttl = reply->opts.ttl; - dst->Options.Tos = reply->opts.tos; - dst->Options.Flags = reply->opts.flags; - dst->Options.OptionsSize = reply->opts.options_size; - dst->Options.OptionsData = (BYTE *)(reply + 1); - - memcpy( dst->Options.OptionsData, (BYTE *)reply + reply->opts.options_offset, reply->opts.options_size ); - memcpy( dst->Data, (BYTE *)reply + reply->data_offset, reply->data_size ); -} - /*********************************************************************** * IcmpSendEcho (IPHLPAPI.@) */ @@ -4636,9 +4609,8 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r void *reply, DWORD reply_size, DWORD timeout ) { struct icmp_handle_data *data = (struct icmp_handle_data *)handle; - DWORD opt_size, in_size, ret = 0, out_size; + DWORD opt_size, in_size, ret = 0; struct nsiproxy_icmp_echo *in; - struct nsiproxy_icmp_echo_reply *out; HANDLE request_event; IO_STATUS_BLOCK iosb; NTSTATUS status; @@ -4658,17 +4630,15 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r opt_size = opts ? (opts->OptionsSize + 3) & ~3 : 0; in_size = FIELD_OFFSET(struct nsiproxy_icmp_echo, data[opt_size + request_size]); in = heap_alloc_zero( in_size ); - out_size = reply_size - sizeof(ICMP_ECHO_REPLY) + sizeof(*out); - out = heap_alloc( out_size ); - if (!in || !out) + if (!in) { - heap_free( out ); - heap_free( in ); SetLastError( IP_NO_RESOURCES ); return 0; } + in->addr = (ULONG_PTR)reply; + in->bits = sizeof(void*) * 8; in->src.Ipv4.sin_family = AF_INET; in->src.Ipv4.sin_addr.s_addr = src; in->dst.Ipv4.sin_family = AF_INET; @@ -4689,19 +4659,15 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r status = NtDeviceIoControlFile( data->nsi_device, request_event, NULL, NULL, &iosb, IOCTL_NSIPROXY_WINE_ICMP_ECHO, in, in_size, - out, out_size ); + reply, reply_size ); if (status == STATUS_PENDING && !WaitForSingleObject( request_event, INFINITE )) status = iosb.Status; if (!status) - { - icmpv4_echo_reply_fixup( reply, out ); ret = IcmpParseReplies( reply, reply_size ); - } CloseHandle( request_event ); - heap_free( out ); heap_free( in ); if (status) SetLastError( RtlNtStatusToDosError( status ) ); diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 90a7a3d..e310805 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -31,6 +31,7 @@ #include "netiodef.h" #include "wine/nsi.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unixlib.h" #include "nsiproxy_private.h" @@ -211,6 +212,57 @@ static void WINAPI icmp_echo_cancel( DEVICE_OBJECT *device, IRP *irp ) LeaveCriticalSection( &nsiproxy_cs ); } +static void icmp_echo_reply_fixup( void *out, struct nsiproxy_icmp_echo_reply *reply, ULONGLONG addr, ULONG family, ULONG bits ) +{ + void *data = out; + if (family == AF_INET) + { + void *options_data; + if (bits == 32) + { + struct icmp_echo_reply_32 *dst = out; + dst->addr = reply->addr.Ipv4.sin_addr.s_addr; + dst->status = reply->status; + dst->round_trip_time = reply->round_trip_time; + dst->data_size = reply->data_size; + dst->num_of_pkts = reply->num_of_pkts; + dst->data_ptr = addr + sizeof(*dst) + ((reply->opts.options_size + 3) & ~3); + dst->opts.ttl = reply->opts.ttl; + dst->opts.tos = reply->opts.tos; + dst->opts.flags = reply->opts.flags; + dst->opts.options_size = reply->opts.options_size; + dst->opts.options_ptr = addr + sizeof(*dst); + options_data = dst + 1; + } + else + { + struct icmp_echo_reply_64 *dst = out; + dst->addr = reply->addr.Ipv4.sin_addr.s_addr; + dst->status = reply->status; + dst->round_trip_time = reply->round_trip_time; + dst->data_size = reply->data_size; + dst->num_of_pkts = reply->num_of_pkts; + dst->data_ptr = addr + sizeof(*dst) + ((reply->opts.options_size + 3) & ~3); + dst->opts.ttl = reply->opts.ttl; + dst->opts.tos = reply->opts.tos; + dst->opts.flags = reply->opts.flags; + dst->opts.options_size = reply->opts.options_size; + dst->opts.options_ptr = addr + sizeof(*dst); + options_data = dst + 1; + } + memcpy( options_data, (BYTE *)reply + reply->opts.options_offset, reply->opts.options_size ); + data = (BYTE *)options_data + ((reply->opts.options_size + 3) & ~3); + } + memcpy( data, (BYTE *)reply + reply->data_offset, reply->data_size ); +} + +static int icmp_echo_reply_struct_len( ULONG family, ULONG bits ) +{ + if (family == AF_INET) + return (bits == 32) ? sizeof(struct icmp_echo_reply_32) : sizeof(struct icmp_echo_reply_64); + return 0; +} + static NTSTATUS nsiproxy_icmp_echo( IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -222,7 +274,7 @@ static NTSTATUS nsiproxy_icmp_echo( IRP *irp ) if (in_len < offsetof(struct nsiproxy_icmp_echo, data[0]) || in_len < offsetof(struct nsiproxy_icmp_echo, data[((in->opt_size + 3) & ~3) + in->req_size]) || - out_len < sizeof(struct nsiproxy_icmp_echo_reply)) + out_len < icmp_echo_reply_struct_len( in->dst.si_family, in->bits )) return STATUS_INVALID_PARAMETER; switch (in->dst.si_family) @@ -320,19 +372,34 @@ static DWORD WINAPI listen_thread_proc( void *arg ) { IRP *irp = arg; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + unsigned int reply_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; struct nsiproxy_icmp_echo *in = irp->AssociatedIrp.SystemBuffer; struct icmp_listen_params params; + ULONG family = in->dst.si_family; + ULONGLONG addr = in->addr; + ULONG bits = in->bits; + ULONG struct_len; NTSTATUS status; TRACE( "\n" ); + struct_len = icmp_echo_reply_struct_len( family, bits ); params.handle = irp_get_icmp_handle( irp ); params.timeout = in->timeout; - params.reply = irp->AssociatedIrp.SystemBuffer; - params.reply_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + params.reply_len = reply_len - struct_len + sizeof(struct nsiproxy_icmp_echo_reply); + params.reply = heap_alloc( params.reply_len ); - status = nsiproxy_call( icmp_listen, &params ); - TRACE( "icmp_listen rets %08x\n", status ); + if (params.reply) + { + void *reply = irp->AssociatedIrp.SystemBuffer; + status = nsiproxy_call( icmp_listen, &params ); + TRACE( "icmp_listen rets %08x\n", status ); + + icmp_echo_reply_fixup( reply, params.reply, addr, family, bits ); + heap_free( params.reply ); + reply_len = params.reply_len - sizeof(struct nsiproxy_icmp_echo_reply) + struct_len; + } + else status = STATUS_NO_MEMORY; EnterCriticalSection( &nsiproxy_cs ); @@ -340,7 +407,7 @@ static DWORD WINAPI listen_thread_proc( void *arg ) irp->IoStatus.Status = status; if (status == STATUS_SUCCESS) - irp->IoStatus.Information = params.reply_len; + irp->IoStatus.Information = reply_len; else irp->IoStatus.Information = 0; IoCompleteRequest( irp, IO_NO_INCREMENT ); @@ -353,8 +420,10 @@ static DWORD WINAPI listen_thread_proc( void *arg ) static void handle_queued_send_echo( IRP *irp ) { struct nsiproxy_icmp_echo *in = (struct nsiproxy_icmp_echo *)irp->AssociatedIrp.SystemBuffer; - struct nsiproxy_icmp_echo_reply *reply = (struct nsiproxy_icmp_echo_reply *)irp->AssociatedIrp.SystemBuffer; + void *out = irp->AssociatedIrp.SystemBuffer; struct icmp_send_echo_params params; + ULONG family = in->dst.si_family; + ULONG bits = in->bits; NTSTATUS status; TRACE( "\n" ); @@ -372,9 +441,23 @@ static void handle_queued_send_echo( IRP *irp ) irp->IoStatus.Status = status; if (status == STATUS_SUCCESS) { - memset( reply, 0, sizeof(*reply) ); - reply->status = params.ip_status; - irp->IoStatus.Information = sizeof(*reply); + if (family == AF_INET) + { + if (bits == 32) + { + struct icmp_echo_reply_32 *reply = out; + memset( reply, 0, sizeof(*reply) ); + reply->status = params.ip_status; + irp->IoStatus.Information = sizeof(*reply); + } + else + { + struct icmp_echo_reply_64 *reply = out; + memset( reply, 0, sizeof(*reply) ); + reply->status = params.ip_status; + irp->IoStatus.Information = sizeof(*reply); + } + } } IoCompleteRequest( irp, IO_NO_INCREMENT ); } diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 91dd393..0694757 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -34,3 +34,58 @@ struct icmp_send_echo_params HANDLE handle; ULONG ip_status; }; + +/* output for IOCTL_NSIPROXY_WINE_ICMP_ECHO - cf. ICMP_ECHO_REPLY */ +struct nsiproxy_icmp_echo_reply +{ + SOCKADDR_INET addr; + ULONG status; + ULONG round_trip_time; + USHORT data_size; + USHORT num_of_pkts; + DWORD data_offset; + struct + { + BYTE ttl; + BYTE tos; + BYTE flags; + BYTE options_size; + DWORD options_offset; + } opts; +}; + +struct icmp_echo_reply_32 +{ + ULONG addr; + ULONG status; + ULONG round_trip_time; + USHORT data_size; + USHORT num_of_pkts; + ULONG data_ptr; + struct + { + BYTE ttl; + BYTE tos; + BYTE flags; + BYTE options_size; + ULONG options_ptr; + } opts; +}; + +struct icmp_echo_reply_64 +{ + ULONG addr; + ULONG status; + ULONG round_trip_time; + USHORT data_size; + USHORT num_of_pkts; + ULONGLONG data_ptr; + struct + { + BYTE ttl; + BYTE tos; + BYTE flags; + BYTE options_size; + ULONGLONG options_ptr; + } opts; +}; diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 9664b53..4e60ff6 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -426,6 +426,8 @@ struct nsiproxy_icmp_echo { SOCKADDR_INET src; SOCKADDR_INET dst; + ULONGLONG addr; /* user-mode reply buffer address */ + BYTE bits; BYTE ttl; BYTE tos; BYTE flags; @@ -435,25 +437,6 @@ struct nsiproxy_icmp_echo BYTE data[1]; /* ((opt_size + 3) & ~3) + req_size */ }; -/* output for IOCTL_NSIPROXY_WINE_ICMP_ECHO - cf. ICMP_ECHO_REPLY */ -struct nsiproxy_icmp_echo_reply -{ - SOCKADDR_INET addr; - ULONG status; - ULONG round_trip_time; - USHORT data_size; - USHORT num_of_pkts; - DWORD data_offset; - struct - { - BYTE ttl; - BYTE tos; - BYTE flags; - BYTE options_size; - DWORD options_offset; - } opts; -}; - /* Undocumented Nsi api */ #define NSI_PARAM_TYPE_RW 0 -- 2.31.1

2 4

[PATCH 6/6] win32u: Move winstation initialization from user32.
by Jacek Caban Oct. 14, 2021

Oct. 14, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_main.c | 105 +------------------------- dlls/win32u/font.c | 16 +--- dlls/win32u/syscall.c | 4 +- dlls/win32u/win32u_private.h | 17 +++++ dlls/win32u/winstation.c | 138 ++++++++++++++++++++++++++++++++++- 5 files changed, 160 insertions(+), 120 deletions(-)

1 0

[PATCH 4/6] win32u: Move NtUserOpenDesktop implementation from user32.
by Jacek Caban Oct. 14, 2021

Oct. 14, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winstation.c | 25 +++++++------------------ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 24 ++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 13 +++++++++++++ include/ntuser.h | 1 + 7 files changed, 48 insertions(+), 19 deletions(-)

1 0

[PATCH 3/6] win32u: Move NtUserCreateDesktopEx implementation from user32.
by Jacek Caban Oct. 14, 2021

Oct. 14, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winstation.c | 27 ++++++++------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 32 ++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 19 +++++++++++++++++++ include/ntuser.h | 4 ++++ 7 files changed, 66 insertions(+), 20 deletions(-)

1 0

[PATCH 2/6] win32u: Move NtUserOpenWindowStation implementation from user32.
by Jacek Caban Oct. 14, 2021

Oct. 14, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winstation.c | 33 +++++++++++---------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 19 +++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 ++++++++++ include/ntuser.h | 1 + 7 files changed, 44 insertions(+), 23 deletions(-)

1 0