- wine-devel - winehq.org

[PATCH 1/5] strmbase: Get rid of BaseRendererImpl_QueryInterface().
by Zebediah Figura 06 Jun '19

06 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/renderer.c | 16 ---------------- include/wine/strmbase.h | 1 - 2 files changed, 17 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 6f0bc2dfcd..1017c8c574 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -289,22 +289,6 @@ HRESULT WINAPI strmbase_renderer_init(BaseRenderer *This, const IBaseFilterVtbl return hr; } -HRESULT WINAPI BaseRendererImpl_QueryInterface(IBaseFilter* iface, REFIID riid, LPVOID * ppv) -{ - BaseRenderer *This = impl_from_IBaseFilter(iface); - - if (IsEqualIID(riid, &IID_IMediaSeeking) || IsEqualIID(riid, &IID_IMediaPosition)) - return IUnknown_QueryInterface(This->pPosition, riid, ppv); - else if (IsEqualIID(riid, &IID_IQualityControl)) - { - *ppv = &This->qcimpl->IQualityControl_iface; - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - else - return BaseFilterImpl_QueryInterface(iface, riid, ppv); -} - void strmbase_renderer_cleanup(BaseRenderer *filter) { IPin *peer; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 87396fdf58..7ee8be668c 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -611,7 +611,6 @@ typedef struct BaseRendererFuncTable { HRESULT (*renderer_query_interface)(BaseRenderer *iface, REFIID iid, void **out); } BaseRendererFuncTable; -HRESULT WINAPI BaseRendererImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv); HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSample); HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface); HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart); -- 2.20.1

2 5

[PATCH 1/5] hidclass.sys: Use PDRIVER_ADD_DEVICE.
by Zebediah Figura 06 Jun '19

06 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/hidclass.sys/hid.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index ff2e7eff47..b9bf13579f 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -34,8 +34,6 @@ #define DEFAULT_POLL_INTERVAL 200 #define MAX_POLL_INTERVAL_MSEC 10000 -typedef NTSTATUS (WINAPI *pAddDevice)(DRIVER_OBJECT *DriverObject, DEVICE_OBJECT *PhysicalDeviceObject); - /* Ring buffer functions */ struct ReportRingBuffer; @@ -85,7 +83,7 @@ typedef struct _minidriver PDRIVER_UNLOAD DriverUnload; - pAddDevice AddDevice; + PDRIVER_ADD_DEVICE AddDevice; PDRIVER_DISPATCH PNPDispatch; struct list device_list; } minidriver; -- 2.20.1

1 4

[PATCH] mf: Implement clock-synchronized mode for ProcessSample() in sample grabber sink.
by Nikolay Sivov 06 Jun '19

06 Jun '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 228 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 209 insertions(+), 19 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index d19496d7f8..3f9644432d 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -25,6 +25,7 @@ #include "wine/debug.h" #include "wine/heap.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -36,13 +37,24 @@ enum sink_state struct sample_grabber; +struct scheduled_sample +{ + struct list entry; + IMFSample *sample; +}; + struct sample_grabber_stream { IMFStreamSink IMFStreamSink_iface; IMFMediaTypeHandler IMFMediaTypeHandler_iface; + IMFAsyncCallback timer_callback; LONG refcount; struct sample_grabber *sink; IMFMediaEventQueue *event_queue; + enum sink_state state; + struct list samples; + IUnknown *cancel_key; + CRITICAL_SECTION cs; }; struct sample_grabber @@ -57,8 +69,9 @@ struct sample_grabber struct sample_grabber_stream *stream; IMFMediaEventQueue *event_queue; IMFPresentationClock *clock; - enum sink_state state; + IMFTimer *timer; UINT32 ignore_clock; + UINT64 sample_time_offset; CRITICAL_SECTION cs; }; @@ -101,6 +114,11 @@ static struct sample_grabber_stream *impl_from_IMFMediaTypeHandler(IMFMediaTypeH return CONTAINING_RECORD(iface, struct sample_grabber_stream, IMFMediaTypeHandler_iface); } +static struct sample_grabber_stream *impl_from_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct sample_grabber_stream, timer_callback); +} + static HRESULT WINAPI sample_grabber_stream_QueryInterface(IMFStreamSink *iface, REFIID riid, void **obj) { struct sample_grabber_stream *stream = impl_from_IMFStreamSink(iface); @@ -138,22 +156,41 @@ static ULONG WINAPI sample_grabber_stream_AddRef(IMFStreamSink *iface) return refcount; } +static void stream_release_pending_entry(struct sample_grabber_stream *stream, struct scheduled_sample *sample) +{ + list_remove(&sample->entry); + IMFSample_Release(sample->sample); + heap_free(sample); +} + static ULONG WINAPI sample_grabber_stream_Release(IMFStreamSink *iface) { struct sample_grabber_stream *stream = impl_from_IMFStreamSink(iface); ULONG refcount = InterlockedDecrement(&stream->refcount); + struct scheduled_sample *sample, *next_sample; TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) { if (stream->sink) + { IMFMediaSink_Release(&stream->sink->IMFMediaSink_iface); + if (stream->sink->timer && stream->cancel_key) + IMFTimer_CancelTimer(stream->sink->timer, stream->cancel_key); + } + if (stream->cancel_key) + IUnknown_Release(stream->cancel_key); if (stream->event_queue) { IMFMediaEventQueue_Shutdown(stream->event_queue); IMFMediaEventQueue_Release(stream->event_queue); } + LIST_FOR_EACH_ENTRY_SAFE(sample, next_sample, &stream->samples, struct scheduled_sample, entry) + { + stream_release_pending_entry(stream, sample); + } + DeleteCriticalSection(&stream->cs); heap_free(stream); } @@ -284,6 +321,58 @@ static HRESULT sample_grabber_report_sample(struct sample_grabber *grabber, IMFS return hr; } +static HRESULT stream_schedule_sample(struct sample_grabber_stream *stream, struct scheduled_sample *pending) +{ + LONGLONG sampletime; + HRESULT hr; + + if (!stream->sink) + return MF_E_STREAMSINK_REMOVED; + + if (FAILED(hr = IMFSample_GetSampleTime(pending->sample, &sampletime))) + return hr; + + if (stream->cancel_key) + { + IUnknown_Release(stream->cancel_key); + stream->cancel_key = NULL; + } + + if (FAILED(hr = IMFTimer_SetTimer(stream->sink->timer, 0, sampletime - stream->sink->sample_time_offset, + &stream->timer_callback, NULL, &stream->cancel_key))) + { + stream->cancel_key = NULL; + } + + return hr; +} + +static HRESULT stream_queue_sample(struct sample_grabber_stream *stream, IMFSample *sample) +{ + struct scheduled_sample *pending; + LONGLONG sampletime; + HRESULT hr; + + if (FAILED(hr = IMFSample_GetSampleTime(sample, &sampletime))) + return hr; + + if (!(pending = heap_alloc_zero(sizeof(*pending)))) + return E_OUTOFMEMORY; + + pending->sample = sample; + IMFSample_AddRef(pending->sample); + list_init(&pending->entry); + if (list_empty(&stream->samples)) + hr = stream_schedule_sample(stream, pending); + + if (SUCCEEDED(hr)) + list_add_tail(&stream->samples, &pending->entry); + else + stream_release_pending_entry(stream, pending); + + return hr; +} + static HRESULT WINAPI sample_grabber_stream_ProcessSample(IMFStreamSink *iface, IMFSample *sample) { struct sample_grabber_stream *stream = impl_from_IMFStreamSink(iface); @@ -298,9 +387,9 @@ static HRESULT WINAPI sample_grabber_stream_ProcessSample(IMFStreamSink *iface, if (!stream->sink) return MF_E_STREAMSINK_REMOVED; - EnterCriticalSection(&stream->sink->cs); + EnterCriticalSection(&stream->cs); - if (stream->sink->state == SINK_STATE_RUNNING) + if (stream->state == SINK_STATE_RUNNING) { hr = IMFSample_GetSampleTime(sample, &sampletime); @@ -309,11 +398,11 @@ static HRESULT WINAPI sample_grabber_stream_ProcessSample(IMFStreamSink *iface, if (stream->sink->ignore_clock) hr = sample_grabber_report_sample(stream->sink, sample); else - FIXME("Sample scheduling is not implemented.\n"); + hr = stream_queue_sample(stream, sample); } } - LeaveCriticalSection(&stream->sink->cs); + LeaveCriticalSection(&stream->cs); return hr; } @@ -480,6 +569,87 @@ static const IMFMediaTypeHandlerVtbl sample_grabber_stream_type_handler_vtbl = sample_grabber_stream_type_handler_GetMajorType, }; +static HRESULT WINAPI sample_grabber_stream_timer_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, + void **obj) +{ + if (IsEqualIID(riid, &IID_IMFAsyncCallback) || IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncCallback_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI sample_grabber_stream_timer_callback_AddRef(IMFAsyncCallback *iface) +{ + struct sample_grabber_stream *stream = impl_from_IMFAsyncCallback(iface); + return IMFStreamSink_AddRef(&stream->IMFStreamSink_iface); +} + +static ULONG WINAPI sample_grabber_stream_timer_callback_Release(IMFAsyncCallback *iface) +{ + struct sample_grabber_stream *stream = impl_from_IMFAsyncCallback(iface); + return IMFStreamSink_Release(&stream->IMFStreamSink_iface); +} + +static HRESULT WINAPI sample_grabber_stream_timer_callback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, + DWORD *queue) +{ + return E_NOTIMPL; +} + +static struct scheduled_sample *stream_get_next_sample(struct sample_grabber_stream *stream) +{ + struct scheduled_sample *sample = NULL; + struct list *e; + + if ((e = list_head(&stream->samples))) + sample = LIST_ENTRY(e, struct scheduled_sample, entry); + + return sample; +} + +static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct sample_grabber_stream *stream = impl_from_IMFAsyncCallback(iface); + struct scheduled_sample *sample; + HRESULT hr; + + EnterCriticalSection(&stream->cs); + + /* Report and schedule next. */ + if (stream->sink && (sample = stream_get_next_sample(stream))) + { + if (FAILED(hr = sample_grabber_report_sample(stream->sink, sample->sample))) + WARN("Failed to report a sample, hr %#x.\n", hr); + + stream_release_pending_entry(stream, sample); + + if ((sample = stream_get_next_sample(stream))) + { + if (FAILED(hr = stream_schedule_sample(stream, sample))) + WARN("Failed to schedule a sample, hr %#x.\n", hr); + } + } + + LeaveCriticalSection(&stream->cs); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl sample_grabber_stream_timer_callback_vtbl = +{ + sample_grabber_stream_timer_callback_QueryInterface, + sample_grabber_stream_timer_callback_AddRef, + sample_grabber_stream_timer_callback_Release, + sample_grabber_stream_timer_callback_GetParameters, + sample_grabber_stream_timer_callback_Invoke, +}; + static HRESULT WINAPI sample_grabber_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) { struct sample_grabber *grabber = impl_from_IMFMediaSink(iface); @@ -539,6 +709,8 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) } if (grabber->clock) IMFPresentationClock_Release(grabber->clock); + if (grabber->timer) + IMFTimer_Release(grabber->timer); DeleteCriticalSection(&grabber->cs); heap_free(grabber); } @@ -661,12 +833,22 @@ static HRESULT WINAPI sample_grabber_sink_SetPresentationClock(IMFMediaSink *ifa { 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; + } } } @@ -715,7 +897,9 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(grabber->callback))) { IMFMediaSink_Release(&grabber->stream->sink->IMFMediaSink_iface); + EnterCriticalSection(&grabber->stream->cs); grabber->stream->sink = NULL; + LeaveCriticalSection(&grabber->stream->cs); IMFStreamSink_Release(&grabber->stream->IMFStreamSink_iface); grabber->stream = NULL; } @@ -769,23 +953,25 @@ static void sample_grabber_set_state(struct sample_grabber *grabber, enum sink_s EnterCriticalSection(&grabber->cs); - switch (grabber->state) + if (grabber->stream) { - case SINK_STATE_STOPPED: - set_state = state == SINK_STATE_RUNNING; - break; - case SINK_STATE_RUNNING: - set_state = state == SINK_STATE_STOPPED; - break; - default: - ; - } + switch (grabber->stream->state) + { + case SINK_STATE_STOPPED: + set_state = state == SINK_STATE_RUNNING; + break; + case SINK_STATE_RUNNING: + set_state = state == SINK_STATE_STOPPED; + break; + default: + ; + } - if (set_state) - { - grabber->state = state; - if (grabber->stream) + if (set_state) + { + grabber->stream->state = state; IMFStreamSink_QueueEvent(&grabber->stream->IMFStreamSink_iface, events[state], &GUID_NULL, S_OK, NULL); + } } LeaveCriticalSection(&grabber->cs); @@ -929,9 +1115,12 @@ static HRESULT sample_grabber_create_stream(struct sample_grabber *sink, struct object->IMFStreamSink_iface.lpVtbl = &sample_grabber_stream_vtbl; object->IMFMediaTypeHandler_iface.lpVtbl = &sample_grabber_stream_type_handler_vtbl; + object->timer_callback.lpVtbl = &sample_grabber_stream_timer_callback_vtbl; object->refcount = 1; object->sink = sink; IMFMediaSink_AddRef(&object->sink->IMFMediaSink_iface); + list_init(&object->samples); + InitializeCriticalSection(&object->cs); if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) goto failed; @@ -972,6 +1161,7 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use object->media_type = context->media_type; IMFMediaType_AddRef(object->media_type); IMFAttributes_GetUINT32(attributes, &MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, &object->ignore_clock); + IMFAttributes_GetUINT64(attributes, &MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET, &object->sample_time_offset); InitializeCriticalSection(&object->cs); if (FAILED(hr = sample_grabber_create_stream(object, &object->stream))) -- 2.20.1

1 0

[PATCH 5/5] wined3d: Create a blitter for the Vulkan adapter.
by Henri Verbeet 06 Jun '19

06 Jun '19

The CPU blitter isn't the fastest, but it should work. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 00098182c1a..0dc64580702 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -416,12 +416,14 @@ static BOOL adapter_vk_check_format(const struct wined3d_adapter *adapter, static HRESULT adapter_vk_init_3d(struct wined3d_device *device) { + struct wined3d_device_vk *device_vk; struct wined3d_context *context_vk; HRESULT hr; TRACE("device %p.\n", device); - context_vk = &wined3d_device_vk(device)->context_vk; + device_vk = wined3d_device_vk(device); + context_vk = &device_vk->context_vk; if (FAILED(hr = wined3d_context_vk_init(context_vk, device->swapchains[0]))) { WARN("Failed to initialise context.\n"); @@ -437,6 +439,14 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) TRACE("Initialised context %p.\n", context_vk); + if (!(device_vk->d.blitter = wined3d_cpu_blitter_create())) + { + ERR("Failed to create CPU blitter.\n"); + device_context_remove(device, context_vk); + wined3d_context_cleanup(context_vk); + return E_FAIL; + } + return WINED3D_OK; } @@ -446,6 +456,8 @@ static void adapter_vk_uninit_3d(struct wined3d_device *device) TRACE("device %p.\n", device); + device->blitter->ops->blitter_destroy(device->blitter, NULL); + context_vk = &wined3d_device_vk(device)->context_vk; device_context_remove(device, context_vk); wined3d_context_cleanup(context_vk); -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to context_reacquire().
by Henri Verbeet 06 Jun '19

