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

Rémi Bernon : ntdll: Check subheap sizes for consistency before using them.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 1196b46b293291b455345a06a61b8687d6911b68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1196b46b293291b455345a06… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 20:19:50 2022 +0200 ntdll: Check subheap sizes for consistency before using them. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index ab9985a1016..a917abe39af 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -250,6 +250,12 @@ static inline struct block *next_block( const SUBHEAP *subheap, const struct blo return (struct block *)next; } +static inline BOOL check_subheap( const SUBHEAP *subheap ) +{ + const char *base = subheap->base; + return contains( base, subheap->size, base + subheap->headerSize, subheap->commitSize - subheap->headerSize ); +} + static BOOL heap_validate( HEAP *heap, BOOL quiet ); /* mark a block of memory as free for debugging purposes */ @@ -353,6 +359,7 @@ static void subheap_notify_free_all(SUBHEAP const *subheap) char const *ptr = (char const *)subheap->base + subheap->headerSize; if (!RUNNING_ON_VALGRIND) return; + if (!check_subheap( subheap )) return; while (ptr < (char const *)subheap->base + subheap->size) { @@ -454,6 +461,8 @@ static void heap_dump( const HEAP *heap ) TRACE( " %p: base %p first %p last %p end %p\n", subheap, base, first_block( subheap ), last_block( subheap ), base + subheap_size( subheap ) ); + if (!check_subheap( subheap )) return; + overhead += (char *)first_block( subheap ) - base; for (block = first_block( subheap ); block; block = next_block( subheap, block )) { @@ -614,6 +623,7 @@ static SUBHEAP *find_subheap( const HEAP *heap, const void *ptr ) LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) { + if (!check_subheap( subheap )) return NULL; if (contains( subheap_base( subheap ), subheap_size( subheap ), ptr, sizeof(struct block) )) return subheap; } @@ -1456,6 +1466,14 @@ static BOOL heap_validate( HEAP *heap, BOOL quiet ) LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) { char *ptr = (char *)subheap->base + subheap->headerSize; + + if (!check_subheap( subheap )) + { + ERR( "heap %p, subheap %p corrupted sizes\n", heap, subheap ); + if (TRACE_ON(heap)) heap_dump( heap ); + return FALSE; + } + while (ptr < (char *)subheap->base + subheap->size) { if (*(DWORD *)ptr & ARENA_FLAG_FREE) @@ -1577,6 +1595,9 @@ static void heap_set_debug_flags( HANDLE handle ) { char *ptr = (char *)subheap->base + subheap->headerSize; char *end = (char *)subheap->base + subheap->commitSize; + + if (!check_subheap( subheap )) break; + while (ptr < end) { ARENA_INUSE *arena = (ARENA_INUSE *)ptr;

1 0

Stefan Dösinger : wined3d: Separate mapping from data writing in surface_cpu_blt_colour_fill.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 7bf8b53d57d14909a1a71b977de54e277e8abe01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bf8b53d57d14909a1a71b97… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 13 15:54:35 2022 +0300 wined3d: Separate mapping from data writing in surface_cpu_blt_colour_fill. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/resource.c | 76 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface.c | 68 ++----------------------------------- dlls/wined3d/wined3d_private.h | 3 ++ 3 files changed, 81 insertions(+), 66 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 437f9c9da69..7587a6455a4 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -613,3 +613,79 @@ void *resource_offset_map_pointer(struct wined3d_resource *resource, unsigned in + (box->left * format->byte_count); } } + +void wined3d_resource_memory_colour_fill(struct wined3d_resource *resource, + const struct wined3d_map_desc *map, const struct wined3d_color *colour, + const struct wined3d_box *box) +{ + const struct wined3d_format *format = resource->format; + unsigned int w, h, d, x, y, z, bpp; + uint8_t *dst, *dst2; + uint32_t c; + + w = box->right - box->left; + h = box->bottom - box->top; + d = box->back - box->front; + + dst = (uint8_t *)map->data + + (box->front * map->slice_pitch) + + ((box->top / format->block_height) * map->row_pitch) + + ((box->left / format->block_width) * format->block_byte_count); + + c = wined3d_format_convert_from_float(format, colour); + bpp = format->byte_count; + + switch (bpp) + { + case 1: + for (x = 0; x < w; ++x) + { + dst[x] = c; + } + break; + + case 2: + for (x = 0; x < w; ++x) + { + ((uint16_t *)dst)[x] = c; + } + break; + + case 3: + { + dst2 = dst; + for (x = 0; x < w; ++x, dst2 += 3) + { + dst2[0] = (c ) & 0xff; + dst2[1] = (c >> 8) & 0xff; + dst2[2] = (c >> 16) & 0xff; + } + break; + } + case 4: + for (x = 0; x < w; ++x) + { + ((uint32_t *)dst)[x] = c; + } + break; + + default: + FIXME("Not implemented for bpp %u.\n", bpp); + return; + } + + dst2 = dst; + for (y = 1; y < h; ++y) + { + dst2 += map->row_pitch; + memcpy(dst2, dst, w * bpp); + } + + dst2 = dst; + for (z = 1; z < d; ++z) + { + dst2 += map->slice_pitch; + memcpy(dst2, dst, w * h * bpp); + } + +} diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 448c8689342..0d4809ea55b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1241,15 +1241,13 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, const struct wined3d_box *box, const struct wined3d_color *colour) { struct wined3d_device *device = view->resource->device; - unsigned int x, y, z, w, h, d, bpp, level; struct wined3d_context *context; struct wined3d_texture *texture; struct wined3d_bo_address data; struct wined3d_map_desc map; struct wined3d_range range; + unsigned int level; DWORD map_binding; - uint8_t *dst; - DWORD c; TRACE("view %p, box %s, colour %s.\n", view, debug_box(box), debug_color(colour)); @@ -1274,12 +1272,6 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, texture = texture_from_resource(view->resource); level = view->sub_resource_idx % texture->level_count; - c = wined3d_format_convert_from_float(view->format, colour); - bpp = view->format->byte_count; - w = box->right - box->left; - h = box->bottom - box->top; - d = box->back - box->front; - map_binding = texture->resource.map_binding; if (!wined3d_texture_load_location(texture, view->sub_resource_idx, context, map_binding)) ERR("Failed to load the sub-resource into %s.\n", wined3d_debug_location(map_binding)); @@ -1288,66 +1280,10 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, wined3d_texture_get_bo_address(texture, view->sub_resource_idx, &data, map_binding); map.data = wined3d_context_map_bo_address(context, &data, texture->sub_resources[view->sub_resource_idx].size, WINED3D_MAP_WRITE); - map.data = (BYTE *)map.data - + (box->front * map.slice_pitch) - + ((box->top / view->format->block_height) * map.row_pitch) - + ((box->left / view->format->block_width) * view->format->block_byte_count); range.offset = 0; range.size = texture->sub_resources[view->sub_resource_idx].size; - switch (bpp) - { - case 1: - for (x = 0; x < w; ++x) - { - ((BYTE *)map.data)[x] = c; - } - break; - - case 2: - for (x = 0; x < w; ++x) - { - ((WORD *)map.data)[x] = c; - } - break; - - case 3: - { - dst = map.data; - for (x = 0; x < w; ++x, dst += 3) - { - dst[0] = (c ) & 0xff; - dst[1] = (c >> 8) & 0xff; - dst[2] = (c >> 16) & 0xff; - } - break; - } - case 4: - for (x = 0; x < w; ++x) - { - ((DWORD *)map.data)[x] = c; - } - break; - - default: - FIXME("Not implemented for bpp %u.\n", bpp); - wined3d_resource_unmap(view->resource, view->sub_resource_idx); - return; - } - - dst = map.data; - for (y = 1; y < h; ++y) - { - dst += map.row_pitch; - memcpy(dst, map.data, w * bpp); - } - - dst = map.data; - for (z = 1; z < d; ++z) - { - dst += map.slice_pitch; - memcpy(dst, map.data, w * h * bpp); - } + wined3d_resource_memory_colour_fill(view->resource, &map, colour, box); wined3d_context_unmap_bo_address(context, &data, 1, &range); context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cad697e9d23..ba1dc2169b0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4365,6 +4365,9 @@ GLbitfield wined3d_resource_gl_storage_flags(const struct wined3d_resource *reso BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN; BOOL wined3d_resource_prepare_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DECLSPEC_HIDDEN; +void wined3d_resource_memory_colour_fill(struct wined3d_resource *resource, + const struct wined3d_map_desc *map, const struct wined3d_color *colour, + const struct wined3d_box *box) DECLSPEC_HIDDEN; /* Tests show that the start address of resources is 32 byte aligned */ #define RESOURCE_ALIGNMENT 16

1 0

Chip Davis : configure: Check for struct icmpstat.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 0a70e1ac63f0f378d2ebf16aa165f38aece720ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a70e1ac63f0f378d2ebf16a… Author: Chip Davis <cdavis5x(a)gmail.com> Date: Fri Apr 15 19:28:15 2022 -0500 configure: Check for struct icmpstat. NetBSD no longer has statistics structures. Instead, it stores them as arrays of integer counters. It's backwards compatible with the old statistics structures, but the struct definitions are missing. This has likely been broken on NetBSD for quite some time as a result. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 26 ++++++++++++++++++++++++++ configure.ac | 19 +++++++++++++++++++ dlls/nsiproxy.sys/ip.c | 2 +- include/config.h.in | 3 +++ 4 files changed, 49 insertions(+), 1 deletion(-) diff --git a/configure b/configure index f77409da444..5eff6d59592 100755 --- a/configure +++ b/configure @@ -20619,6 +20619,32 @@ printf "%s\n" "#define HAVE_STRUCT_IP_STATS_IPS_TOTAL 1" >>confdefs.h fi +ac_fn_c_check_member "$LINENO" "struct icmpstat" "icps_error" "ac_cv_member_struct_icmpstat_icps_error" "#include <sys/types.h> +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_IP_H +#include <netinet/ip.h> +#endif +#ifdef HAVE_NETINET_IP_ICMP_H +#include <netinet/ip_icmp.h> +#endif +#ifdef HAVE_NETINET_ICMP_VAR_H +#include <netinet/icmp_var.h> +#endif +" +if test "x$ac_cv_member_struct_icmpstat_icps_error" = xyes +then : + +printf "%s\n" "#define HAVE_STRUCT_ICMPSTAT_ICPS_ERROR 1" >>confdefs.h + + +fi + + ac_fn_c_check_member "$LINENO" "struct tcpstat" "tcps_connattempt" "ac_cv_member_struct_tcpstat_tcps_connattempt" "#include <sys/types.h> #ifdef HAVE_SYS_SOCKETVAR_H #include <sys/socketvar.h> diff --git a/configure.ac b/configure.ac index 630f0563527..5036857db71 100644 --- a/configure.ac +++ b/configure.ac @@ -2218,6 +2218,25 @@ AC_CHECK_MEMBERS([struct ip_stats.ips_total],,, #include <netinet/ip_var.h> #endif]) +dnl Check for struct icmpstat +AC_CHECK_MEMBERS([struct icmpstat.icps_error],,, +[#include <sys/types.h> +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_IP_H +#include <netinet/ip.h> +#endif +#ifdef HAVE_NETINET_IP_ICMP_H +#include <netinet/ip_icmp.h> +#endif +#ifdef HAVE_NETINET_ICMP_VAR_H +#include <netinet/icmp_var.h> +#endif]) + dnl Check for struct tcpstat AC_CHECK_MEMBERS([struct tcpstat.tcps_connattempt],,, [#include <sys/types.h> diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index b8fff704f38..69f286a41a0 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -299,7 +299,7 @@ static NTSTATUS ipv4_icmpstats_get_all_parameters( const void *key, UINT key_siz fclose( fp ); return status; } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) +#elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) && defined(HAVE_STRUCT_ICMPSTAT_ICPS_ERROR) { int mib[] = { CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS }; struct icmpstat icmp_stat; diff --git a/include/config.h.in b/include/config.h.in index 45a0bd07abb..bc5ecdebc91 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -443,6 +443,9 @@ /* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H +/* Define to 1 if `icps_error' is a member of `struct icmpstat'. */ +#undef HAVE_STRUCT_ICMPSTAT_ICPS_ERROR + /* Define to 1 if `ifr_hwaddr' is a member of `struct ifreq'. */ #undef HAVE_STRUCT_IFREQ_IFR_HWADDR

1 0

Chip Davis : nsiproxy.sys: Implement IPv6 icmpstats get_all_parameters on Mac OS and BSD.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 84e9696078aae9fef0dc34d99eebedfacc0b58e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84e9696078aae9fef0dc34d9… Author: Chip Davis <cdavis5x(a)gmail.com> Date: Tue Apr 19 19:19:45 2022 -0500 nsiproxy.sys: Implement IPv6 icmpstats get_all_parameters on Mac OS and BSD. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 52 ++++++++++++++++++++++++++++++++++ configure.ac | 15 +++++++++- dlls/nsiproxy.sys/ip.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 6 ++++ 4 files changed, 147 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 5eff6d59592..5bfc9202f33 100755 --- a/configure +++ b/configure @@ -8879,6 +8879,38 @@ if test "x$ac_cv_header_netinet_icmp_var_h" = xyes then : printf "%s\n" "#define HAVE_NETINET_ICMP_VAR_H 1" >>confdefs.h +fi +ac_fn_c_check_header_compile "$LINENO" "netinet/icmp6.h" "ac_cv_header_netinet_icmp6_h" "#include <sys/types.h> + #include <sys/socket.h> + #ifdef HAVE_SYS_SOCKETVAR_H + # include <sys/socketvar.h> + #endif + #ifdef HAVE_NETINET_IN_H + # include <netinet/in.h> + #endif + #ifdef HAVE_NETINET_IN_SYSTM_H + # include <netinet/in_systm.h> + #endif + #ifdef HAVE_NETINET_IP_H + # include <netinet/ip.h> + #endif + #ifdef HAVE_NETINET_IP_VAR_H + # include <netinet/ip_var.h> + #endif + #ifdef HAVE_NETINET_IP_ICMP_H + # include <netinet/ip_icmp.h> + #endif + #ifdef HAVE_NETINET_UDP_H + # include <netinet/udp.h> + #endif + #ifdef HAVE_NETINET_TCP_H + # include <netinet/tcp.h> + #endif +" +if test "x$ac_cv_header_netinet_icmp6_h" = xyes +then : + printf "%s\n" "#define HAVE_NETINET_ICMP6_H 1" >>confdefs.h + fi ac_fn_c_check_header_compile "$LINENO" "netinet/tcp_var.h" "ac_cv_header_netinet_tcp_var_h" "#include <sys/types.h> #include <sys/socket.h> @@ -20645,6 +20677,26 @@ printf "%s\n" "#define HAVE_STRUCT_ICMPSTAT_ICPS_ERROR 1" >>confdefs.h fi +ac_fn_c_check_member "$LINENO" "struct icmp6stat" "icp6s_error" "ac_cv_member_struct_icmp6stat_icp6s_error" "#include <sys/types.h> +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_ICMP6_H +#include <netinet/icmp6.h> +#endif +" +if test "x$ac_cv_member_struct_icmp6stat_icp6s_error" = xyes +then : + +printf "%s\n" "#define HAVE_STRUCT_ICMP6STAT_ICP6S_ERROR 1" >>confdefs.h + + +fi + + ac_fn_c_check_member "$LINENO" "struct tcpstat" "tcps_connattempt" "ac_cv_member_struct_tcpstat_tcps_connattempt" "#include <sys/types.h> #ifdef HAVE_SYS_SOCKETVAR_H #include <sys/socketvar.h> diff --git a/configure.ac b/configure.ac index 5036857db71..c2ea705bc63 100644 --- a/configure.ac +++ b/configure.ac @@ -555,7 +555,7 @@ AC_CHECK_HEADERS(\ # include <netinet/ip.h> #endif]) -AC_CHECK_HEADERS([netinet/udp_var.h netinet/icmp_var.h netinet/tcp_var.h ],,, +AC_CHECK_HEADERS([netinet/udp_var.h netinet/icmp_var.h netinet/icmp6.h netinet/tcp_var.h ],,, [#include <sys/types.h> #include <sys/socket.h> #ifdef HAVE_SYS_SOCKETVAR_H @@ -2237,6 +2237,19 @@ AC_CHECK_MEMBERS([struct icmpstat.icps_error],,, #include <netinet/icmp_var.h> #endif]) +dnl Check for struct icmp6stat +AC_CHECK_MEMBERS([struct icmp6stat.icp6s_error],,, +[#include <sys/types.h> +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_ICMP6_H +#include <netinet/icmp6.h> +#endif]) + dnl Check for struct tcpstat AC_CHECK_MEMBERS([struct tcpstat.tcps_connattempt],,, [#include <sys/types.h> diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 69f286a41a0..18e88f493bb 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -59,6 +59,24 @@ #include <netinet/icmp_var.h> #endif +#ifdef HAVE_NETINET_ICMP6_H +#include <netinet/icmp6.h> +#undef ICMP6_DST_UNREACH +#undef ICMP6_PACKET_TOO_BIG +#undef ICMP6_TIME_EXCEEDED +#undef ICMP6_PARAM_PROB +#undef ICMP6_ECHO_REQUEST +#undef ICMP6_ECHO_REPLY +#undef ICMP6_MEMBERSHIP_QUERY +#undef ICMP6_MEMBERSHIP_REPORT +#undef ICMP6_MEMBERSHIP_REDUCTION +#undef ND_ROUTER_SOLICIT +#undef ND_ROUTER_ADVERT +#undef ND_NEIGHBOR_SOLICIT +#undef ND_NEIGHBOR_ADVERT +#undef ND_REDIRECT +#endif + #ifdef HAVE_NETINET_IF_ETHER_H #include <netinet/if_ether.h> #endif @@ -472,6 +490,63 @@ static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, UINT key_siz if (dynamic_data) *(struct nsi_ip_icmpstats_dynamic *)dynamic_data = dyn; return STATUS_SUCCESS; } +#elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPV6CTL_STATS) && defined(HAVE_STRUCT_ICMP6STAT_ICP6S_ERROR) + { + int mib[] = { CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_STATS }; + struct icmp6stat icmp_stat; + size_t needed = sizeof(icmp_stat); + int i; + + if (sysctl( mib, ARRAY_SIZE(mib), &icmp_stat, &needed, NULL, 0 ) == -1) return STATUS_NOT_SUPPORTED; + + dyn.in_msgs = icmp_stat.icp6s_badcode + icmp_stat.icp6s_checksum + icmp_stat.icp6s_tooshort + + icmp_stat.icp6s_badlen + icmp_stat.icp6s_nd_toomanyopt; + for (i = 0; i <= ICMP6_MAXTYPE; i++) + dyn.in_msgs += icmp_stat.icp6s_inhist[i]; + + dyn.in_errors = icmp_stat.icp6s_badcode + icmp_stat.icp6s_checksum + icmp_stat.icp6s_tooshort + + icmp_stat.icp6s_badlen + icmp_stat.icp6s_nd_toomanyopt; + + dyn.in_type_counts[ICMP6_DST_UNREACH] = icmp_stat.icp6s_inhist[ICMP6_DST_UNREACH]; + dyn.in_type_counts[ICMP6_PACKET_TOO_BIG] = icmp_stat.icp6s_inhist[ICMP6_PACKET_TOO_BIG]; + dyn.in_type_counts[ICMP6_TIME_EXCEEDED] = icmp_stat.icp6s_inhist[ICMP6_TIME_EXCEEDED]; + dyn.in_type_counts[ICMP6_PARAM_PROB] = icmp_stat.icp6s_inhist[ICMP6_PARAM_PROB]; + dyn.in_type_counts[ICMP6_ECHO_REQUEST] = icmp_stat.icp6s_inhist[ICMP6_ECHO_REQUEST]; + dyn.in_type_counts[ICMP6_ECHO_REPLY] = icmp_stat.icp6s_inhist[ICMP6_ECHO_REPLY]; + dyn.in_type_counts[ICMP6_MEMBERSHIP_QUERY] = icmp_stat.icp6s_inhist[ICMP6_MEMBERSHIP_QUERY]; + dyn.in_type_counts[ICMP6_MEMBERSHIP_REPORT] = icmp_stat.icp6s_inhist[ICMP6_MEMBERSHIP_REPORT]; + dyn.in_type_counts[ICMP6_MEMBERSHIP_REDUCTION] = icmp_stat.icp6s_inhist[ICMP6_MEMBERSHIP_REDUCTION]; + dyn.in_type_counts[ND_ROUTER_SOLICIT] = icmp_stat.icp6s_inhist[ND_ROUTER_SOLICIT]; + dyn.in_type_counts[ND_ROUTER_ADVERT] = icmp_stat.icp6s_inhist[ND_ROUTER_ADVERT]; + dyn.in_type_counts[ND_NEIGHBOR_SOLICIT] = icmp_stat.icp6s_inhist[ND_NEIGHBOR_SOLICIT]; + dyn.in_type_counts[ND_NEIGHBOR_ADVERT] = icmp_stat.icp6s_inhist[ND_NEIGHBOR_ADVERT]; + dyn.in_type_counts[ND_REDIRECT] = icmp_stat.icp6s_inhist[ND_REDIRECT]; + dyn.in_type_counts[ICMP6_V2_MEMBERSHIP_REPORT] = icmp_stat.icp6s_inhist[MLDV2_LISTENER_REPORT]; + + dyn.out_msgs = icmp_stat.icp6s_canterror + icmp_stat.icp6s_toofreq; + for (i = 0; i <= ICMP6_MAXTYPE; i++) + dyn.out_msgs += icmp_stat.icp6s_outhist[i]; + + dyn.out_errors = icmp_stat.icp6s_canterror + icmp_stat.icp6s_toofreq; + + dyn.out_type_counts[ICMP6_DST_UNREACH] = icmp_stat.icp6s_outhist[ICMP6_DST_UNREACH]; + dyn.out_type_counts[ICMP6_PACKET_TOO_BIG] = icmp_stat.icp6s_outhist[ICMP6_PACKET_TOO_BIG]; + dyn.out_type_counts[ICMP6_TIME_EXCEEDED] = icmp_stat.icp6s_outhist[ICMP6_TIME_EXCEEDED]; + dyn.out_type_counts[ICMP6_PARAM_PROB] = icmp_stat.icp6s_outhist[ICMP6_PARAM_PROB]; + dyn.out_type_counts[ICMP6_ECHO_REQUEST] = icmp_stat.icp6s_outhist[ICMP6_ECHO_REQUEST]; + dyn.out_type_counts[ICMP6_ECHO_REPLY] = icmp_stat.icp6s_outhist[ICMP6_ECHO_REPLY]; + dyn.out_type_counts[ICMP6_MEMBERSHIP_QUERY] = icmp_stat.icp6s_outhist[ICMP6_MEMBERSHIP_QUERY]; + dyn.out_type_counts[ICMP6_MEMBERSHIP_REPORT] = icmp_stat.icp6s_outhist[ICMP6_MEMBERSHIP_REPORT]; + dyn.out_type_counts[ICMP6_MEMBERSHIP_REDUCTION] = icmp_stat.icp6s_outhist[ICMP6_MEMBERSHIP_REDUCTION]; + dyn.out_type_counts[ND_ROUTER_SOLICIT] = icmp_stat.icp6s_outhist[ND_ROUTER_SOLICIT]; + dyn.out_type_counts[ND_ROUTER_ADVERT] = icmp_stat.icp6s_outhist[ND_ROUTER_ADVERT]; + dyn.out_type_counts[ND_NEIGHBOR_SOLICIT] = icmp_stat.icp6s_outhist[ND_NEIGHBOR_SOLICIT]; + dyn.out_type_counts[ND_NEIGHBOR_ADVERT] = icmp_stat.icp6s_outhist[ND_NEIGHBOR_ADVERT]; + dyn.out_type_counts[ND_REDIRECT] = icmp_stat.icp6s_outhist[ND_REDIRECT]; + dyn.out_type_counts[ICMP6_V2_MEMBERSHIP_REPORT] = icmp_stat.icp6s_outhist[MLDV2_LISTENER_REPORT]; + if (dynamic_data) *(struct nsi_ip_icmpstats_dynamic *)dynamic_data = dyn; + return STATUS_SUCCESS; + } #else FIXME( "not implemented\n" ); return STATUS_NOT_IMPLEMENTED; diff --git a/include/config.h.in b/include/config.h.in index bc5ecdebc91..8cbf23d417e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -257,6 +257,9 @@ /* Define to 1 if you have the <netdb.h> header file. */ #undef HAVE_NETDB_H +/* Define to 1 if you have the <netinet/icmp6.h> header file. */ +#undef HAVE_NETINET_ICMP6_H + /* Define to 1 if you have the <netinet/icmp_var.h> header file. */ #undef HAVE_NETINET_ICMP_VAR_H @@ -443,6 +446,9 @@ /* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H +/* Define to 1 if `icp6s_error' is a member of `struct icmp6stat'. */ +#undef HAVE_STRUCT_ICMP6STAT_ICP6S_ERROR + /* Define to 1 if `icps_error' is a member of `struct icmpstat'. */ #undef HAVE_STRUCT_ICMPSTAT_ICPS_ERROR

1 0

Chip Davis : nsiproxy.sys: Implement IPv6 ipstats get_all_parameters on Mac OS and BSD.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 2264663c743a01c815909b9e44e71a475964b58f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2264663c743a01c815909b9e… Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:32:21 2022 -0500 nsiproxy.sys: Implement IPv6 ipstats get_all_parameters on Mac OS and BSD. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 46 +++++++++++++++++++++++++++++++ configure.ac | 14 ++++++++++ dlls/nsiproxy.sys/ip.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 6 ++++ 4 files changed, 141 insertions(+) diff --git a/configure b/configure index 5bfc9202f33..64396a1c69b 100755 --- a/configure +++ b/configure @@ -8761,6 +8761,32 @@ if test "x$ac_cv_header_netinet_udp_h" = xyes then : printf "%s\n" "#define HAVE_NETINET_UDP_H 1" >>confdefs.h +fi +ac_fn_c_check_header_compile "$LINENO" "netinet6/ip6_var.h" "ac_cv_header_netinet6_ip6_var_h" "#include <sys/types.h> + #include <sys/socket.h> + #ifdef HAVE_SYS_SOCKETVAR_H + # include <sys/socketvar.h> + #endif + #ifdef HAVE_NET_ROUTE_H + # include <net/route.h> + #endif + #ifdef HAVE_NETINET_IN_H + # include <netinet/in.h> + #endif + #ifdef HAVE_NETINET_IN_SYSTM_H + # include <netinet/in_systm.h> + #endif + #ifdef HAVE_NET_IF_H + # include <net/if.h> + #endif + #ifdef HAVE_NETINET_IP_H + # include <netinet/ip.h> + #endif +" +if test "x$ac_cv_header_netinet6_ip6_var_h" = xyes +then : + printf "%s\n" "#define HAVE_NETINET6_IP6_VAR_H 1" >>confdefs.h + fi ac_fn_c_check_header_compile "$LINENO" "netipx/ipx.h" "ac_cv_header_netipx_ipx_h" "#include <sys/types.h> #include <sys/socket.h> @@ -20651,6 +20677,26 @@ printf "%s\n" "#define HAVE_STRUCT_IP_STATS_IPS_TOTAL 1" >>confdefs.h fi +ac_fn_c_check_member "$LINENO" "struct ip6stat" "ip6s_total" "ac_cv_member_struct_ip6stat_ip6s_total" "#include <sys/types.h> +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET6_IP6_VAR_H +#include <netinet6/ip6_var.h> +#endif +" +if test "x$ac_cv_member_struct_ip6stat_ip6s_total" = xyes +then : + +printf "%s\n" "#define HAVE_STRUCT_IP6STAT_IP6S_TOTAL 1" >>confdefs.h + + +fi + + ac_fn_c_check_member "$LINENO" "struct icmpstat" "icps_error" "ac_cv_member_struct_icmpstat_icps_error" "#include <sys/types.h> #ifdef HAVE_SYS_SOCKETVAR_H #include <sys/socketvar.h> diff --git a/configure.ac b/configure.ac index c2ea705bc63..e4abc79997b 100644 --- a/configure.ac +++ b/configure.ac @@ -532,6 +532,7 @@ AC_CHECK_HEADERS(\ netinet/ip_icmp.h \ netinet/ip_var.h \ netinet/udp.h \ + netinet6/ip6_var.h \ netipx/ipx.h \ sys/un.h \ ,,,[#include <sys/types.h> @@ -2218,6 +2219,19 @@ AC_CHECK_MEMBERS([struct ip_stats.ips_total],,, #include <netinet/ip_var.h> #endif]) +dnl Check for struct ip6stat +AC_CHECK_MEMBERS([struct ip6stat.ip6s_total],,, +[#include <sys/types.h> +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET6_IP6_VAR_H +#include <netinet6/ip6_var.h> +#endif]) + dnl Check for struct icmpstat AC_CHECK_MEMBERS([struct icmpstat.icps_error],,, [#include <sys/types.h> diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 18e88f493bb..27344756580 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -55,6 +55,50 @@ #include <netinet/ip_var.h> #endif +#ifdef HAVE_NETINET6_IP6_VAR_H +#include <netinet6/ip6_var.h> +#endif + +#ifdef __APPLE__ +/* For reasons unknown, Mac OS doesn't export <netinet6/ip6_var.h> to user- + * space. We'll have to define the needed struct ourselves. + */ +struct ip6stat { + u_quad_t ip6s_total; + u_quad_t ip6s_tooshort; + u_quad_t ip6s_toosmall; + u_quad_t ip6s_fragments; + u_quad_t ip6s_fragdropped; + u_quad_t ip6s_fragtimeout; + u_quad_t ip6s_fragoverflow; + u_quad_t ip6s_forward; + u_quad_t ip6s_cantforward; + u_quad_t ip6s_redirectsent; + u_quad_t ip6s_delivered; + u_quad_t ip6s_localout; + u_quad_t ip6s_odropped; + u_quad_t ip6s_reassembled; + u_quad_t ip6s_atmfrag_rcvd; + u_quad_t ip6s_fragmented; + u_quad_t ip6s_ofragments; + u_quad_t ip6s_cantfrag; + u_quad_t ip6s_badoptions; + u_quad_t ip6s_noroute; + u_quad_t ip6s_badvers; + u_quad_t ip6s_rawout; + u_quad_t ip6s_badscope; + u_quad_t ip6s_notmember; + u_quad_t ip6s_nxthist[256]; + u_quad_t ip6s_m1; + u_quad_t ip6s_m2m[32]; + u_quad_t ip6s_mext1; + u_quad_t ip6s_mext2m; + u_quad_t ip6s_exthdrtoolong; + u_quad_t ip6s_nogif; + u_quad_t ip6s_toomanyhdr; +}; +#endif + #ifdef HAVE_NETINET_ICMP_VAR_H #include <netinet/icmp_var.h> #endif @@ -729,6 +773,37 @@ static NTSTATUS ipv6_ipstats_get_all_parameters( const void *key, UINT key_size, if (static_data) *(struct nsi_ip_ipstats_static *)static_data = stat; return status; } +#elif defined(HAVE_SYS_SYSCTL_H) && defined(IPV6CTL_STATS) && (defined(HAVE_STRUCT_IP6STAT_IP6S_TOTAL) || defined(__APPLE__)) + { + int mib[] = { CTL_NET, PF_INET6, IPPROTO_IPV6, IPV6CTL_STATS }; + struct ip6stat ip_stat; + size_t needed; + + needed = sizeof(ip_stat); + if (sysctl( mib, ARRAY_SIZE(mib), &ip_stat, &needed, NULL, 0 ) == -1) return STATUS_NOT_SUPPORTED; + + dyn.in_recv = ip_stat.ip6s_total; + dyn.in_hdr_errs = ip_stat.ip6s_tooshort + ip_stat.ip6s_toosmall + ip_stat.ip6s_badvers + + ip_stat.ip6s_badoptions + ip_stat.ip6s_exthdrtoolong + ip_stat.ip6s_toomanyhdr; + dyn.in_addr_errs = ip_stat.ip6s_cantforward + ip_stat.ip6s_badscope + ip_stat.ip6s_notmember; + dyn.fwd_dgrams = ip_stat.ip6s_forward; + dyn.in_discards = ip_stat.ip6s_fragdropped; + dyn.in_delivers = ip_stat.ip6s_delivered; + dyn.out_reqs = ip_stat.ip6s_localout; + dyn.out_discards = ip_stat.ip6s_odropped; + dyn.out_no_routes = ip_stat.ip6s_noroute; + stat.reasm_timeout = ip_stat.ip6s_fragtimeout; + dyn.reasm_reqds = ip_stat.ip6s_fragments; + dyn.reasm_oks = ip_stat.ip6s_reassembled; + dyn.reasm_fails = ip_stat.ip6s_fragments - ip_stat.ip6s_reassembled; + dyn.frag_oks = ip_stat.ip6s_fragmented; + dyn.frag_fails = ip_stat.ip6s_cantfrag; + dyn.frag_creates = ip_stat.ip6s_ofragments; + + if (dynamic_data) *(struct nsi_ip_ipstats_dynamic *)dynamic_data = dyn; + if (static_data) *(struct nsi_ip_ipstats_static *)static_data = stat; + return STATUS_SUCCESS; + } #else FIXME( "not implemented\n" ); return STATUS_NOT_IMPLEMENTED; diff --git a/include/config.h.in b/include/config.h.in index 8cbf23d417e..de1bf6c61eb 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -257,6 +257,9 @@ /* Define to 1 if you have the <netdb.h> header file. */ #undef HAVE_NETDB_H +/* Define to 1 if you have the <netinet6/ip6_var.h> header file. */ +#undef HAVE_NETINET6_IP6_VAR_H + /* Define to 1 if you have the <netinet/icmp6.h> header file. */ #undef HAVE_NETINET_ICMP6_H @@ -458,6 +461,9 @@ /* Define to 1 if `ipi6_addr' is a member of `struct in6_pktinfo'. */ #undef HAVE_STRUCT_IN6_PKTINFO_IPI6_ADDR +/* Define to 1 if `ip6s_total' is a member of `struct ip6stat'. */ +#undef HAVE_STRUCT_IP6STAT_IP6S_TOTAL + /* Define to 1 if `ips_total' is a member of `struct ipstat'. */ #undef HAVE_STRUCT_IPSTAT_IPS_TOTAL

1 0

Eric Pouech : dbghelp: Fix conversion of dwarf's basic types into dbghelp's basic types.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: d94f4747e877b87400d4cb0d11d1c09139ad2c87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d94f4747e877b87400d4cb0d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue May 10 17:11:08 2022 +0200 dbghelp: Fix conversion of dwarf's basic types into dbghelp's basic types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 19c0da933d3..5c0f34d4bf5 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -213,6 +213,7 @@ typedef struct dwarf2_parse_context_s dwarf2_cuhead_t head; enum unit_status status; dwarf2_traverse_context_t traverse_DIE; + unsigned language; } dwarf2_parse_context_t; /* stored in the dbghelp's module internal structure for later reuse */ @@ -1450,16 +1451,43 @@ static struct vector* dwarf2_get_di_children(dwarf2_debug_info_t* di) return NULL; } +/* reconstruct whether integer is long (contains 'long' only once) */ +static BOOL is_long(const char* name) +{ + /* we assume name is made only of basic C keywords: + * int long short unsigned signed void float double char _Bool _Complex + */ + const char* p = strstr(name, "long"); + return p && strstr(p + 4, "long") == NULL; +} + +static BOOL is_c_language(dwarf2_parse_context_t* unit_ctx) +{ + return unit_ctx->language == DW_LANG_C || + unit_ctx->language == DW_LANG_C89 || + unit_ctx->language == DW_LANG_C99; +} + +static BOOL is_cpp_language(dwarf2_parse_context_t* unit_ctx) +{ + return unit_ctx->language == DW_LANG_C_plus_plus; +} + static struct symt* dwarf2_parse_base_type(dwarf2_debug_info_t* di) { struct attribute name; struct attribute size; struct attribute encoding; enum BasicType bt; + BOOL c_language, cpp_language; + if (di->symt) return di->symt; TRACE("%s\n", dwarf2_debug_di(di)); + c_language = is_c_language(di->unit_ctx); + cpp_language = is_cpp_language(di->unit_ctx); + if (!dwarf2_find_attribute(di, DW_AT_name, &name)) name.u.string = NULL; if (!dwarf2_find_attribute(di, DW_AT_byte_size, &size)) size.u.uvalue = 0; @@ -1472,10 +1500,19 @@ static struct symt* dwarf2_parse_base_type(dwarf2_debug_info_t* di) case DW_ATE_boolean: bt = btBool; break; case DW_ATE_complex_float: bt = btComplex; break; case DW_ATE_float: bt = btFloat; break; - case DW_ATE_signed: bt = btInt; break; - case DW_ATE_unsigned: bt = btUInt; break; - case DW_ATE_signed_char: bt = btChar; break; - case DW_ATE_unsigned_char: bt = btChar; break; + case DW_ATE_signed: bt = ((c_language || cpp_language) && is_long(name.u.string)) ? btLong : btInt; break; + case DW_ATE_unsigned: + if ((c_language || cpp_language) && is_long(name.u.string)) bt = btULong; + else if (cpp_language && !strcmp(name.u.string, "wchar_t")) bt = btWChar; + else if (cpp_language && !strcmp(name.u.string, "char8_t")) bt = btChar8; + else if (cpp_language && !strcmp(name.u.string, "char16_t")) bt = btChar16; + else if (cpp_language && !strcmp(name.u.string, "char32_t")) bt = btChar32; + else bt = btUInt; + break; + /* on Windows, in C, char == signed char, but not in C++ */ + case DW_ATE_signed_char: bt = (cpp_language && !strcmp(name.u.string, "signed char")) ? btInt : btChar; break; + case DW_ATE_unsigned_char: bt = btUInt; break; + case DW_ATE_UTF: bt = (size.u.uvalue == 1) ? btChar8 : (size.u.uvalue == 2 ? btChar16 : btChar32); break; default: bt = btNoType; break; } di->symt = &symt_get_basic(bt, size.u.uvalue)->symt; @@ -1497,7 +1534,15 @@ static struct symt* dwarf2_parse_typedef(dwarf2_debug_info_t* di) ref_type = dwarf2_lookup_type(di); if (name.u.string) + { + /* Note: The MS C compiler has tweaks for WCHAR support. + * Even if WCHAR is a typedef to wchar_t, wchar_t is emitted as btUInt/2 (it's defined as + * unsigned short, so far so good), while WCHAR is emitted as btWChar/2). + */ + if ((is_c_language(di->unit_ctx) || is_cpp_language(di->unit_ctx)) && !strcmp(name.u.string, "WCHAR")) + ref_type = &symt_get_basic(btWChar, 2)->symt; di->symt = &symt_new_typedef(di->unit_ctx->module_ctx->module, ref_type, name.u.string)->symt; + } if (dwarf2_get_di_children(di)) FIXME("Unsupported children\n"); return di->symt; } @@ -2917,6 +2962,7 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx) unsigned int i; struct attribute stmt_list, low_pc; struct attribute comp_dir; + struct attribute language; if (!dwarf2_find_attribute(di, DW_AT_name, &name)) name.u.string = NULL; @@ -2927,6 +2973,12 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx) if (!dwarf2_find_attribute(di, DW_AT_low_pc, &low_pc)) low_pc.u.uvalue = 0; + + if (!dwarf2_find_attribute(di, DW_AT_language, &language)) + language.u.uvalue = DW_LANG_C; + + ctx->language = language.u.uvalue; + ctx->compiland = symt_new_compiland(ctx->module_ctx->module, ctx->module_ctx->load_offset + low_pc.u.uvalue, source_new(ctx->module_ctx->module, comp_dir.u.string, name.u.string)); dwarf2_cache_cuhead(ctx->module_ctx->module->format_info[DFI_DWARF]->u.dwarf2_info, ctx->compiland, &ctx->head);

