wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Rémi Bernon : user32: Return failure when rawinput has been overwritten.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: 359ee2ecc21b08e4118f0f77b3a208e4b5e1e63d URL: https://source.winehq.org/git/wine.git/?a=commit;h=359ee2ecc21b08e4118f0f77… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 25 19:08:44 2020 +0200 user32: Return failure when rawinput has been overwritten. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 3 ++- dlls/user32/tests/input.c | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 775b066e67..b5af008e88 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -459,7 +459,7 @@ UINT WINAPI GetRawInputData(HRAWINPUT rawinput, UINT command, void *data, UINT * TRACE("rawinput %p, command %#x, data %p, data_size %p, header_size %u.\n", rawinput, command, data, data_size, header_size); - if (!ri) + if (!ri || !ri->header.dwSize) return ~0U; if (header_size != sizeof(RAWINPUTHEADER)) @@ -488,6 +488,7 @@ UINT WINAPI GetRawInputData(HRAWINPUT rawinput, UINT command, void *data, UINT * if (*data_size < s) return ~0U; memcpy(data, ri, s); + ri->header.dwSize = 0; return s; } diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 5c58990812..bab0fd9753 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1913,10 +1913,7 @@ static LRESULT CALLBACK rawinputbuffer_wndproc(HWND hwnd, UINT msg, WPARAM wpara ok(ri.data.mouse.lLastX == 6, "Unexpected rawinput data: %d\n", ri.data.mouse.lLastX); } else - { - todo_wine ok(count == ~0U, "GetRawInputData succeeded\n"); - } } return DefWindowProcA(hwnd, msg, wparam, lparam);

1 0

Rémi Bernon : user32: Implement GetRawInputBuffer.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: 3a9edf9aad43c3e8ba724571da5381f821f1dc56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a9edf9aad43c3e8ba724571… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 25 19:08:43 2020 +0200 user32: Implement GetRawInputBuffer. CoD: WWII uses it to read mouse motion instead of listening to WM_INPUT messages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 91 +++++++++++++++++++++++++++++++++++++++++- dlls/user32/tests/input.c | 27 ------------- dlls/user32/user_private.h | 2 +- include/wine/server_protocol.h | 21 +++++++++- server/protocol.def | 10 +++++ server/queue.c | 40 +++++++++++++++++++ server/request.h | 8 ++++ server/trace.c | 16 ++++++++ 8 files changed, 184 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a9edf9aad43c3e8ba72…

1 0

Rémi Bernon : user32: Introduce rawinput_thread_data helper.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: b269354f456b6abde1d01d304f158c0fd924c181 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b269354f456b6abde1d01d30… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 25 19:08:42 2020 +0200 user32: Introduce rawinput_thread_data helper. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 10 +--------- dlls/user32/rawinput.c | 9 +++++++++ dlls/user32/user_private.h | 7 ++++++- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 89ffa07f70..c5c7db667c 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2286,15 +2286,7 @@ static void accept_hardware_message( UINT hw_id, BOOL remove ) static BOOL process_rawinput_message( MSG *msg, const struct hardware_msg_data *msg_data ) { - struct user_thread_info *thread_info = get_user_thread_info(); - RAWINPUT *rawinput = thread_info->rawinput; - - if (!rawinput) - { - thread_info->rawinput = HeapAlloc( GetProcessHeap(), 0, sizeof(*rawinput) ); - if (!(rawinput = thread_info->rawinput)) return FALSE; - } - + RAWINPUT *rawinput = rawinput_thread_data(); if (!rawinput_from_hardware_message(rawinput, msg_data)) return FALSE; diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 56efc09179..1ec6c7bd23 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -223,6 +223,15 @@ static void find_devices(void) } +RAWINPUT *rawinput_thread_data(void) +{ + struct user_thread_info *thread_info = get_user_thread_info(); + RAWINPUT *rawinput = thread_info->rawinput; + if (!rawinput) rawinput = thread_info->rawinput = HeapAlloc( GetProcessHeap(), 0, RAWINPUT_BUFFER_SIZE ); + return rawinput; +} + + BOOL rawinput_from_hardware_message(RAWINPUT *rawinput, const struct hardware_msg_data *msg_data) { rawinput->header.dwType = msg_data->rawinput.type; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 25bbeba6f0..d7f4741ebe 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -169,6 +169,10 @@ struct wm_char_mapping_data MSG get_msg; }; +/* on windows the buffer capacity is quite large as well, enough to */ +/* hold up to 10s of 1kHz mouse rawinput events */ +#define RAWINPUT_BUFFER_SIZE (512*1024) + /* this is the structure stored in TEB->Win32ClientInfo */ /* no attempt is made to keep the layout compatible with the Windows one */ struct user_thread_info @@ -192,7 +196,7 @@ struct user_thread_info struct user_key_state_info *key_state; /* Cache of global key state */ HWND top_window; /* Desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ - RAWINPUT *rawinput; + RAWINPUT *rawinput; /* Rawinput buffer */ }; C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) ); @@ -232,6 +236,7 @@ struct tagWND; struct hardware_msg_data; extern BOOL rawinput_from_hardware_message(RAWINPUT *rawinput, const struct hardware_msg_data *msg_data); +extern RAWINPUT *rawinput_thread_data(void); extern void CLIPBOARD_ReleaseOwner( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL FOCUS_MouseActivate( HWND hwnd ) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : user32: Introduce rawinput_from_hardware_message helper.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: 262ad90d3fb871c38ed3b95c63aa9eaf5d57b28d URL: https://source.winehq.org/git/wine.git/?a=commit;h=262ad90d3fb871c38ed3b95c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 25 19:08:41 2020 +0200 user32: Introduce rawinput_from_hardware_message helper. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 96 +---------------------------------------- dlls/user32/rawinput.c | 105 +++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 3 ++ 3 files changed, 109 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=262ad90d3fb871c38ed3…