06 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 25 +++---- dlls/wined3d/query.c | 148 ++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 3 +- 3 files changed, 86 insertions(+), 90 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0f107502f5c..2e562844194 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4259,27 +4259,28 @@ struct wined3d_context *wined3d_context_gl_acquire(const struct wined3d_device * return context; } -struct wined3d_context *context_reacquire(struct wined3d_device *device, - struct wined3d_context *context) +struct wined3d_context_gl *wined3d_context_gl_reacquire(struct wined3d_context_gl *context_gl) { struct wined3d_context *acquired_context; + struct wined3d_device *device; - wined3d_from_cs(device->cs); - - if (!context || context->tid != GetCurrentThreadId()) + if (!context_gl || context_gl->c.tid != GetCurrentThreadId()) return NULL; - if (context->current_rt.texture) + device = context_gl->c.device; + wined3d_from_cs(device->cs); + + if (context_gl->c.current_rt.texture) { - wined3d_context_gl_activate(wined3d_context_gl(context), - context->current_rt.texture, context->current_rt.sub_resource_idx); - return context; + wined3d_context_gl_activate(context_gl, context_gl->c.current_rt.texture, + context_gl->c.current_rt.sub_resource_idx); + return context_gl; } acquired_context = context_acquire(device, NULL, 0); - if (acquired_context != context) - ERR("Acquired context %p instead of %p.\n", acquired_context, context); - return acquired_context; + if (acquired_context != &context_gl->c) + ERR("Acquired context %p instead of %p.\n", acquired_context, &context_gl->c); + return wined3d_context_gl(acquired_context); } void dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index eeec8e25098..58e757c855b 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -183,7 +183,7 @@ static enum wined3d_fence_result wined3d_fence_test(const struct wined3d_fence * struct wined3d_device *device, DWORD flags) { const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; enum wined3d_fence_result ret; BOOL fence_result; @@ -195,16 +195,16 @@ static enum wined3d_fence_result wined3d_fence_test(const struct wined3d_fence * return WINED3D_FENCE_NOT_STARTED; } - if (!(context = context_reacquire(device, &fence->context_gl->c))) + if (!(context_gl = wined3d_context_gl_reacquire(fence->context_gl))) { if (!fence->context_gl->c.gl_info->supported[ARB_SYNC]) { WARN("Fence tested from wrong thread.\n"); return WINED3D_FENCE_WRONG_THREAD; } - context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context_acquire(device, NULL, 0)); } - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; if (gl_info->supported[ARB_SYNC]) { @@ -253,7 +253,7 @@ static enum wined3d_fence_result wined3d_fence_test(const struct wined3d_fence * ret = WINED3D_FENCE_ERROR; } - context_release(context); + context_release(&context_gl->c); return ret; } @@ -261,7 +261,7 @@ enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, struct wined3d_device *device) { const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; enum wined3d_fence_result ret; TRACE("fence %p, device %p.\n", fence, device); @@ -273,7 +273,7 @@ enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, } gl_info = fence->context_gl->c.gl_info; - if (!(context = context_reacquire(device, &fence->context_gl->c))) + if (!(context_gl = wined3d_context_gl_reacquire(fence->context_gl))) { /* A glFinish does not reliably wait for draws in other contexts. The caller has * to find its own way to cope with the thread switch @@ -283,9 +283,9 @@ enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, WARN("Fence finished from wrong thread.\n"); return WINED3D_FENCE_WRONG_THREAD; } - context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context_acquire(device, NULL, 0)); } - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; if (gl_info->supported[ARB_SYNC]) { @@ -310,13 +310,13 @@ enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, ret = WINED3D_FENCE_ERROR; } } - else if (context->gl_info->supported[APPLE_FENCE]) + else if (gl_info->supported[APPLE_FENCE]) { GL_EXTCALL(glFinishFenceAPPLE(fence->object.id)); checkGLcall("glFinishFenceAPPLE"); ret = WINED3D_FENCE_OK; } - else if (context->gl_info->supported[NV_FENCE]) + else if (gl_info->supported[NV_FENCE]) { GL_EXTCALL(glFinishFenceNV(fence->object.id)); checkGLcall("glFinishFenceNV"); @@ -328,23 +328,23 @@ enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, ret = WINED3D_FENCE_ERROR; } - context_release(context); + context_release(&context_gl->c); return ret; } void wined3d_fence_issue(struct wined3d_fence *fence, struct wined3d_device *device) { - struct wined3d_context *context = NULL; + struct wined3d_context_gl *context_gl = NULL; const struct wined3d_gl_info *gl_info; - if (fence->context_gl && !(context = context_reacquire(device, &fence->context_gl->c)) + if (fence->context_gl && !(context_gl = wined3d_context_gl_reacquire(fence->context_gl)) && !fence->context_gl->c.gl_info->supported[ARB_SYNC]) wined3d_context_gl_free_fence(fence); - if (!context) - context = context_acquire(device, NULL, 0); - gl_info = context->gl_info; + if (!context_gl) + context_gl = wined3d_context_gl(context_acquire(device, NULL, 0)); + gl_info = context_gl->c.gl_info; if (!fence->context_gl) - wined3d_context_gl_alloc_fence(wined3d_context_gl(context), fence); + wined3d_context_gl_alloc_fence(context_gl, fence); if (gl_info->supported[ARB_SYNC]) { @@ -365,7 +365,7 @@ void wined3d_fence_issue(struct wined3d_fence *fence, struct wined3d_device *dev checkGLcall("glSetFenceNV"); } - context_release(context); + context_release(&context_gl->c); } static void wined3d_fence_free(struct wined3d_fence *fence) @@ -531,20 +531,19 @@ HRESULT CDECL wined3d_query_issue(struct wined3d_query *query, DWORD flags) static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query, DWORD flags) { struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); - struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; GLuint available; TRACE("query %p, flags %#x.\n", query, flags); - if (!(context = context_reacquire(device, &oq->context_gl->c))) + if (!(context_gl = wined3d_context_gl_reacquire(oq->context_gl))) { FIXME("%p Wrong thread, returning 1.\n", query); oq->samples = 1; return TRUE; } - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; GL_EXTCALL(glGetQueryObjectuiv(oq->id, GL_QUERY_RESULT_AVAILABLE, &available)); TRACE("Available %#x.\n", available); @@ -556,7 +555,7 @@ static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query, DWORD } checkGLcall("poll occlusion query"); - context_release(context); + context_release(&context_gl->c); return available; } @@ -631,7 +630,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; BOOL poll = FALSE; TRACE("query %p, flags %#x.\n", query, flags); @@ -642,9 +641,9 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD { if (oq->started) { - if ((context = context_reacquire(device, &oq->context_gl->c))) + if ((context_gl = wined3d_context_gl_reacquire(oq->context_gl))) { - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); checkGLcall("glEndQuery()"); } @@ -652,23 +651,23 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD { FIXME("Wrong thread, can't restart query.\n"); wined3d_context_gl_free_occlusion_query(oq); - context = context_acquire(device, NULL, 0); - wined3d_context_gl_alloc_occlusion_query(wined3d_context_gl(context), oq); + context_gl = wined3d_context_gl(context_acquire(device, NULL, 0)); + wined3d_context_gl_alloc_occlusion_query(context_gl, oq); } } else { if (oq->context_gl) wined3d_context_gl_free_occlusion_query(oq); - context = context_acquire(device, NULL, 0); - wined3d_context_gl_alloc_occlusion_query(wined3d_context_gl(context), oq); + context_gl = wined3d_context_gl(context_acquire(device, NULL, 0)); + wined3d_context_gl_alloc_occlusion_query(context_gl, oq); } - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; GL_EXTCALL(glBeginQuery(GL_SAMPLES_PASSED, oq->id)); checkGLcall("glBeginQuery()"); - context_release(context); + context_release(&context_gl->c); oq->started = TRUE; } if (flags & WINED3DISSUE_END) @@ -678,14 +677,14 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD * so avoid generating an error. */ if (oq->started) { - if ((context = context_reacquire(device, &oq->context_gl->c))) + if ((context_gl = wined3d_context_gl_reacquire(oq->context_gl))) { - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); checkGLcall("glEndQuery()"); - wined3d_query_buffer_queue_result(context, query, oq->id); + wined3d_query_buffer_queue_result(&context_gl->c, query, oq->id); - context_release(context); + context_release(&context_gl->c); poll = TRUE; } else @@ -702,21 +701,20 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query, DWORD flags) { struct wined3d_timestamp_query *tq = wined3d_timestamp_query_from_query(query); - struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; GLuint64 timestamp; GLuint available; TRACE("query %p, flags %#x.\n", query, flags); - if (!(context = context_reacquire(device, &tq->context_gl->c))) + if (!(context_gl = wined3d_context_gl_reacquire(tq->context_gl))) { FIXME("%p Wrong thread, returning 1.\n", query); tq->timestamp = 1; return TRUE; } - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; GL_EXTCALL(glGetQueryObjectuiv(tq->id, GL_QUERY_RESULT_AVAILABLE, &available)); checkGLcall("glGetQueryObjectuiv(GL_QUERY_RESULT_AVAILABLE)"); @@ -730,7 +728,7 @@ static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query, DWORD tq->timestamp = timestamp; } - context_release(context); + context_release(&context_gl->c); return available; } @@ -781,20 +779,19 @@ static BOOL wined3d_timestamp_disjoint_query_ops_issue(struct wined3d_query *que static BOOL wined3d_so_statistics_query_ops_poll(struct wined3d_query *query, DWORD flags) { struct wined3d_so_statistics_query *pq = wined3d_so_statistics_query_from_query(query); - struct wined3d_device *device = query->device; GLuint written_available, generated_available; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; TRACE("query %p, flags %#x.\n", query, flags); - if (!(context = context_reacquire(device, &pq->context_gl->c))) + if (!(context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { FIXME("%p Wrong thread, returning 0 primitives.\n", query); memset(&pq->statistics, 0, sizeof(pq->statistics)); return TRUE; } - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.written, GL_QUERY_RESULT_AVAILABLE, &written_available)); @@ -812,7 +809,7 @@ static BOOL wined3d_so_statistics_query_ops_poll(struct wined3d_query *query, DW } checkGLcall("poll SO statistics query"); - context_release(context); + context_release(&context_gl->c); return written_available && generated_available; } @@ -840,7 +837,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D struct wined3d_so_statistics_query *pq = wined3d_so_statistics_query_from_query(query); struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; BOOL poll = FALSE; TRACE("query %p, flags %#x.\n", query, flags); @@ -849,26 +846,26 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D { if (pq->started) { - if ((context = context_reacquire(device, &pq->context_gl->c))) + if ((context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { - wined3d_so_statistics_query_end(pq, context); + wined3d_so_statistics_query_end(pq, &context_gl->c); } else { FIXME("Wrong thread, can't restart query.\n"); wined3d_context_gl_free_so_statistics_query(pq); - context = context_acquire(device, NULL, 0); - wined3d_context_gl_alloc_so_statistics_query(wined3d_context_gl(context), pq); + context_gl = wined3d_context_gl(context_acquire(device, NULL, 0)); + wined3d_context_gl_alloc_so_statistics_query(context_gl, pq); } } else { if (pq->context_gl) wined3d_context_gl_free_so_statistics_query(pq); - context = context_acquire(device, NULL, 0); - wined3d_context_gl_alloc_so_statistics_query(wined3d_context_gl(context), pq); + context_gl = wined3d_context_gl(context_acquire(device, NULL, 0)); + wined3d_context_gl_alloc_so_statistics_query(context_gl, pq); } - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; if (gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) { @@ -886,18 +883,18 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D } checkGLcall("begin query"); - context_release(context); + context_release(&context_gl->c); pq->started = TRUE; } if (flags & WINED3DISSUE_END) { if (pq->started) { - if ((context = context_reacquire(device, &pq->context_gl->c))) + if ((context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { - wined3d_so_statistics_query_end(pq, context); + wined3d_so_statistics_query_end(pq, &context_gl->c); - context_release(context); + context_release(&context_gl->c); poll = TRUE; } else @@ -914,21 +911,20 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D static BOOL wined3d_pipeline_query_ops_poll(struct wined3d_query *query, DWORD flags) { struct wined3d_pipeline_statistics_query *pq = wined3d_pipeline_statistics_query_from_query(query); - struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; GLuint available; int i; TRACE("query %p, flags %#x.\n", query, flags); - if (!(context = context_reacquire(device, &pq->context_gl->c))) + if (!(context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { FIXME("%p Wrong thread.\n", query); memset(&pq->statistics, 0, sizeof(pq->statistics)); return TRUE; } - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; for (i = 0; i < ARRAY_SIZE(pq->u.id); ++i) { @@ -953,7 +949,7 @@ static BOOL wined3d_pipeline_query_ops_poll(struct wined3d_query *query, DWORD f } checkGLcall("poll pipeline statistics query"); - context_release(context); + context_release(&context_gl->c); return available; } @@ -981,7 +977,7 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD struct wined3d_pipeline_statistics_query *pq = wined3d_pipeline_statistics_query_from_query(query); struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; BOOL poll = FALSE; TRACE("query %p, flags %#x.\n", query, flags); @@ -990,26 +986,26 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD { if (pq->started) { - if ((context = context_reacquire(device, &pq->context_gl->c))) + if ((context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { - wined3d_pipeline_statistics_query_end(pq, context); + wined3d_pipeline_statistics_query_end(pq, &context_gl->c); } else { FIXME("Wrong thread, can't restart query.\n"); wined3d_context_gl_free_pipeline_statistics_query(pq); - context = context_acquire(device, NULL, 0); - wined3d_context_gl_alloc_pipeline_statistics_query(wined3d_context_gl(context), pq); + context_gl = wined3d_context_gl(context_acquire(device, NULL, 0)); + wined3d_context_gl_alloc_pipeline_statistics_query(context_gl, pq); } } else { if (pq->context_gl) wined3d_context_gl_free_pipeline_statistics_query(pq); - context = context_acquire(device, NULL, 0); - wined3d_context_gl_alloc_pipeline_statistics_query(wined3d_context_gl(context), pq); + context_gl = wined3d_context_gl(context_acquire(device, NULL, 0)); + wined3d_context_gl_alloc_pipeline_statistics_query(context_gl, pq); } - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; GL_EXTCALL(glBeginQuery(GL_VERTICES_SUBMITTED_ARB, pq->u.query.vertices)); GL_EXTCALL(glBeginQuery(GL_PRIMITIVES_SUBMITTED_ARB, pq->u.query.primitives)); @@ -1024,17 +1020,17 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD GL_EXTCALL(glBeginQuery(GL_CLIPPING_OUTPUT_PRIMITIVES_ARB, pq->u.query.clipping_output)); checkGLcall("begin query"); - context_release(context); + context_release(&context_gl->c); pq->started = TRUE; } if (flags & WINED3DISSUE_END) { if (pq->started) { - if ((context = context_reacquire(device, &pq->context_gl->c))) + if ((context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { - wined3d_pipeline_statistics_query_end(pq, context); - context_release(context); + wined3d_pipeline_statistics_query_end(pq, &context_gl->c); + context_release(&context_gl->c); poll = TRUE; } else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 753dc8cb663..8272a56203b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2096,6 +2096,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; 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; +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; void wined3d_context_gl_set_draw_buffer(struct wined3d_context_gl *context_gl, GLenum buffer) DECLSPEC_HIDDEN; void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl, @@ -2257,8 +2258,6 @@ void context_invalidate_compute_state(struct wined3d_context *context, DWORD sta void context_invalidate_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; void *context_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) DECLSPEC_HIDDEN; -struct wined3d_context *context_reacquire(struct wined3d_device *device, - struct wined3d_context *context) DECLSPEC_HIDDEN; void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void context_restore(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Move the "valid" field from struct wined3d_context to struct wined3d_context_gl.
by Henri Verbeet 06 Jun '19

06 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 54 ++++++++++++++++++++---------------------- dlls/wined3d/cs.c | 10 ++++---- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/wined3d_private.h | 34 +++++++++++++------------- 6 files changed, 53 insertions(+), 55 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index fb745e2d98e..0f107502f5c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1241,7 +1241,7 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context { WARN("Failed to make GL context %p current on device context %p, last error %#x.\n", context_gl->gl_ctx, context_gl->dc, GetLastError()); - context_gl->c.valid = 0; + context_gl->valid = 0; WARN("Trying fallback to the backup window.\n"); /* FIXME: If the context is destroyed it's no longer associated with @@ -1280,7 +1280,7 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context return FALSE; } - context_gl->c.valid = 1; + context_gl->valid = 1; } context_gl->needs_set = 0; @@ -1315,12 +1315,12 @@ static void wined3d_context_gl_update_window(struct wined3d_context_gl *context_ context_gl->dc_is_private = FALSE; context_gl->dc_has_format = FALSE; context_gl->needs_set = 1; - context_gl->c.valid = 1; + context_gl->valid = 1; if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) { ERR("Failed to get a device context for window %p.\n", context_gl->window); - context_gl->c.valid = 0; + context_gl->valid = 0; } } @@ -1346,10 +1346,10 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) if (restore_ctx == context_gl->gl_ctx) restore_ctx = NULL; - else if (context_gl->c.valid) + else if (context_gl->valid) wined3d_context_gl_set_gl_context(context_gl); - if (context_gl->c.valid) + if (context_gl->valid) { if (context_gl->dummy_arbfp_prog) GL_EXTCALL(glDeleteProgramsARB(1, &context_gl->dummy_arbfp_prog)); @@ -1408,7 +1408,7 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) LIST_FOR_EACH_ENTRY(pipeline_statistics_query, &context_gl->pipeline_statistics_queries, struct wined3d_pipeline_statistics_query, entry) { - if (context_gl->c.valid) + if (context_gl->valid) GL_EXTCALL(glDeleteQueries(ARRAY_SIZE(pipeline_statistics_query->u.id), pipeline_statistics_query->u.id)); pipeline_statistics_query->context_gl = NULL; } @@ -1416,21 +1416,21 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) LIST_FOR_EACH_ENTRY(so_statistics_query, &context_gl->so_statistics_queries, struct wined3d_so_statistics_query, entry) { - if (context_gl->c.valid) + if (context_gl->valid) GL_EXTCALL(glDeleteQueries(ARRAY_SIZE(so_statistics_query->u.id), so_statistics_query->u.id)); so_statistics_query->context_gl = NULL; } LIST_FOR_EACH_ENTRY(timestamp_query, &context_gl->timestamp_queries, struct wined3d_timestamp_query, entry) { - if (context_gl->c.valid) + if (context_gl->valid) GL_EXTCALL(glDeleteQueries(1, &timestamp_query->id)); timestamp_query->context_gl = NULL; } LIST_FOR_EACH_ENTRY(fence, &context_gl->fences, struct wined3d_fence, entry) { - if (context_gl->c.valid) + if (context_gl->valid) { if (gl_info->supported[ARB_SYNC]) { @@ -1451,21 +1451,21 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) LIST_FOR_EACH_ENTRY(occlusion_query, &context_gl->occlusion_queries, struct wined3d_occlusion_query, entry) { - if (context_gl->c.valid) + if (context_gl->valid) GL_EXTCALL(glDeleteQueries(1, &occlusion_query->id)); occlusion_query->context_gl = NULL; } LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context_gl->fbo_destroy_list, struct fbo_entry, entry) { - if (!context_gl->c.valid) + if (!context_gl->valid) entry->id = 0; wined3d_context_gl_destroy_fbo_entry(context_gl, entry); } LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context_gl->fbo_list, struct fbo_entry, entry) { - if (!context_gl->c.valid) + if (!context_gl->valid) entry->id = 0; wined3d_context_gl_destroy_fbo_entry(context_gl, entry); } @@ -1539,7 +1539,7 @@ BOOL context_set_current(struct wined3d_context *ctx) { struct wined3d_context_gl *context_gl = wined3d_context_gl(ctx); - if (!ctx->valid) + if (!context_gl->valid) { ERR("Trying to make invalid context %p current\n", ctx); return FALSE; @@ -2129,7 +2129,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context->render_offscreen = wined3d_resource_is_offscreen(target); context_gl->draw_buffers_mask = context_generate_rt_mask(GL_BACK); - context->valid = 1; + context_gl->valid = 1; context_gl->gl_ctx = ctx; context_gl->dc_has_format = TRUE; @@ -4183,7 +4183,7 @@ static void wined3d_context_gl_activate(struct wined3d_context_gl *context_gl, wined3d_context_gl_enter(context_gl); wined3d_context_gl_update_window(context_gl); context_setup_target(&context_gl->c, texture, sub_resource_idx); - if (!context_gl->c.valid) + if (!context_gl->valid) return; if (&context_gl->c != context_get_current()) @@ -4287,33 +4287,31 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state { const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; - struct wined3d_context *context; - context = context_acquire(device, NULL, 0); - if (!context->valid) + context_gl = wined3d_context_gl(context_acquire(device, NULL, 0)); + if (!context_gl->valid) { - context_release(context); + context_release(&context_gl->c); WARN("Invalid context, skipping dispatch.\n"); return; } - context_gl = wined3d_context_gl(context); - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; if (!gl_info->supported[ARB_COMPUTE_SHADER]) { - context_release(context); + context_release(&context_gl->c); FIXME("OpenGL implementation does not support compute shaders.\n"); return; } if (parameters->indirect) - wined3d_buffer_load(parameters->u.indirect.buffer, context, state); + wined3d_buffer_load(parameters->u.indirect.buffer, &context_gl->c, state); wined3d_context_gl_apply_compute_state(context_gl, device, state); if (!state->shader[WINED3D_SHADER_TYPE_COMPUTE]) { - context_release(context); + context_release(&context_gl->c); WARN("No compute shader bound, skipping dispatch.\n"); return; } @@ -4337,7 +4335,7 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state GL_EXTCALL(glMemoryBarrier(GL_ALL_BARRIER_BITS)); checkGLcall("glMemoryBarrier"); - context_release(context); + context_release(&context_gl->c); } /* Context activation is done by the caller. */ @@ -4815,13 +4813,13 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s context = context_acquire(device, wined3d_texture_from_resource(rtv->resource), rtv->sub_resource_idx); else context = context_acquire(device, NULL, 0); - if (!context->valid) + context_gl = wined3d_context_gl(context); + if (!context_gl->valid) { context_release(context); WARN("Invalid context, skipping draw.\n"); return; } - context_gl = wined3d_context_gl(context); gl_info = context->gl_info; if (!use_transform_feedback(state)) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2fb361fb677..e1f94f45eed 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1008,12 +1008,12 @@ void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, static void wined3d_cs_exec_flush(struct wined3d_cs *cs, const void *data) { - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; - context = context_acquire(cs->device, NULL, 0); - if (context->valid) - context->gl_info->gl_ops.gl.p_glFlush(); - context_release(context); + context_gl = wined3d_context_gl(context_acquire(cs->device, NULL, 0)); + if (context_gl->valid) + context_gl->c.gl_info->gl_ops.gl.p_glFlush(); + context_release(&context_gl->c); } void wined3d_cs_emit_flush(struct wined3d_cs *cs) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ed77a6e144a..4ec4022dce6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -306,7 +306,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c if (dsv && dsv->resource->type != WINED3D_RTYPE_BUFFER) depth_stencil = texture_from_resource(dsv->resource); - if (!context->valid) + if (!context_gl->valid) { context_release(context); WARN("Invalid context, skipping clear.\n"); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7d126420d17..7ae4fb81877 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -224,14 +224,14 @@ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_cont else restore_texture = NULL; - if (!context->valid) + context_gl = wined3d_context_gl(context); + if (!context_gl->valid) { context_release(context); WARN("Invalid context, skipping blit.\n"); return; } - context_gl = wined3d_context_gl(context); gl_info = context->gl_info; if (src_location == WINED3D_LOCATION_DRAWABLE) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2c816218c8e..c18f7304d94 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -434,13 +434,13 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, BOOL render_to_fbo; context = context_acquire(swapchain->device, back_buffer, 0); - if (!context->valid) + context_gl = wined3d_context_gl(context); + if (!context_gl->valid) { context_release(context); WARN("Invalid context, skipping present.\n"); return; } - context_gl = wined3d_context_gl(context); gl_info = context->gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5b37e96c9d0..753dc8cb663 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1903,40 +1903,39 @@ struct wined3d_context DWORD tid; /* Thread ID which owns this context at the moment */ /* Stores some information about the context state for optimization */ - DWORD render_offscreen : 1; - DWORD last_was_rhw : 1; /* true iff last draw_primitive was in xyzrhw mode */ + DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ + DWORD update_shader_resource_bindings : 1; + DWORD update_compute_shader_resource_bindings : 1; + DWORD update_unordered_access_view_bindings : 1; + DWORD update_compute_unordered_access_view_bindings : 1; DWORD last_swizzle_map : 16; /* MAX_ATTRIBS, 16 */ + DWORD last_was_rhw : 1; /* True iff last draw_primitive was in xyzrhw mode. */ DWORD last_was_pshader : 1; DWORD last_was_vshader : 1; DWORD last_was_diffuse : 1; DWORD last_was_specular : 1; DWORD last_was_normal : 1; - DWORD namedArraysLoaded : 1; + DWORD last_was_ffp_blit : 1; DWORD last_was_blit : 1; DWORD last_was_ckey : 1; - DWORD fog_coord : 1; - DWORD current : 1; - DWORD destroyed : 1; - DWORD destroy_delayed : 1; - DWORD valid : 1; - + DWORD namedArraysLoaded : 1; DWORD texShaderBumpMap : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD lastWasPow2Texture : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD fixed_function_usage_map : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD lowest_disabled_stage : 4; /* Max WINED3D_MAX_TEXTURES, 8 */ + DWORD use_immediate_mode_draw : 1; DWORD uses_uavs : 1; DWORD transform_feedback_active : 1; DWORD transform_feedback_paused : 1; - - DWORD update_shader_resource_bindings : 1; - DWORD update_compute_shader_resource_bindings : 1; - DWORD update_unordered_access_view_bindings : 1; - DWORD update_compute_unordered_access_view_bindings : 1; - DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ + DWORD fog_coord : 1; + DWORD render_offscreen : 1; + DWORD current : 1; + DWORD destroyed : 1; + DWORD destroy_delayed : 1; DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ - DWORD padding : 14; + DWORD padding : 15; DWORD constant_update_mask; DWORD numbered_array_mask; @@ -1975,7 +1974,8 @@ struct wined3d_context_gl uint32_t rebind_fbo : 1; uint32_t untracked_material_count : 2; /* Max value 2 */ uint32_t needs_set : 1; - uint32_t padding : 24; + uint32_t valid : 1; + uint32_t padding : 23; uint32_t default_attrib_value_set; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Move the "needs_set" field from struct wined3d_context to struct wined3d_context_gl.
by Henri Verbeet 06 Jun '19

06 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 129d4da8161..fb745e2d98e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1282,7 +1282,7 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context context_gl->c.valid = 1; } - context_gl->c.needs_set = 0; + context_gl->needs_set = 0; return TRUE; } @@ -1314,7 +1314,7 @@ static void wined3d_context_gl_update_window(struct wined3d_context_gl *context_ context_gl->window = context_gl->c.swapchain->win_handle; context_gl->dc_is_private = FALSE; context_gl->dc_has_format = FALSE; - context_gl->c.needs_set = 1; + context_gl->needs_set = 1; context_gl->c.valid = 1; if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) @@ -1583,7 +1583,7 @@ void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) if (!--context->level) { if (wined3d_context_gl_restore_pixel_format(context_gl)) - context->needs_set = 1; + context_gl->needs_set = 1; if (context_gl->restore_ctx) { TRACE("Restoring GL context %p on device context %p.\n", context_gl->restore_ctx, context_gl->restore_dc); @@ -1629,11 +1629,11 @@ static void wined3d_context_gl_enter(struct wined3d_context_gl *context_gl) current_gl, wglGetCurrentDC()); context_gl->restore_ctx = current_gl; context_gl->restore_dc = wglGetCurrentDC(); - context_gl->c.needs_set = 1; + context_gl->needs_set = 1; } - else if (!context_gl->c.needs_set && !(context_gl->dc_is_private && context_gl->dc_has_format) + else if (!context_gl->needs_set && !(context_gl->dc_is_private && context_gl->dc_has_format) && context_gl->pixel_format != context_gl->c.gl_info->gl_ops.wgl.p_wglGetPixelFormat(context_gl->dc)) - context_gl->c.needs_set = 1; + context_gl->needs_set = 1; } } @@ -2133,7 +2133,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_gl->gl_ctx = ctx; context_gl->dc_has_format = TRUE; - context->needs_set = 1; + context_gl->needs_set = 1; /* Set up the context defaults */ if (!context_set_current(context)) @@ -4191,7 +4191,7 @@ static void wined3d_context_gl_activate(struct wined3d_context_gl *context_gl, if (!context_set_current(&context_gl->c)) ERR("Failed to activate the new context.\n"); } - else if (context_gl->c.needs_set) + else if (context_gl->needs_set) { wined3d_context_gl_set_gl_context(context_gl); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6652794ca88..5b37e96c9d0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1926,7 +1926,7 @@ struct wined3d_context DWORD fixed_function_usage_map : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD lowest_disabled_stage : 4; /* Max WINED3D_MAX_TEXTURES, 8 */ DWORD use_immediate_mode_draw : 1; - DWORD needs_set : 1; + DWORD uses_uavs : 1; DWORD transform_feedback_active : 1; DWORD transform_feedback_paused : 1; @@ -1934,10 +1934,9 @@ struct wined3d_context DWORD update_compute_shader_resource_bindings : 1; DWORD update_unordered_access_view_bindings : 1; DWORD update_compute_unordered_access_view_bindings : 1; - DWORD uses_uavs : 1; DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ - DWORD padding : 13; + DWORD padding : 14; DWORD constant_update_mask; DWORD numbered_array_mask; @@ -1975,7 +1974,8 @@ struct wined3d_context_gl uint32_t diffuse_attrib_to_1 : 1; uint32_t rebind_fbo : 1; uint32_t untracked_material_count : 2; /* Max value 2 */ - uint32_t padding : 25; + uint32_t needs_set : 1; + uint32_t padding : 24; uint32_t default_attrib_value_set; -- 2.11.0

1 0

[PATCH 1/5] wined3d: Move the material tracking fields from struct wined3d_context to struct wined3d_context_gl.
by Henri Verbeet 06 Jun '19

06 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 8 ++++--- dlls/wined3d/state.c | 49 +++++++++++++++--------------------------- dlls/wined3d/wined3d_private.h | 14 ++++++------ 3 files changed, 29 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9784a48f91f..129d4da8161 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4552,7 +4552,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, else gl_info->gl_ops.gl.p_glNormal3f(0.0f, 0.0f, 0.0f); - untracked_material_count = context_gl->c.num_untracked_materials; + untracked_material_count = context_gl->untracked_material_count; if (si->use_map & (1u << WINED3D_FFP_DIFFUSE)) { element = &si->elements[WINED3D_FFP_DIFFUSE]; @@ -4665,7 +4665,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, for (i = 0; i < untracked_material_count; ++i) { gl_info->gl_ops.gl.p_glMaterialfv(GL_FRONT_AND_BACK, - context_gl->c.untracked_materials[i], &color.r); + context_gl->untracked_materials[i], &color.r); } } } @@ -4794,6 +4794,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s struct wined3d_stream_info si_emulated; struct wined3d_fence *ib_fence = NULL; const struct wined3d_gl_info *gl_info; + struct wined3d_context_gl *context_gl; struct wined3d_context *context; unsigned int i, idx_size = 0; const void *idx_data = NULL; @@ -4820,6 +4821,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s WARN("Invalid context, skipping draw.\n"); return; } + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; if (!use_transform_feedback(state)) @@ -4898,7 +4900,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (!use_vs(state)) { - if (!stream_info->position_transformed && context->num_untracked_materials + if (!stream_info->position_transformed && context_gl->untracked_material_count && state->render_states[WINED3D_RS_LIGHTING]) { static BOOL warned; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b2fcbddd57f..c52e25d6ce2 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1297,19 +1297,18 @@ void state_fogdensity(struct wined3d_context *context, const struct wined3d_stat static void state_colormat(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GLenum Parm = 0; - /* Depends on the decoded vertex declaration to read the existence of diffuse data. - * The vertex declaration will call this function if the fixed function pipeline is used. - */ - - if(isStateDirty(context, STATE_VDECL)) { + /* Depends on the decoded vertex declaration to read the existence of + * diffuse data. The vertex declaration will call this function if the + * fixed function pipeline is used. */ + if (isStateDirty(&context_gl->c, STATE_VDECL)) return; - } - context->num_untracked_materials = 0; - if ((context->stream_info.use_map & (1u << WINED3D_FFP_DIFFUSE)) + context_gl->untracked_material_count = 0; + if ((context_gl->c.stream_info.use_map & (1u << WINED3D_FFP_DIFFUSE)) && state->render_states[WINED3D_RS_COLORVERTEX]) { TRACE("diff %d, amb %d, emis %d, spec %d\n", @@ -1325,38 +1324,23 @@ static void state_colormat(struct wined3d_context *context, const struct wined3d else Parm = GL_DIFFUSE; if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3D_MCS_COLOR1) - { - context->untracked_materials[context->num_untracked_materials] = GL_EMISSION; - context->num_untracked_materials++; - } + context_gl->untracked_materials[context_gl->untracked_material_count++] = GL_EMISSION; if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1) - { - context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; - context->num_untracked_materials++; - } + context_gl->untracked_materials[context_gl->untracked_material_count++] = GL_SPECULAR; } else if (state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE] == WINED3D_MCS_COLOR1) { Parm = GL_AMBIENT; if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3D_MCS_COLOR1) - { - context->untracked_materials[context->num_untracked_materials] = GL_EMISSION; - context->num_untracked_materials++; - } + context_gl->untracked_materials[context_gl->untracked_material_count++] = GL_EMISSION; if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1) - { - context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; - context->num_untracked_materials++; - } + context_gl->untracked_materials[context_gl->untracked_material_count++] = GL_SPECULAR; } else if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3D_MCS_COLOR1) { Parm = GL_EMISSION; if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1) - { - context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; - context->num_untracked_materials++; - } + context_gl->untracked_materials[context_gl->untracked_material_count++] = GL_SPECULAR; } else if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1) { @@ -1365,7 +1349,8 @@ static void state_colormat(struct wined3d_context *context, const struct wined3d } /* Nothing changed, return. */ - if (Parm == context->tracking_parm) return; + if (Parm == context_gl->tracking_parm) + return; if (!Parm) { @@ -1382,7 +1367,7 @@ static void state_colormat(struct wined3d_context *context, const struct wined3d /* Apparently calls to glMaterialfv are ignored for properties we're * tracking with glColorMaterial, so apply those here. */ - switch (context->tracking_parm) + switch (context_gl->tracking_parm) { case GL_AMBIENT_AND_DIFFUSE: gl_info->gl_ops.gl.p_glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float *)&state->material.ambient); @@ -1421,7 +1406,7 @@ static void state_colormat(struct wined3d_context *context, const struct wined3d break; } - context->tracking_parm = Parm; + context_gl->tracking_parm = Parm; } static void state_linepattern(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 89d3272a091..6652794ca88 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1927,23 +1927,20 @@ struct wined3d_context DWORD lowest_disabled_stage : 4; /* Max WINED3D_MAX_TEXTURES, 8 */ DWORD use_immediate_mode_draw : 1; DWORD needs_set : 1; - DWORD num_untracked_materials : 2; /* Max value 2 */ + DWORD transform_feedback_active : 1; + DWORD transform_feedback_paused : 1; DWORD update_shader_resource_bindings : 1; DWORD update_compute_shader_resource_bindings : 1; DWORD update_unordered_access_view_bindings : 1; DWORD update_compute_unordered_access_view_bindings : 1; DWORD uses_uavs : 1; - DWORD transform_feedback_active : 1; - DWORD transform_feedback_paused : 1; DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ - DWORD padding : 11; + DWORD padding : 13; DWORD constant_update_mask; DWORD numbered_array_mask; - GLenum tracking_parm; /* Which source is tracking current colour */ - GLenum untracked_materials[2]; enum fogsource fog_source; UINT instance_count; @@ -1977,10 +1974,13 @@ struct wined3d_context_gl uint32_t fog_enabled : 1; uint32_t diffuse_attrib_to_1 : 1; uint32_t rebind_fbo : 1; - uint32_t padding : 27; + uint32_t untracked_material_count : 2; /* Max value 2 */ + uint32_t padding : 25; uint32_t default_attrib_value_set; + GLenum tracking_parm; /* Which source is tracking current colour. */ + GLenum untracked_materials[2]; SIZE blit_size; unsigned int active_texture; -- 2.11.0

1 0

[PATCH v2 1/6] comctl32/listbox: Handle Mouse Wheel scrolling for multi-column listboxes properly
by Gabriel Ivăncescu 06 Jun '19

06 Jun '19

Multi-column listboxes scroll horizontally, so each wheel tick must go an entire page at a time instead of an item at a time. But we have to limit the amount of scrolling in this case to avoid "jumping over" columns, if the window is too small. This matches Windows behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22253 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- These notes apply to all the patches in the series. The calculation has been simplified to just integer arithmetic in all cases, since the division (the only operation with a fractional result) was immediately truncated to integer anyway and didn't help with overflow either, because the line that assigns to descr->wheel_remain operates on integers, so if it overflowed in the initial float operation, it would overflow on this line anyway. In other words, the current code didn't protect from overflow, so we can simply get rid of the float cast (WHEEL_DELTA is too small for overflow to be a concern, though). dlls/comctl32/listbox.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 8fd556c..991baac 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2068,7 +2068,7 @@ static LRESULT LISTBOX_HandleHScroll( LB_DESCR *descr, WORD scrollReq, WORD pos static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) { - UINT pulScrollLines = 3; + INT pulScrollLines = 3; SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); @@ -2082,9 +2082,20 @@ static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) if (descr->wheel_remain && pulScrollLines) { int cLineScroll; - pulScrollLines = min((UINT) descr->page_size, pulScrollLines); - cLineScroll = pulScrollLines * (float)descr->wheel_remain / WHEEL_DELTA; - descr->wheel_remain -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + if (descr->style & LBS_MULTICOLUMN) + { + pulScrollLines = min((UINT)descr->width / descr->column_width, pulScrollLines); + pulScrollLines = max(1u, pulScrollLines); + cLineScroll = (pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (WHEEL_DELTA * cLineScroll) / pulScrollLines; + cLineScroll *= descr->page_size; + } + else + { + pulScrollLines = min((UINT)descr->page_size, pulScrollLines); + cLineScroll = (pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (WHEEL_DELTA * cLineScroll) / pulScrollLines; + } LISTBOX_SetTopItem( descr, descr->top_item - cLineScroll, TRUE ); } return 0; -- 2.21.0

2 10

[PATCH] quartz: Avoid LPVOID for VMR9_ImagePresenter_QueryInterface.
by Andrey Gusev 06 Jun '19

06 Jun '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/quartz/vmr9.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index d208b1c53e..751eeeb816 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2326,16 +2326,14 @@ HRESULT VMR9Impl_create(IUnknown *outer_unk, LPVOID *ppv) } -static HRESULT WINAPI VMR9_ImagePresenter_QueryInterface(IVMRImagePresenter9 *iface, REFIID riid, LPVOID * ppv) +static HRESULT WINAPI VMR9_ImagePresenter_QueryInterface(IVMRImagePresenter9 *iface, REFIID riid, void **ppv) { VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = (LPVOID)&(This->IVMRImagePresenter9_iface); - else if (IsEqualIID(riid, &IID_IVMRImagePresenter9)) + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IVMRImagePresenter9)) *ppv = &This->IVMRImagePresenter9_iface; else if (IsEqualIID(riid, &IID_IVMRSurfaceAllocatorEx9)) *ppv = &This->IVMRSurfaceAllocatorEx9_iface; -- 2.21.0

1 0

[PATCH v5 4/4] gdi32: Implement D3DKMTDestroyDevice.
by Zhiyi Zhang 06 Jun '19

06 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 29 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 10 +++---- include/ddk/d3dkmthk.h | 1 + 6 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index cb7935bbbc..43452cda74 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -22,7 +22,7 @@ @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext @ stdcall D3DKMTDestroyDCFromMemory(ptr) gdi32.D3DKMTDestroyDCFromMemory -@ stub D3DKMTDestroyDevice +@ stdcall D3DKMTDestroyDevice(ptr) gdi32.D3DKMTDestroyDevice @ stub D3DKMTDestroyKeyedMutex @ stub D3DKMTDestroyOutputDupl @ stub D3DKMTDestroyOverlay diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index e4692ace9c..01bc8bfebc 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -12,7 +12,7 @@ @ stub D3DKMTCreateSynchronizationObject @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext -@ stub D3DKMTDestroyDevice +@ stdcall D3DKMTDestroyDevice(ptr) gdi32.D3DKMTDestroyDevice @ stub D3DKMTDestroySynchronizationObject @ stub D3DKMTEscape @ stub D3DKMTGetContextSchedulingPriority diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index f57dd1231f..96c2f1f129 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1394,3 +1394,32 @@ NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) desc->hDevice = device->handle; return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTDestroyDevice [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) +{ + NTSTATUS status = STATUS_INVALID_PARAMETER; + struct d3dkmt_device *device; + + TRACE("(%p)\n", desc); + + if (!desc || !desc->hDevice) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( device, &d3dkmt_devices, struct d3dkmt_device, entry ) + { + if (device->handle == desc->hDevice) + { + list_remove( &device->entry ); + heap_free( device ); + status = STATUS_SUCCESS; + break; + } + } + LeaveCriticalSection( &driver_section ); + + return status; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 88fe846eb8..9abd82173c 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -84,6 +84,7 @@ @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTCreateDevice(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) +@ stdcall D3DKMTDestroyDevice(ptr) @ stdcall D3DKMTEscape(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index f5c23dad76..b5f6f75a83 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -194,9 +194,9 @@ static void test_D3DKMTCreateDevice(void) D3DKMT_DESTROYDEVICE destroy_device_desc; NTSTATUS status; - if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND || !pD3DKMTDestroyDevice) + if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTCreateDevice() or D3DKMTDestroyDevice() is unavailable.\n"); + win_skip("D3DKMTCreateDevice() is unavailable.\n"); return; } @@ -240,17 +240,17 @@ static void test_D3DKMTDestroyDevice(void) if (!pD3DKMTDestroyDevice || pD3DKMTDestroyDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTDestroyDevice() is unavailable.\n"); + win_skip("D3DKMTDestroyDevice() is unavailable.\n"); return; } /* Invalid parameters */ status = pD3DKMTDestroyDevice(NULL); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); memset(&destroy_device_desc, 0, sizeof(destroy_device_desc)); status = pD3DKMTDestroyDevice(&destroy_device_desc); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } static void test_D3DKMTCheckVidPnExclusiveOwnership(void) diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 90bf907e30..081758bf5d 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -169,6 +169,7 @@ NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDevice(D3DKMT_CREATEDEVICE *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); +NTSTATUS WINAPI D3DKMTDestroyDevice(const D3DKMT_DESTROYDEVICE *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); #ifdef __cplusplus -- 2.20.1

3 2

[PATCH v5 3/4] gdi32: Implement D3DKMTCreateDevice.
by Zhiyi Zhang 06 Jun '19

06 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 52 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- include/ddk/d3dkmthk.h | 1 + 6 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index 43186e8fcc..cb7935bbbc 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -12,7 +12,7 @@ @ stub D3DKMTCreateAllocation2 @ stub D3DKMTCreateContext @ stdcall D3DKMTCreateDCFromMemory(ptr) gdi32.D3DKMTCreateDCFromMemory -@ stub D3DKMTCreateDevice +@ stdcall D3DKMTCreateDevice(ptr) gdi32.D3DKMTCreateDevice @ stub D3DKMTCreateKeyedMutex @ stub D3DKMTCreateKeyedMutex2 @ stub D3DKMTCreateOutputDupl diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 87304b7c13..e4692ace9c 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -8,7 +8,7 @@ @ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext -@ stub D3DKMTCreateDevice +@ stdcall D3DKMTCreateDevice(ptr) gdi32.D3DKMTCreateDevice @ stub D3DKMTCreateSynchronizationObject @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index da3aad9e7c..f57dd1231f 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -59,10 +59,17 @@ struct d3dkmt_adapter struct list entry; /* List entry */ }; +struct d3dkmt_device +{ + D3DKMT_HANDLE handle; /* Kernel mode graphics device handle*/ + struct list entry; /* List entry */ +}; + static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); +static struct list d3dkmt_devices = LIST_INIT( d3dkmt_devices ); const struct gdi_dc_funcs *font_driver = NULL; @@ -1342,3 +1349,48 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI desc->VidPnSourceId = 0; return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTCreateDevice [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) +{ + static D3DKMT_HANDLE handle_start = 0; + struct d3dkmt_adapter *adapter; + struct d3dkmt_device *device; + BOOL found = FALSE; + + TRACE("(%p)\n", desc); + + if (!desc) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) + { + if (adapter->handle == desc->hAdapter) + { + found = TRUE; + break; + } + } + LeaveCriticalSection( &driver_section ); + + if (!found) + return STATUS_INVALID_PARAMETER; + + if (desc->Flags.LegacyMode || desc->Flags.RequestVSync || desc->Flags.DisableGpuTimeout) + FIXME("Flags unsupported.\n"); + + device = heap_alloc_zero( sizeof( *device ) ); + if (!device) + return STATUS_NO_MEMORY; + + EnterCriticalSection( &driver_section ); + device->handle = ++handle_start; + list_add_tail( &d3dkmt_devices, &device->entry ); + LeaveCriticalSection( &driver_section ); + + desc->hDevice = device->handle; + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 5c17ed9ee8..88fe846eb8 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -82,6 +82,7 @@ @ stdcall CreateSolidBrush(long) @ stdcall D3DKMTCloseAdapter(ptr) @ stdcall D3DKMTCreateDCFromMemory(ptr) +@ stdcall D3DKMTCreateDevice(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index caded27aef..f5c23dad76 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -194,7 +194,7 @@ static void test_D3DKMTCreateDevice(void) D3DKMT_DESTROYDEVICE destroy_device_desc; NTSTATUS status; - if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) + if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND || !pD3DKMTDestroyDevice) { skip("D3DKMTCreateDevice() or D3DKMTDestroyDevice() is unavailable.\n"); return; diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 5436cb6612..90bf907e30 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -166,6 +166,7 @@ extern "C" #endif /* __cplusplus */ NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); +NTSTATUS WINAPI D3DKMTCreateDevice(D3DKMT_CREATEDEVICE *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); -- 2.20.1

3 2

[PATCH v5 2/4] gdi32: Implement D3DKMTCloseAdapter.
by Zhiyi Zhang 06 Jun '19

06 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 24 ++++++++++++++++++++++-- dlls/gdi32/tests/driver.c | 4 ++-- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 365e5d7c0c..87304b7c13 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -5,7 +5,7 @@ @ stdcall D3D11CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) @ stdcall D3D11CreateDeviceAndSwapChain(ptr long ptr long ptr long long ptr ptr ptr ptr ptr) @ stdcall D3D11On12CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) -@ stub D3DKMTCloseAdapter +@ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext @ stub D3DKMTCreateDevice diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 01efc6903b..da3aad9e7c 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1279,8 +1279,28 @@ NTSTATUS WINAPI D3DKMTEscape( const void *pData ) */ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) { - FIXME("(%p): stub\n", desc); - return STATUS_SUCCESS; + NTSTATUS status = STATUS_INVALID_PARAMETER; + struct d3dkmt_adapter *adapter; + + TRACE("(%p)\n", desc); + + if (!desc || !desc->hAdapter) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) + { + if (adapter->handle == desc->hAdapter) + { + list_remove( &adapter->entry ); + heap_free( adapter ); + status = STATUS_SUCCESS; + break; + } + } + LeaveCriticalSection( &driver_section ); + + return status; } /****************************************************************************** diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 067c162838..caded27aef 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -179,11 +179,11 @@ static void test_D3DKMTCloseAdapter(void) /* Invalid parameters */ status = pD3DKMTCloseAdapter(NULL); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); memset(&close_adapter_desc, 0, sizeof(close_adapter_desc)); status = pD3DKMTCloseAdapter(&close_adapter_desc); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } static void test_D3DKMTCreateDevice(void) -- 2.20.1

3 2

[PATCH v5 1/4] gdi32: Implement D3DKMTOpenAdapterFromGdiDisplayName.
by Zhiyi Zhang 06 Jun '19

06 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Use non-safe list iteration macros. v3: Fix intermediate test crash. v4: Make d3dkmt_* struct local. v5: Avoid a possible race. Sorry about making to v5. Supersede 166048~166051 .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 1 + dlls/gdi32/driver.c | 50 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- include/ddk/d3dkmthk.h | 1 + 6 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index e8aa38edf4..43186e8fcc 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -46,7 +46,7 @@ @ stub D3DKMTLock @ stub D3DKMTOfferAllocations @ stub D3DKMTOpenAdapterFromDeviceName -@ stub D3DKMTOpenAdapterFromGdiDisplayName +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) gdi32.D3DKMTOpenAdapterFromGdiDisplayName @ stdcall D3DKMTOpenAdapterFromHdc(ptr) gdi32.D3DKMTOpenAdapterFromHdc @ stub D3DKMTOpenKeyedMutex @ stub D3DKMTOpenKeyedMutex2 diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 267778ab14..365e5d7c0c 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -22,6 +22,7 @@ @ stub D3DKMTGetRuntimeData @ stub D3DKMTGetSharedPrimaryHandle @ stub D3DKMTLock +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) gdi32.D3DKMTOpenAdapterFromGdiDisplayName @ stub D3DKMTOpenAdapterFromHdc @ stub D3DKMTOpenResource @ stub D3DKMTPresent diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 88f49a03b6..01efc6903b 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -41,6 +41,7 @@ #include "wine/unicode.h" #include "wine/list.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(driver); @@ -51,9 +52,18 @@ struct graphics_driver const struct gdi_dc_funcs *funcs; }; +struct d3dkmt_adapter +{ + D3DKMT_HANDLE handle; /* Kernel mode graphics adapter handle */ + INT ordinal; /* Graphics adapter ordinal */ + struct list entry; /* List entry */ +}; + static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; +static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); + const struct gdi_dc_funcs *font_driver = NULL; static CRITICAL_SECTION driver_section; @@ -1272,3 +1282,43 @@ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) FIXME("(%p): stub\n", desc); return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTOpenAdapterFromGdiDisplayName [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) +{ + static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; + static D3DKMT_HANDLE handle_start = 0; + struct d3dkmt_adapter *adapter; + + TRACE("(%p) semi-stub\n", desc); + + if (!desc) + return STATUS_UNSUCCESSFUL; + + /* FIXME: Support multiple monitors */ + if (lstrcmpiW( desc->DeviceName, display1W )) + { + FIXME("%s is unsupported\n", wine_dbgstr_w( desc->DeviceName )); + return STATUS_UNSUCCESSFUL; + } + + adapter = heap_alloc( sizeof( *adapter ) ); + if (!adapter) + return STATUS_NO_MEMORY; + + EnterCriticalSection( &driver_section ); + /* D3DKMT_HANDLE is UINT, so we can't use pointer as handle */ + adapter->handle = ++handle_start; + adapter->ordinal = 0; + list_add_tail( &d3dkmt_adapters, &adapter->entry ); + LeaveCriticalSection( &driver_section ); + + desc->hAdapter = handle_start; + /* FIXME: Support AdapterLuid */ + desc->AdapterLuid.LowPart = 0; + desc->AdapterLuid.HighPart = 0; + desc->VidPnSourceId = 0; + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2d158e0f1b..5c17ed9ee8 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -84,6 +84,7 @@ @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 3b8953b4c3..067c162838 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -56,7 +56,7 @@ static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) if (!pD3DKMTOpenAdapterFromGdiDisplayName || pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); + win_skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); return; } diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index c87321058c..5436cb6612 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -168,6 +168,7 @@ extern "C" NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); +NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); #ifdef __cplusplus } -- 2.20.1

3 2

[PATCH v4 3/4] winemac.drv: Activate window when restoring from iconic state.
by Zhiyi Zhang 05 Jun '19

05 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index b7a09634ee..605c0c87f1 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2452,6 +2452,7 @@ void macdrv_window_did_unminimize(HWND hwnd) { TRACE("restoring win %p/%p\n", hwnd, data->cocoa_window); release_win_data(data); + SetActiveWindow(hwnd); SendMessageW(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); return; } -- 2.20.1

2 1

[PATCH v2 resend] kernel32: Consider the working directory first when launching executables with CreateProcess.
by Erich E. Hoover 05 Jun '19

05 Jun '19

v2: Fix the logic so that having NoDefaultCurrentDirectoryInExePath set does not break the search *The three most relevant cases* Case 1: NoDefaultCurrentDirectoryInExePath = False NeedCurrentDirectoryForExePathW = True GetCurrentDirectoryW != 0 (True) SearchPathW = True Overall = True (stop search) Case 2: NoDefaultCurrentDirectoryInExePath = False NeedCurrentDirectoryForExePathW = True GetCurrentDirectoryW != 0 (True) SearchPathW = False Overall = False (continue search) Case 3: NoDefaultCurrentDirectoryInExePath = True NeedCurrentDirectoryForExePathW = False GetCurrentDirectoryW (not called) SearchPathW (not called) Overall = False (continue search) Best, Erich

2 1

[PATCH 2/2] msvcp: Add _Init_locks class implementation.
by Piotr Caban 05 Jun '19

05 Jun '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46982 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp100/msvcp100.spec | 16 +++++----- dlls/msvcp110/msvcp110.spec | 20 ++++++------ dlls/msvcp120/msvcp120.spec | 20 ++++++------ dlls/msvcp140/msvcp140.spec | 20 ++++++------ dlls/msvcp60/main.c | 4 +-- dlls/msvcp60/msvcp.h | 8 +++++ dlls/msvcp80/msvcp80.spec | 16 +++++----- dlls/msvcp90/misc.c | 61 ++++++++++++++++++++++++++++++++----- dlls/msvcp90/msvcp90.h | 10 ++++-- dlls/msvcp90/msvcp90.spec | 16 +++++----- dlls/msvcp90/msvcp_main.c | 4 +-- 11 files changed, 127 insertions(+), 68 deletions(-)

1 0

[PATCH 1/2] msvcp: Fix _Lockit::_Lockit_ctor and _Lockit::_Lockit_dtor implementation.
by Piotr Caban 05 Jun '19

05 Jun '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp100/msvcp100.spec | 4 +-- dlls/msvcp110/msvcp110.spec | 4 +-- dlls/msvcp120/msvcp120.spec | 4 +-- dlls/msvcp140/msvcp140.spec | 4 +-- dlls/msvcp80/msvcp80.spec | 4 +-- dlls/msvcp90/misc.c | 55 ++++++++++++++++++++----------------- dlls/msvcp90/msvcp90.spec | 4 +-- 7 files changed, 42 insertions(+), 37 deletions(-)

1 0

[PATCH v7 1/6] kernel32/tests: Fix NtAllocateVirtualMemory tests results on w1064v1809
by Rémi Bernon 05 Jun '19

05 Jun '19

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 474955630fd..d797df26f6c 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -456,12 +456,13 @@ static void test_VirtualAlloc(void) ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); - /* 21 zero bits is valid */ + /* 21 zero bits never succeeds */ size = 0x1000; addr2 = NULL; status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 21, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, + todo_wine + ok(status == STATUS_NO_MEMORY || status == STATUS_INVALID_PARAMETER, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); @@ -470,7 +471,8 @@ static void test_VirtualAlloc(void) addr2 = NULL; status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 22, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - ok(status == STATUS_INVALID_PARAMETER_3, "NtAllocateVirtualMemory returned %08x\n", status); + ok(status == STATUS_INVALID_PARAMETER_3 || status == STATUS_INVALID_PARAMETER, + "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); /* AT_ROUND_TO_PAGE flag is not supported for VirtualAlloc */ @@ -484,8 +486,8 @@ static void test_VirtualAlloc(void) addr2 = (char *)addr1 + 0x1000; status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 0, &size, MEM_RESERVE | MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE); - todo_wine - ok(status == STATUS_INVALID_PARAMETER_5, "NtAllocateVirtualMemory returned %08x\n", status); + ok(status == STATUS_INVALID_PARAMETER_5 || status == STATUS_INVALID_PARAMETER, + "NtAllocateVirtualMemory returned %08x\n", status); ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); } -- 2.20.1

3 11

[PATCH v4 1/4] gdi32: Implement D3DKMTOpenAdapterFromGdiDisplayName.
by Zhiyi Zhang 05 Jun '19

05 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Use non-safe list iteration macros. v3: Fix intermediate test crash. v4: Make d3dkmt_* struct local. Supersede 165966~165969 .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 1 + dlls/gdi32/driver.c | 51 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- include/ddk/d3dkmthk.h | 1 + 6 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index e8aa38edf4..43186e8fcc 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -46,7 +46,7 @@ @ stub D3DKMTLock @ stub D3DKMTOfferAllocations @ stub D3DKMTOpenAdapterFromDeviceName -@ stub D3DKMTOpenAdapterFromGdiDisplayName +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) gdi32.D3DKMTOpenAdapterFromGdiDisplayName @ stdcall D3DKMTOpenAdapterFromHdc(ptr) gdi32.D3DKMTOpenAdapterFromHdc @ stub D3DKMTOpenKeyedMutex @ stub D3DKMTOpenKeyedMutex2 diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 267778ab14..365e5d7c0c 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -22,6 +22,7 @@ @ stub D3DKMTGetRuntimeData @ stub D3DKMTGetSharedPrimaryHandle @ stub D3DKMTLock +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) gdi32.D3DKMTOpenAdapterFromGdiDisplayName @ stub D3DKMTOpenAdapterFromHdc @ stub D3DKMTOpenResource @ stub D3DKMTPresent diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 88f49a03b6..fe66266e18 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -41,6 +41,7 @@ #include "wine/unicode.h" #include "wine/list.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(driver); @@ -51,9 +52,18 @@ struct graphics_driver const struct gdi_dc_funcs *funcs; }; +struct d3dkmt_adapter +{ + D3DKMT_HANDLE handle; /* Kernel mode graphics adapter handle */ + INT ordinal; /* Graphics adapter ordinal */ + struct list entry; /* List entry */ +}; + static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; +static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); + const struct gdi_dc_funcs *font_driver = NULL; static CRITICAL_SECTION driver_section; @@ -1272,3 +1282,44 @@ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) FIXME("(%p): stub\n", desc); return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTOpenAdapterFromGdiDisplayName [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) +{ + static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; + static D3DKMT_HANDLE handle_start = 0; + struct d3dkmt_adapter *adapter; + + TRACE("(%p) semi-stub\n", desc); + + if (!desc) + return STATUS_UNSUCCESSFUL; + + /* FIXME: Support multiple monitors */ + if (lstrcmpiW( desc->DeviceName, display1W )) + { + FIXME("%s is unsupported\n", wine_dbgstr_w( desc->DeviceName )); + return STATUS_UNSUCCESSFUL; + } + + adapter = heap_alloc( sizeof( *adapter ) ); + if (!adapter) + return STATUS_NO_MEMORY; + + /* D3DKMT_HANDLE is UINT, so we can't use pointer as handle */ + adapter->handle = ++handle_start; + adapter->ordinal = 0; + + desc->hAdapter = handle_start; + /* FIXME: Support AdapterLuid */ + desc->AdapterLuid.LowPart = 0; + desc->AdapterLuid.HighPart = 0; + desc->VidPnSourceId = 0; + + EnterCriticalSection( &driver_section ); + list_add_tail( &d3dkmt_adapters, &adapter->entry ); + LeaveCriticalSection( &driver_section ); + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2d158e0f1b..5c17ed9ee8 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -84,6 +84,7 @@ @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 3b8953b4c3..067c162838 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -56,7 +56,7 @@ static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) if (!pD3DKMTOpenAdapterFromGdiDisplayName || pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); + win_skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); return; } diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index c87321058c..5436cb6612 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -168,6 +168,7 @@ extern "C" NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); +NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); #ifdef __cplusplus } -- 2.20.1

