wine-commits August 2019

wine-commits@winehq.org

2 participants
703 discussions

Henri Verbeet : wined3d: Upload buffer ranges through buffer ops.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: ac7ca87a68ffb43e358b3950fcd135575a28dfeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac7ca87a68ffb43e358b3950… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 8 03:35:07 2019 +0430 wined3d: Upload buffer ranges through buffer ops. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 59 +++++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 7 +++++ 2 files changed, 40 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2a4725e..a2908bf 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -535,25 +535,6 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) return refcount; } -/* Context activation is done by the caller. */ -static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context, - const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) -{ - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - const struct wined3d_map_range *range; - - wined3d_buffer_gl_bind(buffer_gl, context_gl); - - while (range_count--) - { - range = &ranges[range_count]; - GL_EXTCALL(glBufferSubData(buffer_gl->buffer_type_hint, - range->offset, range->size, (BYTE *)data + range->offset - data_offset)); - } - checkGLcall("glBufferSubData"); -} - static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined3d_context *context) { unsigned int i, j, range_idx, start, end, vertex_count; @@ -605,8 +586,8 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined } } - wined3d_buffer_gl_upload_ranges(wined3d_buffer_gl(buffer), - context, data, 0, buffer->modified_areas, buffer->maps); + buffer->buffer_ops->buffer_upload_ranges(buffer, context, + data, 0, buffer->modified_areas, buffer->maps); heap_free(data); } @@ -691,8 +672,8 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, case WINED3D_LOCATION_BUFFER: if (!buffer->conversion_map) - wined3d_buffer_gl_upload_ranges(buffer_gl, context, buffer->resource.heap_memory, - 0, buffer->modified_areas, buffer->maps); + buffer->buffer_ops->buffer_upload_ranges(buffer, context, + buffer->resource.heap_memory, 0, buffer->modified_areas, buffer->maps); else buffer_conversion_upload(buffer, context); break; @@ -1250,7 +1231,7 @@ void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_co range.size = buffer->resource.size; } - wined3d_buffer_gl_upload_ranges(wined3d_buffer_gl(buffer), context, data, range.offset, 1, &range); + buffer->buffer_ops->buffer_upload_ranges(buffer, context, data, range.offset, 1, &range); } static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, @@ -1366,7 +1347,7 @@ static GLenum buffer_type_hint_from_bind_flags(const struct wined3d_gl_info *gl_ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, - void *parent, const struct wined3d_parent_ops *parent_ops) + void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_buffer_ops *buffer_ops) { const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, desc->bind_flags); const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; @@ -1399,6 +1380,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d WARN("Failed to initialize resource, hr %#x.\n", hr); return hr; } + buffer->buffer_ops = buffer_ops; buffer->structure_byte_stride = desc->structure_byte_stride; buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; @@ -1461,6 +1443,31 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d return WINED3D_OK; } +/* Context activation is done by the caller. */ +static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, + const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) +{ + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + const struct wined3d_map_range *range; + + wined3d_buffer_gl_bind(buffer_gl, context_gl); + + while (range_count--) + { + range = &ranges[range_count]; + GL_EXTCALL(glBufferSubData(buffer_gl->buffer_type_hint, + range->offset, range->size, (BYTE *)data + range->offset - data_offset)); + } + checkGLcall("buffer upload"); +} + +static const struct wined3d_buffer_ops wined3d_buffer_gl_ops = +{ + wined3d_buffer_gl_upload_ranges, +}; + HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) @@ -1480,7 +1487,7 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct object->buffer_type_hint = buffer_type_hint_from_bind_flags(gl_info, desc->bind_flags); - if (FAILED(hr = wined3d_buffer_init(&object->b, device, desc, data, parent, parent_ops))) + if (FAILED(hr = wined3d_buffer_init(&object->b, device, desc, data, parent, parent_ops, &wined3d_buffer_gl_ops))) { WARN("Failed to initialize buffer, hr %#x.\n", hr); heap_free(object); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 00ed6dc..8dbf255 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4043,9 +4043,16 @@ struct wined3d_map_range UINT size; }; +struct wined3d_buffer_ops +{ + void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, + unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges); +}; + struct wined3d_buffer { struct wined3d_resource resource; + const struct wined3d_buffer_ops *buffer_ops; unsigned int structure_byte_stride; DWORD flags;

1 0

Henri Verbeet : wined3d: Setup and tear down the shader backend for the Vulkan adapter.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 3ab6b8293229bfeec31a74e6f514681ab91b4cef URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ab6b8293229bfeec31a74e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 8 03:35:06 2019 +0430 wined3d: Setup and tear down the shader backend for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 50f173f..cdb5c97 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -413,9 +413,18 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) return hr; } + if (FAILED(hr = device->shader_backend->shader_alloc_private(device, + device->adapter->vertex_pipe, device->adapter->fragment_pipe))) + { + ERR("Failed to allocate shader private data, hr %#x.\n", hr); + wined3d_context_vk_cleanup(context_vk); + return hr; + } + if (!device_context_add(device, &context_vk->c)) { ERR("Failed to add the newly created context to the context list.\n"); + device->shader_backend->shader_free_private(device, NULL); wined3d_context_vk_cleanup(context_vk); return E_FAIL; } @@ -426,6 +435,7 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) { ERR("Failed to create CPU blitter.\n"); device_context_remove(device, &context_vk->c); + device->shader_backend->shader_free_private(device, NULL); wined3d_context_vk_cleanup(context_vk); return E_FAIL; } @@ -436,13 +446,20 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) static void adapter_vk_uninit_3d(struct wined3d_device *device) { struct wined3d_context_vk *context_vk; + struct wined3d_shader *shader; TRACE("device %p.\n", device); + LIST_FOR_EACH_ENTRY(shader, &device->shaders, struct wined3d_shader, shader_list_entry) + { + device->shader_backend->shader_destroy(shader); + } + device->blitter->ops->blitter_destroy(device->blitter, NULL); context_vk = &wined3d_device_vk(device)->context_vk; device_context_remove(device, &context_vk->c); + device->shader_backend->shader_free_private(device, NULL); wined3d_context_vk_cleanup(context_vk); }

