wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Zhiyi Zhang : winex11.drv: Open a Vulkan device for D3DKMTOpenAdapterFromLuid().
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 4a98b07c4bcc35a698448261478ba856c149cbea URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a98b07c4bcc35a698448261… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 17 14:17:53 2022 +0800 winex11.drv: Open a Vulkan device for D3DKMTOpenAdapterFromLuid(). The Vulkan device is used for querying video memory information for implementing D3DKMTQueryVideoMemoryInfo(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/dibdrv/dc.c | 4 + dlls/win32u/driver.c | 19 ++++ dlls/win32u/emfdrv.c | 2 + dlls/win32u/font.c | 2 + dlls/win32u/gdiobj.c | 3 + dlls/win32u/path.c | 2 + dlls/win32u/syscall.c | 3 - dlls/win32u/win32u.spec | 6 +- dlls/win32u/win32u_private.h | 3 + dlls/win32u/wrappers.c | 18 +++ dlls/wineps.drv/init.c | 2 + dlls/winex11.drv/init.c | 2 + dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 250 +++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/xrender.c | 2 + dlls/wow64win/gdi.c | 34 ------ dlls/wow64win/syscall.h | 3 - include/ddk/d3dkmthk.h | 1 + include/wine/gdi_driver.h | 2 + 19 files changed, 317 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4a98b07c4bcc35a69844…

1 0

Zhiyi Zhang : gdi32/tests: Add D3DKMTQueryVideoMemoryInfo() tests.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 37b74e644a9011e9c79c2540c4bb7152555037a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37b74e644a9011e9c79c2540… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 17 14:17:41 2022 +0800 gdi32/tests: Add D3DKMTQueryVideoMemoryInfo() tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/driver.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 3d25eacacd9..5117d34908d 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -48,8 +48,27 @@ static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromDeviceName)(D3DKMT_OPENADAPTERFRO static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromHdc)(D3DKMT_OPENADAPTERFROMHDC *); static NTSTATUS (WINAPI *pD3DKMTSetVidPnSourceOwner)(const D3DKMT_SETVIDPNSOURCEOWNER *); +static NTSTATUS (WINAPI *pD3DKMTQueryVideoMemoryInfo)(D3DKMT_QUERYVIDEOMEMORYINFO *); static HRESULT (WINAPI *pDwmEnableComposition)(UINT); +static BOOL get_primary_adapter_name(WCHAR *name) +{ + DISPLAY_DEVICEW dd; + DWORD adapter_idx; + + dd.cb = sizeof(dd); + for (adapter_idx = 0; EnumDisplayDevicesW(NULL, adapter_idx, &dd, 0); ++adapter_idx) + { + if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + lstrcpyW(name, dd.DeviceName); + return TRUE; + } + } + + return FALSE; +} + static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) { D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_gdi_desc; @@ -886,6 +905,91 @@ static void test_D3DKMTOpenAdapterFromDeviceName(void) winetest_pop_context(); } +static void test_D3DKMTQueryVideoMemoryInfo(void) +{ + static const D3DKMT_MEMORY_SEGMENT_GROUP groups[] = {D3DKMT_MEMORY_SEGMENT_GROUP_LOCAL, + D3DKMT_MEMORY_SEGMENT_GROUP_NON_LOCAL}; + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_desc; + D3DKMT_QUERYVIDEOMEMORYINFO query_memory_info; + D3DKMT_CLOSEADAPTER close_adapter_desc; + NTSTATUS status; + unsigned int i; + BOOL ret; + + if (!pD3DKMTQueryVideoMemoryInfo) + { + skip("D3DKMTQueryVideoMemoryInfo() is unavailable.\n"); + return; + } + + ret = get_primary_adapter_name(open_adapter_desc.DeviceName); + ok(ret, "Failed to get primary adapter name.\n"); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); + + /* Normal query */ + for (i = 0; i < ARRAY_SIZE(groups); ++i) + { + winetest_push_context("group %d", groups[i]); + + query_memory_info.hProcess = NULL; + query_memory_info.hAdapter = open_adapter_desc.hAdapter; + query_memory_info.PhysicalAdapterIndex = 0; + query_memory_info.MemorySegmentGroup = groups[i]; + status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); + ok(query_memory_info.Budget >= query_memory_info.AvailableForReservation, + "Unexpected budget %I64u and reservation %I64u.\n", query_memory_info.Budget, + query_memory_info.AvailableForReservation); + ok(query_memory_info.CurrentUsage <= query_memory_info.Budget, + "Unexpected current usage %I64u.\n", query_memory_info.CurrentUsage); + ok(query_memory_info.CurrentReservation == 0, + "Unexpected current reservation %I64u.\n", query_memory_info.CurrentReservation); + + winetest_pop_context(); + } + + /* Query using the current process handle */ + query_memory_info.hProcess = GetCurrentProcess(); + status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); + + /* Query using a process handle without PROCESS_QUERY_INFORMATION privilege */ + query_memory_info.hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, GetCurrentProcessId()); + ok(!!query_memory_info.hProcess, "OpenProcess failed, error %ld.\n", GetLastError()); + status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + ok(status == STATUS_ACCESS_DENIED, "Got unexpected return code %#lx.\n", status); + CloseHandle(query_memory_info.hProcess); + query_memory_info.hProcess = NULL; + + /* Query using an invalid process handle */ + query_memory_info.hProcess = (HANDLE)0xdeadbeef; + status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + ok(status == STATUS_INVALID_HANDLE, "Got unexpected return code %#lx.\n", status); + query_memory_info.hProcess = NULL; + + /* Query using an invalid adapter handle */ + query_memory_info.hAdapter = (D3DKMT_HANDLE)0xdeadbeef; + status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#lx.\n", status); + query_memory_info.hAdapter = open_adapter_desc.hAdapter; + + /* Query using an invalid adapter index */ + query_memory_info.PhysicalAdapterIndex = 99; + status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#lx.\n", status); + query_memory_info.PhysicalAdapterIndex = 0; + + /* Query using an invalid memory segment group */ + query_memory_info.MemorySegmentGroup = D3DKMT_MEMORY_SEGMENT_GROUP_NON_LOCAL + 1; + status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#lx.\n", status); + + close_adapter_desc.hAdapter = open_adapter_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); @@ -900,6 +1004,7 @@ START_TEST(driver) pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); pD3DKMTOpenAdapterFromHdc = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromHdc"); pD3DKMTSetVidPnSourceOwner = (void *)GetProcAddress(gdi32, "D3DKMTSetVidPnSourceOwner"); + pD3DKMTQueryVideoMemoryInfo = (void *)GetProcAddress(gdi32, "D3DKMTQueryVideoMemoryInfo"); if (dwmapi) pDwmEnableComposition = (void *)GetProcAddress(dwmapi, "DwmEnableComposition"); @@ -913,6 +1018,7 @@ START_TEST(driver) test_D3DKMTSetVidPnSourceOwner(); test_D3DKMTCheckOcclusion(); test_D3DKMTOpenAdapterFromDeviceName(); + test_D3DKMTQueryVideoMemoryInfo(); FreeLibrary(dwmapi); }