4 3

[PATCH v2] ddraw/tests: Test lighting with _ProcessVertices() for ddraw7.
by Paul Gofman 05 Jun '19

05 Jun '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2 changes: - make process_vertices_todo last parameter in test structure; - fix IDirectDraw7 interface leak in test_lighting(). dlls/ddraw/tests/ddraw7.c | 378 ++++++++++++++++++++++++++++---------- 1 file changed, 282 insertions(+), 96 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 9ba6a06ecc..ce741253ae 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -20,6 +20,7 @@ #define COBJMACROS #include "wine/test.h" +#include "wine/heap.h" #include <limits.h> #include <math.h> #include "d3d.h" @@ -3644,7 +3645,7 @@ static void test_lighting(void) 0.0f, 0.0f, 1.0f, -1.0f, 10.f, 10.0f, 10.0f, 0.0f, }; - static struct + static struct vertex { struct vec3 position; DWORD diffuse; @@ -3663,7 +3664,7 @@ static void test_lighting(void) {{ 0.0f, 1.0f, 0.1f}, 0xff00ff00}, {{ 0.0f, 0.0f, 0.1f}, 0xff00ff00}, }; - static struct + static struct vertex_normal { struct vec3 position; struct vec3 normal; @@ -3709,26 +3710,41 @@ static void test_lighting(void) { D3DMATRIX *world_matrix; void *quad; - DWORD expected; + DWORD expected, expected_process_vertices; const char *message; + BOOL process_vertices_todo; } tests[] = { - {&mat, nquad, 0x000000ff, "Lit quad with light"}, - {&mat_singular, nquad, 0x000000ff, "Lit quad with singular world matrix"}, - {&mat_transf, rotatedquad, 0x000000ff, "Lit quad with transformation matrix"}, - {&mat_nonaffine, translatedquad, 0x00000000, "Lit quad with non-affine matrix"}, + {&mat, nquad, 0x000000ff, 0xff0000ff, "Lit quad with light"}, + {&mat_singular, nquad, 0x000000ff, 0xff000000, "Lit quad with singular world matrix", TRUE}, + {&mat_transf, rotatedquad, 0x000000ff, 0xff0000ff, "Lit quad with transformation matrix"}, + {&mat_nonaffine, translatedquad, 0x00000000, 0xff000000, "Lit quad with non-affine matrix"}, }; - HWND window; + DWORD nfvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_NORMAL; + IDirect3DVertexBuffer7 *src_vb1, *src_vb2, *dst_vb; + DWORD fvf = D3DFVF_XYZ | D3DFVF_DIFFUSE; + struct vertex_normal *src_data2; + D3DVERTEXBUFFERDESC vb_desc; + struct vertex *src_data1; IDirect3DDevice7 *device; IDirectDrawSurface7 *rt; - HRESULT hr; - DWORD fvf = D3DFVF_XYZ | D3DFVF_DIFFUSE; - DWORD nfvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_NORMAL; + IDirectDraw7 *ddraw; + IDirect3D7 *d3d; D3DCOLOR color; ULONG refcount; unsigned int i; + BOOL is_warp; + HWND window; + HRESULT hr; + struct + { + struct vec4 position; + DWORD diffuse; + DWORD specular; + } + *dst_data; window = create_window(); if (!(device = create_device(window, DDSCL_NORMAL))) @@ -3737,97 +3753,199 @@ static void test_lighting(void) DestroyWindow(window); return; } + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + is_warp = ddraw_is_warp(ddraw); hr = IDirect3DDevice7_GetRenderTarget(device, &rt); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &mat); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_VIEW, &mat); - ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &mat); - ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CLIPPING, FALSE); - ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_STENCILENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable stencil buffering, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CULLMODE, D3DCULL_NONE); - ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + memset(&vb_desc, 0, sizeof(vb_desc)); + vb_desc.dwSize = sizeof(vb_desc); + vb_desc.dwFVF = fvf; + vb_desc.dwNumVertices = 2; + hr = IDirect3D7_CreateVertexBuffer(d3d, &vb_desc, &src_vb1, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + vb_desc.dwSize = sizeof(vb_desc); + vb_desc.dwFVF = nfvf; + vb_desc.dwNumVertices = 2; + hr = IDirect3D7_CreateVertexBuffer(d3d, &vb_desc, &src_vb2, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + memset(&vb_desc, 0, sizeof(vb_desc)); + vb_desc.dwSize = sizeof(vb_desc); + vb_desc.dwFVF = D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR; + vb_desc.dwNumVertices = 4; + hr = IDirect3D7_CreateVertexBuffer(d3d, &vb_desc, &dst_vb, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_Lock(src_vb1, 0, (void **)&src_data1, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(src_data1, unlitquad, sizeof(*src_data1)); + memcpy(&src_data1[1], litquad, sizeof(*src_data1)); + hr = IDirect3DVertexBuffer7_Unlock(src_vb1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_Lock(src_vb2, 0, (void **)&src_data2, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(src_data2, unlitnquad, sizeof(*src_data2)); + memcpy(&src_data2[1], litnquad, sizeof(*src_data2)); + hr = IDirect3DVertexBuffer7_Unlock(src_vb2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* No lights are defined... That means, lit vertices should be entirely black. */ hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); - ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb, D3DVOP_TRANSFORM, 0, + 1, src_vb1, 0, device, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, fvf, unlitquad, 4, indices, 6, 0); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, TRUE); - ok(SUCCEEDED(hr), "Failed to enable lighting, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb, D3DVOP_TRANSFORM | D3DVOP_LIGHT, 1, + 1, src_vb1, 1, device, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, fvf, litquad, 4, indices, 6, 0); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); - ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb, D3DVOP_TRANSFORM, 2, + 1, src_vb2, 0, device, 0); hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, nfvf, unlitnquad, 4, indices, 6, 0); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, TRUE); - ok(SUCCEEDED(hr), "Failed to enable lighting, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb, D3DVOP_TRANSFORM | D3DVOP_LIGHT, 3, + 1, src_vb2, 1, device, 0); hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, nfvf, litnquad, 4, indices, 6, 0); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_Lock(dst_vb, 0, (void **)&dst_data, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 160, 360); ok(color == 0x00ff0000, "Unlit quad without normals has color 0x%08x, expected 0x00ff0000.\n", color); + ok(dst_data[0].diffuse == 0xffff0000, + "Unlit quad without normals has color 0x%08x, expected 0xffff0000.\n", dst_data[0].diffuse); + ok(!dst_data[0].specular, + "Unexpected specular color 0x%08x.\n", dst_data[0].specular); color = get_surface_color(rt, 160, 120); - ok(color == 0x00000000, "Lit quad without normals has color 0x%08x, expected 0x00000000.\n", color); + /* Broken on some of WARP drivers. */ + ok(color == 0x00000000 || broken(is_warp && color == 0x000000ff), + "Lit quad without normals has color 0x%08x, expected 0x00000000.\n", color); + ok(dst_data[1].diffuse == 0xff000000, + "Lit quad without normals has color 0x%08x, expected 0xff000000.\n", dst_data[1].diffuse); + ok(!dst_data[1].specular, + "Unexpected specular color 0x%08x.\n", dst_data[1].specular); color = get_surface_color(rt, 480, 360); ok(color == 0x000000ff, "Unlit quad with normals has color 0x%08x, expected 0x000000ff.\n", color); + ok(dst_data[2].diffuse == 0xff0000ff, + "Unlit quad with normals has color 0x%08x, expected 0xff0000ff.\n", dst_data[2].diffuse); + ok(!dst_data[2].specular, + "Unexpected specular color 0x%08x.\n", dst_data[2].specular); color = get_surface_color(rt, 480, 120); - ok(color == 0x00000000, "Lit quad with normals has color 0x%08x, expected 0x00000000.\n", color); + ok(color == 0x00000000 || broken(is_warp && color == 0x000000ff), + "Lit quad with normals has color 0x%08x, expected 0x00000000.\n", color); + ok(dst_data[3].diffuse == 0xff000000, + "Lit quad with normals has color 0x%08x, expected 0xff000000.\n", dst_data[3].diffuse); + ok(!dst_data[3].specular, + "Unexpected specular color 0x%08x.\n", dst_data[3].specular); + + hr = IDirect3DVertexBuffer7_Unlock(dst_vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_LightEnable(device, 0, TRUE); - ok(SUCCEEDED(hr), "Failed to enable light 0, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(tests); ++i) { + hr = IDirect3DVertexBuffer7_Lock(src_vb2, 0, (void **)&src_data2, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(src_data2, tests[i].quad, sizeof(*src_data2)); + hr = IDirect3DVertexBuffer7_Unlock(src_vb2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, tests[i].world_matrix); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb, D3DVOP_TRANSFORM | D3DVOP_LIGHT, 0, + 1, src_vb2, 0, device, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, nfvf, tests[i].quad, 4, indices, 6, 0); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_Lock(dst_vb, 0, (void **)&dst_data, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(color == tests[i].expected, "%s has color 0x%08x.\n", tests[i].message, color); + ok(color == tests[i].expected || broken(is_warp && color == 0x000000ff), + "%s has color 0x%08x.\n", tests[i].message, color); + todo_wine_if(tests[i].process_vertices_todo) + ok(dst_data[0].diffuse == tests[i].expected_process_vertices, + "%s has color 0x%08x.\n", tests[i].message, dst_data[0].diffuse); + ok(!dst_data[0].specular, + "%s has specular color 0x%08x.\n", tests[i].message, dst_data[0].specular); + + hr = IDirect3DVertexBuffer7_Unlock(dst_vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } + IDirect3DVertexBuffer7_Release(src_vb1); + IDirect3DVertexBuffer7_Release(src_vb2); + IDirect3DVertexBuffer7_Release(dst_vb); + IDirectDrawSurface7_Release(rt); + IDirectDraw7_Release(ddraw); + IDirect3D7_Release(d3d); refcount = IDirect3DDevice7_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); DestroyWindow(window); @@ -3845,6 +3963,24 @@ static void test_specular_lighting(void) 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, }; + static const struct vertex + { + struct vec3 position; + struct vec3 normal; + } + vertices[] = + { + {{-0.5f, -0.5f, 1.0f}, {0.0f, 0.0f, -1.0f}}, + {{ 0.0f, -0.5f, 1.0f}, {0.0f, 0.0f, -1.0f}}, + {{ 0.5f, -0.5f, 1.0f}, {0.0f, 0.0f, -1.0f}}, + {{-0.5f, 0.0f, 1.0f}, {0.0f, 0.0f, -1.0f}}, + {{ 0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, -1.0f}}, + {{ 0.5f, 0.0f, 1.0f}, {0.0f, 0.0f, -1.0f}}, + {{-0.5f, 0.5f, 1.0f}, {0.0f, 0.0f, -1.0f}}, + {{ 0.0f, 0.5f, 1.0f}, {0.0f, 0.0f, -1.0f}}, + {{ 0.5f, 0.5f, 1.0f}, {0.0f, 0.0f, -1.0f}}, + }; + static D3DLIGHT7 directional = { D3DLIGHT_DIRECTIONAL, @@ -4006,18 +4142,6 @@ static void test_specular_lighting(void) {320, 360, 0x00000000}, {480, 360, 0x00000000}, }, - expected_directional_0[] = - { - {160, 120, 0x00ffffff}, - {320, 120, 0x00ffffff}, - {480, 120, 0x00ffffff}, - {160, 240, 0x00ffffff}, - {320, 240, 0x00ffffff}, - {480, 240, 0x00ffffff}, - {160, 360, 0x00ffffff}, - {320, 360, 0x00ffffff}, - {480, 360, 0x00ffffff}, - }, expected_directional_local_0[] = { {160, 120, 0x00ffffff}, @@ -4071,41 +4195,56 @@ static void test_specular_lighting(void) D3DLIGHT7 *light; BOOL local_viewer; float specular_power; - const struct expected_color *expected; + const struct expected_color *expected, *expected_process_vertices; unsigned int expected_count; + BOOL todo_process_vertices; } tests[] = { - {&directional, FALSE, 30.0f, expected_directional, ARRAY_SIZE(expected_directional)}, - {&directional, TRUE, 30.0f, expected_directional_local, ARRAY_SIZE(expected_directional_local)}, - {&point, FALSE, 30.0f, expected_point, ARRAY_SIZE(expected_point)}, - {&point, TRUE, 30.0f, expected_point_local, ARRAY_SIZE(expected_point_local)}, - {&spot, FALSE, 30.0f, expected_spot, ARRAY_SIZE(expected_spot)}, - {&spot, TRUE, 30.0f, expected_spot_local, ARRAY_SIZE(expected_spot_local)}, - {&point_range, FALSE, 30.0f, expected_point_range, ARRAY_SIZE(expected_point_range)}, - {&point_side, TRUE, 0.0f, expected_point_side, ARRAY_SIZE(expected_point_side)}, - {&directional, FALSE, 0.0f, expected_directional_0, ARRAY_SIZE(expected_directional_0)}, - {&directional, TRUE, 0.0f, expected_directional_local_0, ARRAY_SIZE(expected_directional_local_0)}, - {&point, FALSE, 0.0f, expected_point_0, ARRAY_SIZE(expected_point_0)}, - {&point, TRUE, 0.0f, expected_point_0, ARRAY_SIZE(expected_point_0)}, - {&spot, FALSE, 0.0f, expected_spot_0, ARRAY_SIZE(expected_spot_0)}, - {&spot, TRUE, 0.0f, expected_spot_0, ARRAY_SIZE(expected_spot_0)}, - {&point_range, FALSE, 0.0f, expected_point_range_0, ARRAY_SIZE(expected_point_range_0)}, - }; + {&directional, FALSE, 30.0f, expected_directional, expected_directional, + ARRAY_SIZE(expected_directional)}, + {&directional, TRUE, 30.0f, expected_directional_local, expected_directional_local, + ARRAY_SIZE(expected_directional_local)}, + {&point, FALSE, 30.0f, expected_point, expected_point, ARRAY_SIZE(expected_point)}, + {&point, TRUE, 30.0f, expected_point_local, expected_point_local, ARRAY_SIZE(expected_point_local)}, + {&spot, FALSE, 30.0f, expected_spot, expected_spot, ARRAY_SIZE(expected_spot)}, + {&spot, TRUE, 30.0f, expected_spot_local, expected_spot_local, ARRAY_SIZE(expected_spot_local)}, + {&point_range, FALSE, 30.0f, expected_point_range, expected_point_range, + ARRAY_SIZE(expected_point_range)}, + + /* For zero material shininess _ProcessVertices() seem to keep non-zero material shininess set previously. */ + {&point_side, TRUE, 0.0f, expected_point_side, expected_point_side, ARRAY_SIZE(expected_point_side), TRUE}, + {&directional, FALSE, 0.0f, expected_directional, expected_directional, + ARRAY_SIZE(expected_directional), TRUE}, + {&directional, TRUE, 0.0f, expected_directional_local_0, expected_directional_local, + ARRAY_SIZE(expected_directional_local_0), TRUE}, + {&point, FALSE, 0.0f, expected_point_0, expected_point, ARRAY_SIZE(expected_point_0), TRUE}, + {&point, TRUE, 0.0f, expected_point_0, expected_point_local, ARRAY_SIZE(expected_point_0), TRUE}, + {&spot, FALSE, 0.0f, expected_spot_0, expected_spot, ARRAY_SIZE(expected_spot_0), TRUE}, + {&spot, TRUE, 0.0f, expected_spot_0, expected_spot_local, ARRAY_SIZE(expected_spot_0), TRUE}, + {&point_range, FALSE, 0.0f, expected_point_range_0, expected_point_range, ARRAY_SIZE(expected_point_range_0), TRUE}, + }; + + IDirect3DVertexBuffer7 *src_vb, *dst_vb; + D3DCOLOR color, expected_color; + D3DVERTEXBUFFERDESC vb_desc; IDirect3DDevice7 *device; + unsigned int i, j, x, y; IDirectDrawSurface7 *rt; D3DMATERIAL7 material; - D3DCOLOR color; + struct vec3 *src_data; + struct vertex *quad; + IDirect3D7 *d3d; ULONG refcount; + WORD *indices; HWND window; HRESULT hr; - unsigned int i, j, x, y; struct { - struct vec3 position; - struct vec3 normal; - } *quad; - WORD *indices; + struct vec4 position; + DWORD diffuse; + DWORD specular; + } *dst_data; window = create_window(); if (!(device = create_device(window, DDSCL_NORMAL))) @@ -4114,9 +4253,11 @@ static void test_specular_lighting(void) DestroyWindow(window); return; } + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - quad = HeapAlloc(GetProcessHeap(), 0, vertices_side * vertices_side * sizeof(*quad)); - indices = HeapAlloc(GetProcessHeap(), 0, indices_count * sizeof(*indices)); + quad = heap_alloc(vertices_side * vertices_side * sizeof(*quad)); + indices = heap_alloc(indices_count * sizeof(*indices)); for (i = 0, y = 0; y < vertices_side; ++y) { for (x = 0; x < vertices_side; ++x) @@ -4143,56 +4284,89 @@ static void test_specular_lighting(void) } hr = IDirect3DDevice7_GetRenderTarget(device, &rt); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &mat); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_VIEW, &mat); - ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &mat); - ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CLIPPING, FALSE); - ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_LightEnable(device, 0, TRUE); - ok(SUCCEEDED(hr), "Failed to enable light 0, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_SPECULARENABLE, TRUE); - ok(SUCCEEDED(hr), "Failed to enable specular lighting, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + memset(&vb_desc, 0, sizeof(vb_desc)); + vb_desc.dwSize = sizeof(vb_desc); + vb_desc.dwFVF = fvf; + vb_desc.dwNumVertices = ARRAY_SIZE(vertices); + hr = IDirect3D7_CreateVertexBuffer(d3d, &vb_desc, &src_vb, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer7_Lock(src_vb, 0, (void **)&src_data, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(src_data, vertices, sizeof(vertices)); + hr = IDirect3DVertexBuffer7_Unlock(src_vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + memset(&vb_desc, 0, sizeof(vb_desc)); + vb_desc.dwSize = sizeof(vb_desc); + vb_desc.dwFVF = D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR; + vb_desc.dwNumVertices = ARRAY_SIZE(vertices); + hr = IDirect3D7_CreateVertexBuffer(d3d, &vb_desc, &dst_vb, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice7_SetLight(device, 0, tests[i].light); - ok(SUCCEEDED(hr), "Failed to set light parameters, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LOCALVIEWER, tests[i].local_viewer); - ok(SUCCEEDED(hr), "Failed to set local viewer state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memset(&material, 0, sizeof(material)); U1(U2(material).specular).r = 1.0f; U2(U2(material).specular).g = 1.0f; U3(U2(material).specular).b = 1.0f; - U4(U2(material).specular).a = 1.0f; + U4(U2(material).specular).a = 0.5f; U4(material).power = tests[i].specular_power; hr = IDirect3DDevice7_SetMaterial(device, &material); - ok(SUCCEEDED(hr), "Failed to set material, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_Lock(dst_vb, 0, (void **)&dst_data, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memset(dst_data, 0, sizeof(*dst_data) * ARRAY_SIZE(vertices)); + hr = IDirect3DVertexBuffer7_Unlock(dst_vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb, D3DVOP_TRANSFORM | D3DVOP_LIGHT, 0, + ARRAY_SIZE(vertices), src_vb, 0, device, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, fvf, quad, vertices_side * vertices_side, indices, indices_count, 0); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer7_Lock(dst_vb, 0, (void **)&dst_data, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + ok(tests[i].expected_count == ARRAY_SIZE(vertices), "Array size mismatch.\n"); for (j = 0; j < tests[i].expected_count; ++j) { color = get_surface_color(rt, tests[i].expected[j].x, tests[i].expected[j].y); @@ -4200,16 +4374,28 @@ static void test_specular_lighting(void) "Expected color 0x%08x at location (%u, %u), got 0x%08x, case %u.\n", tests[i].expected[j].color, tests[i].expected[j].x, tests[i].expected[j].y, color, i); + ok(!dst_data[j].diffuse, "Expected color 0x00000000 for vertex %u, got 0x%08x, case %u.\n", + j, dst_data[j].diffuse, i); + expected_color = tests[i].expected_process_vertices[j].color | 0x80000000; + todo_wine_if(tests[i].todo_process_vertices && dst_data[j].specular != expected_color) + ok(compare_color(dst_data[j].specular, expected_color, 1), + "Expected color 0x%08x for vertex %u, got 0x%08x, case %u.\n", + expected_color, j, dst_data[j].specular, i); } + hr = IDirect3DVertexBuffer7_Unlock(dst_vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } + IDirect3DVertexBuffer7_Release(dst_vb); + IDirect3DVertexBuffer7_Release(src_vb); IDirectDrawSurface7_Release(rt); + IDirect3D7_Release(d3d); refcount = IDirect3DDevice7_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); DestroyWindow(window); - HeapFree(GetProcessHeap(), 0, indices); - HeapFree(GetProcessHeap(), 0, quad); + heap_free(indices); + heap_free(quad); } static void test_clear_rect_count(void) -- 2.21.0

