August 2021 - Wine-commits - list.winehq.org

Huw Davies : iphlpapi: Implement GetInterfaceInfo() on top of nsi.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 203350e0307beee55479e857771e9ece29b3c401 URL: https://source.winehq.org/git/wine.git/?a=commit;h=203350e0307beee55479e857… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 19 08:53:41 2021 +0100 iphlpapi: Implement GetInterfaceInfo() on top of nsi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 49 +++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8a8b6b3e7cf..494df48752b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -67,6 +67,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); #define CHARS_IN_GUID 39 +static const WCHAR device_tcpip[] = {'\\','D','E','V','I','C','E','\\','T','C','P','I','P','_',0}; + DWORD WINAPI AllocateAndGetIfTableFromStack( MIB_IFTABLE **table, BOOL sort, HANDLE heap, DWORD flags ); DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL sort, HANDLE heap, DWORD flags ); @@ -1573,10 +1575,8 @@ DWORD WINAPI GetIcmpStatisticsEx( MIB_ICMP_EX *stats, DWORD family ) static void if_row_fill( MIB_IFROW *row, struct nsi_ndis_ifinfo_rw *rw, struct nsi_ndis_ifinfo_dynamic *dyn, struct nsi_ndis_ifinfo_static *stat ) { - static const WCHAR name_prefix[] = {'\\','D','E','V','I','C','E','\\','T','C','P','I','P','_',0}; - - memcpy( row->wszName, name_prefix, sizeof(name_prefix) ); - ConvertGuidToStringW( &stat->if_guid, row->wszName + ARRAY_SIZE(name_prefix) - 1, CHARS_IN_GUID ); + memcpy( row->wszName, device_tcpip, sizeof(device_tcpip) ); + ConvertGuidToStringW( &stat->if_guid, row->wszName + ARRAY_SIZE(device_tcpip) - 1, CHARS_IN_GUID ); row->dwIndex = stat->if_index; row->dwType = stat->type; row->dwMtu = dyn->mtu; @@ -1922,31 +1922,44 @@ DWORD WINAPI GetIfTable2( MIB_IF_TABLE2 **table ) */ DWORD WINAPI GetInterfaceInfo( IP_INTERFACE_INFO *table, ULONG *size ) { - MIB_IFTABLE *if_table; - DWORD err, needed, i; + NET_LUID *keys; + struct nsi_ndis_ifinfo_static *stat; + DWORD err, count, num = 0, needed, i; - TRACE("table %p, size %p\n", table, size ); + TRACE( "table %p, size %p\n", table, size ); if (!size) return ERROR_INVALID_PARAMETER; - err = AllocateAndGetIfTableFromStack( &if_table, 0, GetProcessHeap(), 0 ); + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, + (void **)&keys, sizeof(*keys), NULL, 0, NULL, 0, + (void **)&stat, sizeof(*stat), &count, 0 ); if (err) return err; - needed = FIELD_OFFSET(IP_INTERFACE_INFO, Adapter[if_table->dwNumEntries]); + for (i = 0; i < count; i++) + { + num++; + } + + needed = FIELD_OFFSET(IP_INTERFACE_INFO, Adapter[num]); if (!table || *size < needed) { *size = needed; - heap_free( if_table ); - return ERROR_INSUFFICIENT_BUFFER; + err = ERROR_INSUFFICIENT_BUFFER; + goto done; } - table->NumAdapters = if_table->dwNumEntries; - for (i = 0; i < if_table->dwNumEntries; i++) + table->NumAdapters = num; + for (i = 0, num = 0; i < count; i++) { - table->Adapter[i].Index = if_table->table[i].dwIndex; - strcpyW( table->Adapter[i].Name, if_table->table[i].wszName ); + IP_ADAPTER_INDEX_MAP *row; + + row = table->Adapter + num++; + row->Index = stat[i].if_index; + memcpy( row->Name, device_tcpip, sizeof(device_tcpip) ); + ConvertGuidToStringW( &stat[i].if_guid, row->Name + ARRAY_SIZE(device_tcpip) - 1, CHARS_IN_GUID ); } - heap_free( if_table ); - return ERROR_SUCCESS; +done: + NsiFreeTable( keys, NULL, NULL, stat ); + return err; } static int ipaddrrow_cmp( const void *a, const void *b ) @@ -1957,7 +1970,7 @@ static int ipaddrrow_cmp( const void *a, const void *b ) /****************************************************************** * GetIpAddrTable (IPHLPAPI.@) * - * Get interface-to-IP address mapping table. + * Get interface-to-IP address mapping table. * * PARAMS * table [Out] buffer for mapping table

