wine-commits May 2020

wine-commits@winehq.org

1 participants
743 discussions

Zebediah Figura : amstream: Don't duplicate IMediaStream method implementations.
by Alexandre Julliard 26 May '20

26 May '20

Module: wine Branch: master Commit: f5aaca10affba65460206f6869fdf7fb10197468 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5aaca10affba65460206f68… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 25 14:17:32 2020 -0500 amstream: Don't duplicate IMediaStream method implementations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 61 +++++++++++------------------------------- dlls/amstream/ddrawstream.c | 65 ++++++++++++--------------------------------- 2 files changed, 32 insertions(+), 94 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 4e82d76da0..d620abc6ec 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -605,76 +605,45 @@ static ULONG WINAPI audio_IAudioMediaStream_Release(IAudioMediaStream *iface) return IAMMediaStream_Release(&This->IAMMediaStream_iface); } -/*** IMediaStream methods ***/ static HRESULT WINAPI audio_IAudioMediaStream_GetMultiMediaStream(IAudioMediaStream *iface, - IMultiMediaStream **multi_media_stream) + IMultiMediaStream **mmstream) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); - - TRACE("(%p/%p)->(%p)\n", iface, This, multi_media_stream); - - if (!multi_media_stream) - return E_POINTER; - - IMultiMediaStream_AddRef(This->parent); - *multi_media_stream = This->parent; - - return S_OK; + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); + return IAMMediaStream_GetMultiMediaStream(&stream->IAMMediaStream_iface, mmstream); } static HRESULT WINAPI audio_IAudioMediaStream_GetInformation(IAudioMediaStream *iface, MSPID *purpose_id, STREAM_TYPE *type) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); - - TRACE("(%p/%p)->(%p,%p)\n", iface, This, purpose_id, type); - - if (purpose_id) - *purpose_id = This->purpose_id; - if (type) - *type = This->stream_type; - - return S_OK; + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); + return IAMMediaStream_GetInformation(&stream->IAMMediaStream_iface, purpose_id, type); } static HRESULT WINAPI audio_IAudioMediaStream_SetSameFormat(IAudioMediaStream *iface, - IMediaStream *stream_format, DWORD flags) + IMediaStream *other, DWORD flags) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); - - FIXME("(%p/%p)->(%p,%x) stub!\n", iface, This, stream_format, flags); - - return S_FALSE; + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); + return IAMMediaStream_SetSameFormat(&stream->IAMMediaStream_iface, other, flags); } static HRESULT WINAPI audio_IAudioMediaStream_AllocateSample(IAudioMediaStream *iface, DWORD flags, IStreamSample **sample) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); - - FIXME("(%p/%p)->(%x,%p) stub!\n", iface, This, flags, sample); - - return S_FALSE; + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); + return IAMMediaStream_AllocateSample(&stream->IAMMediaStream_iface, flags, sample); } static HRESULT WINAPI audio_IAudioMediaStream_CreateSharedSample(IAudioMediaStream *iface, IStreamSample *existing_sample, DWORD flags, IStreamSample **sample) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); - - FIXME("(%p/%p)->(%p,%x,%p) stub!\n", iface, This, existing_sample, flags, sample); - - return S_FALSE; + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); + return IAMMediaStream_CreateSharedSample(&stream->IAMMediaStream_iface, existing_sample, flags, sample); } -static HRESULT WINAPI audio_IAudioMediaStream_SendEndOfStream(IAudioMediaStream *iface, - DWORD flags) +static HRESULT WINAPI audio_IAudioMediaStream_SendEndOfStream(IAudioMediaStream *iface, DWORD flags) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); - - FIXME("(%p/%p)->(%x) stub!\n", iface, This, flags); - - return S_FALSE; + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); + return IAMMediaStream_SendEndOfStream(&stream->IAMMediaStream_iface, flags); } /*** IAudioMediaStream methods ***/ diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 9c552f1a03..6ef74eb7de 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -292,76 +292,45 @@ static ULONG WINAPI ddraw_IDirectDrawMediaStream_Release(IDirectDrawMediaStream return IAMMediaStream_Release(&This->IAMMediaStream_iface); } -/*** IMediaStream methods ***/ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetMultiMediaStream(IDirectDrawMediaStream *iface, - IMultiMediaStream **multi_media_stream) + IMultiMediaStream **mmstream) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); - - TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); - - if (!multi_media_stream) - return E_POINTER; - - IMultiMediaStream_AddRef(This->parent); - *multi_media_stream = This->parent; - - return S_OK; + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + return IAMMediaStream_GetMultiMediaStream(&stream->IAMMediaStream_iface, mmstream); } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetInformation(IDirectDrawMediaStream *iface, MSPID *purpose_id, STREAM_TYPE *type) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); - - TRACE("(%p/%p)->(%p,%p)\n", This, iface, purpose_id, type); - - if (purpose_id) - *purpose_id = This->purpose_id; - if (type) - *type = This->stream_type; - - return S_OK; + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + return IAMMediaStream_GetInformation(&stream->IAMMediaStream_iface, purpose_id, type); } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetSameFormat(IDirectDrawMediaStream *iface, - IMediaStream *pStreamThatHasDesiredFormat, DWORD dwFlags) + IMediaStream *other, DWORD flags) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); - - FIXME("(%p/%p)->(%p,%x) stub!\n", This, iface, pStreamThatHasDesiredFormat, dwFlags); - - return S_FALSE; + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + return IAMMediaStream_SetSameFormat(&stream->IAMMediaStream_iface, other, flags); } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_AllocateSample(IDirectDrawMediaStream *iface, - DWORD dwFlags, IStreamSample **ppSample) + DWORD flags, IStreamSample **sample) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); - - FIXME("(%p/%p)->(%x,%p) stub!\n", This, iface, dwFlags, ppSample); - - return S_FALSE; + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + return IAMMediaStream_AllocateSample(&stream->IAMMediaStream_iface, flags, sample); } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_CreateSharedSample(IDirectDrawMediaStream *iface, - IStreamSample *pExistingSample, DWORD dwFlags, IStreamSample **ppSample) + IStreamSample *existing_sample, DWORD flags, IStreamSample **sample) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); - - FIXME("(%p/%p)->(%p,%x,%p) stub!\n", This, iface, pExistingSample, dwFlags, ppSample); - - return S_FALSE; + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + return IAMMediaStream_CreateSharedSample(&stream->IAMMediaStream_iface, existing_sample, flags, sample); } -static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SendEndOfStream(IDirectDrawMediaStream *iface, - DWORD dwFlags) +static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SendEndOfStream(IDirectDrawMediaStream *iface, DWORD flags) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); - - FIXME("(%p/%p)->(%x) stub!\n", This, iface, dwFlags); - - return S_FALSE; + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + return IAMMediaStream_SendEndOfStream(&stream->IAMMediaStream_iface, flags); } /*** IDirectDrawMediaStream methods ***/