3 2

[PATCH v2 1/5] ntoskrnl.exe: Free device IDs from pool.
by Zebediah Figura 05 Jun '19

05 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/pnp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 23ae4ca..d8f74e0 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -301,7 +301,7 @@ static void handle_bus_relations( DEVICE_OBJECT *device ) if (get_driver_for_id( ptr, driver )) break; } - RtlFreeHeap( GetProcessHeap(), 0, ids ); + ExFreePool( ids ); if (!driver[0]) { @@ -409,7 +409,7 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP else status = STATUS_BUFFER_TOO_SMALL; - HeapFree( GetProcessHeap(), 0, id ); + ExFreePool( id ); break; } case DevicePropertyPhysicalDeviceObjectName: @@ -658,17 +658,17 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla HeapFree( GetProcessHeap(), 0, id ); if (!rc) { - HeapFree( GetProcessHeap(), 0, instance_id ); + ExFreePool( instance_id ); return STATUS_UNSUCCESSFUL; } } else { - HeapFree( GetProcessHeap(), 0, instance_id ); + ExFreePool( instance_id ); return STATUS_UNSUCCESSFUL; } } - HeapFree( GetProcessHeap(), 0, instance_id ); + ExFreePool( instance_id ); if (!SetupDiCreateDeviceInterfaceW( set, &sp_device, class_guid, refstr ? refstr->Buffer : NULL, 0, &sp_iface )) return STATUS_UNSUCCESSFUL; -- 2.7.4

1 4

[PATCH vkd3d 4/4] vkd3d: Add initial checks for feature levels 12_0+.
by Józef Kucia 05 Jun '19

