March 2021 - Wine-devel - list.winehq.org

[PATCH 1/7] wined3d: Separate the "ops" member of struct wined3d_cs to a new wined3d_device_context structure.
by Zebediah Figura 05 Mar '21

05 Mar '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Apologies for the large series of large patches... dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/cs.c | 54 ++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 23 ++++++++++----- 4 files changed, 53 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index e12a1ff13b7..59a925717e9 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4807,7 +4807,7 @@ static void wined3d_view_gl_destroy(struct wined3d_device *device, wined3d_cs_destroy_object(device->cs, wined3d_view_gl_destroy_object, ctx); if (ctx == &c) - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + device->cs->c.ops->finish(&device->cs->c, WINED3D_CS_QUEUE_DEFAULT); } static void adapter_gl_destroy_rendertarget_view(struct wined3d_rendertarget_view *view) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 8c79cc05058..8ba912eaee6 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1394,7 +1394,7 @@ static void wined3d_view_vk_destroy(struct wined3d_device *device, VkBufferView wined3d_cs_destroy_object(device->cs, wined3d_view_vk_destroy_object, ctx); if (ctx == &c) - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + device->cs->c.ops->finish(&device->cs->c, WINED3D_CS_QUEUE_DEFAULT); } static void adapter_vk_destroy_rendertarget_view(struct wined3d_rendertarget_view *view) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 4ee3d97b7fc..12a0230b361 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -458,12 +458,12 @@ struct wined3d_cs_stop static inline void *wined3d_cs_require_space(struct wined3d_cs *cs, size_t size, enum wined3d_cs_queue_id queue_id) { - return cs->ops->require_space(cs, size, queue_id); + return cs->c.ops->require_space(&cs->c, size, queue_id); } static inline void wined3d_cs_submit(struct wined3d_cs *cs, enum wined3d_cs_queue_id queue_id) { - cs->ops->submit(cs, queue_id); + cs->c.ops->submit(&cs->c, queue_id); } static const char *debug_cs_op(enum wined3d_cs_op op) @@ -2023,9 +2023,15 @@ wined3d_cs_push_constant_info[] = {FIELD_OFFSET(struct wined3d_state, ps_consts_b), sizeof(BOOL), WINED3D_SHADER_CONST_PS_B}, }; -static void wined3d_cs_st_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p, +static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) +{ + return CONTAINING_RECORD(context, struct wined3d_cs, c); +} + +static void wined3d_cs_st_push_constants(struct wined3d_device_context *context, enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants) { + struct wined3d_cs *cs = wined3d_cs_from_context(context); struct wined3d_device *device = cs->device; unsigned int context_count; unsigned int i; @@ -2048,12 +2054,13 @@ static void wined3d_cs_exec_push_constants(struct wined3d_cs *cs, const void *da { const struct wined3d_cs_push_constants *op = data; - wined3d_cs_st_push_constants(cs, op->type, op->start_idx, op->count, op->constants); + wined3d_cs_st_push_constants(&cs->c, op->type, op->start_idx, op->count, op->constants); } -static void wined3d_cs_mt_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p, +static void wined3d_cs_mt_push_constants(struct wined3d_device_context *context, enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants) { + struct wined3d_cs *cs = wined3d_cs_from_context(context); struct wined3d_cs_push_constants *op; size_t size; @@ -2669,8 +2676,11 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_GENERATE_MIPMAPS */ wined3d_cs_exec_generate_mipmaps, }; -static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size, enum wined3d_cs_queue_id queue_id) +static void *wined3d_cs_st_require_space(struct wined3d_device_context *context, + size_t size, enum wined3d_cs_queue_id queue_id) { + struct wined3d_cs *cs = wined3d_cs_from_context(context); + if (size > (cs->data_size - cs->end)) { size_t new_size; @@ -2694,8 +2704,9 @@ static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size, enu return (BYTE *)cs->data + cs->start; } -static void wined3d_cs_st_submit(struct wined3d_cs *cs, enum wined3d_cs_queue_id queue_id) +static void wined3d_cs_st_submit(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id) { + struct wined3d_cs *cs = wined3d_cs_from_context(context); enum wined3d_cs_op opcode; size_t start; BYTE *data; @@ -2716,11 +2727,11 @@ static void wined3d_cs_st_submit(struct wined3d_cs *cs, enum wined3d_cs_queue_id heap_free(data); } -static void wined3d_cs_st_finish(struct wined3d_cs *cs, enum wined3d_cs_queue_id queue_id) +static void wined3d_cs_st_finish(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id) { } -static const struct wined3d_cs_ops wined3d_cs_st_ops = +static const struct wined3d_device_context_ops wined3d_cs_st_ops = { wined3d_cs_st_require_space, wined3d_cs_st_submit, @@ -2747,10 +2758,12 @@ static void wined3d_cs_queue_submit(struct wined3d_cs_queue *queue, struct wined SetEvent(cs->event); } -static void wined3d_cs_mt_submit(struct wined3d_cs *cs, enum wined3d_cs_queue_id queue_id) +static void wined3d_cs_mt_submit(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id) { + struct wined3d_cs *cs = wined3d_cs_from_context(context); + if (cs->thread_id == GetCurrentThreadId()) - return wined3d_cs_st_submit(cs, queue_id); + return wined3d_cs_st_submit(context, queue_id); wined3d_cs_queue_submit(&cs->queue[queue_id], cs); } @@ -2817,24 +2830,29 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size return packet->data; } -static void *wined3d_cs_mt_require_space(struct wined3d_cs *cs, size_t size, enum wined3d_cs_queue_id queue_id) +static void *wined3d_cs_mt_require_space(struct wined3d_device_context *context, + size_t size, enum wined3d_cs_queue_id queue_id) { + struct wined3d_cs *cs = wined3d_cs_from_context(context); + if (cs->thread_id == GetCurrentThreadId()) - return wined3d_cs_st_require_space(cs, size, queue_id); + return wined3d_cs_st_require_space(context, size, queue_id); return wined3d_cs_queue_require_space(&cs->queue[queue_id], size, cs); } -static void wined3d_cs_mt_finish(struct wined3d_cs *cs, enum wined3d_cs_queue_id queue_id) +static void wined3d_cs_mt_finish(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id) { + struct wined3d_cs *cs = wined3d_cs_from_context(context); + if (cs->thread_id == GetCurrentThreadId()) - return wined3d_cs_st_finish(cs, queue_id); + return wined3d_cs_st_finish(context, queue_id); while (cs->queue[queue_id].head != *(volatile LONG *)&cs->queue[queue_id].tail) YieldProcessor(); } -static const struct wined3d_cs_ops wined3d_cs_mt_ops = +static const struct wined3d_device_context_ops wined3d_cs_mt_ops = { wined3d_cs_mt_require_space, wined3d_cs_mt_submit, @@ -2969,7 +2987,7 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) if (!(cs = heap_alloc_zero(sizeof(*cs)))) return NULL; - cs->ops = &wined3d_cs_st_ops; + cs->c.ops = &wined3d_cs_st_ops; cs->device = device; cs->serialize_commands = TRACE_ON(d3d_sync) || wined3d_settings.cs_multithreaded & WINED3D_CSMT_SERIALIZE; @@ -2982,7 +3000,7 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) if (wined3d_settings.cs_multithreaded & WINED3D_CSMT_ENABLE && !RtlIsCriticalSectionLockedByThread(NtCurrentTeb()->Peb->LoaderLock)) { - cs->ops = &wined3d_cs_mt_ops; + cs->c.ops = &wined3d_cs_mt_ops; if (!(cs->event = CreateEventW(NULL, FALSE, FALSE, NULL))) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 56d3ef8fea2..3c77c295027 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -89,6 +89,7 @@ struct wined3d_adapter; struct wined3d_buffer_vk; struct wined3d_context; struct wined3d_context_vk; +struct wined3d_device_context; struct wined3d_gl_info; struct wined3d_state; struct wined3d_swapchain_gl; @@ -4671,18 +4672,24 @@ struct wined3d_cs_queue BYTE data[WINED3D_CS_QUEUE_SIZE]; }; -struct wined3d_cs_ops +struct wined3d_device_context_ops { - void *(*require_space)(struct wined3d_cs *cs, size_t size, enum wined3d_cs_queue_id queue_id); - void (*submit)(struct wined3d_cs *cs, enum wined3d_cs_queue_id queue_id); - void (*finish)(struct wined3d_cs *cs, enum wined3d_cs_queue_id queue_id); - void (*push_constants)(struct wined3d_cs *cs, enum wined3d_push_constants p, + void *(*require_space)(struct wined3d_device_context *context, size_t size, enum wined3d_cs_queue_id queue_id); + void (*submit)(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id); + void (*finish)(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id); + void (*push_constants)(struct wined3d_device_context *context, enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants); }; +struct wined3d_device_context +{ + const struct wined3d_device_context_ops *ops; +}; + struct wined3d_cs { - const struct wined3d_cs_ops *ops; + struct wined3d_device_context c; + struct wined3d_device *device; struct wined3d_state state; HMODULE wined3d_module; @@ -4800,13 +4807,13 @@ HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resourc static inline void wined3d_cs_finish(struct wined3d_cs *cs, enum wined3d_cs_queue_id queue_id) { - cs->ops->finish(cs, queue_id); + cs->c.ops->finish(&cs->c, queue_id); } static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants) { - cs->ops->push_constants(cs, p, start_idx, count, constants); + cs->c.ops->push_constants(&cs->c, p, start_idx, count, constants); } static inline void wined3d_resource_wait_idle(struct wined3d_resource *resource) -- 2.20.1

