wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Henri Verbeet : vkd3d-shader: Report descriptor resource types in vkd3d_shader_scan_dxbc().
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: vkd3d Branch: master Commit: cf04ed68a7dd6ef7ed2dee1956436d979fafb534 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cf04ed68a7dd6ef7ed2dee1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 25 11:06:25 2020 +0430 vkd3d-shader: Report descriptor resource types in vkd3d_shader_scan_dxbc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 30 +++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_main.c | 45 ++++++++++++++++++++++++++------ libs/vkd3d-shader/vkd3d_shader_private.h | 15 ----------- 3 files changed, 67 insertions(+), 23 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index b2fa499..ea1944e 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -585,11 +585,41 @@ struct vkd3d_versioned_root_signature_desc /* FIXME: Add support for 64 UAV bind slots. */ #define VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS 8 +enum vkd3d_shader_resource_type +{ + VKD3D_SHADER_RESOURCE_NONE = 0x0, + VKD3D_SHADER_RESOURCE_BUFFER = 0x1, + VKD3D_SHADER_RESOURCE_TEXTURE_1D = 0x2, + VKD3D_SHADER_RESOURCE_TEXTURE_2D = 0x3, + VKD3D_SHADER_RESOURCE_TEXTURE_2DMS = 0x4, + VKD3D_SHADER_RESOURCE_TEXTURE_3D = 0x5, + VKD3D_SHADER_RESOURCE_TEXTURE_CUBE = 0x6, + VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY = 0x7, + VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY = 0x8, + VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY = 0x9, + VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY = 0xa, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_RESOURCE_TYPE), +}; + +enum vkd3d_shader_resource_data_type +{ + VKD3D_SHADER_RESOURCE_DATA_UNORM = 0x1, + VKD3D_SHADER_RESOURCE_DATA_SNORM = 0x2, + VKD3D_SHADER_RESOURCE_DATA_INT = 0x3, + VKD3D_SHADER_RESOURCE_DATA_UINT = 0x4, + VKD3D_SHADER_RESOURCE_DATA_FLOAT = 0x5, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_RESOURCE_DATA_TYPE), +}; + struct vkd3d_shader_descriptor_info { enum vkd3d_shader_descriptor_type type; unsigned int register_space; unsigned int register_index; + enum vkd3d_shader_resource_type resource_type; + enum vkd3d_shader_resource_data_type resource_data_type; unsigned int count; }; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 45a7a80..aa401d0 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -229,7 +229,8 @@ static void vkd3d_shader_scan_record_uav_counter(struct vkd3d_shader_scan_info * } static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *context, - enum vkd3d_shader_descriptor_type type, unsigned int register_space, unsigned int register_index) + enum vkd3d_shader_descriptor_type type, unsigned int register_space, unsigned int register_index, + enum vkd3d_shader_resource_type resource_type, enum vkd3d_shader_resource_data_type resource_data_type) { struct vkd3d_shader_scan_info *scan_info = context->scan_info; struct vkd3d_shader_descriptor_info *d; @@ -245,6 +246,8 @@ static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *c d->type = type; d->register_space = register_space; d->register_index = register_index; + d->resource_type = resource_type; + d->resource_data_type = resource_data_type; d->count = 1; ++scan_info->descriptor_count; @@ -256,8 +259,8 @@ static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_sc { const struct vkd3d_shader_constant_buffer *cb = &instruction->declaration.cb; - vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, - cb->register_space, cb->register_index); + vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, cb->register_space, + cb->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); } static void vkd3d_shader_scan_input_declaration(struct vkd3d_shader_scan_info *scan_info, @@ -282,21 +285,45 @@ static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_conte scan_info->sampler_comparison_mode_mask |= 1u << sampler_index; } - vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, - sampler->register_space, sampler->register_index); + vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, sampler->register_space, + sampler->register_index, VKD3D_SHADER_RESOURCE_NONE, VKD3D_SHADER_RESOURCE_DATA_UINT); } static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_instruction *instruction) { const struct vkd3d_shader_semantic *semantic = &instruction->declaration.semantic; + enum vkd3d_shader_resource_data_type resource_data_type; enum vkd3d_shader_descriptor_type type; if (semantic->reg.reg.type == VKD3DSPR_UAV) type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; else type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; - vkd3d_shader_scan_add_descriptor(context, type, semantic->register_space, semantic->register_index); + switch (semantic->resource_data_type) + { + case VKD3D_DATA_UNORM: + resource_data_type = VKD3D_SHADER_RESOURCE_DATA_UNORM; + break; + case VKD3D_DATA_SNORM: + resource_data_type = VKD3D_SHADER_RESOURCE_DATA_SNORM; + break; + case VKD3D_DATA_INT: + resource_data_type = VKD3D_SHADER_RESOURCE_DATA_INT; + break; + case VKD3D_DATA_UINT: + resource_data_type = VKD3D_SHADER_RESOURCE_DATA_UINT; + break; + case VKD3D_DATA_FLOAT: + resource_data_type = VKD3D_SHADER_RESOURCE_DATA_FLOAT; + break; + default: + ERR("Invalid resource data type %#x.\n", semantic->resource_data_type); + resource_data_type = VKD3D_SHADER_RESOURCE_DATA_FLOAT; + break; + } + vkd3d_shader_scan_add_descriptor(context, type, semantic->register_space, + semantic->register_index, semantic->resource_type, resource_data_type); } static void vkd3d_shader_scan_resource_declaration_raw(struct vkd3d_shader_scan_context *context, @@ -309,7 +336,8 @@ static void vkd3d_shader_scan_resource_declaration_raw(struct vkd3d_shader_scan_ type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; else type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; - vkd3d_shader_scan_add_descriptor(context, type, resource->register_space, resource->register_index); + vkd3d_shader_scan_add_descriptor(context, type, resource->register_space, + resource->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); } static void vkd3d_shader_scan_resource_declaration_structured(struct vkd3d_shader_scan_context *context, @@ -322,7 +350,8 @@ static void vkd3d_shader_scan_resource_declaration_structured(struct vkd3d_shade type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; else type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; - vkd3d_shader_scan_add_descriptor(context, type, resource->register_space, resource->register_index); + vkd3d_shader_scan_add_descriptor(context, type, resource->register_space, + resource->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); } static void vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *context, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index dfbbdfd..a9a0c52 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -361,21 +361,6 @@ enum vkd3d_shader_register_type VKD3DSPR_INVALID = ~0u, }; -enum vkd3d_shader_resource_type -{ - VKD3D_SHADER_RESOURCE_NONE, - VKD3D_SHADER_RESOURCE_BUFFER, - VKD3D_SHADER_RESOURCE_TEXTURE_1D, - VKD3D_SHADER_RESOURCE_TEXTURE_2D, - VKD3D_SHADER_RESOURCE_TEXTURE_2DMS, - VKD3D_SHADER_RESOURCE_TEXTURE_3D, - VKD3D_SHADER_RESOURCE_TEXTURE_CUBE, - VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY, - VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY, - VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY, - VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY, -}; - enum vkd3d_data_type { VKD3D_DATA_FLOAT,