05 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 06b58215339d..a9610ffbfb4a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1090,7 +1090,8 @@ static void vkd3d_trace_physical_device_features(const VkPhysicalDeviceFeatures2 } static void vkd3d_init_feature_level(struct vkd3d_vulkan_info *vk_info, - const VkPhysicalDeviceFeatures *features) + const VkPhysicalDeviceFeatures *features, + const D3D12_FEATURE_DATA_D3D12_OPTIONS *d3d12_options) { bool have_11_0 = true; @@ -1158,12 +1159,24 @@ static void vkd3d_init_feature_level(struct vkd3d_vulkan_info *vk_info, vk_info->max_feature_level = D3D_FEATURE_LEVEL_11_0; if (have_11_0 - && features->logicOp + && d3d12_options->OutputMergerLogicOp && features->vertexPipelineStoresAndAtomics && vk_info->device_limits.maxPerStageDescriptorStorageBuffers >= D3D12_UAV_SLOT_COUNT && vk_info->device_limits.maxPerStageDescriptorStorageImages >= D3D12_UAV_SLOT_COUNT) vk_info->max_feature_level = D3D_FEATURE_LEVEL_11_1; + /* TODO: MinMaxFiltering */ + if (vk_info->max_feature_level >= D3D_FEATURE_LEVEL_11_1 + && d3d12_options->TiledResourcesTier >= D3D12_TILED_RESOURCES_TIER_2 + && d3d12_options->ResourceBindingTier >= D3D12_RESOURCE_BINDING_TIER_2 + && d3d12_options->TypedUAVLoadAdditionalFormats) + vk_info->max_feature_level = D3D_FEATURE_LEVEL_12_0; + + if (vk_info->max_feature_level >= D3D_FEATURE_LEVEL_12_0 + && d3d12_options->ROVsSupported + && d3d12_options->ConservativeRasterizationTier >= D3D12_CONSERVATIVE_RASTERIZATION_TIER_1) + vk_info->max_feature_level = D3D_FEATURE_LEVEL_12_1; + TRACE("Max feature level: %#x.\n", vk_info->max_feature_level); } @@ -1333,7 +1346,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vkd3d_free(vk_extensions); - vkd3d_init_feature_level(vulkan_info, features); + vkd3d_init_feature_level(vulkan_info, features, &device->feature_options); if (vulkan_info->max_feature_level < create_info->minimum_feature_level) { WARN("Feature level %#x is not supported.\n", create_info->minimum_feature_level); -- 2.21.0

2 1

[PATCH vkd3d 3/4] vkd3d: Use sparse resources for emulating NULL UAVs.
by Józef Kucia 05 Jun '19

05 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> If residencyNonResidentStrict is supported. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 7 +++ libs/vkd3d/resource.c | 112 +++++++++++++++++++++++++++--------------- 2 files changed, 79 insertions(+), 40 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index e83b7fa9258c..06b58215339d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1213,6 +1213,13 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vkd3d_trace_physical_device_features(features2); vkd3d_trace_physical_device_limits(&device_properties2); + if (!features->sparseResidencyBuffer || !features->sparseResidencyImage2D) + { + features->sparseResidencyBuffer = VK_FALSE; + features->sparseResidencyImage2D = VK_FALSE; + device_properties2.properties.sparseProperties.residencyNonResidentStrict = VK_FALSE; + } + vulkan_info->device_limits = device_properties2.properties.limits; vulkan_info->sparse_properties = device_properties2.properties.sparseProperties; vulkan_info->rasterization_stream = xfb_properties.transformFeedbackRasterizationStreamSelect; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 30ef9018d775..1e5f5f3c3c38 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -3357,6 +3357,7 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H static HRESULT vkd3d_init_null_resources_data(struct vkd3d_null_resources *null_resource, struct d3d12_device *device) { + const bool use_sparse_resources = device->vk_info.sparse_properties.residencyNonResidentStrict; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; static const VkClearColorValue clear_color = {{0}}; VkCommandBufferAllocateInfo command_buffer_info; @@ -3413,37 +3414,63 @@ static HRESULT vkd3d_init_null_resources_data(struct vkd3d_null_resources *null_ /* fill buffer */ VK_CALL(vkCmdFillBuffer(vk_command_buffer, null_resource->vk_buffer, 0, VK_WHOLE_SIZE, 0x00000000)); - /* fill UAV buffer */ - VK_CALL(vkCmdFillBuffer(vk_command_buffer, null_resource->vk_storage_buffer, 0, VK_WHOLE_SIZE, 0x00000000)); - - /* clear 2D UAV image */ - barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; - barrier.pNext = NULL; - barrier.srcAccessMask = 0; - barrier.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; - barrier.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED; - barrier.newLayout = VK_IMAGE_LAYOUT_GENERAL; - barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - barrier.image = null_resource->vk_2d_storage_image; - barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; - barrier.subresourceRange.baseMipLevel = 0; - barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS; - barrier.subresourceRange.baseArrayLayer = 0; - barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS; - - VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, - VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, - 0, NULL, 0, NULL, 1, &barrier)); - - range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; - range.baseMipLevel = 0; - range.levelCount = 1; - range.baseArrayLayer = 0; - range.layerCount = 1; - - VK_CALL(vkCmdClearColorImage(vk_command_buffer, - null_resource->vk_2d_storage_image, VK_IMAGE_LAYOUT_GENERAL, &clear_color, 1, &range)); + if (use_sparse_resources) + { + /* transition 2D UAV image */ + barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; + barrier.pNext = NULL; + barrier.srcAccessMask = 0; + barrier.dstAccessMask = 0; + barrier.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED; + barrier.newLayout = VK_IMAGE_LAYOUT_GENERAL; + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.image = null_resource->vk_2d_storage_image; + barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + barrier.subresourceRange.baseMipLevel = 0; + barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS; + barrier.subresourceRange.baseArrayLayer = 0; + barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS; + + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, + VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, 0, + 0, NULL, 0, NULL, 1, &barrier)); + } + else + { + /* fill UAV buffer */ + VK_CALL(vkCmdFillBuffer(vk_command_buffer, + null_resource->vk_storage_buffer, 0, VK_WHOLE_SIZE, 0x00000000)); + + /* clear 2D UAV image */ + barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; + barrier.pNext = NULL; + barrier.srcAccessMask = 0; + barrier.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + barrier.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED; + barrier.newLayout = VK_IMAGE_LAYOUT_GENERAL; + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.image = null_resource->vk_2d_storage_image; + barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + barrier.subresourceRange.baseMipLevel = 0; + barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS; + barrier.subresourceRange.baseArrayLayer = 0; + barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS; + + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, + VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, + 0, NULL, 0, NULL, 1, &barrier)); + + range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + range.baseMipLevel = 0; + range.levelCount = 1; + range.baseArrayLayer = 0; + range.layerCount = 1; + + VK_CALL(vkCmdClearColorImage(vk_command_buffer, + null_resource->vk_2d_storage_image, VK_IMAGE_LAYOUT_GENERAL, &clear_color, 1, &range)); + } /* transition 2D SRV image */ barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; @@ -3516,6 +3543,7 @@ done: HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, struct d3d12_device *device) { + const bool use_sparse_resources = device->vk_info.sparse_properties.residencyNonResidentStrict; D3D12_HEAP_PROPERTIES heap_properties; D3D12_RESOURCE_DESC resource_desc; HRESULT hr; @@ -3550,10 +3578,10 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, /* buffer UAV */ resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS; - if (FAILED(hr = vkd3d_create_buffer(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + if (FAILED(hr = vkd3d_create_buffer(device, use_sparse_resources ? NULL : &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, &null_resources->vk_storage_buffer))) goto fail; - if (FAILED(hr = vkd3d_allocate_buffer_memory(device, null_resources->vk_storage_buffer, + if (!use_sparse_resources && FAILED(hr = vkd3d_allocate_buffer_memory(device, null_resources->vk_storage_buffer, &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_storage_buffer_memory))) goto fail; @@ -3587,13 +3615,14 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, resource_desc.Format = VKD3D_NULL_VIEW_FORMAT; resource_desc.SampleDesc.Count = 1; resource_desc.SampleDesc.Quality = 0; - resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_desc.Layout = use_sparse_resources + ? D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE : D3D12_TEXTURE_LAYOUT_UNKNOWN; resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS; - if (FAILED(hr = vkd3d_create_image(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + if (FAILED(hr = vkd3d_create_image(device, use_sparse_resources ? NULL : &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, &null_resources->vk_2d_storage_image))) goto fail; - if (FAILED(hr = vkd3d_allocate_image_memory(device, null_resources->vk_2d_storage_image, + if (!use_sparse_resources && FAILED(hr = vkd3d_allocate_image_memory(device, null_resources->vk_2d_storage_image, &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_2d_storage_image_memory))) goto fail; @@ -3604,16 +3633,19 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL memory"); vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_storage_buffer, VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT, "NULL UAV buffer"); - vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_storage_buffer_memory, - VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL UAV buffer memory"); vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_image, VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, "NULL 2D SRV image"); vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_image_memory, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL 2D SRV memory"); vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_storage_image, VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, "NULL 2D UAV image"); - vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_storage_image_memory, - VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL 2D UAV memory"); + if (!use_sparse_resources) + { + vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_storage_buffer_memory, + VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL UAV buffer memory"); + vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_storage_image_memory, + VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL 2D UAV memory"); + } return vkd3d_init_null_resources_data(null_resources, device); -- 2.21.0

2 1

[PATCH vkd3d 2/4] tests: Add test for creating reserved resources.
by Józef Kucia 05 Jun '19

05 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index d6cd4e014660..04ee7be99fff 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -616,6 +616,36 @@ static bool is_min_max_filtering_supported(ID3D12Device *device) return options.TiledResourcesTier >= D3D12_TILED_RESOURCES_TIER_2; } +static D3D12_TILED_RESOURCES_TIER get_tiled_resources_tier(ID3D12Device *device) +{ + D3D12_FEATURE_DATA_D3D12_OPTIONS options; + HRESULT hr; + + if (FAILED(hr = ID3D12Device_CheckFeatureSupport(device, + D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)))) + { + trace("Failed to check feature support, hr %#x.\n", hr); + return D3D12_TILED_RESOURCES_TIER_NOT_SUPPORTED; + } + + return options.TiledResourcesTier; +} + +static bool is_standard_swizzle_64kb_supported(ID3D12Device *device) +{ + D3D12_FEATURE_DATA_D3D12_OPTIONS options; + HRESULT hr; + + if (FAILED(hr = ID3D12Device_CheckFeatureSupport(device, + D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)))) + { + trace("Failed to check feature support, hr %#x.\n", hr); + return false; + } + + return options.StandardSwizzle64KBSupported; +} + #define create_cb_root_signature(a, b, c, e) create_cb_root_signature_(__LINE__, a, b, c, e) static ID3D12RootSignature *create_cb_root_signature_(unsigned int line, ID3D12Device *device, unsigned int reg_idx, D3D12_SHADER_VISIBILITY shader_visibility, @@ -2126,6 +2156,138 @@ static void test_create_placed_resource(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_create_reserved_resource(void) +{ + D3D12_GPU_VIRTUAL_ADDRESS gpu_address; + D3D12_HEAP_PROPERTIES heap_properties; + D3D12_RESOURCE_DESC resource_desc; + D3D12_CLEAR_VALUE clear_value; + D3D12_HEAP_FLAGS heap_flags; + ID3D12Resource *resource; + bool standard_swizzle; + ID3D12Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + if (get_tiled_resources_tier(device) == D3D12_TILED_RESOURCES_TIER_NOT_SUPPORTED) + { + skip("Tiled resources are not supported.\n"); + goto done; + } + + standard_swizzle = is_standard_swizzle_64kb_supported(device); + trace("Standard swizzle 64KB: %#x.\n", standard_swizzle); + + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + resource_desc.Alignment = 0; + resource_desc.Width = 32; + resource_desc.Height = 1; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_UNKNOWN; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + resource_desc.Flags = 0; + + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create reserved resource, hr %#x.\n", hr); + + check_interface(resource, &IID_ID3D12Object, TRUE); + check_interface(resource, &IID_ID3D12DeviceChild, TRUE); + check_interface(resource, &IID_ID3D12Pageable, TRUE); + check_interface(resource, &IID_ID3D12Resource, TRUE); + + gpu_address = ID3D12Resource_GetGPUVirtualAddress(resource); + ok(gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address); + + heap_flags = 0xdeadbeef; + hr = ID3D12Resource_GetHeapProperties(resource, &heap_properties, &heap_flags); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(heap_flags == 0xdeadbeef, "Got unexpected heap flags %#x.\n", heap_flags); + + refcount = ID3D12Resource_Release(resource); + ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount); + + /* The clear value must be NULL for buffers. */ + clear_value.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + clear_value.Color[0] = 1.0f; + clear_value.Color[1] = 0.0f; + clear_value.Color[2] = 0.0f; + clear_value.Color[3] = 1.0f; + + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + /* D3D12_TEXTURE_LAYOUT_ROW_MAJOR must be used for buffers. */ + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE; + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + /* D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE must be used for textures. */ + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Alignment = 0; + resource_desc.Width = 64; + resource_desc.Height = 64; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 4; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE; + resource_desc.Flags = 0; + + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create reserved resource, hr %#x.\n", hr); + refcount = ID3D12Resource_Release(resource); + ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount); + + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + resource_desc.MipLevels = 1; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_64KB_STANDARD_SWIZZLE; + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == (standard_swizzle ? S_OK : E_INVALIDARG) || broken(use_warp_device), "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12Resource_Release(resource); + +done: + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_create_descriptor_heap(void) { D3D12_DESCRIPTOR_HEAP_DESC heap_desc; @@ -29603,6 +29765,7 @@ START_TEST(d3d12) run_test(test_create_committed_resource); run_test(test_create_heap); run_test(test_create_placed_resource); + run_test(test_create_reserved_resource); run_test(test_create_descriptor_heap); run_test(test_create_sampler); run_test(test_create_unordered_access_view); -- 2.21.0

2 1

[PATCH vkd3d 1/4] vkd3d: Implement d3d12_device_CreateReservedResource().
by Józef Kucia 05 Jun '19

05 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 18 ++++-- libs/vkd3d/resource.c | 129 ++++++++++++++++++++++++++++++------- libs/vkd3d/vkd3d_private.h | 3 + 3 files changed, 119 insertions(+), 31 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index ddec0f7cae67..e83b7fa9258c 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2780,14 +2780,20 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreatePlacedResource(ID3D12Device static HRESULT STDMETHODCALLTYPE d3d12_device_CreateReservedResource(ID3D12Device *iface, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value, - REFIID riid, void **resource) + const D3D12_CLEAR_VALUE *optimized_clear_value, REFIID iid, void **resource) { - FIXME("iface %p, desc %p, initial_state %#x, optimized_clear_value %p, " - "riid %s, resource %p stub!\n", - iface, desc, initial_state, optimized_clear_value, debugstr_guid(riid), resource); + struct d3d12_device *device = impl_from_ID3D12Device(iface); + struct d3d12_resource *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, initial_state %#x, optimized_clear_value %p, iid %s, resource %p.\n", + iface, desc, initial_state, optimized_clear_value, debugstr_guid(iid), resource); + + if (FAILED(hr = d3d12_reserved_resource_create(device, + desc, initial_state, optimized_clear_value, &object))) + return hr; + + return return_interface(&object->ID3D12Resource_iface, &IID_ID3D12Resource, iid, resource); } static HRESULT STDMETHODCALLTYPE d3d12_device_CreateSharedHandle(ID3D12Device *iface, diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index c3c92386da08..30ef9018d775 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -21,6 +21,8 @@ #define VKD3D_NULL_BUFFER_SIZE 16 #define VKD3D_NULL_VIEW_FORMAT DXGI_FORMAT_R8G8B8A8_UNORM +#define VKD3D_HEAP_TYPE_INVALID ((D3D12_HEAP_TYPE)~0u) + static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32_t memory_type_mask, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags) { @@ -497,14 +499,25 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, const D3D12_RESOURCE_DESC *desc, VkBuffer *vk_buffer) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + const bool sparse_resource = !heap_properties; VkBufferCreateInfo buffer_info; + D3D12_HEAP_TYPE heap_type; VkResult vr; + heap_type = heap_properties ? heap_properties->Type : D3D12_HEAP_TYPE_DEFAULT; + buffer_info.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO; buffer_info.pNext = NULL; buffer_info.flags = 0; buffer_info.size = desc->Width; + if (sparse_resource) + { + buffer_info.flags |= VK_BUFFER_CREATE_SPARSE_BINDING_BIT; + if (device->vk_info.sparse_properties.residencyNonResidentStrict) + buffer_info.flags |= VK_BUFFER_CREATE_SPARSE_RESIDENCY_BIT; + } + buffer_info.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT @@ -512,16 +525,15 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; - if (heap_properties->Type == D3D12_HEAP_TYPE_DEFAULT - && device->vk_info.EXT_transform_feedback) + if (heap_type == D3D12_HEAP_TYPE_DEFAULT && device->vk_info.EXT_transform_feedback) { buffer_info.usage |= VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT | VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT; } - if (heap_properties->Type == D3D12_HEAP_TYPE_UPLOAD) + if (heap_type == D3D12_HEAP_TYPE_UPLOAD) buffer_info.usage &= ~VK_BUFFER_USAGE_TRANSFER_DST_BIT; - else if (heap_properties->Type == D3D12_HEAP_TYPE_READBACK) + else if (heap_type == D3D12_HEAP_TYPE_READBACK) buffer_info.usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT; if (desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS) @@ -573,6 +585,7 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, const D3D12_RESOURCE_DESC *desc, VkImage *vk_image) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + const bool sparse_resource = !heap_properties; const struct vkd3d_format *format; VkImageCreateInfo image_info; VkResult vr; @@ -595,6 +608,13 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) image_info.flags |= VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR; + if (sparse_resource) + { + image_info.flags |= VK_IMAGE_CREATE_SPARSE_BINDING_BIT; + if (device->vk_info.sparse_properties.residencyNonResidentStrict) + image_info.flags |= VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT; + } + image_info.imageType = vk_image_type_from_d3d12_resource_dimension(desc->Dimension); image_info.format = format->vk_format; image_info.extent.width = desc->Width; @@ -614,7 +634,17 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, image_info.mipLevels = min(desc->MipLevels, max_miplevel_count(desc)); image_info.samples = vk_samples_from_dxgi_sample_desc(&desc->SampleDesc); - if (desc->Layout == D3D12_TEXTURE_LAYOUT_UNKNOWN) + if (sparse_resource) + { + if (desc->Layout != D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE) + { + WARN("D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE must be used for reserved texture.\n"); + return E_INVALIDARG; + } + + image_info.tiling = VK_IMAGE_TILING_OPTIMAL; + } + else if (desc->Layout == D3D12_TEXTURE_LAYOUT_UNKNOWN) { image_info.tiling = VK_IMAGE_TILING_OPTIMAL; } @@ -652,7 +682,7 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, image_info.pQueueFamilyIndices = NULL; } - image_info.initialLayout = is_cpu_accessible_heap(heap_properties) ? + image_info.initialLayout = heap_properties && is_cpu_accessible_heap(heap_properties) ? VK_IMAGE_LAYOUT_PREINITIALIZED : VK_IMAGE_LAYOUT_UNDEFINED; if ((vr = VK_CALL(vkCreateImage(device->vk_device, &image_info, NULL, vk_image))) < 0) @@ -1155,6 +1185,12 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_GetHeapProperties(ID3D12Resource TRACE("iface %p, heap_properties %p, flags %p.\n", iface, heap_properties, flags); + if (resource->heap_properties.Type == VKD3D_HEAP_TYPE_INVALID) + { + WARN("Cannot get heap properties for reserved resources.\n"); + return E_INVALIDARG; + } + if (heap_properties) *heap_properties = resource->heap_properties; if (flags) @@ -1255,46 +1291,55 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) return S_OK; } -static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12_device *device, - const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value) +static bool d3d12_resource_validate_heap_properties(const struct d3d12_resource *resource, + const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_RESOURCE_STATES initial_state) { - HRESULT hr; - - resource->ID3D12Resource_iface.lpVtbl = &d3d12_resource_vtbl; - resource->refcount = 1; - resource->internal_refcount = 1; - - resource->desc = *desc; - if (heap_properties->Type == D3D12_HEAP_TYPE_UPLOAD || heap_properties->Type == D3D12_HEAP_TYPE_READBACK) { if (d3d12_resource_is_texture(resource)) { WARN("Textures cannot be created on upload/readback heaps.\n"); - return E_INVALIDARG; + return false; } - if (desc->Flags & (D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET | D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS)) + if (resource->desc.Flags & (D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET | D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS)) { WARN("Render target and unordered access buffers cannot be created on upload/readback heaps.\n"); - return E_INVALIDARG; + return false; } } if (heap_properties->Type == D3D12_HEAP_TYPE_UPLOAD && initial_state != D3D12_RESOURCE_STATE_GENERIC_READ) { WARN("For D3D12_HEAP_TYPE_UPLOAD the state must be D3D12_RESOURCE_STATE_GENERIC_READ.\n"); - return E_INVALIDARG; + return false; } if (heap_properties->Type == D3D12_HEAP_TYPE_READBACK && initial_state != D3D12_RESOURCE_STATE_COPY_DEST) { WARN("For D3D12_HEAP_TYPE_READBACK the state must be D3D12_RESOURCE_STATE_COPY_DEST.\n"); - return E_INVALIDARG; + return false; } + return true; +} + +static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12_device *device, + const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, + const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, + const D3D12_CLEAR_VALUE *optimized_clear_value) +{ + HRESULT hr; + + resource->ID3D12Resource_iface.lpVtbl = &d3d12_resource_vtbl; + resource->refcount = 1; + resource->internal_refcount = 1; + + resource->desc = *desc; + + if (heap_properties && !d3d12_resource_validate_heap_properties(resource, heap_properties, initial_state)) + return E_INVALIDARG; + if (!is_valid_resource_state(initial_state)) { WARN("Invalid initial resource state %#x.\n", initial_state); @@ -1351,8 +1396,18 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->map_count = 0; resource->map_ptr = NULL; - resource->heap_properties = *heap_properties; - resource->heap_flags = heap_flags; + if (heap_properties) + { + resource->heap_properties = *heap_properties; + resource->heap_flags = heap_flags; + } + else + { + memset(&resource->heap_properties, 0, sizeof(resource->heap_properties)); + resource->heap_properties.Type = VKD3D_HEAP_TYPE_INVALID; + resource->heap_flags = 0; + } + resource->initial_state = initial_state; resource->heap = NULL; @@ -1417,6 +1472,12 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, struct d3d12_resource *object; HRESULT hr; + if (!heap_properties) + { + WARN("Heap properties are NULL.\n"); + return E_INVALIDARG; + } + if (FAILED(hr = d3d12_resource_create(device, heap_properties, heap_flags, desc, initial_state, optimized_clear_value, &object))) return hr; @@ -1503,6 +1564,24 @@ HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_h return S_OK; } +HRESULT d3d12_reserved_resource_create(struct d3d12_device *device, + const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, + const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) +{ + struct d3d12_resource *object; + HRESULT hr; + + if (FAILED(hr = d3d12_resource_create(device, NULL, 0, + desc, initial_state, optimized_clear_value, &object))) + return hr; + + TRACE("Created reserved resource %p.\n", object); + + *resource = object; + + return S_OK; +} + HRESULT vkd3d_create_image_resource(ID3D12Device *device, const struct vkd3d_image_resource_create_info *create_info, ID3D12Resource **resource) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 71e05b245230..2d31cacc101e 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -402,6 +402,9 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, UINT64 heap_offset, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN; +HRESULT d3d12_reserved_resource_create(struct d3d12_device *device, + const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, + const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN; struct d3d12_resource *unsafe_impl_from_ID3D12Resource(ID3D12Resource *iface) DECLSPEC_HIDDEN; HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_buffer, -- 2.21.0

2 1

[PATCH 5/5] wined3d: Make the adapter responsible for acquiring and releasing contexts.
by Henri Verbeet 05 Jun '19

05 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 49 ++++----------------------- dlls/wined3d/adapter_vk.c | 60 ++++++++++++++++++++------------- dlls/wined3d/context.c | 75 ++++++++++++++++++------------------------ dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 69 +++++++++++++++++++++++--------------- dlls/wined3d/query.c | 6 ++-- dlls/wined3d/surface.c | 2 +- dlls/wined3d/swapchain.c | 39 ++++++++++++++++------ dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 46 +++++++++++++++++++------- 10 files changed, 190 insertions(+), 160 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 110771f8ea9..c8ebe346431 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4338,50 +4338,15 @@ static void adapter_gl_destroy_device(struct wined3d_device *device) heap_free(device_gl); } -static HRESULT adapter_gl_create_context(struct wined3d_swapchain *swapchain, struct wined3d_context **context) +struct wined3d_context *adapter_gl_acquire_context(struct wined3d_device *device, + struct wined3d_texture *texture, unsigned int sub_resource_idx) { - struct wined3d_context_gl *context_gl; - HRESULT hr; - - TRACE("swapchain %p, context %p.\n", swapchain, context); - - if (!(context_gl = heap_alloc_zero(sizeof(*context_gl)))) - return E_OUTOFMEMORY; - - if (FAILED(hr = wined3d_context_gl_init(context_gl, swapchain))) - { - WARN("Failed to initialise context.\n"); - heap_free(context_gl); - return hr; - } - - TRACE("Created context %p.\n", context_gl); - *context = &context_gl->c; - - return WINED3D_OK; + return wined3d_context_gl_acquire(device, texture, sub_resource_idx); } -static void adapter_gl_destroy_context(struct wined3d_context *context) +void adapter_gl_release_context(struct wined3d_context *context) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - - if (context_gl->c.current && context_gl->c.tid != GetCurrentThreadId()) - { - struct wined3d_gl_info *gl_info; - - /* Make a copy of gl_info for wined3d_context_gl_cleanup() use, the - * one in wined3d_adapter may go away in the meantime. */ - gl_info = heap_alloc(sizeof(*gl_info)); - *gl_info = *context_gl->c.gl_info; - context_gl->c.gl_info = gl_info; - context_gl->c.destroyed = 1; - - return; - } - - wined3d_context_gl_cleanup(context_gl); - TlsSetValue(context_get_tls_idx(), NULL); - heap_free(context_gl); + return wined3d_context_gl_release(wined3d_context_gl(context)); } static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, struct wined3d_caps *caps) @@ -4672,8 +4637,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_destroy, adapter_gl_create_device, adapter_gl_destroy_device, - adapter_gl_create_context, - adapter_gl_destroy_context, + adapter_gl_acquire_context, + adapter_gl_release_context, adapter_gl_get_wined3d_caps, adapter_gl_check_format, adapter_gl_init_3d, diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index b944b2fb32a..00098182c1a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -28,6 +28,8 @@ struct wined3d_device_vk { struct wined3d_device d; + struct wined3d_context context_vk; + VkDevice vk_device; VkQueue vk_queue; @@ -288,33 +290,22 @@ static void adapter_vk_destroy_device(struct wined3d_device *device) heap_free(device_vk); } -static HRESULT adapter_vk_create_context(struct wined3d_swapchain *swapchain, struct wined3d_context **context) +struct wined3d_context *adapter_vk_acquire_context(struct wined3d_device *device, + struct wined3d_texture *texture, unsigned int sub_resource_idx) { - struct wined3d_context *context_vk; - HRESULT hr; - - TRACE("swapchain %p, context %p.\n", swapchain, context); + TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); - if (!(context_vk = heap_alloc_zero(sizeof(*context_vk)))) - return E_OUTOFMEMORY; - - if (FAILED(hr = wined3d_context_vk_init(context_vk, swapchain))) - { - WARN("Failed to initialise context.\n"); - heap_free(context_vk); - return hr; - } + wined3d_from_cs(device->cs); - TRACE("Created context %p.\n", context_vk); - *context = context_vk; + if (!device->context_count) + return NULL; - return WINED3D_OK; + return &wined3d_device_vk(device)->context_vk; } -static void adapter_vk_destroy_context(struct wined3d_context *context) +void adapter_vk_release_context(struct wined3d_context *context) { - wined3d_context_cleanup(context); - heap_free(context); + TRACE("context %p.\n", context); } static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, struct wined3d_caps *caps) @@ -425,14 +416,39 @@ static BOOL adapter_vk_check_format(const struct wined3d_adapter *adapter, static HRESULT adapter_vk_init_3d(struct wined3d_device *device) { + struct wined3d_context *context_vk; + HRESULT hr; + TRACE("device %p.\n", device); + context_vk = &wined3d_device_vk(device)->context_vk; + if (FAILED(hr = wined3d_context_vk_init(context_vk, device->swapchains[0]))) + { + WARN("Failed to initialise context.\n"); + return hr; + } + + if (!device_context_add(device, context_vk)) + { + ERR("Failed to add the newly created context to the context list.\n"); + wined3d_context_cleanup(context_vk); + return E_FAIL; + } + + TRACE("Initialised context %p.\n", context_vk); + return WINED3D_OK; } static void adapter_vk_uninit_3d(struct wined3d_device *device) { + struct wined3d_context *context_vk; + TRACE("device %p.\n", device); + + context_vk = &wined3d_device_vk(device)->context_vk; + device_context_remove(device, context_vk); + wined3d_context_cleanup(context_vk); } static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = @@ -440,8 +456,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_destroy, adapter_vk_create_device, adapter_vk_destroy_device, - adapter_vk_create_context, - adapter_vk_destroy_context, + adapter_vk_acquire_context, + adapter_vk_release_context, adapter_vk_get_wined3d_caps, adapter_vk_check_format, adapter_vk_init_3d, diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2a2b2e8a87c..9784a48f91f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1328,7 +1328,7 @@ void wined3d_context_cleanup(struct wined3d_context *context) { } -void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) +static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) { struct wined3d_pipeline_statistics_query *pipeline_statistics_query; const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; @@ -1566,9 +1566,9 @@ BOOL context_set_current(struct wined3d_context *ctx) return TlsSetValue(wined3d_context_tls_idx, ctx); } -void context_release(struct wined3d_context *context) +void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + struct wined3d_context *context = &context_gl->c; TRACE("Releasing context %p, level %u.\n", context_gl, context->level); @@ -1594,8 +1594,8 @@ void context_release(struct wined3d_context *context) if (context->destroy_delayed) { - TRACE("Destroying context %p.\n", context); - wined3d_context_destroy(context); + TRACE("Destroying context %p.\n", context_gl); + wined3d_context_gl_destroy(context_gl); } } } @@ -2302,54 +2302,45 @@ HRESULT wined3d_context_vk_init(struct wined3d_context *context_vk, struct wined return WINED3D_OK; } -struct wined3d_context *context_create(struct wined3d_swapchain *swapchain) +void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) { - struct wined3d_device *device = swapchain->device; - struct wined3d_context *context; - HRESULT hr; + struct wined3d_device *device = context_gl->c.device; - TRACE("swapchain %p.\n", swapchain); + TRACE("Destroying context %p.\n", context_gl); wined3d_from_cs(device->cs); - if (FAILED(hr = device->adapter->adapter_ops->adapter_create_context(swapchain, &context))) - return NULL; - - if (!device_context_add(device, context)) + /* We delay destroying a context when it is active. The context_release() + * function invokes wined3d_context_gl_destroy() again while leaving the + * last level. */ + if (context_gl->c.level) { - ERR("Failed to add the newly created context to the context list.\n"); - device->adapter->adapter_ops->adapter_destroy_context(context); - return NULL; + TRACE("Delaying destruction of context %p.\n", context_gl); + context_gl->c.destroy_delayed = 1; + /* FIXME: Get rid of a pointer to swapchain from wined3d_context. */ + context_gl->c.swapchain = NULL; + return; } - TRACE("Created context %p.\n", context); + device_context_remove(device, &context_gl->c); - return context; -} - -void wined3d_context_destroy(struct wined3d_context *context) -{ - struct wined3d_device *device = context->device; - - TRACE("Destroying ctx %p\n", context); + if (context_gl->c.current && context_gl->c.tid != GetCurrentThreadId()) + { + struct wined3d_gl_info *gl_info; - wined3d_from_cs(device->cs); + /* Make a copy of gl_info for wined3d_context_gl_cleanup() use, the + * one in wined3d_adapter may go away in the meantime. */ + gl_info = heap_alloc(sizeof(*gl_info)); + *gl_info = *context_gl->c.gl_info; + context_gl->c.gl_info = gl_info; + context_gl->c.destroyed = 1; - /* We delay destroying a context when it is active. The context_release() - * function invokes wined3d_context_destroy() again while leaving the last - * level. */ - if (context->level) - { - TRACE("Delaying destruction of context %p.\n", context); - context->destroy_delayed = 1; - /* FIXME: Get rid of a pointer to swapchain from wined3d_context. */ - context->swapchain = NULL; return; } - device_context_remove(device, context); - - device->adapter->adapter_ops->adapter_destroy_context(context); + wined3d_context_gl_cleanup(context_gl); + TlsSetValue(context_get_tls_idx(), NULL); + heap_free(context_gl); } const unsigned int *wined3d_context_gl_get_tex_unit_mapping(const struct wined3d_context_gl *context_gl, @@ -4206,7 +4197,7 @@ static void wined3d_context_gl_activate(struct wined3d_context_gl *context_gl, } } -struct wined3d_context *context_acquire(const struct wined3d_device *device, +struct wined3d_context *wined3d_context_gl_acquire(const struct wined3d_device *device, struct wined3d_texture *texture, unsigned int sub_resource_idx) { struct wined3d_context *current_context = context_get_current(); @@ -4215,8 +4206,6 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); - wined3d_from_cs(device->cs); - if (current_context && current_context->destroyed) current_context = NULL; @@ -4270,7 +4259,7 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, return context; } -struct wined3d_context *context_reacquire(const struct wined3d_device *device, +struct wined3d_context *context_reacquire(struct wined3d_device *device, struct wined3d_context *context) { struct wined3d_context *acquired_context; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 683401bd1da..ed77a6e144a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1075,7 +1075,7 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) if (device->contexts[0]->swapchain) swapchain_destroy_contexts(device->contexts[0]->swapchain); else - wined3d_context_destroy(device->contexts[0]); + wined3d_context_gl_destroy(wined3d_context_gl(device->contexts[0])); } } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 49fa3a35f74..313e522f4a5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2233,21 +2233,22 @@ static HRESULT adapter_no3d_create_device(struct wined3d *wined3d, const struct const enum wined3d_feature_level *levels, unsigned int level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device) { - struct wined3d_device *object; + struct wined3d_device_no3d *device_no3d; HRESULT hr; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(device_no3d = heap_alloc_zero(sizeof(*device_no3d)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_device_init(object, wined3d, adapter->ordinal, device_type, + if (FAILED(hr = wined3d_device_init(&device_no3d->d, wined3d, adapter->ordinal, device_type, focus_window, flags, surface_alignment, levels, level_count, device_parent))) { WARN("Failed to initialize device, hr %#x.\n", hr); - heap_free(object); + heap_free(device_no3d); return hr; } - *device = object; + *device = &device_no3d->d; + return WINED3D_OK; } @@ -2257,32 +2258,22 @@ static void adapter_no3d_destroy_device(struct wined3d_device *device) heap_free(device); } -static HRESULT adapter_no3d_create_context(struct wined3d_swapchain *swapchain, struct wined3d_context **context) +struct wined3d_context *adapter_no3d_acquire_context(struct wined3d_device *device, + struct wined3d_texture *texture, unsigned int sub_resource_idx) { - struct wined3d_context *context_no3d; - - TRACE("swapchain %p, context %p.\n", swapchain, context); - - if (!(context_no3d = heap_alloc_zero(sizeof(*context_no3d)))) - return E_OUTOFMEMORY; + TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); - if (FAILED(wined3d_context_no3d_init(context_no3d, swapchain))) - { - WARN("Failed to initialise context.\n"); - heap_free(context_no3d); - return E_FAIL; - } + wined3d_from_cs(device->cs); - TRACE("Created context %p.\n", context_no3d); - *context = context_no3d; + if (!device->context_count) + return NULL; - return WINED3D_OK; + return &wined3d_device_no3d(device)->context_no3d; } -static void adapter_no3d_destroy_context(struct wined3d_context *context) +void adapter_no3d_release_context(struct wined3d_context *context) { - wined3d_context_cleanup(context); - heap_free(context); + TRACE("context %p.\n", context); } static void adapter_no3d_get_wined3d_caps(const struct wined3d_adapter *adapter, struct wined3d_caps *caps) @@ -2298,11 +2289,32 @@ static BOOL adapter_no3d_check_format(const struct wined3d_adapter *adapter, static HRESULT adapter_no3d_init_3d(struct wined3d_device *device) { + struct wined3d_context *context_no3d; + HRESULT hr; + TRACE("device %p.\n", device); + context_no3d = &wined3d_device_no3d(device)->context_no3d; + if (FAILED(hr = wined3d_context_no3d_init(context_no3d, device->swapchains[0]))) + { + WARN("Failed to initialise context.\n"); + return hr; + } + + if (!device_context_add(device, context_no3d)) + { + ERR("Failed to add the newly created context to the context list.\n"); + wined3d_context_cleanup(context_no3d); + return E_FAIL; + } + + TRACE("Initialised context %p.\n", context_no3d); + if (!(device->blitter = wined3d_cpu_blitter_create())) { ERR("Failed to create CPU blitter.\n"); + device_context_remove(device, context_no3d); + wined3d_context_cleanup(context_no3d); return E_FAIL; } @@ -2311,9 +2323,14 @@ static HRESULT adapter_no3d_init_3d(struct wined3d_device *device) static void adapter_no3d_uninit_3d(struct wined3d_device *device) { + struct wined3d_context *context_no3d; + TRACE("device %p.\n", device); + context_no3d = &wined3d_device_no3d(device)->context_no3d; device->blitter->ops->blitter_destroy(device->blitter, NULL); + device_context_remove(device, context_no3d); + wined3d_context_cleanup(context_no3d); } static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = @@ -2321,8 +2338,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = adapter_no3d_destroy, adapter_no3d_create_device, adapter_no3d_destroy_device, - adapter_no3d_create_context, - adapter_no3d_destroy_context, + adapter_no3d_acquire_context, + adapter_no3d_release_context, adapter_no3d_get_wined3d_caps, adapter_no3d_check_format, adapter_no3d_init_3d, diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 87c50eebe51..eeec8e25098 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -180,7 +180,7 @@ static BOOL wined3d_fence_supported(const struct wined3d_gl_info *gl_info) } static enum wined3d_fence_result wined3d_fence_test(const struct wined3d_fence *fence, - const struct wined3d_device *device, DWORD flags) + struct wined3d_device *device, DWORD flags) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; @@ -258,7 +258,7 @@ static enum wined3d_fence_result wined3d_fence_test(const struct wined3d_fence * } enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, - const struct wined3d_device *device) + struct wined3d_device *device) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; @@ -332,7 +332,7 @@ enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, return ret; } -void wined3d_fence_issue(struct wined3d_fence *fence, const struct wined3d_device *device) +void wined3d_fence_issue(struct wined3d_fence *fence, struct wined3d_device *device) { struct wined3d_context *context = NULL; const struct wined3d_gl_info *gl_info; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a30605b912a..7d126420d17 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -149,7 +149,7 @@ static BOOL is_multisample_location(const struct wined3d_texture_gl *texture_gl, /* Blit between surface locations. Onscreen on different swapchains is not supported. * Depth / stencil is not supported. Context activation is done by the caller. */ -static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3d_context *context, +static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *context, enum wined3d_texture_filter_type filter, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, DWORD src_location, const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, DWORD dst_location, diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 481b3b718ed..2c816218c8e 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1059,32 +1059,51 @@ HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, struct win static struct wined3d_context *swapchain_create_context(struct wined3d_swapchain *swapchain) { + struct wined3d_device *device = swapchain->device; + struct wined3d_context_gl *context_gl; struct wined3d_context **ctx_array; - struct wined3d_context *ctx; TRACE("Creating a new context for swapchain %p, thread %u.\n", swapchain, GetCurrentThreadId()); - if (!(ctx = context_create(swapchain))) + wined3d_from_cs(device->cs); + + if (!(context_gl = heap_alloc_zero(sizeof(*context_gl)))) + { + ERR("Failed to allocate context memory.\n"); + return NULL; + } + + if (FAILED(wined3d_context_gl_init(context_gl, swapchain))) { - ERR("Failed to create a new context for the swapchain\n"); + WARN("Failed to initialise context.\n"); + heap_free(context_gl); return NULL; } - context_release(ctx); + + if (!device_context_add(device, &context_gl->c)) + { + ERR("Failed to add the newly created context to the context list.\n"); + wined3d_context_gl_destroy(context_gl); + return NULL; + } + + TRACE("Created context %p.\n", context_gl); + + context_release(&context_gl->c); if (!(ctx_array = heap_calloc(swapchain->num_contexts + 1, sizeof(*ctx_array)))) { - ERR("Out of memory when trying to allocate a new context array\n"); - wined3d_context_destroy(ctx); + ERR("Failed to allocate new context array memory.\n"); + wined3d_context_gl_destroy(context_gl); return NULL; } memcpy(ctx_array, swapchain->context, sizeof(*ctx_array) * swapchain->num_contexts); heap_free(swapchain->context); - ctx_array[swapchain->num_contexts] = ctx; + ctx_array[swapchain->num_contexts] = &context_gl->c; swapchain->context = ctx_array; swapchain->num_contexts++; - TRACE("Returning context %p\n", ctx); - return ctx; + return &context_gl->c; } void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) @@ -1093,7 +1112,7 @@ void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) for (i = 0; i < swapchain->num_contexts; ++i) { - wined3d_context_destroy(swapchain->context[i]); + wined3d_context_gl_destroy(wined3d_context_gl(swapchain->context[i])); } heap_free(swapchain->context); swapchain->num_contexts = 0; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index beda90093c3..dc60d874bd6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -490,7 +490,7 @@ static void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) { unsigned int sub_count = texture->level_count * texture->layer_count; - const struct wined3d_device *device = texture->resource.device; + struct wined3d_device *device = texture->resource.device; DWORD map_binding = texture->update_map_binding; struct wined3d_context *context = NULL; unsigned int i; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 864476c6f07..89d3272a091 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1733,9 +1733,9 @@ struct wined3d_fence HRESULT wined3d_fence_create(struct wined3d_device *device, struct wined3d_fence **fence) DECLSPEC_HIDDEN; void wined3d_fence_destroy(struct wined3d_fence *fence) DECLSPEC_HIDDEN; -void wined3d_fence_issue(struct wined3d_fence *fence, const struct wined3d_device *device) DECLSPEC_HIDDEN; +void wined3d_fence_issue(struct wined3d_fence *fence, struct wined3d_device *device) DECLSPEC_HIDDEN; enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, - const struct wined3d_device *device) DECLSPEC_HIDDEN; + struct wined3d_device *device) DECLSPEC_HIDDEN; /* Direct3D terminology with little modifications. We do not have an issued * state because only the driver knows about it, but we have a created state @@ -2057,6 +2057,8 @@ static inline const struct wined3d_context_gl *wined3d_context_gl_const(const st return CONTAINING_RECORD(context, struct wined3d_context_gl, c); } +struct wined3d_context *wined3d_context_gl_acquire(const struct wined3d_device *device, + struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; void wined3d_context_gl_active_texture(struct wined3d_context_gl *context_gl, const struct wined3d_gl_info *gl_info, unsigned int unit) DECLSPEC_HIDDEN; void wined3d_context_gl_alloc_fence(struct wined3d_context_gl *context_gl, @@ -2081,7 +2083,7 @@ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_check_fbo_status(const struct wined3d_context_gl *context_gl, GLenum target) DECLSPEC_HIDDEN; -void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_free_fence(struct wined3d_fence *fence) DECLSPEC_HIDDEN; void wined3d_context_gl_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; void wined3d_context_gl_free_pipeline_statistics_query(struct wined3d_pipeline_statistics_query *query) DECLSPEC_HIDDEN; @@ -2094,6 +2096,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; 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_release(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_set_draw_buffer(struct wined3d_context_gl *context_gl, GLenum buffer) DECLSPEC_HIDDEN; void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl, const struct wined3d_texture_gl *texture_gl) DECLSPEC_HIDDEN; @@ -2232,16 +2235,12 @@ void wined3d_raw_blitter_create(struct wined3d_blitter **next, BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN; -struct wined3d_context *context_acquire(const struct wined3d_device *device, - struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) DECLSPEC_HIDDEN; void context_bind_dummy_textures(const struct wined3d_context *context) DECLSPEC_HIDDEN; void context_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, GLenum dst_binding, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; -struct wined3d_context *context_create(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; -void wined3d_context_destroy(struct wined3d_context *context) DECLSPEC_HIDDEN; void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; @@ -2258,9 +2257,8 @@ void context_invalidate_compute_state(struct wined3d_context *context, DWORD sta void context_invalidate_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; void *context_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) DECLSPEC_HIDDEN; -struct wined3d_context *context_reacquire(const struct wined3d_device *device, +struct wined3d_context *context_reacquire(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; -void context_release(struct wined3d_context *context) DECLSPEC_HIDDEN; void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void context_restore(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; @@ -2745,8 +2743,9 @@ struct wined3d_adapter_ops BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device); void (*adapter_destroy_device)(struct wined3d_device *device); - HRESULT (*adapter_create_context)(struct wined3d_swapchain *swapchain, struct wined3d_context **context); - void (*adapter_destroy_context)(struct wined3d_context *context); + struct wined3d_context *(*adapter_acquire_context)(struct wined3d_device *device, + struct wined3d_texture *texture, unsigned int sub_resource_idx); + void (*adapter_release_context)(struct wined3d_context *context); void (*adapter_get_wined3d_caps)(const struct wined3d_adapter *adapter, struct wined3d_caps *caps); BOOL (*adapter_check_format)(const struct wined3d_adapter *adapter, const struct wined3d_format *adapter_format, const struct wined3d_format *rt_format, @@ -3240,6 +3239,18 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_device_uninit_3d(struct wined3d_device *device) DECLSPEC_HIDDEN; +struct wined3d_device_no3d +{ + struct wined3d_device d; + + struct wined3d_context context_no3d; +}; + +static inline struct wined3d_device_no3d *wined3d_device_no3d(struct wined3d_device *device) +{ + return CONTAINING_RECORD(device, struct wined3d_device_no3d, d); +} + struct wined3d_device_gl { struct wined3d_device d; @@ -4899,6 +4910,19 @@ BOOL invert_matrix(struct wined3d_matrix *out, const struct wined3d_matrix *m) D void compute_normal_matrix(float *normal_matrix, BOOL legacy_lighting, const struct wined3d_matrix *modelview) DECLSPEC_HIDDEN; +static inline struct wined3d_context *context_acquire(struct wined3d_device *device, + struct wined3d_texture *texture, unsigned int sub_resource_idx) +{ + wined3d_from_cs(device->cs); + + return device->adapter->adapter_ops->adapter_acquire_context(device, texture, sub_resource_idx); +} + +static inline void context_release(struct wined3d_context *context) +{ + context->device->adapter->adapter_ops->adapter_release_context(context); +} + /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL" -- 2.11.0

1 0

[PATCH 4/5] wined3d: Move the blit dimension fields from struct wined3d_context to struct wined3d_context_gl.
by Henri Verbeet 05 Jun '19

05 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 12 +++++------- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 86003610023..2a2b2e8a87c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2791,12 +2791,11 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, if (context->last_was_blit) { - if (context->blit_w != rt_size.cx || context->blit_h != rt_size.cy) + if (context_gl->blit_size.cx != rt_size.cx || context_gl->blit_size.cy != rt_size.cy) { gl_info->gl_ops.gl.p_glViewport(0, 0, rt_size.cx, rt_size.cy); context->viewport_count = WINED3D_MAX_VIEWPORTS; - context->blit_w = rt_size.cx; - context->blit_h = rt_size.cy; + context_gl->blit_size = rt_size; /* No need to dirtify here, the states are still dirtified because * they weren't applied since the last context_apply_blit_state() * call. */ @@ -2870,8 +2869,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, device->shader_backend->shader_disable(device->shader_priv, context); - context->blit_w = rt_size.cx; - context->blit_h = rt_size.cy; + context_gl->blit_size = rt_size; checkGLcall("blit state application"); } @@ -2909,7 +2907,7 @@ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_ SIZE rt_size; wined3d_context_gl_get_rt_size(context_gl, &rt_size); - if (context->blit_w != rt_size.cx || context->blit_h != rt_size.cy) + if (context_gl->blit_size.cx != rt_size.cx || context_gl->blit_size.cy != rt_size.cy) context_apply_blit_projection(context, rt_size.cx, rt_size.cy); wined3d_context_gl_apply_blit_state(context_gl, device); @@ -2964,7 +2962,7 @@ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_ gl_info->gl_ops.gl.p_glMatrixMode(GL_MODELVIEW); gl_info->gl_ops.gl.p_glLoadIdentity(); context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0))); - context_apply_blit_projection(context, context->blit_w, context->blit_h); + context_apply_blit_projection(context, context_gl->blit_size.cx, context_gl->blit_size.cy); context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); /* Other misc states. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4eddc55cd5b..864476c6f07 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1944,8 +1944,7 @@ struct wined3d_context DWORD numbered_array_mask; GLenum tracking_parm; /* Which source is tracking current colour */ GLenum untracked_materials[2]; - UINT blit_w, blit_h; - enum fogsource fog_source; + enum fogsource fog_source; UINT instance_count; @@ -1982,6 +1981,7 @@ struct wined3d_context_gl uint32_t default_attrib_value_set; + SIZE blit_size; unsigned int active_texture; GLenum *texture_type; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Move the "active_texture" field from struct wined3d_context to struct wined3d_context_gl.
by Henri Verbeet 05 Jun '19