1 0

Henri Verbeet : wined3d: Introduce a structure for Vulkan context information.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: f654f983fa388f77fc2940f7c80fbb67fca28c2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f654f983fa388f77fc2940f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 8 03:35:05 2019 +0430 wined3d: Introduce a structure for Vulkan context information. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 35 +++++++++-------------------------- dlls/wined3d/context.c | 9 +++++++-- dlls/wined3d/wined3d_private.h | 25 ++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index a309847..50f173f 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -24,23 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); -struct wined3d_device_vk -{ - struct wined3d_device d; - - struct wined3d_context context_vk; - - VkDevice vk_device; - VkQueue vk_queue; - - struct wined3d_vk_info vk_info; -}; - -static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device *device) -{ - return CONTAINING_RECORD(device, struct wined3d_device_vk, d); -} - static inline const struct wined3d_adapter_vk *wined3d_adapter_vk_const(const struct wined3d_adapter *adapter) { return CONTAINING_RECORD(adapter, struct wined3d_adapter_vk, a); @@ -300,7 +283,7 @@ struct wined3d_context *adapter_vk_acquire_context(struct wined3d_device *device if (!device->context_count) return NULL; - return &wined3d_device_vk(device)->context_vk; + return &wined3d_device_vk(device)->context_vk.c; } void adapter_vk_release_context(struct wined3d_context *context) @@ -416,8 +399,8 @@ static BOOL adapter_vk_check_format(const struct wined3d_adapter *adapter, static HRESULT adapter_vk_init_3d(struct wined3d_device *device) { + struct wined3d_context_vk *context_vk; struct wined3d_device_vk *device_vk; - struct wined3d_context *context_vk; HRESULT hr; TRACE("device %p.\n", device); @@ -430,10 +413,10 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) return hr; } - if (!device_context_add(device, context_vk)) + if (!device_context_add(device, &context_vk->c)) { ERR("Failed to add the newly created context to the context list.\n"); - wined3d_context_cleanup(context_vk); + wined3d_context_vk_cleanup(context_vk); return E_FAIL; } @@ -442,8 +425,8 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) 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); + device_context_remove(device, &context_vk->c); + wined3d_context_vk_cleanup(context_vk); return E_FAIL; } @@ -452,15 +435,15 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) static void adapter_vk_uninit_3d(struct wined3d_device *device) { - struct wined3d_context *context_vk; + struct wined3d_context_vk *context_vk; 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); + device_context_remove(device, &context_vk->c); + wined3d_context_vk_cleanup(context_vk); } static HRESULT adapter_vk_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2509d90..8a6cd5c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1493,6 +1493,11 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) wined3d_context_cleanup(&context_gl->c); } +void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) +{ + wined3d_context_cleanup(&context_vk->c); +} + DWORD context_get_tls_idx(void) { return wined3d_context_tls_idx; @@ -2295,11 +2300,11 @@ fail: return E_FAIL; } -HRESULT wined3d_context_vk_init(struct wined3d_context *context_vk, struct wined3d_swapchain *swapchain) +HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) { TRACE("context_vk %p, swapchain %p.\n", context_vk, swapchain); - wined3d_context_init(context_vk, swapchain); + wined3d_context_init(&context_vk->c, swapchain); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e63d5e6..00ed6dc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2127,7 +2127,13 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) DECLSPEC_HIDDEN; -HRESULT wined3d_context_vk_init(struct wined3d_context *context_vk, +struct wined3d_context_vk +{ + struct wined3d_context c; +}; + +void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; typedef void (*APPLYSTATEFUNC)(struct wined3d_context *ctx, const struct wined3d_state *state, DWORD state_id); @@ -3287,6 +3293,23 @@ static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_gl, d); } +struct wined3d_device_vk +{ + struct wined3d_device d; + + struct wined3d_context_vk context_vk; + + VkDevice vk_device; + VkQueue vk_queue; + + struct wined3d_vk_info vk_info; +}; + +static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device *device) +{ + return CONTAINING_RECORD(device, struct wined3d_device_vk, d); +} + static inline BOOL isStateDirty(const struct wined3d_context *context, unsigned int state_id) { unsigned int idx = state_id / (sizeof(*context->dirty_graphics_states) * CHAR_BIT);

1 0

Henri Verbeet : wined3d: Make the adapter responsible for swapchain creation and destruction.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 7170f67456c98f8ae62ec3ffb3c362d2896cea29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7170f67456c98f8ae62ec3ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 8 03:35:04 2019 +0430 wined3d: Make the adapter responsible for swapchain creation and destruction. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 33 ++++++++++++++++ dlls/wined3d/adapter_vk.c | 33 ++++++++++++++++ dlls/wined3d/directx.c | 33 ++++++++++++++++ dlls/wined3d/swapchain.c | 90 +++++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 16 ++++++++ 5 files changed, 173 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7170f67456c98f8ae62e…

1 0

Alexey Prokhin : xinput: Fix vibration capabilities.
by Alexandre Julliard 07 Aug '19

07 Aug '19

Module: wine Branch: master Commit: 9855fbe252ff3664d879e8cd9f5d1ea879af47dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=9855fbe252ff3664d879e8cd… Author: Alexey Prokhin <alexey(a)prokhin.ru> Date: Wed Aug 7 19:51:35 2019 +0300 xinput: Fix vibration capabilities. wLeftMotorSpeed and wRightMotorSpeed returned by XInputGetCapabilities are supposed to be resolutions rather than current motor speeds. This fixes rumble in Far Cry 5. Signed-off-by: Alexey Prokhin <alexey(a)prokhin.ru> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 10 +++++++--- dlls/xinput1_3/xinput_private.h | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index aa46f35..38c93be 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -173,7 +173,11 @@ static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA ppd, XINPUT_CAPABILITIES *xinput_ value_caps_count = caps->NumberOutputValueCaps; if (value_caps_count > 0) + { xinput_caps->Flags |= XINPUT_CAPS_FFB_SUPPORTED; + xinput_caps->Vibration.wLeftMotorSpeed = 255; + xinput_caps->Vibration.wRightMotorSpeed = 255; + } return TRUE; } @@ -456,8 +460,8 @@ DWORD HID_set_state(xinput_controller* device, XINPUT_VIBRATION* state) if (device->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) { - device->caps.Vibration.wLeftMotorSpeed = state->wLeftMotorSpeed; - device->caps.Vibration.wRightMotorSpeed = state->wRightMotorSpeed; + device->vibration.wLeftMotorSpeed = state->wLeftMotorSpeed; + device->vibration.wRightMotorSpeed = state->wRightMotorSpeed; if (private->enabled) { @@ -498,7 +502,7 @@ void HID_enable(xinput_controller* device, BOOL enable) } else if (!private->enabled && enable) { - HID_set_state(device, &device->caps.Vibration); + HID_set_state(device, &device->vibration); } LeaveCriticalSection(&private->crit); } diff --git a/dlls/xinput1_3/xinput_private.h b/dlls/xinput1_3/xinput_private.h index 00888f4..d6e0e96 100644 --- a/dlls/xinput1_3/xinput_private.h +++ b/dlls/xinput1_3/xinput_private.h @@ -23,6 +23,7 @@ typedef struct _xinput_controller XINPUT_CAPABILITIES caps; void *platform_private; XINPUT_STATE state; + XINPUT_VIBRATION vibration; } xinput_controller;