1 0

Nikolay Sivov : mfplat: Add Media Engine attributes to tracing.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: ba920246e502afe7bc664c1881d528a27e980101 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba920246e502afe7bc664c18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 25 22:14:23 2020 +0300 mfplat: Add Media Engine attributes to tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 0a5958acb2..ea6a0659c5 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -39,6 +39,7 @@ #include "mfplat_private.h" #include "mfreadwrite.h" +#include "mfmediaengine.h" #include "propvarutil.h" #include "strsafe.h" @@ -1559,6 +1560,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_MPEG2_TIMECODE), X(MF_PMP_SERVER_CONTEXT), X(MFT_SUPPORT_DYNAMIC_FORMAT_CHANGE), + X(MF_MEDIA_ENGINE_TRACK_ID), X(MF_MT_CUSTOM_VIDEO_PRIMARIES), X(MF_MT_TIMESTAMP_CAN_BE_DTS), X(MFT_CODEC_MERIT_Attribute), @@ -1566,10 +1568,12 @@ const char *debugstr_attr(const GUID *guid) X(MF_LOW_LATENCY), X(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS), X(MF_MT_MPEG2_FLAGS), + X(MF_MEDIA_ENGINE_AUDIO_CATEGORY), X(MF_MT_PIXEL_ASPECT_RATIO), X(MF_TOPOLOGY_ENABLE_XVP_FOR_PLAYBACK), X(MFT_CONNECTED_STREAM_ATTRIBUTE), X(MF_MT_REALTIME_CONTENT), + X(MF_MEDIA_ENGINE_CONTENT_PROTECTION_FLAGS), X(MF_MT_WRAPPED_TYPE), X(MF_MT_DRM_FLAGS), X(MF_MT_AVG_BITRATE), @@ -1583,6 +1587,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING), X(MF_MT_AM_FORMAT_TYPE), X(MF_SESSION_APPROX_EVENT_OCCURRENCE_TIME), + X(MF_MEDIA_ENGINE_SYNCHRONOUS_CLOSE), X(MF_MT_H264_MAX_MB_PER_SEC), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_MAX_BUFFERS), X(MF_MT_AUDIO_BLOCK_ALIGNMENT), @@ -1597,10 +1602,13 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_H264_SUPPORTED_SLICE_MODES), X(MF_PD_LAST_MODIFIED_TIME), X(MF_PD_PLAYBACK_ELEMENT_ID), + X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE9), X(MF_MT_ALL_SAMPLES_INDEPENDENT), X(MF_PD_PREFERRED_LANGUAGE), X(MF_PD_PLAYBACK_BOUNDARY_TIME), + X(MF_MEDIA_ENGINE_TELEMETRY_APPLICATION_ID), X(MF_ACTIVATE_MFT_LOCKED), + X(MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT), X(MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING), X(MF_MT_FRAME_SIZE), X(MF_MT_H264_SIMULCAST_SUPPORT), @@ -1612,9 +1620,13 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_PALETTE), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_PROVIDER_DEVICE_ID), X(MF_TOPOLOGY_STATIC_PLAYBACK_OPTIMIZATIONS), + X(MF_MEDIA_ENGINE_NEEDKEY_CALLBACK), X(MF_MT_GEOMETRIC_APERTURE), X(MF_MT_ORIGINAL_WAVE_FORMAT_TAG), X(MF_MT_DV_AAUX_SRC_PACK_1), + X(MF_MEDIA_ENGINE_STREAM_CONTAINS_ALPHA_CHANNEL), + X(MF_MEDIA_ENGINE_MEDIA_PLAYER_MODE), + X(MF_MEDIA_ENGINE_EXTENSION), X(MF_MT_DEFAULT_STRIDE), X(MF_MT_ARBITRARY_FORMAT), X(MF_TRANSFORM_CATEGORY_Attribute), @@ -1632,12 +1644,14 @@ const char *debugstr_attr(const GUID *guid) X(MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME), X(MF_MT_VIDEO_ROTATION), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_SYMBOLIC_LINK), + X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE11), X(MF_MT_USER_DATA), X(MF_MT_MIN_MASTERING_LUMINANCE), X(MF_EVENT_STREAM_METADATA_SYSTEMID), X(MF_MT_AUDIO_CHANNEL_MASK), X(MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN), X(MF_READWRITE_DISABLE_CONVERTERS), + X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE_EDGE), X(MF_MT_MINIMUM_DISPLAY_APERTURE), X(MFSampleExtension_Token), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_CATEGORY), @@ -1646,12 +1660,13 @@ const char *debugstr_attr(const GUID *guid) X(MF_DISABLE_FRAME_CORRUPTION_INFO), X(MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES), X(MF_MT_VIDEO_NO_FRAME_ORDERING), + X(MF_MEDIA_ENGINE_PLAYBACK_VISUAL), X(MF_MT_VIDEO_CHROMA_SITING), X(MF_AUDIO_RENDERER_ATTRIBUTE_STREAM_CATEGORY), X(MFSampleExtension_3DVideo_SampleFormat), X(MF_MT_H264_RESOLUTION_SCALING), - X(MF_MT_MPEG2_LEVEL), X(MF_MT_VIDEO_LEVEL), + X(MF_MT_MPEG2_LEVEL), X(MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET), X(MF_MT_SAMPLE_SIZE), X(MF_MT_AAC_PAYLOAD_TYPE), @@ -1682,6 +1697,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_BYTESTREAM_ORIGIN_NAME), X(MF_BYTESTREAM_CONTENT_TYPE), X(MF_MT_DEPTH_MEASUREMENT), + X(MF_MEDIA_ENGINE_COMPATIBILITY_MODE_WIN10), X(MF_MT_VIDEO_3D_NUM_VIEWS), X(MF_BYTESTREAM_DURATION), X(MF_SD_SAMI_LANGUAGE), @@ -1701,6 +1717,8 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_VIDEO_3D_FIRST_IS_LEFT), X(MFT_DECODER_FINAL_VIDEO_RESOLUTION_HINT), X(MF_PD_ADAPTIVE_STREAMING), + X(MF_MEDIA_ENGINE_SOURCE_RESOLVER_CONFIG_STORE), + X(MF_MEDIA_ENGINE_COMPATIBILITY_MODE_WWA_EDGE), X(MF_MT_H264_SUPPORTED_USAGES), X(MFT_PREFERRED_OUTPUTTYPE_Attribute), X(MFSampleExtension_Timestamp), @@ -1708,6 +1726,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_SUBTYPE), X(MF_TRANSFORM_ASYNC), X(MF_TOPONODE_STREAMID), + X(MF_MEDIA_ENGINE_PLAYBACK_HWND), X(MF_TOPONODE_NOSHUTDOWN_ON_REMOVE), X(MF_MT_VIDEO_LIGHTING), X(MF_SD_MUTUALLY_EXCLUSIVE), @@ -1722,9 +1741,11 @@ const char *debugstr_attr(const GUID *guid) X(MF_SINK_WRITER_D3D_MANAGER), X(MFSampleExtension_3DVideo), X(MF_MT_H264_USAGE), + X(MF_MEDIA_ENGINE_EME_CALLBACK), X(MF_EVENT_SOURCE_FAKE_START), X(MF_EVENT_SOURCE_PROJECTSTART), X(MF_EVENT_SOURCE_ACTUAL_START), + X(MF_MEDIA_ENGINE_CONTENT_PROTECTION_MANAGER), X(MF_MT_AUDIO_SAMPLES_PER_BLOCK), X(MFT_ENUM_HARDWARE_URL_Attribute), X(MF_SOURCE_READER_ASYNC_CALLBACK), @@ -1741,6 +1762,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_SPATIAL_AUDIO_MAX_METADATA_ITEMS), X(MF_MT_MPEG2_ONE_FRAME_PER_PACKET), X(MF_MT_INTERLACE_MODE), + X(MF_MEDIA_ENGINE_CALLBACK), X(MF_MT_VIDEO_RENDERER_EXTENSION_PROFILE), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_HW_SOURCE), X(MF_MT_AUDIO_PREFER_WAVEFORMATEX), @@ -1767,9 +1789,11 @@ const char *debugstr_attr(const GUID *guid) X(MF_EVENT_START_PRESENTATION_TIME), X(MF_EVENT_SESSIONCAPS), X(MF_EVENT_PRESENTATION_TIME_OFFSET), + X(MF_MEDIA_ENGINE_AUDIO_ENDPOINT_ROLE), X(MF_EVENT_SESSIONCAPS_DELTA), X(MF_EVENT_START_PRESENTATION_TIME_AT_OUTPUT), X(MFSampleExtension_DecodeTimestamp), + X(MF_MEDIA_ENGINE_COMPATIBILITY_MODE), X(MF_MT_VIDEO_H264_NO_FMOASO), X(MF_MT_AVG_BIT_ERROR_RATE), X(MF_MT_VIDEO_PRIMARIES), @@ -1777,7 +1801,9 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_H264_RATE_CONTROL_MODES), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK), X(MF_READWRITE_D3D_OPTIONAL), + X(MF_MEDIA_ENGINE_DXGI_MANAGER), X(MF_READWRITE_MMCSS_CLASS_AUDIO), + X(MF_MEDIA_ENGINE_COREWINDOW), X(MF_SOURCE_READER_DISABLE_CAMERA_PLUGINS), X(MF_MT_MPEG4_TRACK_TYPE), X(MF_MT_PAN_SCAN_APERTURE), @@ -1785,6 +1811,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_ORIGINAL_4CC), X(MF_PD_AUDIO_ISVARIABLEBITRATE), X(MF_AUDIO_RENDERER_ATTRIBUTE_FLAGS), + X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE), X(MF_AUDIO_RENDERER_ATTRIBUTE_SESSION_ID), X(MF_MT_MPEG2_CONTENT_PACKET), X(MFT_PROCESS_LOCAL_Attribute), @@ -1793,6 +1820,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_VIDEO_NOMINAL_RANGE), X(MF_MT_AAC_AUDIO_PROFILE_LEVEL_INDICATION), X(MF_MT_MPEG_SEQUENCE_HEADER), + X(MF_MEDIA_ENGINE_OPM_HWND), X(MF_MT_AUDIO_SAMPLES_PER_SECOND), X(MF_MT_SPATIAL_AUDIO_DATA_PRESENT), X(MF_MT_FRAME_RATE), @@ -1822,6 +1850,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_TOPOLOGY_DXVA_MODE), X(MF_TOPONODE_LOCKED), X(MF_TOPONODE_WORKQUEUE_ID), + X(MF_MEDIA_ENGINE_CONTINUE_ON_CODEC_ERROR), X(MF_TOPONODE_WORKQUEUE_MMCSS_CLASS), X(MF_TOPONODE_DECRYPTOR), X(MF_EVENT_DO_THINNING), @@ -1829,6 +1858,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_TOPOLOGY_HARDWARE_MODE), X(MF_SOURCE_READER_DISABLE_DXVA), X(MF_MT_FORWARD_CUSTOM_NALU), + X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE10), X(MF_TOPONODE_ERROR_MAJORTYPE), X(MF_MT_SECURE), X(MFT_FIELDOFUSE_UNLOCK_Attribute),

