January 2024 - Wine-Commits

Nikolay Sivov : scrrun/dictionary: Handle VT_EMPTY/VT_NULL keys.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 564b796e3605f8f622c47f3588b22deef4f323a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/564b796e3605f8f622c47f3588b22d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 4 01:43:16 2024 +0100 scrrun/dictionary: Handle VT_EMPTY/VT_NULL keys. --- dlls/scrrun/dictionary.c | 4 ++++ dlls/scrrun/tests/dictionary.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index f4f1fa701f6..f2f39c82f6f 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -188,6 +188,10 @@ static BOOL is_matching_key(const struct dictionary *dict, const struct keyitem_ { return hash == pair->hash && numeric_key_eq(key, &pair->key); } + else if (V_VT(&pair->key) == VT_EMPTY || V_VT(&pair->key) == VT_NULL) + { + return V_VT(&pair->key) == V_VT(key); + } else { WARN("Unexpected key type %#x.\n", V_VT(key)); diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 4c103ff25bf..ccc4d181793 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -1009,6 +1009,45 @@ static void test_Add(void) VariantClear(&item); + /* Empty and null keys. */ + hr = IDictionary_RemoveAll(dict); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + V_VT(&key1) = VT_EMPTY; + V_I4(&key1) = 1; + + V_VT(&item) = VT_BSTR; + V_BSTR(&item) = SysAllocString(L"empty"); + + hr = IDictionary_Add(dict, &key1, &item); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + V_VT(&key2) = VT_EMPTY; + V_I4(&key2) = 2; + + hr = IDictionary_Add(dict, &key2, &item); + ok(hr == CTL_E_KEY_ALREADY_EXISTS, "Unexpected hr %#lx.\n", hr); + + V_VT(&key2) = VT_NULL; + V_I4(&key2) = 2; + + hr = IDictionary_Add(dict, &key2, &item); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDictionary_RemoveAll(dict); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDictionary_Add(dict, &key2, &item); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDictionary_Add(dict, &key2, &item); + ok(hr == CTL_E_KEY_ALREADY_EXISTS, "Unexpected hr %#lx.\n", hr); + + hr = IDictionary_Add(dict, &key1, &item); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + VariantClear(&item); + IDictionary_Release(dict); }

1 0

Eric Pouech : appwiz.cpl: Load dynamically wine_get_version().
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: d40a0d8a1d881f5c54c2d336faee545f70ab1bea URL: https://gitlab.winehq.org/wine/wine/-/commit/d40a0d8a1d881f5c54c2d336faee54… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jan 2 11:48:50 2024 +0100 appwiz.cpl: Load dynamically wine_get_version(). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index a2957c3040a..88f871be53b 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -108,8 +108,7 @@ static LPWSTR url = NULL; static IBinding *dwl_binding; static WCHAR *msi_file; -extern const char * CDECL wine_get_version(void); - +static const char * (CDECL *p_wine_get_version)(void); static WCHAR * (CDECL *p_wine_get_dos_file_name)(const char*); static BOOL sha_check(const WCHAR *file_name) @@ -610,7 +609,7 @@ static void append_url_params( WCHAR *url ) len += MultiByteToWideChar(CP_ACP, 0, addon->version, -1, url+len, size/sizeof(WCHAR)-len)-1; lstrcpyW(url+len, L"&winev="); len += lstrlenW(L"&winev="); - MultiByteToWideChar(CP_ACP, 0, wine_get_version(), -1, url+len, size/sizeof(WCHAR)-len); + MultiByteToWideChar(CP_ACP, 0, p_wine_get_version() ? p_wine_get_version() : 0, -1, url+len, size/sizeof(WCHAR)-len); } static LPWSTR get_url(void) @@ -751,6 +750,7 @@ BOOL install_addon(addon_t addon_type) addon = addons_info+addon_type; p_wine_get_dos_file_name = (void *)GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "wine_get_dos_file_name"); + p_wine_get_version = (void *)GetProcAddress(GetModuleHandleW(L"ntdll.dll"), "wine_get_version"); /* * Try to find addon .msi file in following order:

1 0

Nikolay Sivov : scrrun/dictionary: Add support for hashing VT_NULL keys.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: e89bedb70b63a3b28de6f835a37e403e3d88fc86 URL: https://gitlab.winehq.org/wine/wine/-/commit/e89bedb70b63a3b28de6f835a37e40… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 4 00:53:58 2024 +0100 scrrun/dictionary: Add support for hashing VT_NULL keys. --- dlls/scrrun/dictionary.c | 1 + dlls/scrrun/tests/dictionary.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 650874dcf03..f4f1fa701f6 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -910,6 +910,7 @@ static HRESULT WINAPI dictionary_get_HashVal(IDictionary *iface, VARIANT *key, V case VT_R8: return get_flt_hash(V_VT(key) & VT_BYREF ? *V_R8REF(key) : V_R8(key), &V_I4(hash)); case VT_EMPTY: + case VT_NULL: V_I4(hash) = 0; return S_OK; case VT_INT: diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index e7d39bc0336..4c103ff25bf 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -753,6 +753,14 @@ if (0) { /* crashes on native */ ok(V_VT(&hash) == VT_I4, "Unexpected hash type %d.\n", V_VT(&hash)); ok(V_I4(&hash) == 0, "Unexpected hash value %ld.\n", V_I4(&hash)); + V_VT(&key) = VT_NULL; + V_I4(&key) = 1234; + V_I4(&hash) = 5678; + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&hash) == VT_I4, "Unexpected hash type %d.\n", V_VT(&hash)); + ok(V_I4(&hash) == 0, "Unexpected hash value %ld.\n", V_I4(&hash)); + IDictionary_Release(dict); }

1 0

Nikolay Sivov : scrrun/dictionary: Add support for hashing VT_EMPTY keys.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 92e2626e9d788fb3909c347d311f25404e12ba3b URL: https://gitlab.winehq.org/wine/wine/-/commit/92e2626e9d788fb3909c347d311f25… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 3 23:03:27 2024 +0100 scrrun/dictionary: Add support for hashing VT_EMPTY keys. --- dlls/scrrun/dictionary.c | 3 +++ dlls/scrrun/tests/dictionary.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 364d8b52ff6..650874dcf03 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -909,6 +909,9 @@ static HRESULT WINAPI dictionary_get_HashVal(IDictionary *iface, VARIANT *key, V case VT_R8|VT_BYREF: case VT_R8: return get_flt_hash(V_VT(key) & VT_BYREF ? *V_R8REF(key) : V_R8(key), &V_I4(hash)); + case VT_EMPTY: + V_I4(hash) = 0; + return S_OK; case VT_INT: case VT_UINT: case VT_I1: diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index a6369b77831..e7d39bc0336 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -745,6 +745,14 @@ if (0) { /* crashes on native */ ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); ok(V_I4(&hash) == expected, "got hash %#lx, expected %#lx\n", V_I4(&hash), expected); + V_VT(&key) = VT_EMPTY; + V_I4(&key) = 1234; + V_I4(&hash) = 5678; + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&hash) == VT_I4, "Unexpected hash type %d.\n", V_VT(&hash)); + ok(V_I4(&hash) == 0, "Unexpected hash value %ld.\n", V_I4(&hash)); + IDictionary_Release(dict); }

1 0

David Kahurani : gdiplus: Avoid use of temporary variable.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 760bcdcb4e5c271876baee6bc7207bba400b33a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/760bcdcb4e5c271876baee6bc7207b… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Sat Dec 23 12:26:49 2023 +0300 gdiplus: Avoid use of temporary variable. A temporary variable is used here to assist with assignment but this does not conform to the coding style in the rest of gdiplus and introduces an unnecessary variable. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/gdiplus/graphicspath.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 24c2888cfe8..9e186aa43d1 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -117,10 +117,16 @@ struct flatten_bezier_job static BOOL flatten_bezier_add(struct list *jobs, path_list_node_t *start, REAL x2, REAL y2, REAL x3, REAL y3, path_list_node_t *end) { struct flatten_bezier_job *job = malloc(sizeof(struct flatten_bezier_job)); - struct flatten_bezier_job temp = { start, x2, y2, x3, y3, end }; if (!job) return FALSE; - *job = temp; + + job->start = start; + job->x2 = x2; + job->y2 = y2; + job->x3 = x3; + job->y3 = y3; + job->end = end; + list_add_after(jobs, &job->entry); return TRUE; }

1 0

Zhiyi Zhang : msi: Fix a memory leak (Coverity).
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 4afca1787febb012d0cdd2c007dd32beba35178d URL: https://gitlab.winehq.org/wine/wine/-/commit/4afca1787febb012d0cdd2c007dd32… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 30 11:58:04 2023 +0800 msi: Fix a memory leak (Coverity). --- dlls/msi/action.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 575af431854..20da818e686 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5263,9 +5263,13 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package) MSI_RecordSetStringW(record, 0, NULL); rc = MSI_ProcessMessage(package, INSTALLMESSAGE_ERROR, record); if (rc == IDCANCEL) + { + msiobj_release(&record->hdr); return ERROR_INSTALL_USEREXIT; + } attrib = GetFileAttributesW(package->db->path); } + msiobj_release(&record->hdr); rc = ERROR_SUCCESS; } else

1 0

Alistair Leslie-Hughes : include: Add more D3D_FEATURE_LEVEL_ defines.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 7ea0a3609c94868e8298702b42901079daa31f30 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ea0a3609c94868e8298702b429010… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 4 12:27:13 2024 +1100 include: Add more D3D_FEATURE_LEVEL_ defines. --- include/d3dcommon.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 7a53a84079d..5ffb4cd5b5b 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -100,6 +100,7 @@ typedef enum D3D_DRIVER_TYPE typedef enum D3D_FEATURE_LEVEL { + D3D_FEATURE_LEVEL_1_0_CORE = 0x1000, D3D_FEATURE_LEVEL_9_1 = 0x9100, D3D_FEATURE_LEVEL_9_2 = 0x9200, D3D_FEATURE_LEVEL_9_3 = 0x9300, @@ -109,6 +110,7 @@ typedef enum D3D_FEATURE_LEVEL D3D_FEATURE_LEVEL_11_1 = 0xb100, D3D_FEATURE_LEVEL_12_0 = 0xc000, D3D_FEATURE_LEVEL_12_1 = 0xc100, + D3D_FEATURE_LEVEL_12_2 = 0xc200, } D3D_FEATURE_LEVEL; cpp_quote("#define D3D_FL9_1_REQ_TEXTURE1D_U_DIMENSION 2048")

1 0

Zhiyi Zhang : bcrypt: Fix an possible out-of-bounds read (Coverity).
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: fe7e7c62ee938407e0e411f5fd64637b40bfc2d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe7e7c62ee938407e0e411f5fd6463… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 30 11:52:42 2023 +0800 bcrypt: Fix an possible out-of-bounds read (Coverity). --- dlls/bcrypt/bcrypt_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 26472cbfe2b..52066a32c74 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -272,7 +272,7 @@ static struct object *get_object( BCRYPT_HANDLE handle, ULONG magic ) } idx = (ULONG_PTR)handle >> 4; - if (idx > ARRAY_SIZE(pseudo_algorithms) || !pseudo_algorithms[idx].hdr.magic) + if (idx >= ARRAY_SIZE(pseudo_algorithms) || !pseudo_algorithms[idx].hdr.magic) { FIXME( "pseudo-handle %p not supported\n", handle ); return NULL;

1 0

Zhiyi Zhang : wldap32: Fix a possible memory leak (Coverity).
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: b0de71f2149f53263a372a0b09cd77e0aca71c47 URL: https://gitlab.winehq.org/wine/wine/-/commit/b0de71f2149f53263a372a0b09cd77… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 30 13:05:21 2023 +0800 wldap32: Fix a possible memory leak (Coverity). --- dlls/wldap32/ber.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index d3e8adc8433..d38f0119dc4 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -91,8 +91,12 @@ int CDECL WLDAP32_ber_flatten( WLDAP32_BerElement *ber, BERVAL **berval ) TRACE( "%p, %p\n", ber, berval ); if (ber_flatten( BER(ber), &bervalU )) return WLDAP32_LBER_ERROR; - if (!(bervalW = bervalUtoW( bervalU ))) return WLDAP32_LBER_ERROR; + + bervalW = bervalUtoW( bervalU ); ber_bvfree( bervalU ); + if (!bervalW) + return WLDAP32_LBER_ERROR; + *berval = bervalW; return 0; }

1 0

Biswapriyo Nath : include: Add D3D12_FEATURE_DATA_VIDEO_ENCODER_SUPPORT in d3d12video.idl.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 407bfcf9852b135e6fd0fd3d1e21077795709c0a URL: https://gitlab.winehq.org/wine/wine/-/commit/407bfcf9852b135e6fd0fd3d1e2107… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Jan 4 04:28:58 2024 +0000 include: Add D3D12_FEATURE_DATA_VIDEO_ENCODER_SUPPORT in d3d12video.idl. --- include/d3d12video.idl | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/include/d3d12video.idl b/include/d3d12video.idl index e838a4cd5a2..f39b28d29a9 100644 --- a/include/d3d12video.idl +++ b/include/d3d12video.idl @@ -1167,6 +1167,25 @@ typedef struct D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT PictureSupport; } D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT; +typedef enum D3D12_VIDEO_ENCODER_SUPPORT_FLAGS +{ + D3D12_VIDEO_ENCODER_SUPPORT_FLAG_NONE = 0x0, + D3D12_VIDEO_ENCODER_SUPPORT_FLAG_GENERAL_SUPPORT_OK = 0x1, + D3D12_VIDEO_ENCODER_SUPPORT_FLAG_RATE_CONTROL_RECONFIGURATION_AVAILABLE = 0x2, + D3D12_VIDEO_ENCODER_SUPPORT_FLAG_RESOLUTION_RECONFIGURATION_AVAILABLE = 0x4, + D3D12_VIDEO_ENCODER_SUPPORT_FLAG_RATE_CONTROL_VBV_SIZE_CONFIG_AVAILABLE = 0x8, + D3D12_VIDEO_ENCODER_SUPPORT_FLAG_RATE_CONTROL_FRAME_ANALYSIS_AVAILABLE = 0x10, + D3D12_VIDEO_ENCODER_SUPPORT_FLAG_RECONSTRUCTED_FRAMES_REQUIRE_TEXTURE_ARRAYS = 0x20, + D3D12_VIDEO_ENCODER_SUPPORT_FLAG_RATE_CONTROL_DELTA_QP_AVAILABLE = 0x40, + D3D12_VIDEO_ENCODER_SUPPORT_FLAG_SUBREGION_LAYOUT_RECONFIGURATION_AVAILABLE = 0x80, + D3D12_VIDEO_ENCODER_SUPPORT_FLAG_RATE_CONTROL_ADJUSTABLE_QP_RANGE_AVAILABLE = 0x100, + D3D12_VIDEO_ENCODER_SUPPORT_FLAG_RATE_CONTROL_INITIAL_QP_AVAILABLE = 0x200, + D3D12_VIDEO_ENCODER_SUPPORT_FLAG_RATE_CONTROL_MAX_FRAME_SIZE_AVAILABLE = 0x400, + D3D12_VIDEO_ENCODER_SUPPORT_FLAG_SEQUENCE_GOP_RECONFIGURATION_AVAILABLE = 0x800, + D3D12_VIDEO_ENCODER_SUPPORT_FLAG_MOTION_ESTIMATION_PRECISION_MODE_LIMIT_AVAILABLE = 0x1000, +} D3D12_VIDEO_ENCODER_SUPPORT_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_SUPPORT_FLAGS);") + typedef enum D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAGS { D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAG_NONE = 0x0, @@ -1245,6 +1264,21 @@ typedef struct D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITS UINT QPMapRegionPixelsSize; } D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITS; +typedef enum D3D12_VIDEO_ENCODER_VALIDATION_FLAGS +{ + D3D12_VIDEO_ENCODER_VALIDATION_FLAG_NONE = 0x0, + D3D12_VIDEO_ENCODER_VALIDATION_FLAG_CODEC_NOT_SUPPORTED = 0x1, + D3D12_VIDEO_ENCODER_VALIDATION_FLAG_INPUT_FORMAT_NOT_SUPPORTED = 0x8, + D3D12_VIDEO_ENCODER_VALIDATION_FLAG_CODEC_CONFIGURATION_NOT_SUPPORTED = 0x10, + D3D12_VIDEO_ENCODER_VALIDATION_FLAG_RATE_CONTROL_MODE_NOT_SUPPORTED = 0x20, + D3D12_VIDEO_ENCODER_VALIDATION_FLAG_RATE_CONTROL_CONFIGURATION_NOT_SUPPORTED = 0x40, + D3D12_VIDEO_ENCODER_VALIDATION_FLAG_INTRA_REFRESH_MODE_NOT_SUPPORTED = 0x80, + D3D12_VIDEO_ENCODER_VALIDATION_FLAG_SUBREGION_LAYOUT_MODE_NOT_SUPPORTED = 0x100, + D3D12_VIDEO_ENCODER_VALIDATION_FLAG_RESOLUTION_NOT_SUPPORTED_IN_LIST = 0x200, + D3D12_VIDEO_ENCODER_VALIDATION_FLAG_GOP_STRUCTURE_NOT_SUPPORTED = 0x800, +} D3D12_VIDEO_ENCODER_VALIDATION_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_VALIDATION_FLAGS);") + typedef struct D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_H264 { UINT GOPLength; @@ -1271,6 +1305,26 @@ typedef struct D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE }; } D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE; +typedef struct D3D12_FEATURE_DATA_VIDEO_ENCODER_SUPPORT +{ + UINT NodeIndex; + D3D12_VIDEO_ENCODER_CODEC Codec; + DXGI_FORMAT InputFormat; + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION CodecConfiguration; + D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE CodecGopSequence; + D3D12_VIDEO_ENCODER_RATE_CONTROL RateControl; + D3D12_VIDEO_ENCODER_INTRA_REFRESH_MODE IntraRefresh; + D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE SubregionFrameEncoding; + UINT ResolutionsListCount; + const D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC *pResolutionList; + UINT MaxReferenceFramesInDPB; + D3D12_VIDEO_ENCODER_VALIDATION_FLAGS ValidationFlags; + D3D12_VIDEO_ENCODER_SUPPORT_FLAGS SupportFlags; + D3D12_VIDEO_ENCODER_PROFILE_DESC SuggestedProfile; + D3D12_VIDEO_ENCODER_LEVEL_SETTING SuggestedLevel; + D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITS *pResolutionDependentSupport; +} D3D12_FEATURE_DATA_VIDEO_ENCODER_SUPPORT; + typedef struct D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOURCE_REQUIREMENTS { UINT NodeIndex;

1 0