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

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

May 17, 2022

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: Implement D3DKMTQueryVideoMemoryInfo().
by Alexandre Julliard May 17, 2022

May 17, 2022

Module: wine Branch: master Commit: 8bc0c8d64604945540ba37b41becf343a2ae4a37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bc0c8d64604945540ba37b4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 17 14:18:12 2022 +0800 gdi32: Implement 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/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- dlls/win32u/dibdrv/dc.c | 2 ++ dlls/win32u/driver.c | 37 ++++++++++++++++++++++++++ dlls/win32u/emfdrv.c | 1 + dlls/win32u/font.c | 1 + dlls/win32u/gdiobj.c | 1 + dlls/win32u/path.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 +++++ dlls/wineps.drv/init.c | 1 + dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 59 ++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/xrender.c | 1 + include/ntgdi.h | 1 + include/wine/gdi_driver.h | 1 + 18 files changed, 118 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8bc0c8d64604945540ba…

1 0

Piotr Caban : oleacc: Add IAccessible refcount tests.
by Alexandre Julliard May 17, 2022

May 17, 2022

Module: wine Branch: master Commit: 32cd910bde51a23d1263ec99e18a753510b657d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32cd910bde51a23d1263ec99… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 17 14:38:48 2022 +0200 oleacc: Add IAccessible refcount tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index cbbc98e4742..532c5d71257 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -100,6 +100,7 @@ static struct Accessible { IAccessible IAccessible_iface; IOleWindow IOleWindow_iface; + LONG ref; IAccessible *parent; HWND acc_hwnd; @@ -140,12 +141,14 @@ static HRESULT WINAPI Accessible_QueryInterface( static ULONG WINAPI Accessible_AddRef(IAccessible *iface) { - return 2; + struct Accessible *This = impl_from_Accessible(iface); + return InterlockedIncrement(&This->ref); } static ULONG WINAPI Accessible_Release(IAccessible *iface) { - return 1; + struct Accessible *This = impl_from_Accessible(iface); + return InterlockedDecrement(&This->ref); } static HRESULT WINAPI Accessible_GetTypeInfoCount( @@ -226,9 +229,11 @@ static HRESULT WINAPI Accessible_get_accChild(IAccessible *iface, return S_FALSE; case 3: *ppdispChild = (IDispatch*)&Accessible_child.IAccessible_iface; + IDispatch_AddRef(*ppdispChild); return S_OK; case 4: *ppdispChild = (IDispatch*)&Accessible_child.IAccessible_iface; + IDispatch_AddRef(*ppdispChild); return S_FALSE; default: ok(0, "unexpected call\n"); @@ -464,6 +469,7 @@ static struct Accessible Accessible = { { &AccessibleVtbl }, { &OleWindowVtbl }, + 1, NULL, 0, 0 }; @@ -471,6 +477,7 @@ static struct Accessible Accessible_child = { { &AccessibleVtbl }, { &OleWindowVtbl }, + 1, &Accessible.IAccessible_iface, 0, 0 }; @@ -906,6 +913,8 @@ static void test_AccessibleObjectFromEvent(void) IAccessible_Release(acc); DestroyWindow(hwnd); + ok(Accessible.ref == 1, "Accessible.ref = %ld\n", Accessible.ref); + ok(Accessible_child.ref == 1, "Accessible.ref = %ld\n", Accessible_child.ref); } static void test_GetProcessHandleFromHwnd(void) @@ -1014,6 +1023,9 @@ static void test_AccessibleChildren(IAccessible *acc) IDispatch_Release(V_DISPATCH(children+1)); } ok(V_VT(children+2) == VT_EMPTY, "V_VT(children+2) = %d\n", V_VT(children+2)); + + ok(Accessible.ref == 1, "Accessible.ref = %ld\n", Accessible.ref); + ok(Accessible_child.ref == 1, "Accessible.ref = %ld\n", Accessible_child.ref); } #define check_acc_state(acc, state) _check_acc_state(__LINE__, acc, state) @@ -2003,6 +2015,8 @@ static void test_WindowFromAccessibleObject(void) CHECK_CALLED(Accessible_child_get_accParent); Accessible.ow_hwnd = NULL; + ok(Accessible.ref == 1, "Accessible.ref = %ld\n", Accessible.ref); + ok(Accessible_child.ref == 1, "Accessible.ref = %ld\n", Accessible_child.ref); } START_TEST(main)

1 0

Zebediah Figura : maintainers: Add a GStreamer section.
by Alexandre Julliard May 17, 2022

May 17, 2022

Module: wine Branch: master Commit: 73289b65552f02ccb798d81ad3bd6f52d48eecc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73289b65552f02ccb798d81a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 17 12:38:10 2022 -0500 maintainers: Add a GStreamer section. Assign formal maintainership of the whole DLL to myself. Although there are parts of winegstreamer that fall under the purview of Media Foundation, it is not really possible to separate these logically from the parts which interact with the GStreamer backend. Better to have a dedicated maintainer for the whole DLL, and assign patches to the Media Foundation maintainer as necessary. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index f532c2eb570..01d2cfa80f5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -113,7 +113,6 @@ F: dlls/qcap/ F: dlls/qdvd/ F: dlls/qedit/ F: dlls/quartz/ -F: dlls/winegstreamer/quartz_parser.c F: libs/strmbase/ DirectWrite @@ -156,6 +155,10 @@ GPhoto Driver M: Marcus Meissner <marcus(a)jet.franken.de> F: dlls/gphoto2.ds/ +GStreamer multimedia backend +M: Zebediah Figura <z.figura12(a)gmail.com> +F: dlls/winegstreamer/ + HID support M: Aric Stewart <aric(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com>

1 0

Zhiyi Zhang : win32u: Fix a memory leak.
by Alexandre Julliard May 17, 2022

May 17, 2022

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

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

May 17, 2022

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 : nsi: Allocate a small buffer at once in NsiAllocateAndGetTable().
by Alexandre Julliard May 17, 2022

May 17, 2022

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

Zhiyi Zhang : include: Add D3DKMTQueryVideoMemoryInfo() definition.
by Alexandre Julliard May 17, 2022

May 17, 2022

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

Zebediah Figura : maintainers: Add a Windows Media Format section.
by Alexandre Julliard May 17, 2022

May 17, 2022

Module: wine Branch: master Commit: d2d1ebdfc2fe31dce4c87b5ad9d518dc06cdec0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2d1ebdfc2fe31dce4c87b5a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 17 12:38:11 2022 -0500 maintainers: Add a Windows Media Format section. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 01d2cfa80f5..c60a383b3b9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -333,6 +333,11 @@ F: dlls/wbemdisp/ F: dlls/wbemprox/ F: dlls/wmiutils/ +Windows Media Format +M: Zebediah Figura <z.figura12(a)gmail.com> +F: dlls/wmp/ +F: dlls/wmvcore/ + Windows Media Foundation M: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/mf/

1 0

Piotr Caban : oleacc: Store test IAccessible data in structure.
by Alexandre Julliard May 17, 2022

May 17, 2022

Module: wine Branch: master Commit: 3dbfe812b6f0333c0041fd8ebe736e3947a93ec1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dbfe812b6f0333c0041fd8e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 17 14:38:40 2022 +0200 oleacc: Store test IAccessible data in structure. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 147 +++++++++++++++++++++++++++++------------------ 1 file changed, 92 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3dbfe812b6f0333c0041…

1 0