August 2022 - Wine-commits - list.winehq.org

Jeremy White : Patches submitted by a maintainer need no reviewer.
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: tools Branch: master Commit: 30f1195e95d8125eec7d4157a83cc719e762fd28 URL: https://gitlab.winehq.org/winehq/tools/-/commit/30f1195e95d8125eec7d4157a83… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Aug 9 16:27:32 2022 -0500 Patches submitted by a maintainer need no reviewer. This is a revision of 34b1a84e, which had the intention of excluding the author from any constructed maintainer list. In the case of a maintainer submitting their own patches, this would result in one of the involved people being assigned to review the patch. Henri being set up to review Nikolay's work on d2d, for example. However, this was a misinterpretation on my part of what Alexandre had requested. His thought had been that if Nikolay is the sole maintainer, and submits only his own work, that no reviewer need be assigned. With this change, the focus of this patch is now to make it so that an author of a merge request is *not* assigned to review their own work. If they are the sole maintainer, then no one is assigned to review it. --- gitlab/gitlab-to-mail/assign.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gitlab/gitlab-to-mail/assign.py b/gitlab/gitlab-to-mail/assign.py index 56167a37..513d07f1 100755 --- a/gitlab/gitlab-to-mail/assign.py +++ b/gitlab/gitlab-to-mail/assign.py @@ -24,11 +24,14 @@ def empty_record(): } return copy.deepcopy(m) -def add_but_exclude_author(out_ids, out_names, in_ids, in_names, author): +def exclude_author(in_ids, in_names, author): + out_ids = [] + out_names = [] for i in range(len(in_ids)): if in_names[i] != author: out_ids.append(in_ids[i]) out_names.append(in_names[i]) + return out_ids, out_names class Assign: settings = None @@ -112,11 +115,13 @@ class Assign: for glob in m['globs']: for f in files: if fnmatch.fnmatch(f, glob): - add_but_exclude_author(maintainer_ids, maintainer_names, m['maintainer_ids'], m['maintainers'], author['name']) - add_but_exclude_author(people_ids, people_names, m['people_ids'], m['people'], author['name']) + maintainer_ids += m['maintainer_ids'] + maintainer_names += m['maintainers'] + people_ids += m['people_ids'] + people_names += m['people'] if len(maintainer_ids) > 0: - return maintainer_ids, maintainer_names - return people_ids, people_names + return exclude_author(maintainer_ids, maintainer_names, author['name']) + return exclude_author(people_ids, people_names, author['name']) def get_assignees_from_commits(self, version): author_names = []

1 0

Giovanni Mascellani : vkd3d: Do not store the latch bit in an object that could be overwritten.
by Alexandre Julliard 09 Aug '22

09 Aug '22

Module: vkd3d Branch: master Commit: 4112c3607610b6e5df5de8356535eae20f4fe046 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4112c3607610b6e5df5de8356535e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Aug 9 14:05:24 2022 +0200 vkd3d: Do not store the latch bit in an object that could be overwritten. Once a event is signaled, the corresponding struct vkd3d_waiting_event entry is considered dead and could be overwritten, so it's not safe to keep a pointer to it in d3d12_fence_SetEventOnCompletion(). Instead, keep the latch bit in d3d12_fence_SetEventOnCompletion() and put a pointer to it in struct vkd3d_waiting_event. --- libs/vkd3d/command.c | 9 ++++----- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 82871053..dabd8424 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -851,7 +851,7 @@ static void d3d12_fence_signal_external_events_locked(struct d3d12_fence *fence) } else { - current->latch = true; + *current->latch = true; signal_null_event_cond = true; } } @@ -1155,7 +1155,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i { struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); unsigned int i; - bool *latch; + bool latch = false; int rc; TRACE("iface %p, value %#"PRIx64", event %p.\n", iface, value, event); @@ -1196,8 +1196,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i fence->events[fence->event_count].value = value; fence->events[fence->event_count].event = event; - fence->events[fence->event_count].latch = false; - latch = &fence->events[fence->event_count].latch; + fence->events[fence->event_count].latch = &latch; ++fence->event_count; /* If event is NULL, we need to block until the fence value completes. @@ -1206,7 +1205,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i * and signal a condition variable instead of calling external signal_event callback. */ if (!event) { - while (!*latch) + while (!latch) vkd3d_cond_wait(&fence->null_event_cond, &fence->mutex); } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 8bbb4838..c9b70d9c 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -530,7 +530,7 @@ struct d3d12_fence { uint64_t value; HANDLE event; - bool latch; + bool *latch; } *events; size_t events_size; size_t event_count;

1 0

Nikolay Sivov : mfplat: Add some attributes related to transcoding.
by Alexandre Julliard 09 Aug '22

09 Aug '22

