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

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

Aug. 10, 2022

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 Aug. 9, 2022

Aug. 9, 2022

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 Aug. 9, 2022

Aug. 9, 2022

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

Jacek Caban : win32u: Use NtUserMessageCall for NtUserSpyGetMsgName.
by Alexandre Julliard Aug. 9, 2022

Aug. 9, 2022

Module: wine Branch: master Commit: 2c75490c3e6cb8611197fa64c1470a318edb80f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c75490c3e6cb8611197fa64c1470a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 30 19:03:04 2022 +0200 win32u: Use NtUserMessageCall for NtUserSpyGetMsgName. Instead of leaking a kernel pointer. --- dlls/user32/user_main.c | 4 +++- dlls/win32u/message.c | 6 +++++- dlls/win32u/window.c | 3 --- include/ntuser.h | 6 +++--- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index df3e6b27b81..bc817089e46 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -352,7 +352,9 @@ BOOL WINAPI ShutdownBlockReasonDestroy(HWND hwnd) const char *SPY_GetMsgName( UINT msg, HWND hwnd ) { - return (const char *)NtUserCallHwndParam( hwnd, msg, NtUserSpyGetMsgName ); + char buf[128]; + NtUserMessageCall( hwnd, msg, ARRAYSIZE(buf), 0, buf, NtUserSpyGetMsgName, FALSE ); + return wine_dbg_sprintf( "%s", buf ); } void SPY_EnterMessage( INT flag, HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 5fb065e1208..33170147aa9 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2960,7 +2960,7 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa return send_notify_message( hwnd, msg, wparam, lparam, ansi ); case NtUserSendMessageCallback: - return send_message_callback( hwnd, msg, wparam, lparam, (void *)result_info, ansi ); + return send_message_callback( hwnd, msg, wparam, lparam, result_info, ansi ); case NtUserClipboardWindowProc: return user_driver->pClipboardWindowProc( hwnd, msg, wparam, lparam ); @@ -2978,6 +2978,10 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa spy_enter_message( ansi, hwnd, msg, wparam, lparam ); return 0; + case NtUserSpyGetMsgName: + lstrcpynA( result_info, debugstr_msg_name( msg, hwnd ), wparam ); + return 0; + case NtUserSpyExit: spy_exit_message( ansi, hwnd, msg, (LPARAM)result_info, wparam, lparam ); return 0; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index c4e14381cf5..2a4edeee656 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5578,9 +5578,6 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) return set_window_style( hwnd, style->styleNew, style->styleOld ); } - case NtUserSpyGetMsgName: - return (UINT_PTR)debugstr_msg_name( param, hwnd ); - default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index f15ba1f135e..5b7d66a2a4e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -297,8 +297,9 @@ enum /* Wine-specific exports */ NtUserClipboardWindowProc = 0x0300, NtUserGetDispatchParams = 0x3001, - NtUserSpyEnter = 0x0302, - NtUserSpyExit = 0x0303, + NtUserSpyGetMsgName = 0x3002, + NtUserSpyEnter = 0x0303, + NtUserSpyExit = 0x0304, }; /* NtUserThunkedMenuItemInfo codes */ @@ -1261,7 +1262,6 @@ enum NtUserCallHwndParam_ShowOwnedPopups, /* temporary exports */ NtUserSetWindowStyle, - NtUserSpyGetMsgName, }; static inline BOOL NtUserClientToScreen( HWND hwnd, POINT *pt )

1 0

Hans Leidekker : nsiproxy.sys: Support media connect state on Linux.
by Alexandre Julliard Aug. 9, 2022

Aug. 9, 2022

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 Aug. 9, 2022

Aug. 9, 2022

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

Nikolay Sivov : include: Fix ID2D1CommandSink::DrawImage() prototype.
by Alexandre Julliard Aug. 9, 2022

Aug. 9, 2022

Module: wine Branch: master Commit: 6ed5d85121ac36c68fdd3fb85b259254a72523ea URL: https://gitlab.winehq.org/wine/wine/-/commit/6ed5d85121ac36c68fdd3fb85b2592… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 6 00:58:24 2022 +0300 include: Fix ID2D1CommandSink::DrawImage() prototype. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/d2d1_1.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index ba3fd24914f..b60064be3b6 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -623,7 +623,7 @@ interface ID2D1CommandSink : IUnknown HRESULT DrawImage( [in] ID2D1Image *image, [in] const D2D1_POINT_2F *target_offset, - [in] const D2D1_POINT_2F *image_rect, + [in] const D2D1_RECT_F *image_rect, [in] D2D1_INTERPOLATION_MODE interpolation_mode, [in] D2D1_COMPOSITE_MODE composite_mode );

1 0

Tim Clem : ntdll: Fix leak of mach_thread_self port.
by Alexandre Julliard Aug. 9, 2022

Aug. 9, 2022