2 13

[PATCH v2] d3d11/tests: Test ID3D11DeviceContext1::SwapDeviceContextState() on a deferred context.
by Zebediah Figura 05 Mar '21

05 Mar '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 59 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c40593d31d8..6cdac34c0cd 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -31969,6 +31969,64 @@ static void test_deferred_context_state(void) release_test_context(&test_context); } +static void test_deferred_context_swap_state(void) +{ + ID3D11DeviceContext1 *immediate, *deferred; + ID3DDeviceContextState *state, *prev_state; + ID3D11Buffer *green_buffer, *ret_buffer; + struct d3d11_test_context test_context; + D3D_FEATURE_LEVEL feature_level; + ID3D11Device1 *device; + HRESULT hr; + + static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + + if (!init_test_context(&test_context, NULL)) + return; + + if (FAILED(ID3D11Device_QueryInterface(test_context.device, &IID_ID3D11Device1, (void **)&device))) + { + skip("ID3D11Device1 is not available.\n"); + release_test_context(&test_context); + return; + } + + ID3D11Device1_GetImmediateContext1(device, &immediate); + + green_buffer = create_buffer(test_context.device, D3D11_BIND_CONSTANT_BUFFER, sizeof(green), &green); + ID3D11DeviceContext1_PSSetConstantBuffers(immediate, 0, 1, &green_buffer); + + hr = ID3D11Device1_CreateDeferredContext1(device, 0, &deferred); + todo_wine ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + if (hr != S_OK) + goto out; + + feature_level = ID3D11Device1_GetFeatureLevel(device); + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, + &IID_ID3D11Device1, NULL, &state); + ok(hr == S_OK, "Failed to create device context state, hr %#x.\n", hr); + + prev_state = (void *)0xdeadbeef; + ID3D11DeviceContext1_SwapDeviceContextState(deferred, NULL, &prev_state); + ok(!prev_state, "Got state %p.\n", prev_state); + + prev_state = (void *)0xdeadbeef; + ID3D11DeviceContext1_SwapDeviceContextState(deferred, state, &prev_state); + ok(!prev_state, "Got state %p.\n", prev_state); + + ID3D11DeviceContext1_PSGetConstantBuffers(deferred, 0, 1, &ret_buffer); + ok(!ret_buffer, "Got unexpected buffer %p.\n", ret_buffer); + + ID3DDeviceContextState_Release(state); + ID3D11DeviceContext1_Release(deferred); + +out: + ID3D11Buffer_Release(green_buffer); + ID3D11DeviceContext1_Release(immediate); + ID3D11Device1_Release(device); + release_test_context(&test_context); +} + static void test_deferred_context_rendering(void) { ID3D11DeviceContext *immediate, *deferred; @@ -32238,6 +32296,7 @@ START_TEST(d3d11) queue_test(test_independent_blend); queue_test(test_dual_source_blend); queue_test(test_deferred_context_state); + queue_test(test_deferred_context_swap_state); queue_test(test_deferred_context_rendering); run_queued_tests(); -- 2.20.1