Module: wine Branch: master Commit: da581d383d411b877ea7ee5b96e307877a4d3181 URL: https://gitlab.winehq.org/wine/wine/-/commit/da581d383d411b877ea7ee5b96e307… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 21:26:23 2022 +0300 mfplat: Add some attributes related to transcoding. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 19 +++++++++++++++++++ include/mfidl.idl | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 1e4e026d1d7..1afec10405b 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1678,14 +1678,17 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_ALPHA_MODE), X(MF_MT_MPEG2_TIMECODE), X(MF_PMP_SERVER_CONTEXT), + X(MF_TRANSCODE_TOPOLOGYMODE), X(MFT_SUPPORT_DYNAMIC_FORMAT_CHANGE), X(MF_MEDIA_ENGINE_TRACK_ID), + X(MFTranscodeContainerType_MP3), X(MF_MT_CUSTOM_VIDEO_PRIMARIES), X(MF_MT_TIMESTAMP_CAN_BE_DTS), X(MFT_CODEC_MERIT_Attribute), X(MF_TOPOLOGY_PLAYBACK_MAX_DIMS), X(MF_XVP_DISABLE_FRC), X(MF_LOW_LATENCY), + X(MF_TRANSCODE_ADJUST_PROFILE), X(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS), X(MF_MT_MPEG2_FLAGS), X(MF_MEDIA_ENGINE_AUDIO_CATEGORY), @@ -1732,6 +1735,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_PD_PLAYBACK_BOUNDARY_TIME), X(MF_MEDIA_ENGINE_TELEMETRY_APPLICATION_ID), X(MF_ACTIVATE_MFT_LOCKED), + X(MFTranscodeContainerType_WAVE), X(MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT), X(MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING), X(MF_MT_FRAME_SIZE), @@ -1739,6 +1743,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_SINK_WRITER_ASYNC_CALLBACK), X(MF_TOPOLOGY_START_TIME_ON_PRESENTATION_SWITCH), X(MFT_DECODER_EXPOSE_OUTPUT_TYPES_IN_NATIVE_ORDER), + X(MF_TRANSCODE_CONTAINERTYPE), X(MF_TOPONODE_WORKQUEUE_MMCSS_PRIORITY), X(MF_MT_FRAME_RATE_RANGE_MAX), X(MF_MT_PALETTE), @@ -1770,6 +1775,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_ENDPOINT_ID), X(MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME), X(MF_MT_VIDEO_ROTATION), + X(MFTranscodeContainerType_MPEG4), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_SYMBOLIC_LINK), X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE11), X(MF_MT_USER_DATA), @@ -1789,12 +1795,14 @@ const char *debugstr_attr(const GUID *guid) X(MF_SA_D3D12_HEAP_FLAGS), X(MF_MT_MINIMUM_DISPLAY_APERTURE), X(MFSampleExtension_Token), + X(MFTranscodeContainerType_3GP), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_CATEGORY), X(MF_D3D12_SYNCHRONIZATION_OBJECT), X(MF_MT_AUDIO_VALID_BITS_PER_SAMPLE), X(MF_TRANSFORM_ASYNC_UNLOCK), X(MF_DISABLE_FRAME_CORRUPTION_INFO), X(MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES), + X(MFTranscodeContainerType_ASF), X(MF_MT_VIDEO_NO_FRAME_ORDERING), X(MF_MEDIA_ENGINE_PLAYBACK_VISUAL), X(MF_MT_VIDEO_CHROMA_SITING), @@ -1809,8 +1817,10 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_AAC_PAYLOAD_TYPE), X(MF_TOPOLOGY_PLAYBACK_FRAMERATE), X(MF_SOURCE_READER_D3D11_BIND_FLAGS), + X(MF_TRANSCODE_ENCODINGPROFILE), X(MF_MT_AUDIO_FOLDDOWN_MATRIX), X(MF_MT_AUDIO_WMADRC_PEAKREF), + X(MFTranscodeContainerType_ADTS), X(MF_MT_AUDIO_WMADRC_PEAKTARGET), X(MF_TRANSFORM_FLAGS_Attribute), X(MF_MT_H264_SUPPORTED_RATE_CONTROL_MODES), @@ -1879,6 +1889,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_VIDEO_3D_FORMAT), X(MF_EVENT_STREAM_METADATA_KEYDATA), X(MF_READER_WRITER_D3D_MANAGER), + X(MFTranscodeContainerType_FLAC), X(MFSampleExtension_3DVideo), X(MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT_PROGRESSIVE), X(MF_MT_H264_USAGE), @@ -1897,6 +1908,7 @@ const char *debugstr_attr(const GUID *guid) X(MFT_ENCODER_SUPPORTS_CONFIG_EVENT), X(MF_MT_AUDIO_FLAC_MAX_BLOCK_SIZE), X(MFT_FRIENDLY_NAME_Attribute), + X(MFTranscodeContainerType_AVI), X(MF_MT_FIXED_SIZE_SAMPLES), X(MFT_SUPPORT_3DVIDEO), X(MFT_SUPPORT_3DVIDEO), @@ -1920,6 +1932,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_SA_D3D11_SHARED), X(MF_MT_PAN_SCAN_ENABLED), X(MF_MT_D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL), + X(MFTranscodeContainerType_AC3), X(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ID), X(MF_MT_DV_VAUX_CTRL_PACK), X(MFSampleExtension_ForwardedDecodeUnitType), @@ -1934,6 +1947,7 @@ const char *debugstr_attr(const GUID *guid) X(MFT_ENUM_HARDWARE_VENDOR_ID_Attribute), X(MFT_ENUM_TRANSCODE_ONLY_ATTRIBUTE), X(MF_READWRITE_MMCSS_PRIORITY), + X(MF_TRANSCODE_DONOT_INSERT_ENCODER), X(MF_MT_VIDEO_3D), X(MF_EVENT_START_PRESENTATION_TIME), X(MF_EVENT_SESSIONCAPS), @@ -1941,6 +1955,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MEDIA_ENGINE_AUDIO_ENDPOINT_ROLE), X(MF_EVENT_SESSIONCAPS_DELTA), X(MF_EVENT_START_PRESENTATION_TIME_AT_OUTPUT), + X(MFTranscodeContainerType_AMR), X(MFSampleExtension_DecodeTimestamp), X(MF_MEDIA_ENGINE_COMPATIBILITY_MODE), X(MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT), @@ -1991,8 +2006,10 @@ const char *debugstr_attr(const GUID *guid) X(MF_TOPONODE_STREAM_DESCRIPTOR), X(MF_TOPONODE_ERRORCODE), X(MF_TOPONODE_SEQUENCE_ELEMENTID), + X(MF_TRANSCODE_SKIP_METADATA_TRANSFER), X(MF_EVENT_MFT_CONTEXT), X(MF_MT_FORWARD_CUSTOM_SEI), + X(MFTranscodeContainerType_FMPEG4), X(MF_TOPONODE_CONNECT_METHOD), X(MFT_OUTPUT_TYPES_Attributes), X(MF_MT_IMAGE_LOSS_TOLERANT), @@ -2002,9 +2019,11 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_ARBITRARY_HEADER), X(MF_TOPOLOGY_DXVA_MODE), X(MF_TOPONODE_LOCKED), + X(MF_TRANSCODE_QUALITYVSSPEED), X(MF_TOPONODE_WORKQUEUE_ID), X(MF_MEDIA_ENGINE_CONTINUE_ON_CODEC_ERROR), X(MF_TOPONODE_WORKQUEUE_MMCSS_CLASS), + X(MFTranscodeContainerType_MPEG2), X(MF_TOPONODE_DECRYPTOR), X(MF_EVENT_DO_THINNING), X(MF_TOPONODE_DISCARDABLE), diff --git a/include/mfidl.idl b/include/mfidl.idl index e492bf8daf0..14e2dd7ce4d 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -113,6 +113,24 @@ typedef enum _MFSTREAMSINK_MARKER_TYPE MFSTREAMSINK_MARKER_EVENT, } MFSTREAMSINK_MARKER_TYPE; +typedef enum _MF_TRANSCODE_TOPOLOGYMODE_FLAGS +{ + MF_TRANSCODE_TOPOLOGYMODE_SOFTWARE_ONLY = 0, + MF_TRANSCODE_TOPOLOGYMODE_HARDWARE_ALLOWED = 1, +} MF_TRANSCODE_TOPOLOGYMODE_FLAGS; + +typedef enum _MF_TRANSCODE_ADJUST_PROFILE_FLAGS +{ + MF_TRANSCODE_ADJUST_PROFILE_DEFAULT = 0, + MF_TRANSCODE_ADJUST_PROFILE_USE_SOURCE_ATTRIBUTES = 1, +} MF_TRANSCODE_ADJUST_PROFILE_FLAGS; + +typedef enum _MF_VIDEO_PROCESSOR_ALGORITHM_TYPE +{ + MF_VIDEO_PROCESSOR_ALGORITHM_DEFAULT = 0, + MF_VIDEO_PROCESSOR_ALGORITHM_MRF_CRF_444 = 1, +} MF_VIDEO_PROCESSOR_ALGORITHM_TYPE; + [ object, uuid(2eb1e945-18b8-4139-9b1a-d5d584818530), @@ -1639,3 +1657,24 @@ cpp_quote("EXTERN_GUID(CLSID_WMADecMediaObject, 0x2eeb4adf, 0x4578, 0x4d10, 0xbc cpp_quote("EXTERN_GUID(CLSID_HttpSchemePlugin, 0x44cb442b, 0x9da9, 0x49df, 0xb3, 0xfd, 0x02, 0x37, 0x77, 0xb1, 0x6e, 0x50);") cpp_quote("EXTERN_GUID(CLSID_NetSchemePlugin, 0xe9f4ebab, 0xd97b, 0x463e, 0xa2, 0xb1, 0xc5, 0x4e, 0xe3, 0xf9, 0x41, 0x4d);") cpp_quote("EXTERN_GUID(CLSID_UrlmonSchemePlugin, 0x9ec4b4f9, 0x3029, 0x45ad, 0x94, 0x7b, 0x34, 0x4d, 0xe2, 0xa2, 0x49, 0xe2);") + +cpp_quote("EXTERN_GUID(MF_TRANSCODE_ADJUST_PROFILE, 0x9c37c21b, 0x060f, 0x487c, 0xa6, 0x90, 0x80, 0xd7, 0xf5, 0x0d, 0x1c, 0x72);") +cpp_quote("EXTERN_GUID(MF_TRANSCODE_CONTAINERTYPE, 0x150ff23f, 0x4abc, 0x478b, 0xac, 0x4f, 0xe1, 0x91, 0x6f, 0xba, 0x1c, 0xca);") +cpp_quote("EXTERN_GUID(MF_TRANSCODE_DONOT_INSERT_ENCODER, 0xf45aa7ce, 0xab24, 0x4012, 0xa1, 0x1b, 0xdc, 0x82, 0x20, 0x20, 0x14, 0x10);") +cpp_quote("EXTERN_GUID(MF_TRANSCODE_ENCODINGPROFILE, 0x6947787c, 0xf508, 0x4ea9, 0xb1, 0xe9, 0xa1, 0xfe, 0x3a, 0x49, 0xfb, 0xc9);") +cpp_quote("EXTERN_GUID(MF_TRANSCODE_SKIP_METADATA_TRANSFER, 0x4e4469ef, 0xb571, 0x4959, 0x8f, 0x83, 0x3d, 0xcf, 0xba, 0x33, 0xa3, 0x93);") +cpp_quote("EXTERN_GUID(MF_TRANSCODE_TOPOLOGYMODE, 0x3e3df610, 0x394a, 0x40b2, 0x9d, 0xea, 0x3b, 0xab, 0x65, 0x0b, 0xeb, 0xf2);") +cpp_quote("EXTERN_GUID(MF_TRANSCODE_QUALITYVSSPEED, 0x98332df8, 0x03cd, 0x476b, 0x89, 0xfa, 0x3f, 0x9e, 0x44, 0x2d, 0xec, 0x9f);") + +cpp_quote("EXTERN_GUID(MFTranscodeContainerType_3GP, 0x34c50167, 0x4472, 0x4f34, 0x9e, 0xa0, 0xc4, 0x9f, 0xba, 0xcf, 0x03, 0x7d);") +cpp_quote("EXTERN_GUID(MFTranscodeContainerType_AC3, 0x6d8d91c3, 0x8c91, 0x4ed1, 0x87, 0x42, 0x8c, 0x34, 0x7d, 0x5b, 0x44, 0xd0);") +cpp_quote("EXTERN_GUID(MFTranscodeContainerType_ADTS, 0x132fd27d, 0x0f02, 0x43de, 0xa3, 0x01, 0x38, 0xfb, 0xbb, 0xb3, 0x83, 0x4e);") +cpp_quote("EXTERN_GUID(MFTranscodeContainerType_AMR, 0x25d5ad3, 0x621a, 0x475b, 0x96, 0x4d, 0x66, 0xb1, 0xc8, 0x24, 0xf0, 0x79);") +cpp_quote("EXTERN_GUID(MFTranscodeContainerType_ASF, 0x430f6f6e, 0xb6bf, 0x4fc1, 0xa0, 0xbd, 0x9e, 0xe4, 0x6e, 0xee, 0x2a, 0xfb);") +cpp_quote("EXTERN_GUID(MFTranscodeContainerType_AVI, 0x7edfe8af, 0x402f, 0x4d76, 0xa3, 0x3c, 0x61, 0x9f, 0xd1, 0x57, 0xd0, 0xf1);") +cpp_quote("EXTERN_GUID(MFTranscodeContainerType_FLAC, 0x31344aa3, 0x05a9, 0x42b5, 0x90, 0x1b, 0x8e, 0x9d, 0x42, 0x57, 0xf7, 0x5e);") +cpp_quote("EXTERN_GUID(MFTranscodeContainerType_FMPEG4, 0x9ba876f1, 0x419f, 0x4b77, 0xa1, 0xe0, 0x35, 0x95, 0x9d, 0x9d, 0x40, 0x04);") +cpp_quote("EXTERN_GUID(MFTranscodeContainerType_MP3, 0xe438b912, 0x83f1, 0x4de6, 0x9e, 0x3a, 0x9f, 0xfb, 0xc6, 0xdd, 0x24, 0xd1);") +cpp_quote("EXTERN_GUID(MFTranscodeContainerType_MPEG2, 0xbfc2dbf9, 0x7bb4, 0x4f8f, 0xaf, 0xde, 0xe1, 0x12, 0xc4, 0x4b, 0xa8, 0x82);") +cpp_quote("EXTERN_GUID(MFTranscodeContainerType_MPEG4, 0xdc6cd05d, 0xb9d0, 0x40ef, 0xbd, 0x35, 0xfa, 0x62, 0x2c, 0x1a, 0xb2, 0x8a);") +cpp_quote("EXTERN_GUID(MFTranscodeContainerType_WAVE, 0x64c3453c, 0x0f26, 0x4741, 0xbe, 0x63, 0x87, 0xbd, 0xf8, 0xbb, 0x93, 0x5b);")

