July 2020 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : msxml3/tests: Add some tests for XML loading with site assigned.
by Alexandre Julliard July 9, 2020

July 9, 2020

Module: wine Branch: master Commit: f9920d27b3a6aa2314434fd8398376f71223a8a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9920d27b3a6aa2314434fd8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 9 11:06:22 2020 +0800 msxml3/tests: Add some tests for XML loading with site assigned. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 144 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index ef29bf6a59..c86042bc70 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -37,6 +37,7 @@ #include "dispex.h" #include "objsafe.h" #include "mshtml.h" +#include "docobj.h" #include "xmlparser.h" #include "initguid.h" #include "asptlb.h" @@ -13114,6 +13115,148 @@ static void test_namespaces_as_attributes(void) free_bstrs(); } +static const IID *qi_list[32]; +static int qi_count; + +static BOOL qi_list_contains(REFIID iid) +{ + int i; + + for (i = 0; i < qi_count; i++) + { + if (IsEqualGUID(qi_list[i], iid)) + return TRUE; + } + + return FALSE; +} + +static BOOL qi_list_contains_service(REFIID service, REFIID iid) +{ + int i; + + for (i = 0; i < qi_count; i++) + { + if (IsEqualGUID(qi_list[i], service) && IsEqualGUID(qi_list[i + 1], iid)) + return TRUE; + } + + return FALSE; +} + +static HRESULT WINAPI sp_QueryInterface(IServiceProvider *iface, REFIID iid, void **ppv) +{ + trace("sp_QueryInterface: %s\n", wine_dbgstr_guid(iid)); + + if (qi_count < ARRAY_SIZE(qi_list)) + qi_list[qi_count++] = iid; + else + ok(0, "qi_list overflow: %d\n", qi_count); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IServiceProvider)) + { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI sp_AddRef(IServiceProvider *iface) +{ + return 2; +} + +static ULONG WINAPI sp_Release(IServiceProvider *iface) +{ + return 1; +} + +static HRESULT WINAPI sp_QueryService(IServiceProvider *iface, REFGUID service, + REFIID iid, void **ppv) +{ + trace("sp_QueryService: %s, %s\n", wine_dbgstr_guid(service), wine_dbgstr_guid(iid)); + + if (IsEqualGUID(service, &SID_SContainerDispatch) || + IsEqualGUID(service, &SID_SInternetHostSecurityManager)) + { + if (qi_count + 1 < ARRAY_SIZE(qi_list)) + { + qi_list[qi_count++] = service; + qi_list[qi_count++] = iid; + } + else + ok(0, "qi_list overflow: %d\n", qi_count); + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static const IServiceProviderVtbl sp_vtbl = +{ + sp_QueryInterface, + sp_AddRef, + sp_Release, + sp_QueryService +}; + +static IServiceProvider sp = { &sp_vtbl }; + +static void test_load_with_site(void) +{ + char path[MAX_PATH]; + IXMLDOMDocument2 *doc; + IObjectWithSite *site; + VARIANT var; + VARIANT_BOOL b; + HRESULT hr; + + GetTempPathA(MAX_PATH, path); + strcat(path, "winetest.xml"); + write_to_file(path, win1252xml); + + doc = create_document(&IID_IXMLDOMDocument2); + + hr = IXMLDOMDocument2_QueryInterface(doc, &IID_IObjectWithSite, (void **)&site); + ok(hr == S_OK, "got %#x\n", hr); + + qi_count = 0; + hr = IObjectWithSite_SetSite(site, (IUnknown *)&sp); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(qi_count != 0, "got %d QI calls\n", qi_count); +todo_wine + ok(qi_list_contains(&IID_IXMLDOMDocument), "QI(IID_IXMLDOMDocument) was not called\n"); +todo_wine + ok(qi_list_contains(&IID_IHTMLDocument2), "QI(IID_IHTMLDocument2) was not called\n"); +todo_wine + ok(qi_list_contains(&IID_IServiceProvider), "QI(IID_IServiceProvider) was not called\n"); +todo_wine + ok(qi_list_contains(&IID_IOleClientSite), "QI(IID_IOleClientSite) was not called\n"); +todo_wine + ok(qi_list_contains_service(&SID_SContainerDispatch, &IID_IHTMLDocument2), + "QI(SID_SContainerDispatch, IID_IHTMLDocument2) was not called\n"); +todo_wine + ok(qi_list_contains_service(&SID_SInternetHostSecurityManager, &IID_IXMLDOMDocument), + "QI(SID_SInternetHostSecurityManager, IID_IXMLDOMDocument) was not called\n"); + + qi_count = 0; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_(path); + hr = IXMLDOMDocument2_load(doc, var, &b); + ok(hr == S_OK, "got %#x\n", hr); + ok(b == VARIANT_TRUE, "got %d\n", b); + ok(qi_count == 0, "got %d QI calls\n", qi_count); + SysFreeString(V_BSTR(&var)); + + IXMLDOMDocument2_Release(doc); + + DeleteFileA(path); +} + START_TEST(domdoc) { HRESULT hr; @@ -13130,6 +13273,7 @@ START_TEST(domdoc) return; } + test_load_with_site(); test_domdoc(); test_persiststream(); test_domnode();

