January 2024 - Wine-gitlab - list.winehq.org

Re: [PATCH v3 0/3] MR4857: gdi32,win32u: Implement D3DKMTEnumAdapters2.
by Zhiyi Zhang (＠zhiyi) 19 Jan '24

19 Jan '24

Zhiyi Zhang (@zhiyi) commented about dlls/win32u/sysparams.c: > + if (!lock_display_devices()) return STATUS_UNSUCCESSFUL; > + > + if ((count = list_count( &adapters )) > max_adapters) > + { > + WARN( "Too many adapters (%u), only up to %u can be enumerated.\n", > + (unsigned int)count, (unsigned int)max_adapters ); > + count = max_adapters; > + } > + > + if (count > desc->NumAdapters) > + { > + status = STATUS_BUFFER_TOO_SMALL; > + goto done; > + } > + > + if (!(adapter_infos = calloc( count, sizeof(*adapter_infos) ))) D3DKMT_ENUMADAPTERS2 already has an array for this. I think you can avoid this memory allocation. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4857#note_58131

1 0

Re: [PATCH v3 0/3] MR4857: gdi32,win32u: Implement D3DKMTEnumAdapters2.
by Zhiyi Zhang (＠zhiyi) 19 Jan '24

19 Jan '24

Zhiyi Zhang (@zhiyi) commented about dlls/win32u/sysparams.c: > - return STATUS_PROCEDURE_NOT_FOUND; > + D3DKMT_OPENADAPTERFROMLUID open_adapter_from_luid; > + D3DKMT_ADAPTERINFO *adapter_infos = NULL; > + static const ULONG max_adapters = 32; > + D3DKMT_CLOSEADAPTER close_adapter; > + NTSTATUS status = STATUS_SUCCESS; > + struct adapter *adapter; > + ULONG idx = 0, count; > + > + TRACE( "(%p)\n", desc ); > + > + if (!desc) return STATUS_INVALID_PARAMETER; > + > + if (!desc->pAdapters) > + { > + desc->NumAdapters = max_adapters; Please add a test for this. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4857#note_58129

1 0

Re: [PATCH v3 0/3] MR4857: gdi32,win32u: Implement D3DKMTEnumAdapters2.
by Zhiyi Zhang (＠zhiyi) 19 Jan '24

19 Jan '24

Zhiyi Zhang (@zhiyi) commented about dlls/win32u/sysparams.c: > + struct adapter *adapter; > + ULONG idx = 0, count; > + > + TRACE( "(%p)\n", desc ); > + > + if (!desc) return STATUS_INVALID_PARAMETER; > + > + if (!desc->pAdapters) > + { > + desc->NumAdapters = max_adapters; > + return STATUS_SUCCESS; > + } > + > + if (!lock_display_devices()) return STATUS_UNSUCCESSFUL; > + > + if ((count = list_count( &adapters )) > max_adapters) This is wrong. adapters in sysparams.c are GDI adapters, they are not the same adapter in D3DKMT terms. Adapters in D3DKMT terms mean GPUs. So you need to add a list of GPUs to the cache and then do enumeration from that. You should do the initialization from the SetupAPI registry data. For example, basically with the following code. However, since you're in win32u. You can't use SetupAPI directly and you need to convert these to NT registry calls instead. See prepare_devices() for some example code for how to do it. ``` devinfo = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_DISPLAY, DIGCF_PRESENT ); for (i = 0; SetupDiEnumDeviceInfo( set, i, &device ); ++i) { if (SetupDiGetDevicePropertyW( device, &device_data, &DEVPROPKEY_GPU_LUID, &type, (BYTE *)&luid_desc.AdapterLuid, sizeof( luid_desc.AdapterLuid ), NULL, 0)) add_to_gpu_list; } ``` Then `NumOfSources` is the number of GDI adapters with the same GPU LUID. As for bPrecisePresentRegionsPreferred, I guess you can just return TRUE. The GPU list construction can be done in update_display_cache_from_registry(). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4857#note_58130

1 0

Re: [PATCH v3 0/3] MR4857: gdi32,win32u: Implement D3DKMTEnumAdapters2.
by Zhiyi Zhang (＠zhiyi) 19 Jan '24

19 Jan '24

Zhiyi Zhang (@zhiyi) commented about dlls/gdi32/tests/driver.c: > + status = pD3DKMTEnumAdapters2(&enum_adapters_2_desc); > + ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); > + ok(enum_adapters_2_desc.NumAdapters, "Expect not zero.\n"); > + > + for (i = 0; i < enum_adapters_2_desc.NumAdapters; ++i) > + { > + ok(enum_adapters_2_desc.pAdapters[i].hAdapter, "Expect not null.\n"); > + ok(enum_adapters_2_desc.pAdapters[i].AdapterLuid.LowPart || enum_adapters_2_desc.pAdapters[i].AdapterLuid.HighPart, > + "Expect LUID not zero.\n"); > + > + close_adapter_desc.hAdapter = enum_adapters_2_desc.pAdapters[i].hAdapter; > + status = pD3DKMTCloseAdapter(&close_adapter_desc); > + ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); > + } > + > + ok(!enum_adapters_2_desc.pAdapters[i].hAdapter, "Expect null.\n"); You can remove this line. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4857#note_58128

