April 2022 - Wine-commits - list.winehq.org

Zhiyi Zhang : apisetschema: Add api-ms-win-core-winrt-robuffer-l1-1-0.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 5a162a763f8a7d9587803a586584f1aace1ce4b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a162a763f8a7d9587803a58… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Apr 25 16:08:35 2022 +0800 apisetschema: Add api-ms-win-core-winrt-robuffer-l1-1-0. Required for Iragon: Prologue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/apisetschema/apisetschema.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/apisetschema/apisetschema.spec b/dlls/apisetschema/apisetschema.spec index dce332e51fb..b13d00f8844 100644 --- a/dlls/apisetschema/apisetschema.spec +++ b/dlls/apisetschema/apisetschema.spec @@ -147,6 +147,7 @@ apiset api-ms-win-core-winrt-error-l1-1-1 = combase.dll apiset api-ms-win-core-winrt-errorprivate-l1-1-1 = combase.dll apiset api-ms-win-core-winrt-l1-1-0 = combase.dll apiset api-ms-win-core-winrt-registration-l1-1-0 = combase.dll +apiset api-ms-win-core-winrt-robuffer-l1-1-0 = wintypes.dll apiset api-ms-win-core-winrt-roparameterizediid-l1-1-0 = combase.dll apiset api-ms-win-core-winrt-string-l1-1-1 = combase.dll apiset api-ms-win-core-wow64-l1-1-1 = kernelbase.dll

1 0

Eric Pouech : include: Don't use long types in nsi.h.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 3720c45a46c5710a2ef27c463f1d9ec87a5a6d2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3720c45a46c5710a2ef27c46… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 25 09:35:22 2022 +0100 include: Don't use long types in nsi.h. It'll make things simpler from unixlib when long types are enabled. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/nsi.h | 304 ++++++++++++++++++++++++++--------------------------- 1 file changed, 152 insertions(+), 152 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3720c45a46c5710a2ef2…

1 0

Eric Pouech : nsi/tests: Enable compilation with long types.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 4defa8d46057d115bfa60204538bd799a20bc717 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4defa8d46057d115bfa60204… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 25 09:35:23 2022 +0100 nsi/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/tests/Makefile.in | 1 - dlls/nsi/tests/nsi.c | 196 ++++++++++++++++++++++----------------------- 2 files changed, 98 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4defa8d46057d115bfa6…

1 0

Eric Pouech : nsiproxy: Don't use long types in internal structure / helpers.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: f34f38bc2008165dbc8e2dec8e494aeccbc60d65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f34f38bc2008165dbc8e2dec… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 25 09:35:24 2022 +0100 nsiproxy: Don't use long types in internal structure / helpers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/ip.c | 84 ++++++++++++++++++------------------ dlls/nsiproxy.sys/ndis.c | 20 ++++----- dlls/nsiproxy.sys/nsiproxy_private.h | 18 ++++---- dlls/nsiproxy.sys/tcp.c | 32 +++++++------- dlls/nsiproxy.sys/udp.c | 16 +++---- dlls/nsiproxy.sys/unix_private.h | 36 ++++++++-------- 6 files changed, 103 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f34f38bc2008165dbc8e…

1 0

Eric Pouech : nsiproxy: Don't use long types for local types.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: ff51493574aa70646c9f4bbcddfb1dde12ad55ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff51493574aa70646c9f4bbc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 25 09:35:25 2022 +0100 nsiproxy: Don't use long types for local types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/device.c | 6 +++--- dlls/nsiproxy.sys/icmp_echo.c | 2 +- dlls/nsiproxy.sys/ip.c | 50 +++++++++++++++++++++---------------------- dlls/nsiproxy.sys/ndis.c | 30 +++++++++++++------------- dlls/nsiproxy.sys/nsi.c | 4 ++-- dlls/nsiproxy.sys/tcp.c | 10 ++++----- dlls/nsiproxy.sys/udp.c | 6 +++--- 7 files changed, 54 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ff51493574aa70646c9f…

1 0