1 0

Huw Davies : iphlpapi: Don't enumerate loopback interfaces in GetInterfaceInfo().
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 8d7720b0ed39aa628afc7073df65a64e49c27078 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d7720b0ed39aa628afc7073… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 19 08:53:42 2021 +0100 iphlpapi: Don't enumerate loopback interfaces in GetInterfaceInfo(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 2 ++ dlls/iphlpapi/tests/iphlpapi.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 494df48752b..ab72f766e97 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1936,6 +1936,7 @@ DWORD WINAPI GetInterfaceInfo( IP_INTERFACE_INFO *table, ULONG *size ) for (i = 0; i < count; i++) { + if (stat[i].type == IF_TYPE_SOFTWARE_LOOPBACK) continue; num++; } @@ -1952,6 +1953,7 @@ DWORD WINAPI GetInterfaceInfo( IP_INTERFACE_INFO *table, ULONG *size ) { IP_ADAPTER_INDEX_MAP *row; + if (stat[i].type == IF_TYPE_SOFTWARE_LOOPBACK) continue; row = table->Adapter + num++; row->Index = stat[i].if_index; memcpy( row->Name, device_tcpip, sizeof(device_tcpip) ); diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 5ec2f2eaba2..d1881616d30 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1109,7 +1109,6 @@ static void testGetInterfaceInfo(void) GetIfEntry( &row ); ok( !wcscmp( buf->Adapter[i].Name, row.wszName ), "got %s vs %s\n", debugstr_w( buf->Adapter[i].Name ), debugstr_w( row.wszName ) ); -todo_wine_if( row.dwType == IF_TYPE_SOFTWARE_LOOPBACK) ok( row.dwType != IF_TYPE_SOFTWARE_LOOPBACK, "got loopback\n" ); } HeapFree(GetProcessHeap(), 0, buf);

1 0

Huw Davies : iphlpapi: Implement GetAdapterIndex() by parsing the GUID from the name.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 502fd1a4baee3a16d5102b53eedc9b07e3ad5a20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=502fd1a4baee3a16d5102b53… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 19 08:53:43 2021 +0100 iphlpapi: Implement GetAdapterIndex() by parsing the GUID from the name. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index ab72f766e97..ff6b858d48b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -69,7 +69,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); static const WCHAR device_tcpip[] = {'\\','D','E','V','I','C','E','\\','T','C','P','I','P','_',0}; -DWORD WINAPI AllocateAndGetIfTableFromStack( MIB_IFTABLE **table, BOOL sort, HANDLE heap, DWORD flags ); DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL sort, HANDLE heap, DWORD flags ); static const NPI_MODULEID *ip_module_id( USHORT family ) @@ -533,10 +532,10 @@ DWORD WINAPI FlushIpNetTable(DWORD dwIfIndex) * ptr [In] pointer to the buffer to free * */ -void WINAPI FreeMibTable(void *ptr) +void WINAPI FreeMibTable( void *ptr ) { - TRACE("(%p)\n", ptr); - HeapFree(GetProcessHeap(), 0, ptr); + TRACE( "(%p)\n", ptr ); + heap_free( ptr ); } /****************************************************************** @@ -547,33 +546,21 @@ void WINAPI FreeMibTable(void *ptr) * PARAMS * adapter_name [In] unicode string with the adapter name * index [Out] returns found interface index - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h */ DWORD WINAPI GetAdapterIndex( WCHAR *adapter_name, ULONG *index ) { - MIB_IFTABLE *if_table; - DWORD err, i; + NET_LUID luid; + GUID guid; + DWORD err; TRACE( "name %s, index %p\n", debugstr_w( adapter_name ), index ); - err = AllocateAndGetIfTableFromStack( &if_table, 0, GetProcessHeap(), 0 ); + if (strlenW( adapter_name ) < strlenW( device_tcpip )) return ERROR_INVALID_PARAMETER; + err = ConvertStringToGuidW( adapter_name + strlenW( device_tcpip ), &guid ); if (err) return err; - - err = ERROR_INVALID_PARAMETER; - for (i = 0; i < if_table->dwNumEntries; i++) - { - if (!strcmpW( adapter_name, if_table->table[i].wszName )) - { - *index = if_table->table[i].dwIndex; - err = ERROR_SUCCESS; - break; - } - } - heap_free( if_table ); - return err; + err = ConvertInterfaceGuidToLuid( &guid, &luid ); + if (err) return err; + return ConvertInterfaceLuidToIndex( &luid, index ); } static DWORD get_wins_servers( SOCKADDR_INET **servers )

