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

Henri Verbeet : wined3d: Use the bo binding in wined3d_context_gl_map_bo_address().
by Alexandre Julliard April 22, 2020

April 22, 2020

Module: wine Branch: master Commit: 7d43577d89e3be02372c472c95ad42d35bc456f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d43577d89e3be02372c472c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 22 18:00:42 2020 +0430 wined3d: Use the bo binding in wined3d_context_gl_map_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 8 +------- dlls/wined3d/context_gl.c | 14 +++++++------- dlls/wined3d/texture.c | 6 ++---- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index ec8a2cadd2..f2cbb06860 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4629,13 +4629,7 @@ static void adapter_gl_uninit_3d(struct wined3d_device *device) static void *adapter_gl_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, uint32_t bind_flags, uint32_t map_flags) { - struct wined3d_context_gl *context_gl; - GLenum binding; - - context_gl = wined3d_context_gl(context); - binding = wined3d_buffer_gl_binding_from_bind_flags(context_gl->gl_info, bind_flags); - - return wined3d_context_gl_map_bo_address(context_gl, data, size, binding, map_flags); + return wined3d_context_gl_map_bo_address(wined3d_context_gl(context), data, size, map_flags); } static void adapter_gl_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 4e0af7474c..2bb11c3068 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2525,7 +2525,7 @@ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLen } void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, - const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) + const struct wined3d_bo_address *data, size_t size, uint32_t flags) { const struct wined3d_gl_info *gl_info; struct wined3d_bo_gl *bo; @@ -2535,20 +2535,20 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, return data->addr; gl_info = context_gl->gl_info; - wined3d_context_gl_bind_bo(context_gl, binding, bo->id); + wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - memory = GL_EXTCALL(glMapBufferRange(binding, (INT_PTR)data->addr, + memory = GL_EXTCALL(glMapBufferRange(bo->binding, (INT_PTR)data->addr, size, wined3d_resource_gl_map_flags(flags))); } else { - memory = GL_EXTCALL(glMapBuffer(binding, wined3d_resource_gl_legacy_map_flags(flags))); + memory = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))); memory += (INT_PTR)data->addr; } - wined3d_context_gl_bind_bo(context_gl, binding, 0); + wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); checkGLcall("Map buffer object"); return memory; @@ -2604,8 +2604,8 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, } else { - src_ptr = wined3d_context_gl_map_bo_address(context_gl, src, size, src_bo->binding, WINED3D_MAP_READ); - dst_ptr = wined3d_context_gl_map_bo_address(context_gl, dst, size, dst_bo->binding, WINED3D_MAP_WRITE); + src_ptr = wined3d_context_gl_map_bo_address(context_gl, src, size, WINED3D_MAP_READ); + dst_ptr = wined3d_context_gl_map_bo_address(context_gl, dst, size, WINED3D_MAP_WRITE); memcpy(dst_ptr, src_ptr, size); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d075ccc9cd..e549a41309 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2160,8 +2160,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, return; } - src_mem = wined3d_context_gl_map_bo_address(context_gl, &bo, - src_slice_pitch * update_d, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); + src_mem = wined3d_context_gl_map_bo_address(context_gl, &bo, src_slice_pitch * update_d, WINED3D_MAP_READ); for (z = 0; z < update_d; ++z, src_mem += src_slice_pitch) { @@ -2811,8 +2810,7 @@ static BOOL wined3d_texture_gl_load_texture(struct wined3d_texture_gl *texture_g wined3d_format_calculate_pitch(format, device->surface_alignment, width, height, &dst_row_pitch, &dst_slice_pitch); - src_mem = wined3d_context_gl_map_bo_address(context_gl, &data, - src_slice_pitch, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); + src_mem = wined3d_context_gl_map_bo_address(context_gl, &data, src_slice_pitch, WINED3D_MAP_READ); if (!(dst_mem = heap_alloc(dst_slice_pitch))) { ERR("Out of memory (%u).\n", dst_slice_pitch); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5f0b1eee7f..f835432b68 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2200,7 +2200,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, const struct wined3d_stream_info *si, GLuint *current_bo, const struct wined3d_state *state) DECLSPEC_HIDDEN; void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, - const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) DECLSPEC_HIDDEN; + const struct wined3d_bo_address *data, size_t size, uint32_t flags) DECLSPEC_HIDDEN; struct wined3d_context_gl *wined3d_context_gl_reacquire(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; BOOL wined3d_context_gl_set_current(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : mf: Release presentation clock on sample grabber shutdown.
by Alexandre Julliard April 22, 2020

April 22, 2020

Module: wine Branch: master Commit: e49c550bdc76a0418f60a9adddb324a61743b8d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e49c550bdc76a0418f60a9ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 22 16:32:14 2020 +0300 mf: Release presentation clock on sample grabber shutdown. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 48 +++++++++++++++++++++++++++--------------------- dlls/mf/tests/mf.c | 5 +++-- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index bd5859d4f4..1919ce6220 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -956,6 +956,31 @@ static HRESULT WINAPI sample_grabber_sink_GetStreamSinkById(IMFMediaSink *iface, return hr; } +static void sample_grabber_set_presentation_clock(struct sample_grabber *grabber, IMFPresentationClock *clock) +{ + if (grabber->clock) + { + IMFPresentationClock_RemoveClockStateSink(grabber->clock, &grabber->IMFClockStateSink_iface); + IMFPresentationClock_Release(grabber->clock); + if (grabber->timer) + { + IMFTimer_Release(grabber->timer); + grabber->timer = NULL; + } + } + grabber->clock = clock; + if (grabber->clock) + { + IMFPresentationClock_AddRef(grabber->clock); + IMFPresentationClock_AddClockStateSink(grabber->clock, &grabber->IMFClockStateSink_iface); + if (FAILED(IMFPresentationClock_QueryInterface(grabber->clock, &IID_IMFTimer, (void **)&grabber->timer))) + { + WARN("Failed to get IMFTimer interface.\n"); + grabber->timer = NULL; + } + } +} + static HRESULT WINAPI sample_grabber_sink_SetPresentationClock(IMFMediaSink *iface, IMFPresentationClock *clock) { struct sample_grabber *grabber = impl_from_IMFMediaSink(iface); @@ -968,27 +993,7 @@ static HRESULT WINAPI sample_grabber_sink_SetPresentationClock(IMFMediaSink *ifa if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnSetPresentationClock(sample_grabber_get_callback(grabber), clock))) { - if (grabber->clock) - { - IMFPresentationClock_RemoveClockStateSink(grabber->clock, &grabber->IMFClockStateSink_iface); - IMFPresentationClock_Release(grabber->clock); - if (grabber->timer) - { - IMFTimer_Release(grabber->timer); - grabber->timer = NULL; - } - } - grabber->clock = clock; - if (grabber->clock) - { - IMFPresentationClock_AddRef(grabber->clock); - IMFPresentationClock_AddClockStateSink(grabber->clock, &grabber->IMFClockStateSink_iface); - if (FAILED(IMFPresentationClock_QueryInterface(grabber->clock, &IID_IMFTimer, (void **)&grabber->timer))) - { - WARN("Failed to get IMFTimer interface.\n"); - grabber->timer = NULL; - } - } + sample_grabber_set_presentation_clock(grabber, clock); } LeaveCriticalSection(&grabber->cs); @@ -1035,6 +1040,7 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) grabber->is_shut_down = TRUE; if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)))) { + sample_grabber_set_presentation_clock(grabber, NULL); IMFMediaEventQueue_Shutdown(grabber->stream_event_queue); IMFMediaEventQueue_Shutdown(grabber->event_queue); } diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 9e6b45e2f6..ae9f58a4bc 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2102,8 +2102,6 @@ static void test_sample_grabber(void) ok(hr == S_OK, "Failed to set time source, hr %#x.\n", hr); IMFPresentationTimeSource_Release(time_source); - IMFPresentationClock_Release(clock); - hr = IMFMediaSink_GetCharacteristics(sink, &flags); ok(hr == S_OK, "Failed to get sink flags, hr %#x.\n", hr); @@ -2221,8 +2219,10 @@ static void test_sample_grabber(void) hr = IMFStreamSink_GetEvent(stream, MF_EVENT_FLAG_NO_WAIT, &event); ok(hr == MF_E_NO_EVENTS_AVAILABLE, "Unexpected hr %#x.\n", hr); + EXPECT_REF(clock, 3); hr = IMFMediaSink_Shutdown(sink); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + EXPECT_REF(clock, 1); hr = IMFMediaEventGenerator_GetEvent(eg, MF_EVENT_FLAG_NO_WAIT, &event); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); @@ -2355,6 +2355,7 @@ static void test_sample_grabber(void) IMFActivate_Release(activate); IMFMediaType_Release(media_type); + IMFPresentationClock_Release(clock); hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);