05 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/view.c | 6 +++--- dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7988eb6dd9d..86003610023 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2520,7 +2520,7 @@ void wined3d_context_gl_active_texture(struct wined3d_context_gl *context_gl, { GL_EXTCALL(glActiveTexture(GL_TEXTURE0 + unit)); checkGLcall("glActiveTexture"); - context_gl->c.active_texture = unit; + context_gl->active_texture = unit; } void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) @@ -2545,7 +2545,7 @@ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLen else target = GL_NONE; - unit = context_gl->c.active_texture; + unit = context_gl->active_texture; old_texture_type = context_gl->texture_type[unit]; if (old_texture_type != target) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e3d9d54900c..beda90093c3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1061,9 +1061,9 @@ void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl, * called from sampler() in state.c. This means we can't touch anything * other than whatever happens to be the currently active texture, or we * would risk marking already applied sampler states dirty again. */ - if (context_gl->c.active_texture < ARRAY_SIZE(context_gl->rev_tex_unit_map)) + if (context_gl->active_texture < ARRAY_SIZE(context_gl->rev_tex_unit_map)) { - unsigned int active_sampler = context_gl->rev_tex_unit_map[context_gl->c.active_texture]; + unsigned int active_sampler = context_gl->rev_tex_unit_map[context_gl->active_texture]; if (active_sampler != WINED3D_UNMAPPED_STAGE) context_invalidate_state(&context_gl->c, STATE_SAMPLER(active_sampler)); } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 1d61d09c25f..b43dcddcdf2 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -858,9 +858,9 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl static void shader_resource_view_gl_bind_and_dirtify(struct wined3d_shader_resource_view_gl *view_gl, struct wined3d_context_gl *context_gl) { - if (context_gl->c.active_texture < ARRAY_SIZE(context_gl->rev_tex_unit_map)) + if (context_gl->active_texture < ARRAY_SIZE(context_gl->rev_tex_unit_map)) { - unsigned int active_sampler = context_gl->rev_tex_unit_map[context_gl->c.active_texture]; + unsigned int active_sampler = context_gl->rev_tex_unit_map[context_gl->active_texture]; if (active_sampler != WINED3D_UNMAPPED_STAGE) context_invalidate_state(&context_gl->c, STATE_SAMPLER(active_sampler)); } @@ -912,7 +912,7 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * } if (gl_info->supported[ARB_SAMPLER_OBJECTS]) - GL_EXTCALL(glBindSampler(context->active_texture, 0)); + GL_EXTCALL(glBindSampler(context_gl->active_texture, 0)); gl_tex = wined3d_texture_gl_get_gl_texture(texture_gl, srgb); if (context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ec40e3bd48c..4eddc55cd5b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1946,7 +1946,6 @@ struct wined3d_context GLenum untracked_materials[2]; UINT blit_w, blit_h; enum fogsource fog_source; - DWORD active_texture; UINT instance_count; @@ -1983,6 +1982,8 @@ struct wined3d_context_gl uint32_t default_attrib_value_set; + unsigned int active_texture; + GLenum *texture_type; /* The WGL context. */ -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to context_active_texture().
by Henri Verbeet 05 Jun '19