1 0

Nikolay Sivov : include: Add IMFMediaEngineEx definition.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 38aeedcc80b53d98ac52b5a8ecf225025f82bb5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=38aeedcc80b53d98ac52b5a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 25 21:57:47 2020 +0300 include: Add IMFMediaEngineEx definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfmediaengine.idl | 73 +++++++++++++++++++++++++++++++++++++++++++++++ include/mftransform.idl | 6 ++++ 2 files changed, 79 insertions(+) diff --git a/include/mfmediaengine.idl b/include/mfmediaengine.idl index 556d2fba2b..e5d91a5732 100644 --- a/include/mfmediaengine.idl +++ b/include/mfmediaengine.idl @@ -194,6 +194,79 @@ interface IMFMediaEngine : IUnknown HRESULT OnVideoStreamTick([out] LONGLONG *time); } +typedef enum MF_MEDIA_ENGINE_STATISTIC +{ + MF_MEDIA_ENGINE_STATISTIC_FRAMES_RENDERED, + MF_MEDIA_ENGINE_STATISTIC_FRAMES_DROPPED, + MF_MEDIA_ENGINE_STATISTIC_BYTES_DOWNLOADED, + MF_MEDIA_ENGINE_STATISTIC_BUFFER_PROGRESS, + MF_MEDIA_ENGINE_STATISTIC_FRAMES_PER_SECOND, + MF_MEDIA_ENGINE_STATISTIC_PLAYBACK_JITTER, + MF_MEDIA_ENGINE_STATISTIC_FRAMES_CORRUPTED, + MF_MEDIA_ENGINE_STATISTIC_TOTAL_FRAME_DELAY, +} MF_MEDIA_ENGINE_STATISTIC; + +typedef enum MF_MEDIA_ENGINE_S3D_PACKING_MODE +{ + MF_MEDIA_ENGINE_S3D_PACKING_MODE_NONE, + MF_MEDIA_ENGINE_S3D_PACKING_MODE_SIDE_BY_SIDE, + MF_MEDIA_ENGINE_S3D_PACKING_MODE_TOP_BOTTOM +} MF_MEDIA_ENGINE_S3D_PACKING_MODE; + +typedef enum MF_MEDIA_ENGINE_SEEK_MODE +{ + MF_MEDIA_ENGINE_SEEK_MODE_NORMAL, + MF_MEDIA_ENGINE_SEEK_MODE_APPROXIMATE, +} MF_MEDIA_ENGINE_SEEK_MODE; + +[ + object, + uuid(83015ead-b1e6-40d0-a98a-37145ffe1ad1), + local, + pointer_default(unique) +] +interface IMFMediaEngineEx : IMFMediaEngine +{ + HRESULT SetSourceFromByteStream([in] IMFByteStream *bytestream, [in] BSTR url); + HRESULT GetStatistics([in] MF_MEDIA_ENGINE_STATISTIC stat_id, [out] PROPVARIANT *stat); + HRESULT UpdateVideoStream([in] const MFVideoNormalizedRect *src, + [in] const RECT *dst, [in] const MFARGB *border_color); + double GetBalance(); + HRESULT SetBalance([in] double balance); + BOOL IsPlaybackRateSupported([in] double rate); + HRESULT FrameStep([in] BOOL forward); + HRESULT GetResourceCharacteristics([out] DWORD *flags); + HRESULT GetPresentationAttribute([in] REFGUID attribute, [out] PROPVARIANT *value); + HRESULT GetNumberOfStreams([out] DWORD *stream_count); + HRESULT GetStreamAttribute([in] DWORD stream_index, [in] REFGUID attribute, [out] PROPVARIANT *value); + HRESULT GetStreamSelection([in] DWORD stream_index, [out] BOOL *enabled); + HRESULT SetStreamSelection([in] DWORD stream_index, [in] BOOL enabled); + HRESULT ApplyStreamSelections(); + HRESULT IsProtected([out] BOOL *protected); + HRESULT InsertVideoEffect([in] IUnknown *effect, [in] BOOL is_optional); + HRESULT InsertAudioEffect([in] IUnknown *effect, [in] BOOL is_optional); + HRESULT RemoveAllEffects(); + HRESULT SetTimelineMarkerTimer([in] double timeout); + HRESULT GetTimelineMarkerTimer([out] double *timeout); + HRESULT CancelTimelineMarkerTimer(); + BOOL IsStereo3D(); + HRESULT GetStereo3DFramePackingMode([out] MF_MEDIA_ENGINE_S3D_PACKING_MODE *mode); + HRESULT SetStereo3DFramePackingMode([in] MF_MEDIA_ENGINE_S3D_PACKING_MODE mode); + HRESULT GetStereo3DRenderMode([out] MF3DVideoOutputType *output_type); + HRESULT SetStereo3DRenderMode([in] MF3DVideoOutputType output_type); + HRESULT EnableWindowlessSwapchainMode([in] BOOL enable); + HRESULT GetVideoSwapchainHandle([out] HANDLE *swapchain); + HRESULT EnableHorizontalMirrorMode([in] BOOL enable); + HRESULT GetAudioStreamCategory([out] UINT32 *category); + HRESULT SetAudioStreamCategory([in] UINT32 category); + HRESULT GetAudioEndpointRole([out] UINT32 *role); + HRESULT SetAudioEndpointRole([in] UINT32 role); + HRESULT GetRealTimeMode([out] BOOL *enabled); + HRESULT SetRealTimeMode([in] BOOL enable); + HRESULT SetCurrentTimeEx([in] double seektime, [in] MF_MEDIA_ENGINE_SEEK_MODE mode); + HRESULT EnableTimeUpdateTimer([in] BOOL enable); +} + [ object, uuid(4d645ace-26aa-4688-9be1-df3516990b93), diff --git a/include/mftransform.idl b/include/mftransform.idl index 6b9c79572a..1b402a5cc7 100644 --- a/include/mftransform.idl +++ b/include/mftransform.idl @@ -107,6 +107,12 @@ enum _MFT_DRAIN_TYPE MFT_DRAIN_NO_TAILS = 0x00000001 }; +typedef enum _MF3DVideoOutputType +{ + MF3DVideoOutputType_BaseView, + MF3DVideoOutputType_Stereo +} MF3DVideoOutputType; + typedef struct _MFT_INPUT_STREAM_INFO { LONGLONG hnsMaxLatency;

1 0

Paul Gofman : ntoskrnl.exe: Return zero for unknown msr registers.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 6ceb6c7f47c225c117dd514ffdb15a0cb4317753 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ceb6c7f47c225c117dd514f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 25 11:19:30 2020 +0300 ntoskrnl.exe: Return zero for unknown msr registers. rdmsr should fault if called with the register not supported by CPU. But until we want to support the full range of CPU specific registers returning zero is probably a better fallback. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/instr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 68140c09ef..44f2ed4f51 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -815,7 +815,11 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) context->Rax = (ULONG)syscall_address; break; } - default: return ExceptionContinueSearch; + default: + FIXME("reg %#x, returning 0.\n", reg); + context->Rdx = 0; + context->Rax = 0; + break; } context->Rip += prefixlen + 2; return ExceptionContinueExecution;