1 0

Jacek Caban : server: Don't wait for client thread to enter suspended state in set_thread_context.
by Alexandre Julliard April 22, 2020

April 22, 2020

Module: wine Branch: master Commit: aa0c4bb5e72caf290b6588bc1f9931cc89a9feb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa0c4bb5e72caf290b6588bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 22 14:33:09 2020 +0200 server: Don't wait for client thread to enter suspended state in set_thread_context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 26 -------------------------- server/thread.c | 22 ++++------------------ 2 files changed, 4 insertions(+), 44 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index ee3c925f91..b8c270c16d 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -787,42 +787,16 @@ TEB_ACTIVE_FRAME * WINAPI RtlGetFrame(void) NTSTATUS set_thread_context( HANDLE handle, const context_t *context, BOOL *self ) { NTSTATUS ret; - DWORD dummy, i; SERVER_START_REQ( set_thread_context ) { req->handle = wine_server_obj_handle( handle ); - req->suspend = 1; wine_server_add_data( req, context, sizeof(*context) ); ret = wine_server_call( req ); *self = reply->self; } SERVER_END_REQ; - if (ret == STATUS_PENDING) - { - for (i = 0; i < 100; i++) - { - SERVER_START_REQ( set_thread_context ) - { - req->handle = wine_server_obj_handle( handle ); - req->suspend = 0; - wine_server_add_data( req, context, sizeof(*context) ); - ret = wine_server_call( req ); - } - SERVER_END_REQ; - if (ret == STATUS_PENDING) - { - LARGE_INTEGER timeout; - timeout.QuadPart = -10000; - NtDelayExecution( FALSE, &timeout ); - } - else break; - } - NtResumeThread( handle, &dummy ); - if (ret == STATUS_PENDING) ret = STATUS_ACCESS_DENIED; - } - return ret; } diff --git a/server/thread.c b/server/thread.c index 07be868d48..de508c6ace 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1859,35 +1859,21 @@ DECL_HANDLER(set_thread_context) if (!(thread = get_thread_from_handle( req->handle, THREAD_SET_CONTEXT ))) return; reply->self = (thread == current); - if (thread != current && (!thread->context || thread->context->status == STATUS_PENDING)) - { - /* thread is not suspended, retry (if it's still running) */ - if (thread->state == RUNNING) - { - set_error( STATUS_PENDING ); - if (req->suspend) - { - release_object( thread ); - /* make sure we have suspend access */ - if (!(thread = get_thread_from_handle( req->handle, THREAD_SUSPEND_RESUME ))) return; - suspend_thread( thread ); - } - } - else set_error( STATUS_UNSUCCESSFUL ); - } - else if (context->cpu == thread->process->cpu) + if (thread->state == TERMINATED) set_error( STATUS_UNSUCCESSFUL ); + else if (context->cpu != thread->process->cpu) set_error( STATUS_INVALID_PARAMETER ); + else { unsigned int system_flags = get_context_system_regs(context->cpu) & context->flags; unsigned int client_flags = context->flags & ~system_flags; if (system_flags) set_thread_context( thread, context, system_flags ); + if (thread != current && !get_error()) stop_thread( thread ); if (thread->context && !get_error()) { copy_context( &thread->context->regs, context, context->flags ); thread->context->regs.flags |= client_flags; } } - else set_error( STATUS_INVALID_PARAMETER ); release_object( thread ); }