3 2

[PATCH 1/3] wmvcore: Move IWMSyncReader implementation to separate file.
by Gijs Vermeulen 05 Mar '21

05 Mar '21

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/wmvcore/Makefile.in | 1 + dlls/wmvcore/reader.c | 312 ----------------------------------- dlls/wmvcore/syncreader.c | 337 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 338 insertions(+), 312 deletions(-) create mode 100644 dlls/wmvcore/syncreader.c diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index e4efe0d3873..d84411ab846 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -6,6 +6,7 @@ EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ reader.c \ + syncreader.c \ wmvcore_main.c \ writer.c diff --git a/dlls/wmvcore/reader.c b/dlls/wmvcore/reader.c index 293bba0279c..12ba8099ab1 100644 --- a/dlls/wmvcore/reader.c +++ b/dlls/wmvcore/reader.c @@ -2072,315 +2072,3 @@ HRESULT WINAPI WMCreateReaderPriv(IWMReader **ret_reader) { return WMCreateReader(NULL, 0, ret_reader); } - -typedef struct { - IWMSyncReader2 IWMSyncReader2_iface; - LONG ref; -} WMSyncReader; - -static inline WMSyncReader *impl_from_IWMSyncReader2(IWMSyncReader2 *iface) -{ - return CONTAINING_RECORD(iface, WMSyncReader, IWMSyncReader2_iface); -} - -static HRESULT WINAPI WMSyncReader_QueryInterface(IWMSyncReader2 *iface, REFIID riid, void **ppv) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - - if(IsEqualGUID(riid, &IID_IUnknown)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IWMSyncReader2_iface; - }else if(IsEqualGUID(riid, &IID_IWMSyncReader)) { - TRACE("(%p)->(IID_IWMSyncReader %p)\n", This, ppv); - *ppv = &This->IWMSyncReader2_iface; - }else if(IsEqualGUID(riid, &IID_IWMSyncReader2)) { - TRACE("(%p)->(IID_IWMSyncReader2 %p)\n", This, ppv); - *ppv = &This->IWMSyncReader2_iface; - }else { - *ppv = NULL; - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI WMSyncReader_AddRef(IWMSyncReader2 *iface) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - LONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - return ref; -} - -static ULONG WINAPI WMSyncReader_Release(IWMSyncReader2 *iface) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - LONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - if(!ref) - heap_free(This); - - return ref; -} - -static HRESULT WINAPI WMSyncReader_Close(IWMSyncReader2 *iface) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_GetMaxOutputSampleSize(IWMSyncReader2 *iface, DWORD output, DWORD *max) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %p): stub!\n", This, output, max); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_GetMaxStreamSampleSize(IWMSyncReader2 *iface, WORD stream, DWORD *max) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %p): stub!\n", This, stream, max); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_GetNextSample(IWMSyncReader2 *iface, WORD stream, INSSBuffer **sample, - QWORD *sample_time, QWORD *sample_duration, DWORD *flags, DWORD *output_num, WORD *stream_num) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %p %p %p %p %p %p): stub!\n", This, stream, sample, sample_time, - sample_duration, flags, output_num, stream_num); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_GetOutputCount(IWMSyncReader2 *iface, DWORD *outputs) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%p): stub!\n", This, outputs); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_GetOutputFormat(IWMSyncReader2 *iface, DWORD output_num, DWORD format_num, - IWMOutputMediaProps **props) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%u %u %p): stub!\n", This, output_num, format_num, props); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_GetOutputFormatCount(IWMSyncReader2 *iface, DWORD output_num, DWORD *formats) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%u %p): stub!\n", This, output_num, formats); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_GetOutputNumberForStream(IWMSyncReader2 *iface, WORD stream_num, DWORD *output_num) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%u %p): stub!\n", This, stream_num, output_num); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_GetOutputProps(IWMSyncReader2 *iface, DWORD output_num, IWMOutputMediaProps **output) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%u %p): stub!\n", This, output_num, output); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_GetOutputSetting(IWMSyncReader2 *iface, DWORD output_num, const WCHAR *name, - WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%u %s %p %p %p): stub!\n", This, output_num, debugstr_w(name), type, value, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_GetReadStreamSamples(IWMSyncReader2 *iface, WORD stream_num, BOOL *compressed) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %p): stub!\n", This, stream_num, compressed); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_GetStreamNumberForOutput(IWMSyncReader2 *iface, DWORD output, WORD *stream_num) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%u %p): stub!\n", This, output, stream_num); - return S_OK; -} - -static HRESULT WINAPI WMSyncReader_GetStreamSelected(IWMSyncReader2 *iface, WORD stream_num, WMT_STREAM_SELECTION *selection) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %p): stub!\n", This, stream_num, selection); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_Open(IWMSyncReader2 *iface, const WCHAR *filename) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%s): stub!\n", This, debugstr_w(filename)); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_OpenStream(IWMSyncReader2 *iface, IStream *stream) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%p): stub!\n", This, stream); - return S_OK; -} - -static HRESULT WINAPI WMSyncReader_SetOutputProps(IWMSyncReader2 *iface, DWORD output_num, IWMOutputMediaProps *output) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%u %p): stub!\n", This, output_num, output); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_SetOutputSetting(IWMSyncReader2 *iface, DWORD output_num, const WCHAR *name, - WMT_ATTR_DATATYPE type, const BYTE *value, WORD length) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %s %d %p %d): stub!\n", This, output_num, debugstr_w(name), type, value, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_SetRange(IWMSyncReader2 *iface, QWORD start, LONGLONG duration) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%s %s): stub!\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration)); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_SetRangeByFrame(IWMSyncReader2 *iface, WORD stream_num, QWORD frame_num, - LONGLONG frames) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %s %s): stub!\n", This, stream_num, wine_dbgstr_longlong(frame_num), wine_dbgstr_longlong(frames)); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_SetReadStreamSamples(IWMSyncReader2 *iface, WORD stream_num, BOOL compressed) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%u %x): stub!\n", This, stream_num, compressed); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader_SetStreamsSelected(IWMSyncReader2 *iface, WORD stream_count, - WORD *stream_numbers, WMT_STREAM_SELECTION *selections) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %p %p): stub!\n", This, stream_count, stream_numbers, selections); - return S_OK; -} - -static HRESULT WINAPI WMSyncReader2_SetRangeByTimecode(IWMSyncReader2 *iface, WORD stream_num, - WMT_TIMECODE_EXTENSION_DATA *start, WMT_TIMECODE_EXTENSION_DATA *end) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%u %p %p): stub!\n", This, stream_num, start, end); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader2_SetRangeByFrameEx(IWMSyncReader2 *iface, WORD stream_num, QWORD frame_num, - LONGLONG frames_to_read, QWORD *starttime) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%u %s %s %p): stub!\n", This, stream_num, wine_dbgstr_longlong(frame_num), - wine_dbgstr_longlong(frames_to_read), starttime); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader2_SetAllocateForOutput(IWMSyncReader2 *iface, DWORD output_num, IWMReaderAllocatorEx *allocator) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %p): stub!\n", This, output_num, allocator); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader2_GetAllocateForOutput(IWMSyncReader2 *iface, DWORD output_num, IWMReaderAllocatorEx **allocator) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %p): stub!\n", This, output_num, allocator); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader2_SetAllocateForStream(IWMSyncReader2 *iface, DWORD stream_num, IWMReaderAllocatorEx *allocator) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %p): stub!\n", This, stream_num, allocator); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMSyncReader2_GetAllocateForStream(IWMSyncReader2 *iface, DWORD stream_num, IWMReaderAllocatorEx **allocator) -{ - WMSyncReader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %p): stub!\n", This, stream_num, allocator); - return E_NOTIMPL; -} - -static const IWMSyncReader2Vtbl WMSyncReader2Vtbl = { - WMSyncReader_QueryInterface, - WMSyncReader_AddRef, - WMSyncReader_Release, - WMSyncReader_Open, - WMSyncReader_Close, - WMSyncReader_SetRange, - WMSyncReader_SetRangeByFrame, - WMSyncReader_GetNextSample, - WMSyncReader_SetStreamsSelected, - WMSyncReader_GetStreamSelected, - WMSyncReader_SetReadStreamSamples, - WMSyncReader_GetReadStreamSamples, - WMSyncReader_GetOutputSetting, - WMSyncReader_SetOutputSetting, - WMSyncReader_GetOutputCount, - WMSyncReader_GetOutputProps, - WMSyncReader_SetOutputProps, - WMSyncReader_GetOutputFormatCount, - WMSyncReader_GetOutputFormat, - WMSyncReader_GetOutputNumberForStream, - WMSyncReader_GetStreamNumberForOutput, - WMSyncReader_GetMaxOutputSampleSize, - WMSyncReader_GetMaxStreamSampleSize, - WMSyncReader_OpenStream, - WMSyncReader2_SetRangeByTimecode, - WMSyncReader2_SetRangeByFrameEx, - WMSyncReader2_SetAllocateForOutput, - WMSyncReader2_GetAllocateForOutput, - WMSyncReader2_SetAllocateForStream, - WMSyncReader2_GetAllocateForStream -}; - -HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader) -{ - WMSyncReader *sync; - - TRACE("(%p, %x, %p)\n", pcert, rights, syncreader); - - sync = heap_alloc(sizeof(*sync)); - - if (!sync) - return E_OUTOFMEMORY; - - sync->IWMSyncReader2_iface.lpVtbl = &WMSyncReader2Vtbl; - sync->ref = 1; - - *syncreader = (IWMSyncReader *)&sync->IWMSyncReader2_iface; - - return S_OK; -} - -HRESULT WINAPI WMCreateSyncReaderPriv(IWMSyncReader **syncreader) -{ - return WMCreateSyncReader(NULL, 0, syncreader); -} diff --git a/dlls/wmvcore/syncreader.c b/dlls/wmvcore/syncreader.c new file mode 100644 index 00000000000..c3176e61ddb --- /dev/null +++ b/dlls/wmvcore/syncreader.c @@ -0,0 +1,337 @@ +/* + * Copyright 2012 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wmvcore.h" + +#include "wmsdk.h" +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); + +typedef struct { + IWMSyncReader2 IWMSyncReader2_iface; + LONG ref; +} WMSyncReader; + +static inline WMSyncReader *impl_from_IWMSyncReader2(IWMSyncReader2 *iface) +{ + return CONTAINING_RECORD(iface, WMSyncReader, IWMSyncReader2_iface); +} + +static HRESULT WINAPI WMSyncReader_QueryInterface(IWMSyncReader2 *iface, REFIID riid, void **ppv) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IWMSyncReader2_iface; + }else if(IsEqualGUID(riid, &IID_IWMSyncReader)) { + TRACE("(%p)->(IID_IWMSyncReader %p)\n", This, ppv); + *ppv = &This->IWMSyncReader2_iface; + }else if(IsEqualGUID(riid, &IID_IWMSyncReader2)) { + TRACE("(%p)->(IID_IWMSyncReader2 %p)\n", This, ppv); + *ppv = &This->IWMSyncReader2_iface; + }else { + *ppv = NULL; + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WMSyncReader_AddRef(IWMSyncReader2 *iface) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI WMSyncReader_Release(IWMSyncReader2 *iface) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI WMSyncReader_Close(IWMSyncReader2 *iface) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p): stub!\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_GetMaxOutputSampleSize(IWMSyncReader2 *iface, DWORD output, DWORD *max) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%d %p): stub!\n", This, output, max); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_GetMaxStreamSampleSize(IWMSyncReader2 *iface, WORD stream, DWORD *max) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%d %p): stub!\n", This, stream, max); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_GetNextSample(IWMSyncReader2 *iface, WORD stream, INSSBuffer **sample, + QWORD *sample_time, QWORD *sample_duration, DWORD *flags, DWORD *output_num, WORD *stream_num) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%d %p %p %p %p %p %p): stub!\n", This, stream, sample, sample_time, + sample_duration, flags, output_num, stream_num); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_GetOutputCount(IWMSyncReader2 *iface, DWORD *outputs) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%p): stub!\n", This, outputs); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_GetOutputFormat(IWMSyncReader2 *iface, DWORD output_num, DWORD format_num, + IWMOutputMediaProps **props) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%u %u %p): stub!\n", This, output_num, format_num, props); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_GetOutputFormatCount(IWMSyncReader2 *iface, DWORD output_num, DWORD *formats) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%u %p): stub!\n", This, output_num, formats); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_GetOutputNumberForStream(IWMSyncReader2 *iface, WORD stream_num, DWORD *output_num) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%u %p): stub!\n", This, stream_num, output_num); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_GetOutputProps(IWMSyncReader2 *iface, DWORD output_num, IWMOutputMediaProps **output) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%u %p): stub!\n", This, output_num, output); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_GetOutputSetting(IWMSyncReader2 *iface, DWORD output_num, const WCHAR *name, + WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%u %s %p %p %p): stub!\n", This, output_num, debugstr_w(name), type, value, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_GetReadStreamSamples(IWMSyncReader2 *iface, WORD stream_num, BOOL *compressed) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%d %p): stub!\n", This, stream_num, compressed); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_GetStreamNumberForOutput(IWMSyncReader2 *iface, DWORD output, WORD *stream_num) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%u %p): stub!\n", This, output, stream_num); + return S_OK; +} + +static HRESULT WINAPI WMSyncReader_GetStreamSelected(IWMSyncReader2 *iface, WORD stream_num, WMT_STREAM_SELECTION *selection) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%d %p): stub!\n", This, stream_num, selection); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_Open(IWMSyncReader2 *iface, const WCHAR *filename) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%s): stub!\n", This, debugstr_w(filename)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_OpenStream(IWMSyncReader2 *iface, IStream *stream) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%p): stub!\n", This, stream); + return S_OK; +} + +static HRESULT WINAPI WMSyncReader_SetOutputProps(IWMSyncReader2 *iface, DWORD output_num, IWMOutputMediaProps *output) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%u %p): stub!\n", This, output_num, output); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_SetOutputSetting(IWMSyncReader2 *iface, DWORD output_num, const WCHAR *name, + WMT_ATTR_DATATYPE type, const BYTE *value, WORD length) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%d %s %d %p %d): stub!\n", This, output_num, debugstr_w(name), type, value, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_SetRange(IWMSyncReader2 *iface, QWORD start, LONGLONG duration) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%s %s): stub!\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_SetRangeByFrame(IWMSyncReader2 *iface, WORD stream_num, QWORD frame_num, + LONGLONG frames) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%d %s %s): stub!\n", This, stream_num, wine_dbgstr_longlong(frame_num), wine_dbgstr_longlong(frames)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_SetReadStreamSamples(IWMSyncReader2 *iface, WORD stream_num, BOOL compressed) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%u %x): stub!\n", This, stream_num, compressed); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_SetStreamsSelected(IWMSyncReader2 *iface, WORD stream_count, + WORD *stream_numbers, WMT_STREAM_SELECTION *selections) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%d %p %p): stub!\n", This, stream_count, stream_numbers, selections); + return S_OK; +} + +static HRESULT WINAPI WMSyncReader2_SetRangeByTimecode(IWMSyncReader2 *iface, WORD stream_num, + WMT_TIMECODE_EXTENSION_DATA *start, WMT_TIMECODE_EXTENSION_DATA *end) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%u %p %p): stub!\n", This, stream_num, start, end); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader2_SetRangeByFrameEx(IWMSyncReader2 *iface, WORD stream_num, QWORD frame_num, + LONGLONG frames_to_read, QWORD *starttime) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%u %s %s %p): stub!\n", This, stream_num, wine_dbgstr_longlong(frame_num), + wine_dbgstr_longlong(frames_to_read), starttime); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader2_SetAllocateForOutput(IWMSyncReader2 *iface, DWORD output_num, IWMReaderAllocatorEx *allocator) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%d %p): stub!\n", This, output_num, allocator); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader2_GetAllocateForOutput(IWMSyncReader2 *iface, DWORD output_num, IWMReaderAllocatorEx **allocator) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%d %p): stub!\n", This, output_num, allocator); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader2_SetAllocateForStream(IWMSyncReader2 *iface, DWORD stream_num, IWMReaderAllocatorEx *allocator) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%d %p): stub!\n", This, stream_num, allocator); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader2_GetAllocateForStream(IWMSyncReader2 *iface, DWORD stream_num, IWMReaderAllocatorEx **allocator) +{ + WMSyncReader *This = impl_from_IWMSyncReader2(iface); + FIXME("(%p)->(%d %p): stub!\n", This, stream_num, allocator); + return E_NOTIMPL; +} + +static const IWMSyncReader2Vtbl WMSyncReader2Vtbl = { + WMSyncReader_QueryInterface, + WMSyncReader_AddRef, + WMSyncReader_Release, + WMSyncReader_Open, + WMSyncReader_Close, + WMSyncReader_SetRange, + WMSyncReader_SetRangeByFrame, + WMSyncReader_GetNextSample, + WMSyncReader_SetStreamsSelected, + WMSyncReader_GetStreamSelected, + WMSyncReader_SetReadStreamSamples, + WMSyncReader_GetReadStreamSamples, + WMSyncReader_GetOutputSetting, + WMSyncReader_SetOutputSetting, + WMSyncReader_GetOutputCount, + WMSyncReader_GetOutputProps, + WMSyncReader_SetOutputProps, + WMSyncReader_GetOutputFormatCount, + WMSyncReader_GetOutputFormat, + WMSyncReader_GetOutputNumberForStream, + WMSyncReader_GetStreamNumberForOutput, + WMSyncReader_GetMaxOutputSampleSize, + WMSyncReader_GetMaxStreamSampleSize, + WMSyncReader_OpenStream, + WMSyncReader2_SetRangeByTimecode, + WMSyncReader2_SetRangeByFrameEx, + WMSyncReader2_SetAllocateForOutput, + WMSyncReader2_GetAllocateForOutput, + WMSyncReader2_SetAllocateForStream, + WMSyncReader2_GetAllocateForStream +}; + +HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader) +{ + WMSyncReader *sync; + + TRACE("(%p, %x, %p)\n", pcert, rights, syncreader); + + sync = heap_alloc(sizeof(*sync)); + + if (!sync) + return E_OUTOFMEMORY; + + sync->IWMSyncReader2_iface.lpVtbl = &WMSyncReader2Vtbl; + sync->ref = 1; + + *syncreader = (IWMSyncReader *)&sync->IWMSyncReader2_iface; + + return S_OK; +} + +HRESULT WINAPI WMCreateSyncReaderPriv(IWMSyncReader **syncreader) +{ + return WMCreateSyncReader(NULL, 0, syncreader); +} -- 2.30.1