1 0

Henri Verbeet : vkd3d-shader: Report descriptor usage information in vkd3d_shader_scan_dxbc().
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: vkd3d Branch: master Commit: 25c0966b6970a2bd777e7c446a566d4af1e6c60e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=25c0966b6970a2bd777e7c4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 25 11:06:24 2020 +0430 vkd3d-shader: Report descriptor usage information in vkd3d_shader_scan_dxbc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 13 ++++ libs/vkd3d-shader/vkd3d_shader.map | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 130 +++++++++++++++++++++++++++++++--- libs/vkd3d/state.c | 2 + 4 files changed, 137 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=25c0966b6970a2bd777…

1 0

Paul Gofman : ntdll: Call TLS callbacks for main exe on thread detach.
by Alexandre Julliard 24 Jun '20

24 Jun '20

Module: wine Branch: master Commit: 1f6423f778f7036a3875613e10b9c8c3b84584f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f6423f778f7036a3875613e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 24 23:30:06 2020 +0300 ntdll: Call TLS callbacks for main exe on thread detach. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index bc437d1a58..2a0f1d51a3 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3178,6 +3178,7 @@ void WINAPI LdrShutdownThread(void) { PLIST_ENTRY mark, entry; LDR_DATA_TABLE_ENTRY *mod; + WINE_MODREF *wm; UINT i; void **pointers; @@ -3187,6 +3188,7 @@ void WINAPI LdrShutdownThread(void) if (process_detaching) return; RtlEnterCriticalSection( &loader_section ); + wm = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); mark = &NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList; for (entry = mark->Blink; entry != mark; entry = entry->Blink) @@ -3202,6 +3204,8 @@ void WINAPI LdrShutdownThread(void) DLL_THREAD_DETACH, NULL ); } + if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, DLL_THREAD_DETACH ); + RtlAcquirePebLock(); RemoveEntryList( &NtCurrentTeb()->TlsLinks ); if ((pointers = NtCurrentTeb()->ThreadLocalStoragePointer))