1 0

Henri Verbeet : wined3d: Drop the "bind_flags" parameter to wined3d_adapter_ops.adapter_map_bo_address().
by Alexandre Julliard April 22, 2020

April 22, 2020

Module: wine Branch: master Commit: 32d17f1e9afd34cc432bd6fa0eef8c5731ad22c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32d17f1e9afd34cc432bd6fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 22 18:00:46 2020 +0430 wined3d: Drop the "bind_flags" parameter to wined3d_adapter_ops.adapter_map_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/adapter_vk.c | 6 +++--- dlls/wined3d/buffer.c | 6 ++---- dlls/wined3d/directx.c | 2 +- dlls/wined3d/surface.c | 12 ++++++------ dlls/wined3d/texture.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 6 +++--- 7 files changed, 20 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=32d17f1e9afd34cc432b…

1 0

Zhiyi Zhang : winex11.drv: Allocate LUID for GPUs.
by Alexandre Julliard April 22, 2020

April 22, 2020

Module: wine Branch: master Commit: de94f8a1d6804b3629b3f5f841bd0bfeb375cbdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=de94f8a1d6804b3629b3f5f8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 21 20:12:30 2020 +0800 winex11.drv: Allocate LUID for GPUs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 7ad74c9b4e..4429cb8922 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -39,6 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); + /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); @@ -278,9 +280,11 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; + DEVPROPTYPE property_type; WCHAR bufferW[1024]; HKEY hkey = NULL; GUID guid; + LUID luid; INT written; DWORD size; BOOL ret = FALSE; @@ -306,6 +310,20 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g (const BYTE *)&present, sizeof(present), 0)) goto done; + /* Write DEVPROPKEY_GPU_LUID property */ + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &property_type, + (BYTE *)&luid, sizeof(luid), NULL, 0)) + { + if (!AllocateLocallyUniqueId(&luid)) + goto done; + + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, + DEVPROP_TYPE_UINT64, (const BYTE *)&luid, sizeof(luid), 0)) + goto done; + } + TRACE("GPU id:0x%s name:%s LUID:%08x:%08x.\n", wine_dbgstr_longlong(gpu->id), + wine_dbgstr_w(gpu->name), luid.HighPart, luid.LowPart); + /* Open driver key. * This is where HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} links to */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL);