1 0

Zhiyi Zhang : include: Add D3DKMTQueryVideoMemoryInfo() definition.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 4cf797d4d8c2b5af5ef8b46f9d7290e5333f8756 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cf797d4d8c2b5af5ef8b46f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 17 14:17:30 2022 +0800 include: Add D3DKMTQueryVideoMemoryInfo() definition. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/d3dkmthk.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 663a5d31ada..aaebcb39e2e 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -30,6 +30,12 @@ typedef enum _D3DKMT_VIDPNSOURCEOWNER_TYPE D3DKMT_VIDPNSOURCEOWNER_EMULATED = 4 } D3DKMT_VIDPNSOURCEOWNER_TYPE; +typedef enum _D3DKMT_MEMORY_SEGMENT_GROUP +{ + D3DKMT_MEMORY_SEGMENT_GROUP_LOCAL = 0, + D3DKMT_MEMORY_SEGMENT_GROUP_NON_LOCAL = 1 +} D3DKMT_MEMORY_SEGMENT_GROUP; + typedef struct _D3DKMT_CREATEDEVICEFLAGS { UINT LegacyMode : 1; @@ -603,6 +609,18 @@ typedef struct _D3DKMT_QUERYSTATISTICS } DUMMYUNIONNAME; } D3DKMT_QUERYSTATISTICS; +typedef struct _D3DKMT_QUERYVIDEOMEMORYINFO +{ + HANDLE hProcess; + D3DKMT_HANDLE hAdapter; + D3DKMT_MEMORY_SEGMENT_GROUP MemorySegmentGroup; + UINT64 Budget; + UINT64 CurrentUsage; + UINT64 CurrentReservation; + UINT64 AvailableForReservation; + UINT PhysicalAdapterIndex; +} D3DKMT_QUERYVIDEOMEMORYINFO; + typedef enum _D3DKMT_QUEUEDLIMIT_TYPE { D3DKMT_SET_QUEUEDLIMIT_PRESENT = 1, @@ -664,6 +682,7 @@ NTSTATUS WINAPI D3DKMTEscape( const D3DKMT_ESCAPE *desc ); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromHdc( D3DKMT_OPENADAPTERFROMHDC *desc ); NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats); +NTSTATUS WINAPI D3DKMTQueryVideoMemoryInfo(D3DKMT_QUERYVIDEOMEMORYINFO *desc); NTSTATUS WINAPI D3DKMTSetQueuedLimit(D3DKMT_SETQUEUEDLIMIT *desc); NTSTATUS WINAPI D3DKMTSetVidPnSourceOwner(const D3DKMT_SETVIDPNSOURCEOWNER *desc);

