October 2023 - Wine-commits

Rémi Bernon : dmime: Send DMUS_PMSGT_NOTIFICATION messages from the performance.
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: 3de1bc035ede848b5661da7d4ad8af5220a5ae28 URL: https://gitlab.winehq.org/wine/wine/-/commit/3de1bc035ede848b5661da7d4ad8af… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Oct 7 10:48:36 2023 +0200 dmime: Send DMUS_PMSGT_NOTIFICATION messages from the performance. Keeping the segment state referenced until its playback ends. --- dlls/dmime/performance.c | 72 ++++++++++++++++++++++++++++++++++++++++++------ dlls/dmime/tests/dmime.c | 34 ++++------------------- 2 files changed, 69 insertions(+), 37 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 0215b19a23c..40a78bc40ce 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -66,6 +66,9 @@ struct performance IReferenceClock *master_clock; REFERENCE_TIME init_time; struct list messages; + + BOOL notification_performance; + BOOL notification_segment; }; struct message @@ -225,6 +228,32 @@ static HRESULT performance_send_dirty_pmsg(struct performance *This, MUSIC_TIME return hr; } +static HRESULT performance_send_notification_pmsg(struct performance *This, MUSIC_TIME music_time, BOOL stamp, + GUID type, DWORD option, IUnknown *object) +{ + IDirectMusicPerformance8 *performance = &This->IDirectMusicPerformance8_iface; + IDirectMusicGraph *graph = &This->IDirectMusicGraph_iface; + DMUS_NOTIFICATION_PMSG *msg; + HRESULT hr; + + if (FAILED(hr = IDirectMusicPerformance8_AllocPMsg(performance, sizeof(*msg), (DMUS_PMSG **)&msg))) + return hr; + + msg->mtTime = music_time; + msg->dwFlags = DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_QUEUE; + msg->dwType = DMUS_PMSGT_NOTIFICATION; + if ((msg->punkUser = object)) IUnknown_AddRef(object); + msg->guidNotificationType = type; + msg->dwNotificationOption = option; + + /* only stamp the message if notifications are enabled, otherwise send them directly to the output tool */ + if ((stamp && FAILED(hr = IDirectMusicGraph_StampPMsg(graph, (DMUS_PMSG *)msg))) + || FAILED(hr = IDirectMusicPerformance8_SendPMsg(performance, (DMUS_PMSG *)msg))) + IDirectMusicPerformance8_FreePMsg(performance, (DMUS_PMSG *)msg); + + return hr; +} + static int pchannel_block_compare(const void *key, const struct wine_rb_entry *entry) { const struct pchannel_block *b = WINE_RB_ENTRY_VALUE(entry, const struct pchannel_block, entry); @@ -703,20 +732,32 @@ static HRESULT WINAPI performance_GetNotificationPMsg(IDirectMusicPerformance8 * /*return S_OK;*/ } -static HRESULT WINAPI performance_AddNotificationType(IDirectMusicPerformance8 *iface, REFGUID rguidNotificationType) +static HRESULT WINAPI performance_AddNotificationType(IDirectMusicPerformance8 *iface, REFGUID type) { - struct performance *This = impl_from_IDirectMusicPerformance8(iface); + struct performance *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; + FIXME("(%p, %s): stub\n", This, debugstr_dmguid(type)); + + if (IsEqualGUID(type, &GUID_NOTIFICATION_PERFORMANCE)) + This->notification_performance = TRUE; + if (IsEqualGUID(type, &GUID_NOTIFICATION_SEGMENT)) + This->notification_segment = TRUE; + + return S_OK; } -static HRESULT WINAPI performance_RemoveNotificationType(IDirectMusicPerformance8 *iface, REFGUID rguidNotificationType) +static HRESULT WINAPI performance_RemoveNotificationType(IDirectMusicPerformance8 *iface, REFGUID type) { - struct performance *This = impl_from_IDirectMusicPerformance8(iface); + struct performance *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; + FIXME("(%p, %s): stub\n", This, debugstr_dmguid(type)); + + if (IsEqualGUID(type, &GUID_NOTIFICATION_PERFORMANCE)) + This->notification_performance = FALSE; + if (IsEqualGUID(type, &GUID_NOTIFICATION_SEGMENT)) + This->notification_segment = FALSE; + + return S_OK; } static HRESULT perf_dmport_create(struct performance *perf, DMUS_PORTPARAMS *params) @@ -1122,11 +1163,26 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, } hr = IDirectMusicSegment_GetLength(segment, &length); + if (SUCCEEDED(hr)) + hr = performance_send_notification_pmsg(This, start_time, This->notification_performance, + GUID_NOTIFICATION_PERFORMANCE, DMUS_NOTIFICATION_MUSICSTARTED, NULL); + if (SUCCEEDED(hr)) + hr = performance_send_notification_pmsg(This, start_time, This->notification_segment, + GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGSTART, (IUnknown *)state); if (SUCCEEDED(hr)) hr = performance_send_dirty_pmsg(This, start_time); + if (SUCCEEDED(hr)) + hr = performance_send_notification_pmsg(This, start_time + length, This->notification_segment, + GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGEND, (IUnknown *)state); + if (SUCCEEDED(hr)) + hr = performance_send_notification_pmsg(This, start_time + length, This->notification_segment, + GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGALMOSTEND, (IUnknown *)state); if (SUCCEEDED(hr)) hr = performance_send_dirty_pmsg(This, start_time + length); + if (SUCCEEDED(hr)) + hr = performance_send_notification_pmsg(This, start_time + length, This->notification_performance, + GUID_NOTIFICATION_PERFORMANCE, DMUS_NOTIFICATION_MUSICSTOPPED, NULL); if (SUCCEEDED(hr) && segment_state) { diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 2b7f08eef7a..c8c330860a8 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3109,66 +3109,45 @@ static void test_notification_pmsg(void) ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&notif); ok(!ret, "got %#lx\n", ret); - if (notif->dwType == DMUS_PMSGT_NOTIFICATION) - { check_dmus_notification_pmsg(notif, &GUID_NOTIFICATION_PERFORMANCE, DMUS_NOTIFICATION_MUSICSTARTED); - } hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)notif); ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&notif); ok(!ret, "got %#lx\n", ret); - if (notif->dwType == DMUS_PMSGT_NOTIFICATION) - { check_dmus_notification_pmsg(notif, &GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGSTART); - } hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)notif); ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 500, &msg); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %#lx\n", msg->dwType); hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&notif); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); check_dmus_notification_pmsg(notif, &GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGEND); hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)notif); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&notif); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); check_dmus_notification_pmsg(notif, &GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGALMOSTEND); hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)notif); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, &msg); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %#lx\n", msg->dwType); hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&notif); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); check_dmus_notification_pmsg(notif, &GUID_NOTIFICATION_PERFORMANCE, DMUS_NOTIFICATION_MUSICSTOPPED); hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)notif); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 100, &msg); ok(ret == WAIT_TIMEOUT, "got %#lx\n", ret); @@ -3246,10 +3225,7 @@ static void test_notification_pmsg(void) ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&notif); ok(!ret, "got %#lx\n", ret); - if (notif->dwType == DMUS_PMSGT_NOTIFICATION) - { check_dmus_notification_pmsg(notif, &GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGSTART); - } hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)notif); ok(hr == S_OK, "got %#lx\n", hr);

