July 2021 - Wine-Commits - list.winehq.org

Huw Davies : iphlpapi: Implement GetNumberOfInterfaces() on top of nsi.
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: 805e30ee43e370f45fdc17f28c206e3835a6e3c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=805e30ee43e370f45fdc17f2… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 8 08:59:59 2021 +0100 iphlpapi: Implement GetNumberOfInterfaces() 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 | 21 +++++++++------------ dlls/iphlpapi/tests/iphlpapi.c | 4 ---- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index b869570bac0..d8696f62ab7 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2376,21 +2376,18 @@ DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen) * RETURNS * NO_ERROR on success, ERROR_INVALID_PARAMETER if pdwNumIf is NULL. */ -DWORD WINAPI GetNumberOfInterfaces(PDWORD pdwNumIf) +DWORD WINAPI GetNumberOfInterfaces( DWORD *count ) { - DWORD ret; + DWORD err, num; - TRACE("pdwNumIf %p\n", pdwNumIf); - if (!pdwNumIf) - ret = ERROR_INVALID_PARAMETER; - else { - *pdwNumIf = get_interface_indices( FALSE, NULL ); - ret = NO_ERROR; - } - TRACE("returning %d\n", ret); - return ret; -} + TRACE( "count %p\n", count ); + if (!count) return ERROR_INVALID_PARAMETER; + err = NsiEnumerateObjectsAllParameters( 1, 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, NULL, 0, + NULL, 0, NULL, 0, NULL, 0, &num ); + *count = err ? 0 : num; + return err; +} /****************************************************************** * GetPerAdapterInfo (IPHLPAPI.@) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 87aeb99d6d9..bbd3ac2cc9e 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -138,10 +138,6 @@ static void testGetNumberOfInterfaces(void) } apiReturn = GetNumberOfInterfaces(&numInterfaces); - if (apiReturn == ERROR_NOT_SUPPORTED) { - skip("GetNumberOfInterfaces is not supported\n"); - return; - } ok(apiReturn == NO_ERROR, "GetNumberOfInterfaces returned %d, expected 0\n", apiReturn); }

1 0

Huw Davies : iphlpapi: Implement ConvertGuidToString[AW]().
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: 8f12e295ff8fbbc629dd21e42acaa7e9072a0b59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f12e295ff8fbbc629dd21e4… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 8 09:00:00 2021 +0100 iphlpapi: Implement ConvertGuidToString[AW](). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 4 ++-- dlls/iphlpapi/iphlpapi_main.c | 28 ++++++++++++++++++++++++++-- dlls/iphlpapi/tests/iphlpapi.c | 24 ++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 4299af36660..480b26c9315 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -10,8 +10,8 @@ @ stdcall AllocateAndGetUdpTableFromStack( ptr long long long ) @ stdcall CancelIPChangeNotify( ptr ) @ stdcall CancelMibChangeNotify2( ptr ) -#@ stub ConvertGuidToStringA -#@ stub ConvertGuidToStringW +@ stdcall ConvertGuidToStringA( ptr ptr long ) +@ stdcall ConvertGuidToStringW( ptr ptr long ) @ stdcall ConvertInterfaceAliasToLuid( ptr ptr ) @ stdcall ConvertInterfaceGuidToLuid( ptr ptr ) @ stdcall ConvertInterfaceIndexToLuid( long ptr ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d8696f62ab7..ffd0028ff42 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -73,6 +73,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); #define INADDR_NONE ~0UL #endif +#define CHARS_IN_GUID 39 + +DWORD WINAPI ConvertGuidToStringA( const GUID *guid, char *str, DWORD len ) +{ + if (len < CHARS_IN_GUID) return ERROR_INSUFFICIENT_BUFFER; + sprintf( str, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], + guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + return ERROR_SUCCESS; +} + +DWORD WINAPI ConvertGuidToStringW( const GUID *guid, WCHAR *str, DWORD len ) +{ + static const WCHAR fmt[] = { '{','%','0','8','X','-','%','0','4','X','-','%','0','4','X','-', + '%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X', + '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','}',0 }; + + if (len < CHARS_IN_GUID) return ERROR_INSUFFICIENT_BUFFER; + sprintfW( str, fmt, + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], + guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + return ERROR_SUCCESS; +} + /****************************************************************** * AddIPAddress (IPHLPAPI.@) * @@ -989,7 +1013,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index } total_size = sizeof(IP_ADAPTER_ADDRESSES); - total_size += 39; /* "{00000000-0000-0000-0000-000000000000}" */ + total_size += CHARS_IN_GUID; total_size += IF_NAMESIZE * sizeof(WCHAR); if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) total_size += IF_NAMESIZE * sizeof(WCHAR); @@ -1030,7 +1054,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]); aa->AdapterName = ptr; - ptr += 39; + ptr += CHARS_IN_GUID; getInterfaceNameByIndex(index, name); if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index bbd3ac2cc9e..daf3fec0a98 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -67,6 +67,9 @@ static DWORD (WINAPI *pNotifyUnicastIpAddressChange)(ADDRESS_FAMILY, PUNICAST_IP PVOID, BOOLEAN, HANDLE *); static DWORD (WINAPI *pCancelMibChangeNotify2)(HANDLE); +DWORD WINAPI ConvertGuidToStringA( const GUID *, char *, DWORD ); +DWORD WINAPI ConvertGuidToStringW( const GUID *, WCHAR *, DWORD ); + static void loadIPHlpApi(void) { hLibrary = LoadLibraryA("iphlpapi.dll"); @@ -2331,6 +2334,26 @@ static void test_NotifyUnicastIpAddressChange(void) ok(!CloseHandle(handle), "CloseHandle() succeeded.\n"); } +static void test_ConvertGuidToString( void ) +{ + DWORD err; + char bufA[39]; + WCHAR bufW[39]; + GUID guid = { 0xa, 0xb, 0xc, { 0xd, 0, 0xe, 0xf } }; + + err = ConvertGuidToStringA( &guid, bufA, 38 ); + ok( err, "got %d\n", err ); + err = ConvertGuidToStringA( &guid, bufA, 39 ); + ok( !err, "got %d\n", err ); + ok( !strcmp( bufA, "{0000000A-000B-000C-0D00-0E0F00000000}" ), "got %s\n", bufA ); + + err = ConvertGuidToStringW( &guid, bufW, 38 ); + ok( err, "got %d\n", err ); + err = ConvertGuidToStringW( &guid, bufW, 39 ); + ok( !err, "got %d\n", err ); + ok( !wcscmp( bufW, L"{0000000A-000B-000C-0D00-0E0F00000000}" ), "got %s\n", debugstr_w( bufW ) ); +} + START_TEST(iphlpapi) { @@ -2363,6 +2386,7 @@ START_TEST(iphlpapi) test_GetUdp6Table(); test_ParseNetworkString(); test_NotifyUnicastIpAddressChange(); + test_ConvertGuidToString(); freeIPHlpApi(); } }