1 0

Paul Gofman : iphlpapi: Don't request unused dynamic interface data.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 1a782a52153a4b16fba0ce22ee1cc24ebc7b45a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a782a52153a4b16fba0ce22… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 16 17:22:21 2022 -0500 iphlpapi: Don't request unused dynamic interface data. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 0bd7cdc06c8..5a4acdb9c5a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -598,7 +598,6 @@ DWORD WINAPI GetAdaptersInfo( IP_ADAPTER_INFO *info, ULONG *size ) DWORD len, i, uni, fwd; NET_LUID *if_keys = NULL; struct nsi_ndis_ifinfo_rw *if_rw = NULL; - struct nsi_ndis_ifinfo_dynamic *if_dyn = NULL; struct nsi_ndis_ifinfo_static *if_stat = NULL; struct nsi_ipv4_unicast_key *uni_keys = NULL; struct nsi_ip_unicast_rw *uni_rw = NULL; @@ -612,7 +611,8 @@ DWORD WINAPI GetAdaptersInfo( IP_ADAPTER_INFO *info, ULONG *size ) err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&if_keys, sizeof(*if_keys), (void **)&if_rw, sizeof(*if_rw), - (void **)&if_dyn, sizeof(*if_dyn), (void **)&if_stat, sizeof(*if_stat), &if_count, 0 ); + NULL, 0, (void **)&if_stat, sizeof(*if_stat), &if_count, 0 ); + if (err) return err; for (i = 0; i < if_count; i++) { @@ -726,7 +726,7 @@ err: heap_free( wins_servers ); NsiFreeTable( fwd_keys, NULL, NULL, NULL ); NsiFreeTable( uni_keys, uni_rw, NULL, NULL ); - NsiFreeTable( if_keys, if_rw, if_dyn, if_stat ); + NsiFreeTable( if_keys, if_rw, NULL, if_stat ); return err; }

1 0