1 0

Huw Davies : iphlpapi: Use the ANSI codepage for the convert interface name functions.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 7992178df58830aa998da58a41df7fcf001fd3fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7992178df58830aa998da58a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 19 08:53:44 2021 +0100 iphlpapi: Use the ANSI codepage for the convert interface name functions. The name in these functions is now not the Unix interface name. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index ff6b858d48b..408ac14bd1b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -4265,7 +4265,7 @@ DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID *luid, char *name, SIZE_ err = ConvertInterfaceLuidToNameW( luid, nameW, ARRAY_SIZE(nameW) ); if (err) return err; - if (!WideCharToMultiByte( CP_UNIXCP, 0, nameW, -1, name, len, NULL, NULL )) + if (!WideCharToMultiByte( CP_ACP, 0, nameW, -1, name, len, NULL, NULL )) err = GetLastError(); return err; } @@ -4340,7 +4340,7 @@ DWORD WINAPI ConvertInterfaceNameToLuidA(const char *name, NET_LUID *luid) TRACE( "(%s %p)\n", debugstr_a(name), luid ); if (!name) return ERROR_INVALID_NAME; - if (!MultiByteToWideChar( CP_UNIXCP, 0, name, -1, nameW, ARRAY_SIZE(nameW) )) + if (!MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, ARRAY_SIZE(nameW) )) return GetLastError(); return ConvertInterfaceNameToLuidW( nameW, luid );

1 0

Huw Davies : iphlpapi: Remove no longer needed libraries.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: e39d5967c74868d1f05b3bde20fbb2c31ad5a5a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e39d5967c74868d1f05b3bde… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 19 08:53:45 2021 +0100 iphlpapi: Remove no longer needed libraries. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index 326cf8bf75e..9d7345251bd 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -1,7 +1,6 @@ MODULE = iphlpapi.dll IMPORTLIB = iphlpapi IMPORTS = advapi32 dnsapi nsi uuid -EXTRALIBS = $(KSTAT_LIBS) $(PROCSTAT_LIBS) C_SRCS = \ icmp.c \

1 0