1 0

Henri Verbeet : winex11: Request VK_KHR_external_memory_capabilities in get_gpu_properties_from_vulkan().
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: dd25789fb24e257baea4b257deddad44d5b6fedd URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd25789fb24e257baea4b257… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 8 10:36:49 2021 +0200 winex11: Request VK_KHR_external_memory_capabilities in get_gpu_properties_from_vulkan(). Required for VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index e3fa7a6e1d6..a8eab06a544 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -622,6 +622,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro static const char *extensions[] = { VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, + VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME, "VK_EXT_acquire_xlib_display", "VK_EXT_direct_mode_display", };

1 0

Henri Verbeet : winex11: Request VK_KHR_display in get_gpu_properties_from_vulkan().
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: 218f70b134179b86c19e64dd2c2552805acad44f URL: https://source.winehq.org/git/wine.git/?a=commit;h=218f70b134179b86c19e64dd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 8 10:36:50 2021 +0200 winex11: Request VK_KHR_display in get_gpu_properties_from_vulkan(). Required by VK_EXT_direct_mode_display. VK_KHR_display in turn requires VK_KHR_surface. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index a8eab06a544..e7adcec0f2e 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -625,6 +625,8 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME, "VK_EXT_acquire_xlib_display", "VK_EXT_direct_mode_display", + "VK_KHR_display", + VK_KHR_SURFACE_EXTENSION_NAME, }; const struct vulkan_funcs *vulkan_funcs = get_vulkan_driver( WINE_VULKAN_DRIVER_VERSION ); VkResult (*pvkGetRandROutputDisplayEXT)( VkPhysicalDevice, Display *, RROutput, VkDisplayKHR * );