Eric Pouech : nsiproxy: Add intermediate variables for sscanf on ULONG.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 73974636bde9897adf78e18332949f7d999bc69a URL: https://source.winehq.org/git/wine.git/?a=commit;h=73974636bde9897adf78e183… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 25 09:35:26 2022 +0100 nsiproxy: Add intermediate variables for sscanf on ULONG. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/tcp.c | 7 +++++-- dlls/nsiproxy.sys/udp.c | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 8e2d7e749a7..0dbee8418b9 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -534,6 +534,7 @@ static NTSTATUS tcp_conns_enumerate_all( UINT filter, struct nsi_tcp_conn_key *k FILE *fp; char buf[512], *ptr; int inode; + UINT laddr, raddr; if (!(fp = fopen( "/proc/net/tcp", "r" ))) return ERROR_NOT_SUPPORTED; @@ -547,15 +548,17 @@ static NTSTATUS tcp_conns_enumerate_all( UINT filter, struct nsi_tcp_conn_key *k while ((ptr = fgets( buf, sizeof(buf), fp ))) { if (sscanf( ptr, "%*x: %x:%hx %x:%hx %x %*s %*s %*s %*s %*s %d", - &key.local.Ipv4.sin_addr.WS_s_addr, &key.local.Ipv4.sin_port, - &key.remote.Ipv4.sin_addr.WS_s_addr, &key.remote.Ipv4.sin_port, + &laddr, &key.local.Ipv4.sin_port, + &raddr, &key.remote.Ipv4.sin_port, &dyn.state, &inode ) != 6) continue; dyn.state = tcp_state_to_mib_state( dyn.state ); if (filter && filter != dyn.state ) continue; key.local.Ipv4.sin_family = key.remote.Ipv4.sin_family = WS_AF_INET; + key.local.Ipv4.sin_addr.WS_s_addr = laddr; key.local.Ipv4.sin_port = htons( key.local.Ipv4.sin_port ); + key.remote.Ipv4.sin_addr.WS_s_addr = raddr; key.remote.Ipv4.sin_port = htons( key.remote.Ipv4.sin_port ); if (num < *count) diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index 0ba2f835e44..2248d74234b 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -223,6 +223,7 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, UINT key_size, void FILE *fp; char buf[512], *ptr; int inode; + UINT addr; if (!(fp = fopen( "/proc/net/udp", "r" ))) return ERROR_NOT_SUPPORTED; @@ -235,10 +236,11 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, UINT key_size, void while ((ptr = fgets( buf, sizeof(buf), fp ))) { if (sscanf( ptr, "%*u: %x:%hx %*s %*s %*s %*s %*s %*s %*s %d", - &key.local.Ipv4.sin_addr.WS_s_addr, &key.local.Ipv4.sin_port, &inode ) != 3) + &addr, &key.local.Ipv4.sin_port, &inode ) != 3) continue; key.local.Ipv4.sin_family = WS_AF_INET; + key.local.Ipv4.sin_addr.WS_s_addr = addr; key.local.Ipv4.sin_port = htons( key.local.Ipv4.sin_port ); stat.pid = find_owning_pid( pid_map, pid_map_size, inode );

1 0