1 0

Nikolay Sivov : d2d1/commandlist: Implement DrawImage() command.
by Alexandre Julliard 09 Aug '22

09 Aug '22

Module: wine Branch: master Commit: a52ba8d95a07f4b0f65c502e5cecd8d3aa50f99e URL: https://gitlab.winehq.org/wine/wine/-/commit/a52ba8d95a07f4b0f65c502e5cecd8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 6 00:58:58 2022 +0300 d2d1/commandlist: Implement DrawImage() command. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/command_list.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 3 +++ dlls/d2d1/device.c | 3 ++- 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/command_list.c b/dlls/d2d1/command_list.c index 8e5654adac8..f5e3bd22246 100644 --- a/dlls/d2d1/command_list.c +++ b/dlls/d2d1/command_list.c @@ -40,6 +40,7 @@ enum d2d_command_type D2D_COMMAND_DRAW_GEOMETRY, D2D_COMMAND_DRAW_RECTANGLE, D2D_COMMAND_DRAW_BITMAP, + D2D_COMMAND_DRAW_IMAGE, D2D_COMMAND_FILL_MESH, D2D_COMMAND_FILL_OPACITY_MASK, D2D_COMMAND_FILL_GEOMETRY, @@ -188,6 +189,16 @@ struct d2d_command_draw_bitmap D2D1_MATRIX_4X4_F *perspective_transform; }; +struct d2d_command_draw_image +{ + struct d2d_command c; + ID2D1Image *image; + D2D1_INTERPOLATION_MODE interpolation_mode; + D2D1_COMPOSITE_MODE composite_mode; + D2D1_POINT_2F *target_offset; + D2D1_RECT_F *image_rect; +}; + static inline struct d2d_command_list *impl_from_ID2D1CommandList(ID2D1CommandList *iface) { return CONTAINING_RECORD(iface, struct d2d_command_list, ID2D1CommandList_iface); @@ -387,6 +398,13 @@ static HRESULT STDMETHODCALLTYPE d2d_command_list_Stream(ID2D1CommandList *iface c->interpolation_mode, c->src_rect, c->perspective_transform); break; } + case D2D_COMMAND_DRAW_IMAGE: + { + const struct d2d_command_draw_image *c = data; + hr = ID2D1CommandSink_DrawImage(sink, c->image, c->target_offset, c->image_rect, + c->interpolation_mode, c->composite_mode); + break; + } case D2D_COMMAND_FILL_MESH: { const struct d2d_command_fill_mesh *c = data; @@ -957,6 +975,32 @@ void d2d_command_list_draw_bitmap(struct d2d_command_list *command_list, ID2D1Bi d2d_command_list_write_field(&data, &command->perspective_transform, perspective_transform, sizeof(*perspective_transform)); } +void d2d_command_list_draw_image(struct d2d_command_list *command_list, ID2D1Image *image, + const D2D1_POINT_2F *target_offset, const D2D1_RECT_F *image_rect, D2D1_INTERPOLATION_MODE interpolation_mode, + D2D1_COMPOSITE_MODE composite_mode) +{ + struct d2d_command_draw_image *command; + size_t size; + BYTE *data; + + size = sizeof(*command); + if (target_offset) size += sizeof(*target_offset); + if (image_rect) size += sizeof(*image_rect); + + d2d_command_list_reference_object(command_list, image); + + command = d2d_command_list_require_space(command_list, size); + command->c.op = D2D_COMMAND_DRAW_IMAGE; + command->image = image; + command->interpolation_mode = interpolation_mode; + command->composite_mode = composite_mode; + + data = (BYTE *)(command + 1); + + d2d_command_list_write_field(&data, &command->target_offset, target_offset, sizeof(*target_offset)); + d2d_command_list_write_field(&data, &command->image_rect, image_rect, sizeof(*image_rect)); +} + void d2d_command_list_fill_mesh(struct d2d_command_list *command_list, const struct d2d_device_context *context, ID2D1Mesh *mesh, ID2D1Brush *orig_brush) { diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 4cc77079e0f..b309427b355 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -769,6 +769,9 @@ void d2d_command_list_draw_glyph_run(struct d2d_command_list *command_list, void d2d_command_list_draw_bitmap(struct d2d_command_list *command_list, ID2D1Bitmap *bitmap, const D2D1_RECT_F *dst_rect, float opacity, D2D1_INTERPOLATION_MODE interpolation_mode, const D2D1_RECT_F *src_rect, const D2D1_MATRIX_4X4_F *perspective_transform) DECLSPEC_HIDDEN; +void d2d_command_list_draw_image(struct d2d_command_list *command_list, ID2D1Image *image, + const D2D1_POINT_2F *target_offset, const D2D1_RECT_F *image_rect, D2D1_INTERPOLATION_MODE interpolation_mode, + D2D1_COMPOSITE_MODE composite_mode) DECLSPEC_HIDDEN; void d2d_command_list_fill_mesh(struct d2d_command_list *command_list, const struct d2d_device_context *context, ID2D1Mesh *mesh, ID2D1Brush *orig_brush) DECLSPEC_HIDDEN; void d2d_command_list_fill_opacity_mask(struct d2d_command_list *command_list, const struct d2d_device_context *context, diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 796d837c3d9..6a671ba2818 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -2511,7 +2511,8 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawImage(ID2D1DeviceContext1 * if (context->target.type == D2D_TARGET_COMMAND_LIST) { - FIXME("Unimplemented for command list target.\n"); + d2d_command_list_draw_image(context->target.command_list, image, target_offset, image_rect, + interpolation_mode, composite_mode); return; }