1 0

Alex Henrie : ntoskrnl: Add MmIsThisAnNtAsSystem().
by Alexandre Julliard 07 Aug '19

07 Aug '19

Module: wine Branch: master Commit: 433c14b06442eaa63d58af2561c96847228f4fb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=433c14b06442eaa63d58af25… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 1 23:49:33 2019 -0600 ntoskrnl: Add MmIsThisAnNtAsSystem(). This function returns FALSE on all server and non-server versions of Windows since XP except for Windows Server 2003. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47578 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 40c18d8..6488e52 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2971,6 +2971,14 @@ PVOID WINAPI MmGetSystemRoutineAddress(PUNICODE_STRING SystemRoutineName) return pFunc; } +/*********************************************************************** + * MmIsThisAnNtAsSystem (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI MmIsThisAnNtAsSystem(void) +{ + TRACE("\n"); + return FALSE; +} /*********************************************************************** * MmQuerySystemSize (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 359e2d9..a3704a5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -699,7 +699,7 @@ @ stub MmIsDriverVerifying @ stub MmIsNonPagedSystemAddressValid @ stub MmIsRecursiveIoFault -@ stub MmIsThisAnNtAsSystem +@ stdcall MmIsThisAnNtAsSystem() @ stub MmIsVerifierEnabled @ stub MmLockPagableDataSection @ stub MmLockPagableImageSection

1 0

Zebediah Figura : quartz/tests: Add some tests for IGraphBuilder:: AddSourceFilter().
by Alexandre Julliard 07 Aug '19

07 Aug '19

Module: wine Branch: master Commit: 2538d56946f6dbecb3dde93c89769ce7cbbb3dd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2538d56946f6dbecb3dde93c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 6 14:58:37 2019 -0500 quartz/tests: Add some tests for IGraphBuilder::AddSourceFilter(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 236 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 213 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2538d56946f6dbecb3dd…

1 0

Zebediah Figura : quartz: Get rid of GetFileSourceFilter() and CreateFilterInstanceAndLoadFile().
by Alexandre Julliard 07 Aug '19

07 Aug '19

Module: wine Branch: master Commit: c11b6217045be6380310196534556648115e2603 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c11b6217045be63803101965… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 6 14:58:36 2019 -0500 quartz: Get rid of GetFileSourceFilter() and CreateFilterInstanceAndLoadFile(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 78 +++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 47 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 7fd3d83..f947327 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1655,68 +1655,52 @@ static HRESULT WINAPI FilterGraph2_RenderFile(IFilterGraph2 *iface, LPCWSTR lpcw return hr; } -static HRESULT CreateFilterInstanceAndLoadFile(GUID* clsid, LPCOLESTR pszFileName, IBaseFilter **filter) +static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, + const WCHAR *filename, const WCHAR *filter_name, IBaseFilter **ret_filter) { - IFileSourceFilter *source = NULL; - HRESULT hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)filter); - TRACE("CLSID: %s\n", debugstr_guid(clsid)); - if (FAILED(hr)) - return hr; + IFilterGraphImpl *graph = impl_from_IFilterGraph2(iface); + IFileSourceFilter *filesource; + IBaseFilter *filter; + HRESULT hr; + GUID clsid; - hr = IBaseFilter_QueryInterface(*filter, &IID_IFileSourceFilter, (LPVOID*)&source); - if (FAILED(hr)) + TRACE("graph %p, filename %s, filter_name %s, ret_filter %p.\n", + graph, debugstr_w(filename), debugstr_w(filter_name), ret_filter); + + if (!get_media_type(filename, NULL, NULL, &clsid)) + clsid = CLSID_AsyncReader; + TRACE("Using source filter %s.\n", debugstr_guid(&clsid)); + + if (FAILED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter))) { - IBaseFilter_Release(*filter); + WARN("Failed to create filter, hr %#x.\n", hr); return hr; } - /* Load the file in the file source filter */ - hr = IFileSourceFilter_Load(source, pszFileName, NULL); - IFileSourceFilter_Release(source); - if (FAILED(hr)) { - WARN("Load (%x)\n", hr); - IBaseFilter_Release(*filter); + if (FAILED(hr = IBaseFilter_QueryInterface(filter, &IID_IFileSourceFilter, (void **)&filesource))) + { + WARN("Failed to get IFileSourceFilter, hr %#x.\n", hr); + IBaseFilter_Release(filter); return hr; } - return hr; -} - -/* Some filters implement their own asynchronous reader (Theoretically they all should, try to load it first */ -static HRESULT GetFileSourceFilter(const WCHAR *filename, IBaseFilter **filter) -{ - GUID clsid; - if (!get_media_type(filename, NULL, NULL, &clsid)) - clsid = CLSID_AsyncReader; - return CreateFilterInstanceAndLoadFile(&clsid, filename, filter); -} - -static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR lpcwstrFileName, - LPCWSTR lpcwstrFilterName, IBaseFilter **ppFilter) -{ - IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); - HRESULT hr; - IBaseFilter* preader; - - TRACE("(%p/%p)->(%s, %s, %p)\n", This, iface, debugstr_w(lpcwstrFileName), debugstr_w(lpcwstrFilterName), ppFilter); - - /* Try from file name first, then fall back to default asynchronous reader */ - hr = GetFileSourceFilter(lpcwstrFileName, &preader); - if (FAILED(hr)) { - WARN("Unable to create file source filter (%x)\n", hr); + hr = IFileSourceFilter_Load(filesource, filename, NULL); + IFileSourceFilter_Release(filesource); + if (FAILED(hr)) + { + WARN("Failed to load file, hr %#x.\n", hr); return hr; } - hr = IFilterGraph2_AddFilter(iface, preader, lpcwstrFilterName); - if (FAILED(hr)) { - WARN("Unable add filter (%x)\n", hr); - IBaseFilter_Release(preader); + if (FAILED(hr = IFilterGraph2_AddFilter(iface, filter, filter_name))) + { + IBaseFilter_Release(filter); return hr; } - if (ppFilter) - *ppFilter = preader; - + if (ret_filter) + *ret_filter = filter; return S_OK; }

1 0

Zebediah Figura : quartz: Use file APIs directly in get_media_type().
by Alexandre Julliard 07 Aug '19

07 Aug '19

Module: wine Branch: master Commit: 26ac991c697fd5f3f384038a1e55a6f19179e36d URL: https://source.winehq.org/git/wine.git/?a=commit;h=26ac991c697fd5f3f384038a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 6 14:58:35 2019 -0500 quartz: Use file APIs directly in get_media_type(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 28 +++++++++++++------ dlls/quartz/filtergraph.c | 65 +++----------------------------------------- dlls/quartz/quartz_private.h | 2 +- 3 files changed, 24 insertions(+), 71 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index f3d9cd4..05c453a 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -129,10 +129,10 @@ static unsigned char byte_from_hex_char(WCHAR wHex) } } -static BOOL process_pattern_string(const WCHAR *pattern, IAsyncReader *reader) +static BOOL process_pattern_string(const WCHAR *pattern, HANDLE file) { + ULONG size, offset, i, ret_size; BYTE *mask, *expect, *actual; - ULONG size, offset, i; BOOL ret = TRUE; /* format: "offset, size, mask, value" */ @@ -181,7 +181,8 @@ static BOOL process_pattern_string(const WCHAR *pattern, IAsyncReader *reader) } actual = heap_alloc(size); - if (FAILED(IAsyncReader_SyncRead(reader, offset, size, actual))) + SetFilePointer(file, offset, NULL, FILE_BEGIN); + if (!ReadFile(file, actual, size, &ret_size, NULL) || ret_size != size) { heap_free(actual); heap_free(expect); @@ -204,13 +205,12 @@ static BOOL process_pattern_string(const WCHAR *pattern, IAsyncReader *reader) /* If there is a following tuple, then we must match that as well. */ if (ret && (pattern = wcschr(pattern, ','))) - return process_pattern_string(pattern + 1, reader); + return process_pattern_string(pattern + 1, file); return ret; } -BOOL get_media_type(IAsyncReader *reader, const WCHAR *filename, GUID *majortype, - GUID *subtype, GUID *source_clsid) +BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID *source_clsid) { WCHAR extensions_path[278] = {'M','e','d','i','a',' ','T','y','p','e','\\','E','x','t','e','n','s','i','o','n','s','\\',0}; static const WCHAR wszExtensions[] = {'E','x','t','e','n','s','i','o','n','s',0}; @@ -218,6 +218,7 @@ BOOL get_media_type(IAsyncReader *reader, const WCHAR *filename, GUID *majortype DWORD majortype_idx, size; const WCHAR *ext; HKEY parent_key; + HANDLE file; if ((ext = wcsrchr(filename, '.'))) { @@ -244,11 +245,18 @@ BOOL get_media_type(IAsyncReader *reader, const WCHAR *filename, GUID *majortype } } - if (!reader) + if ((file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE) + { + WARN("Failed to open file %s, error %u.\n", debugstr_w(filename), GetLastError()); return FALSE; + } if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszMediaType, 0, KEY_READ, &parent_key)) + { + CloseHandle(file); return FALSE; + } for (majortype_idx = 0; ; ++majortype_idx) { @@ -298,7 +306,7 @@ BOOL get_media_type(IAsyncReader *reader, const WCHAR *filename, GUID *majortype if (!wcscmp(value_name, source_filter_name)) continue; - if (!process_pattern_string(pattern, reader)) + if (!process_pattern_string(pattern, file)) continue; if (majortype) @@ -314,6 +322,7 @@ BOOL get_media_type(IAsyncReader *reader, const WCHAR *filename, GUID *majortype RegCloseKey(subtype_key); RegCloseKey(majortype_key); RegCloseKey(parent_key); + CloseHandle(file); return TRUE; } @@ -325,6 +334,7 @@ BOOL get_media_type(IAsyncReader *reader, const WCHAR *filename, GUID *majortype } RegCloseKey(parent_key); + CloseHandle(file); return FALSE; } @@ -503,7 +513,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi if (!pmt) { CopyMediaType(This->pmt, &default_mt); - if (get_media_type(&This->IAsyncReader_iface, pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL)) + if (get_media_type(pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL)) { TRACE("Found major type %s, subtype %s.\n", debugstr_guid(&This->pmt->majortype), debugstr_guid(&This->pmt->subtype)); diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 681ebad..7fd3d83 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1683,69 +1683,12 @@ static HRESULT CreateFilterInstanceAndLoadFile(GUID* clsid, LPCOLESTR pszFileNam } /* Some filters implement their own asynchronous reader (Theoretically they all should, try to load it first */ -static HRESULT GetFileSourceFilter(LPCOLESTR pszFileName, IBaseFilter **filter) +static HRESULT GetFileSourceFilter(const WCHAR *filename, IBaseFilter **filter) { - HRESULT hr; GUID clsid; - IAsyncReader * pReader = NULL; - IFileSourceFilter* pSource = NULL; - IPin * pOutputPin = NULL; - static const WCHAR wszOutputPinName[] = { 'O','u','t','p','u','t',0 }; - BOOL ret; - - /* Try to find a match without reading the file first */ - if (get_media_type(NULL, pszFileName, NULL, NULL, &clsid)) - return CreateFilterInstanceAndLoadFile(&clsid, pszFileName, filter); - - /* Now create a AyncReader instance, to check for signature bytes in the file */ - hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)filter); - if (FAILED(hr)) - return hr; - - hr = IBaseFilter_QueryInterface(*filter, &IID_IFileSourceFilter, (LPVOID *)&pSource); - if (FAILED(hr)) - { - IBaseFilter_Release(*filter); - return hr; - } - - hr = IFileSourceFilter_Load(pSource, pszFileName, NULL); - IFileSourceFilter_Release(pSource); - if (FAILED(hr)) - { - IBaseFilter_Release(*filter); - return hr; - } - - hr = IBaseFilter_FindPin(*filter, wszOutputPinName, &pOutputPin); - if (FAILED(hr)) - { - IBaseFilter_Release(*filter); - return hr; - } - - hr = IPin_QueryInterface(pOutputPin, &IID_IAsyncReader, (LPVOID *)&pReader); - IPin_Release(pOutputPin); - if (FAILED(hr)) - { - IBaseFilter_Release(*filter); - return hr; - } - - /* Try again find a match */ - ret = get_media_type(pReader, pszFileName, NULL, NULL, &clsid); - IAsyncReader_Release(pReader); - - if (ret) - { - TRACE("Found source filter %s.\n", debugstr_guid(&clsid)); - /* Release the AsyncReader filter and create the matching one */ - IBaseFilter_Release(*filter); - return CreateFilterInstanceAndLoadFile(&clsid, pszFileName, filter); - } - - /* Return the AsyncReader filter */ - return S_OK; + if (!get_media_type(filename, NULL, NULL, &clsid)) + clsid = CLSID_AsyncReader; + return CreateFilterInstanceAndLoadFile(&clsid, filename, filter); } static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR lpcwstrFileName, diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 92af231..874b29f 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -77,6 +77,6 @@ extern void video_unregister_windowclass(void) DECLSPEC_HIDDEN; BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, BOOL bWildcards); void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt) DECLSPEC_HIDDEN; -BOOL get_media_type(IAsyncReader *reader, const WCHAR *filename, GUID *majortype, GUID *subtype, GUID *source_clsid) DECLSPEC_HIDDEN; +BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID *source_clsid) DECLSPEC_HIDDEN; #endif /* __QUARTZ_PRIVATE_INCLUDED__ */

1 0

Zebediah Figura : quartz: Simplify error handling in process_pattern_string().
by Alexandre Julliard 07 Aug '19

07 Aug '19

Module: wine Branch: master Commit: 4555da1d7f3a64d5bb2ebf0c37c04271b003a8a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4555da1d7f3a64d5bb2ebf0c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 6 14:58:34 2019 -0500 quartz: Simplify error handling in process_pattern_string(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 126 ++++++++++++++++++++++------------------------- 1 file changed, 58 insertions(+), 68 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index d547c12..f3d9cd4 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -129,94 +129,84 @@ static unsigned char byte_from_hex_char(WCHAR wHex) } } -static HRESULT process_pattern_string(LPCWSTR wszPatternString, IAsyncReader * pReader) +static BOOL process_pattern_string(const WCHAR *pattern, IAsyncReader *reader) { - ULONG ulOffset; - ULONG ulBytes; - BYTE * pbMask; - BYTE * pbValue; - BYTE * pbFile; - HRESULT hr = S_OK; - ULONG strpos; - - /* format: "offset, bytestocompare, mask, value" */ - - ulOffset = wcstol(wszPatternString, NULL, 10); - - if (!(wszPatternString = wcschr(wszPatternString, ','))) - return E_INVALIDARG; + BYTE *mask, *expect, *actual; + ULONG size, offset, i; + BOOL ret = TRUE; - wszPatternString++; /* skip ',' */ + /* format: "offset, size, mask, value" */ - ulBytes = wcstol(wszPatternString, NULL, 10); + offset = wcstol(pattern, NULL, 10); - pbMask = HeapAlloc(GetProcessHeap(), 0, ulBytes); - pbValue = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ulBytes); - pbFile = HeapAlloc(GetProcessHeap(), 0, ulBytes); + if (!(pattern = wcschr(pattern, ','))) + return FALSE; + pattern++; - /* default mask is match everything */ - memset(pbMask, 0xFF, ulBytes); + size = wcstol(pattern, NULL, 10); + mask = heap_alloc(size); + expect = heap_alloc(size); + memset(mask, 0xff, size); - if (!(wszPatternString = wcschr(wszPatternString, ','))) - hr = E_INVALIDARG; + if (!(pattern = wcschr(pattern, ','))) + return FALSE; + pattern++; + while (!iswxdigit(*pattern) && (*pattern != ',')) + pattern++; - if (hr == S_OK) + for (i = 0; iswxdigit(*pattern) && (i/2 < size); pattern++, i++) { - wszPatternString++; /* skip ',' */ - while (!iswxdigit(*wszPatternString) && (*wszPatternString != ',')) wszPatternString++; + if (i % 2) + mask[i / 2] |= byte_from_hex_char(*pattern); + else + mask[i / 2] = byte_from_hex_char(*pattern) << 4; + } - for (strpos = 0; iswxdigit(*wszPatternString) && (strpos/2 < ulBytes); wszPatternString++, strpos++) - { - if ((strpos % 2) == 1) /* odd numbered position */ - pbMask[strpos / 2] |= byte_from_hex_char(*wszPatternString); - else - pbMask[strpos / 2] = byte_from_hex_char(*wszPatternString) << 4; - } + if (!(pattern = wcschr(pattern, ','))) + { + heap_free(mask); + heap_free(expect); + return FALSE; + } + pattern++; + while (!iswxdigit(*pattern) && (*pattern != ',')) + pattern++; - if (!(wszPatternString = wcschr(wszPatternString, ','))) - hr = E_INVALIDARG; + for (i = 0; iswxdigit(*pattern) && (i/2 < size); pattern++, i++) + { + if (i % 2) + expect[i / 2] |= byte_from_hex_char(*pattern); else - wszPatternString++; /* skip ',' */ + expect[i / 2] = byte_from_hex_char(*pattern) << 4; } - if (hr == S_OK) + actual = heap_alloc(size); + if (FAILED(IAsyncReader_SyncRead(reader, offset, size, actual))) { - for ( ; !iswxdigit(*wszPatternString) && (*wszPatternString != ','); wszPatternString++) - ; + heap_free(actual); + heap_free(expect); + heap_free(mask); + return FALSE; + } - for (strpos = 0; iswxdigit(*wszPatternString) && (strpos/2 < ulBytes); wszPatternString++, strpos++) + for (i = 0; i < size; ++i) + { + if ((actual[i] & mask[i]) != expect[i]) { - if ((strpos % 2) == 1) /* odd numbered position */ - pbValue[strpos / 2] |= byte_from_hex_char(*wszPatternString); - else - pbValue[strpos / 2] = byte_from_hex_char(*wszPatternString) << 4; + ret = FALSE; + break; } } - if (hr == S_OK) - hr = IAsyncReader_SyncRead(pReader, ulOffset, ulBytes, pbFile); - - if (hr == S_OK) - { - ULONG i; - for (i = 0; i < ulBytes; i++) - if ((pbFile[i] & pbMask[i]) != pbValue[i]) - { - hr = S_FALSE; - break; - } - } + heap_free(actual); + heap_free(expect); + heap_free(mask); - HeapFree(GetProcessHeap(), 0, pbMask); - HeapFree(GetProcessHeap(), 0, pbValue); - HeapFree(GetProcessHeap(), 0, pbFile); + /* If there is a following tuple, then we must match that as well. */ + if (ret && (pattern = wcschr(pattern, ','))) + return process_pattern_string(pattern + 1, reader); - /* if we encountered no errors with this string, and there is a following tuple, then we - * have to match that as well to succeed */ - if ((hr == S_OK) && (wszPatternString = wcschr(wszPatternString, ','))) - return process_pattern_string(wszPatternString + 1, pReader); - else - return hr; + return ret; } BOOL get_media_type(IAsyncReader *reader, const WCHAR *filename, GUID *majortype, @@ -308,7 +298,7 @@ BOOL get_media_type(IAsyncReader *reader, const WCHAR *filename, GUID *majortype if (!wcscmp(value_name, source_filter_name)) continue; - if (process_pattern_string(pattern, reader) != S_OK) + if (!process_pattern_string(pattern, reader)) continue; if (majortype)

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2019