1 0

Dmitry Timoshkov : msxml3: Use site's base URI when loading an XML file.
by Alexandre Julliard July 9, 2020

July 9, 2020

Module: wine Branch: master Commit: f62b05dadd368d2d175c30e110149d4c5eb74413 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f62b05dadd368d2d175c30e1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 9 15:18:11 2020 +0800 msxml3: Use site's base URI when loading an XML file. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/bsc.c | 17 ++++++++++++++--- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/msxml_private.h | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index 0b9e679bda..5cebe09333 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -242,9 +242,10 @@ static const struct IBindStatusCallbackVtbl bsc_vtbl = bsc_OnObjectAvailable }; -HRESULT create_uri(const WCHAR *url, IUri **uri) +HRESULT create_uri(IUri *base, const WCHAR *url, IUri **uri) { WCHAR fileUrl[INTERNET_MAX_URL_LENGTH]; + HRESULT hr; TRACE("%s\n", debugstr_w(url)); @@ -271,7 +272,17 @@ HRESULT create_uri(const WCHAR *url, IUri **uri) url = fileUrl; } - return CreateUri(url, Uri_CREATE_ALLOW_RELATIVE | Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, uri); + hr = CreateUri(url, Uri_CREATE_ALLOW_RELATIVE | Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, uri); + if (hr == S_OK && base) + { + IUri *rebased_uri; + + hr = CoInternetCombineIUri(base, *uri, 0, &rebased_uri, 0); + IUri_Release(*uri); + *uri = rebased_uri; + } + + return hr; } HRESULT create_moniker_from_url(LPCWSTR url, IMoniker **mon) @@ -281,7 +292,7 @@ HRESULT create_moniker_from_url(LPCWSTR url, IMoniker **mon) TRACE("%s\n", debugstr_w(url)); - if (FAILED(hr = create_uri(url, &uri))) + if (FAILED(hr = create_uri(NULL, url, &uri))) return hr; hr = CreateURLMonikerEx2(NULL, uri, mon, 0); diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 6d611c590f..8d45c546fb 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2304,7 +2304,7 @@ static HRESULT WINAPI domdoc_load( This->properties->uri = NULL; } - hr = create_uri(filename, &uri); + hr = create_uri(This->base_uri, filename, &uri); if (SUCCEEDED(hr)) hr = CreateURLMonikerEx2(NULL, uri, &mon, 0); if ( SUCCEEDED(hr) ) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 918c0d3d44..5fce060985 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -532,7 +532,7 @@ static inline const CLSID* SchemaCache_version(MSXML_VERSION v) typedef struct bsc_t bsc_t; HRESULT create_moniker_from_url(LPCWSTR, IMoniker**) DECLSPEC_HIDDEN; -HRESULT create_uri(const WCHAR *, IUri **) DECLSPEC_HIDDEN; +HRESULT create_uri(IUri *base, const WCHAR *, IUri **) DECLSPEC_HIDDEN; HRESULT bind_url(IMoniker*, HRESULT (*onDataAvailable)(void*,char*,DWORD), void*, bsc_t**) DECLSPEC_HIDDEN; HRESULT detach_bsc(bsc_t*) DECLSPEC_HIDDEN; IUri *get_base_uri(IUnknown *) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Use char pointers instead of ANSI/UNICODE_STRING in unix_to_nt_file_name().
by Alexandre Julliard July 9, 2020