1 0

Zebediah Figura : strmbase: Make the pin_query_accept() callback optional.
by Alexandre Julliard April 22, 2020

April 22, 2020

Module: wine Branch: master Commit: a0251e33543df35d373eaf8b9d35cdbae91a9413 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0251e33543df35d373eaf8b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 20:29:34 2020 -0500 strmbase: Make the pin_query_accept() callback optional. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index d9d25f7627..b5f8092e9e 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -391,6 +391,13 @@ static HRESULT WINAPI pin_QueryId(IPin *iface, WCHAR **id) return S_OK; } +static BOOL query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt) +{ + if (pin->ops->pin_query_accept && pin->ops->pin_query_accept(pin, mt) != S_OK) + return FALSE; + return TRUE; +} + static HRESULT WINAPI pin_QueryAccept(IPin *iface, const AM_MEDIA_TYPE *mt) { struct strmbase_pin *pin = impl_from_IPin(iface); @@ -398,7 +405,7 @@ static HRESULT WINAPI pin_QueryAccept(IPin *iface, const AM_MEDIA_TYPE *mt) TRACE("pin %p %s:%s, mt %p.\n", pin, debugstr_w(pin->filter->name), debugstr_w(pin->name), mt); strmbase_dump_media_type(mt); - return (pin->ops->pin_query_accept(pin, mt) == S_OK ? S_OK : S_FALSE); + return query_accept(pin, mt) ? S_OK : S_FALSE; } static HRESULT WINAPI pin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_media_types) @@ -763,7 +770,7 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(struct strmbase_source *This, TRACE("(%p)->(%p, %p)\n", This, pReceivePin, pmt); - if (This->pFuncsTable->base.pin_query_accept(&This->pin, pmt) != S_OK) + if (!query_accept(&This->pin, pmt)) return VFW_E_TYPE_NOT_ACCEPTED; This->pin.peer = pReceivePin; @@ -871,7 +878,7 @@ static HRESULT WINAPI sink_ReceiveConnection(IPin *iface, IPin *pReceivePin, con if (This->pin.peer) hr = VFW_E_ALREADY_CONNECTED; - if (SUCCEEDED(hr) && This->pin.ops->pin_query_accept(&This->pin, pmt) != S_OK) + if (SUCCEEDED(hr) && !query_accept(&This->pin, pmt)) hr = VFW_E_TYPE_NOT_ACCEPTED; /* FIXME: shouldn't we just map common errors onto * VFW_E_TYPE_NOT_ACCEPTED and pass the value on otherwise? */

1 0

Alexandre Julliard : ntdll: Add a helper function to allocate module dependencies.
by Alexandre Julliard April 22, 2020

April 22, 2020

Module: wine Branch: master Commit: d2b70aa57a77103107a2e620999181c518d14bda URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2b70aa57a77103107a2e620… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 22 16:01:55 2020 +0200 ntdll: Add a helper function to allocate module dependencies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b457d60f6b..04ea7ea121 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -599,6 +599,27 @@ static WINE_MODREF *find_so_module( void *handle ) } +/************************************************************************* + * grow_module_deps + */ +static WINE_MODREF **grow_module_deps( WINE_MODREF *wm, int count ) +{ + WINE_MODREF **deps; + + if (wm->alloc_deps) + deps = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, wm->deps, + (wm->alloc_deps + count) * sizeof(*deps) ); + else + deps = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, count * sizeof(*deps) ); + + if (deps) + { + wm->deps = deps; + wm->alloc_deps += count; + } + return deps; +} + /************************************************************************* * find_forwarded_export * @@ -632,18 +653,8 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS { if (!imports_fixup_done && current_modref) { - WINE_MODREF **deps; - if (current_modref->alloc_deps) - deps = RtlReAllocateHeap( GetProcessHeap(), 0, current_modref->deps, - (current_modref->alloc_deps + 1) * sizeof(*deps) ); - else - deps = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*deps) ); - if (deps) - { - deps[current_modref->nDeps++] = wm; - current_modref->deps = deps; - current_modref->alloc_deps++; - } + WINE_MODREF **deps = grow_module_deps( current_modref, 1 ); + if (deps) deps[current_modref->nDeps++] = wm; } else if (process_attach( wm, NULL ) != STATUS_SUCCESS) { @@ -1087,9 +1098,8 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void * if (!(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) return STATUS_SUCCESS; /* already done */ wm->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS; + if (!grow_module_deps( wm, 1 )) return STATUS_NO_MEMORY; wm->nDeps = 1; - wm->alloc_deps = 1; - wm->deps = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(WINE_MODREF *) ); prev = current_modref; current_modref = wm; @@ -1144,14 +1154,11 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) while (imports[nb_imports].Name && imports[nb_imports].FirstThunk) nb_imports++; if (!nb_imports) return STATUS_SUCCESS; /* no imports */ + if (!grow_module_deps( wm, nb_imports )) return STATUS_NO_MEMORY; if (!create_module_activation_context( &wm->ldr )) RtlActivateActivationContext( 0, wm->ldr.ActivationContext, &cookie ); - /* Allocate module dependency list */ - wm->alloc_deps = nb_imports; - wm->deps = RtlAllocateHeap( GetProcessHeap(), 0, nb_imports*sizeof(WINE_MODREF *) ); - /* load the imported modules. They are automatically * added to the modref list of the process. */