1 0

Nikolay Sivov : d2d1/commandlist: Implement layer commands.
by Alexandre Julliard 09 Aug '22

09 Aug '22

Module: wine Branch: master Commit: 2f3738b3a6ef43f4b2ca7ae3c7a438dc03876d55 URL: https://gitlab.winehq.org/wine/wine/-/commit/2f3738b3a6ef43f4b2ca7ae3c7a438… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 6 10:45:36 2022 +0300 d2d1/commandlist: Implement layer commands. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/command_list.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 3 +++ dlls/d2d1/device.c | 21 +++++++++++++++++++++ 3 files changed, 73 insertions(+) diff --git a/dlls/d2d1/command_list.c b/dlls/d2d1/command_list.c index f5e3bd22246..bed650516ac 100644 --- a/dlls/d2d1/command_list.c +++ b/dlls/d2d1/command_list.c @@ -46,7 +46,9 @@ enum d2d_command_type D2D_COMMAND_FILL_GEOMETRY, D2D_COMMAND_FILL_RECTANGLE, D2D_COMMAND_PUSH_CLIP, + D2D_COMMAND_PUSH_LAYER, D2D_COMMAND_POP_CLIP, + D2D_COMMAND_POP_LAYER, }; struct d2d_command @@ -110,6 +112,13 @@ struct d2d_command_push_clip D2D1_ANTIALIAS_MODE mode; }; +struct d2d_command_push_layer +{ + struct d2d_command c; + D2D1_LAYER_PARAMETERS1 params; + ID2D1Layer *layer; +}; + struct d2d_command_draw_line { struct d2d_command c; @@ -435,9 +444,18 @@ static HRESULT STDMETHODCALLTYPE d2d_command_list_Stream(ID2D1CommandList *iface hr = ID2D1CommandSink_PushAxisAlignedClip(sink, &c->rect, c->mode); break; } + case D2D_COMMAND_PUSH_LAYER: + { + const struct d2d_command_push_layer *c = data; + hr = ID2D1CommandSink_PushLayer(sink, &c->params, c->layer); + break; + } case D2D_COMMAND_POP_CLIP: hr = ID2D1CommandSink_PopAxisAlignedClip(sink); break; + case D2D_COMMAND_POP_LAYER: + hr = ID2D1CommandSink_PopLayer(sink); + break; default: FIXME("Unhandled command %u.\n", command->op); hr = E_UNEXPECTED; @@ -694,6 +712,37 @@ void d2d_command_list_pop_clip(struct d2d_command_list *command_list) command->op = D2D_COMMAND_POP_CLIP; } +void d2d_command_list_push_layer(struct d2d_command_list *command_list, const struct d2d_device_context *context, + const D2D1_LAYER_PARAMETERS1 *params, ID2D1Layer *layer) +{ + struct d2d_command_push_layer *command; + ID2D1Brush *opacity_brush = NULL; + + if (params->opacityBrush && FAILED(d2d_command_list_create_brush(command_list, context, + params->opacityBrush, &opacity_brush))) + { + command_list->state = D2D_COMMAND_LIST_STATE_ERROR; + return; + } + + d2d_command_list_reference_object(command_list, layer); + d2d_command_list_reference_object(command_list, params->geometricMask); + + command = d2d_command_list_require_space(command_list, sizeof(*command)); + command->c.op = D2D_COMMAND_PUSH_LAYER; + command->params = *params; + command->params.opacityBrush = opacity_brush; + command->layer = layer; +} + +void d2d_command_list_pop_layer(struct d2d_command_list *command_list) +{ + struct d2d_command *command; + + command = d2d_command_list_require_space(command_list, sizeof(*command)); + command->op = D2D_COMMAND_POP_LAYER; +} + void d2d_command_list_clear(struct d2d_command_list *command_list, const D2D1_COLOR_F *color) { struct d2d_command_clear *command; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index b309427b355..085febe95e7 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -776,6 +776,9 @@ void d2d_command_list_fill_mesh(struct d2d_command_list *command_list, const str ID2D1Mesh *mesh, ID2D1Brush *orig_brush) DECLSPEC_HIDDEN; void d2d_command_list_fill_opacity_mask(struct d2d_command_list *command_list, const struct d2d_device_context *context, ID2D1Bitmap *bitmap, ID2D1Brush *orig_brush, const D2D1_RECT_F *dst_rect, const D2D1_RECT_F *src_rect) DECLSPEC_HIDDEN; +void d2d_command_list_push_layer(struct d2d_command_list *command_list, const struct d2d_device_context *context, + const D2D1_LAYER_PARAMETERS1 *params, ID2D1Layer *layer) DECLSPEC_HIDDEN; +void d2d_command_list_pop_layer(struct d2d_command_list *command_list) DECLSPEC_HIDDEN; static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 6a671ba2818..32519f662c9 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1696,12 +1696,28 @@ static void STDMETHODCALLTYPE d2d_device_context_GetTags(ID2D1DeviceContext1 *if static void STDMETHODCALLTYPE d2d_device_context_PushLayer(ID2D1DeviceContext1 *iface, const D2D1_LAYER_PARAMETERS *layer_parameters, ID2D1Layer *layer) { + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + FIXME("iface %p, layer_parameters %p, layer %p stub!\n", iface, layer_parameters, layer); + + if (context->target.type == D2D_TARGET_COMMAND_LIST) + { + D2D1_LAYER_PARAMETERS1 parameters; + + memcpy(&parameters, layer_parameters, sizeof(*layer_parameters)); + parameters.layerOptions = D2D1_LAYER_OPTIONS1_NONE; + d2d_command_list_push_layer(context->target.command_list, context, &parameters, layer); + } } static void STDMETHODCALLTYPE d2d_device_context_PopLayer(ID2D1DeviceContext1 *iface) { + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + FIXME("iface %p stub!\n", iface); + + if (context->target.type == D2D_TARGET_COMMAND_LIST) + d2d_command_list_pop_layer(context->target.command_list); } static HRESULT STDMETHODCALLTYPE d2d_device_context_Flush(ID2D1DeviceContext1 *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) @@ -2564,7 +2580,12 @@ static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_DrawBitmap(I static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_PushLayer(ID2D1DeviceContext1 *iface, const D2D1_LAYER_PARAMETERS1 *layer_parameters, ID2D1Layer *layer) { + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + FIXME("iface %p, layer_parameters %p, layer %p stub!\n", iface, layer_parameters, layer); + + if (context->target.type == D2D_TARGET_COMMAND_LIST) + d2d_command_list_push_layer(context->target.command_list, context, layer_parameters, layer); } static HRESULT STDMETHODCALLTYPE d2d_device_context_InvalidateEffectInputRectangle(ID2D1DeviceContext1 *iface,