July 9, 2020

Module: wine Branch: master Commit: 5ebdeaaa372186b4c3a9098676c76423a1781154 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ebdeaaa372186b4c3a90986… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 10:01:19 2020 +0200 ntdll: Use char pointers instead of ANSI/UNICODE_STRING in unix_to_nt_file_name(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 29 ++++++------- dlls/ntdll/unix/file.c | 97 +++++++++++++++++++++++------------------- dlls/ntdll/unix/loader.c | 25 ++++++----- dlls/ntdll/unix/unix_private.h | 2 +- 4 files changed, 79 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ebdeaaa372186b4c3a9…

1 0

Alexandre Julliard : ntdll: Return a char pointer instead of an ANSI_STRING in nt_to_unix_file_name().
by Alexandre Julliard July 9, 2020

July 9, 2020

Module: wine Branch: master Commit: d0a16b7dc99a4040e4e804c04d71a24b3a9d829e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0a16b7dc99a4040e4e804c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 09:57:57 2020 +0200 ntdll: Return a char pointer instead of an ANSI_STRING in nt_to_unix_file_name(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 124 ++++++++++++++++++++++------------------- dlls/ntdll/unix/loader.c | 8 +-- dlls/ntdll/unix/process.c | 6 +- dlls/ntdll/unix/unix_private.h | 3 +- 4 files changed, 76 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d0a16b7dc99a4040e4e8…

1 0

Alexandre Julliard : winebuild: Fix retrieving syscall arg length on x86_64.
by Alexandre Julliard July 9, 2020

July 9, 2020

Module: wine Branch: master Commit: 461fc592ad1462c022bcf1c2cebfaee2bb5cc1de URL: https://source.winehq.org/git/wine.git/?a=commit;h=461fc592ad1462c022bcf1c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 12:47:33 2020 +0200 winebuild: Fix retrieving syscall arg length on x86_64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index b725e81163..edbe8d0c0f 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1498,7 +1498,8 @@ void output_syscalls( DLLSPEC *spec ) output( "\tsubq $0xb,0x8(%%rbp)\n" ); output( "\tcmpq $%u,%%rax\n", count ); output( "\tjae 3f\n" ); - output( "\tmovzbq .Lsyscall_args(%%rip),%%rcx\n" ); + output( "\tleaq .Lsyscall_args(%%rip),%%rcx\n" ); + output( "\tmovzbl (%%rcx,%%rax),%%ecx\n" ); output( "\tsubq $0x20,%%rcx\n" ); output( "\tjbe 1f\n" ); output( "\tsubq %%rcx,%%rsp\n" );

1 0

Jacek Caban : wineconsole: Use OVERLAPPED to wait for console events.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: 340a661723eab4afe2204837716e2b53cc14f5f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=340a661723eab4afe2204837… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 8 16:31:55 2020 +0200 wineconsole: Use OVERLAPPED to wait for console events. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/curses.c | 2 +- programs/wineconsole/user.c | 2 +- programs/wineconsole/winecon_private.h | 4 ++++ programs/wineconsole/wineconsole.c | 18 +++++++++++++----- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 6fa669d150..ff38bafe2c 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -1020,7 +1020,7 @@ static int WCCURSES_MainLoop(struct inner_data* data) if (pipe( PRIVATE(data)->sync_pipe ) == -1) return 1; PRIVATE(data)->input_thread = CreateThread( NULL, 0, input_thread, data, 0, &id ); - while (!data->dying && WaitForSingleObject(data->hSynchro, INFINITE) == WAIT_OBJECT_0) + while (!data->dying && WaitForSingleObject(data->overlapped.hEvent, INFINITE) == WAIT_OBJECT_0) { EnterCriticalSection(&PRIVATE(data)->lock); WINECON_GrabChanges(data); diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index de3f4ae98c..67531c0045 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -1365,7 +1365,7 @@ static int WCUSER_MainLoop(struct inner_data* data) ShowWindow(data->hWnd, data->nCmdShow); while (!data->dying || !data->curcfg.exit_on_die) { - switch (MsgWaitForMultipleObjects(1, &data->hSynchro, FALSE, INFINITE, QS_ALLINPUT)) + switch (MsgWaitForMultipleObjects(1, &data->overlapped.hEvent, FALSE, INFINITE, QS_ALLINPUT)) { case WAIT_OBJECT_0: WINECON_GrabChanges(data); diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index 54d8782a2a..cdf05e9332 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -22,6 +22,7 @@ #include <windef.h> #include <winbase.h> #include <wincon.h> +#include <wine/condrv.h> #include "wineconsole_res.h" @@ -69,6 +70,9 @@ struct inner_data { BOOL in_grab_changes;/* to handle re-entrant calls to WINECON_GrabChanges */ BOOL dying; /* to TRUE when we've been notified by server that child has died */ + OVERLAPPED overlapped; + struct condrv_renderer_event events[256]; + int (*fnMainLoop)(struct inner_data* data); void (*fnPosCursor)(const struct inner_data* data); void (*fnShapeCursor)(struct inner_data* data, int size, int vis, BOOL force); diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index bc2aef847e..6ccba13c8a 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -27,7 +27,6 @@ #include "winecon_private.h" #include "winnls.h" #include "winuser.h" -#include "wine/condrv.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -242,21 +241,20 @@ static void WINECON_SetColors(struct inner_data *data, const struct config_data* */ void WINECON_GrabChanges(struct inner_data* data) { - struct condrv_renderer_event evts[256]; + struct condrv_renderer_event *evts = data->events; int i, ev_found; DWORD num; HANDLE h; if (data->in_grab_changes) return; - if (!DeviceIoControl( data->hSynchro, IOCTL_CONDRV_GET_RENDERER_EVENTS, NULL, 0, evts, - sizeof(evts), &num, NULL ) || !num) + if (!GetOverlappedResult(data->hSynchro, &data->overlapped, &num, FALSE)) { ERR( "failed to get renderer events: %u\n", GetLastError() ); data->dying = TRUE; return; } - num /= sizeof(*evts); + num /= sizeof(data->events[0]); WINE_TRACE( "got %u events\n", num ); /* FIXME: should do some event compression here (cursor pos, update) */ @@ -400,6 +398,13 @@ void WINECON_GrabChanges(struct inner_data* data) } } data->in_grab_changes = FALSE; + + if (!DeviceIoControl(data->hSynchro, IOCTL_CONDRV_GET_RENDERER_EVENTS, NULL, 0, data->events, + sizeof(data->events), NULL, &data->overlapped) && GetLastError() != ERROR_IO_PENDING) + { + ERR("failed to get renderer events: %u\n", GetLastError()); + data->dying = TRUE; + } } /****************************************************************** @@ -590,6 +595,7 @@ static void WINECON_Delete(struct inner_data* data) if (data->hConOut) CloseHandle(data->hConOut); if (data->hSynchro) CloseHandle(data->hSynchro); if (data->hProcess) CloseHandle(data->hProcess); + if (data->overlapped.hEvent) CloseHandle(data->overlapped.hEvent); HeapFree(GetProcessHeap(), 0, data->curcfg.registry); HeapFree(GetProcessHeap(), 0, data->cells); HeapFree(GetProcessHeap(), 0, data); @@ -676,6 +682,8 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna /* should always be defined */ } + if (!(data->overlapped.hEvent = CreateEventW(NULL, TRUE, TRUE, NULL))) goto error; + /* the handles here are created without the whistles and bells required by console * (mainly because wineconsole doesn't need it) * - they are not inheritable

1 0

Nikolay Sivov : mf/evr: Add a stub for clock state sink.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: 115ac283993013116af06f9d14e650e027d7f06d URL: https://source.winehq.org/git/wine.git/?a=commit;h=115ac283993013116af06f9d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 8 18:10:34 2020 +0300 mf/evr: Add a stub for clock state sink. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 5 ++++ 2 files changed, 81 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index bb21ccdd25..aa4d3850c6 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -34,6 +34,7 @@ struct video_renderer IMFMediaSink IMFMediaSink_iface; IMFMediaSinkPreroll IMFMediaSinkPreroll_iface; IMFVideoRenderer IMFVideoRenderer_iface; + IMFClockStateSink IMFClockStateSink_iface; IMFMediaEventGenerator IMFMediaEventGenerator_iface; LONG refcount; @@ -64,6 +65,11 @@ static struct video_renderer *impl_from_IMFMediaEventGenerator(IMFMediaEventGene return CONTAINING_RECORD(iface, struct video_renderer, IMFMediaEventGenerator_iface); } +static struct video_renderer *impl_from_IMFClockStateSink(IMFClockStateSink *iface) +{ + return CONTAINING_RECORD(iface, struct video_renderer, IMFClockStateSink_iface); +} + static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) { struct video_renderer *renderer = impl_from_IMFMediaSink(iface); @@ -87,6 +93,10 @@ static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, RE { *obj = &renderer->IMFMediaEventGenerator_iface; } + else if (IsEqualIID(riid, &IID_IMFClockStateSink)) + { + *obj = &renderer->IMFClockStateSink_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -363,6 +373,71 @@ static const IMFMediaEventGeneratorVtbl video_renderer_events_vtbl = video_renderer_events_QueueEvent, }; +static HRESULT WINAPI video_renderer_clock_sink_QueryInterface(IMFClockStateSink *iface, REFIID riid, void **obj) +{ + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + return IMFMediaSink_QueryInterface(&renderer->IMFMediaSink_iface, riid, obj); +} + +static ULONG WINAPI video_renderer_clock_sink_AddRef(IMFClockStateSink *iface) +{ + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + return IMFMediaSink_AddRef(&renderer->IMFMediaSink_iface); +} + +static ULONG WINAPI video_renderer_clock_sink_Release(IMFClockStateSink *iface) +{ + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); +} + +static HRESULT WINAPI video_renderer_clock_sink_OnClockStart(IMFClockStateSink *iface, MFTIME systime, LONGLONG offset) +{ + FIXME("%p, %s, %s.\n", iface, debugstr_time(systime), debugstr_time(offset)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_clock_sink_OnClockStop(IMFClockStateSink *iface, MFTIME systime) +{ + FIXME("%p, %s.\n", iface, debugstr_time(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_clock_sink_OnClockPause(IMFClockStateSink *iface, MFTIME systime) +{ + FIXME("%p, %s.\n", iface, debugstr_time(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_clock_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME systime) +{ + FIXME("%p, %s.\n", iface, debugstr_time(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate) +{ + FIXME("%p, %s, %f.\n", iface, debugstr_time(systime), rate); + + return E_NOTIMPL; +} + +static const IMFClockStateSinkVtbl video_renderer_clock_sink_vtbl = +{ + video_renderer_clock_sink_QueryInterface, + video_renderer_clock_sink_AddRef, + video_renderer_clock_sink_Release, + video_renderer_clock_sink_OnClockStart, + video_renderer_clock_sink_OnClockStop, + video_renderer_clock_sink_OnClockPause, + video_renderer_clock_sink_OnClockRestart, + video_renderer_clock_sink_OnClockSetRate, +}; + static HRESULT video_renderer_create_mixer(IMFAttributes *attributes, IMFTransform **out) { unsigned int flags = 0; @@ -423,6 +498,7 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, object->IMFMediaSinkPreroll_iface.lpVtbl = &video_renderer_preroll_vtbl; object->IMFVideoRenderer_iface.lpVtbl = &video_renderer_vtbl; object->IMFMediaEventGenerator_iface.lpVtbl = &video_renderer_events_vtbl; + object->IMFClockStateSink_iface.lpVtbl = &video_renderer_clock_sink_vtbl; object->refcount = 1; InitializeCriticalSection(&object->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5d9ccc5408..077466b7e8 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3229,6 +3229,7 @@ static void test_evr(void) { IMFMediaEventGenerator *ev_generator; IMFVideoRenderer *video_renderer; + IMFClockStateSink *clock_sink; IMFMediaSinkPreroll *preroll; IMFMediaSink *sink, *sink2; IMFActivate *activate; @@ -3272,6 +3273,10 @@ static void test_evr(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFMediaEventGenerator_Release(ev_generator); + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFClockStateSink, (void **)&clock_sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFClockStateSink_Release(clock_sink); + hr = IMFActivate_ShutdownObject(activate); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);

1 0

Nikolay Sivov : mf/evr: Add IMFGetService stub.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: f557a5ee561faa215f2700b492daab789c82bee8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f557a5ee561faa215f2700b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 8 18:10:35 2020 +0300 mf/evr: Add IMFGetService stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 5 +++++ 2 files changed, 49 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index aa4d3850c6..ebb3fd4c2c 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -36,6 +36,7 @@ struct video_renderer IMFVideoRenderer IMFVideoRenderer_iface; IMFClockStateSink IMFClockStateSink_iface; IMFMediaEventGenerator IMFMediaEventGenerator_iface; + IMFGetService IMFGetService_iface; LONG refcount; IMFMediaEventQueue *event_queue; @@ -70,6 +71,11 @@ static struct video_renderer *impl_from_IMFClockStateSink(IMFClockStateSink *ifa return CONTAINING_RECORD(iface, struct video_renderer, IMFClockStateSink_iface); } +static struct video_renderer *impl_from_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct video_renderer, IMFGetService_iface); +} + static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) { struct video_renderer *renderer = impl_from_IMFMediaSink(iface); @@ -97,6 +103,10 @@ static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, RE { *obj = &renderer->IMFClockStateSink_iface; } + else if (IsEqualIID(riid, &IID_IMFGetService)) + { + *obj = &renderer->IMFGetService_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -438,6 +448,39 @@ static const IMFClockStateSinkVtbl video_renderer_clock_sink_vtbl = video_renderer_clock_sink_OnClockSetRate, }; +static HRESULT WINAPI video_renderer_get_service_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) +{ + struct video_renderer *renderer = impl_from_IMFGetService(iface); + return IMFMediaSink_QueryInterface(&renderer->IMFMediaSink_iface, riid, obj); +} + +static ULONG WINAPI video_renderer_get_service_AddRef(IMFGetService *iface) +{ + struct video_renderer *renderer = impl_from_IMFGetService(iface); + return IMFMediaSink_AddRef(&renderer->IMFMediaSink_iface); +} + +static ULONG WINAPI video_renderer_get_service_Release(IMFGetService *iface) +{ + struct video_renderer *renderer = impl_from_IMFGetService(iface); + return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); +} + +static HRESULT WINAPI video_renderer_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + FIXME("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static const IMFGetServiceVtbl video_renderer_get_service_vtbl = +{ + video_renderer_get_service_QueryInterface, + video_renderer_get_service_AddRef, + video_renderer_get_service_Release, + video_renderer_get_service_GetService, +}; + static HRESULT video_renderer_create_mixer(IMFAttributes *attributes, IMFTransform **out) { unsigned int flags = 0; @@ -499,6 +542,7 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, object->IMFVideoRenderer_iface.lpVtbl = &video_renderer_vtbl; object->IMFMediaEventGenerator_iface.lpVtbl = &video_renderer_events_vtbl; object->IMFClockStateSink_iface.lpVtbl = &video_renderer_clock_sink_vtbl; + object->IMFGetService_iface.lpVtbl = &video_renderer_get_service_vtbl; object->refcount = 1; InitializeCriticalSection(&object->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 077466b7e8..3fad309bcf 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3234,6 +3234,7 @@ static void test_evr(void) IMFMediaSink *sink, *sink2; IMFActivate *activate; DWORD flags, count; + IMFGetService *gs; UINT64 value; HRESULT hr; @@ -3277,6 +3278,10 @@ static void test_evr(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFClockStateSink_Release(clock_sink); + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFGetService, (void **)&gs); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFGetService_Release(gs); + hr = IMFActivate_ShutdownObject(activate); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);

1 0

Georg Lehmann : winevulkan: Unwrap object for VK_EXT_private_data when needed.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: 380b7f28253c048d04c1fbd0cfbc7e804bb1b0e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=380b7f28253c048d04c1fbd0… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Wed Jul 8 15:43:22 2020 +0200 winevulkan: Unwrap object for VK_EXT_private_data when needed. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 7 +++++++ dlls/winevulkan/vulkan.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 12 ------------ dlls/winevulkan/vulkan_thunks.h | 2 ++ 4 files changed, 46 insertions(+), 12 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index a0bf6b0859..b84eb39587 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -217,6 +217,10 @@ FUNCTION_OVERRIDES = { # VK_KHR_device_group "vkGetDeviceGroupSurfacePresentModesKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, "vkGetPhysicalDevicePresentRectanglesKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, + + # VK_EXT_private_data + "vkGetPrivateDataEXT" : {"dispatch": True, "driver" : False, "thunk" : False}, + "vkSetPrivateDataEXT" : {"dispatch": True, "driver" : False, "thunk" : False}, } STRUCT_CHAIN_CONVERSIONS = [ @@ -919,6 +923,9 @@ class VkHandle(object): def native_handle(self, name): """ Provide access to the native handle of a wrapped object. """ + # Remember to add any new native handle whose parent is VkDevice + # to unwrap_object_handle() in vulkan.c + if self.name == "VkCommandPool": return "wine_cmd_pool_from_handle({0})->command_pool".format(name) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index d2da92cfa2..4642975ad0 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1372,6 +1372,43 @@ void WINAPI wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(VkPhysicalDev properties->externalSemaphoreFeatures = 0; } +static uint64_t unwrap_object_handle(VkObjectType type, uint64_t handle) +{ + switch (type) + { + case VK_OBJECT_TYPE_DEVICE: + return (uint64_t) (uintptr_t) ((VkDevice) (uintptr_t) handle)->device; + case VK_OBJECT_TYPE_QUEUE: + return (uint64_t) (uintptr_t) ((VkQueue) (uintptr_t) handle)->queue; + case VK_OBJECT_TYPE_COMMAND_BUFFER: + return (uint64_t) (uintptr_t) ((VkCommandBuffer) (uintptr_t) handle)->command_buffer; + case VK_OBJECT_TYPE_COMMAND_POOL: + return (uint64_t) wine_cmd_pool_from_handle(handle)->command_pool; + default: + return handle; + } +} + +VkResult WINAPI wine_vkSetPrivateDataEXT(VkDevice device, VkObjectType object_type, uint64_t object_handle, + VkPrivateDataSlotEXT private_data_slot, uint64_t data) +{ + TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", device, object_type, wine_dbgstr_longlong(object_handle), + wine_dbgstr_longlong(private_data_slot), wine_dbgstr_longlong(data)); + + object_handle = unwrap_object_handle(object_type, object_handle); + return device->funcs.p_vkSetPrivateDataEXT(device->device, object_type, object_handle, private_data_slot, data); +} + +void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType object_type, uint64_t object_handle, + VkPrivateDataSlotEXT private_data_slot, uint64_t *data) +{ + TRACE("%p, %#x, 0x%s, 0x%s, %p\n", device, object_type, wine_dbgstr_longlong(object_handle), + wine_dbgstr_longlong(private_data_slot), data); + + object_handle = unwrap_object_handle(object_type, object_handle); + device->funcs.p_vkGetPrivateDataEXT(device->device, object_type, object_handle, private_data_slot, data); +} + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { TRACE("%p, %u, %p\n", hinst, reason, reserved); diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index f8d171a6db..94aa1e3fb7 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -5066,12 +5066,6 @@ static VkResult WINAPI wine_vkGetPipelineExecutableStatisticsKHR(VkDevice device #endif } -static void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t *pData) -{ - TRACE("%p, %#x, 0x%s, 0x%s, %p\n", device, objectType, wine_dbgstr_longlong(objectHandle), wine_dbgstr_longlong(privateDataSlot), pData); - device->funcs.p_vkGetPrivateDataEXT(device->device, objectType, objectHandle, privateDataSlot, pData); -} - VkResult WINAPI wine_vkGetQueryPoolResults(VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, size_t dataSize, void *pData, VkDeviceSize stride, VkQueryResultFlags flags) { TRACE("%p, 0x%s, %u, %u, 0x%s, %p, 0x%s, %#x\n", device, wine_dbgstr_longlong(queryPool), firstQuery, queryCount, wine_dbgstr_longlong(dataSize), pData, wine_dbgstr_longlong(stride), flags); @@ -5264,12 +5258,6 @@ VkResult WINAPI wine_vkSetEvent(VkDevice device, VkEvent event) return device->funcs.p_vkSetEvent(device->device, event); } -static VkResult WINAPI wine_vkSetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t data) -{ - TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", device, objectType, wine_dbgstr_longlong(objectHandle), wine_dbgstr_longlong(privateDataSlot), wine_dbgstr_longlong(data)); - return device->funcs.p_vkSetPrivateDataEXT(device->device, objectType, objectHandle, privateDataSlot, data); -} - VkResult WINAPI wine_vkSignalSemaphore(VkDevice device, const VkSemaphoreSignalInfo *pSignalInfo) { #if defined(USE_STRUCT_CONVERSION) diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 9580c6bbcd..7055d4fb13 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -40,7 +40,9 @@ VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; void WINAPI wine_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties); void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; +void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t *pData) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, VkFence fence); +VkResult WINAPI wine_vkSetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t data) DECLSPEC_HIDDEN; /* Private thunks */ VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : mf/evr: Forward presenter service requests to the presenter.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: 612f96ae27a7a117e5d5260ab7c01f15b030c6f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=612f96ae27a7a117e5d5260a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 8 18:10:38 2020 +0300 mf/evr: Forward presenter service requests to the presenter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 8b7de5c76b..d20fb1a395 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -478,6 +478,10 @@ static HRESULT WINAPI video_renderer_get_service_GetService(IMFGetService *iface { hr = IMFTransform_QueryInterface(renderer->mixer, &IID_IMFGetService, (void **)&gs); } + else if (IsEqualGUID(service, &MR_VIDEO_RENDER_SERVICE)) + { + hr = IMFVideoPresenter_QueryInterface(renderer->presenter, &IID_IMFGetService, (void **)&gs); + } else { FIXME("Unsupported service %s.\n", debugstr_guid(service));

1 0