[PATCH v2 0/1] MR2624: include: Fix IDirectXVideoDecoderService declaration in dxva2api.idl.

[Biswapriyo Nath (＠Biswa96)]

This matches the declaration with official documentation and fixes
    the following two compiler errors in apitrace project.

    d3d9trace.cpp:28469:59: error: invalid conversion from 'const DXVA2_ConfigPictureDecode*' to 'DXVA2_ConfigPictureDecode*' [-fpermissive]
    d3d9trace.cpp:28194:65: error: invalid conversion from 'void*' to 'IUnknown*' [-fpermissive]

--
  v2: include: Fix IDirectXVideoDecoderService declaration in dxva2api.idl.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2624

[PATCH v2 1/1] include: Fix IDirectXVideoDecoderService declaration in dxva2api.idl.

[Biswapriyo Nath]

From: Biswapriyo Nath <nathbappai(a)gmail.com>

This matches the declaration with official documentation and fixes
the following two compiler errors in apitrace project.

d3d9trace.cpp:28469:59: error: invalid conversion from 'const DXVA2_ConfigPictureDecode*' to 'DXVA2_ConfigPictureDecode*' [-fpermissive]
d3d9trace.cpp:28194:65: error: invalid conversion from 'void*' to 'IUnknown*' [-fpermissive]

Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com>
---
 dlls/dxva2/main.c    | 4 ++--
 include/dxva2api.idl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c
index c5ca3439a68..d48cf8de230 100644
--- a/dlls/dxva2/main.c
+++ b/dlls/dxva2/main.c
@@ -701,7 +701,7 @@ static HRESULT WINAPI device_manager_decoder_service_GetDecoderRenderTargets(IDi
 }
 
 static HRESULT WINAPI device_manager_decoder_service_GetDecoderConfigurations(IDirectXVideoDecoderService *iface,
-        REFGUID guid, const DXVA2_VideoDesc *video_desc, IUnknown *reserved, UINT *count, DXVA2_ConfigPictureDecode **configs)
+        REFGUID guid, const DXVA2_VideoDesc *video_desc, void *reserved, UINT *count, DXVA2_ConfigPictureDecode **configs)
 {
     FIXME("%p, %s, %p, %p, %p, %p.\n", iface, debugstr_guid(guid), video_desc, reserved, count, configs);
 
@@ -709,7 +709,7 @@ static HRESULT WINAPI device_manager_decoder_service_GetDecoderConfigurations(ID
 }
 
 static HRESULT WINAPI device_manager_decoder_service_CreateVideoDecoder(IDirectXVideoDecoderService *iface,
-        REFGUID guid, const DXVA2_VideoDesc *video_desc, DXVA2_ConfigPictureDecode *config, IDirect3DSurface9 **rts,
+        REFGUID guid, const DXVA2_VideoDesc *video_desc, const DXVA2_ConfigPictureDecode *config, IDirect3DSurface9 **rts,
         UINT num_surfaces, IDirectXVideoDecoder **decoder)
 {
     FIXME("%p, %s, %p, %p, %p, %u, %p.\n", iface, debugstr_guid(guid), video_desc, config, rts, num_surfaces,
diff --git a/include/dxva2api.idl b/include/dxva2api.idl
index 63de780f0df..205491e3790 100644
--- a/include/dxva2api.idl
+++ b/include/dxva2api.idl
@@ -631,14 +631,14 @@ interface IDirectXVideoDecoderService : IDirectXVideoAccelerationService
     HRESULT GetDecoderConfigurations(
         [in] REFGUID guid,
         [in] const DXVA2_VideoDesc *pVideoDesc,
-        [in] IUnknown *pReserved,
+        [in] void *pReserved,
         [out] UINT *pCount,
         [out] DXVA2_ConfigPictureDecode **ppConfigs);
 
     HRESULT CreateVideoDecoder(
         [in] REFGUID guid,
         [in] const DXVA2_VideoDesc *pVideoDesc,
-        [in] DXVA2_ConfigPictureDecode *pConfig,
+        [in] const DXVA2_ConfigPictureDecode *pConfig,
         [in] IDirect3DSurface9 **ppDecoderRenderTargets,
         [in] UINT NumSurfaces,
         [out] IDirectXVideoDecoder **ppDecode);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2624

[PATCH v2 0/1] MR2624: include: Fix IDirectXVideoDecoderService declaration in dxva2api.idl. - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2624