Module: wine Branch: master Commit: 317085fde560d99c5a9fc89d449502f1834edbdb URL: https://gitlab.winehq.org/wine/wine/-/commit/317085fde560d99c5a9fc89d449502… Author: Tim Clem <tclem(a)codeweavers.com> Date: Mon Aug 8 10:06:44 2022 -0700 ntdll: Fix leak of mach_thread_self port. --- dlls/ntdll/unix/signal_x86_64.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 1c2db47c95d..88c517daecf 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -3052,7 +3052,10 @@ static void *mac_thread_gsbase(void) unsigned int info_count = THREAD_IDENTIFIER_INFO_COUNT; static int gsbase_offset = -1; - kern_return_t kr = thread_info(mach_thread_self(), THREAD_IDENTIFIER_INFO, (thread_info_t) &tiinfo, &info_count); + mach_port_t self = mach_thread_self(); + kern_return_t kr = thread_info(self, THREAD_IDENTIFIER_INFO, (thread_info_t) &tiinfo, &info_count); + mach_port_deallocate(mach_task_self(), self); + if (kr == KERN_SUCCESS) return (void*)tiinfo.thread_handle; if (gsbase_offset < 0)

1 0

Jacek Caban : win32u: Use platform-independent layout for ntuser_thread_info.
by Alexandre Julliard Aug. 9, 2022

Aug. 9, 2022

Module: wine Branch: master Commit: 1e9390e558d02652d245353b9e4e3037451c6c30 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e9390e558d02652d245353b9e4e30… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 30 03:09:47 2022 +0200 win32u: Use platform-independent layout for ntuser_thread_info. --- dlls/imm32/imm.c | 8 ++++---- dlls/user32/message.c | 15 ++++++++++----- dlls/user32/user_main.c | 2 +- dlls/user32/win.c | 8 ++++---- dlls/win32u/driver.c | 2 +- dlls/win32u/imm.c | 7 ++++--- dlls/win32u/window.c | 17 ++++++++++------- dlls/win32u/winstation.c | 15 ++++++++------- dlls/wineandroid.drv/device.c | 4 ++-- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_main.c | 2 +- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 4 ++-- include/ntuser.h | 14 +++++++------- 14 files changed, 56 insertions(+), 46 deletions(-)

1 0

Jacek Caban : win32u: Support wow64 in NtAllocateVirtualMemory calls.
by Alexandre Julliard Aug. 9, 2022

Aug. 9, 2022

Module: wine Branch: master Commit: 149e7502400e24d27fe3f9159d2a936af71c7a19 URL: https://gitlab.winehq.org/wine/wine/-/commit/149e7502400e24d27fe3f9159d2a93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 30 02:51:49 2022 +0200 win32u: Support wow64 in NtAllocateVirtualMemory calls. --- dlls/win32u/dc.c | 4 ++-- dlls/win32u/dib.c | 4 ++-- dlls/win32u/gdiobj.c | 4 ++-- dlls/win32u/win32u_private.h | 9 +++++++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 131927a4707..a8c651dd28f 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -112,8 +112,8 @@ static DC_ATTR *alloc_dc_attr(void) { SIZE_T size = system_info.AllocationGranularity; bucket->entries = NULL; - if (!NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&bucket->entries, 0, &size, - MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE )) + if (!NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&bucket->entries, zero_bits(), + &size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE )) { bucket->next_free = NULL; bucket->next_unused = bucket->entries + 1; diff --git a/dlls/win32u/dib.c b/dlls/win32u/dib.c index 7a6df3da7cc..e7a5a50e201 100644 --- a/dlls/win32u/dib.c +++ b/dlls/win32u/dib.c @@ -1548,8 +1548,8 @@ HBITMAP WINAPI NtGdiCreateDIBSection( HDC hdc, HANDLE section, DWORD offset, con { SIZE_T size = bmp->dib.dsBmih.biSizeImage; offset = 0; - if (NtAllocateVirtualMemory( GetCurrentProcess(), &bmp->dib.dsBm.bmBits, 0, &size, - MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE )) + if (NtAllocateVirtualMemory( GetCurrentProcess(), &bmp->dib.dsBm.bmBits, zero_bits(), + &size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE )) goto error; } bmp->dib.dshSection = section; diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index aaeed2ba676..e42d076bc5b 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -566,8 +566,8 @@ static void init_gdi_shared(void) { SIZE_T size = sizeof(*gdi_shared); - if (NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&gdi_shared, 0, &size, - MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE )) + if (NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&gdi_shared, zero_bits(), + &size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE )) return; next_unused = gdi_shared->Handles + FIRST_GDI_HANDLE; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index d4b86d1e6a9..6d492f2e73b 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -494,6 +494,15 @@ static inline BOOL is_win9x(void) return NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32s; } +static inline ULONG_PTR zero_bits(void) +{ +#ifdef _WIN64 + return !NtCurrentTeb()->WowTebOffset ? 0 : 0x7fffffff; +#else + return 0; +#endif +} + static inline const char *debugstr_us( const UNICODE_STRING *us ) { if (!us) return "<null>";

1 0