wine-devel November 2020

wine-devel@winehq.org

73 participants
650 discussions

[PATCH v2] msxml3: Support IStream in domdoc_transformNodeToObject.
by Daniel Lehman 13 Nov '20

13 Nov '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/msxml3/domdoc.c | 17 ++++++++++++++++- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/node.c | 18 +++++++++++------- dlls/msxml3/stylesheet.c | 2 +- dlls/msxml3/tests/domdoc.c | 23 +++++++++++++++++++++++ 5 files changed, 52 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index d447bd2b1d8..90d59df2027 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1525,7 +1525,9 @@ static HRESULT WINAPI domdoc_transformNodeToObject( case VT_DISPATCH: { IXMLDOMDocument *doc; + IStream *stream; HRESULT hr; + BSTR str; if (!V_UNKNOWN(&output)) return E_INVALIDARG; @@ -1535,7 +1537,6 @@ static HRESULT WINAPI domdoc_transformNodeToObject( if (IUnknown_QueryInterface(V_UNKNOWN(&output), &IID_IXMLDOMDocument, (void **)&doc) == S_OK) { VARIANT_BOOL b; - BSTR str; if (FAILED(hr = node_transform_node(&This->node, stylesheet, &str))) return hr; @@ -1544,6 +1545,20 @@ static HRESULT WINAPI domdoc_transformNodeToObject( SysFreeString(str); return hr; } + else if (IUnknown_QueryInterface(V_UNKNOWN(&output), &IID_IStream, (void**)&stream) == S_OK) + { + BSTR str; + + if (SUCCEEDED(hr = node_transform_node_params(&This->node, stylesheet, &str, NULL, NULL, TRUE))) + { + DWORD count; + hr = IStream_Write( stream, str, SysStringByteLen(str), &count ); + SysFreeString(str); + } + + IStream_Release(stream); + return hr; + } else { FIXME("Unsupported destination type.\n"); diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index a59e00bf2b3..7b5b161c9de 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -344,7 +344,7 @@ extern HRESULT node_select_nodes(const xmlnode*,BSTR,IXMLDOMNodeList**) DECLSPEC extern HRESULT node_select_singlenode(const xmlnode*,BSTR,IXMLDOMNode**) DECLSPEC_HIDDEN; extern HRESULT node_transform_node(const xmlnode*,IXMLDOMNode*,BSTR*) DECLSPEC_HIDDEN; extern HRESULT node_transform_node_params(const xmlnode*,IXMLDOMNode*,BSTR*,ISequentialStream*, - const struct xslprocessor_params*) DECLSPEC_HIDDEN; + const struct xslprocessor_params*,BOOL) DECLSPEC_HIDDEN; extern HRESULT node_create_supporterrorinfo(const tid_t*,void**) DECLSPEC_HIDDEN; extern HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 35777d65918..0123cb117b9 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1249,7 +1249,7 @@ static HRESULT node_transform_write(xsltStylesheetPtr style, xmlDocPtr result, B } /* For BSTR output is always UTF-16, without 'encoding' attribute */ -static HRESULT node_transform_write_to_bstr(xsltStylesheetPtr style, xmlDocPtr result, BSTR *str) +static HRESULT node_transform_write_to_bstr(xsltStylesheetPtr style, xmlDocPtr result, BSTR *str, BOOL keep_bom) { HRESULT hr = S_OK; @@ -1273,9 +1273,13 @@ static HRESULT node_transform_write_to_bstr(xsltStylesheetPtr style, xmlDocPtr r content = xmlBufferContent(output->conv); len = xmlBufferLength(output->conv); #endif - /* UTF-16 encoder places UTF-16 bom, we don't need it for BSTR */ - content += sizeof(WCHAR); - *str = SysAllocStringLen((WCHAR*)content, len/sizeof(WCHAR) - 1); + len /= sizeof(WCHAR); + if (!keep_bom) + { + content += sizeof(WCHAR); + --len; + } + *str = SysAllocStringLen((WCHAR*)content, len); xmlOutputBufferClose(output); } @@ -1503,7 +1507,7 @@ failed: #endif /* SONAME_LIBXSLT */ HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR *p, - ISequentialStream *stream, const struct xslprocessor_params *params) + ISequentialStream *stream, const struct xslprocessor_params *params, BOOL keep_bom) { #ifdef SONAME_LIBXSLT xsltStylesheetPtr xsltSS; @@ -1563,7 +1567,7 @@ HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, if (stream) hr = node_transform_write_to_stream(xsltSS, result, stream); else - hr = node_transform_write_to_bstr(xsltSS, result, p); + hr = node_transform_write_to_bstr(xsltSS, result, p, keep_bom); xmlFreeDoc(result); } @@ -1584,7 +1588,7 @@ HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, HRESULT node_transform_node(const xmlnode *node, IXMLDOMNode *stylesheet, BSTR *p) { - return node_transform_node_params(node, stylesheet, p, NULL, NULL); + return node_transform_node_params(node, stylesheet, p, NULL, NULL, FALSE); } HRESULT node_select_nodes(const xmlnode *This, BSTR query, IXMLDOMNodeList **nodes) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 9863ed7aa4b..7950adbe6da 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -588,7 +588,7 @@ static HRESULT WINAPI xslprocessor_transform( SysFreeString(This->outstr); hr = node_transform_node_params(get_node_obj(This->input), This->stylesheet->node, - &This->outstr, stream, &This->params); + &This->outstr, stream, &This->params, FALSE); if (SUCCEEDED(hr)) { IStream *src = (IStream *)stream; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 101a775ca36..3ed08b04b30 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13030,7 +13030,11 @@ static void test_transformNodeToObject(void) { IUnknown transformdest = { &transformdestvtbl }; IXMLDOMDocument *doc, *doc2, *doc3; + LARGE_INTEGER off; + WCHAR buffer[256]; + IStream *istream; VARIANT_BOOL b; + ULONG nread; HRESULT hr; VARIANT v; @@ -13063,6 +13067,25 @@ static void test_transformNodeToObject(void) hr = IXMLDOMDocument_transformNodeToObject(doc, (IXMLDOMNode *)doc2, v); ok(hr == S_OK, "Failed to transform node, hr %#x.\n", hr); + istream = SHCreateMemStream(NULL, 0); + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown *)istream; + hr = IXMLDOMDocument_transformNodeToObject(doc, (IXMLDOMNode *)doc2, v); + ok(hr == S_OK, "Failed to transform node, hr %#x.\n", hr); + + off.QuadPart = 0; + hr = IStream_Seek(istream, off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "Failed to seek, hr %#x.\n", hr); + + nread = 0; + memset(buffer, 0xcc, sizeof(buffer)); + hr = IStream_Read(istream, buffer, sizeof(buffer), &nread); + ok(hr == S_OK, "Failed to read, hr %#x.\n", hr); + buffer[nread/2] = 0; + ok(buffer[0] == 0xfeff, "got %x\n", buffer[0]); + ok(compareIgnoreReturns(&buffer[1], _bstr_(szTransformOutput)), "got output %s\n", wine_dbgstr_w(buffer)); + IStream_Release(istream); + IXMLDOMDocument_Release(doc3); IXMLDOMDocument_Release(doc2); IXMLDOMDocument_Release(doc); -- 2.25.1