1 0

Jacek Caban : server: Don't change context flags in copy_context.
by Alexandre Julliard April 22, 2020

April 22, 2020

Module: wine Branch: master Commit: 89b4bdd6cd173db729f6ef9f8389a40d463ded68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89b4bdd6cd173db729f6ef9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 22 14:31:01 2020 +0200 server: Don't change context flags in copy_context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/server/thread.c b/server/thread.c index 9c22d83a9d..0d3cb28f5c 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1202,7 +1202,6 @@ void kill_thread( struct thread *thread, int violent_death ) static void copy_context( context_t *to, const context_t *from, unsigned int flags ) { assert( to->cpu == from->cpu ); - to->flags |= flags; if (flags & SERVER_CTX_CONTROL) to->ctl = from->ctl; if (flags & SERVER_CTX_INTEGER) to->integer = from->integer; if (flags & SERVER_CTX_SEGMENTS) to->seg = from->seg; @@ -1776,7 +1775,11 @@ DECL_HANDLER(get_thread_context) memset( context, 0, sizeof(context_t) ); context->cpu = thread->process->cpu; - if (thread->context) copy_context( context, thread->context, req->flags & ~flags ); + if (thread->context) + { + copy_context( context, thread->context, req->flags & ~flags ); + context->flags |= req->flags & ~flags; + } if (req->flags & flags) get_thread_context( thread, context, req->flags & flags ); } release_object( thread ); @@ -1818,7 +1821,11 @@ DECL_HANDLER(set_thread_context) unsigned int client_flags = context->flags & ~system_flags; if (system_flags) set_thread_context( thread, context, system_flags ); - if (thread->context && !get_error()) copy_context( thread->context, context, client_flags ); + if (thread->context && !get_error()) + { + copy_context( thread->context, context, client_flags ); + thread->context->flags |= client_flags; + } } else set_error( STATUS_INVALID_PARAMETER );