1 2

[PATCH vkd3d 1/5] vkd3d-shader: Use %empty.
by Zebediah Figura 05 Mar '21

05 Mar '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1341de13..50aeeab4 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1714,7 +1714,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t %% hlsl_prog: - /* empty */ + %empty | hlsl_prog func_declaration { const struct hlsl_ir_function_decl *decl; @@ -1833,7 +1833,7 @@ any_identifier: | NEW_IDENTIFIER fields_list: - /* empty */ + %empty { if (!($$ = make_empty_list())) YYABORT; @@ -1930,7 +1930,7 @@ compound_statement: } scope_start: - /* empty */ + %empty { hlsl_push_scope(ctx); } @@ -1940,7 +1940,7 @@ var_identifier: | NEW_IDENTIFIER colon_attribute: - /* empty */ + %empty { $$.semantic = NULL; $$.reg_reservation = NULL; @@ -2030,7 +2030,7 @@ parameter: } input_mods: - /* empty */ + %empty { $$ = 0; } @@ -2206,7 +2206,7 @@ declaration: } variables_def_optional: - /* empty */ + %empty { $$ = NULL; } @@ -2247,7 +2247,7 @@ variable_def: } array: - /* empty */ + %empty { $$ = 0; } @@ -2274,7 +2274,7 @@ array: } var_modifiers: - /* empty */ + %empty { $$ = 0; } -- 2.30.1