1 0

Aaro Altonen : msado15: Implement _Command get/put CommandType.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 6255b031af691988f96c4e648c4f0975575f0487 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6255b031af691988f96c4e64… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Mon May 25 17:01:30 2020 +0300 msado15: Implement _Command get/put CommandType. Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/command.c | 34 ++++++++++++++++++++++++++++------ dlls/msado15/tests/msado15.c | 13 +++++++++++++ 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index a96fd73990..9081f1554f 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -31,8 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct command { - _Command Command_iface; - LONG ref; + _Command Command_iface; + LONG ref; + CommandTypeEnum type; }; static inline struct command *impl_from_Command( _Command *iface ) @@ -193,14 +194,34 @@ static HRESULT WINAPI command_get_Parameters( _Command *iface, Parameters **para static HRESULT WINAPI command_put_CommandType( _Command *iface, CommandTypeEnum type ) { - FIXME( "%p, %d\n", iface, type ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + + TRACE( "%p, %d\n", iface, type ); + + switch (type) + { + case adCmdUnspecified: + case adCmdUnknown: + case adCmdText: + case adCmdTable: + case adCmdStoredProc: + case adCmdFile: + case adCmdTableDirect: + command->type = type; + return S_OK; + } + + return MAKE_ADO_HRESULT( adErrInvalidArgument ); } static HRESULT WINAPI command_get_CommandType( _Command *iface, CommandTypeEnum *type ) { - FIXME( "%p, %p\n", iface, type ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + + TRACE( "%p, %p\n", iface, type ); + + *type = command->type; + return S_OK; } static HRESULT WINAPI command_get_Name(_Command *iface, BSTR *name) @@ -305,6 +326,7 @@ HRESULT Command_create( void **obj ) if (!(command = heap_alloc( sizeof(*command) ))) return E_OUTOFMEMORY; command->Command_iface.lpVtbl = &command_vtbl; + command->type = adCmdUnknown; command->ref = 1; *obj = &command->Command_iface; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index fb77936bba..b17430a93d 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -742,6 +742,7 @@ static void test_Command(void) _ADO *ado; Command15 *command15; Command25 *command25; + CommandTypeEnum cmd_type = adCmdUnspecified; hr = CoCreateInstance( &CLSID_Command, NULL, CLSCTX_INPROC_SERVER, &IID__Command, (void **)&command ); ok( hr == S_OK, "got %08x\n", hr ); @@ -758,6 +759,18 @@ static void test_Command(void) ok( hr == S_OK, "got %08x\n", hr ); Command25_Release( command25 ); + hr = _Command_get_CommandType( command, &cmd_type ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cmd_type == adCmdUnknown, "got %08x\n", cmd_type ); + + _Command_put_CommandType( command, adCmdText ); + hr = _Command_get_CommandType( command, &cmd_type ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cmd_type == adCmdText, "got %08x\n", cmd_type ); + + hr = _Command_put_CommandType( command, 0xdeadbeef ); + ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08x\n", hr ); + _Command_Release( command ); }

1 0

Alexandre Julliard : server: Update shared user data timestamps on every request.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 1ae10889647c1c84c36660749508a42e99e64a5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ae10889647c1c84c3666074… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 25 20:25:50 2020 +0200 server: Update shared user data timestamps on every request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 50 +++++++++++++++++++++++++++++++++++++++++++---- server/file.h | 1 + server/mapping.c | 59 ++++---------------------------------------------------- 3 files changed, 51 insertions(+), 59 deletions(-) diff --git a/server/fd.c b/server/fd.c index 39fb419f25..06d1d81bdb 100644 --- a/server/fd.c +++ b/server/fd.c @@ -104,6 +104,7 @@ #include "winternl.h" #include "winioctl.h" +#include "ddk/wdm.h" #if defined(HAVE_SYS_EPOLL_H) && defined(HAVE_EPOLL_CREATE) # include <sys/epoll.h> @@ -374,6 +375,46 @@ static struct list rel_timeout_list = LIST_INIT(rel_timeout_list); /* sorted rel timeout_t current_time; timeout_t monotonic_time; +struct _KUSER_SHARED_DATA *user_shared_data = NULL; +static const int user_shared_data_timeout = 16; + +static void set_user_shared_data_time(void) +{ + timeout_t tick_count = monotonic_time / 10000; + + /* on X86 there should be total store order guarantees, so volatile is enough + * to ensure the stores aren't reordered by the compiler, and then they will + * always be seen in-order from other CPUs. On other archs, we need atomic + * intrinsics to guarantee that. */ +#if defined(__i386__) || defined(__x86_64__) + user_shared_data->SystemTime.High2Time = current_time >> 32; + user_shared_data->SystemTime.LowPart = current_time; + user_shared_data->SystemTime.High1Time = current_time >> 32; + + user_shared_data->InterruptTime.High2Time = monotonic_time >> 32; + user_shared_data->InterruptTime.LowPart = monotonic_time; + user_shared_data->InterruptTime.High1Time = monotonic_time >> 32; + + user_shared_data->TickCount.High2Time = tick_count >> 32; + user_shared_data->TickCount.LowPart = tick_count; + user_shared_data->TickCount.High1Time = tick_count >> 32; + *(volatile ULONG *)&user_shared_data->TickCountLowDeprecated = tick_count; +#else + __atomic_store_n(&user_shared_data->SystemTime.High2Time, current_time >> 32, __ATOMIC_SEQ_CST); + __atomic_store_n(&user_shared_data->SystemTime.LowPart, current_time, __ATOMIC_SEQ_CST); + __atomic_store_n(&user_shared_data->SystemTime.High1Time, current_time >> 32, __ATOMIC_SEQ_CST); + + __atomic_store_n(&user_shared_data->InterruptTime.High2Time, monotonic_time >> 32, __ATOMIC_SEQ_CST); + __atomic_store_n(&user_shared_data->InterruptTime.LowPart, monotonic_time, __ATOMIC_SEQ_CST); + __atomic_store_n(&user_shared_data->InterruptTime.High1Time, monotonic_time >> 32, __ATOMIC_SEQ_CST); + + __atomic_store_n(&user_shared_data->TickCount.High2Time, tick_count >> 32, __ATOMIC_SEQ_CST); + __atomic_store_n(&user_shared_data->TickCount.LowPart, tick_count, __ATOMIC_SEQ_CST); + __atomic_store_n(&user_shared_data->TickCount.High1Time, tick_count >> 32, __ATOMIC_SEQ_CST); + __atomic_store_n(&user_shared_data->TickCountLowDeprecated, tick_count, __ATOMIC_SEQ_CST); +#endif +} + void set_current_time(void) { static const timeout_t ticks_1601_to_1970 = (timeout_t)86400 * (369 * 365 + 89) * TICKS_PER_SEC; @@ -381,6 +422,7 @@ void set_current_time(void) gettimeofday( &now, NULL ); current_time = (timeout_t)now.tv_sec * TICKS_PER_SEC + now.tv_usec * 10 + ticks_1601_to_1970; monotonic_time = monotonic_counter(); + if (user_shared_data) set_user_shared_data_time(); } /* add a timeout user */ @@ -865,10 +907,11 @@ static void remove_poll_user( struct fd *fd, int user ) /* process pending timeouts and return the time until the next timeout, in milliseconds */ static int get_next_timeout(void) { + int ret = user_shared_data ? user_shared_data_timeout : -1; + if (!list_empty( &abs_timeout_list ) || !list_empty( &rel_timeout_list )) { struct list expired_list, *ptr; - int ret = -1; /* first remove all expired timers from the list */ @@ -911,7 +954,7 @@ static int get_next_timeout(void) struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); int diff = (timeout->when - current_time + 9999) / 10000; if (diff < 0) diff = 0; - ret = diff; + if (ret == -1 || diff < ret) ret = diff; } if ((ptr = list_head( &rel_timeout_list )) != NULL) @@ -921,9 +964,8 @@ static int get_next_timeout(void) if (diff < 0) diff = 0; if (ret == -1 || diff < ret) ret = diff; } - return ret; } - return -1; /* no pending timeouts */ + return ret; } /* server main poll() loop */ diff --git a/server/file.h b/server/file.h index 4c454de4d4..aa5f6216c2 100644 --- a/server/file.h +++ b/server/file.h @@ -130,6 +130,7 @@ static inline struct fd *get_obj_fd( struct object *obj ) { return obj->ops->get struct timeout_user; extern timeout_t current_time; extern timeout_t monotonic_time; +extern struct _KUSER_SHARED_DATA *user_shared_data; #define TICKS_PER_SEC 10000000 diff --git a/server/mapping.c b/server/mapping.c index ffd20450df..0fcada7f8f 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -945,66 +945,15 @@ int get_page_size(void) return page_mask + 1; } -static KSHARED_USER_DATA *kusd = MAP_FAILED; -static const timeout_t kusd_timeout = 16 * -TICKS_PER_SEC / 1000; - -static void kusd_set_current_time( void *private ) -{ - ULONG system_time_high = current_time >> 32; - ULONG system_time_low = current_time & 0xffffffff; - ULONG interrupt_time_high = monotonic_time >> 32; - ULONG interrupt_time_low = monotonic_time & 0xffffffff; - ULONG tick_count_high = (monotonic_time * 1000 / TICKS_PER_SEC) >> 32; - ULONG tick_count_low = (monotonic_time * 1000 / TICKS_PER_SEC) & 0xffffffff; - KSHARED_USER_DATA *ptr = kusd; - - add_timeout_user( kusd_timeout, kusd_set_current_time, NULL ); - - /* on X86 there should be total store order guarantees, so volatile is enough - * to ensure the stores aren't reordered by the compiler, and then they will - * always be seen in-order from other CPUs. On other archs, we need atomic - * intrinsics to guarantee that. */ -#if defined(__i386__) || defined(__x86_64__) - ptr->SystemTime.High2Time = system_time_high; - ptr->SystemTime.LowPart = system_time_low; - ptr->SystemTime.High1Time = system_time_high; - - ptr->InterruptTime.High2Time = interrupt_time_high; - ptr->InterruptTime.LowPart = interrupt_time_low; - ptr->InterruptTime.High1Time = interrupt_time_high; - - ptr->TickCount.High2Time = tick_count_high; - ptr->TickCount.LowPart = tick_count_low; - ptr->TickCount.High1Time = tick_count_high; - *(volatile ULONG *)&ptr->TickCountLowDeprecated = tick_count_low; -#else - __atomic_store_n(&ptr->SystemTime.High2Time, system_time_high, __ATOMIC_SEQ_CST); - __atomic_store_n(&ptr->SystemTime.LowPart, system_time_low, __ATOMIC_SEQ_CST); - __atomic_store_n(&ptr->SystemTime.High1Time, system_time_high, __ATOMIC_SEQ_CST); - - __atomic_store_n(&ptr->InterruptTime.High2Time, interrupt_time_high, __ATOMIC_SEQ_CST); - __atomic_store_n(&ptr->InterruptTime.LowPart, interrupt_time_low, __ATOMIC_SEQ_CST); - __atomic_store_n(&ptr->InterruptTime.High1Time, interrupt_time_high, __ATOMIC_SEQ_CST); - - __atomic_store_n(&ptr->TickCount.High2Time, tick_count_high, __ATOMIC_SEQ_CST); - __atomic_store_n(&ptr->TickCount.LowPart, tick_count_low, __ATOMIC_SEQ_CST); - __atomic_store_n(&ptr->TickCount.High1Time, tick_count_high, __ATOMIC_SEQ_CST); - __atomic_store_n(&ptr->TickCountLowDeprecated, tick_count_low, __ATOMIC_SEQ_CST); -#endif -} - void init_kusd_mapping( struct mapping *mapping ) { - if (kusd != MAP_FAILED) return; + void *ptr; + if (user_shared_data) return; grab_object( mapping ); make_object_static( &mapping->obj ); - - if ((kusd = mmap( NULL, mapping->size, PROT_WRITE, MAP_SHARED, - get_unix_fd( mapping->fd ), 0 )) == MAP_FAILED) - set_error( STATUS_NO_MEMORY ); - else - kusd_set_current_time( NULL ); + ptr = mmap( NULL, mapping->size, PROT_WRITE, MAP_SHARED, get_unix_fd( mapping->fd ), 0 ); + if (ptr != MAP_FAILED) user_shared_data = ptr; } /* create a file mapping */

1 0

Jacek Caban : rpcndr.h: Avoid error_status_t redefinition.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 4444d19ee37cfc20504dae2ea807458367410544 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4444d19ee37cfc20504dae2e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 25 19:43:55 2020 +0200 rpcndr.h: Avoid error_status_t redefinition. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/rpcndr.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/rpcndr.h b/include/rpcndr.h index 27b9096827..13711f2f2d 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -444,7 +444,11 @@ typedef struct _FULL_PTR_XLAT_TABLES { struct IRpcStubBuffer; +#ifndef _ERROR_STATUS_T_DEFINED typedef ULONG error_status_t; +#define _ERROR_STATUS_T_DEFINED +#endif + typedef void * NDR_CCONTEXT; typedef struct _SCONTEXT_QUEUE {

1 0

Paul Gofman : ntdll: Fill ActiveGroupCount field in _KUSER_SHARED_DATA.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: ca56ef6739383350f2bff6a8be174e1181ed6e1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca56ef6739383350f2bff6a8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 25 18:42:02 2020 +0300 ntdll: Fill ActiveGroupCount field in _KUSER_SHARED_DATA. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 3 +++ dlls/ntdll/thread.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 59c2224816..beab744178 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -531,6 +531,9 @@ static void test_user_shared_data(void) ok(user_shared_data->ActiveProcessorCount == NtCurrentTeb()->Peb->NumberOfProcessors || broken(!user_shared_data->ActiveProcessorCount) /* before Win7 */, "Got unexpected ActiveProcessorCount %u.\n", user_shared_data->ActiveProcessorCount); + ok(user_shared_data->ActiveGroupCount == 1 + || broken(!user_shared_data->ActiveGroupCount) /* before Win7 */, + "Got unexpected ActiveGroupCount %u.\n", user_shared_data->ActiveGroupCount); } START_TEST(virtual) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 78574d0c5d..3d370f7a98 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -239,6 +239,7 @@ static void fill_user_shared_data( struct _KUSER_SHARED_DATA *data ) break; } data->ActiveProcessorCount = NtCurrentTeb()->Peb->NumberOfProcessors; + data->ActiveGroupCount = 1; } HANDLE user_shared_data_init_done(void)

1 0

Paul Gofman : ntdll: Fill ActiveProcessorCount field in _KUSER_SHARED_DATA.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 1306bd941b7052a97910795a86aeae873f4fcb08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1306bd941b7052a97910795a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 25 18:42:01 2020 +0300 ntdll: Fill ActiveProcessorCount field in _KUSER_SHARED_DATA. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 3 +++ dlls/ntdll/thread.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 3b0d74daeb..59c2224816 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -528,6 +528,9 @@ static void test_user_shared_data(void) ok(user_shared_data->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] /* Supported since Pentium CPUs. */, "_RDTSC not available.\n"); #endif + ok(user_shared_data->ActiveProcessorCount == NtCurrentTeb()->Peb->NumberOfProcessors + || broken(!user_shared_data->ActiveProcessorCount) /* before Win7 */, + "Got unexpected ActiveProcessorCount %u.\n", user_shared_data->ActiveProcessorCount); } START_TEST(virtual) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 19e09c7e38..78574d0c5d 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -238,6 +238,7 @@ static void fill_user_shared_data( struct _KUSER_SHARED_DATA *data ) features[PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE] = !!(sci.FeatureSet & CPU_FEATURE_ARM_V8_CRYPTO); break; } + data->ActiveProcessorCount = NtCurrentTeb()->Peb->NumberOfProcessors; } HANDLE user_shared_data_init_done(void)

1 0

Paul Gofman : include/ddk: Fix struct _KUSER_SHARED_DATA definition.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 0def647b6e5d9dc1648b0021e6a7a40bfdaaf2fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=0def647b6e5d9dc1648b0021… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 25 18:42:00 2020 +0300 include/ddk: Fix struct _KUSER_SHARED_DATA definition. HeapTracingPid, CritSecTracingPid are present in NT 6.0. But NT 6.0 has UserModeGlobalLogger array size of 8 instead of 16. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 790d1a1247..1f80a5af29 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1258,8 +1258,6 @@ typedef struct _KUSER_SHARED_DATA { ULONG EnclaveFeatureMask[4]; /* 0x36c */ ULONG TelemetryCoverageRound; /* 0x37c */ USHORT UserModeGlobalLogger[16]; /* 0x380 */ - ULONG HeapTracingPid[2]; /* 0x390 */ - ULONG CritSecTracingPid[2]; /* 0x398 */ ULONG ImageFileExecutionOptions; /* 0x3a0 */ ULONG LangGenerationCount; /* 0x3a4 */ ULONG ActiveProcessorAffinity; /* 0x3a8 */

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2020