1 0

Rémi Bernon : dmime: Implement IDirectMusicPerformance_GetNotificationPMsg.
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: 7a678903fbe9b384e97b23bc8cb73c9239616054 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a678903fbe9b384e97b23bc8cb73c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 6 15:55:13 2023 +0200 dmime: Implement IDirectMusicPerformance_GetNotificationPMsg. --- dlls/dmime/performance.c | 108 +++++++++++++++++++++++++++++++++++++---------- dlls/dmime/tests/dmime.c | 31 ++++---------- 2 files changed, 93 insertions(+), 46 deletions(-)

1 0

Rémi Bernon : dmime: Call IDirectMusicTrack_(Init|End)Play from the segment state.
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: 3e19ca928e8479edce9f9484dc841d08edbdf5f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e19ca928e8479edce9f9484dc841d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 22 17:30:51 2023 +0200 dmime: Call IDirectMusicTrack_(Init|End)Play from the segment state. --- dlls/dmime/dmime_private.h | 4 +- dlls/dmime/performance.c | 21 +++++++++- dlls/dmime/segmentstate.c | 98 +++++++++++++++++++++++++++++++++++++++++++++- dlls/dmime/tests/dmime.c | 14 +++---- 4 files changed, 125 insertions(+), 12 deletions(-)