1 0

Nikolay Sivov : dwrite/tests: Add a helper to create analyzer instance.
by Alexandre Julliard 09 Aug '22

09 Aug '22

Module: wine Branch: master Commit: 2879930172b5568faef4829f68ccaefc4a9e0585 URL: https://gitlab.winehq.org/wine/wine/-/commit/2879930172b5568faef4829f68ccae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 6 18:18:28 2022 +0300 dwrite/tests: Add a helper to create analyzer instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/analyzer.c | 193 +++++++++++++++++++++---------------------- 1 file changed, 95 insertions(+), 98 deletions(-)

1 0

Nikolay Sivov : dwrite/fallback: Add mappings for some CJK ranges.
by Alexandre Julliard 09 Aug '22

09 Aug '22

Module: wine Branch: master Commit: 5b46a8a0653ea8545ad2691fea26827d72b26513 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b46a8a0653ea8545ad2691fea2682… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 6 23:11:02 2022 +0300 dwrite/fallback: Add mappings for some CJK ranges. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 42 +++++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/layout.c | 12 ++++-------- 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index f93d06a84d9..ccce2c63976 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -248,9 +248,49 @@ system_fallback_config[] = { "1800-18AF, 11660-1167F", L"Noto Sans Mongolian" }, - { "3000-30FF, 31F0-31FF, 4E00-9FFF", L"Meiryo" }, + /* CJK Symbols and Punctuation - 3000-303F + Hiragana - 3040-309F + Katakana - 30A0-30FF + Katakana Phonetic Ext. - 31F0-31FF */ + + { "3000-30FF, 31F0-31FF", L"Noto Sans CJK SC", L"zh-Hans" }, + { "3000-30FF, 31F0-31FF", L"Noto Sans CJK TC", L"zh-Hant" }, + { "3000-30FF, 31F0-31FF", L"Noto Sans CJK KR", L"ko" }, + { "3000-30FF, 31F0-31FF", L"Noto Sans CJK JP" }, + + /* CJK Unified Ext A - 3400-4DBF + CJK Unified - 4E00-9FFF */ + + { "3400-4DBF, 4E00-9FFF", L"Noto Sans CJK SC", L"zh-Hans" }, + { "3400-4DBF, 4E00-9FFF", L"Noto Sans CJK TC", L"zh-Hant" }, + { "3400-4DBF, 4E00-9FFF", L"Noto Sans CJK KR", L"ko" }, + { "3400-4DBF, 4E00-9FFF", L"Noto Sans CJK JP" }, + + /* CJK Compatibility Ideographs - F900-FAFF */ + + { "F900-FAFF", L"Noto Sans CJK SC", L"zh-Hans" }, + { "F900-FAFF", L"Noto Sans CJK TC", L"zh-Hant" }, + { "F900-FAFF", L"Noto Sans CJK KR", L"ko" }, + { "F900-FAFF", L"Noto Sans CJK JP" }, + + /* Vertical Forms - FE10-FE1F */ + + { "FE10-FE1F", L"Noto Sans CJK SC", L"zh-Hans" }, + { "FE10-FE1F", L"Noto Sans CJK KR", L"ko" }, + { "FE10-FE1F", L"Noto Sans CJK TC" }, + + /* CJK Compatibility Forms - FE30-FE4F + Small Form Variants - FE50-FE6F */ + + { "FE30-FE6F", L"Noto Sans CJK SC", L"zh-Hans" }, + { "FE30-FE6F", L"Noto Sans CJK KR", L"ko" }, + { "FE30-FE6F", L"Noto Sans CJK JP", L"ja" }, + { "FE30-FE6F", L"Noto Sans CJK TC" }, /* Halfwidth and Fullwidth Forms */ + { "FF00-FFEF", L"Noto Sans CJK SC", L"zh-Hans" }, + { "FF00-FFEF", L"Noto Sans CJK TC", L"zh-Hant" }, + { "FF00-FFEF", L"Noto Sans CJK KR", L"ko" }, { "FF00-FFEF", L"Noto Sans CJK JP" }, }; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 3b2289b40ce..8d32037315c 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4686,14 +4686,12 @@ static void test_MapCharacters(void) hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 1, 2, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine - ok(mappedlength == 1, "got %u\n", mappedlength); + ok(mappedlength == 1, "Unexpected length %u.\n", mappedlength); ok(scale == 1.0f, "got %f\n", scale); - todo_wine ok(font != NULL, "got %p\n", font); -if (font) { - IDWriteFont_Release(font); -} + if (font) + IDWriteFont_Release(font); + /* Try with explicit collection, Tahoma will be forced. */ /* 1. Latin part */ g_source = str2W; @@ -4726,7 +4724,6 @@ if (font) { ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(mappedlength == 1, "got %u\n", mappedlength); ok(scale == 1.0f, "got %f\n", scale); - todo_wine ok(font != NULL, "got %p\n", font); if (font) @@ -4736,7 +4733,6 @@ if (font) { ok(hr == S_OK && exists, "Unexpected hr %#lx, exists %d.\n", hr, exists); hr = IDWriteLocalizedStrings_GetString(strings, 0, buffW, ARRAY_SIZE(buffW)); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(lstrcmpW(buffW, L"Tahoma"), "Unexpected string %s.\n", wine_dbgstr_w(buffW)); IDWriteLocalizedStrings_Release(strings); IDWriteFont_Release(font);

1 0

Hans Leidekker : bcrypt: Add compatibility defines for AES CFB8.
by Alexandre Julliard 09 Aug '22

09 Aug '22

Module: wine Branch: master Commit: c2328d0fde59b0070e6f877453f30b3c1f62ae27 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2328d0fde59b0070e6f877453f30b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Aug 8 12:21:20 2022 +0200 bcrypt: Add compatibility defines for AES CFB8. --- dlls/bcrypt/gnutls.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 9d52b7360ce..64a7a195527 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -69,6 +69,12 @@ typedef enum } gnutls_ecc_curve_t; #endif +#if GNUTLS_VERSION_MAJOR < 3 || (GNUTLS_VERSION_MAJOR == 3 && GNUTLS_VERSION_MINOR < 6) +#define GNUTLS_CIPHER_AES_128_CFB8 29 +#define GNUTLS_CIPHER_AES_192_CFB8 30 +#define GNUTLS_CIPHER_AES_256_CFB8 31 +#endif + union key_data { gnutls_cipher_hd_t cipher;

1 0

Hans Leidekker : nsiproxy.sys: Support media connect state on Linux.
by Alexandre Julliard 09 Aug '22

09 Aug '22

Module: wine Branch: master Commit: fa8a5692c28bd982cf90306383d6bd69f4da204e URL: https://gitlab.winehq.org/wine/wine/-/commit/fa8a5692c28bd982cf90306383d6bd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Aug 8 11:25:36 2022 +0200 nsiproxy.sys: Support media connect state on Linux. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53499 --- dlls/nsiproxy.sys/ndis.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 667d399b0cb..c34630d8aec 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -333,7 +333,23 @@ static void ifinfo_fill_dynamic( struct if_entry *entry, struct nsi_ndis_ifinfo_ data->flags.unk = 0; data->flags.not_media_conn = 0; data->flags.unk2 = 0; +#ifdef __linux__ + { + char filename[64]; + FILE *fp; + + sprintf( filename, "/sys/class/net/%s/carrier", entry->if_unix_name ); + if (!(fp = fopen( filename, "r" ))) data->media_conn_state = MediaConnectStateUnknown; + else + { + if (fgetc( fp ) == '1') data->media_conn_state = MediaConnectStateConnected; + else data->media_conn_state = MediaConnectStateDisconnected; + fclose( fp ); + } + } +#else data->media_conn_state = MediaConnectStateConnected; +#endif data->unk = 0; if (!ioctl( fd, SIOCGIFMTU, &req )) data->mtu = req.ifr_mtu;

1 0

Jacek Caban : win32u: Use platform-independent layout for DC_ATTR.
by Alexandre Julliard 09 Aug '22

09 Aug '22

Module: wine Branch: master Commit: 2b6647cdd53bf6514f8c6760d0abf77a0f0c9574 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b6647cdd53bf6514f8c6760d0abf7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 30 02:48:02 2022 +0200 win32u: Use platform-independent layout for DC_ATTR. --- dlls/gdi32/dc.c | 6 +- dlls/gdi32/emfdc.c | 218 ++++++++++++++++++++++++++++------------------------- dlls/win32u/dc.c | 3 +- include/ntgdi.h | 6 +- 4 files changed, 125 insertions(+), 108 deletions(-)

1 0