5 18

[PATCH] d3dx9/tests: Remove the fallback NAN definition.
by Zebediah Figura 05 Mar '21

05 Mar '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3dx9_36/tests/mesh.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 42deb32b934..e981f3623ce 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -29,16 +29,6 @@ #include "rmxftmpl.h" #include "rmxfguid.h" -#ifndef NAN -/* From wine/port.h */ -static inline float __port_nan(void) -{ - static const unsigned __nan_bytes = 0x7fc00000; - return *(const float *)&__nan_bytes; -} -#define NAN __port_nan() -#endif - /* Set the WINETEST_DEBUG environment variable to be greater than 1 for verbose * function call traces of ID3DXAllocateHierarchy callbacks. */ #define TRACECALLBACK if(winetest_debug > 1) trace -- 2.20.1

2 1

[PATCH 1/9] dwrite/tests: Test IDWriteTextFormat with nonexistent font
by Giovanni Mascellani 05 Mar '21

05 Mar '21

From: Lucian Poston <lucianposton(a)pm.me> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/dwrite/tests/layout.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index cc4079faa14..35d54ae41f0 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -3356,6 +3356,43 @@ todo_wine ok(metrics.lineCount == 1, "Unexpected line count %u.\n", metrics.lineCount); IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); + + /* nonexistent font */ + hr = IDWriteFactory_CreateTextFormat(factory, L"Blah!", NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, L"en-us", &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, L"A", 4, format, 500.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(count == 4, "got %u\n", count); + for (i = 0, width = 0.0; i < count; i++) + width += clusters[i].width; + + memset(&metrics, 0xcc, sizeof(metrics)); + hr = IDWriteTextLayout_GetMetrics(layout, &metrics); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(metrics.left == 0.0, "got %.2f\n", metrics.left); + ok(metrics.top == 0.0, "got %.2f\n", metrics.top); + ok(metrics.width == width, "got %.2f, expected %.2f\n", metrics.width, width); + ok(metrics.widthIncludingTrailingWhitespace == width, "got %.2f, expected %.2f\n", + metrics.widthIncludingTrailingWhitespace, width); +todo_wine + ok(metrics.height > 0.0, "got %.2f\n", metrics.height); + ok(metrics.layoutWidth == 500.0, "got %.2f\n", metrics.layoutWidth); + ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight); + ok(metrics.maxBidiReorderingDepth == 1, "got %u\n", metrics.maxBidiReorderingDepth); +todo_wine + ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount); + + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); } -- 2.30.1