2 2

[PATCH] msxml3: Support IStream in domdoc_transformNodeToObject.
by Daniel Lehman 13 Nov '20

13 Nov '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- i have another version that doesn't skip the BOM in node_transform_write_to_bstr, if preferred --- dlls/msxml3/domdoc.c | 16 +++++++++++++++- dlls/msxml3/tests/domdoc.c | 23 +++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index d447bd2b1d8..de5ea51a675 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1525,7 +1525,9 @@ static HRESULT WINAPI domdoc_transformNodeToObject( case VT_DISPATCH: { IXMLDOMDocument *doc; + IStream *stream; HRESULT hr; + BSTR str; if (!V_UNKNOWN(&output)) return E_INVALIDARG; @@ -1535,7 +1537,6 @@ static HRESULT WINAPI domdoc_transformNodeToObject( if (IUnknown_QueryInterface(V_UNKNOWN(&output), &IID_IXMLDOMDocument, (void **)&doc) == S_OK) { VARIANT_BOOL b; - BSTR str; if (FAILED(hr = node_transform_node(&This->node, stylesheet, &str))) return hr; @@ -1544,6 +1545,19 @@ static HRESULT WINAPI domdoc_transformNodeToObject( SysFreeString(str); return hr; } + else if (IUnknown_QueryInterface(V_UNKNOWN(&output), &IID_IStream, (void**)&stream) == S_OK) + { + if (SUCCEEDED(hr = node_transform_node(&This->node, stylesheet, &str))) + { + static const char utf16BOM[] = {0xff,0xfe}; + if (SUCCEEDED(hr = IStream_Write( stream, utf16BOM, sizeof(utf16BOM), NULL))) + hr = IStream_Write( stream, str, SysStringByteLen(str), NULL ); + SysFreeString(str); + } + + IStream_Release(stream); + return hr; + } else { FIXME("Unsupported destination type.\n"); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 101a775ca36..3ed08b04b30 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13030,7 +13030,11 @@ static void test_transformNodeToObject(void) { IUnknown transformdest = { &transformdestvtbl }; IXMLDOMDocument *doc, *doc2, *doc3; + LARGE_INTEGER off; + WCHAR buffer[256]; + IStream *istream; VARIANT_BOOL b; + ULONG nread; HRESULT hr; VARIANT v; @@ -13063,6 +13067,25 @@ static void test_transformNodeToObject(void) hr = IXMLDOMDocument_transformNodeToObject(doc, (IXMLDOMNode *)doc2, v); ok(hr == S_OK, "Failed to transform node, hr %#x.\n", hr); + istream = SHCreateMemStream(NULL, 0); + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown *)istream; + hr = IXMLDOMDocument_transformNodeToObject(doc, (IXMLDOMNode *)doc2, v); + ok(hr == S_OK, "Failed to transform node, hr %#x.\n", hr); + + off.QuadPart = 0; + hr = IStream_Seek(istream, off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "Failed to seek, hr %#x.\n", hr); + + nread = 0; + memset(buffer, 0xcc, sizeof(buffer)); + hr = IStream_Read(istream, buffer, sizeof(buffer), &nread); + ok(hr == S_OK, "Failed to read, hr %#x.\n", hr); + buffer[nread/2] = 0; + ok(buffer[0] == 0xfeff, "got %x\n", buffer[0]); + ok(compareIgnoreReturns(&buffer[1], _bstr_(szTransformOutput)), "got output %s\n", wine_dbgstr_w(buffer)); + IStream_Release(istream); + IXMLDOMDocument_Release(doc3); IXMLDOMDocument_Release(doc2); IXMLDOMDocument_Release(doc); -- 2.25.1

2 2

Re: [PATCH] winex11.drv: Let the Window Manager handle the off-screen window if it's managed.
by Gabriel Ivăncescu 13 Nov '20

13 Nov '20

On 14/10/2020 23:37, Marvin wrote: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Rejected". > > This means that the patch has been rejected by a reviewer. You should > have received a mail explaining why it was rejected. You need to fix > the issue and resend the patch, or if you are convinced that your > patch is good as is, you should reply to the rejection message with > your counterarguments. > > If you do not understand the reason for this status, disagree with our > assessment, or are simply not sure how to proceed next, please ask for > clarification by replying to this email. > Hi, Why was this rejected? To me, as it stands, it makes no sense to try to unmap the window if it's offscreen when it is managed; we're overriding its job. Some WMs implement their own virtual desktops/workspaces and "snap" and "shift" the windows when they're offscreen (e.g. if you move the window to the left, it snaps to the left workspace and shifts up to the right when you switch to it). This completely ignores that and hides them when they would *not* be hidden by the WM.

2 3

[PATCH resend] ntdll: Implement JobObjectBasicProcessIdList for NtQueryInformationJobObject.
by Gabriel Ivăncescu 13 Nov '20

13 Nov '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/tests/process.c | 9 --------- dlls/ntdll/unix/sync.c | 26 ++++++++++++++++++++++++-- server/process.c | 23 +++++++++++++++++++++++ server/protocol.def | 9 +++++++++ 4 files changed, 56 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 7c6a0ff..afc7126 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2671,15 +2671,11 @@ static void test_QueryInformationJobObject(void) pid_list->NumberOfProcessIdsInList = 42; ret = QueryInformationJobObject(job, JobObjectBasicProcessIdList, pid_list, FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[1]), &ret_len); - todo_wine ok(!ret, "QueryInformationJobObject expected failure\n"); - todo_wine expect_eq_d(ERROR_MORE_DATA, GetLastError()); if (ret) { - todo_wine expect_eq_d(42, pid_list->NumberOfAssignedProcesses); - todo_wine expect_eq_d(42, pid_list->NumberOfProcessIdsInList); } @@ -2694,17 +2690,12 @@ static void test_QueryInformationJobObject(void) { ULONG_PTR *list = pid_list->ProcessIdList; - todo_wine ok(ret_len == FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[2]), "QueryInformationJobObject returned ret_len=%u\n", ret_len); - todo_wine expect_eq_d(2, pid_list->NumberOfAssignedProcesses); - todo_wine expect_eq_d(2, pid_list->NumberOfProcessIdsInList); - todo_wine expect_eq_d(pi[0].dwProcessId, list[0]); - todo_wine expect_eq_d(pi[1].dwProcessId, list[1]); } } diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index bba7af7..e6273f8 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -780,10 +780,32 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c case JobObjectBasicProcessIdList: { JOBOBJECT_BASIC_PROCESS_ID_LIST *process = info; + DWORD count, i; if (len < sizeof(*process)) return STATUS_INFO_LENGTH_MISMATCH; - memset( process, 0, sizeof(*process) ); - if (ret_len) *ret_len = sizeof(*process); + + count = len - FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList); + count /= sizeof(process->ProcessIdList[0]); + + SERVER_START_REQ( query_job_pids ) + { + req->job = wine_server_user_handle(handle); + wine_server_set_reply(req, process, count * sizeof(process_id_t)); + if ((ret = wine_server_call(req)) != STATUS_SUCCESS) + return ret; + if (count < reply->count) + return STATUS_MORE_ENTRIES; + count = reply->count; + } + SERVER_END_REQ; + + /* start from the end to not overwrite */ + for (i = count; i--;) + process->ProcessIdList[i] = ((process_id_t*)process)[i]; + process->NumberOfAssignedProcesses = count; + process->NumberOfProcessIdsInList = count; + + if (ret_len) *ret_len = (char*)(&process->ProcessIdList[count]) - (char*)process; return STATUS_SUCCESS; } case JobObjectExtendedLimitInformation: diff --git a/server/process.c b/server/process.c index 1786493..5c330bd 100644 --- a/server/process.c +++ b/server/process.c @@ -1739,6 +1739,29 @@ DECL_HANDLER(process_in_job) release_object( process ); } +/* get a list of the pids associated with the job */ +DECL_HANDLER(query_job_pids) +{ + struct job *job = get_job_obj( current->process, req->job, JOB_OBJECT_QUERY ); + struct process *process; + process_id_t *data; + data_size_t len; + + if (!job) return; + + reply->count = job->num_processes; + len = min( get_reply_max_size(), job->num_processes * sizeof(*data) ); + if (len && ((data = set_reply_data_size( len )))) + { + process_id_t *end = data + len; + LIST_FOR_EACH_ENTRY( process, &job->process_list, struct process, job_entry ) + { + if (data >= end) break; + *data++ = process->id; + } + } +} + /* retrieve information about a job */ DECL_HANDLER(get_job_info) { diff --git a/server/protocol.def b/server/protocol.def index a3708f2..4bfe6b2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3615,6 +3615,15 @@ struct handle_info @END +/* Query a list of pids associated with the job */ +@REQ(query_job_pids) + obj_handle_t job; /* handle to the job */ +@REPLY + data_size_t count; /* number of processes associated with the job */ + VARARG(pids,uints); /* list of pids */ +@END + + /* Set limit flags on a job */ @REQ(set_job_limits) obj_handle_t handle; /* handle to the job */ -- 2.21.0

1 0

[PATCH v2] winex11.drv: Always enable minimize/maximize functions for minimized windows.
by Gabriel Ivăncescu 13 Nov '20

13 Nov '20

A window without a minimize or maximize box can still be programmatically minimized by the Windows API. However, some WMs will refuse to change the state and not allow it to be maximized again, despite it being minimized, due to lacking those functions, thus not sending WM_STATE change notifications when clicking the minimized window on the taskbar. Heroes of Might and Magic V does this, for example, when losing focus. It minimizes itself. When maximizing it by clicking on the taskbar it won't send a WM_STATE change notification (since it was never changed) and fail to maximize properly, showing a black screen (the game will still think it is minimized). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/winex11.drv/window.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4571739..e2f0623 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -750,6 +750,10 @@ static void set_mwm_hints( struct x11drv_win_data *data, DWORD style, DWORD ex_s if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE; if (style & WS_MAXIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MAXIMIZE; if (style & WS_SYSMENU) mwm_hints.functions |= MWM_FUNC_CLOSE; + + /* The window can be programmatically minimized even without + a minimize box button. Allow the WM to restore it. */ + if (style & WS_MINIMIZE) mwm_hints.functions |= MWM_FUNC_MINIMIZE | MWM_FUNC_MAXIMIZE; } } -- 2.21.0

1 0

[PATCH] mfplat/buffer: Fix byte width set for d3d9 surface buffers.
by Nikolay Sivov 13 Nov '20

13 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/buffer.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 3d1d2abdf88..b47d2a9ba16 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -941,6 +941,18 @@ static HRESULT create_d3d9_surface_buffer(IUnknown *surface, BOOL bottom_up, IMF { struct memory_buffer *object; D3DSURFACE_DESC desc; + unsigned int stride; + GUID subtype; + BOOL is_yuv; + + IDirect3DSurface9_GetDesc((IDirect3DSurface9 *)surface, &desc); + TRACE("format %#x, %u x %u.\n", desc.Format, desc.Width, desc.Height); + + memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); + subtype.Data1 = desc.Format; + + if (!(stride = mf_format_get_stride(&subtype, desc.Width, &is_yuv))) + return MF_E_INVALIDMEDIATYPE; object = heap_alloc_zero(sizeof(*object)); if (!object) @@ -954,11 +966,8 @@ static HRESULT create_d3d9_surface_buffer(IUnknown *surface, BOOL bottom_up, IMF object->d3d9_surface.surface = (IDirect3DSurface9 *)surface; IUnknown_AddRef(surface); - IDirect3DSurface9_GetDesc(object->d3d9_surface.surface, &desc); - TRACE("format %#x, %u x %u.\n", desc.Format, desc.Width, desc.Height); - MFGetPlaneSize(desc.Format, desc.Width, desc.Height, &object->_2d.plane_size); - object->_2d.width = desc.Width; + object->_2d.width = stride; object->_2d.height = desc.Height; object->max_length = object->_2d.plane_size; -- 2.29.2

1 0

[PATCH 1/6] evr/presenter: Add IQualProp stub.
by Nikolay Sivov 13 Nov '20

13 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/presenter.c | 84 ++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 4 +++ 2 files changed, 88 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 9bf4cda3725..c1f29d41e4e 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -66,6 +66,7 @@ struct video_presenter IMFRateSupport IMFRateSupport_iface; IMFGetService IMFGetService_iface; IMFVideoPositionMapper IMFVideoPositionMapper_iface; + IQualProp IQualProp_iface; IMFVideoSampleAllocatorNotify allocator_cb; IUnknown IUnknown_inner; IUnknown *outer_unk; @@ -137,6 +138,11 @@ static struct video_presenter *impl_from_IMFVideoSampleAllocatorNotify(IMFVideoS return CONTAINING_RECORD(iface, struct video_presenter, allocator_cb); } +static struct video_presenter *impl_from_IQualProp(IQualProp *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, IQualProp_iface); +} + static void video_presenter_notify_renderer(struct video_presenter *presenter, LONG event, LONG_PTR param1, LONG_PTR param2) { @@ -444,6 +450,10 @@ static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFI { *obj = &presenter->IMFVideoPositionMapper_iface; } + else if (IsEqualIID(riid, &IID_IQualProp)) + { + *obj = &presenter->IQualProp_iface; + } else { WARN("Unimplemented interface %s.\n", debugstr_guid(riid)); @@ -1285,6 +1295,79 @@ static const IMFVideoSampleAllocatorNotifyVtbl video_presenter_allocator_cb_vtbl video_presenter_allocator_cb_NotifyRelease, }; +static HRESULT WINAPI video_presenter_qualprop_QueryInterface(IQualProp *iface, REFIID riid, void **obj) +{ + struct video_presenter *presenter = impl_from_IQualProp(iface); + return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); +} + +static ULONG WINAPI video_presenter_qualprop_AddRef(IQualProp *iface) +{ + struct video_presenter *presenter = impl_from_IQualProp(iface); + return IMFVideoPresenter_AddRef(&presenter->IMFVideoPresenter_iface); +} + +static ULONG WINAPI video_presenter_qualprop_Release(IQualProp *iface) +{ + struct video_presenter *presenter = impl_from_IQualProp(iface); + return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); +} + +static HRESULT WINAPI video_presenter_qualprop_get_FramesDroppedInRenderer(IQualProp *iface, int *frames) +{ + FIXME("%p, %p stub.\n", iface, frames); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_qualprop_get_FramesDrawn(IQualProp *iface, int *frames) +{ + FIXME("%p, %p stub.\n", iface, frames); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_qualprop_get_AvgFrameRate(IQualProp *iface, int *avg_frame_rate) +{ + FIXME("%p, %p stub.\n", iface, avg_frame_rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_qualprop_get_Jitter(IQualProp *iface, int *jitter) +{ + FIXME("%p, %p stub.\n", iface, jitter); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_qualprop_get_AvgSyncOffset(IQualProp *iface, int *offset) +{ + FIXME("%p, %p stub.\n", iface, offset); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_qualprop_get_DevSyncOffset(IQualProp *iface, int *devoffset) +{ + FIXME("%p, %p stub.\n", iface, devoffset); + + return E_NOTIMPL; +} + +static const IQualPropVtbl video_presenter_qualprop_vtbl = +{ + video_presenter_qualprop_QueryInterface, + video_presenter_qualprop_AddRef, + video_presenter_qualprop_Release, + video_presenter_qualprop_get_FramesDroppedInRenderer, + video_presenter_qualprop_get_FramesDrawn, + video_presenter_qualprop_get_AvgFrameRate, + video_presenter_qualprop_get_Jitter, + video_presenter_qualprop_get_AvgSyncOffset, + video_presenter_qualprop_get_DevSyncOffset, +}; + 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); @@ -1353,6 +1436,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) object->IMFRateSupport_iface.lpVtbl = &video_presenter_rate_support_vtbl; object->IMFGetService_iface.lpVtbl = &video_presenter_getservice_vtbl; object->IMFVideoPositionMapper_iface.lpVtbl = &video_presenter_position_mapper_vtbl; + object->IQualProp_iface.lpVtbl = &video_presenter_qualprop_vtbl; object->allocator_cb.lpVtbl = &video_presenter_allocator_cb_vtbl; object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index b8a16fc7cc9..bdf3154c7e5 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1122,6 +1122,10 @@ static void test_default_presenter(void) if (FAILED(hr)) return; + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IQualProp, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoPositionMapper, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); -- 2.29.2

1 5

[PATCH] dxva2: Add a semi-stub for VideoProcessBlt().
by Nikolay Sivov 13 Nov '20

13 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/main.c | 51 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 83c4723a7dc..341ee33d44d 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -218,13 +218,60 @@ static HRESULT WINAPI video_processor_GetFilterPropertyRange(IDirectXVideoProces return E_NOTIMPL; } +static BOOL intersect_rect(RECT *dest, const RECT *src1, const RECT *src2) +{ + if (IsRectEmpty(src1) || IsRectEmpty(src2) || + (src1->left >= src2->right) || (src2->left >= src1->right) || + (src1->top >= src2->bottom) || (src2->top >= src1->bottom)) + { + SetRectEmpty(dest); + return FALSE; + } + dest->left = max(src1->left, src2->left); + dest->right = min(src1->right, src2->right); + dest->top = max(src1->top, src2->top); + dest->bottom = min(src1->bottom, src2->bottom); + + return TRUE; +} + static HRESULT WINAPI video_processor_VideoProcessBlt(IDirectXVideoProcessor *iface, IDirect3DSurface9 *rt, const DXVA2_VideoProcessBltParams *params, const DXVA2_VideoSample *samples, UINT sample_count, HANDLE *complete_handle) { - FIXME("%p, %p, %p, %p, %u, %p.\n", iface, rt, params, samples, sample_count, complete_handle); + IDirect3DDevice9 *device; + unsigned int i; + RECT dst_rect; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %p, %p, %u, %p.\n", iface, rt, params, samples, sample_count, complete_handle); + + if (FAILED(hr = IDirect3DSurface9_GetDevice(rt, &device))) + { + WARN("Failed to get surface device, hr %#x.\n", hr); + return hr; + } + + /* FIXME: use specified color */ + IDirect3DDevice9_ColorFill(device, rt, NULL, 0); + + for (i = 0; i < sample_count; ++i) + { + dst_rect = params->TargetRect; + + if (!intersect_rect(&dst_rect, &dst_rect, &samples[i].DstRect)) + continue; + + if (FAILED(hr = IDirect3DDevice9_StretchRect(device, samples[i].SrcSurface, &samples[i].SrcRect, + rt, &dst_rect, D3DTEXF_POINT))) + { + WARN("Failed to copy sample %u, hr %#x.\n", i, hr); + } + } + + IDirect3DDevice9_Release(device); + + return S_OK; } static const IDirectXVideoProcessorVtbl video_processor_vtbl = -- 2.29.2

1 0

[website] German translation for release 5.0.3
by Julian Rüger 13 Nov '20

13 Nov '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.21
by Julian Rüger 13 Nov '20

13 Nov '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
65
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-devel November 2020