February 2020 - Wine-Commits

Andrew Wesie : kernel32: Make QueryWorkingSetEx use MemoryWorkingSetExInformation.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: f7a184e1bfcd7f34e32f5b0b7b6baaf988280628 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7a184e1bfcd7f34e32f5b0b… Author: Andrew Wesie <awesie(a)gmail.com> Date: Fri Jan 24 12:19:39 2020 -0800 kernel32: Make QueryWorkingSetEx use MemoryWorkingSetExInformation. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 7875f3469a..5146622230 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -722,7 +722,7 @@ BOOL WINAPI K32QueryWorkingSetEx( HANDLE process, LPVOID buffer, DWORD size ) { TRACE( "(%p, %p, %d)\n", process, buffer, size ); - return set_ntstatus( NtQueryVirtualMemory( process, NULL, MemoryWorkingSetList, buffer, size, NULL )); + return set_ntstatus( NtQueryVirtualMemory( process, NULL, MemoryWorkingSetExInformation, buffer, size, NULL )); } /***********************************************************************

1 0

Zebediah Figura : wined3d: Implement casting int to uint.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: 3364348e6b6c97c52d9ecc20456a3b4920474720 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3364348e6b6c97c52d9ecc20… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 6 10:42:59 2020 -0600 wined3d: Implement casting int to uint. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 25e9772325..4a2fbce553 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3125,7 +3125,7 @@ static void shader_glsl_get_swizzle(const struct wined3d_shader_src_param *param } static void shader_glsl_sprintf_cast(struct wined3d_string_buffer *dst_param, const char *src_param, - enum wined3d_data_type dst_data_type, enum wined3d_data_type src_data_type) + enum wined3d_data_type dst_data_type, enum wined3d_data_type src_data_type, unsigned int size) { if (dst_data_type == src_data_type) { @@ -3156,10 +3156,22 @@ static void shader_glsl_sprintf_cast(struct wined3d_string_buffer *dst_param, co return; } - if (src_data_type == WINED3D_DATA_INT && dst_data_type == WINED3D_DATA_FLOAT) + if (src_data_type == WINED3D_DATA_INT) { - string_buffer_sprintf(dst_param, "intBitsToFloat(%s)", src_param); - return; + switch (dst_data_type) + { + case WINED3D_DATA_FLOAT: + string_buffer_sprintf(dst_param, "intBitsToFloat(%s)", src_param); + return; + case WINED3D_DATA_UINT: + if (size == 1) + string_buffer_sprintf(dst_param, "uint(%s)", src_param); + else + string_buffer_sprintf(dst_param, "uvec%u(%s)", size, src_param); + return; + default: + break; + } } FIXME("Unhandled cast from %#x to %#x.\n", src_data_type, dst_data_type); @@ -3179,6 +3191,7 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_context *c enum wined3d_data_type param_data_type; BOOL is_color = FALSE; char swizzle_str[6]; + unsigned int size; glsl_src->param_str[0] = '\0'; swizzle_str[0] = '\0'; @@ -3190,24 +3203,30 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_context *c { case WINED3DSPR_IMMCONST: param_data_type = data_type; + size = wined3d_src->reg.immconst_type == WINED3D_IMMCONST_SCALAR ? 1 : 4; break; case WINED3DSPR_FORKINSTID: case WINED3DSPR_GSINSTID: case WINED3DSPR_JOININSTID: - case WINED3DSPR_LOCALTHREADID: case WINED3DSPR_LOCALTHREADINDEX: case WINED3DSPR_OUTPOINTID: case WINED3DSPR_PRIMID: + param_data_type = WINED3D_DATA_INT; + size = 1; + break; + case WINED3DSPR_LOCALTHREADID: case WINED3DSPR_THREADGROUPID: case WINED3DSPR_THREADID: param_data_type = WINED3D_DATA_INT; + size = 3; break; default: param_data_type = WINED3D_DATA_FLOAT; + size = 4; break; } - shader_glsl_sprintf_cast(param_str, reg_name->buffer, data_type, param_data_type); + shader_glsl_sprintf_cast(param_str, reg_name->buffer, data_type, param_data_type, size); shader_glsl_gen_modifier(wined3d_src->modifiers, param_str->buffer, swizzle_str, glsl_src->param_str); string_buffer_release(priv->string_buffers, reg_name); @@ -7520,7 +7539,7 @@ static void shader_glsl_generate_color_output(struct wined3d_string_buffer *buff dst_data_type = component_type_info[output->component_type].data_type; shader_addline(buffer, "color_out%u = ", output->semantic_idx); string_buffer_sprintf(src, "ps_out[%u]", output->semantic_idx); - shader_glsl_sprintf_cast(assignment, src->buffer, dst_data_type, WINED3D_DATA_FLOAT); + shader_glsl_sprintf_cast(assignment, src->buffer, dst_data_type, WINED3D_DATA_FLOAT, 4); swizzle = args->rt_alpha_swizzle & (1u << output->semantic_idx) ? ".argb" : ""; shader_addline(buffer, "%s%s;\n", assignment->buffer, swizzle); }

1 0

Zebediah Figura : strmbase: Always return VFW_E_TYPE_NOT_ACCEPTED if the pin_query_accept() callback fails.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: 44c91bcbb0a8611791b6dff3b58967e79270addc URL: https://source.winehq.org/git/wine.git/?a=commit;h=44c91bcbb0a8611791b6dff3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 6 16:49:10 2020 -0600 strmbase: Always return VFW_E_TYPE_NOT_ACCEPTED if the pin_query_accept() callback fails. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 4 ++-- dlls/quartz/tests/mpegsplit.c | 4 ++-- dlls/strmbase/pin.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index e3c20140bc..fa10f54a7c 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -1191,12 +1191,12 @@ static void test_connect_pin(void) req_mt.majortype = MEDIATYPE_Stream; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.majortype = MEDIATYPE_Video; req_mt.subtype = MEDIASUBTYPE_RGB32; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.subtype = GUID_NULL; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index d4972baa28..4d7ef7d582 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -1426,12 +1426,12 @@ static void test_connect_pin(void) req_mt.majortype = MEDIATYPE_Stream; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.majortype = MEDIATYPE_Audio; req_mt.subtype = MEDIASUBTYPE_PCM; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.subtype = GUID_NULL; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 18631410b7..305310fbc4 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -735,8 +735,8 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(struct strmbase_source *This, TRACE("(%p)->(%p, %p)\n", This, pReceivePin, pmt); - if ((hr = This->pFuncsTable->base.pin_query_accept(&This->pin, pmt)) != S_OK) - return hr; + if (This->pFuncsTable->base.pin_query_accept(&This->pin, pmt) != S_OK) + return VFW_E_TYPE_NOT_ACCEPTED; This->pin.peer = pReceivePin; IPin_AddRef(pReceivePin);

1 0

Zebediah Figura : qedit/samplegrabber: Use BaseOutputPinImpl_AttemptConnection().
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: a1a587a83ad5063d70d9c1ea7600b0f2b0cd90e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1a587a83ad5063d70d9c1ea… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 6 16:49:11 2020 -0600 qedit/samplegrabber: Use BaseOutputPinImpl_AttemptConnection(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 7652f70d95..398a5bb815 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -575,16 +575,12 @@ static HRESULT sample_grabber_source_get_media_type(struct strmbase_pin *iface, return VFW_S_NO_MORE_ITEMS; } -static HRESULT WINAPI sample_grabber_source_AttemptConnection(struct strmbase_source *iface, - IPin *peer, const AM_MEDIA_TYPE *mt) +static HRESULT WINAPI sample_grabber_source_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) { SG_Impl *filter = impl_from_source_pin(&iface->pin); - HRESULT hr; + const AM_MEDIA_TYPE *mt = &iface->pin.mt; - if (filter->source.pin.peer) - return VFW_E_ALREADY_CONNECTED; - if (filter->filter.state != State_Stopped) - return VFW_E_NOT_STOPPED; if (!IsEqualGUID(&mt->majortype, &filter->mtype.majortype)) return VFW_E_TYPE_NOT_ACCEPTED; if (!IsEqualGUID(&mt->subtype, &filter->mtype.subtype)) @@ -598,19 +594,7 @@ static HRESULT WINAPI sample_grabber_source_AttemptConnection(struct strmbase_so && !mt->pbFormat) return VFW_E_TYPE_NOT_ACCEPTED; - IPin_AddRef(filter->source.pin.peer = peer); - CopyMediaType(&filter->source.pin.mt, mt); - if (SUCCEEDED(hr = IPin_ReceiveConnection(peer, &filter->source.pin.IPin_iface, mt))) - hr = IPin_QueryInterface(peer, &IID_IMemInputPin, (void **)&filter->source.pMemInputPin); - - if (FAILED(hr)) - { - IPin_Release(filter->source.pin.peer); - filter->source.pin.peer = NULL; - FreeMediaType(&filter->source.pin.mt); - } - - return hr; + return S_OK; } static const struct strmbase_source_ops source_ops = @@ -618,7 +602,8 @@ static const struct strmbase_source_ops source_ops = .base.pin_query_interface = sample_grabber_source_query_interface, .base.pin_query_accept = sample_grabber_source_query_accept, .base.pin_get_media_type = sample_grabber_source_get_media_type, - .pfnAttemptConnection = sample_grabber_source_AttemptConnection, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = sample_grabber_source_DecideAllocator, }; HRESULT SampleGrabber_create(IUnknown *outer, void **out)

1 0

Zebediah Figura : d3d9: Reset the viewport and scissor rect for extended devices in d3d9_device_reset().
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: 542a13ad6c68cf25ccc75abf5e97c6199e0aee75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=542a13ad6c68cf25ccc75abf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 6 19:33:23 2020 -0600 d3d9: Reset the viewport and scissor rect for extended devices in d3d9_device_reset(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 22 ++++++++++++++++++++-- dlls/wined3d/device.c | 16 ---------------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index da884544ea..4dfc88a1a8 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1039,6 +1039,24 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, present_parameters->BackBufferCount = swapchain_desc.backbuffer_count; device->device_state = D3D9_DEVICE_STATE_OK; + + if (extended) + { + const struct wined3d_viewport *current = &wined3d_stateblock_get_state(device->state)->viewport; + struct wined3d_viewport vp; + RECT rect; + + vp.x = 0; + vp.y = 0; + vp.width = swapchain_desc.backbuffer_width; + vp.height = swapchain_desc.backbuffer_height; + vp.min_z = current->min_z; + vp.max_z = current->max_z; + wined3d_stateblock_set_viewport(device->state, &vp); + + SetRect(&rect, 0, 0, swapchain_desc.backbuffer_width, swapchain_desc.backbuffer_height); + wined3d_stateblock_set_scissor_rect(device->state, &rect); + } } rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0); @@ -2158,7 +2176,7 @@ static HRESULT WINAPI d3d9_device_GetViewport(IDirect3DDevice9Ex *iface, D3DVIEW TRACE("iface %p, viewport %p.\n", iface, viewport); wined3d_mutex_lock(); - wined3d_device_get_viewports(device->wined3d_device, NULL, &wined3d_viewport); + wined3d_viewport = wined3d_stateblock_get_state(device->state)->viewport; wined3d_mutex_unlock(); viewport->X = wined3d_viewport.x; @@ -2737,7 +2755,7 @@ static HRESULT WINAPI d3d9_device_GetScissorRect(IDirect3DDevice9Ex *iface, RECT TRACE("iface %p, rect %p.\n", iface, rect); wined3d_mutex_lock(); - wined3d_device_get_scissor_rects(device->wined3d_device, NULL, rect); + *rect = wined3d_stateblock_get_state(device->state)->scissor_rect; wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fc4933bd72..8405643741 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5576,24 +5576,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, device_load_logo(device, wined3d_settings.logo); } else if ((view = device->back_buffer_view)) - { - struct wined3d_state *state = &device->state; - wined3d_device_set_rendertarget_view(device, 0, view, FALSE); - /* Note the min_z / max_z is not reset. */ - state->viewports[0].x = 0; - state->viewports[0].y = 0; - state->viewports[0].width = view->width; - state->viewports[0].height = view->height; - state->viewport_count = 1; - wined3d_cs_emit_set_viewports(device->cs, 1, state->viewports); - - SetRect(&state->scissor_rects[0], 0, 0, view->width, view->height); - state->scissor_rect_count = 1; - wined3d_cs_emit_set_scissor_rects(device->cs, 1, state->scissor_rects); - } - if (device->d3d_initialized && reset_state) hr = device->adapter->adapter_ops->adapter_init_3d(device);

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetViewport().
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: 43fc245faa2174499168ca50a7e0c7345e7afe3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=43fc245faa2174499168ca50… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 6 19:33:24 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetViewport(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4dfc88a1a8..cff3a5c898 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2161,8 +2161,6 @@ static HRESULT WINAPI d3d9_device_SetViewport(IDirect3DDevice9Ex *iface, const D wined3d_mutex_lock(); wined3d_stateblock_set_viewport(device->update_state, &vp); - if (!device->recording) - wined3d_device_set_viewports(device->wined3d_device, 1, &vp); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d9: Retrieve the vertex declaration from the primary stateblock.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: c50d3468ccf7705d83daca368f9ab0bf944c211e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c50d3468ccf7705d83daca36… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 6 19:33:26 2020 -0600 d3d9: Retrieve the vertex declaration from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 3609dddb39..789f5a9c18 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3338,7 +3338,7 @@ static HRESULT WINAPI d3d9_device_GetVertexDeclaration(IDirect3DDevice9Ex *iface if (!declaration) return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - if ((wined3d_declaration = wined3d_device_get_vertex_declaration(device->wined3d_device))) + if ((wined3d_declaration = wined3d_stateblock_get_state(device->state)->vertex_declaration)) { declaration_impl = wined3d_vertex_declaration_get_parent(wined3d_declaration); *declaration = &declaration_impl->IDirect3DVertexDeclaration9_iface; @@ -3460,7 +3460,7 @@ static HRESULT WINAPI d3d9_device_GetFVF(IDirect3DDevice9Ex *iface, DWORD *fvf) TRACE("iface %p, fvf %p.\n", iface, fvf); wined3d_mutex_lock(); - if ((wined3d_declaration = wined3d_device_get_vertex_declaration(device->wined3d_device))) + if ((wined3d_declaration = wined3d_stateblock_get_state(device->state)->vertex_declaration)) { d3d9_declaration = wined3d_vertex_declaration_get_parent(wined3d_declaration); *fvf = d3d9_declaration->fvf;

1 0

Zebediah Figura : qedit/samplegrabber: Rename the "mtype" field to "filter_mt".
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: d11b31fdbe2f0268cf35e20ab2aefe46fa216df7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d11b31fdbe2f0268cf35e20a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 6 16:49:13 2020 -0600 qedit/samplegrabber: Rename the "mtype" field to "filter_mt". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 6a9dea0b9f..8f30ebe46e 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -43,7 +43,7 @@ typedef struct _SG_Impl { IUnknown *seekthru_unk; struct strmbase_sink sink; - AM_MEDIA_TYPE mtype; + AM_MEDIA_TYPE filter_mt; IMemInputPin IMemInputPin_iface; IMemAllocator *allocator; @@ -84,7 +84,7 @@ static void SampleGrabber_cleanup(SG_Impl *This) IMemAllocator_Release(This->allocator); if (This->grabberIface) ISampleGrabberCB_Release(This->grabberIface); - CoTaskMemFree(This->mtype.pbFormat); + CoTaskMemFree(This->filter_mt.pbFormat); CoTaskMemFree(This->bufferData); if(This->seekthru_unk) IUnknown_Release(This->seekthru_unk); @@ -236,15 +236,15 @@ SampleGrabber_ISampleGrabber_SetMediaType(ISampleGrabber *iface, const AM_MEDIA_ debugstr_guid(&type->majortype), debugstr_guid(&type->subtype), type->lSampleSize, debugstr_guid(&type->formattype), type->cbFormat); - CoTaskMemFree(This->mtype.pbFormat); - This->mtype = *type; - This->mtype.pUnk = NULL; + CoTaskMemFree(This->filter_mt.pbFormat); + This->filter_mt = *type; + This->filter_mt.pUnk = NULL; if (type->cbFormat) { - This->mtype.pbFormat = CoTaskMemAlloc(type->cbFormat); - CopyMemory(This->mtype.pbFormat, type->pbFormat, type->cbFormat); + This->filter_mt.pbFormat = CoTaskMemAlloc(type->cbFormat); + CopyMemory(This->filter_mt.pbFormat, type->pbFormat, type->cbFormat); } else - This->mtype.pbFormat = NULL; + This->filter_mt.pbFormat = NULL; return S_OK; } @@ -258,10 +258,10 @@ SampleGrabber_ISampleGrabber_GetConnectedMediaType(ISampleGrabber *iface, AM_MED return E_POINTER; if (!This->sink.pin.peer) return VFW_E_NOT_CONNECTED; - *type = This->mtype; + *type = This->filter_mt; if (type->cbFormat) { type->pbFormat = CoTaskMemAlloc(type->cbFormat); - CopyMemory(type->pbFormat, This->mtype.pbFormat, type->cbFormat); + CopyMemory(type->pbFormat, This->filter_mt.pbFormat, type->cbFormat); } return S_OK; } @@ -500,7 +500,7 @@ static HRESULT sample_grabber_sink_get_media_type(struct strmbase_pin *iface, if (!index) { - CopyMediaType(mt, &filter->mtype); + CopyMediaType(mt, &filter->filter_mt); return S_OK; } return VFW_S_NO_MORE_ITEMS; @@ -515,20 +515,20 @@ static HRESULT sample_grabber_sink_connect(struct strmbase_sink *iface, && !IsEqualGUID(&mt->formattype, &GUID_NULL) && !mt->pbFormat) return VFW_E_INVALIDMEDIATYPE; - if (!IsEqualGUID(&filter->mtype.majortype, &GUID_NULL) - && !IsEqualGUID(&filter->mtype.majortype, &mt->majortype)) + if (!IsEqualGUID(&filter->filter_mt.majortype, &GUID_NULL) + && !IsEqualGUID(&filter->filter_mt.majortype, &mt->majortype)) return VFW_E_TYPE_NOT_ACCEPTED; - if (!IsEqualGUID(&filter->mtype.subtype, &GUID_NULL) - && !IsEqualGUID(&filter->mtype.subtype, &mt->subtype)) + if (!IsEqualGUID(&filter->filter_mt.subtype, &GUID_NULL) + && !IsEqualGUID(&filter->filter_mt.subtype, &mt->subtype)) return VFW_E_TYPE_NOT_ACCEPTED; - if (!IsEqualGUID(&filter->mtype.formattype, &GUID_NULL) - && !IsEqualGUID(&filter->mtype.formattype, &mt->formattype)) + if (!IsEqualGUID(&filter->filter_mt.formattype, &GUID_NULL) + && !IsEqualGUID(&filter->filter_mt.formattype, &mt->formattype)) return VFW_E_TYPE_NOT_ACCEPTED; - FreeMediaType(&filter->mtype); - CopyMediaType(&filter->mtype, mt); + FreeMediaType(&filter->filter_mt); + CopyMediaType(&filter->filter_mt, mt); return S_OK; } @@ -568,7 +568,7 @@ static HRESULT sample_grabber_source_get_media_type(struct strmbase_pin *iface, if (!index) { - CopyMediaType(mt, &filter->mtype); + CopyMediaType(mt, &filter->filter_mt); return S_OK; } return VFW_S_NO_MORE_ITEMS; @@ -580,13 +580,13 @@ static HRESULT WINAPI sample_grabber_source_DecideAllocator(struct strmbase_sour SG_Impl *filter = impl_from_source_pin(&iface->pin); const AM_MEDIA_TYPE *mt = &iface->pin.mt; - if (!IsEqualGUID(&mt->majortype, &filter->mtype.majortype)) + if (!IsEqualGUID(&mt->majortype, &filter->filter_mt.majortype)) return VFW_E_TYPE_NOT_ACCEPTED; - if (!IsEqualGUID(&mt->subtype, &filter->mtype.subtype)) + if (!IsEqualGUID(&mt->subtype, &filter->filter_mt.subtype)) return VFW_E_TYPE_NOT_ACCEPTED; if (!IsEqualGUID(&mt->formattype, &FORMAT_None) && !IsEqualGUID(&mt->formattype, &GUID_NULL) - && !IsEqualGUID(&mt->formattype, &filter->mtype.formattype)) + && !IsEqualGUID(&mt->formattype, &filter->filter_mt.formattype)) return VFW_E_TYPE_NOT_ACCEPTED; if (!IsEqualGUID(&mt->formattype, &FORMAT_None) && !IsEqualGUID(&mt->formattype, &GUID_NULL)

1 0

Zebediah Figura : qedit/samplegrabber: Initialize the media type filter to use wild cards instead of "None" types.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: 94111ea281e3e0ed85208eeb0d2bce9f7b86e888 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94111ea281e3e0ed85208eeb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 6 16:49:12 2020 -0600 qedit/samplegrabber: Initialize the media type filter to use wild cards instead of "None" types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 398a5bb815..6a9dea0b9f 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -519,12 +519,11 @@ static HRESULT sample_grabber_sink_connect(struct strmbase_sink *iface, && !IsEqualGUID(&filter->mtype.majortype, &mt->majortype)) return VFW_E_TYPE_NOT_ACCEPTED; - if (!IsEqualGUID(&filter->mtype.subtype,&MEDIASUBTYPE_None) + if (!IsEqualGUID(&filter->mtype.subtype, &GUID_NULL) && !IsEqualGUID(&filter->mtype.subtype, &mt->subtype)) return VFW_E_TYPE_NOT_ACCEPTED; if (!IsEqualGUID(&filter->mtype.formattype, &GUID_NULL) - && !IsEqualGUID(&filter->mtype.formattype, &FORMAT_None) && !IsEqualGUID(&filter->mtype.formattype, &mt->formattype)) return VFW_E_TYPE_NOT_ACCEPTED; @@ -626,9 +625,6 @@ HRESULT SampleGrabber_create(IUnknown *outer, void **out) strmbase_sink_init(&obj->sink, &obj->filter, L"In", &sink_ops, NULL); strmbase_source_init(&obj->source, &obj->filter, L"Out", &source_ops); - obj->mtype.majortype = GUID_NULL; - obj->mtype.subtype = MEDIASUBTYPE_None; - obj->mtype.formattype = FORMAT_None; obj->allocator = NULL; obj->grabberIface = NULL; obj->grabberMethod = -1;

1 0

Andrew Wesie : psapi/tests: Test QueryWorkingSetEx.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: 533ef8d21a839eafe3539df84bbd7a1dfb157886 URL: https://source.winehq.org/git/wine.git/?a=commit;h=533ef8d21a839eafe3539df8… Author: Andrew Wesie <awesie(a)gmail.com> Date: Fri Jan 24 12:19:40 2020 -0800 psapi/tests: Test QueryWorkingSetEx. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 91 +++++++++++++++++++++++++++++++++++++++++++ include/psapi.h | 18 +++++++++ 2 files changed, 109 insertions(+) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 9799d2ffae..0df247e9bf 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -43,6 +43,7 @@ static NTSTATUS (WINAPI *pNtQueryVirtualMemory)(HANDLE, LPCVOID, ULONG, PVOID, S static BOOL (WINAPI *pIsWow64Process)(HANDLE, BOOL *); static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); +static BOOL (WINAPI *pQueryWorkingSetEx)(HANDLE, PVOID, DWORD); static BOOL wow64; @@ -53,6 +54,7 @@ static BOOL init_func_ptrs(void) pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); pWow64DisableWow64FsRedirection = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "Wow64DisableWow64FsRedirection"); pWow64RevertWow64FsRedirection = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "Wow64RevertWow64FsRedirection"); + pQueryWorkingSetEx = (void *)GetProcAddress(GetModuleHandleA("psapi.dll"), "QueryWorkingSetEx"); return TRUE; } @@ -791,6 +793,94 @@ free_page: VirtualFree(addr, 0, MEM_RELEASE); } +static void check_QueryWorkingSetEx(PVOID addr, const char *desc, DWORD expected_valid, + DWORD expected_protection, DWORD expected_shared, BOOL todo, BOOL todo_shared) +{ + PSAPI_WORKING_SET_EX_INFORMATION info; + BOOL ret; + + memset(&info, 0x41, sizeof(info)); + info.VirtualAddress = addr; + ret = pQueryWorkingSetEx(GetCurrentProcess(), &info, sizeof(info)); + ok(ret, "QueryWorkingSetEx failed with %d\n", GetLastError()); + + todo_wine_if(todo) + ok(info.VirtualAttributes.Valid == expected_valid, "%s expected Valid=%u but got %u\n", + desc, expected_valid, info.VirtualAttributes.Valid); + + todo_wine_if(todo) + ok(info.VirtualAttributes.Win32Protection == expected_protection, "%s expected Win32Protection=%u but got %u\n", + desc, expected_protection, info.VirtualAttributes.Win32Protection); + + ok(info.VirtualAttributes.Node == 0, "%s expected Node=0 but got %u\n", + desc, info.VirtualAttributes.Node); + ok(info.VirtualAttributes.LargePage == 0, "%s expected LargePage=0 but got %u\n", + desc, info.VirtualAttributes.LargePage); + + todo_wine_if(todo_shared) + ok(info.VirtualAttributes.Shared == expected_shared || broken(!info.VirtualAttributes.Valid) /* w2003 */, + "%s expected Shared=%u but got %u\n", desc, expected_shared, info.VirtualAttributes.Shared); + if (info.VirtualAttributes.Valid && info.VirtualAttributes.Shared) + ok(info.VirtualAttributes.ShareCount > 0, "%s expected ShareCount > 0 but got %u\n", + desc, info.VirtualAttributes.ShareCount); + else + ok(info.VirtualAttributes.ShareCount == 0, "%s expected ShareCount == 0 but got %u\n", + desc, info.VirtualAttributes.ShareCount); +} + +static void test_QueryWorkingSetEx(void) +{ + PVOID addr; + DWORD prot; + BOOL ret; + + if (pQueryWorkingSetEx == NULL) + { + win_skip("QueryWorkingSetEx not found, skipping tests\n"); + return; + } + + addr = GetModuleHandleA(NULL); + check_QueryWorkingSetEx(addr, "exe", 1, PAGE_READONLY, 1, FALSE, TRUE); + + ret = VirtualProtect(addr, 0x1000, PAGE_NOACCESS, &prot); + ok(ret, "VirtualProtect failed with %d\n", GetLastError()); + check_QueryWorkingSetEx(addr, "exe,noaccess", 0, 0, 1, FALSE, TRUE); + + ret = VirtualProtect(addr, 0x1000, prot, &prot); + ok(ret, "VirtualProtect failed with %d\n", GetLastError()); + check_QueryWorkingSetEx(addr, "exe,readonly1", 0, 0, 1, TRUE, TRUE); + + *(volatile char *)addr; + ok(ret, "VirtualProtect failed with %d\n", GetLastError()); + check_QueryWorkingSetEx(addr, "exe,readonly2", 1, PAGE_READONLY, 1, FALSE, TRUE); + + addr = VirtualAlloc(NULL, 0x1000, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE); + ok(addr != NULL, "VirtualAlloc failed with %d\n", GetLastError()); + check_QueryWorkingSetEx(addr, "valloc", 0, 0, 0, FALSE, FALSE); + + *(volatile char *)addr; + check_QueryWorkingSetEx(addr, "valloc,read", 1, PAGE_READWRITE, 0, FALSE, FALSE); + + *(volatile char *)addr = 0x42; + check_QueryWorkingSetEx(addr, "valloc,write", 1, PAGE_READWRITE, 0, FALSE, FALSE); + + ret = VirtualProtect(addr, 0x1000, PAGE_NOACCESS, &prot); + ok(ret, "VirtualProtect failed with %d\n", GetLastError()); + check_QueryWorkingSetEx(addr, "valloc,noaccess", 0, 0, 0, FALSE, FALSE); + + ret = VirtualProtect(addr, 0x1000, prot, &prot); + ok(ret, "VirtualProtect failed with %d\n", GetLastError()); + check_QueryWorkingSetEx(addr, "valloc,readwrite1", 0, 0, 0, TRUE, FALSE); + + *(volatile char *)addr; + check_QueryWorkingSetEx(addr, "valloc,readwrite2", 1, PAGE_READWRITE, 0, FALSE, FALSE); + + ret = VirtualFree(addr, 0, MEM_RELEASE); + ok(ret, "VirtualFree failed with %d\n", GetLastError()); + check_QueryWorkingSetEx(addr, "valloc,free", FALSE, 0, 0, FALSE, FALSE); +} + START_TEST(psapi_main) { DWORD pid = GetCurrentProcessId(); @@ -818,6 +908,7 @@ START_TEST(psapi_main) test_GetProcessImageFileName(); test_GetModuleFileNameEx(); test_GetModuleBaseName(); + test_QueryWorkingSetEx(); test_ws_functions(); CloseHandle(hpSR); diff --git a/include/psapi.h b/include/psapi.h index 742bf7b574..66e660b243 100644 --- a/include/psapi.h +++ b/include/psapi.h @@ -45,6 +45,24 @@ typedef struct _PROCESS_MEMORY_COUNTERS { } PROCESS_MEMORY_COUNTERS; typedef PROCESS_MEMORY_COUNTERS *PPROCESS_MEMORY_COUNTERS; +typedef union _PSAPI_WORKING_SET_EX_BLOCK { + ULONG_PTR Flags; + struct { + ULONG_PTR Valid :1; + ULONG_PTR ShareCount :3; + ULONG_PTR Win32Protection :11; + ULONG_PTR Shared :1; + ULONG_PTR Node :6; + ULONG_PTR Locked :1; + ULONG_PTR LargePage :1; + } DUMMYSTRUCTNAME; +} PSAPI_WORKING_SET_EX_BLOCK, *PPSAPI_WORKING_SET_EX_BLOCK; + +typedef struct _PSAPI_WORKING_SET_EX_INFORMATION { + PVOID VirtualAddress; + PSAPI_WORKING_SET_EX_BLOCK VirtualAttributes; +} PSAPI_WORKING_SET_EX_INFORMATION, *PPSAPI_WORKING_SET_EX_INFORMATION; + typedef struct _PSAPI_WS_WATCH_INFORMATION { LPVOID FaultingPc; LPVOID FaultingVa;

1 0