1 0

Zebediah Figura : qcap/tests: Remove some no longer necessary callbacks.
by Alexandre Julliard April 22, 2020

April 22, 2020

Module: wine Branch: master Commit: f88567ac15b1b5b39442f93f06933659bd8bb537 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f88567ac15b1b5b39442f93f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 20:29:35 2020 -0500 qcap/tests: Remove some no longer necessary callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/capturegraph.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/qcap/tests/capturegraph.c b/dlls/qcap/tests/capturegraph.c index 49b4f8c6b9..c37ac51573 100644 --- a/dlls/qcap/tests/capturegraph.c +++ b/dlls/qcap/tests/capturegraph.c @@ -194,11 +194,6 @@ static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid return S_OK; } -static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT testsource_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { struct testfilter *filter = impl_from_strmbase_filter(iface->filter); @@ -222,7 +217,6 @@ static HRESULT WINAPI testsource_DecideBufferSize(struct strmbase_source *iface, static const struct strmbase_source_ops testsource_ops = { .base.pin_query_interface = testsource_query_interface, - .base.pin_query_accept = testsource_query_accept, .base.pin_get_media_type = testsource_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, @@ -264,7 +258,6 @@ static const struct strmbase_sink_ops testsink_ops = { .base.pin_query_interface = testsink_query_interface, .base.pin_query_accept = testsink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, }; static void reset_interfaces(struct testfilter *filter)

1 0

Roman Pišl : wineconsole: Don't allow recurrent resizing while grabbing changes.
by Alexandre Julliard April 22, 2020

April 22, 2020

Module: wine Branch: master Commit: 3d2277e04a7438cd25ad8cb7325bbb6773a18ec4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d2277e04a7438cd25ad8cb7… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Tue Apr 21 22:09:55 2020 +0200 wineconsole: Don't allow recurrent resizing while grabbing changes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48747 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 4b65e68939..38a8c71163 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -92,7 +92,7 @@ void WINECON_ResizeWithContainer(struct inner_data* data, int width, int height) { struct config_data cfg; - if (data->in_set_config) return; + if (data->in_set_config || data->in_grab_changes) return; cfg = data->curcfg; cfg.win_width = width;

1 0