2 11

[tools] testbot/LogUtils: Fix handling of subtest lines.
by Francois Gouget 05 Mar '21

05 Mar '21

Add support for garbled subtest lines. Let _CheckUnit() issue an error if they are misplaced. This also ensure the error message contains all the necessary information, such as the module name. Take the subtest line into account even if it looks like it is misplaced: the _CheckUnit() error is sufficient to indicate something is wrong. Tweak the _CheckUnit() message since subtest lines are not really "messages". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 19 +++++++------------ testbot/src/reporttest/report.testwtbs | 8 ++++---- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 4e9b733c0..ed5dd74d4 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -381,7 +381,7 @@ sub _CheckUnit($$$$) # Only report the first misplaced message to avoid duplicate errors. if (!$Cur->{Units}->{$Unit} and $Cur->{Unit} ne "" and !$Cur->{IsBroken}) { - _AddExtra($LogInfo, "contains a misplaced $Type message for $Unit", $Cur); + _AddExtra($LogInfo, "contains a misplaced $Type line for $Unit", $Cur); $Cur->{IsBroken} = 1; } } @@ -557,19 +557,14 @@ sub ParseWineTestReport($$$) $Cur->{GroupLineNo} = $LineNo; $Cur->{Group} = undef; } - elsif ($Line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)$/) + elsif (($Cur->{Unit} ne "" and + $Line =~ /($Cur->{UnitsRE})\.c:\d+: Subtest ([_a-z0-9]+)/) or + $Line =~ /^([_a-z0-9]+)\.c:\d+: Subtest ([_a-z0-9]+)/) { my ($Unit, $SubUnit) = ($1, $2); - if ($Cur->{Units}->{$Unit}) - { - $Cur->{Units}->{$SubUnit} = 1; - $Cur->{UnitsRE} = join("|", keys %{$Cur->{Units}}); - } - else - { - _AddExtra($LogInfo, "$Unit has a misplaced $SubUnit subtest line"); - } - $LogInfo->{IsWineTest} = 1; + _CheckUnit($LogInfo, $Cur, $Unit, "$SubUnit subtest"); + $Cur->{Units}->{$SubUnit} = 1; + $Cur->{UnitsRE} = join("|", keys %{$Cur->{Units}}); } elsif (($Cur->{Unit} ne "" and $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test (?:failed|succeeded inside todo block): /) or diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index 27ca12f1d..eefbbc0c4 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -80,7 +80,7 @@ n 0 advapi32:registry has no test summary line (early exit of the main process?) n 0 advapi32:service returned success despite having failures n 0 amstream:amstream has unaccounted for failure messages n 0 amstream:amstream returned success despite having failures -n 0 atl:registrar contains a misplaced test summary message for alien +n 0 atl:registrar contains a misplaced test summary line for alien n 0 browseui:progressdlg has unaccounted for skip messages n 0 cabinet:extract is missing some skip messages n 0 cmd.exe:batch has unaccounted for todo messages @@ -90,13 +90,13 @@ n 0 comctl32:dpa returned a non-zero exit code despite reporting no failures n 0 comctl32:header returned success despite having failures n 0 comctl32:ipaddress has no done line (or it is garbled) n 0 comctl32:misc had no start line (or it is garbled) -n 0 comctl32:monthcal contains a misplaced todo message for security +n 0 comctl32:monthcal contains a misplaced todo line for security n 0 comctl32:propsheet has no test summary line (early exit of the main process?) n 0 comctl32:rebar returned success despite having failures n 0 comctl32:toolbar has no done line (or it is garbled) n 0 comctl32:treeview returned success despite having failures -n 0 comctl32:updown contains a misplaced failure message for vorlon -n 0 shadow has a misplaced black subtest line +n 0 comctl32:updown contains a misplaced failure line for vorlon +n 0 comdlg32:filedlg contains a misplaced black subtest line for shadow n 0 xmllite:writer has unaccounted for failure messages n 0 xmllite:writer returned success despite having failures ----- TestWTBS ----- -- 2.20.1