Paul Gofman : nsi: Allocate a small buffer at once in NsiAllocateAndGetTable().
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 7ef04f4118c1d221c1f8d8d87d833246534ebe47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ef04f4118c1d221c1f8d8d8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 16 16:53:03 2022 -0500 nsi: Allocate a small buffer at once in NsiAllocateAndGetTable(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/nsi.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index efb10c0f615..345dce6dfe6 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -39,7 +39,7 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ) { - DWORD err, num = 0; + DWORD err, num = 64; void *data[4] = { NULL }; DWORD sizes[4] = { key_size, rw_size, dynamic_size, static_size }; int i, attempt; @@ -49,9 +49,6 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR for (attempt = 0; attempt < 5; attempt++) { - err = NsiEnumerateObjectsAllParameters( unk, 0, module, table, NULL, 0, NULL, 0, NULL, 0, NULL, 0, &num ); - if (err) return err; - for (i = 0; i < ARRAY_SIZE(data); i++) { if (sizes[i]) @@ -68,9 +65,11 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR err = NsiEnumerateObjectsAllParameters( unk, 0, module, table, data[0], sizes[0], data[1], sizes[1], data[2], sizes[2], data[3], sizes[3], &num ); if (err != ERROR_MORE_DATA) break; - + TRACE( "Short buffer, attempt %d.\n", attempt ); NsiFreeTable( data[0], data[1], data[2], data[3] ); memset( data, 0, sizeof(data) ); + err = NsiEnumerateObjectsAllParameters( unk, 0, module, table, NULL, 0, NULL, 0, NULL, 0, NULL, 0, &num ); + if (err) return err; } if (!err)

1 0

Paul Gofman : nsiproxy.sys: Update interface table only if LUID is not found in convert_unix_name_to_luid().
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 50c27f88e369ef72bd05b68c700b6d3c4695f4e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50c27f88e369ef72bd05b68c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 16 16:29:04 2022 -0500 nsiproxy.sys: Update interface table only if LUID is not found in convert_unix_name_to_luid(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/ndis.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 9b09756f35c..667d399b0cb 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -615,18 +615,24 @@ BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) { struct if_entry *entry; BOOL ret = FALSE; + int updated = 0; pthread_mutex_lock( &if_list_lock ); - update_if_table(); - - LIST_FOR_EACH_ENTRY( entry, &if_list, struct if_entry, entry ) - if (!strcmp( entry->if_unix_name, unix_name )) + do + { + LIST_FOR_EACH_ENTRY( entry, &if_list, struct if_entry, entry ) { - *luid = entry->if_luid; - ret = TRUE; - break; + if (!strcmp( entry->if_unix_name, unix_name )) + { + *luid = entry->if_luid; + ret = TRUE; + goto done; + } } + } while (!updated++ && update_if_table()); + +done: pthread_mutex_unlock( &if_list_lock ); return ret;

1 0

Paul Gofman : nsiproxy.sys: Update interface table only if LUID is not found in convert_luid_to_unix_name().
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 1f3c1fdbc7e4c537c2ab41d59bcaa68aa4f93567 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f3c1fdbc7e4c537c2ab41d5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 16 16:24:45 2022 -0500 nsiproxy.sys: Update interface table only if LUID is not found in convert_luid_to_unix_name(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/ndis.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 929bda9cd90..9b09756f35c 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -286,17 +286,19 @@ static struct if_entry *add_entry( UINT index, char *name ) return entry; } -static void update_if_table( void ) +static unsigned int update_if_table( void ) { struct if_nameindex *indices = if_nameindex(), *entry; + unsigned int append_count = 0; for (entry = indices; entry->if_index; entry++) { - if (!find_entry_from_index( entry->if_index )) - add_entry( entry->if_index, entry->if_name ); + if (!find_entry_from_index( entry->if_index ) && add_entry( entry->if_index, entry->if_name )) + ++append_count; } if_freenameindex( indices ); + return append_count; } static void if_counted_string_init( IF_COUNTED_STRING *str, const WCHAR *value ) @@ -634,18 +636,24 @@ BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) { struct if_entry *entry; BOOL ret = FALSE; + int updated = 0; pthread_mutex_lock( &if_list_lock ); - update_if_table(); - - LIST_FOR_EACH_ENTRY( entry, &if_list, struct if_entry, entry ) - if (entry->if_luid.Value == luid->Value) + do + { + LIST_FOR_EACH_ENTRY( entry, &if_list, struct if_entry, entry ) { - *unix_name = entry->if_unix_name; - ret = TRUE; - break; + if (entry->if_luid.Value == luid->Value) + { + *unix_name = entry->if_unix_name; + ret = TRUE; + goto done; + } } + } while (!updated++ && update_if_table()); + +done: pthread_mutex_unlock( &if_list_lock ); return ret;

1 0

Paul Gofman : nsiproxy.sys: Finish search once found in convert_luid_to_unix_name().
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 8e756fe5acab9e1ddead4e56aa4d09205ca73f96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e756fe5acab9e1ddead4e56… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 16 15:35:12 2022 -0500 nsiproxy.sys: Finish search once found in convert_luid_to_unix_name(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/ndis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index a3a10148109..929bda9cd90 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -644,7 +644,7 @@ BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) { *unix_name = entry->if_unix_name; ret = TRUE; - + break; } pthread_mutex_unlock( &if_list_lock );

1 0

Paul Gofman : nsiproxy.sys: Update interface table only if find_entry_from_{luid|index} fails.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 42bf76686633acee8453dbfe65e842e4c6d465ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=42bf76686633acee8453dbfe… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 16 15:32:04 2022 -0500 nsiproxy.sys: Update interface table only if find_entry_from_{luid|index} fails. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/ndis.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index ba4933ff16b..a3a10148109 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -495,9 +495,11 @@ static NTSTATUS ifinfo_get_all_parameters( const void *key, UINT key_size, void pthread_mutex_lock( &if_list_lock ); - update_if_table(); - - entry = find_entry_from_luid( (const NET_LUID *)key ); + if (!(entry = find_entry_from_luid( (const NET_LUID *)key ))) + { + update_if_table(); + entry = find_entry_from_luid( (const NET_LUID *)key ); + } if (entry) { ifinfo_fill_entry( entry, NULL, rw_data, dynamic_data, static_data ); @@ -557,9 +559,11 @@ static NTSTATUS ifinfo_get_parameter( const void *key, UINT key_size, UINT param pthread_mutex_lock( &if_list_lock ); - update_if_table(); - - entry = find_entry_from_luid( (const NET_LUID *)key ); + if (!(entry = find_entry_from_luid( (const NET_LUID *)key ))) + { + update_if_table(); + entry = find_entry_from_luid( (const NET_LUID *)key ); + } if (entry) { switch (param_type) @@ -591,9 +595,11 @@ static NTSTATUS index_luid_get_parameter( const void *key, UINT key_size, UINT p pthread_mutex_lock( &if_list_lock ); - update_if_table(); - - entry = find_entry_from_index( *(UINT *)key ); + if (!(entry = find_entry_from_index( *(UINT *)key ))) + { + update_if_table(); + entry = find_entry_from_index( *(UINT *)key ); + } if (entry) { *(NET_LUID *)data = entry->if_luid;

1 0

Zhiyi Zhang : win32u: Fix a memory leak.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: e55515bf5b21580499ee05bee964444be8dc3c3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e55515bf5b21580499ee05be… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 17 14:19:01 2022 +0800 win32u: Fix a memory leak. The subkey handle is leaked when deleting a GPU entry succeeded. Also, there is no need to restart the enumeration for the grandparent key hkey. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 5fec4ade0f8..dd494188121 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -702,7 +702,6 @@ static void cleanup_devices(void) hkey = reg_open_key( enum_key, pciW, sizeof(pciW) ); -restart: while (!NtEnumerateKey( hkey, i++, KeyNodeInformation, key, sizeof(buffer), &size )) { unsigned int j = 0; @@ -735,7 +734,7 @@ restart: NtClose( device_key ); if (!present && reg_delete_tree( subkey, bufferW, lstrlenW( bufferW ) * sizeof(WCHAR) )) - goto restart; + j = 0; } NtClose( subkey );

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2022