- Wine-Commits - list.winehq.org

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

Biswapriyo Nath : include: Add missing macros in devenum.idl.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: e031a0d0daf1af0b328f23cddbcb5d6b101c32bc URL: https://gitlab.winehq.org/wine/wine/-/commit/e031a0d0daf1af0b328f23cddbcb5d… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Mon Dec 18 09:54:44 2023 +0000 include: Add missing macros in devenum.idl. --- include/devenum.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/devenum.idl b/include/devenum.idl index f7eaf9a4a59..2afe365bd5e 100644 --- a/include/devenum.idl +++ b/include/devenum.idl @@ -27,6 +27,12 @@ cpp_quote("#define CDEF_BYPASS_CLASS_MANAGER 0x0002") cpp_quote("#define CDEF_CLASS_LEGACY 0x0004") cpp_quote("#define CDEF_MERIT_ABOVE_DO_NOT_USE 0x0008") +cpp_quote("#define CDEF_DEVMON_CMGR_DEVICE 0x0010") +cpp_quote("#define CDEF_DEVMON_DMO 0x0020") +cpp_quote("#define CDEF_DEVMON_PNP_DEVICE 0x0040") +cpp_quote("#define CDEF_DEVMON_FILTER 0x0080") +cpp_quote("#define CDEF_DEVMON_SELECTIVE_MASK 0x00f0") + [ object, uuid(29840822-5B84-11D0-BD3B-00A0C911CE86),

1 0

Fabian Maurer : wow64win: Add missing break inside packed_result_32to64 (Coverity).
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 31f340edfd5d13bd535c2058b3c19cb449d44bbf URL: https://gitlab.winehq.org/wine/wine/-/commit/31f340edfd5d13bd535c2058b3c19c… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 6 21:12:01 2024 +0100 wow64win: Add missing break inside packed_result_32to64 (Coverity). --- dlls/wow64win/user.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 44b422ef62c..4b285036184 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -851,6 +851,7 @@ static size_t packed_result_32to64( UINT message, WPARAM wparam, const void *par cs64->dwExStyle = cs32->dwExStyle; return sizeof(*cs64); } + break; case WM_NCCALCSIZE: if (wparam)

1 0

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

Jan. 17, 2024

Module: wine Branch: master Commit: 51e1f5e43d879735a22b1375bf3a9edb75777847 URL: https://gitlab.winehq.org/wine/wine/-/commit/51e1f5e43d879735a22b1375bf3a9e… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Jan 4 04:15:52 2024 +0000 include: Add D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAGS in d3d12video.idl. --- include/d3d12video.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/d3d12video.idl b/include/d3d12video.idl index ffda6916b74..e838a4cd5a2 100644 --- a/include/d3d12video.idl +++ b/include/d3d12video.idl @@ -1594,6 +1594,17 @@ typedef struct D3D12_VIDEO_ENCODER_FRAME_SUBREGION_METADATA UINT64 bHeaderSize; } D3D12_VIDEO_ENCODER_FRAME_SUBREGION_METADATA; +typedef enum D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAGS +{ + D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAG_NO_ERROR = 0x0, + D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAG_CODEC_PICTURE_CONTROL_NOT_SUPPORTED = 0x1, + D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAG_SUBREGION_LAYOUT_CONFIGURATION_NOT_SUPPORTED = 0x2, + D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAG_INVALID_REFERENCE_PICTURES = 0x4, + D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAG_RECONFIGURATION_REQUEST_NOT_SUPPORTED = 0x8, + D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAG_INVALID_METADATA_BUFFER_SOURCE = 0x10, +} D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAGS);") + typedef struct D3D12_VIDEO_ENCODER_OUTPUT_METADATA_STATISTICS { UINT64 AverageQP;

1 0

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

Jan. 17, 2024

Module: wine Branch: master Commit: e63a998420a10fb34b6a7abdd46e5bcd35d12e10 URL: https://gitlab.winehq.org/wine/wine/-/commit/e63a998420a10fb34b6a7abdd46e5b… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Jan 4 04:12:05 2024 +0000 include: Add D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITS in d3d12video.idl. --- include/d3d12video.idl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/d3d12video.idl b/include/d3d12video.idl index 74c1b269b92..ffda6916b74 100644 --- a/include/d3d12video.idl +++ b/include/d3d12video.idl @@ -1237,6 +1237,14 @@ typedef enum D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE_QUARTER_PIXEL = 3, } D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE; +typedef struct D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITS +{ + UINT MaxSubregionsNumber; + UINT MaxIntraRefreshFrameDuration; + UINT SubregionBlockPixelsSize; + UINT QPMapRegionPixelsSize; +} D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITS; + typedef struct D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_H264 { UINT GOPLength;

1 0