1 0

Paul Gofman : ntdll: Call TLS callbacks also for main exe on thread attach.
by Alexandre Julliard 24 Jun '20

24 Jun '20

Module: wine Branch: master Commit: 1dc3383389da636617bfa7d9570e7de5c94f7882 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dc3383389da636617bfa7d9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 24 23:30:05 2020 +0300 ntdll: Call TLS callbacks also for main exe on thread attach. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49007 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49098 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49041 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 42cdc62802..bc437d1a58 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3469,6 +3469,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow if ((status = alloc_thread_tls()) != STATUS_SUCCESS) NtTerminateThread( GetCurrentThread(), status ); thread_attach(); + if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, DLL_THREAD_ATTACH ); } RtlLeaveCriticalSection( &loader_section );

1 0

Gabriel Ivăncescu : msscript.ocx: Release the host ref in put_Language.
by Alexandre Julliard 24 Jun '20

24 Jun '20

Module: wine Branch: master Commit: 71d34fc43c92ed80657f547971f7fe16d4836037 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71d34fc43c92ed80657f5479… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 24 17:16:48 2020 +0300 msscript.ocx: Release the host ref in put_Language. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 4e9e5afa4d..df63220888 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -1182,6 +1182,7 @@ static HRESULT WINAPI ScriptControl_put_Language(IScriptControl *iface, BSTR lan if (This->host) { release_modules(This); + IActiveScriptSite_Release(&This->host->IActiveScriptSite_iface); This->host = NULL; }

1 0

Gabriel Ivăncescu : msscript.ocx: Fail if the module array failed to allocate.
by Alexandre Julliard 24 Jun '20

24 Jun '20

Module: wine Branch: master Commit: b34cd24f7d68309fa69c75ad3bce5681358cceef URL: https://source.winehq.org/git/wine.git/?a=commit;h=b34cd24f7d68309fa69c75ad… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 24 17:16:47 2020 +0300 msscript.ocx: Fail if the module array failed to allocate. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index fd2ada5708..4e9e5afa4d 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -1202,6 +1202,9 @@ static HRESULT WINAPI ScriptControl_put_Language(IScriptControl *iface, BSTR lan hres = E_OUTOFMEMORY; } } + else + hres = E_OUTOFMEMORY; + if (FAILED(hres)) { detach_script_host(This->host); This->host = NULL;

1 0

Gabriel Ivăncescu : msscript.ocx: Fix detaching the script host in put_Language.
by Alexandre Julliard 24 Jun '20

24 Jun '20

Module: wine Branch: master Commit: f81862d41517646595df132130e1a4066f74cbc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f81862d41517646595df1321… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 24 17:16:46 2020 +0300 msscript.ocx: Fix detaching the script host in put_Language. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 8b36f3af9a..fd2ada5708 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -1203,8 +1203,8 @@ static HRESULT WINAPI ScriptControl_put_Language(IScriptControl *iface, BSTR lan } } if (FAILED(hres)) { - This->host = NULL; detach_script_host(This->host); + This->host = NULL; } return hres; }

1 0

Nikolay Sivov : mfplat: Add MFConvertColorInfoToDXVA().
by Alexandre Julliard 24 Jun '20

24 Jun '20