1 0

Re: [PATCH v3 0/3] MR4857: gdi32,win32u: Implement D3DKMTEnumAdapters2.
by Zhiyi Zhang (＠zhiyi) 19 Jan '24

19 Jan '24

Zhiyi Zhang (@zhiyi) commented about dlls/gdi32/tests/driver.c: > + skip("D3DKMTEnumAdapters2() is unavailable.\n"); > + return; > + } > + > + /* Invalid parameters */ > + status = pD3DKMTEnumAdapters2(NULL); > + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#lx.\n", status); > + > + /* Query the array to allocate */ > + memset(&enum_adapters_2_desc, 0, sizeof(enum_adapters_2_desc)); > + status = pD3DKMTEnumAdapters2(&enum_adapters_2_desc); > + ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); > + ok(enum_adapters_2_desc.NumAdapters, "Expect not zero.\n"); > + > + /* Allocate the array */ > + enum_adapters_2_desc.pAdapters = calloc(enum_adapters_2_desc.NumAdapters + 1, sizeof(D3DKMT_ADAPTERINFO)); Why enum_adapters_2_desc.NumAdapters + 1 and not enum_adapters_2_desc.NumAdapters? I don't think it's necessary to check buffer that is out of range. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4857#note_58127

1 0

[PATCH 0/2] MR580: vkd3d-shader/spirv: Handle UINT32_MAX result for FIRSTBIT_HI and FIRSTBIT_SHI.
by Conor McCarthy (＠cmccarthy) 19 Jan '24

19 Jan '24

-- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/580

2 2

[PATCH 0/5] MR4877: include: Add some ncrypt definitions.
by Zhiyi Zhang (＠zhiyi) 19 Jan '24

19 Jan '24

Needed for ManaSoul (SteamID: 2660840) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4877

3 6

[PATCH v3 0/4] MR4066: win32u: Skip windows that are not activated even once in activate_other_window().
by Zhiyi Zhang (＠zhiyi) 19 Jan '24

19 Jan '24

-- v3: win32u: Don't move an owned window on top of its owner if it's not activated ever. user32/tests: Test the z-order for an owned window that's not activated ever. win32u: Skip windows that are not activated even once in activate_other_window(). user32/tests: Add window activation tests. https://gitlab.winehq.org/wine/wine/-/merge_requests/4066

3 5

[PATCH 0/2] MR4817: shell32: Implement some functions of IFileOperation.
by Haoyang Chen (＠chenhaoyang) 19 Jan '24

19 Jan '24

IFileOperation_{SetOperationFlags, NewItem, CopyItem, MoveItem, DeleteItem, GetAnyOperationsAborted, PerformOperations, RenameItem, SetOwnerWindow} -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4817

3 19

[PATCH 0/3] MR4875: wined3d: Hook up sm1 support in the Vulkan backend.
by Zebediah Figura (＠zfigura) 19 Jan '24

19 Jan '24

This allows for the basic features necessary to compile sm1 shaders. This is the first step towards comprehensive Direct3D 1-9 support in the Vulkan backend. Fixed-function d3d states that must be emulated with shaders in Vulkan (e.g. alpha test) are not yet implemented, nor is the fixed-function pipeline. Accordingly it is unlikely that any real applications run yet. Tested with vkd3d's tests. Specifically, run `make crosstest` in a vkd3d tree, then: wine tests/shader_runner.cross64.exe ../vkd3d/tests/hlsl/writemask-assignop-0.shader_test -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4875

5 7