05 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/context.c | 15 ++++++++------- dlls/wined3d/device.c | 2 +- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/nvidia_texture_shader.c | 8 ++++---- dlls/wined3d/state.c | 22 +++++++++++++--------- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 9 files changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e6546abf842..29908b8bae9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7379,7 +7379,7 @@ static void arbfp_blitter_upload_palette(struct wined3d_arbfp_blitter *blitter, } /* Switch back to unit 0 in which the 2D texture will be stored. */ - context_active_texture(&context_gl->c, gl_info, 0); + wined3d_context_gl_active_texture(context_gl, gl_info, 0); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 0a7b832c7f9..e166d99bf1f 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1055,7 +1055,7 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined mapped_stage = context_gl->tex_unit_map[i]; if (mapped_stage != WINED3D_UNMAPPED_STAGE) { - context_active_texture(context, gl_info, mapped_stage); + wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); texture_activate_dimensions(state->textures[i], gl_info); } } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9dbdd945f09..7988eb6dd9d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2209,7 +2209,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi */ for (i = 1; i < gl_info->limits.textures; ++i) { - context_active_texture(context, gl_info, i); + wined3d_context_gl_active_texture(context_gl, gl_info, i); gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, GL_TEXTURE0_ARB + i - 1); checkGLcall("glTexEnvi(GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, ..."); @@ -2240,7 +2240,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi { for (i = 0; i < gl_info->limits.textures; ++i) { - context_active_texture(context, gl_info, i); + wined3d_context_gl_active_texture(context_gl, gl_info, i); gl_info->gl_ops.gl.p_glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); checkGLcall("glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)"); } @@ -2515,11 +2515,12 @@ void wined3d_context_gl_set_draw_buffer(struct wined3d_context_gl *context_gl, G } /* Context activation is done by the caller. */ -void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info, unsigned int unit) +void wined3d_context_gl_active_texture(struct wined3d_context_gl *context_gl, + const struct wined3d_gl_info *gl_info, unsigned int unit) { GL_EXTCALL(glActiveTexture(GL_TEXTURE0 + unit)); checkGLcall("glActiveTexture"); - context->active_texture = unit; + context_gl->c.active_texture = unit; } void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) @@ -2808,7 +2809,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, if (gl_info->supported[ARB_SAMPLER_OBJECTS]) GL_EXTCALL(glBindSampler(0, 0)); - context_active_texture(context, gl_info, 0); + wined3d_context_gl_active_texture(context_gl, gl_info, 0); sampler = context_gl->rev_tex_unit_map[0]; if (sampler != WINED3D_UNMAPPED_STAGE) @@ -2923,7 +2924,7 @@ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_ * from. */ for (i = gl_info->limits.textures - 1; i > 0 ; --i) { - context_active_texture(context, gl_info, i); + wined3d_context_gl_active_texture(context_gl, gl_info, i); if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_CUBE_MAP_ARB); @@ -2943,7 +2944,7 @@ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_ } } - context_active_texture(context, gl_info, 0); + wined3d_context_gl_active_texture(context_gl, gl_info, 0); if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_CUBE_MAP_ARB); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6cfc2b23d6c..683401bd1da 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -690,7 +690,7 @@ static void wined3d_device_gl_create_dummy_textures(struct wined3d_device_gl *de * OpenGL will only allow that when a valid texture is bound. * We emulate this by creating dummy textures and binding them * to each texture stage when the currently set D3D texture is NULL. */ - context_active_texture(&context_gl->c, gl_info, 0); + wined3d_context_gl_active_texture(context_gl, gl_info, 0); gl_info->gl_ops.gl.p_glGenTextures(1, &textures->tex_1d); TRACE("Dummy 1D texture given name %u.\n", textures->tex_1d); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fe8812bcbb5..ab62c1ca599 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12779,7 +12779,7 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, if (!blitter->palette_texture) gl_info->gl_ops.gl.p_glGenTextures(1, &blitter->palette_texture); - context_active_texture(&context_gl->c, gl_info, 1); + wined3d_context_gl_active_texture(context_gl, gl_info, 1); gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_1D, blitter->palette_texture); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); @@ -12799,7 +12799,7 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, GL_UNSIGNED_INT_8_8_8_8_REV, &black); } - context_active_texture(&context_gl->c, gl_info, 0); + wined3d_context_gl_active_texture(context_gl, gl_info, 0); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index c95a6cb3539..f4b0791f47d 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -501,7 +501,7 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s FIXME("Attempt to enable unsupported stage!\n"); return; } - context_active_texture(context, gl_info, mapped_stage); + wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); } if (context->lowest_disabled_stage > 0) @@ -579,9 +579,9 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s BOOL usedBump = !!(context->texShaderBumpMap & 1u << (stage + 1)); if (usesBump != usedBump) { - context_active_texture(context, gl_info, mapped_stage + 1); + wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage + 1); nvts_activate_dimensions(state, stage + 1, context); - context_active_texture(context, gl_info, mapped_stage); + wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); } } } @@ -639,7 +639,7 @@ static void nvts_bumpenvmat(struct wined3d_context *context, const struct wined3 */ if (mapped_stage < gl_info->limits.textures) { - context_active_texture(context, gl_info, mapped_stage); + wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); /* We can't just pass a pointer to the state to GL due to the * different matrix format (column major vs row major). */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 08423e831fd..b2fcbddd57f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -827,6 +827,7 @@ static void state_specularenable(struct wined3d_context *context, const struct w static void state_texfactor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_color color; unsigned int i; @@ -840,7 +841,7 @@ static void state_texfactor(struct wined3d_context *context, const struct wined3 { /* Note the WINED3D_RS value applies to all textures, but GL has one * per texture, so apply it now ready to be used! */ - context_active_texture(context, gl_info, i); + wined3d_context_gl_active_texture(context_gl, gl_info, i); gl_info->gl_ops.gl.p_glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &color.r); checkGLcall("glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, color);"); @@ -3128,8 +3129,9 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined static void tex_colorop(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { unsigned int stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); - unsigned int mapped_stage = wined3d_context_gl(context)->tex_unit_map[stage]; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); BOOL tex_used = context->fixed_function_usage_map & (1u << stage); + unsigned int mapped_stage = context_gl->tex_unit_map[stage]; const struct wined3d_gl_info *gl_info = context->gl_info; TRACE("Setting color op for stage %d\n", stage); @@ -3146,7 +3148,7 @@ static void tex_colorop(struct wined3d_context *context, const struct wined3d_st FIXME("Attempt to enable unsupported stage!\n"); return; } - context_active_texture(context, gl_info, mapped_stage); + wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); } if (stage >= context->lowest_disabled_stage) @@ -3189,8 +3191,9 @@ static void tex_colorop(struct wined3d_context *context, const struct wined3d_st void tex_alphaop(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { unsigned int stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); - unsigned int mapped_stage = wined3d_context_gl(context)->tex_unit_map[stage]; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); BOOL tex_used = context->fixed_function_usage_map & (1u << stage); + unsigned int mapped_stage = context_gl->tex_unit_map[stage]; const struct wined3d_gl_info *gl_info = context->gl_info; DWORD op, arg1, arg2, arg0; @@ -3203,7 +3206,7 @@ void tex_alphaop(struct wined3d_context *context, const struct wined3d_state *st FIXME("Attempt to enable unsupported stage!\n"); return; } - context_active_texture(context, gl_info, mapped_stage); + wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); } op = state->texture_states[stage][WINED3D_TSS_ALPHA_OP]; @@ -3288,7 +3291,8 @@ void tex_alphaop(struct wined3d_context *context, const struct wined3d_state *st static void transform_texture(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { unsigned int tex = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); - unsigned int mapped_stage = wined3d_context_gl(context)->tex_unit_map[tex]; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + unsigned int mapped_stage = context_gl->tex_unit_map[tex]; const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_matrix mat; @@ -3302,7 +3306,7 @@ static void transform_texture(struct wined3d_context *context, const struct wine if (mapped_stage == WINED3D_UNMAPPED_STAGE) return; if (mapped_stage >= gl_info->limits.textures) return; - context_active_texture(context, gl_info, mapped_stage); + wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); gl_info->gl_ops.gl.p_glMatrixMode(GL_TEXTURE); checkGLcall("glMatrixMode(GL_TEXTURE)"); @@ -3335,7 +3339,7 @@ static void tex_coordindex(struct wined3d_context *context, const struct wined3d WARN("stage %u not mapped to a valid texture unit (%u)\n", stage, mapped_stage); return; } - context_active_texture(context, gl_info, mapped_stage); + wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); /* Values 0-7 are indexes into the FVF tex coords - See comments in DrawPrimitive * @@ -3613,7 +3617,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state if (mapped_stage >= gl_info->limits.graphics_samplers) return; - context_active_texture(context, gl_info, mapped_stage); + wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); if (state->textures[sampler_idx]) { diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a8f319f06a1..1d61d09c25f 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -834,7 +834,7 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture_gl *texture_gl; - context_active_texture(context, gl_info, unit); + wined3d_context_gl_active_texture(context_gl, gl_info, unit); if (view_gl->gl_view.name) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a373cc97b9b..ec40e3bd48c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2056,6 +2056,8 @@ static inline const struct wined3d_context_gl *wined3d_context_gl_const(const st return CONTAINING_RECORD(context, struct wined3d_context_gl, c); } +void wined3d_context_gl_active_texture(struct wined3d_context_gl *context_gl, + const struct wined3d_gl_info *gl_info, unsigned int unit) DECLSPEC_HIDDEN; void wined3d_context_gl_alloc_fence(struct wined3d_context_gl *context_gl, struct wined3d_fence *fence) DECLSPEC_HIDDEN; void wined3d_context_gl_alloc_occlusion_query(struct wined3d_context_gl *context_gl, @@ -2231,8 +2233,6 @@ BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSP struct wined3d_context *context_acquire(const struct wined3d_device *device, struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; -void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info, - unsigned int unit) DECLSPEC_HIDDEN; void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) DECLSPEC_HIDDEN; void context_bind_dummy_textures(const struct wined3d_context *context) DECLSPEC_HIDDEN; void context_copy_bo_address(struct wined3d_context *context, -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to shader_resource_view_gl_bind_and_dirtify().
by Henri Verbeet 05 Jun '19

05 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/view.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f3de77022b6..a8f319f06a1 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -856,20 +856,18 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl /* Context activation is done by the caller. */ static void shader_resource_view_gl_bind_and_dirtify(struct wined3d_shader_resource_view_gl *view_gl, - struct wined3d_context *context) + struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - - if (context->active_texture < ARRAY_SIZE(context_gl->rev_tex_unit_map)) + if (context_gl->c.active_texture < ARRAY_SIZE(context_gl->rev_tex_unit_map)) { - unsigned int active_sampler = context_gl->rev_tex_unit_map[context->active_texture]; + unsigned int active_sampler = context_gl->rev_tex_unit_map[context_gl->c.active_texture]; if (active_sampler != WINED3D_UNMAPPED_STAGE) - context_invalidate_state(context, STATE_SAMPLER(active_sampler)); + context_invalidate_state(&context_gl->c, STATE_SAMPLER(active_sampler)); } /* FIXME: Ideally we'd only do this when touching a binding that's used by * a shader. */ - context_invalidate_compute_state(context, STATE_COMPUTE_SHADER_RESOURCE_BINDING); - context_invalidate_state(context, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); + context_invalidate_compute_state(&context_gl->c, STATE_COMPUTE_SHADER_RESOURCE_BINDING); + context_invalidate_state(&context_gl->c, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); wined3d_context_gl_bind_texture(context_gl, view_gl->gl_view.target, view_gl->gl_view.name); } @@ -880,6 +878,7 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * unsigned int i, j, layer_count, level_count, base_level, max_level; const struct wined3d_gl_info *gl_info; struct wined3d_texture_gl *texture_gl; + struct wined3d_context_gl *context_gl; struct wined3d_context *context; struct gl_texture *gl_tex; DWORD location; @@ -888,6 +887,7 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * TRACE("view %p.\n", view); context = context_acquire(view_gl->v.resource->device, NULL, 0); + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; layer_count = view_gl->v.desc.u.texture.layer_count; level_count = view_gl->v.desc.u.texture.level_count; @@ -902,11 +902,11 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * if (view_gl->gl_view.name) { - shader_resource_view_gl_bind_and_dirtify(view_gl, context); + shader_resource_view_gl_bind_and_dirtify(view_gl, context_gl); } else { - wined3d_texture_gl_bind_and_dirtify(texture_gl, wined3d_context_gl(context), srgb); + wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, srgb); gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_BASE_LEVEL, base_level); gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_MAX_LEVEL, max_level); } -- 2.11.0

1 0

[PATCH] mf/tests: Add some more Video Processor tests.
by Nikolay Sivov 05 Jun '19

05 Jun '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 81 +++++++++++++++++++++++++++++++++-------- include/mftransform.idl | 5 +++ 2 files changed, 71 insertions(+), 15 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index cc85221dc0..f55104c039 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2062,7 +2062,8 @@ static void test_video_processor(void) DWORD input_count, output_count, input_id, output_id, flags; DWORD input_min, input_max, output_min, output_max, i, count; IMFAttributes *attributes, *attributes2; - IMFMediaType *media_type; + IMFMediaType *media_type, *media_type2; + MFT_INPUT_STREAM_INFO input_info; IMFTransform *transform; HRESULT hr; GUID guid; @@ -2123,20 +2124,6 @@ todo_wine IMFAttributes_Release(attributes); IMFAttributes_Release(attributes2); - for (i = 0;;++i) - { - hr = IMFTransform_GetInputAvailableType(transform, 0, i, &media_type); - if (hr == MF_E_NO_MORE_TYPES) - break; - ok(hr == S_OK, "Failed to get supported input type, hr %#x.\n", hr); - - hr = IMFMediaType_GetMajorType(media_type, &guid); - ok(hr == S_OK, "Failed to get major type, hr %#x.\n", hr); - ok(IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected major type.\n"); - - IMFMediaType_Release(media_type); - } - hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); @@ -2152,11 +2139,33 @@ todo_wine hr = IMFTransform_GetOutputCurrentType(transform, 1, &media_type); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetInputStreamInfo(transform, 1, &input_info); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); + ok(hr == S_OK, "Failed to get stream info, hr %#x.\n", hr); + ok(input_info.dwFlags == 0, "Unexpected flag %#x.\n", input_info.dwFlags); + ok(input_info.cbSize == 0, "Unexpected size %u.\n", input_info.cbSize); + ok(input_info.cbMaxLookahead == 0, "Unexpected lookahead length %u.\n", input_info.cbMaxLookahead); + ok(input_info.cbAlignment == 0, "Unexpected alignment %u.\n", input_info.cbAlignment); + /* Configure stream types. */ for (i = 0;;++i) { if (FAILED(hr = IMFTransform_GetInputAvailableType(transform, 0, i, &media_type))) + { + ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); break; + } + + hr = IMFTransform_GetInputAvailableType(transform, 0, i, &media_type2); + ok(hr == S_OK, "Failed to get available type, hr %#x.\n", hr); + ok(media_type != media_type2, "Unexpected instance.\n"); + IMFMediaType_Release(media_type2); + + hr = IMFMediaType_GetMajorType(media_type, &guid); + ok(hr == S_OK, "Failed to get major type, hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected major type.\n"); hr = IMFMediaType_GetCount(media_type, &count); ok(hr == S_OK, "Failed to get attributes count, hr %#x.\n", hr); @@ -2166,6 +2175,48 @@ todo_wine ok(hr == S_OK, "Failed to get subtype, hr %#x.\n", hr); ok(is_supported_video_type(&guid), "Unexpected media type %s.\n", wine_dbgstr_guid(&guid)); + hr = IMFTransform_SetInputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(transform, 0, media_type, 0); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type2); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + + /* FIXME: figure out if those require additional attributes or simply advertised but not supported */ + if (IsEqualGUID(&guid, &MFVideoFormat_L8) || IsEqualGUID(&guid, &MFVideoFormat_L16) + || IsEqualGUID(&guid, &MFVideoFormat_D16) || IsEqualGUID(&guid, &MFVideoFormat_420O) + || IsEqualGUID(&guid, &MFVideoFormat_A16B16G16R16F)) + { + IMFMediaType_Release(media_type); + continue; + } + + hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, ((UINT64)16 << 32) | 16); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); + ok(hr == S_OK, "Failed to test input type %s, hr %#x.\n", wine_dbgstr_guid(&guid), hr); + + hr = IMFTransform_SetInputType(transform, 0, media_type, 0); + ok(hr == S_OK, "Failed to test input type, hr %#x.\n", hr); + + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type2); + ok(hr == S_OK, "Failed to get current type, hr %#x.\n", hr); + ok(media_type != media_type2, "Unexpected instance.\n"); + IMFMediaType_Release(media_type2); + + hr = IMFTransform_GetInputStatus(transform, 0, &flags); + ok(hr == S_OK, "Failed to get input status, hr %#x.\n", hr); + ok(flags == MFT_INPUT_STATUS_ACCEPT_DATA, "Unexpected input status %#x.\n", flags); + + hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); + ok(hr == S_OK, "Failed to get stream info, hr %#x.\n", hr); + ok(input_info.dwFlags == 0, "Unexpected flag %#x.\n", input_info.dwFlags); + ok(input_info.cbMaxLookahead == 0, "Unexpected lookahead length %u.\n", input_info.cbMaxLookahead); + ok(input_info.cbAlignment == 0, "Unexpected alignment %u.\n", input_info.cbAlignment); + IMFMediaType_Release(media_type); } diff --git a/include/mftransform.idl b/include/mftransform.idl index 4321d002be..ca2f781a6b 100644 --- a/include/mftransform.idl +++ b/include/mftransform.idl @@ -61,6 +61,11 @@ enum _MFT_SET_TYPE_FLAGS MFT_SET_TYPE_TEST_ONLY = 0x00000001, }; +enum _MFT_INPUT_STATUS_FLAGS +{ + MFT_INPUT_STATUS_ACCEPT_DATA = 0x00000001, +}; + [ object, uuid(bf94c121-5b05-4e6f-8000-ba598961414d) -- 2.20.1

1 0

[PATCH v4 4/4] gdi32: Implement D3DKMTDestroyDevice.
by Zhiyi Zhang 05 Jun '19

05 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 29 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 10 +++---- include/ddk/d3dkmthk.h | 1 + 6 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index cb7935bbbc..43452cda74 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -22,7 +22,7 @@ @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext @ stdcall D3DKMTDestroyDCFromMemory(ptr) gdi32.D3DKMTDestroyDCFromMemory -@ stub D3DKMTDestroyDevice +@ stdcall D3DKMTDestroyDevice(ptr) gdi32.D3DKMTDestroyDevice @ stub D3DKMTDestroyKeyedMutex @ stub D3DKMTDestroyOutputDupl @ stub D3DKMTDestroyOverlay diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index e4692ace9c..01bc8bfebc 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -12,7 +12,7 @@ @ stub D3DKMTCreateSynchronizationObject @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext -@ stub D3DKMTDestroyDevice +@ stdcall D3DKMTDestroyDevice(ptr) gdi32.D3DKMTDestroyDevice @ stub D3DKMTDestroySynchronizationObject @ stub D3DKMTEscape @ stub D3DKMTGetContextSchedulingPriority diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index d5765af2a1..9208f6ecd5 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1395,3 +1395,32 @@ NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) LeaveCriticalSection( &driver_section ); return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTDestroyDevice [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) +{ + NTSTATUS status = STATUS_INVALID_PARAMETER; + struct d3dkmt_device *device; + + TRACE("(%p)\n", desc); + + if (!desc || !desc->hDevice) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( device, &d3dkmt_devices, struct d3dkmt_device, entry ) + { + if (device->handle == desc->hDevice) + { + list_remove( &device->entry ); + heap_free( device ); + status = STATUS_SUCCESS; + break; + } + } + LeaveCriticalSection( &driver_section ); + + return status; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 88fe846eb8..9abd82173c 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -84,6 +84,7 @@ @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTCreateDevice(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) +@ stdcall D3DKMTDestroyDevice(ptr) @ stdcall D3DKMTEscape(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index f5c23dad76..b5f6f75a83 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -194,9 +194,9 @@ static void test_D3DKMTCreateDevice(void) D3DKMT_DESTROYDEVICE destroy_device_desc; NTSTATUS status; - if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND || !pD3DKMTDestroyDevice) + if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTCreateDevice() or D3DKMTDestroyDevice() is unavailable.\n"); + win_skip("D3DKMTCreateDevice() is unavailable.\n"); return; } @@ -240,17 +240,17 @@ static void test_D3DKMTDestroyDevice(void) if (!pD3DKMTDestroyDevice || pD3DKMTDestroyDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTDestroyDevice() is unavailable.\n"); + win_skip("D3DKMTDestroyDevice() is unavailable.\n"); return; } /* Invalid parameters */ status = pD3DKMTDestroyDevice(NULL); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); memset(&destroy_device_desc, 0, sizeof(destroy_device_desc)); status = pD3DKMTDestroyDevice(&destroy_device_desc); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } static void test_D3DKMTCheckVidPnExclusiveOwnership(void) diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 90bf907e30..081758bf5d 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -169,6 +169,7 @@ NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDevice(D3DKMT_CREATEDEVICE *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); +NTSTATUS WINAPI D3DKMTDestroyDevice(const D3DKMT_DESTROYDEVICE *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); #ifdef __cplusplus -- 2.20.1

3 2

[PATCH v4 3/4] gdi32: Implement D3DKMTCreateDevice.
by Zhiyi Zhang 05 Jun '19

05 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 52 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- include/ddk/d3dkmthk.h | 1 + 6 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index 43186e8fcc..cb7935bbbc 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -12,7 +12,7 @@ @ stub D3DKMTCreateAllocation2 @ stub D3DKMTCreateContext @ stdcall D3DKMTCreateDCFromMemory(ptr) gdi32.D3DKMTCreateDCFromMemory -@ stub D3DKMTCreateDevice +@ stdcall D3DKMTCreateDevice(ptr) gdi32.D3DKMTCreateDevice @ stub D3DKMTCreateKeyedMutex @ stub D3DKMTCreateKeyedMutex2 @ stub D3DKMTCreateOutputDupl diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 87304b7c13..e4692ace9c 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -8,7 +8,7 @@ @ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext -@ stub D3DKMTCreateDevice +@ stdcall D3DKMTCreateDevice(ptr) gdi32.D3DKMTCreateDevice @ stub D3DKMTCreateSynchronizationObject @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e021856b0a..d5765af2a1 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -59,10 +59,17 @@ struct d3dkmt_adapter struct list entry; /* List entry */ }; +struct d3dkmt_device +{ + D3DKMT_HANDLE handle; /* Kernel mode graphics device handle*/ + struct list entry; /* List entry */ +}; + static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); +static struct list d3dkmt_devices = LIST_INIT( d3dkmt_devices ); const struct gdi_dc_funcs *font_driver = NULL; @@ -1343,3 +1350,48 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI LeaveCriticalSection( &driver_section ); return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTCreateDevice [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) +{ + static D3DKMT_HANDLE handle_start = 0; + struct d3dkmt_adapter *adapter; + struct d3dkmt_device *device; + BOOL found = FALSE; + + TRACE("(%p)\n", desc); + + if (!desc) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) + { + if (adapter->handle == desc->hAdapter) + { + found = TRUE; + break; + } + } + LeaveCriticalSection( &driver_section ); + + if (!found) + return STATUS_INVALID_PARAMETER; + + if (desc->Flags.LegacyMode || desc->Flags.RequestVSync || desc->Flags.DisableGpuTimeout) + FIXME("Flags unsupported.\n"); + + device = heap_alloc_zero( sizeof( *device ) ); + if (!device) + return STATUS_NO_MEMORY; + + device->handle = ++handle_start; + desc->hDevice = device->handle; + + EnterCriticalSection( &driver_section ); + list_add_tail( &d3dkmt_devices, &device->entry ); + LeaveCriticalSection( &driver_section ); + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 5c17ed9ee8..88fe846eb8 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -82,6 +82,7 @@ @ stdcall CreateSolidBrush(long) @ stdcall D3DKMTCloseAdapter(ptr) @ stdcall D3DKMTCreateDCFromMemory(ptr) +@ stdcall D3DKMTCreateDevice(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index caded27aef..f5c23dad76 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -194,7 +194,7 @@ static void test_D3DKMTCreateDevice(void) D3DKMT_DESTROYDEVICE destroy_device_desc; NTSTATUS status; - if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) + if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND || !pD3DKMTDestroyDevice) { skip("D3DKMTCreateDevice() or D3DKMTDestroyDevice() is unavailable.\n"); return; diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 5436cb6612..90bf907e30 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -166,6 +166,7 @@ extern "C" #endif /* __cplusplus */ NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); +NTSTATUS WINAPI D3DKMTCreateDevice(D3DKMT_CREATEDEVICE *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); -- 2.20.1

3 2

[PATCH v4 2/4] gdi32: Implement D3DKMTCloseAdapter.
by Zhiyi Zhang 05 Jun '19

05 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 24 ++++++++++++++++++++++-- dlls/gdi32/tests/driver.c | 4 ++-- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 365e5d7c0c..87304b7c13 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -5,7 +5,7 @@ @ stdcall D3D11CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) @ stdcall D3D11CreateDeviceAndSwapChain(ptr long ptr long ptr long long ptr ptr ptr ptr ptr) @ stdcall D3D11On12CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) -@ stub D3DKMTCloseAdapter +@ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext @ stub D3DKMTCreateDevice diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index fe66266e18..e021856b0a 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1279,8 +1279,28 @@ NTSTATUS WINAPI D3DKMTEscape( const void *pData ) */ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) { - FIXME("(%p): stub\n", desc); - return STATUS_SUCCESS; + NTSTATUS status = STATUS_INVALID_PARAMETER; + struct d3dkmt_adapter *adapter; + + TRACE("(%p)\n", desc); + + if (!desc || !desc->hAdapter) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) + { + if (adapter->handle == desc->hAdapter) + { + list_remove( &adapter->entry ); + heap_free( adapter ); + status = STATUS_SUCCESS; + break; + } + } + LeaveCriticalSection( &driver_section ); + + return status; } /****************************************************************************** diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 067c162838..caded27aef 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -179,11 +179,11 @@ static void test_D3DKMTCloseAdapter(void) /* Invalid parameters */ status = pD3DKMTCloseAdapter(NULL); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); memset(&close_adapter_desc, 0, sizeof(close_adapter_desc)); status = pD3DKMTCloseAdapter(&close_adapter_desc); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } static void test_D3DKMTCreateDevice(void) -- 2.20.1

3 2

[PATCH] ntdll: Make NtGetTickCount patchable
by Alistair Leslie-Hughes 05 Jun '19

05 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 20de627c28..efe260326c 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -557,7 +557,7 @@ NTSTATUS WINAPI NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER * NtGetTickCount (NTDLL.@) * ZwGetTickCount (NTDLL.@) */ -ULONG WINAPI NtGetTickCount(void) +ULONG WINAPI DECLSPEC_HOTPATCH NtGetTickCount(void) { return monotonic_counter() / TICKSPERMSEC; } -- 2.20.1

3 3

[PATCH v4 1/4] user32/tests: Test restore window messages.
by Zhiyi Zhang 05 Jun '19

05 Jun '19

