wine-commits August 2019

wine-commits@winehq.org

2 participants
703 discussions

Zhiyi Zhang : winemac.drv: Handle display device change events.
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: b8415e0310595d239b5bcef4e74efd1f0972fac0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8415e0310595d239b5bcef4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 29 16:11:41 2019 -0500 winemac.drv: Handle display device change events. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 8 ++++++-- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_main.c | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index a953e0c..236f63d 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -946,6 +946,8 @@ better: SendMessageW(GetDesktopWindow(), WM_MACDRV_UPDATE_DESKTOP_RECT, mode_bpp, MAKELPARAM(width, height)); ret = DISP_CHANGE_SUCCESSFUL; + + macdrv_init_display_devices(TRUE); } else { @@ -1452,6 +1454,8 @@ void macdrv_displays_changed(const macdrv_event *event) free_display_mode_descriptor(desc); CGDisplayModeRelease(mode); + macdrv_init_display_devices(TRUE); + if (is_original && retina_enabled) { width *= 2; @@ -1728,7 +1732,7 @@ static void cleanup_devices(void) * * Initialize display device registry data. */ -void macdrv_init_display_devices(void) +void macdrv_init_display_devices(BOOL force) { static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; @@ -1755,7 +1759,7 @@ void macdrv_init_display_devices(void) } /* Avoid unnecessary reinit */ - if (disposition != REG_CREATED_NEW_KEY) + if (!force && disposition != REG_CREATED_NEW_KEY) goto done; TRACE("\n"); diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index b9f58b9..a7c0b4c 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -223,7 +223,7 @@ extern void macdrv_status_item_mouse_button(const macdrv_event *event) DECLSPEC_ extern void macdrv_status_item_mouse_move(const macdrv_event *event) DECLSPEC_HIDDEN; extern void check_retina_status(void) DECLSPEC_HIDDEN; -extern void macdrv_init_display_devices(void) DECLSPEC_HIDDEN; +extern void macdrv_init_display_devices(BOOL force) DECLSPEC_HIDDEN; /************************************************************************** * Mac IME driver diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 0385784..694a46b 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -299,7 +299,7 @@ static BOOL process_attach(void) return FALSE; } - macdrv_init_display_devices(); + macdrv_init_display_devices(FALSE); return TRUE; }

1 0

Zhiyi Zhang : winemac.drv: Add monitor initialization functions.
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: 83a2ff33b316fa3a5751e706996dac25cd602b66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83a2ff33b316fa3a5751e706… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 29 16:11:40 2019 -0500 winemac.drv: Add monitor initialization functions. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 109 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/display.c | 103 ++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/macdrv_cocoa.h | 14 +++++ dlls/winemac.drv/macdrv_main.c | 2 + 4 files changed, 223 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=83a2ff33b316fa3a5751…

1 0

Zhiyi Zhang : winemac.drv: Add adapter initialization functions.
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: 039a7715f30ecc892f80df9c7aae24aa2530a877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=039a7715f30ecc892f80df9c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 29 16:11:39 2019 -0500 winemac.drv: Add adapter initialization functions. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 99 +++++++++++++++++++++++++++++ dlls/winemac.drv/display.c | 134 +++++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/macdrv_cocoa.h | 15 +++++ 3 files changed, 241 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=039a7715f30ecc892f80…

1 0

Zhiyi Zhang : winemac.drv: Support GPU initialization via Metal.
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: 0699089f0ea65c8d66b2cdcdb0731c432720969e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0699089f0ea65c8d66b2cdcd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 29 16:11:38 2019 -0500 winemac.drv: Support GPU initialization via Metal. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 117 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index b8f2730..68ea897 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -18,7 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #import <AppKit/AppKit.h> +#ifdef HAVE_METAL_METAL_H +#import <Metal/Metal.h> +#endif #include "macdrv_cocoa.h" @@ -227,6 +232,113 @@ done: return ret; } +#ifdef HAVE_METAL_METAL_H + +/*********************************************************************** + * macdrv_get_gpu_info_from_registry_id + * + * Get GPU information from a Metal device registry id. + * + * Returns non-zero value on failure. + */ +static int macdrv_get_gpu_info_from_registry_id(struct macdrv_gpu* gpu, uint64_t registry_id) +{ + int ret; + io_registry_entry_t entry; + + entry = IOServiceGetMatchingService(kIOMasterPortDefault, IORegistryEntryIDMatching(registry_id)); + ret = macdrv_get_gpu_info_from_entry(gpu, entry); + IOObjectRelease(entry); + return ret; +} + +/*********************************************************************** + * macdrv_get_gpus_from_metal + * + * Get a list of GPUs from Metal. + * + * Returns non-zero value on failure with parameters unchanged and zero on success. + */ +static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) +{ + struct macdrv_gpu* gpus = NULL; + struct macdrv_gpu primary_gpu; + id<MTLDevice> primary_device; + BOOL hide_integrated = FALSE; + int primary_index = 0, i; + int gpu_count = 0; + int ret = -1; + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + + /* Test if Metal is available */ + if (&MTLCopyAllDevices == NULL) + goto done; + NSArray<id<MTLDevice>>* devices = [MTLCopyAllDevices() autorelease]; + if (!devices.count || ![devices[0] respondsToSelector:@selector(registryID)]) + goto done; + + gpus = calloc(devices.count, sizeof(*gpus)); + if (!gpus) + goto done; + + /* Use MTLCreateSystemDefaultDevice instead of CGDirectDisplayCopyCurrentMetalDevice(CGMainDisplayID()) to get + * the primary GPU because we need to hide the integrated GPU for an automatic graphic switching pair to avoid apps + * using the integrated GPU. This is the behavior of Windows on a Mac. */ + primary_device = [MTLCreateSystemDefaultDevice() autorelease]; + if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, primary_device.registryID)) + goto done; + + /* Hide the integrated GPU if the system default device is a dedicated GPU */ + if (!primary_device.isLowPower) + { + hide_integrated = TRUE; + } + + for (i = 0; i < devices.count; i++) + { + if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], devices[i].registryID)) + goto done; + + if (hide_integrated && devices[i].isLowPower) + { + continue; + } + + if (gpus[gpu_count].id == primary_gpu.id) + primary_index = gpu_count; + + gpu_count++; + } + + /* Make sure the first GPU is primary */ + if (primary_index) + { + struct macdrv_gpu tmp; + tmp = gpus[0]; + gpus[0] = gpus[primary_index]; + gpus[primary_index] = tmp; + } + + *new_gpus = gpus; + *count = gpu_count; + ret = 0; +done: + if (ret) + macdrv_free_gpus(gpus); + [pool release]; + return ret; +} + +#else + +static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) +{ + TRACE("Metal support not compiled in\n"); + return -1; +} + +#endif + /*********************************************************************** * macdrv_get_gpu_info_from_display_id * @@ -348,7 +460,10 @@ done: */ int macdrv_get_gpus(struct macdrv_gpu** new_gpus, int* count) { - return macdrv_get_gpus_from_iokit(new_gpus, count); + if (!macdrv_get_gpus_from_metal(new_gpus, count)) + return 0; + else + return macdrv_get_gpus_from_iokit(new_gpus, count); } /***********************************************************************