1 0

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in shader_glsl_ld_uav().
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: 420f86c2a5b701064a9ccb91030f8aeb5d571fc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=420f86c2a5b701064a9ccb91… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 8 10:36:51 2021 +0200 wined3d: Use wined3d_mask_from_size() in shader_glsl_ld_uav(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5d0e7b13bd4..b62f3f79e2e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5532,7 +5532,7 @@ static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins) resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; } data_type = reg_maps->uav_resource_info[uav_idx].data_type; - coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; + coord_mask = wined3d_mask_from_size(resource_type_info[resource_type].coord_size); write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &ins->dst[0], 0, data_type); shader_glsl_get_swizzle(&ins->src[1], FALSE, write_mask, dst_swizzle);

1 0

Hugh McMaster : reg: Support use of registry views in the 'import' command.
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: 0c71a9879d894e4b82de2909c9c44e36c0bbb35e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c71a9879d894e4b82de2909… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 8 21:12:16 2021 +1000 reg: Support use of registry views in the 'import' command. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/import.c | 11 +++++++++-- programs/reg/tests/import.c | 48 ++++++++++++++++++++++----------------------- 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index 5750dbf0c79..36d148ca395 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -83,6 +83,7 @@ struct parser WCHAR two_wchars[2]; /* first two characters from the encoding check */ BOOL is_unicode; /* parsing Unicode or ASCII data */ short int reg_version; /* registry file version */ + REGSAM sam; /* 32-bit or 64-bit registry view (if set) */ HKEY hkey; /* current registry key */ WCHAR *key_name; /* current key name */ WCHAR *value_name; /* value name */ @@ -373,7 +374,7 @@ static LONG open_key(struct parser *parser, WCHAR *path) return ERROR_INVALID_PARAMETER; res = RegCreateKeyExW(key_class, key_path, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, NULL, &parser->hkey, NULL); + KEY_ALL_ACCESS|parser->sam, NULL, &parser->hkey, NULL); if (res == ERROR_SUCCESS) { @@ -980,6 +981,8 @@ int reg_import(int argc, WCHAR *argvW[]) if (argc > 4) goto invalid; + parser.sam = 0; + if (argc == 4) { WCHAR *str = argvW[3]; @@ -989,7 +992,11 @@ int reg_import(int argc, WCHAR *argvW[]) str++; - if (lstrcmpiW(str, L"reg:32") && lstrcmpiW(str, L"reg:64")) + if (!lstrcmpiW(str, L"reg:32")) + parser.sam = KEY_WOW64_32KEY; + else if (!lstrcmpiW(str, L"reg:64")) + parser.sam = KEY_WOW64_64KEY; + else goto invalid; } diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index edae8277eb3..976dd381f07 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -3728,20 +3728,20 @@ static void test_registry_view_win64(void) run_reg_exe("reg import reg5.reg /reg:32", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); - todo_wine verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, 0); - todo_wine verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, 0); - todo_wine verify_reg(hkey, "", REG_SZ, "Test", 5, 0); - todo_wine verify_reg(hkey, "Wine4", REG_EXPAND_SZ, "%PATH%", 7, 0); + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); + verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, 0); + verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "", REG_SZ, "Test", 5, 0); + verify_reg(hkey, "Wine4", REG_EXPAND_SZ, "%PATH%", 7, 0); - todo_wine open_key(hkey, "subkey", KEY_WOW64_32KEY, &subkey); - todo_wine verify_reg(subkey, "Empty string", REG_SZ, "", 1, 0); - todo_wine verify_reg(subkey, NULL, REG_SZ, "Default registry value", 23, 0); - todo_wine close_key(subkey); - todo_wine close_key(hkey); + open_key(hkey, "subkey", KEY_WOW64_32KEY, &subkey); + verify_reg(subkey, "Empty string", REG_SZ, "", 1, 0); + verify_reg(subkey, NULL, REG_SZ, "Default registry value", 23, 0); + close_key(subkey); + close_key(hkey); - todo_wine verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); @@ -3819,20 +3819,20 @@ static void test_registry_view_wow64(void) run_reg_exe("reg import reg5.reg /reg:64", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); - todo_wine verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, 0); - todo_wine verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, 0); - todo_wine verify_reg(hkey, "", REG_SZ, "Test", 5, 0); - todo_wine verify_reg(hkey, "Wine4", REG_EXPAND_SZ, "%PATH%", 7, 0); + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); + verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, 0); + verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "", REG_SZ, "Test", 5, 0); + verify_reg(hkey, "Wine4", REG_EXPAND_SZ, "%PATH%", 7, 0); - todo_wine open_key(hkey, "subkey", KEY_WOW64_64KEY, &subkey); - todo_wine verify_reg(subkey, "Empty string", REG_SZ, "", 1, 0); - todo_wine verify_reg(subkey, NULL, REG_SZ, "Default registry value", 23, 0); - todo_wine close_key(subkey); - todo_wine close_key(hkey); + open_key(hkey, "subkey", KEY_WOW64_64KEY, &subkey); + verify_reg(subkey, "Empty string", REG_SZ, "", 1, 0); + verify_reg(subkey, NULL, REG_SZ, "Default registry value", 23, 0); + close_key(subkey); + close_key(hkey); - todo_wine verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY);