1 0

[tools] winetest/dissect: Fix handling of subtest lines.
by Francois Gouget 05 Mar '21

05 Mar '21

Add support for garbled subtest lines. Link to the corresponding source line. Call add_test_line() so they show up in the HTML-ized report. Let check_unit() issue an error if they are misplaced. Tweak the check_unit() message since subtest lines are not really "messages". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 7f4f3271d..797c204b3 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -480,7 +480,7 @@ sub check_unit($$) my ($l_unit, $l_type) = @_; if (!$units{$l_unit} and !$broken) { - add_test_line("end", "Misplaced $l_type message"); + add_test_line("end", "Misplaced $l_type line"); $extra_failures++; $broken = 1; } @@ -609,19 +609,17 @@ while ($line = <IN>) { $rc = 0; } } - elsif ($line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)$/) + elsif (($unit ne "" and + $line =~ /^(.*?)($units_re)\.c:(\d+): (Subtest ([_.a-z0-9-]+).*)$/) or + $line =~ /^()([_a-z0-9]+)\.c:(\d+): (Subtest ([_.a-z0-9-]+).*)$/) { - my ($l_unit, $l_subunit) = ($1, $2); - if ($units{$l_unit}) - { - $units{$l_subunit} = 1; - $units_re = join("|", keys %units); - } - else - { - add_test_line("end", "$l_unit has a misplaced $l_subunit subtest line\n"); - $extra_failures++; - } + my ($pollution, $l_unit, $l_num, $l_text, $l_subunit) = ($1, $2, $3, $4, $5); + add_test_line("trace", escapeHTML($pollution) . + get_source_link($l_unit, $l_num) .": ". + escapeHTML($l_text)); + check_unit($l_unit, "subtest"); + $units{$l_subunit} = 1; + $units_re = join("|", keys %units); } elsif (($unit ne "" and $line =~ /^(.*?)($units_re)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/) or -- 2.20.1

1 0

[tools] testbot/LogUtils: Simplify matching the WineRun* errors.
by Francois Gouget 05 Mar '21

05 Mar '21

They now start with the script name and the ':error:' prefix. Remove the 'Could not create' regexp since it actually corresponds to a VM-side 'Task:' error which is already taken into account. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index bdba8dad0..4e9b733c0 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -106,11 +106,8 @@ sub GetLogLineCategory($) $Line =~ /^Task: / or # Typical perl errors _IsPerlError($Line) or - # The main testbot.log errors - $Line =~ /^An error occurred while / or - $Line =~ /^Could not create / or - $Line =~ /^Giving up after \d+ run$s$$/ or - $Line =~ /^The (?:build|task) timed out$/) + # The testbot.log errors + $Line =~ /:error: /) { return "error"; } -- 2.20.1

1 0

[PATCH] po: Update Dutch translation
by Floris Renaud 05 Mar '21

05 Mar '21

Add aclui translation and fix typo in winecfg Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/po/nl.po b/po/nl.po index 7f33637cf23..9ada91f8700 100644 --- a/po/nl.po +++ b/po/nl.po @@ -19,26 +19,20 @@ msgid "Security" msgstr "Beveiliging" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "&Gebruikersnaam:" +msgstr "&Groeps- of gebruikersnamen:" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "Geel" +msgstr "Toestaan" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Weigeren" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Permission denied" msgid "Permissions for %1" -msgstr "Toegang geweigerd" +msgstr "Rechten voor %1" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -16169,7 +16163,7 @@ msgid "" "or per-application settings in those tabs as well." msgstr "" "Voor elk programma kan Wine apart de Windows versie instellen. Dit tabblad " -"isgekoppeld aan de tabbladen 'Bibliotheken' en 'Grafisch'. Hierdoor kan per " +"is gekoppeld aan de tabbladen 'Bibliotheken' en 'Grafisch'. Hierdoor kan per " "programma de standaardinstellingen of programmaspecifieke instellingen " "gebruikt worden." -- 2.30.1

1 0