1 0

Zhiyi Zhang : winemac.drv: Add GPU initialization functions.
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: d8d1fe486b4a5ebd3b8b14ee097cd6588c737c58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8d1fe486b4a5ebd3b8b14ee… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 29 16:11:37 2019 -0500 winemac.drv: Add GPU initialization functions. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/Makefile.in | 2 +- dlls/winemac.drv/cocoa_display.m | 258 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/display.c | 206 +++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 17 +++ 5 files changed, 483 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8d1fe486b4a5ebd3b8b…

1 0

Alexandre Julliard : mfplat: Fix a GUID name.
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: 7f87c89227bf733f0948848f63ddc8e063b112e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f87c89227bf733f0948848f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 30 20:06:52 2019 +0200 mfplat: Fix a GUID name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 2 +- include/mfapi.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index d213935..5cbf121 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -681,7 +681,7 @@ const char *debugstr_attr(const GUID *guid) X(MFSampleExtension_3DVideo_SampleFormat), X(MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET), X(MF_MT_SAMPLE_SIZE), - X(MF_MT_AAC_PAYLOAD_TIME), + X(MF_MT_AAC_PAYLOAD_TYPE), X(MF_TOPOLOGY_PLAYBACK_FRAMERATE), X(MF_SOURCE_READER_D3D11_BIND_FLAGS), X(MF_MT_AUDIO_FOLDDOWN_MATRIX), diff --git a/include/mfapi.h b/include/mfapi.h index f84c051..1a8fa25 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -261,7 +261,7 @@ DEFINE_GUID(MF_MT_AUDIO_WMADRC_AVGREF, 0x9d62927f, 0x36be, 0x4cf DEFINE_GUID(MF_MT_AUDIO_WMADRC_AVGTARGET, 0x9d629280, 0x36be, 0x4cf2, 0xb5, 0xc4, 0xa3, 0x92, 0x6e, 0x3e, 0x87, 0x11); DEFINE_GUID(MF_MT_AUDIO_PREFER_WAVEFORMATEX, 0xa901aaba, 0xe037, 0x458a, 0xbd, 0xf6, 0x54, 0x5b, 0xe2, 0x07, 0x40, 0x42); DEFINE_GUID(MF_MT_AUDIO_FLAC_MAX_BLOCK_SIZE, 0x8b81adae, 0x4b5a, 0x4d40, 0x80, 0x22, 0xf3, 0x8d, 0x09, 0xca, 0x3c, 0x5c); -DEFINE_GUID(MF_MT_AAC_PAYLOAD_TIME, 0xbfbabe79, 0x7434, 0x4d1c, 0x94, 0xf0, 0x72, 0xa3, 0xb9, 0xe1, 0x71, 0x88); +DEFINE_GUID(MF_MT_AAC_PAYLOAD_TYPE, 0xbfbabe79, 0x7434, 0x4d1c, 0x94, 0xf0, 0x72, 0xa3, 0xb9, 0xe1, 0x71, 0x88); DEFINE_GUID(MF_MT_AAC_AUDIO_PROFILE_LEVEL_INDICATION, 0x7632f0e6, 0x9538, 0x4d61, 0xac, 0xda, 0xea, 0x29, 0xc8, 0xc1, 0x44, 0x56); DEFINE_GUID(MFT_CATEGORY_VIDEO_DECODER, 0xd6c02d4b, 0x6833, 0x45b4, 0x97, 0x1a, 0x05, 0xa4, 0xb0, 0x4b, 0xab, 0x91);

1 0

Jactry Zeng : mfmediaengine: Add MFMediaEngineClassFactory stub.
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: 3a3ace8b067b1c9a6d505d4b8369a03ae801b3c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a3ace8b067b1c9a6d505d4b… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Aug 29 23:50:41 2019 +0800 mfmediaengine: Add MFMediaEngineClassFactory stub. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/mfmediaengine/Makefile.in | 5 + dlls/mfmediaengine/main.c | 141 +++++++++++++++++++++++++++++ dlls/mfmediaengine/mediaengine.idl | 26 ++++++ dlls/mfmediaengine/mediaengine_classes.idl | 26 ++++++ dlls/mfmediaengine/mfmediaengine.spec | 4 +- dlls/mfmediaengine/tests/Makefile.in | 5 + dlls/mfmediaengine/tests/mfmediaengine.c | 65 +++++++++++++ 9 files changed, 272 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a3ace8b067b1c9a6d50…

1 0

Jactry Zeng : mfuuid: Import mfmediaengine.h.
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: 05aa1053551f320ff96e387070eff855caa80111 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05aa1053551f320ff96e3870… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Aug 29 23:50:27 2019 +0800 mfuuid: Import mfmediaengine.h. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfuuid/mfuuid.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mfuuid/mfuuid.c b/dlls/mfuuid/mfuuid.c index 5bfd521..c4976d7 100644 --- a/dlls/mfuuid/mfuuid.c +++ b/dlls/mfuuid/mfuuid.c @@ -31,3 +31,4 @@ #include "mfapi.h" #include "mfidl.h" #include "mfreadwrite.h" +#include "mfmediaengine.h"

1 0

Jactry Zeng : include: Add mfmediaengine.idl.
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: b5e0e004108c00bedc50f232a57653ee31464dd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5e0e004108c00bedc50f232… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Aug 29 23:50:13 2019 +0800 include: Add mfmediaengine.idl. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/mfmediaengine.idl | 168 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 94dd8a0..47a36ff 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -371,6 +371,7 @@ SOURCES = \ mfapi.h \ mferror.h \ mfidl.idl \ + mfmediaengine.idl \ mfobjects.idl \ mfplay.idl \ mfreadwrite.idl \ diff --git a/include/mfmediaengine.idl b/include/mfmediaengine.idl new file mode 100644 index 0000000..940cacc --- /dev/null +++ b/include/mfmediaengine.idl @@ -0,0 +1,168 @@ +/* + * Copyright 2019 Jactry Zeng for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "mfidl.idl"; + +cpp_quote("EXTERN_GUID(CLSID_MFMediaEngineClassFactory, 0xb44392da, 0x499b, 0x446b, 0xa4, 0xcb, 0x00, 0x5f, 0xea, 0xd0, 0xe6, 0xd5);") + +typedef enum MF_MEDIA_ENGINE_ERR +{ + MF_MEDIA_ENGINE_ERR_NOERROR, + MF_MEDIA_ENGINE_ERR_ABORTED, + MF_MEDIA_ENGINE_ERR_NETWORK, + MF_MEDIA_ENGINE_ERR_DECODE, + MF_MEDIA_ENGINE_ERR_SRC_NOT_SUPPORTED, + MF_MEDIA_ENGINE_ERR_ENCRYPTED +} MF_MEDIA_ENGINE_ERR; + +typedef enum MF_MEDIA_ENGINE_PRELOAD +{ + MF_MEDIA_ENGINE_PRELOAD_MISSING, + MF_MEDIA_ENGINE_PRELOAD_EMPTY, + MF_MEDIA_ENGINE_PRELOAD_NONE, + MF_MEDIA_ENGINE_PRELOAD_METADATA, + MF_MEDIA_ENGINE_PRELOAD_AUTOMATIC +} MF_MEDIA_ENGINE_PRELOAD; + +typedef enum MF_MEDIA_ENGINE_CANPLAY +{ + MF_MEDIA_ENGINE_CANPLAY_NOT_SUPPORTED, + MF_MEDIA_ENGINE_CANPLAY_MAYBE, + MF_MEDIA_ENGINE_CANPLAY_PROBABLY, +} MF_MEDIA_ENGINE_CANPLAY; + +typedef struct MFVideoNormalizedRect +{ + float left; + float top; + float right; + float bottom; +} MFVideoNormalizedRect; + +[ + object, + uuid(fc0e10d2-ab2a-4501-a951-06bb1075184c), + local, + pointer_default(unique) +] +interface IMFMediaError : IUnknown +{ + USHORT GetErrorCode(); + HRESULT GetExtendedErrorCode(); + HRESULT SetErrorCode([in] MF_MEDIA_ENGINE_ERR error); + HRESULT SetExtendedErrorCode([in] HRESULT error); +} + +[ + object, + uuid(7a5e5354-b114-4c72-b991-3131d75032ea), + local, + pointer_default(unique) +] +interface IMFMediaEngineSrcElements : IUnknown +{ + DWORD GetLength(); + HRESULT GetURL([in] DWORD index, [out] BSTR *url); + HRESULT GetType([in] DWORD index, [out] BSTR *type); + HRESULT GetMedia([in] DWORD index, [out] BSTR *media); + HRESULT AddElement([in] BSTR url, [in] BSTR type, [in] BSTR media); + HRESULT RemoveAllElements(); +} + +[ + object, + uuid(db71a2fc-078a-414e-9df9-8c2531b0aa6c), + local, + pointer_default(unique) +] +interface IMFMediaTimeRange : IUnknown +{ + DWORD GetLength(); + HRESULT GetStart([in] DWORD index, [out] double *start); + HRESULT GetEnd([in] DWORD index, [out] double *end); + BOOL ContainsTime([in] double time); + HRESULT AddRange([in] double start, [in] double end); + HRESULT Clear(); +} + +[ + object, + uuid(98a1b0bb-03eb-4935-ae7c-93c1fa0e1c93), + local, + pointer_default(unique) +] +interface IMFMediaEngine : IUnknown +{ + HRESULT GetError([out] IMFMediaError **error); + HRESULT SetErrorCode([in] MF_MEDIA_ENGINE_ERR error); + HRESULT SetSourceElements([in] IMFMediaEngineSrcElements *elements); + HRESULT SetSource([in] BSTR url); + HRESULT GetCurrentSource([out] BSTR *url); + USHORT GetNetworkState(); + MF_MEDIA_ENGINE_PRELOAD GetPreload(); + HRESULT SetPreload([in] MF_MEDIA_ENGINE_PRELOAD preload); + HRESULT GetBuffered([out] IMFMediaTimeRange **buffered); + HRESULT Load(); + HRESULT CanPlayType([in] BSTR type, [out] MF_MEDIA_ENGINE_CANPLAY *answer); + USHORT GetReadyState(); + BOOL IsSeeking(); + cpp_quote("#undef GetCurrentTime") + double GetCurrentTime(); + HRESULT SetCurrentTime([in] double time); + double GetStartTime(); + double GetDuration(); + BOOL IsPaused(); + double GetDefaultPlaybackRate(); + HRESULT SetDefaultPlaybackRate([in] double rate); + double GetPlaybackRate(); + HRESULT SetPlaybackRate([in] double rate); + HRESULT GetPlayed([out] IMFMediaTimeRange **played); + HRESULT GetSeekable([out] IMFMediaTimeRange **seekable); + BOOL IsEnded(); + BOOL GetAutoPlay(); + HRESULT SetAutoPlay([in] BOOL autoplay); + BOOL GetLoop(); + HRESULT SetLoop([in] BOOL loop); + HRESULT Play(); + HRESULT Pause(); + BOOL GetMuted(); + HRESULT SetMuted([in] BOOL muted); + double GetVolume(); + HRESULT SetVolume([in] double volume); + BOOL HasVideo(); + BOOL HasAudio(); + HRESULT GetNativeVideoSize([out] DWORD *cx, [out] DWORD *cy); + HRESULT GetVideoAspectRatio([out] DWORD *cx, [out] DWORD *cy); + HRESULT Shutdown(); + HRESULT TransferVideoFrame([in] IUnknown *surface, [in] const MFVideoNormalizedRect *src, + [in] const RECT *dst, [in] const MFARGB *color); + HRESULT OnVideoStreamTick([out] LONGLONG *time); +} + +[ + object, + uuid(4d645ace-26aa-4688-9be1-df3516990b93), + local, + pointer_default(unique) +] +interface IMFMediaEngineClassFactory : IUnknown +{ + HRESULT CreateInstance([in] DWORD flags, [in] IMFAttributes *attributes, [out] IMFMediaEngine **engine); + HRESULT CreateTimeRange([out] IMFMediaTimeRange **range); + HRESULT CreateError([out] IMFMediaError **error); +}

1 0

Jactry Zeng : mfmediaengine: Add stub dll.
by Alexandre Julliard 30 Aug '19

30 Aug '19

Module: wine Branch: master Commit: dfbd925f2c9081db528c598d2e3ae3eee731ff0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfbd925f2c9081db528c598d… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Aug 29 23:49:56 2019 +0800 mfmediaengine: Add stub dll. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/mfmediaengine/Makefile.in | 7 +++++++ dlls/mfmediaengine/main.c | 36 +++++++++++++++++++++++++++++++++++ dlls/mfmediaengine/mfmediaengine.spec | 3 +++ 5 files changed, 49 insertions(+) diff --git a/configure b/configure index d04e493..7f7f029 100755 --- a/configure +++ b/configure @@ -1389,6 +1389,7 @@ enable_mciwave enable_mf enable_mf3216 enable_mferror +enable_mfmediaengine enable_mfplat enable_mfplay enable_mfreadwrite @@ -20488,6 +20489,7 @@ wine_fn_config_makefile dlls/mf enable_mf wine_fn_config_makefile dlls/mf/tests enable_tests wine_fn_config_makefile dlls/mf3216 enable_mf3216 wine_fn_config_makefile dlls/mferror enable_mferror +wine_fn_config_makefile dlls/mfmediaengine enable_mfmediaengine wine_fn_config_makefile dlls/mfplat enable_mfplat wine_fn_config_makefile dlls/mfplat/tests enable_tests wine_fn_config_makefile dlls/mfplay enable_mfplay diff --git a/configure.ac b/configure.ac index f1dedf2..34781bf 100644 --- a/configure.ac +++ b/configure.ac @@ -3393,6 +3393,7 @@ WINE_CONFIG_MAKEFILE(dlls/mf) WINE_CONFIG_MAKEFILE(dlls/mf/tests) WINE_CONFIG_MAKEFILE(dlls/mf3216) WINE_CONFIG_MAKEFILE(dlls/mferror) +WINE_CONFIG_MAKEFILE(dlls/mfmediaengine) WINE_CONFIG_MAKEFILE(dlls/mfplat) WINE_CONFIG_MAKEFILE(dlls/mfplat/tests) WINE_CONFIG_MAKEFILE(dlls/mfplay) diff --git a/dlls/mfmediaengine/Makefile.in b/dlls/mfmediaengine/Makefile.in new file mode 100644 index 0000000..1654130 --- /dev/null +++ b/dlls/mfmediaengine/Makefile.in @@ -0,0 +1,7 @@ +MODULE = mfmediaengine.dll +IMPORTLIB = mfmediaengine + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c new file mode 100644 index 0000000..81aaf77 --- /dev/null +++ b/dlls/mfmediaengine/main.c @@ -0,0 +1,36 @@ +/* + * Copyright 2019 Jactry Zeng for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/mfmediaengine/mfmediaengine.spec b/dlls/mfmediaengine/mfmediaengine.spec new file mode 100644 index 0000000..a7e7cb9 --- /dev/null +++ b/dlls/mfmediaengine/mfmediaengine.spec @@ -0,0 +1,3 @@ +@ stub DllCanUnloadNow +@ stub DllGetActivationFactory +@ stub DllGetClassObject

1 0

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 August 2019