Huw Davies : configure: Remove no longer used checks for libkstat.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 028c9832fe0fc67cf9e624054ae157e5e67ae041 URL: https://source.winehq.org/git/wine.git/?a=commit;h=028c9832fe0fc67cf9e62405… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 19 08:53:46 2021 +0100 configure: Remove no longer used checks for libkstat. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 51 --------------------------------------------------- configure.ac | 9 --------- include/config.h.in | 6 ------ 3 files changed, 66 deletions(-) diff --git a/configure b/configure index dbbe3a5395d..d7ae3b5f437 100755 --- a/configure +++ b/configure @@ -639,7 +639,6 @@ VKD3D_CFLAGS NETAPI_LIBS NETAPI_CFLAGS PROCSTAT_LIBS -KSTAT_LIBS MPG123_LIBS MPG123_CFLAGS TIFF_LIBS @@ -7501,7 +7500,6 @@ for ac_header in \ gsm/gsm.h \ ieeefp.h \ inet/mib2.h \ - kstat.h \ libproc.h \ link.h \ linux/cdrom.h \ @@ -16480,54 +16478,6 @@ then enable_xaudio2_9=${enable_xaudio2_9:-no} fi -if test "$ac_cv_header_kstat_h" = "yes" -then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kstat_open in -lkstat" >&5 -$as_echo_n "checking for kstat_open in -lkstat... " >&6; } -if ${ac_cv_lib_kstat_kstat_open+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lkstat $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char kstat_open (); -int -main () -{ -return kstat_open (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_kstat_kstat_open=yes -else - ac_cv_lib_kstat_kstat_open=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kstat_kstat_open" >&5 -$as_echo "$ac_cv_lib_kstat_kstat_open" >&6; } -if test "x$ac_cv_lib_kstat_kstat_open" = xyes; then : - -$as_echo "#define HAVE_LIBKSTAT 1" >>confdefs.h - - KSTAT_LIBS="-lkstat" - -fi - -fi - if test "$ac_cv_header_libprocstat_h" = "yes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for procstat_open_sysctl in -lprocstat" >&5 @@ -20034,7 +19984,6 @@ TIFF_CFLAGS = $TIFF_CFLAGS TIFF_LIBS = $TIFF_LIBS MPG123_CFLAGS = $MPG123_CFLAGS MPG123_LIBS = $MPG123_LIBS -KSTAT_LIBS = $KSTAT_LIBS PROCSTAT_LIBS = $PROCSTAT_LIBS NETAPI_CFLAGS = $NETAPI_CFLAGS NETAPI_LIBS = $NETAPI_LIBS diff --git a/configure.ac b/configure.ac index a143f6d3d2a..c58076ed1d6 100644 --- a/configure.ac +++ b/configure.ac @@ -468,7 +468,6 @@ AC_CHECK_HEADERS(\ gsm/gsm.h \ ieeefp.h \ inet/mib2.h \ - kstat.h \ libproc.h \ link.h \ linux/cdrom.h \ @@ -1944,14 +1943,6 @@ then enable_xaudio2_9=${enable_xaudio2_9:-no} fi -dnl **** Check for libkstat **** -if test "$ac_cv_header_kstat_h" = "yes" -then - AC_CHECK_LIB(kstat,kstat_open, - [AC_DEFINE(HAVE_LIBKSTAT, 1, [Define to 1 if you have the `kstat' library (-lkstat).]) - AC_SUBST(KSTAT_LIBS,"-lkstat")]) -fi - dnl **** Check for libprocstat **** if test "$ac_cv_header_libprocstat_h" = "yes" then diff --git a/include/config.h.in b/include/config.h.in index 24f7b64ffd3..b1918d46ed1 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -234,9 +234,6 @@ /* Define to 1 if you have the <krb5/krb5.h> header file. */ #undef HAVE_KRB5_KRB5_H -/* Define to 1 if you have the <kstat.h> header file. */ -#undef HAVE_KSTAT_H - /* Define to 1 if you have the <lber.h> header file. */ #undef HAVE_LBER_H @@ -279,9 +276,6 @@ /* Define to 1 if you have the `gettextpo' library (-lgettextpo). */ #undef HAVE_LIBGETTEXTPO -/* Define to 1 if you have the `kstat' library (-lkstat). */ -#undef HAVE_LIBKSTAT - /* Define to 1 if you have the `procstat' library (-lprocstat). */ #undef HAVE_LIBPROCSTAT

1 0