Module: wine Branch: master Commit: 1614769407e397956dd92de3c1bcd4f364f3dc08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1614769407e397956dd92de3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 24 16:25:38 2020 +0300 mfplat: Add MFConvertColorInfoToDXVA(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 34 ++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 843c09c5e0..5eaa4fdd08 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -23,6 +23,7 @@ #include "initguid.h" #include "ks.h" #include "ksmedia.h" +#include "dxva2api.h" #include "wine/debug.h" @@ -2748,3 +2749,36 @@ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MF return S_OK; } + +/*********************************************************************** + * MFConvertColorInfoToDXVA (mfplat.@) + */ +HRESULT WINAPI MFConvertColorInfoToDXVA(DWORD *dxva_info, const MFVIDEOFORMAT *format) +{ + struct + { + UINT SampleFormat : 8; + UINT VideoChromaSubsampling : 4; + UINT NominalRange : 3; + UINT VideoTransferMatrix : 3; + UINT VideoLighting : 4; + UINT VideoPrimaries : 5; + UINT VideoTransferFunction : 5; + } *dxva_format = (void *)dxva_info; + + TRACE("%p, %p.\n", dxva_info, format); + + if (format->videoInfo.InterlaceMode == MFVideoInterlace_MixedInterlaceOrProgressive) + dxva_format->SampleFormat = DXVA2_SampleFieldInterleavedEvenFirst; + else + dxva_format->SampleFormat = format->videoInfo.InterlaceMode; + + dxva_format->VideoChromaSubsampling = format->videoInfo.SourceChromaSubsampling; + dxva_format->NominalRange = format->videoInfo.NominalRange; + dxva_format->VideoTransferMatrix = format->videoInfo.TransferMatrix; + dxva_format->VideoLighting = format->videoInfo.SourceLighting; + dxva_format->VideoPrimaries = format->videoInfo.ColorPrimaries; + dxva_format->VideoTransferFunction = format->videoInfo.TransferFunction; + + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index e6069424fc..16be972e5b 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -34,7 +34,7 @@ @ stdcall MFCompareFullToPartialMediaType(ptr ptr) @ stub MFCompareSockaddrAddresses @ stub MFConvertColorInfoFromDXVA -@ stub MFConvertColorInfoToDXVA +@ stdcall MFConvertColorInfoToDXVA(ptr ptr) @ stub MFConvertFromFP16Array @ stub MFConvertToFP16Array @ stdcall MFCopyImage(ptr long ptr long long long) diff --git a/include/mfapi.h b/include/mfapi.h index e86fb526f1..06a5412cbc 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -494,6 +494,7 @@ HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height HRESULT WINAPI MFCancelCreateFile(IUnknown *cancel_cookie); HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); BOOL WINAPI MFCompareFullToPartialMediaType(IMFMediaType *full_type, IMFMediaType *partial_type); +HRESULT WINAPI MFConvertColorInfoToDXVA(DWORD *dxva_info, const MFVIDEOFORMAT *format); HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines); HRESULT WINAPI MFCreate2DMediaBuffer(DWORD width, DWORD height, DWORD fourcc, BOOL bottom_up, IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateAlignedMemoryBuffer(DWORD max_length, DWORD alignment, IMFMediaBuffer **buffer);

1 0

Nikolay Sivov : include: Make inline helpers compatible with NONAMELESSUNION.
by Alexandre Julliard 24 Jun '20

24 Jun '20

Module: wine Branch: master Commit: 6aeb891d529d821fa62e26c177c186c3acb25f23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6aeb891d529d821fa62e26c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 24 16:25:37 2020 +0300 include: Make inline helpers compatible with NONAMELESSUNION. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxva2api.idl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/include/dxva2api.idl b/include/dxva2api.idl index eb4a26509a..04e620b7be 100644 --- a/include/dxva2api.idl +++ b/include/dxva2api.idl @@ -805,23 +805,24 @@ cpp_quote("#endif") cpp_quote("static inline DXVA2_Fixed32 DXVA2_Fixed32OpaqueAlpha(void) {") cpp_quote(" DXVA2_Fixed32 f32;") -cpp_quote(" f32.ll = 0 + (1 << 16);") +cpp_quote(" *(LONG *)&f32 = 0 + (1 << 16);") cpp_quote(" return f32;") cpp_quote("}") cpp_quote("") cpp_quote("static inline DXVA2_Fixed32 DXVA2_Fixed32TransparentAlpha(void) {") -cpp_quote(" DXVA2_Fixed32 f32;") -cpp_quote(" f32.ll = 0;") +cpp_quote(" DXVA2_Fixed32 f32 = {{{ 0 }}};") cpp_quote(" return f32;") cpp_quote("}") cpp_quote("") cpp_quote("static inline float DXVA2FixedToFloat(DXVA2_Fixed32 f32) {") -cpp_quote(" return (float)f32.Value + (float)f32.Fraction / (1 << 16);") +cpp_quote(" struct { USHORT Fraction; SHORT Value; } *_f32 = (void *)&f32;") +cpp_quote(" return (float)_f32->Value + (float)_f32->Fraction / (1 << 16);") cpp_quote("}") cpp_quote("") cpp_quote("static inline DXVA2_Fixed32 DXVA2FloatToFixed(float f) {") cpp_quote(" DXVA2_Fixed32 f32;") -cpp_quote(" f32.Value = ((ULONG) (f * (1 << 16))) >> 16;") -cpp_quote(" f32.Fraction = ((ULONG) (f * (1 << 16))) & 0xFFFF;") +cpp_quote(" struct { USHORT Fraction; SHORT Value; } *_f32 = (void *)&f32;") +cpp_quote(" _f32->Value = ((ULONG) (f * (1 << 16))) >> 16;") +cpp_quote(" _f32->Fraction = ((ULONG) (f * (1 << 16))) & 0xFFFF;") cpp_quote(" return f32;") cpp_quote("}")

1 0

Nikolay Sivov : evr: Implement input type validation for the mixer.
by Alexandre Julliard 24 Jun '20

24 Jun '20

Module: wine Branch: master Commit: 6ea77ccfebe56b2dd21b3e70bea86cc59b9495d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ea77ccfebe56b2dd21b3e70… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 24 16:25:36 2020 +0300 evr: Implement input type validation for the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 73 ++++++++++++++++++++++++++-- dlls/evr/tests/Makefile.in | 2 +- dlls/evr/tests/evr.c | 116 ++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 185 insertions(+), 6 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 931554b547..a65e82d4ca 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -379,7 +379,7 @@ static HRESULT WINAPI video_mixer_transform_AddInputStreams(IMFTransform *iface, static HRESULT WINAPI video_mixer_transform_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index, IMFMediaType **type) { - FIXME("%p, %u, %u, %p.\n", iface, id, index, type); + TRACE("%p, %u, %u, %p.\n", iface, id, index, type); return E_NOTIMPL; } @@ -392,11 +392,76 @@ static HRESULT WINAPI video_mixer_transform_GetOutputAvailableType(IMFTransform return E_NOTIMPL; } -static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) +static HRESULT video_mixer_init_dxva_videodesc(IMFMediaType *media_type, DXVA2_VideoDesc *video_desc) { - FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); + const MFVIDEOFORMAT *video_format; + IMFVideoMediaType *video_type; + BOOL is_compressed = TRUE; + HRESULT hr = S_OK; - return E_NOTIMPL; + if (FAILED(IMFMediaType_QueryInterface(media_type, &IID_IMFVideoMediaType, (void **)&video_type))) + return MF_E_INVALIDMEDIATYPE; + + video_format = IMFVideoMediaType_GetVideoFormat(video_type); + IMFVideoMediaType_IsCompressedFormat(video_type, &is_compressed); + + if (!video_format || !video_format->videoInfo.dwWidth || !video_format->videoInfo.dwHeight || is_compressed) + { + hr = MF_E_INVALIDMEDIATYPE; + goto done; + } + + memset(video_desc, 0, sizeof(*video_desc)); + video_desc->SampleWidth = video_format->videoInfo.dwWidth; + video_desc->SampleWidth = video_format->videoInfo.dwHeight; + video_desc->Format = video_format->surfaceInfo.Format; + +done: + IMFVideoMediaType_Release(video_type); + + return hr; +} + +static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *media_type, DWORD flags) +{ + struct video_mixer *mixer = impl_from_IMFTransform(iface); + IDirectXVideoProcessorService *service; + DXVA2_VideoDesc video_desc; + HRESULT hr = E_NOTIMPL; + HANDLE handle; + + TRACE("%p, %u, %p, %#x.\n", iface, id, media_type, flags); + + if (id) + { + FIXME("Unimplemented for substreams.\n"); + return E_NOTIMPL; + } + + EnterCriticalSection(&mixer->cs); + + if (!mixer->device_manager) + hr = MF_E_NOT_INITIALIZED; + else + { + if (SUCCEEDED(hr = IDirect3DDeviceManager9_OpenDeviceHandle(mixer->device_manager, &handle))) + { + if (SUCCEEDED(hr = IDirect3DDeviceManager9_GetVideoService(mixer->device_manager, handle, + &IID_IDirectXVideoProcessorService, (void **)&service))) + { + if (SUCCEEDED(hr = video_mixer_init_dxva_videodesc(media_type, &video_desc))) + { + FIXME("Probe for supported devices.\n"); + hr = E_NOTIMPL; + } + } + IDirect3DDeviceManager9_CloseDeviceHandle(mixer->device_manager, handle); + } + } + + LeaveCriticalSection(&mixer->cs); + + return hr; } static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) diff --git a/dlls/evr/tests/Makefile.in b/dlls/evr/tests/Makefile.in index 8253c4d7fb..5bd82277d1 100644 --- a/dlls/evr/tests/Makefile.in +++ b/dlls/evr/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = evr.dll -IMPORTS = mfuuid strmiids uuid dxguid ole32 oleaut32 evr d3d9 user32 +IMPORTS = dxva2 mfplat mfuuid strmiids uuid dxguid ole32 oleaut32 evr d3d9 user32 C_SRCS = \ evr.c diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 9365856d1e..44819c1b38 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -19,16 +19,20 @@ */ #define COBJMACROS + #include "dshow.h" #include "wine/test.h" #include "d3d9.h" #include "evr.h" +#include "mferror.h" +#include "mfapi.h" #include "initguid.h" #include "dxva2api.h" -#include "mferror.h" static const WCHAR sink_id[] = {'E','V','R',' ','I','n','p','u','t','0',0}; +static HRESULT (WINAPI *pMFCreateVideoMediaTypeFromSubtype)(const GUID *subtype, IMFVideoMediaType **video_type); + static HWND create_window(void) { RECT r = {0, 0, 640, 480}; @@ -626,16 +630,126 @@ done: DestroyWindow(window); } +static void test_default_mixer_type_negotiation(void) +{ + IDirect3DDeviceManager9 *manager; + IMFVideoMediaType *video_type; + IMFMediaType *media_type; + IDirect3DDevice9 *device; + IMFTransform *transform; + IDirect3D9 *d3d; + HWND window; + HRESULT hr; + UINT token; + + if (!pMFCreateVideoMediaTypeFromSubtype) + { + win_skip("Skipping mixer types tests.\n"); + return; + } + + hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&transform); + ok(hr == S_OK, "Failed to create default mixer, hr %#x.\n", hr); + + hr = IMFTransform_GetInputAvailableType(transform, 0, 0, &media_type); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); +todo_wine + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(transform, 0, media_type, 0); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + /* Now try with device manager. */ + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_ProcessMessage(transform, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Now manager is not initialized. */ + hr = IMFTransform_SetInputType(transform, 0, media_type, 0); + ok(hr == DXVA2_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* And now type description is incomplete. */ + hr = IMFTransform_SetInputType(transform, 0, media_type, 0); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + IMFMediaType_Release(media_type); + + hr = pMFCreateVideoMediaTypeFromSubtype(&MFVideoFormat_RGB32, &video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Partially initialized type. */ + hr = IMFTransform_SetInputType(transform, 0, (IMFMediaType *)video_type, 0); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + /* Only required data - frame size and uncompressed marker. */ + hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)640 << 32 | 480); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(transform, 0, (IMFMediaType *)video_type, 0); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(media_type != (IMFMediaType *)video_type, "Unexpected pointer.\n"); + IMFMediaType_Release(media_type); + } + + IMFVideoMediaType_Release(video_type); + + IDirect3DDeviceManager9_Release(manager); + + IDirect3DDevice9_Release(device); + +done: + IMFTransform_Release(transform); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(evr) { CoInitialize(NULL); + pMFCreateVideoMediaTypeFromSubtype = (void *)GetProcAddress(GetModuleHandleA("mfplat.dll"), "MFCreateVideoMediaTypeFromSubtype"); + test_aggregation(); test_interfaces(); test_enum_pins(); test_find_pin(); test_pin_info(); test_default_mixer(); + test_default_mixer_type_negotiation(); test_surface_sample(); CoUninitialize();

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
95
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 June 2020