1 0

Etaash Mathamsetty : gdi32: Add stub for D3DKMTQueryAdapterInfo.
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: 627181d99c29a95d91c7ac1dc9de220e0f54b321 URL: https://gitlab.winehq.org/wine/wine/-/commit/627181d99c29a95d91c7ac1dc9de22… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Fri Sep 8 20:37:37 2023 -0400 gdi32: Add stub for D3DKMTQueryAdapterInfo. --- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/gdi32.spec | 1 + dlls/win32u/driver.c | 12 +++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/gdi.c | 22 ++++++++++++ dlls/wow64win/syscall.h | 1 + include/ddk/d3dkmthk.h | 92 +++++++++++++++++++++++++++++++++++++++++++++++++ include/ntgdi.h | 1 + 9 files changed, 132 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 383ed6aa9cc..bb755e2e869 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -27,7 +27,7 @@ @ stub D3DKMTOpenAdapterFromHdc @ stub D3DKMTOpenResource @ stub D3DKMTPresent -@ stub D3DKMTQueryAdapterInfo +@ stdcall D3DKMTQueryAdapterInfo(ptr) gdi32.D3DKMTQueryAdapterInfo @ stub D3DKMTQueryAllocationResidency @ stub D3DKMTQueryResourceInfo @ stub D3DKMTRender diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index d6a0ad90e1e..84c294c286f 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -84,6 +84,7 @@ @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) win32u.NtGdiDdDDIOpenAdapterFromHdc @ stdcall D3DKMTOpenAdapterFromLuid(ptr) win32u.NtGdiDdDDIOpenAdapterFromLuid +@ stdcall D3DKMTQueryAdapterInfo(ptr) win32u.NtGdiDdDDIQueryAdapterInfo @ stdcall D3DKMTQueryStatistics(ptr) win32u.NtGdiDdDDIQueryStatistics @ stdcall D3DKMTQueryVideoMemoryInfo(ptr) win32u.NtGdiDdDDIQueryVideoMemoryInfo @ stdcall D3DKMTSetQueuedLimit(ptr) win32u.NtGdiDdDDISetQueuedLimit diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index ed2e0973d39..e6a24d1a46c 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1539,6 +1539,18 @@ NTSTATUS WINAPI NtGdiDdDDIDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) return status; } +/****************************************************************************** + * NtGdiDdDDIQueryAdapterInfo (win32u.@) + */ +NTSTATUS WINAPI NtGdiDdDDIQueryAdapterInfo( D3DKMT_QUERYADAPTERINFO *desc ) +{ + if (!desc) + return STATUS_INVALID_PARAMETER; + + FIXME("desc %p, type %d stub\n", desc, desc->Type); + return STATUS_NOT_IMPLEMENTED; +} + /****************************************************************************** * NtGdiDdDDIQueryStatistics (win32u.@) */ diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index b5fee3a12c7..5a20409437e 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -76,6 +76,7 @@ static void * const syscalls[] = NtGdiDdDDIOpenAdapterFromDeviceName, NtGdiDdDDIOpenAdapterFromHdc, NtGdiDdDDIOpenAdapterFromLuid, + NtGdiDdDDIQueryAdapterInfo, NtGdiDdDDIQueryStatistics, NtGdiDdDDIQueryVideoMemoryInfo, NtGdiDdDDISetQueuedLimit, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 13ec8cf09b8..24dccb6ec1d 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -295,7 +295,7 @@ @ stub NtGdiDdDDIPresentMultiPlaneOverlay2 @ stub NtGdiDdDDIPresentMultiPlaneOverlay3 @ stub NtGdiDdDDIPresentRedirected -@ stub NtGdiDdDDIQueryAdapterInfo +@ stdcall -syscall NtGdiDdDDIQueryAdapterInfo(ptr) @ stub NtGdiDdDDIQueryAllocationResidency @ stub NtGdiDdDDIQueryClockCalibration @ stub NtGdiDdDDIQueryFSEBlock diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c index 1bcfd17cdfb..36af173405c 100644 --- a/dlls/wow64win/gdi.c +++ b/dlls/wow64win/gdi.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "ntgdi.h" +#include "ddk/d3dkmthk.h" #include "wow64win_private.h" typedef struct @@ -585,6 +586,27 @@ NTSTATUS WINAPI wow64_NtGdiDdDDIOpenAdapterFromLuid( UINT *args ) return NtGdiDdDDIOpenAdapterFromLuid( desc ); } +NTSTATUS WINAPI wow64_NtGdiDdDDIQueryAdapterInfo( UINT *args ) +{ + struct _D3DKMT_QUERYADAPTERINFO + { + D3DKMT_HANDLE hAdapter; + KMTQUERYADAPTERINFOTYPE Type; + ULONG pPrivateDriverData; + UINT PrivateDriverDataSize; + } *desc32 = get_ptr( &args ); + D3DKMT_QUERYADAPTERINFO desc; + + if (!desc32) return STATUS_INVALID_PARAMETER; + + desc.hAdapter = desc32->hAdapter; + desc.Type = desc32->Type; + desc.pPrivateDriverData = UlongToPtr( desc32->pPrivateDriverData ); + desc.PrivateDriverDataSize = desc32->PrivateDriverDataSize; + + return NtGdiDdDDIQueryAdapterInfo( &desc ); +} + NTSTATUS WINAPI wow64_NtGdiDdDDIQueryStatistics( UINT *args ) { D3DKMT_QUERYSTATISTICS *stats = get_ptr( &args ); diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 452962ad6f0..3d441668f6a 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -61,6 +61,7 @@ SYSCALL_ENTRY( NtGdiDdDDIOpenAdapterFromDeviceName ) \ SYSCALL_ENTRY( NtGdiDdDDIOpenAdapterFromHdc ) \ SYSCALL_ENTRY( NtGdiDdDDIOpenAdapterFromLuid ) \ + SYSCALL_ENTRY( NtGdiDdDDIQueryAdapterInfo ) \ SYSCALL_ENTRY( NtGdiDdDDIQueryStatistics ) \ SYSCALL_ENTRY( NtGdiDdDDIQueryVideoMemoryInfo ) \ SYSCALL_ENTRY( NtGdiDdDDISetQueuedLimit ) \ diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 69239a45fd9..2d30bdd8777 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -174,6 +174,98 @@ typedef struct _D3DKMT_DESTROYDCFROMMEMORY HANDLE hBitmap; } D3DKMT_DESTROYDCFROMMEMORY; +typedef enum _KMTQUERYADAPTERINFOTYPE +{ + KMTQAITYPE_UMDRIVERPRIVATE, + KMTQAITYPE_UMDRIVERNAME, + KMTQAITYPE_UMOPENGLINFO, + KMTQAITYPE_GETSEGMENTSIZE, + KMTQAITYPE_ADAPTERGUID, + KMTQAITYPE_FLIPQUEUEINFO, + KMTQAITYPE_ADAPTERADDRESS, + KMTQAITYPE_SETWORKINGSETINFO, + KMTQAITYPE_ADAPTERREGISTRYINFO, + KMTQAITYPE_CURRENTDISPLAYMODE, + KMTQAITYPE_MODELIST, + KMTQAITYPE_CHECKDRIVERUPDATESTATUS, + KMTQAITYPE_VIRTUALADDRESSINFO, + KMTQAITYPE_DRIVERVERSION, + KMTQAITYPE_ADAPTERTYPE, + KMTQAITYPE_OUTPUTDUPLCONTEXTSCOUNT, + KMTQAITYPE_WDDM_1_2_CAPS, + KMTQAITYPE_UMD_DRIVER_VERSION, + KMTQAITYPE_DIRECTFLIP_SUPPORT, + KMTQAITYPE_MULTIPLANEOVERLAY_SUPPORT, + KMTQAITYPE_DLIST_DRIVER_NAME, + KMTQAITYPE_WDDM_1_3_CAPS, + KMTQAITYPE_MULTIPLANEOVERLAY_HUD_SUPPORT, + KMTQAITYPE_WDDM_2_0_CAPS, + KMTQAITYPE_NODEMETADATA, + KMTQAITYPE_CPDRIVERNAME, + KMTQAITYPE_XBOX, + KMTQAITYPE_INDEPENDENTFLIP_SUPPORT, + KMTQAITYPE_MIRACASTCOMPANIONDRIVERNAME, + KMTQAITYPE_PHYSICALADAPTERCOUNT, + KMTQAITYPE_PHYSICALADAPTERDEVICEIDS, + KMTQAITYPE_DRIVERCAPS_EXT, + KMTQAITYPE_QUERY_MIRACAST_DRIVER_TYPE, + KMTQAITYPE_QUERY_GPUMMU_CAPS, + KMTQAITYPE_QUERY_MULTIPLANEOVERLAY_DECODE_SUPPORT, + KMTQAITYPE_QUERY_HW_PROTECTION_TEARDOWN_COUNT, + KMTQAITYPE_QUERY_ISBADDRIVERFORHWPROTECTIONDISABLED, + KMTQAITYPE_MULTIPLANEOVERLAY_SECONDARY_SUPPORT, + KMTQAITYPE_INDEPENDENTFLIP_SECONDARY_SUPPORT, + KMTQAITYPE_PANELFITTER_SUPPORT, + KMTQAITYPE_PHYSICALADAPTERPNPKEY, + KMTQAITYPE_GETSEGMENTGROUPSIZE, + KMTQAITYPE_MPO3DDI_SUPPORT, + KMTQAITYPE_HWDRM_SUPPORT, + KMTQAITYPE_MPOKERNELCAPS_SUPPORT, + KMTQAITYPE_MULTIPLANEOVERLAY_STRETCH_SUPPORT, + KMTQAITYPE_GET_DEVICE_VIDPN_OWNERSHIP_INFO, + KMTQAITYPE_QUERYREGISTRY, + KMTQAITYPE_KMD_DRIVER_VERSION, + KMTQAITYPE_BLOCKLIST_KERNEL, + KMTQAITYPE_BLOCKLIST_RUNTIME, + KMTQAITYPE_ADAPTERGUID_RENDER, + KMTQAITYPE_ADAPTERADDRESS_RENDER, + KMTQAITYPE_ADAPTERREGISTRYINFO_RENDER, + KMTQAITYPE_CHECKDRIVERUPDATESTATUS_RENDER, + KMTQAITYPE_DRIVERVERSION_RENDER, + KMTQAITYPE_ADAPTERTYPE_RENDER, + KMTQAITYPE_WDDM_1_2_CAPS_RENDER, + KMTQAITYPE_WDDM_1_3_CAPS_RENDER, + KMTQAITYPE_QUERY_ADAPTER_UNIQUE_GUID, + KMTQAITYPE_NODEPERFDATA, + KMTQAITYPE_ADAPTERPERFDATA, + KMTQAITYPE_ADAPTERPERFDATA_CAPS, + KMTQUITYPE_GPUVERSION, + KMTQAITYPE_DRIVER_DESCRIPTION, + KMTQAITYPE_DRIVER_DESCRIPTION_RENDER, + KMTQAITYPE_SCANOUT_CAPS, + KMTQAITYPE_DISPLAY_UMDRIVERNAME, + KMTQAITYPE_PARAVIRTUALIZATION_RENDER, + KMTQAITYPE_SERVICENAME, + KMTQAITYPE_WDDM_2_7_CAPS, + KMTQAITYPE_TRACKEDWORKLOAD_SUPPORT, + KMTQAITYPE_HYBRID_DLIST_DLL_SUPPORT, + KMTQAITYPE_DISPLAY_CAPS, + KMTQAITYPE_WDDM_2_9_CAPS, + KMTQAITYPE_CROSSADAPTERRESOURCE_SUPPORT, + KMTQAITYPE_WDDM_3_0_CAPS, + KMTQAITYPE_WSAUMDIMAGENAME, + KMTQAITYPE_VGPUINTERFACEID, + KMTQAITYPE_WDDM_3_1_CAPS +} KMTQUERYADAPTERINFOTYPE; + +typedef struct _D3DKMT_QUERYADAPTERINFO +{ + D3DKMT_HANDLE hAdapter; + KMTQUERYADAPTERINFOTYPE Type; + VOID *pPrivateDriverData; + UINT PrivateDriverDataSize; +} D3DKMT_QUERYADAPTERINFO; + typedef enum _D3DKMT_QUERYRESULT_PREEMPTION_ATTEMPT_RESULT { D3DKMT_PreemptionAttempt = 0, diff --git a/include/ntgdi.h b/include/ntgdi.h index f93708d5400..9812ebc9d32 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -477,6 +477,7 @@ NTSTATUS WINAPI NtGdiDdDDIEscape( const D3DKMT_ESCAPE *desc ); NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromHdc( D3DKMT_OPENADAPTERFROMHDC *desc ); NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromDeviceName( D3DKMT_OPENADAPTERFROMDEVICENAME *desc ); NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ); +NTSTATUS WINAPI NtGdiDdDDIQueryAdapterInfo( D3DKMT_QUERYADAPTERINFO *desc ); NTSTATUS WINAPI NtGdiDdDDIQueryStatistics( D3DKMT_QUERYSTATISTICS *stats ); NTSTATUS WINAPI NtGdiDdDDIQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ); NTSTATUS WINAPI NtGdiDdDDISetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc );

1 0

Nikolay Sivov : gdi32/emf: Fix miter limit serialization.
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: 5b471a2963f52b5550e045ae0066bf4d393d7a56 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b471a2963f52b5550e045ae0066bf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 7 17:53:00 2023 +0200 gdi32/emf: Fix miter limit serialization. --- dlls/gdi32/dc.c | 2 +- dlls/gdi32/emfdc.c | 10 ++++++++++ dlls/gdi32/enhmetafile.c | 2 +- dlls/gdi32/gdi_private.h | 10 ++++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index e1f6703f81e..27211a2b1d2 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1371,7 +1371,7 @@ BOOL WINAPI SetMiterLimit( HDC hdc, FLOAT limit, FLOAT *old_limit ) { DC_ATTR *dc_attr; if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; - /* FIXME: record EMFs */ + if (dc_attr->emf && !EMFDC_SetMiterLimit( dc_attr, limit )) return 0; if (old_limit) *old_limit = dc_attr->miter_limit; dc_attr->miter_limit = limit; return TRUE; diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 645592fea0a..35910b388c3 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -2254,6 +2254,16 @@ BOOL EMFDC_SetMapMode( DC_ATTR *dc_attr, INT mode ) return emfdc_record( get_dc_emf( dc_attr ), &emr.emr ); } +BOOL EMFDC_SetMiterLimit( DC_ATTR *dc_attr, FLOAT limit ) +{ + struct emr_set_miter_limit emr; + + emr.emr.iType = EMR_SETMITERLIMIT; + emr.emr.nSize = sizeof(emr); + emr.eMiterLimit = limit; + return emfdc_record( get_dc_emf( dc_attr ), &emr.emr ); +} + BOOL EMFDC_SetViewportExtEx( DC_ATTR *dc_attr, INT cx, INT cy ) { EMRSETVIEWPORTEXTEX emr; diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 12449ecfdf0..0351d8c462d 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1680,7 +1680,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( case EMR_SETMITERLIMIT: { - const EMRSETMITERLIMIT *lpSetMiterLimit = (const EMRSETMITERLIMIT *)mr; + const struct emr_set_miter_limit *lpSetMiterLimit = (const struct emr_set_miter_limit *)mr; SetMiterLimit( hdc, lpSetMiterLimit->eMiterLimit, NULL ); break; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index f717181b252..a98c0f29917 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -160,6 +160,15 @@ typedef struct INT nBreakCount; } EMRSETTEXTJUSTIFICATION, *PEMRSETTEXTJUSTIFICATION; +/* Public structure EMRSETMITERLIMIT is using a float field, + that does not match serialized output or documentation, + which are both using unsigned integer. */ +struct emr_set_miter_limit +{ + EMR emr; + DWORD eMiterLimit; +}; + BOOL EMFDC_AbortPath( DC_ATTR *dc_attr ); BOOL EMFDC_AlphaBlend( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, INT height_dst, HDC hdc_src, INT x_src, INT y_src, INT width_src, INT height_src, @@ -232,6 +241,7 @@ INT EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dest, INT y_dest, DWORD wi BOOL EMFDC_SetLayout( DC_ATTR *dc_attr, DWORD layout ); BOOL EMFDC_SetMapMode( DC_ATTR *dc_attr, INT mode ); BOOL EMFDC_SetMapperFlags( DC_ATTR *dc_attr, DWORD flags ); +BOOL EMFDC_SetMiterLimit( DC_ATTR *dc_attr, FLOAT limit ); BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ); BOOL EMFDC_SetPolyFillMode( DC_ATTR *dc_attr, INT mode ); BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop );

1 0

Nikolay Sivov : gdi32/tests: Add some tests for SetMiterLimit() argument validation.
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: 3f304014952636e6ee78c2f7495ee6fb60604d0b URL: https://gitlab.winehq.org/wine/wine/-/commit/3f304014952636e6ee78c2f7495ee6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 7 18:11:41 2023 +0200 gdi32/tests: Add some tests for SetMiterLimit() argument validation. --- dlls/gdi32/tests/dc.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index e3d29ae9ca9..d8204acfc14 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -38,6 +38,8 @@ static void test_dc_values(void) HDC hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); COLORREF color; int extra, attr; + float limit; + BOOL ret; ok( hdc != NULL, "CreateDC failed\n" ); color = SetBkColor( hdc, 0x12345678 ); @@ -91,6 +93,25 @@ static void test_dc_values(void) ok(!attr, "GetDeviceCaps rets %d\n", attr); ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %lu\n", GetLastError()); + /* Miter limit */ + limit = 123.0f; + ret = GetMiterLimit(hdc, &limit); + ok(ret, "Unexpected return value.\n"); + ok(limit == 10.0f, "Unexpected default miter limit %f.\n", limit); + + limit = 456.0; + ret = SetMiterLimit(hdc, 0.9f, &limit); + todo_wine + ok(!ret, "Unexpected return value.\n"); + todo_wine + ok(limit == 456.0f, "Unexpected default miter limit %f.\n", limit); + + limit = 0.0; + ret = SetMiterLimit(hdc, 1.0f, &limit); + ok(ret, "Unexpected return value.\n"); + todo_wine + ok(limit == 10.0f, "Unexpected default miter limit %f.\n", limit); + DeleteDC( hdc ); }

1 0

Nikolay Sivov : gdi32: Reject invalid values in SetMiterLimit().
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: 200d795ff3dd3792abb524e1720756a050660974 URL: https://gitlab.winehq.org/wine/wine/-/commit/200d795ff3dd3792abb524e1720756… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 7 18:13:51 2023 +0200 gdi32: Reject invalid values in SetMiterLimit(). --- dlls/gdi32/dc.c | 1 + dlls/gdi32/tests/dc.c | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 27211a2b1d2..09068c7d13a 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1372,6 +1372,7 @@ BOOL WINAPI SetMiterLimit( HDC hdc, FLOAT limit, FLOAT *old_limit ) DC_ATTR *dc_attr; if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_SetMiterLimit( dc_attr, limit )) return 0; + if (limit < 1.0f) return FALSE; if (old_limit) *old_limit = dc_attr->miter_limit; dc_attr->miter_limit = limit; return TRUE; diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index d8204acfc14..ef121470dfe 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -101,15 +101,12 @@ static void test_dc_values(void) limit = 456.0; ret = SetMiterLimit(hdc, 0.9f, &limit); - todo_wine ok(!ret, "Unexpected return value.\n"); - todo_wine ok(limit == 456.0f, "Unexpected default miter limit %f.\n", limit); limit = 0.0; ret = SetMiterLimit(hdc, 1.0f, &limit); ok(ret, "Unexpected return value.\n"); - todo_wine ok(limit == 10.0f, "Unexpected default miter limit %f.\n", limit); DeleteDC( hdc );

1 0

Nikolay Sivov : gdi32/emf: Add SetMetaRgn() recording.
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: fea9bb75237bb83eebdc0cbaa4b02f4bf6e8a54a URL: https://gitlab.winehq.org/wine/wine/-/commit/fea9bb75237bb83eebdc0cbaa4b02f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 7 18:25:06 2023 +0200 gdi32/emf: Add SetMetaRgn() recording. --- dlls/gdi32/dc.c | 2 +- dlls/gdi32/emfdc.c | 9 +++++++++ dlls/gdi32/gdi_private.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 09068c7d13a..3185fb273ba 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -2253,7 +2253,7 @@ INT WINAPI SetMetaRgn( HDC hdc ) DC_ATTR *dc_attr; if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; - if (dc_attr->emf) FIXME( "EMFs are not yet supported\n" ); + if (dc_attr->emf && !EMFDC_SetMetaRgn( dc_attr )) return FALSE; return NtGdiSetMetaRgn( hdc ); } diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 35910b388c3..e94f3c69b12 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -2254,6 +2254,15 @@ BOOL EMFDC_SetMapMode( DC_ATTR *dc_attr, INT mode ) return emfdc_record( get_dc_emf( dc_attr ), &emr.emr ); } +BOOL EMFDC_SetMetaRgn( DC_ATTR *dc_attr ) +{ + EMRSETMETARGN emr; + + emr.emr.iType = EMR_SETMETARGN; + emr.emr.nSize = sizeof(emr); + return emfdc_record( get_dc_emf( dc_attr ), &emr.emr ); +} + BOOL EMFDC_SetMiterLimit( DC_ATTR *dc_attr, FLOAT limit ) { struct emr_set_miter_limit emr; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index a98c0f29917..d9bf1c32895 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -241,6 +241,7 @@ INT EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dest, INT y_dest, DWORD wi BOOL EMFDC_SetLayout( DC_ATTR *dc_attr, DWORD layout ); BOOL EMFDC_SetMapMode( DC_ATTR *dc_attr, INT mode ); BOOL EMFDC_SetMapperFlags( DC_ATTR *dc_attr, DWORD flags ); +BOOL EMFDC_SetMetaRgn( DC_ATTR *dc_attr ); BOOL EMFDC_SetMiterLimit( DC_ATTR *dc_attr, FLOAT limit ); BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ); BOOL EMFDC_SetPolyFillMode( DC_ATTR *dc_attr, INT mode );

1 0

Nikolay Sivov : winedump/emf: Add EMR_SETMITERLIMIT record dumping.
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: 372c43868bd0950935c9542a1af2c9a0bf705f9e URL: https://gitlab.winehq.org/wine/wine/-/commit/372c43868bd0950935c9542a1af2c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 7 18:33:47 2023 +0200 winedump/emf: Add EMR_SETMITERLIMIT record dumping. --- tools/winedump/emf.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index 8a04886571c..42b1f9469af 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -174,7 +174,6 @@ unsigned long dump_emfrecord(const char *pfx, unsigned long offset) EMRCASE(EMR_ARCTO); EMRCASE(EMR_POLYDRAW); EMRCASE(EMR_SETARCDIRECTION); - EMRCASE(EMR_SETMITERLIMIT); EMRCASE(EMR_BEGINPATH); EMRCASE(EMR_ENDPATH); EMRCASE(EMR_CLOSEFIGURE); @@ -186,6 +185,15 @@ unsigned long dump_emfrecord(const char *pfx, unsigned long offset) EMRCASE(EMR_SELECTCLIPPATH); EMRCASE(EMR_ABORTPATH); + case EMR_SETMITERLIMIT: + { + const EMRSETMITERLIMIT *record = PRD(offset, sizeof(*record)); + + printf("%s%-20s %08x\n", pfx, "EMR_SETMITERLIMIT", length); + printf("%s miter limit %u\n", pfx, *(unsigned int *)&record->eMiterLimit); + break; + } + case EMR_GDICOMMENT: { printf("%s%-20s %08x\n", pfx, "EMR_GDICOMMENT", length);

1 0

Piotr Caban : localspl: Add ResetPrinter implementation.
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: b6b8d5f49c06394a5edffa392928a3a577db75ad URL: https://gitlab.winehq.org/wine/wine/-/commit/b6b8d5f49c06394a5edffa392928a3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 5 14:56:34 2023 +0200 localspl: Add ResetPrinter implementation. --- dlls/localspl/provider.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 762f61dbf57..26e9c66bea0 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -2472,6 +2472,36 @@ static BOOL WINAPI fpDeleteMonitor(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMo return FALSE; } +static BOOL WINAPI fpResetPrinter(HANDLE hprinter, PRINTER_DEFAULTSW *def) +{ + printer_t *printer = (printer_t *)hprinter; + + if (!printer || printer->header.type != HANDLE_PRINTER) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!def) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + free(printer->datatype); + if (def->pDatatype) + printer->datatype = wcsdup(def->pDatatype); + else + printer->datatype = NULL; + + free(printer->devmode); + if (def->pDevMode) + printer->devmode = dup_devmode(def->pDevMode); + else + printer->devmode = NULL; + return TRUE; +} + /***************************************************************************** * fpDeletePort [exported through PRINTPROVIDOR] * @@ -4111,7 +4141,7 @@ static const PRINTPROVIDOR backend = { NULL, /* fpPrinterMessageBox */ fpAddMonitor, fpDeleteMonitor, - NULL, /* fpResetPrinter */ + fpResetPrinter, NULL, /* fpGetPrinterDriverEx */ NULL, /* fpFindFirstPrinterChangeNotification */ NULL, /* fpFindClosePrinterChangeNotification */

1 0