Huw Davies : server: Remove check for macOS version < 10.5.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 68b840953d52bcfca0d9aaeaafc60167cf267151 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68b840953d52bcfca0d9aaea… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 19 08:59:59 2021 +0100 server: Remove check for macOS version < 10.5. Our stated minimum requirement is 10.8. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/server/fd.c b/server/fd.c index b953da2ab85..de7c5d7e36d 100644 --- a/server/fd.c +++ b/server/fd.c @@ -627,16 +627,6 @@ static int kqueue_fd = -1; static inline void init_epoll(void) { -#ifdef __APPLE__ /* kqueue support is broken in Mac OS < 10.5 */ - int mib[2]; - char release[32]; - size_t len = sizeof(release); - - mib[0] = CTL_KERN; - mib[1] = KERN_OSRELEASE; - if (sysctl( mib, 2, release, &len, NULL, 0 ) == -1) return; - if (atoi(release) < 9) return; -#endif kqueue_fd = kqueue(); }

1 0

Fabian Maurer : configure: Improve resolv lib test for glibc 2.34.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: a3bbf5137707abb548ff642826992b7069bef1de URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3bbf5137707abb548ff6428… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 19 00:53:56 2021 +0200 configure: Improve resolv lib test for glibc 2.34. res_init and res_query don't need lresolv on glibc 2.34. Added another test for ns_initparse and friends. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51635 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index d7ae3b5f437..5608de31912 100755 --- a/configure +++ b/configure @@ -14156,7 +14156,7 @@ else int main () { -if (!(_res.options & RES_INIT)) res_init(); res_query("foo",ns_c_in,0,0,0) +if (!(_res.options & RES_INIT)) res_init(); res_query("foo",ns_c_in,0,0,0); ns_initparse(0,0,0) ; return 0; } diff --git a/configure.ac b/configure.ac index c58076ed1d6..53c1a36a169 100644 --- a/configure.ac +++ b/configure.ac @@ -1498,7 +1498,7 @@ then AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif -#include <resolv.h>]],[[if (!(_res.options & RES_INIT)) res_init(); res_query("foo",ns_c_in,0,0,0)]])], +#include <resolv.h>]],[[if (!(_res.options & RES_INIT)) res_init(); res_query("foo",ns_c_in,0,0,0); ns_initparse(0,0,0)]])], [ac_cv_have_resolv=${lib:-"none required"}],[ac_cv_have_resolv="not found"]) test "x$ac_cv_have_resolv" = "xnot found" || break done

1 0

Zebediah Figura : ws2_32: Use malloc() instead of HeapAlloc().
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 357fb2be9b8a786081269cafce9cc384bf74632d URL: https://source.winehq.org/git/wine.git/?a=commit;h=357fb2be9b8a786081269caf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 18 23:25:48 2021 -0500 ws2_32: Use malloc() instead of HeapAlloc(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/async.c | 26 +++----- dlls/ws2_32/protocol.c | 141 +++++++++++++++++++++---------------------- dlls/ws2_32/socket.c | 72 +++++++++++----------- dlls/ws2_32/ws2_32_private.h | 2 +- 4 files changed, 116 insertions(+), 125 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=357fb2be9b8a78608126…

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM5 RDEF extensions.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: vkd3d Branch: master Commit: d509e7ead529ec058a02466b8d500db383f12ff0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d509e7ead529ec058a02466… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 17 12:39:01 2021 -0500 vkd3d-shader/hlsl: Write SM5 RDEF extensions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index cba56ee..9f5c18d 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -129,13 +129,18 @@ static D3D_SHADER_VARIABLE_TYPE sm4_base_type(const struct hlsl_type *type) static void write_sm4_type(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, struct hlsl_type *type) { const struct hlsl_type *array_type = get_array_type(type); + const char *name = array_type->name ? array_type->name : "<unnamed>"; + const struct hlsl_profile_info *profile = ctx->profile; unsigned int field_count = 0, array_size = 0; + size_t fields_offset = 0, name_offset = 0; struct hlsl_struct_field *field; - size_t fields_offset = 0; if (type->bytecode_offset) return; + if (profile->major_version >= 5) + name_offset = put_string(buffer, name); + if (type->type == HLSL_CLASS_ARRAY) array_size = get_array_size(type); @@ -162,6 +167,15 @@ static void write_sm4_type(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b put_u32(buffer, type->dimy | (type->dimx << 16)); put_u32(buffer, array_size | (field_count << 16)); put_u32(buffer, fields_offset); + + if (profile->major_version >= 5) + { + put_u32(buffer, 0); /* FIXME: unknown */ + put_u32(buffer, 0); /* FIXME: unknown */ + put_u32(buffer, 0); /* FIXME: unknown */ + put_u32(buffer, 0); /* FIXME: unknown */ + put_u32(buffer, name_offset); + } } static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) @@ -197,6 +211,18 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) put_u32(&buffer, 0); /* FIXME: compilation flags */ creator_position = put_u32(&buffer, 0); + if (profile->major_version >= 5) + { + put_u32(&buffer, TAG_RD11); + put_u32(&buffer, 15 * sizeof(uint32_t)); /* size of RDEF header including this header */ + put_u32(&buffer, 6 * sizeof(uint32_t)); /* size of buffer desc */ + put_u32(&buffer, 8 * sizeof(uint32_t)); /* size of binding desc */ + put_u32(&buffer, 10 * sizeof(uint32_t)); /* size of variable desc */ + put_u32(&buffer, 9 * sizeof(uint32_t)); /* size of type desc */ + put_u32(&buffer, 3 * sizeof(uint32_t)); /* size of member desc */ + put_u32(&buffer, 0); /* unknown; possibly a null terminator */ + } + /* Bound resources. */ resources_offset = bytecode_get_size(&buffer); @@ -293,6 +319,14 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) put_u32(&buffer, flags); put_u32(&buffer, 0); /* type */ put_u32(&buffer, 0); /* FIXME: default value */ + + if (profile->major_version >= 5) + { + put_u32(&buffer, 0); /* texture start */ + put_u32(&buffer, 0); /* texture count */ + put_u32(&buffer, 0); /* sampler start */ + put_u32(&buffer, 0); /* sampler count */ + } } } @@ -301,7 +335,8 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) { if (var->is_uniform && var->buffer == cbuffer) { - size_t var_offset = vars_start + j * 6 * sizeof(uint32_t); + const unsigned int var_size = (profile->major_version >= 5 ? 10 : 6); + size_t var_offset = vars_start + j * var_size * sizeof(uint32_t); size_t string_offset = put_string(&buffer, var->name); set_u32(&buffer, var_offset, string_offset);

1 0