1 0

Rémi Bernon : user32/tests: Add GetRawInputBuffer tests.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: 083cb5c783c361f7c271a60cb8e87ac1f609dd70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=083cb5c783c361f7c271a60c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 25 19:08:40 2020 +0200 user32/tests: Add GetRawInputBuffer tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 247 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 247 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=083cb5c783c361f7c271…

1 0

Jefferson Carpenter : ntoskrnl.exe: Set reserved to 0 in pnp WM_DEVICECHANGE broadcast.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: ab6f8ba0d1ad6d3f825f22b2153dc5969dbd97a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab6f8ba0d1ad6d3f825f22b2… Author: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Date: Tue Jun 30 17:10:00 2020 +0000 ntoskrnl.exe: Set reserved to 0 in pnp WM_DEVICECHANGE broadcast. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49488 Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 91b825dffc..6a0e82ec0e 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -782,9 +782,10 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable if ((broadcast = heap_alloc( len ))) { - broadcast->dbcc_size = len; + broadcast->dbcc_size = len; broadcast->dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE; - broadcast->dbcc_classguid = iface->interface_class; + broadcast->dbcc_reserved = 0; + broadcast->dbcc_classguid = iface->interface_class; lstrcpynW( broadcast->dbcc_name, name->Buffer, namelen + 1 ); send_devicechange( enable ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE, broadcast, len ); heap_free( broadcast );

1 0

Francois Gouget : ntoskrnl.exe/tests: Fix some minor case issues in comments.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: 211d495f792599371926c66767b661365afaf052 URL: https://source.winehq.org/git/wine.git/?a=commit;h=211d495f792599371926c667… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 30 16:49:00 2020 +0200 ntoskrnl.exe/tests: Fix some minor case issues in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver4.c | 2 +- dlls/ntoskrnl.exe/tests/utils.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index 48de151f31..45ea90260a 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -1,7 +1,7 @@ /* * ntoskrnl.exe testing framework * - * Copyright 2020 Paul Gofman for Codeweavers + * Copyright 2020 Paul Gofman for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index da0b02ac00..be0f58f837 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -4,7 +4,7 @@ * Copyright 2015 Sebastian Lackner * Copyright 2015 Michael Müller * Copyright 2015 Christian Costa - * Copyright 2020 Paul Gofman for Codeweavers + * Copyright 2020 Paul Gofman for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Gijs Vermeulen : ntdll: Don't use WCHAR in unix_to_win_locale().
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: b6722aa7527abc71cb46ab75e4b875c288408d52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6722aa7527abc71cb46ab75… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Jun 30 16:44:54 2020 +0200 ntdll: Don't use WCHAR in unix_to_win_locale(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 49 +++++++++++++++++++------------------------------ 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index e260e5c338..e57b625689 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -74,8 +74,8 @@ char **main_envp = NULL; static WCHAR **main_wargv; static CPTABLEINFO unix_table; -static WCHAR system_locale[LOCALE_NAME_MAX_LENGTH]; -static WCHAR user_locale[LOCALE_NAME_MAX_LENGTH]; +static char system_locale[LOCALE_NAME_MAX_LENGTH]; +static char user_locale[LOCALE_NAME_MAX_LENGTH]; static void *read_nls_file( const char *name ) { @@ -649,18 +649,11 @@ static WCHAR **build_wargv( char **argv ) /* Unix format is: lang[_country][.charset][@modifier] * Windows format is: lang[-script][-country][_modifier] */ -static BOOL unix_to_win_locale( const char *unix_name, WCHAR *win_name ) +static BOOL unix_to_win_locale( const char *unix_name, char *win_name ) { - static const WCHAR sepW[] = {'_','.','@',0}; - static const WCHAR posixW[] = {'P','O','S','I','X',0}; - static const WCHAR cW[] = {'C',0}; - static const WCHAR euroW[] = {'e','u','r','o',0}; - static const WCHAR latinW[] = {'l','a','t','i','n',0}; - static const WCHAR latnW[] = {'-','L','a','t','n',0}; - static const WCHAR enUSW[] = {'e','n','-','U','S',0}; - WCHAR buffer[LOCALE_NAME_MAX_LENGTH]; - WCHAR *p, *country = NULL, *modifier = NULL; - DWORD len; + static const char sep[] = "_.@"; + char buffer[LOCALE_NAME_MAX_LENGTH]; + char *p, *country = NULL, *modifier = NULL; if (!unix_name || !unix_name[0] || !strcmp( unix_name, "C" )) { @@ -668,16 +661,12 @@ static BOOL unix_to_win_locale( const char *unix_name, WCHAR *win_name ) if (!unix_name || !unix_name[0]) return FALSE; } - len = ntdll_umbstowcs( unix_name, strlen(unix_name), buffer, ARRAY_SIZE(buffer) ); - if (len == ARRAY_SIZE(buffer)) return FALSE; - buffer[len] = 0; - - if (!(p = wcspbrk( buffer, sepW ))) + if (!(p = strpbrk( buffer, sep ))) { - if (!wcscmp( buffer, posixW ) || !wcscmp( buffer, cW )) - wcscpy( win_name, enUSW ); + if (!strcmp( buffer, "POSIX" ) || !strcmp( buffer, "C" )) + strcpy( win_name, "en-US" ); else - wcscpy( win_name, buffer ); + strcpy( win_name, buffer ); return TRUE; } @@ -685,13 +674,13 @@ static BOOL unix_to_win_locale( const char *unix_name, WCHAR *win_name ) { *p++ = 0; country = p; - p = wcspbrk( p, sepW + 1 ); + p = strpbrk( p, sep + 1 ); } if (p && *p == '.') { *p++ = 0; /* charset, ignore */ - p = wcschr( p, '@' ); + p = strchr( p, '@' ); } if (p) { @@ -701,18 +690,18 @@ static BOOL unix_to_win_locale( const char *unix_name, WCHAR *win_name ) /* rebuild a Windows name */ - wcscpy( win_name, buffer ); + strcpy( win_name, buffer ); if (modifier) { - if (!wcscmp( modifier, latinW )) wcscat( win_name, latnW ); - else if (!wcscmp( modifier, euroW )) {} /* ignore */ + if (!strcmp( modifier, "latin" )) strcat( win_name, "-Latn" ); + else if (!strcmp( modifier, "euro" )) {} /* ignore */ else return FALSE; } if (country) { - p = win_name + wcslen(win_name); + p = win_name + strlen(win_name); *p++ = '-'; - wcscpy( p, country ); + strcpy( p, country ); } return TRUE; } @@ -1083,6 +1072,6 @@ void CDECL get_unix_codepage( CPTABLEINFO *table ) */ void CDECL get_locales( WCHAR *sys, WCHAR *user ) { - wcscpy( sys, system_locale ); - wcscpy( user, user_locale ); + ntdll_umbstowcs( system_locale, ARRAY_SIZE(system_locale), sys, LOCALE_NAME_MAX_LENGTH * sizeof(WCHAR) ); + ntdll_umbstowcs( user_locale, ARRAY_SIZE(user_locale), user, LOCALE_NAME_MAX_LENGTH * sizeof(WCHAR) ); }

1 0

Biswapriyo Nath : ntdll/unix: Use Pc instead of Rip in signal_arm64.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: d324014d42bc759b6a6faa594bdecce054e294c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d324014d42bc759b6a6faa59… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Jun 30 20:25:12 2020 +0530 ntdll/unix: Use Pc instead of Rip in signal_arm64. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 2bd6deb04f..b15f64110d 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -149,7 +149,7 @@ static inline struct arm64_thread_data *arm64_thread_data(void) NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) { #ifdef HAVE_LIBUNWIND - ULONG_PTR ip = context->Rip; + ULONG_PTR ip = context->Pc; unw_context_t unw_context; unw_cursor_t cursor; unw_proc_info_t info;

1 0

Nikolay Sivov : evr: Add IMFVideoDisplayControl stub for the presenter.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: 7ae5f06e4722ea8f55eb47c49bf17105bd0db080 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ae5f06e4722ea8f55eb47c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 30 16:34:04 2020 +0300 evr: Add IMFVideoDisplayControl stub for the presenter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 4 ++ 2 files changed, 125 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index db2f85b46f..cbe8b0d2ff 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -36,6 +36,7 @@ struct video_presenter IMFVideoPresenter IMFVideoPresenter_iface; IMFVideoDeviceID IMFVideoDeviceID_iface; IMFTopologyServiceLookupClient IMFTopologyServiceLookupClient_iface; + IMFVideoDisplayControl IMFVideoDisplayControl_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -61,6 +62,11 @@ static struct video_presenter *impl_from_IMFTopologyServiceLookupClient(IMFTopol return CONTAINING_RECORD(iface, struct video_presenter, IMFTopologyServiceLookupClient_iface); } +static struct video_presenter *impl_from_IMFVideoDisplayControl(IMFVideoDisplayControl *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, IMFVideoDisplayControl_iface); +} + static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { struct video_presenter *presenter = impl_from_IUnknown(iface); @@ -84,6 +90,10 @@ static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFI { *obj = &presenter->IMFTopologyServiceLookupClient_iface; } + else if (IsEqualIID(riid, &IID_IMFVideoDisplayControl)) + { + *obj = &presenter->IMFVideoDisplayControl_iface; + } else { WARN("Unimplemented interface %s.\n", debugstr_guid(riid)); @@ -289,6 +299,116 @@ static const IMFTopologyServiceLookupClientVtbl video_presenter_service_client_v video_presenter_service_client_ReleaseServicePointers, }; +static HRESULT WINAPI video_presenter_control_QueryInterface(IMFVideoDisplayControl *iface, REFIID riid, void **obj) +{ + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); + return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); +} + +static ULONG WINAPI video_presenter_control_AddRef(IMFVideoDisplayControl *iface) +{ + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); + return IMFVideoPresenter_AddRef(&presenter->IMFVideoPresenter_iface); +} + +static ULONG WINAPI video_presenter_control_Release(IMFVideoDisplayControl *iface) +{ + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); + return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); +} + +static HRESULT WINAPI video_presenter_control_GetNativeVideoSize(IMFVideoDisplayControl *iface, SIZE *video_size, + SIZE *aspect_ratio) +{ + FIXME("%p, %p, %p.\n", iface, video_size, aspect_ratio); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_control_GetIdealVideoSize(IMFVideoDisplayControl *iface, SIZE *min_size, + SIZE *max_size) +{ + FIXME("%p, %p, %p.\n", iface, min_size, max_size); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_control_SetVideoPosition(IMFVideoDisplayControl *iface, + const MFVideoNormalizedRect *source, const RECT *dest) +{ + FIXME("%p, %p, %p.\n", iface, source, dest); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_control_GetVideoPosition(IMFVideoDisplayControl *iface, MFVideoNormalizedRect *source, + RECT *dest) +{ + FIXME("%p, %p, %p.\n", iface, source, dest); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_control_SetAspectRatioMode(IMFVideoDisplayControl *iface, DWORD mode) +{ + FIXME("%p, %d.\n", iface, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_control_GetAspectRatioMode(IMFVideoDisplayControl *iface, DWORD *mode) +{ + FIXME("%p, %p.\n", iface, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_control_SetVideoWindow(IMFVideoDisplayControl *iface, HWND window) +{ + FIXME("%p, %p.\n", iface, window); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_control_GetVideoWindow(IMFVideoDisplayControl *iface, HWND *window) +{ + FIXME("%p, %p.\n", iface, window); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_control_RepaintVideo(IMFVideoDisplayControl *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayControl *iface, BITMAPINFOHEADER *header, + BYTE **dib, DWORD *dib_size, LONGLONG *timestamp) +{ + FIXME("%p, %p, %p, %p, %p.\n", iface, header, dib, dib_size, timestamp); + + return E_NOTIMPL; +} + +static const IMFVideoDisplayControlVtbl video_presenter_control_vtbl = +{ + video_presenter_control_QueryInterface, + video_presenter_control_AddRef, + video_presenter_control_Release, + video_presenter_control_GetNativeVideoSize, + video_presenter_control_GetIdealVideoSize, + video_presenter_control_SetVideoPosition, + video_presenter_control_GetVideoPosition, + video_presenter_control_SetAspectRatioMode, + video_presenter_control_GetAspectRatioMode, + video_presenter_control_SetVideoWindow, + video_presenter_control_GetVideoWindow, + video_presenter_control_RepaintVideo, + video_presenter_control_GetCurrentImage, +}; + HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -311,6 +431,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) object->IMFVideoPresenter_iface.lpVtbl = &video_presenter_vtbl; object->IMFVideoDeviceID_iface.lpVtbl = &video_presenter_device_id_vtbl; object->IMFTopologyServiceLookupClient_iface.lpVtbl = &video_presenter_service_client_vtbl; + object->IMFVideoDisplayControl_iface.lpVtbl = &video_presenter_control_vtbl; object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index af9e656710..037916fc4e 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -898,6 +898,10 @@ static void test_default_presenter(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + IMFVideoPresenter_Release(presenter); }

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 June 2020