1 0

Alexandre Julliard : ntdll: Pass a length pointer instead of an IO_STATUS_BLOCK to the async callbacks.
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: 92a66c08ba7546e170b193c0209dd85d3dfc3eb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92a66c08ba7546e170b193c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 8 16:21:51 2021 +0200 ntdll: Pass a length pointer instead of an IO_STATUS_BLOCK to the async callbacks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 27 +++++++++------------------ dlls/ntdll/unix/server.c | 9 +++++++-- dlls/ntdll/unix/socket.c | 20 ++++++++------------ dlls/ntdll/unix/unix_private.h | 2 +- 4 files changed, 25 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 626a0957644..643daa5ab3f 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4681,10 +4681,9 @@ static NTSTATUS wait_async( HANDLE handle, BOOL alertable ) } /* callback for irp async I/O completion */ -static NTSTATUS irp_completion( void *user, IO_STATUS_BLOCK *io, NTSTATUS status ) +static NTSTATUS irp_completion( void *user, ULONG_PTR *info, NTSTATUS status ) { struct async_irp *async = user; - ULONG information = 0; if (status == STATUS_ALERTED) { @@ -4693,20 +4692,15 @@ static NTSTATUS irp_completion( void *user, IO_STATUS_BLOCK *io, NTSTATUS status req->user_arg = wine_server_client_ptr( async ); wine_server_set_reply( req, async->buffer, async->size ); status = virtual_locked_server_call( req ); - information = reply->size; + *info = reply->size; } SERVER_END_REQ; } - if (status != STATUS_PENDING) - { - io->u.Status = status; - io->Information = information; - release_fileio( &async->io ); - } + if (status != STATUS_PENDING) release_fileio( &async->io ); return status; } -static NTSTATUS async_read_proc( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) +static NTSTATUS async_read_proc( void *user, ULONG_PTR *info, NTSTATUS status ) { struct async_fileio_read *fileio = user; int fd, needs_close, result; @@ -4750,14 +4744,13 @@ static NTSTATUS async_read_proc( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS sta } if (status != STATUS_PENDING) { - iosb->u.Status = status; - iosb->Information = fileio->already; + *info = fileio->already; release_fileio( &fileio->io ); } return status; } -static NTSTATUS async_write_proc( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) +static NTSTATUS async_write_proc( void *user, ULONG_PTR *info, NTSTATUS status ) { struct async_fileio_write *fileio = user; int result, fd, needs_close; @@ -4797,8 +4790,7 @@ static NTSTATUS async_write_proc( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS st } if (status != STATUS_PENDING) { - iosb->u.Status = status; - iosb->Information = fileio->already; + *info = fileio->already; release_fileio( &fileio->io ); } return status; @@ -6064,7 +6056,7 @@ NTSTATUS WINAPI NtUnlockFile( HANDLE handle, IO_STATUS_BLOCK *io_status, LARGE_I } -static NTSTATUS read_changes_apc( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) +static NTSTATUS read_changes_apc( void *user, ULONG_PTR *info, NTSTATUS status ) { struct async_fileio_read_changes *fileio = user; int size = 0; @@ -6133,8 +6125,7 @@ static NTSTATUS read_changes_apc( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS st if (status != STATUS_PENDING) { - iosb->u.Status = status; - iosb->Information = size; + *info = size; release_fileio( &fileio->io ); } return status; diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 1d82e806e17..c2efd36ca6f 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -379,11 +379,16 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO { IO_STATUS_BLOCK *iosb = wine_server_get_ptr( call->async_io.sb ); struct async_fileio *user = wine_server_get_ptr( call->async_io.user ); + ULONG_PTR info = 0; result->type = call->type; - result->async_io.status = user->callback( user, iosb, call->async_io.status ); + result->async_io.status = user->callback( user, &info, call->async_io.status ); if (result->async_io.status != STATUS_PENDING) - result->async_io.total = iosb->Information; + { + result->async_io.total = info; + iosb->Status = result->async_io.status; + iosb->Information = info; + } break; } case APC_VIRTUAL_ALLOC: diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index e5abb3828c3..34796dbfd3d 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -543,7 +543,7 @@ static NTSTATUS try_recv( int fd, struct async_recv_ioctl *async, ULONG_PTR *siz return status; } -static NTSTATUS async_recv_proc( void *user, IO_STATUS_BLOCK *io, NTSTATUS status ) +static NTSTATUS async_recv_proc( void *user, ULONG_PTR *info, NTSTATUS status ) { struct async_recv_ioctl *async = user; ULONG_PTR information = 0; @@ -566,8 +566,7 @@ static NTSTATUS async_recv_proc( void *user, IO_STATUS_BLOCK *io, NTSTATUS statu } if (status != STATUS_PENDING) { - io->Status = status; - io->Information = information; + *info = information; release_fileio( &async->io ); } return status; @@ -684,7 +683,7 @@ static ULONG_PTR fill_poll_output( struct async_poll_ioctl *async, NTSTATUS stat return offsetof( struct afd_poll_params, sockets[count] ); } -static NTSTATUS async_poll_proc( void *user, IO_STATUS_BLOCK *io, NTSTATUS status ) +static NTSTATUS async_poll_proc( void *user, ULONG_PTR *info, NTSTATUS status ) { struct async_poll_ioctl *async = user; ULONG_PTR information = 0; @@ -704,8 +703,7 @@ static NTSTATUS async_poll_proc( void *user, IO_STATUS_BLOCK *io, NTSTATUS statu if (status != STATUS_PENDING) { - io->Status = status; - io->Information = information; + *info = information; free( async->input ); release_fileio( &async->io ); } @@ -868,7 +866,7 @@ static NTSTATUS try_send( int fd, struct async_send_ioctl *async ) return STATUS_SUCCESS; } -static NTSTATUS async_send_proc( void *user, IO_STATUS_BLOCK *io, NTSTATUS status ) +static NTSTATUS async_send_proc( void *user, ULONG_PTR *info, NTSTATUS status ) { struct async_send_ioctl *async = user; int fd, needs_close; @@ -890,8 +888,7 @@ static NTSTATUS async_send_proc( void *user, IO_STATUS_BLOCK *io, NTSTATUS statu } if (status != STATUS_PENDING) { - io->Status = status; - io->Information = async->sent_len; + *info = async->sent_len; release_fileio( &async->io ); } return status; @@ -1033,7 +1030,7 @@ static NTSTATUS try_transmit( int sock_fd, int file_fd, struct async_transmit_io return STATUS_SUCCESS; } -static NTSTATUS async_transmit_proc( void *user, IO_STATUS_BLOCK *io, NTSTATUS status ) +static NTSTATUS async_transmit_proc( void *user, ULONG_PTR *info, NTSTATUS status ) { int sock_fd, file_fd = -1, sock_needs_close = FALSE, file_needs_close = FALSE; struct async_transmit_ioctl *async = user; @@ -1062,8 +1059,7 @@ static NTSTATUS async_transmit_proc( void *user, IO_STATUS_BLOCK *io, NTSTATUS s } if (status != STATUS_PENDING) { - io->Status = status; - io->Information = async->head_cursor + async->file_cursor + async->tail_cursor; + *info = async->head_cursor + async->file_cursor + async->tail_cursor; release_fileio( &async->io ); } return status; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 3dae2e56258..e7320dbc1af 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -69,7 +69,7 @@ static inline struct ntdll_thread_data *ntdll_get_thread_data(void) return (struct ntdll_thread_data *)&NtCurrentTeb()->GdiTebBatch; } -typedef NTSTATUS async_callback_t( void *user, IO_STATUS_BLOCK *io, NTSTATUS status ); +typedef NTSTATUS async_callback_t( void *user, ULONG_PTR *info, NTSTATUS status ); struct async_fileio {

1 0

Zebediah Figura : wined3d: Move the uploads array in wined3d_deferred_context_record_command_list().
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: 3f60840cdcdb601ff4c7c05865eafe506a3d7944 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f60840cdcdb601ff4c7c058… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 7 11:40:05 2021 -0500 wined3d: Move the uploads array in wined3d_deferred_context_record_command_list(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51416 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index f7e5009df46..089946cd83d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3698,30 +3698,24 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device object->device = deferred->c.device; if (!(object->data = heap_alloc(deferred->data_size))) - { - heap_free(object); - return E_OUTOFMEMORY; - } + goto out_free_list; object->data_size = deferred->data_size; memcpy(object->data, deferred->data, deferred->data_size); if (!(object->resources = heap_alloc(deferred->resource_count * sizeof(*object->resources)))) - { - heap_free(object->data); - heap_free(object); - return E_OUTOFMEMORY; - } + goto out_free_data; object->resource_count = deferred->resource_count; memcpy(object->resources, deferred->resources, deferred->resource_count * sizeof(*object->resources)); /* Transfer our references to the resources to the command list. */ + if (!(object->uploads = heap_alloc(deferred->upload_count * sizeof(*object->uploads)))) + goto out_free_resources; + object->upload_count = deferred->upload_count; + memcpy(object->uploads, deferred->uploads, deferred->upload_count * sizeof(*object->uploads)); + /* Transfer our references to the resources to the command list. */ + if (!(object->command_lists = heap_alloc(deferred->command_list_count * sizeof(*object->command_lists)))) - { - heap_free(object->resources); - heap_free(object->data); - heap_free(object); - return E_OUTOFMEMORY; - } + goto out_free_uploads; object->command_list_count = deferred->command_list_count; memcpy(object->command_lists, deferred->command_lists, deferred->command_list_count * sizeof(*object->command_lists)); @@ -3729,6 +3723,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->data_size = 0; deferred->resource_count = 0; + deferred->upload_count = 0; deferred->command_list_count = 0; /* This is in fact recorded into a subsequent command list. */ @@ -3741,4 +3736,14 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device *list = object; return S_OK; + +out_free_uploads: + heap_free(object->uploads); +out_free_resources: + heap_free(object->resources); +out_free_data: + heap_free(object->data); +out_free_list: + heap_free(object); + return E_OUTOFMEMORY; }

1 0

Zebediah Figura : wined3d: Fix some memory leaks when destroying command lists.
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: bc8dcae118dc7340db9105bb6a3310e9127c127c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc8dcae118dc7340db9105bb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 7 11:40:06 2021 -0500 wined3d: Fix some memory leaks when destroying command lists. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 089946cd83d..3062becb153 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -66,6 +66,8 @@ static void wined3d_command_list_destroy_object(void *object) for (i = 0; i < list->upload_count; ++i) heap_free(list->uploads[i].sysmem); + heap_free(list->command_lists); + heap_free(list->uploads); heap_free(list->resources); heap_free(list->data); heap_free(list); @@ -95,6 +97,8 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_command_list_decref(list->command_lists[i]); for (i = 0; i < list->resource_count; ++i) wined3d_resource_decref(list->resources[i]); + for (i = 0; i < list->upload_count; ++i) + wined3d_resource_decref(list->uploads[i].resource); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); }

1 0

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in shader_glsl_get_sample_function().
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: c2ea032a71245a0338a8aab958b48c110ac83d8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2ea032a71245a0338a8aab9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 8 10:36:53 2021 +0200 wined3d: Use wined3d_mask_from_size() in shader_glsl_get_sample_function(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index eb805f43a9f..5ae90148dc8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3463,8 +3463,8 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context if (shadow) ++coord_size; sample_function->offset_size = offset ? deriv_size : 0; - sample_function->coord_mask = (1u << coord_size) - 1; - sample_function->deriv_mask = (1u << deriv_size) - 1; + sample_function->coord_mask = wined3d_mask_from_size(coord_size); + sample_function->deriv_mask = wined3d_mask_from_size(deriv_size); sample_function->output_single_component = shadow && !needs_legacy_glsl_syntax(gl_info); }

1 0