1 0

Stefan Dösinger : wined3d: Move clear box clipping to cpu_blitter_clear.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 122643b6e28089a86404562ba21395bfde61ec85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=122643b6e28089a86404562b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 13 15:54:34 2022 +0300 wined3d: Move clear box clipping to cpu_blitter_clear. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 35 +++++++++++++++++++++-------------- dlls/wined3d/view.c | 14 ++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 37 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5feeba3be2d..448c8689342 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1276,17 +1276,9 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, c = wined3d_format_convert_from_float(view->format, colour); bpp = view->format->byte_count; - w = min(box->right, view->width) - min(box->left, view->width); - h = min(box->bottom, view->height) - min(box->top, view->height); - if (view->resource->type != WINED3D_RTYPE_TEXTURE_3D) - { - d = 1; - } - else - { - d = wined3d_texture_get_level_depth(texture, level); - d = min(box->back, d) - min(box->front, d); - } + w = box->right - box->left; + h = box->bottom - box->top; + d = box->back - box->front; map_binding = texture->resource.map_binding; if (!wined3d_texture_load_location(texture, view->sub_resource_idx, context, map_binding)) @@ -1361,13 +1353,22 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, context_release(context); } +static bool wined3d_box_intersect(struct wined3d_box *ret, const struct wined3d_box *b1, + const struct wined3d_box *b2) +{ + wined3d_box_set(ret, max(b1->left, b2->left), max(b1->top, b2->top), + min(b1->right, b2->right), min(b1->bottom, b2->bottom), + max(b1->front, b2->front), min(b1->back, b2->back)); + return ret->right > ret->left && ret->bottom > ret->top && ret->back > ret->front; +} + static void cpu_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { struct wined3d_color c = {depth, 0.0f, 0.0f, 0.0f}; + struct wined3d_box box, box_clip, box_view; struct wined3d_rendertarget_view *view; - struct wined3d_box box; unsigned int i, j; if (!rect_count) @@ -1393,7 +1394,11 @@ static void cpu_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de for (j = 0; j < rt_count; ++j) { if ((view = fb->render_targets[j])) - surface_cpu_blt_colour_fill(view, &box, colour); + { + wined3d_rendertarget_view_get_box(view, &box_view); + if (wined3d_box_intersect(&box_clip, &box_view, &box)) + surface_cpu_blt_colour_fill(view, &box_clip, colour); + } } } @@ -1403,7 +1408,9 @@ static void cpu_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de || (view->format->stencil_size && !(flags & WINED3DCLEAR_STENCIL))) FIXME("Clearing %#x on %s.\n", flags, debug_d3dformat(view->format->id)); - surface_cpu_blt_colour_fill(view, &box, &c); + wined3d_rendertarget_view_get_box(view, &box_view); + if (wined3d_box_intersect(&box_clip, &box_view, &box)) + surface_cpu_blt_colour_fill(view, &box_clip, &c); } } } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 752563508c8..f2dea8f0f9a 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -534,6 +534,20 @@ DWORD wined3d_rendertarget_view_get_locations(const struct wined3d_rendertarget_ return ret; } +void wined3d_rendertarget_view_get_box(struct wined3d_rendertarget_view *view, + struct wined3d_box *box) +{ + if (view->resource->type != WINED3D_RTYPE_TEXTURE_3D) + { + wined3d_box_set(box, 0, 0, view->width, view->height, 0, 1); + } + else + { + struct wined3d_texture *texture = texture_from_resource(view->resource); + wined3d_texture_get_level_box(texture, view->sub_resource_idx, box); + } +} + static void wined3d_render_target_view_gl_cs_init(void *object) { struct wined3d_rendertarget_view_gl *view_gl = object; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 385c84ffcbf..cad697e9d23 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5286,6 +5286,8 @@ struct wined3d_rendertarget_view void wined3d_rendertarget_view_cleanup(struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarget_view *view, const struct wined3d_context *context, unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; +void wined3d_rendertarget_view_get_box(struct wined3d_rendertarget_view *view, + struct wined3d_box *box) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_invalidate_location(struct wined3d_rendertarget_view *view, DWORD location) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *view,

1 0

Nikolay Sivov : d3drm/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 6ff9e47fb7cca6a54737aa8df0b83bc90ba73c22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ff9e47fb7cca6a54737aa8d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 13 11:30:10 2022 +0300 d3drm/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/Makefile.in | 1 - dlls/d3drm/tests/d3drm.c | 3117 +++++++++++++++++++++--------------------- dlls/d3drm/tests/vector.c | 8 +- 3 files changed, 1561 insertions(+), 1565 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ff9e47fb7cca6a54737…

1 0

Henri Verbeet : maintainers: Update the Direct3D section.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 7d297cb37ae2236445b29423b03073ee015b8739 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d297cb37ae2236445b29423… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 12 19:13:28 2022 +0200 maintainers: Update the Direct3D section. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 14fe2e0cb9b..c569409be90 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -62,7 +62,9 @@ M: Henri Verbeet <hverbeet(a)codeweavers.com> F: dlls/d2d*/ Direct3D -M: Henri Verbeet <hverbeet(a)codeweavers.com> +M: Zebediah Figura <z.figura12(a)gmail.com> +M: Jan Sikorski <jsikorski(a)codeweavers.com> +P: Henri Verbeet <hverbeet(a)codeweavers.com> P: Stefan Dösinger <stefan(a)codeweavers.com> P: Matteo Bruni <mbruni(a)codeweavers.com> F: dlls/d3d10core/

1 0

Jactry Zeng : dbghelp: Use RtlGetVersion() for system version detection instead.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: wine Branch: master Commit: 22ea4cd29e2bd44d3854480ed12e4b294ac802df URL: https://source.winehq.org/git/wine.git/?a=commit;h=22ea4cd29e2bd44d3854480e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu May 12 01:57:50 2022 -0500 dbghelp: Use RtlGetVersion() for system version detection instead. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/minidump.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 172847529f1..4d3818a8f54 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -607,7 +607,7 @@ static unsigned dump_system_info(struct dump_context* dc) { MINIDUMP_SYSTEM_INFO mdSysInfo; SYSTEM_INFO sysInfo; - OSVERSIONINFOW osInfo; + RTL_OSVERSIONINFOEXW osInfo; DWORD written; ULONG slen; DWORD wine_extra = 0; @@ -620,7 +620,7 @@ static unsigned dump_system_info(struct dump_context* dc) GetSystemInfo(&sysInfo); osInfo.dwOSVersionInfoSize = sizeof(osInfo); - GetVersionExW(&osInfo); + RtlGetVersion(&osInfo); wine_get_build_id = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_build_id"); wine_get_host_version = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_host_version");

1 0