Eric Pouech : nsiproxy: Enable compilation with long types.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: d0833a0edf8ad6db3c4224c8b91a93a225311fd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0833a0edf8ad6db3c4224c8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 25 09:35:27 2022 +0100 nsiproxy: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/Makefile.in | 1 - dlls/nsiproxy.sys/device.c | 10 +++++----- dlls/nsiproxy.sys/tcp.c | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in index 3b83a4ddaac..87f7e165ef4 100644 --- a/dlls/nsiproxy.sys/Makefile.in +++ b/dlls/nsiproxy.sys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = nsiproxy.sys UNIXLIB = nsiproxy.so IMPORTS = ntoskrnl diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index cc9b00d3359..d3845829a85 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -266,7 +266,7 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); NTSTATUS status; - TRACE( "ioctl %x insize %u outsize %u\n", + TRACE( "ioctl %lx insize %lu outsize %lu\n", irpsp->Parameters.DeviceIoControl.IoControlCode, irpsp->Parameters.DeviceIoControl.InputBufferLength, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); @@ -290,7 +290,7 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) break; default: - FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); + FIXME( "ioctl %lx not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); status = STATUS_NOT_SUPPORTED; break; } @@ -316,7 +316,7 @@ static int add_device( DRIVER_OBJECT *driver ) status = IoCreateSymbolicLink( &link, &name ); if (status) { - FIXME( "failed to create device error %x\n", status ); + FIXME( "failed to create device error %lx\n", status ); return 0; } @@ -341,7 +341,7 @@ static DWORD WINAPI listen_thread_proc( void *arg ) params.reply_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; status = nsiproxy_call( icmp_listen, &params ); - TRACE( "icmp_listen rets %08x\n", status ); + TRACE( "icmp_listen rets %08lx\n", status ); EnterCriticalSection( &nsiproxy_cs ); @@ -375,7 +375,7 @@ static void handle_queued_send_echo( IRP *irp ) params.dst = &in->dst; status = nsiproxy_call( icmp_send_echo, &params ); - TRACE( "icmp_send_echo rets %08x\n", status ); + TRACE( "icmp_send_echo rets %08lx\n", status ); if (status != STATUS_PENDING) { diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 0dbee8418b9..5734c4d9ee0 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -404,7 +404,7 @@ unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entries, UIN unsigned int i, len_socket; char socket[32]; - sprintf( socket, "socket:[%lu]", inode ); + sprintf( socket, "socket:[%zu]", inode ); len_socket = strlen( socket ); for (i = 0; i < num_entries; i++) {

1 0

Martin Storsjö : include: Add a declaration of _InterlockedExchangeAdd64 for MSVC mode for aarch64.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 55177136cc189e71b50b67786309e86fcb533fb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55177136cc189e71b50b6778… Author: Martin Storsjö <martin(a)martin.st> Date: Mon Apr 25 11:46:29 2022 +0300 include: Add a declaration of _InterlockedExchangeAdd64 for MSVC mode for aarch64. This matches the corresponding declaration for x86_64. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 31c6b7d69e9..e853ddbc7ae 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6371,6 +6371,10 @@ static FORCEINLINE void MemoryBarrier(void) #elif defined(__aarch64__) +#pragma intrinsic(_InterlockedExchangeAdd64) + +long long _InterlockedExchangeAdd64(long long volatile *, long long); + static FORCEINLINE void MemoryBarrier(void) { __dmb(_ARM64_BARRIER_SY);

1 0

Martin Storsjö : include: Add declarations of _alloca and alloca for MSVC mode.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 8f8b802e12d458fe97b4c0ddb11e2e5c353c354d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f8b802e12d458fe97b4c0dd… Author: Martin Storsjö <martin(a)martin.st> Date: Mon Apr 25 11:46:39 2022 +0300 include: Add declarations of _alloca and alloca for MSVC mode. This fixes builds with recent Clang 15 (which still is in development), which errors out on implicit declarations. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/malloc.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/msvcrt/malloc.h b/include/msvcrt/malloc.h index 5bb843be5a6..fcbadbeb4e0 100644 --- a/include/msvcrt/malloc.h +++ b/include/msvcrt/malloc.h @@ -77,6 +77,10 @@ _ACRTIMP void* __cdecl _aligned_offset_realloc(void*,size_t,size_t,size_t); _ACRTIMP size_t __cdecl _get_sbh_threshold(void); _ACRTIMP int __cdecl _set_sbh_threshold(size_t size); +#ifdef _MSC_VER +void *_alloca(size_t size); +#endif + #ifdef __cplusplus } #endif @@ -84,6 +88,8 @@ _ACRTIMP int __cdecl _set_sbh_threshold(size_t size); # ifdef __GNUC__ # define _alloca(x) __builtin_alloca((x)) # define alloca(x) __builtin_alloca((x)) +# elif defined(_MSC_VER) +# define alloca(x) _alloca((x)) # endif #endif /* __WINE_MALLOC_H */

1 0

Louis Lenders : wbemprox: Add Win32_PageFileUsage class.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: wine Branch: master Commit: 3e35673b7880ff0ae9eb73171269c524292e1aa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e35673b7880ff0ae9eb7317… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun Apr 24 23:41:10 2022 +0200 wbemprox: Add Win32_PageFileUsage class. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52887 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 13 +++++++++++++ dlls/wbemprox/tests/query.c | 26 ++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 07a5873208f..69d74d756f8 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -260,6 +260,10 @@ static const struct column col_operatingsystem[] = { L"TotalVisibleMemorySize", CIM_UINT64 }, { L"Version", CIM_STRING|COL_FLAG_DYNAMIC }, }; +static const struct column col_pagefileusage[] = +{ + { L"Name", CIM_STRING }, +}; static const struct column col_param[] = { { L"Class", CIM_STRING }, @@ -687,6 +691,10 @@ struct record_operatingsystem UINT64 totalvisiblememorysize; const WCHAR *version; }; +struct record_pagefileusage +{ + const WCHAR *name; +}; struct record_param { const WCHAR *class; @@ -911,6 +919,10 @@ static const struct record_associator data_associator[] = { L"Win32_DiskDriveToDiskPartition", L"Win32_DiskPartition", L"Win32_DiskDrive" }, { L"Win32_LogicalDiskToPartition", L"Win32_LogicalDisk", L"Win32_DiskPartition" }, }; +static const struct record_pagefileusage data_pagefileusage[] = +{ + { L"c:\\pagefile.sys", }, +}; static const struct record_param data_param[] = { { L"__SystemSecurity", L"GetSD", -1, L"ReturnValue", CIM_UINT32 }, @@ -4148,6 +4160,7 @@ static struct table cimv2_builtin_classes[] = { L"Win32_NetworkAdapter", C(col_networkadapter), 0, 0, NULL, fill_networkadapter }, { L"Win32_NetworkAdapterConfiguration", C(col_networkadapterconfig), 0, 0, NULL, fill_networkadapterconfig }, { L"Win32_OperatingSystem", C(col_operatingsystem), 0, 0, NULL, fill_operatingsystem }, + { L"Win32_PageFileUsage", C(col_pagefileusage), D(data_pagefileusage) }, { L"Win32_PhysicalMedia", C(col_physicalmedia), D(data_physicalmedia) }, { L"Win32_PhysicalMemory", C(col_physicalmemory), 0, 0, NULL, fill_physicalmemory }, { L"Win32_PnPEntity", C(col_pnpentity), 0, 0, NULL, fill_pnpentity }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 0a8c97ad166..e0fe78b7fd1 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1475,6 +1475,31 @@ static void test_Win32_ComputerSystemProduct( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_PageFileUsage( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_PageFileUsage" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK , "got %#lx\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_PhysicalMemory( IWbemServices *services ) { BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_PhysicalMemory" ); @@ -2226,6 +2251,7 @@ START_TEST(query) test_Win32_NetworkAdapter( services ); test_Win32_NetworkAdapterConfiguration( services ); test_Win32_OperatingSystem( services ); + test_Win32_PageFileUsage( services ); test_Win32_PhysicalMemory( services ); test_Win32_PnPEntity( services ); test_Win32_Printer( services );

1 0