Mostly to show that there is a WM_ACTIVATE message before WM_SYSCOMMAND SC_RESTORE and after WM_WINDOWPOSCHANGED The Alt+Tab test won't work on non-Windows because the emulated key inputs doesn't reach the host, unless we required user interaction. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: SetActiveWindow only when restoring from iconic state and window is visible. v3: Add a test to verify message sequence. v4: Add DefWindowProcA test to compare results. Add explorer patch. Supersede 165927~165929 dlls/user32/tests/msg.c | 141 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6d0f0637ee..cf491ad1c0 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15345,6 +15345,46 @@ static const struct message NCXBUTTONUPSeq2[] = { 0 } }; +/* DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0) to minimized visible window */ +static const struct message WmRestoreMinimizedOverlappedSeq[] = +{ + { HCBT_SYSCOMMAND, hook|wparam|lparam, SC_RESTORE, 0 }, + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_NCACTIVATE, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|optional }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent|optional }, + { WM_WINDOWPOSCHANGED, sent|optional }, + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_ACTIVATEAPP, sent|wparam, TRUE }, + { WM_NCACTIVATE, sent|wparam, TRUE }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent|wparam, TRUE }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_FRAMECHANGED|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { WM_ACTIVATE, sent|wparam, TRUE }, + { WM_SYNCPAINT, sent|optional }, + { WM_PAINT, sent }, + { 0 } +}; + struct rbuttonup_thread_data { HWND hwnd; @@ -15399,6 +15439,15 @@ static void test_defwinproc(void) GetWindowTextA(hwnd, buffA, ARRAY_SIZE(buffA)); ok(!strcmp(buffA, "test_defwndproc"), "unexpected window text, %s\n", buffA); + ShowWindow(hwnd, SW_MINIMIZE); + flush_events(); + flush_sequence(); + + DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); + flush_events(); + ok_sequence(WmRestoreMinimizedOverlappedSeq, "DefWindowProcA(SC_RESTORE):overlapped", TRUE); + flush_sequence(); + GetCursorPos(&pos); GetWindowRect(hwnd, &rect); x = (rect.left+rect.right) / 2; @@ -17522,6 +17571,97 @@ static void test_DoubleSetCapture(void) DestroyWindow(hwnd); } +static const struct message WmRestoreMinimizedSeq[] = +{ + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_ACTIVATEAPP, sent|wparam, 1 }, + { WM_NCACTIVATE, sent|wparam, 0x200001 }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent|wparam, 0x200001 }, /* Note that activate messages are after WM_WINDOWPOSCHANGED and before WM_SYSCOMMAND */ + { HCBT_KEYSKIPPED, hook|optional }, + { WM_SYSKEYUP, sent|optional }, + { WM_SYSCOMMAND, sent|wparam, SC_RESTORE }, + { HCBT_SYSCOMMAND, hook|wparam, SC_RESTORE }, + { HCBT_SYSCOMMAND, hook|wparam|optional, SC_RESTORE }, + { HCBT_MINMAX, hook }, + { HCBT_MINMAX, hook|optional }, + { WM_QUERYOPEN, sent|defwinproc }, + { WM_QUERYOPEN, sent|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent|wparam|defwinproc, 1 }, + { WM_NCPAINT, sent|wparam|defwinproc|optional, 1 }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent|defwinproc }, + { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|wparam|defwinproc|optional, 1 }, + { WM_NCPAINT, sent|wparam|defwinproc|optional, 1 }, + { WM_ERASEBKGND, sent|defwinproc|optional }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_ACTIVATE, sent|wparam|defwinproc, 1 }, + { WM_PAINT, sent| optional }, + { WM_SETFOCUS, sent|defwinproc|optional }, + { HCBT_KEYSKIPPED, hook|optional }, + { WM_KEYUP, sent|optional }, + { HCBT_KEYSKIPPED, hook|optional }, + { WM_SYSKEYUP, sent|optional }, + { HCBT_KEYSKIPPED, hook|optional }, + { WM_KEYUP, sent|optional }, + { WM_PAINT, sent| optional }, + { 0 } +}; + +static void test_restore_messages(void) +{ + INPUT ip = {0}; + HWND hwnd; + INT i; + + hwnd = CreateWindowExA(0, "TestWindowClass", "Test overlapped", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, + 100, 200, 200, 0, 0, 0, NULL); + ok (hwnd != 0, "Failed to create overlapped window\n"); + SetForegroundWindow(hwnd); + ShowWindow(hwnd, SW_MINIMIZE); + flush_events(); + flush_sequence(); + + for (i = 0; i < 5; i++) + { + /* Send Alt+Tab to restore test window from minimized state */ + ip.type = INPUT_KEYBOARD; + ip.ki.wVk = VK_MENU; + SendInput(1, &ip, sizeof(INPUT)); + ip.ki.wVk = VK_TAB; + SendInput(1, &ip, sizeof(INPUT)); + ip.ki.wVk = VK_MENU; + ip.ki.dwFlags = KEYEVENTF_KEYUP; + SendInput(1, &ip, sizeof(INPUT)); + ip.ki.wVk = VK_TAB; + ip.ki.dwFlags = KEYEVENTF_KEYUP; + SendInput(1, &ip, sizeof(INPUT)); + flush_events(); + if (!IsIconic(hwnd)) + break; + Sleep(500); + } + + if (IsIconic(hwnd)) + { + skip("Alt+Tab failed to bring up test window.\n"); + goto done; + } + ok_sequence(WmRestoreMinimizedSeq, "Restore minimized window", TRUE); + +done: + DestroyWindow(hwnd); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -17646,6 +17786,7 @@ START_TEST(msg) test_quit_message(); test_notify_message(); test_SetActiveWindow(); + test_restore_messages(); if (!pTrackMouseEvent) win_skip("TrackMouseEvent is not available\n"); -- 2.20.1

2 1

[PATCH v4 2/4] winex11.drv: Activate window when restoring from iconic state.
by Zhiyi Zhang 05 Jun '19

05 Jun '19

Some games, e.g., Project CARS waits for WM_ACTIVATE when restoring from iconic state. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/event.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 6054f645c4..5c465aa033 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1266,6 +1266,8 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat { TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); release_win_data( data ); + if ((style & (WS_MINIMIZE | WS_VISIBLE)) == (WS_MINIMIZE | WS_VISIBLE)) + SetActiveWindow( hwnd ); SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); return; } -- 2.20.1

1 0

[PATCH] qcap: release filter only if allocated
by Marcus Meissner 05 Jun '19

05 Jun '19

fixes test crash when built without v4l2 Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/qcap/tests/videocapture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index b80b0f2624..062138e885 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -118,12 +118,12 @@ START_TEST(videocapture) { test_capture(filter); IBaseFilter_Release(filter); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); } else skip("Failed to open capture device, hr=%#x.\n", hr); - ref = IBaseFilter_Release(filter); - ok(!ref, "Got outstanding refcount %d.\n", ref); IMoniker_Release(moniker); } -- 2.21.0

1 0

[PATCH 1/3] dbghelp: Reimplement SymGetLineFromAddrW64
by Alistair Leslie-Hughes 05 Jun '19

05 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/symbol.c | 75 +++++++++++++++++++++++++++++++------------ 1 file changed, 54 insertions(+), 21 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index f59e322fef..177c66480d 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1485,6 +1485,47 @@ BOOL symt_fill_func_line_info(const struct module* module, const struct symt_fun return FALSE; } +/****************************************************************** + * sym_fill_func_line_info64W + * + * fills information about a file + */ +static BOOL symt_fill_func_line_info64W(const struct module* module, const struct symt_function* func, + DWORD64 addr, IMAGEHLP_LINEW64* line) +{ + struct line_info* dli = NULL; + BOOL found = FALSE; + int i; + + assert(func->symt.tag == SymTagFunction); + + for (i=vector_length(&func->vlines)-1; i>=0; i--) + { + dli = vector_at(&func->vlines, i); + if (!dli->is_source_file) + { + if (found || dli->u.pc_offset > addr) continue; + line->LineNumber = dli->line_number; + line->Address = dli->u.pc_offset; + line->Key = dli; + found = TRUE; + continue; + } + if (found) + { + char *filename = (char*)source_get(module, dli->u.source_file); + int len = lstrlenA(filename)+1; + + line->FileName = fetch_buffer(module->process, len * sizeof(WCHAR)); + + MultiByteToWideChar(CP_ACP, 0, filename, -1, line->FileName, len); + + return TRUE; + } + } + return FALSE; +} + /*********************************************************************** * SymGetSymNext64 (DBGHELP.@) */ @@ -1544,22 +1585,6 @@ static void copy_line_64_from_32(IMAGEHLP_LINE64* l64, const IMAGEHLP_LINE* l32) l64->Address = l32->Address; } -/****************************************************************** - * copy_line_W64_from_32 (internal) - * - */ -static void copy_line_W64_from_64(struct process* pcs, IMAGEHLP_LINEW64* l64w, const IMAGEHLP_LINE64* l64) -{ - unsigned len; - - l64w->Key = l64->Key; - l64w->LineNumber = l64->LineNumber; - len = MultiByteToWideChar(CP_ACP, 0, l64->FileName, -1, NULL, 0); - if ((l64w->FileName = fetch_buffer(pcs, len * sizeof(WCHAR)))) - MultiByteToWideChar(CP_ACP, 0, l64->FileName, -1, l64w->FileName, len); - l64w->Address = l64->Address; -} - /****************************************************************** * copy_line_32_from_64 (internal) * @@ -1623,12 +1648,20 @@ BOOL WINAPI SymGetLineFromAddr64(HANDLE hProcess, DWORD64 dwAddr, BOOL WINAPI SymGetLineFromAddrW64(HANDLE hProcess, DWORD64 dwAddr, PDWORD pdwDisplacement, PIMAGEHLP_LINEW64 Line) { - IMAGEHLP_LINE64 il64; + struct module_pair pair; + struct symt_ht* symt; + + pair.pcs = process_find_by_handle(hProcess); + if (!pair.pcs) return FALSE; + pair.requested = module_find_by_addr(pair.pcs, dwAddr, DMT_UNKNOWN); + if (!module_get_debug(&pair)) return FALSE; + if ((symt = symt_find_nearest(pair.effective, dwAddr)) == NULL) return FALSE; + + if (symt->symt.tag != SymTagFunction) return FALSE; + if (!symt_fill_func_line_info64W(pair.effective, (struct symt_function*)symt, + dwAddr, Line)) return FALSE; + *pdwDisplacement = dwAddr - Line->Address; - il64.SizeOfStruct = sizeof(il64); - if (!SymGetLineFromAddr64(hProcess, dwAddr, pdwDisplacement, &il64)) - return FALSE; - copy_line_W64_from_64(process_find_by_handle(hProcess), Line, &il64); return TRUE; } -- 2.17.1

2 3

[PATCH 1/6] qcap/smartteefilter: Use strmbase filter aggregation support.
by Zebediah Figura 04 Jun '19

04 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/smartteefilter.c | 116 ++++++++------------------------------------- 1 file changed, 20 insertions(+), 96 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index a79e4bb..4095d95 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -36,19 +36,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); typedef struct { - IUnknown IUnknown_iface; - IUnknown *outerUnknown; BaseFilter filter; BaseInputPin *input; BaseOutputPin *capture; BaseOutputPin *preview; } SmartTeeFilter; -static inline SmartTeeFilter *impl_from_IUnknown(IUnknown *iface) -{ - return CONTAINING_RECORD(iface, SmartTeeFilter, IUnknown_iface); -} - static inline SmartTeeFilter *impl_from_BaseFilter(BaseFilter *filter) { return CONTAINING_RECORD(filter, SmartTeeFilter, filter); @@ -71,80 +64,6 @@ static inline SmartTeeFilter *impl_from_IPin(IPin *iface) return impl_from_IBaseFilter(bp->pinInfo.pFilter); } -static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) -{ - SmartTeeFilter *This = impl_from_IUnknown(iface); - if (IsEqualIID(riid, &IID_IUnknown)) { - TRACE("(%p)->(IID_IUnknown, %p)\n", This, ppv); - *ppv = &This->IUnknown_iface; - } else if (IsEqualIID(riid, &IID_IPersist)) { - TRACE("(%p)->(IID_IPersist, %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - } else if (IsEqualIID(riid, &IID_IMediaFilter)) { - TRACE("(%p)->(IID_IMediaFilter, %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - } else if (IsEqualIID(riid, &IID_IBaseFilter)) { - TRACE("(%p)->(IID_IBaseFilter, %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - } else { - FIXME("(%p): no interface for %s\n", This, debugstr_guid(riid)); - *ppv = NULL; - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI Unknown_AddRef(IUnknown *iface) -{ - SmartTeeFilter *This = impl_from_IUnknown(iface); - return BaseFilterImpl_AddRef(&This->filter.IBaseFilter_iface); -} - -static ULONG WINAPI Unknown_Release(IUnknown *iface) -{ - SmartTeeFilter *This = impl_from_IUnknown(iface); - ULONG ref = InterlockedDecrement(&This->filter.refcount); - - TRACE("(%p)->() ref=%d\n", This, ref); - - if (!ref) { - if(This->input) - BaseInputPinImpl_Release(&This->input->pin.IPin_iface); - if(This->capture) - BaseOutputPinImpl_Release(&This->capture->pin.IPin_iface); - if(This->preview) - BaseOutputPinImpl_Release(&This->preview->pin.IPin_iface); - strmbase_filter_cleanup(&This->filter); - CoTaskMemFree(This); - } - return ref; -} - -static const IUnknownVtbl UnknownVtbl = { - Unknown_QueryInterface, - Unknown_AddRef, - Unknown_Release -}; - -static HRESULT WINAPI SmartTeeFilter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) -{ - SmartTeeFilter *This = impl_from_IBaseFilter(iface); - return IUnknown_QueryInterface(This->outerUnknown, riid, ppv); -} - -static ULONG WINAPI SmartTeeFilter_AddRef(IBaseFilter *iface) -{ - SmartTeeFilter *This = impl_from_IBaseFilter(iface); - return IUnknown_AddRef(This->outerUnknown); -} - -static ULONG WINAPI SmartTeeFilter_Release(IBaseFilter *iface) -{ - SmartTeeFilter *This = impl_from_IBaseFilter(iface); - return IUnknown_Release(This->outerUnknown); -} - static HRESULT WINAPI SmartTeeFilter_Stop(IBaseFilter *iface) { SmartTeeFilter *This = impl_from_IBaseFilter(iface); @@ -182,9 +101,9 @@ static HRESULT WINAPI SmartTeeFilter_Run(IBaseFilter *iface, REFERENCE_TIME tSta } static const IBaseFilterVtbl SmartTeeFilterVtbl = { - SmartTeeFilter_QueryInterface, - SmartTeeFilter_AddRef, - SmartTeeFilter_Release, + BaseFilterImpl_QueryInterface, + BaseFilterImpl_AddRef, + BaseFilterImpl_Release, BaseFilterImpl_GetClassID, SmartTeeFilter_Stop, SmartTeeFilter_Pause, @@ -217,8 +136,23 @@ static IPin *smart_tee_get_pin(BaseFilter *iface, unsigned int index) return ret; } +static void smart_tee_destroy(BaseFilter *iface) +{ + SmartTeeFilter *filter = impl_from_BaseFilter(iface); + + if (filter->input) + BaseInputPinImpl_Release(&filter->input->pin.IPin_iface); + if (filter->capture) + BaseOutputPinImpl_Release(&filter->capture->pin.IPin_iface); + if (filter->preview) + BaseOutputPinImpl_Release(&filter->preview->pin.IPin_iface); + strmbase_filter_cleanup(&filter->filter); + CoTaskMemFree(filter); +} + static const BaseFilterFuncTable SmartTeeFilterFuncs = { .filter_get_pin = smart_tee_get_pin, + .filter_destroy = smart_tee_destroy, }; static ULONG WINAPI SmartTeeFilterInput_AddRef(IPin *iface) @@ -586,21 +520,14 @@ IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr) HRESULT hr; SmartTeeFilter *This = NULL; - TRACE("(%p, %p)\n", outer, phr); - This = CoTaskMemAlloc(sizeof(*This)); if (This == NULL) { *phr = E_OUTOFMEMORY; return NULL; } memset(This, 0, sizeof(*This)); - This->IUnknown_iface.lpVtbl = &UnknownVtbl; - if (outer) - This->outerUnknown = outer; - else - This->outerUnknown = &This->IUnknown_iface; - strmbase_filter_init(&This->filter, &SmartTeeFilterVtbl, NULL, &CLSID_SmartTee, + strmbase_filter_init(&This->filter, &SmartTeeFilterVtbl, outer, &CLSID_SmartTee, (DWORD_PTR)(__FILE__ ": SmartTeeFilter.csFilter"), &SmartTeeFilterFuncs); inputPinInfo.pFilter = &This->filter.IBaseFilter_iface; @@ -626,10 +553,7 @@ IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr) end: *phr = hr; if (SUCCEEDED(hr)) { - if (outer) - return &This->IUnknown_iface; - else - return (IUnknown*)&This->filter.IBaseFilter_iface; + return &This->filter.IUnknown_inner; } else { strmbase_filter_cleanup(&This->filter); return NULL; -- 2.7.4

1 5

[PATCH 1/5] ntoskrnl.exe: Free device IDs from pool.
by Zebediah Figura 04 Jun '19

04 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/pnp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 23ae4ca..d8f74e0 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -301,7 +301,7 @@ static void handle_bus_relations( DEVICE_OBJECT *device ) if (get_driver_for_id( ptr, driver )) break; } - RtlFreeHeap( GetProcessHeap(), 0, ids ); + ExFreePool( ids ); if (!driver[0]) { @@ -409,7 +409,7 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP else status = STATUS_BUFFER_TOO_SMALL; - HeapFree( GetProcessHeap(), 0, id ); + ExFreePool( id ); break; } case DevicePropertyPhysicalDeviceObjectName: @@ -658,17 +658,17 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla HeapFree( GetProcessHeap(), 0, id ); if (!rc) { - HeapFree( GetProcessHeap(), 0, instance_id ); + ExFreePool( instance_id ); return STATUS_UNSUCCESSFUL; } } else { - HeapFree( GetProcessHeap(), 0, instance_id ); + ExFreePool( instance_id ); return STATUS_UNSUCCESSFUL; } } - HeapFree( GetProcessHeap(), 0, instance_id ); + ExFreePool( instance_id ); if (!SetupDiCreateDeviceInterfaceW( set, &sp_device, class_guid, refstr ? refstr->Buffer : NULL, 0, &sp_iface )) return STATUS_UNSUCCESSFUL; -- 2.7.4

1 4

[PATCH] mshtml: Print the debug strings and not the pointers to them
by Michael Stefaniuc 04 Jun '19

04 Jun '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/oleobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 87147df6eb..ba29b56a23 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -1176,7 +1176,7 @@ static HRESULT WINAPI OleInPlaceObjectWindowless_SetObjectRects(IOleInPlaceObjec HTMLDocument *This = impl_from_IOleInPlaceObjectWindowless(iface); RECT r; - TRACE("(%p)->(%p %p)\n", This, wine_dbgstr_rect(pos), wine_dbgstr_rect(clip)); + TRACE("(%p)->(%s %s)\n", This, wine_dbgstr_rect(pos), wine_dbgstr_rect(clip)); if(clip && !EqualRect(clip, pos)) FIXME("Ignoring clip rect %s\n", wine_dbgstr_rect(clip)); -- 2.20.1

2 1

[PATCH] msvcp: Add _Strxfrm implementation.
by Piotr Caban 04 Jun '19

04 Jun '19

1 0

[PATCH] winedbg: Fix the spelling of a comment
by Michael Stefaniuc 04 Jun '19

04 Jun '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Of course the comment could be just dropped programs/winedbg/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index f3585f2b4e..053ace94ac 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -491,7 +491,7 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) WideCharToMultiByte(CP_ACP, 0, ptr, -1, tmp, sizeof(tmp), NULL, NULL); HeapFree(GetProcessHeap(), 0, ptr); dbg_printf("%s", tmp); - count = 0; /* so that we'll get away from outter loop */ + count = 0; /* so that we'll get away from outer loop */ break; } } -- 2.20.1

1 0

[PATCH] winedump: Fix the spelling of a string
by Michael Stefaniuc 04 Jun '19

04 Jun '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winedump/msc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 5f7765f4d3..fbe7f9e541 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -825,7 +825,7 @@ static void codeview_dump_one_type(unsigned curr_type, const union codeview_type int count = *(const unsigned short*)((const char*)type + 4); int shift = 0; const char* ptr = (const char*)type + 6; - const char* desc[] = {"Near", "Far", "Thin", "Disp to outtermost", + const char* desc[] = {"Near", "Far", "Thin", "Disp to outermost", "Pointer to metaclass", "Near32", "Far32"}; printf("\t%x => VT Shape #%d: ", curr_type, count); while (count--) -- 2.20.1

1 0

[PATCH] dbghelp: Fix the spelling of a parameter
by Michael Stefaniuc 04 Jun '19

04 Jun '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dbghelp/module.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index cfbb58683f..d9d8417e84 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -334,16 +334,15 @@ static struct module* module_get_container(const struct process* pcs, * module_get_containee * */ -struct module* module_get_containee(const struct process* pcs, - const struct module* outter) +struct module* module_get_containee(const struct process* pcs, const struct module* outer) { struct module* module; - + for (module = pcs->lmodules; module; module = module->next) { - if (module != outter && - outter->module.BaseOfImage <= module->module.BaseOfImage && - outter->module.BaseOfImage + outter->module.ImageSize >= + if (module != outer && + outer->module.BaseOfImage <= module->module.BaseOfImage && + outer->module.BaseOfImage + outer->module.ImageSize >= module->module.BaseOfImage + module->module.ImageSize) return module; } -- 2.20.1

1 0

[PATCH v2 1/3] ntoskrnl.exe: Fix handling of reference string in IoRegisterDeviceInterface().
by Zebediah Figura 04 Jun '19

04 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/pnp.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 85bb9f4..23ae4ca 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -613,26 +613,22 @@ static NTSTATUS get_instance_id(DEVICE_OBJECT *device, WCHAR **instance_id) * IoRegisterDeviceInterface (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *class_guid, - UNICODE_STRING *reference_string, UNICODE_STRING *symbolic_link) + UNICODE_STRING *refstr, UNICODE_STRING *symbolic_link) { SP_DEVICE_INTERFACE_DATA sp_iface = {sizeof(sp_iface)}; SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; SP_DEVICE_INTERFACE_DETAIL_DATA_W *data; NTSTATUS status = STATUS_SUCCESS; struct device_interface *iface; - WCHAR *referenceW = NULL; WCHAR *instance_id; DWORD required; HDEVINFO set; BOOL rc; - TRACE("device %p, class_guid %s, reference_string %s, symbolic_link %p.\n", - device, debugstr_guid(class_guid), debugstr_us(reference_string), symbolic_link); + TRACE("device %p, class_guid %s, refstr %s, symbolic_link %p.\n", + device, debugstr_guid(class_guid), debugstr_us(refstr), symbolic_link); - if (reference_string != NULL) - referenceW = reference_string->Buffer; - - set = SetupDiGetClassDevsW( class_guid, referenceW, NULL, DIGCF_DEVICEINTERFACE ); + set = SetupDiGetClassDevsW( class_guid, NULL, NULL, DIGCF_DEVICEINTERFACE ); if (set == INVALID_HANDLE_VALUE) return STATUS_UNSUCCESSFUL; status = get_instance_id( device, &instance_id ); @@ -674,7 +670,7 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla } HeapFree( GetProcessHeap(), 0, instance_id ); - if (!SetupDiCreateDeviceInterfaceW( set, &sp_device, class_guid, NULL, 0, &sp_iface )) + if (!SetupDiCreateDeviceInterfaceW( set, &sp_device, class_guid, refstr ? refstr->Buffer : NULL, 0, &sp_iface )) return STATUS_UNSUCCESSFUL; required = 0; -- 2.7.4

1 2

[PATCH 1/3] ntoskrnl.exe: Fix handling of reference string in IoRegisterDeviceInterface().
by Zebediah Figura 04 Jun '19

04 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/pnp.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 85bb9f4..23ae4ca 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -613,26 +613,22 @@ static NTSTATUS get_instance_id(DEVICE_OBJECT *device, WCHAR **instance_id) * IoRegisterDeviceInterface (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *class_guid, - UNICODE_STRING *reference_string, UNICODE_STRING *symbolic_link) + UNICODE_STRING *refstr, UNICODE_STRING *symbolic_link) { SP_DEVICE_INTERFACE_DATA sp_iface = {sizeof(sp_iface)}; SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; SP_DEVICE_INTERFACE_DETAIL_DATA_W *data; NTSTATUS status = STATUS_SUCCESS; struct device_interface *iface; - WCHAR *referenceW = NULL; WCHAR *instance_id; DWORD required; HDEVINFO set; BOOL rc; - TRACE("device %p, class_guid %s, reference_string %s, symbolic_link %p.\n", - device, debugstr_guid(class_guid), debugstr_us(reference_string), symbolic_link); + TRACE("device %p, class_guid %s, refstr %s, symbolic_link %p.\n", + device, debugstr_guid(class_guid), debugstr_us(refstr), symbolic_link); - if (reference_string != NULL) - referenceW = reference_string->Buffer; - - set = SetupDiGetClassDevsW( class_guid, referenceW, NULL, DIGCF_DEVICEINTERFACE ); + set = SetupDiGetClassDevsW( class_guid, NULL, NULL, DIGCF_DEVICEINTERFACE ); if (set == INVALID_HANDLE_VALUE) return STATUS_UNSUCCESSFUL; status = get_instance_id( device, &instance_id ); @@ -674,7 +670,7 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla } HeapFree( GetProcessHeap(), 0, instance_id ); - if (!SetupDiCreateDeviceInterfaceW( set, &sp_device, class_guid, NULL, 0, &sp_iface )) + if (!SetupDiCreateDeviceInterfaceW( set, &sp_device, class_guid, refstr ? refstr->Buffer : NULL, 0, &sp_iface )) return STATUS_UNSUCCESSFUL; required = 0; -- 2.7.4

3 4

[PATCH 1/5] qcap/avico: Use BaseFilterImpl_QueryInterface().
by Zebediah Figura 04 Jun '19

04 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/avico.c | 46 +++++++++++++++------------------------------- 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 67e7f50..cfb23e8 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -117,36 +117,6 @@ static HRESULT fill_format_info(AVICompressor *This, VIDEOINFOHEADER *src_videoi return S_OK; } -static HRESULT WINAPI AVICompressor_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) -{ - AVICompressor *This = impl_from_IBaseFilter(iface); - - if(IsEqualIID(riid, &IID_IUnknown)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - }else if(IsEqualIID(riid, &IID_IPersist)) { - TRACE("(%p)->(IID_IPersist %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - }else if(IsEqualIID(riid, &IID_IMediaFilter)) { - TRACE("(%p)->(IID_IMediaFilter %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - }else if(IsEqualIID(riid, &IID_IBaseFilter)) { - TRACE("(%p)->(IID_IBaseFilter %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - }else if(IsEqualIID(riid, &IID_IPersistPropertyBag)) { - TRACE("(%p)->(IID_IPersistPropertyBag %p)\n", This, ppv); - *ppv = &This->IPersistPropertyBag_iface; - }else { - FIXME("no interface for %s\n", debugstr_guid(riid)); - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - -} - static HRESULT WINAPI AVICompressor_Stop(IBaseFilter *iface) { AVICompressor *This = impl_from_IBaseFilter(iface); @@ -205,7 +175,7 @@ static HRESULT WINAPI AVICompressor_QueryVendorInfo(IBaseFilter *iface, LPWSTR * } static const IBaseFilterVtbl AVICompressorVtbl = { - AVICompressor_QueryInterface, + BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID, @@ -253,9 +223,23 @@ static void avi_compressor_destroy(BaseFilter *iface) heap_free(filter); } +static HRESULT avi_compressor_query_interface(BaseFilter *iface, REFIID iid, void **out) +{ + AVICompressor *filter = impl_from_BaseFilter(iface); + + if (IsEqualGUID(iid, &IID_IPersistPropertyBag)) + *out = &filter->IPersistPropertyBag_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static const BaseFilterFuncTable filter_func_table = { .filter_get_pin = avi_compressor_get_pin, .filter_destroy = avi_compressor_destroy, + .filter_query_interface = avi_compressor_query_interface, }; static AVICompressor *impl_from_IPersistPropertyBag(IPersistPropertyBag *iface) -- 2.7.4

2 5

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