June 2019 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_generate_fbo_key().
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: c600fd86e1b8d875e07a0172221e6c379230e7ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=c600fd86e1b8d875e07a0172… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 14 16:05:22 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_generate_fbo_key(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 15ee031..6258771 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -498,12 +498,11 @@ static inline void wined3d_context_gl_set_fbo_key_for_render_target(const struct } } -static void context_generate_fbo_key(const struct wined3d_context *context, +static void wined3d_context_gl_generate_fbo_key(const struct wined3d_context_gl *context_gl, struct wined3d_fbo_entry_key *key, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); - unsigned int buffers = context->gl_info->limits.buffers; + unsigned int buffers = context_gl->c.gl_info->limits.buffers; unsigned int i; key->rb_namespace = 0; @@ -519,11 +518,13 @@ static struct fbo_entry *context_create_fbo_entry(const struct wined3d_context * const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_gl_info *gl_info = context->gl_info; struct fbo_entry *entry; entry = heap_alloc(sizeof(*entry)); - context_generate_fbo_key(context, &entry->key, render_targets, depth_stencil, color_location, ds_location); + wined3d_context_gl_generate_fbo_key(context_gl, &entry->key, + render_targets, depth_stencil, color_location, ds_location); entry->flags = 0; if (depth_stencil->resource) { @@ -550,7 +551,8 @@ static void wined3d_context_gl_reuse_fbo_entry(struct wined3d_context_gl *contex wined3d_context_gl_bind_fbo(context_gl, target, entry->id); context_clean_fbo_attachments(gl_info, target); - context_generate_fbo_key(&context_gl->c, &entry->key, render_targets, depth_stencil, color_location, ds_location); + wined3d_context_gl_generate_fbo_key(context_gl, &entry->key, + render_targets, depth_stencil, color_location, ds_location); entry->flags = 0; if (depth_stencil->resource) { @@ -618,7 +620,8 @@ static struct fbo_entry *wined3d_context_gl_find_fbo_entry(struct wined3d_contex } } - context_generate_fbo_key(&context_gl->c, &fbo_key, render_targets, depth_stencil, color_location, ds_location); + wined3d_context_gl_generate_fbo_key(context_gl, &fbo_key, + render_targets, depth_stencil, color_location, ds_location); if (TRACE_ON(d3d)) {

1 0

Henri Verbeet : wined3d: Download texture data through the texture ops in wined3d_texture_download_from_texture ().
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 8e6d89b752e7081785039651d46656039a0bb5ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e6d89b752e7081785039651… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 14 16:05:23 2019 +0430 wined3d: Download texture data through the texture ops in wined3d_texture_download_from_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 87 ++++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 5 +++ 2 files changed, 88 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 71bec04..16f0a56 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2494,10 +2494,74 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, src_box, src_bo_addr, src_row_pitch, src_slice_pitch, dst_x, dst_y, dst_z, srgb); } +static void wined3d_texture_gl_download_data(struct wined3d_context *context, + struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, unsigned int src_location, + const struct wined3d_box *src_box, const struct wined3d_bo_address *dst_bo_addr, + const struct wined3d_format *dst_format, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch) +{ + unsigned int src_level, src_width, src_height, src_depth; + unsigned int src_row_pitch, src_slice_pitch; + BOOL srgb = FALSE; + + TRACE("context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_box %s, dst_bo_addr %s, " + "dst_format %s, dst_x %u, dst_y %u, dst_z %u, dst_row_pitch %u, dst_slice_pitch %u.\n", + context, src_texture, src_sub_resource_idx, wined3d_debug_location(src_location), + debug_box(src_box), debug_bo_address(dst_bo_addr), debug_d3dformat(dst_format->id), + dst_x, dst_y, dst_z, dst_row_pitch, dst_slice_pitch); + + if (src_location == WINED3D_LOCATION_TEXTURE_SRGB) + { + srgb = TRUE; + } + else if (src_location != WINED3D_LOCATION_TEXTURE_RGB) + { + FIXME("Unhandled location %s.\n", wined3d_debug_location(src_location)); + return; + } + + src_level = src_sub_resource_idx % src_texture->level_count; + src_width = wined3d_texture_get_level_width(src_texture, src_level); + src_height = wined3d_texture_get_level_height(src_texture, src_level); + src_depth = wined3d_texture_get_level_depth(src_texture, src_level); + if (src_box->left || src_box->top || src_box->right != src_width || src_box->bottom != src_height + || src_box->front || src_box->back != src_depth) + { + FIXME("Unhandled source box %s.\n", debug_box(src_box)); + return; + } + + if (dst_x || dst_y || dst_z) + { + FIXME("Unhandled destination (%u, %u, %u).\n", dst_x, dst_y, dst_z); + return; + } + + if (dst_format->id != src_texture->resource.format->id) + { + FIXME("Unhandled format conversion (%s -> %s).\n", + debug_d3dformat(src_texture->resource.format->id), + debug_d3dformat(dst_format->id)); + return; + } + + wined3d_texture_get_pitch(src_texture, src_level, &src_row_pitch, &src_slice_pitch); + if (src_row_pitch != dst_row_pitch || src_slice_pitch != dst_slice_pitch) + { + FIXME("Unhandled destination pitches %u/%u (source pitches %u/%u).\n", + dst_row_pitch, dst_slice_pitch, src_row_pitch, src_slice_pitch); + return; + } + + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(src_texture), wined3d_context_gl(context), srgb); + wined3d_texture_download_data(src_texture, src_sub_resource_idx, context, dst_bo_addr); +} + static const struct wined3d_texture_ops texture2d_ops = { texture2d_load_location, wined3d_texture_gl_upload_data, + wined3d_texture_gl_download_data, }; struct wined3d_texture * __cdecl wined3d_texture_from_resource(struct wined3d_resource *resource) @@ -2881,6 +2945,7 @@ static const struct wined3d_texture_ops texture1d_ops = { texture1d_load_location, wined3d_texture_gl_upload_data, + wined3d_texture_gl_download_data, }; static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, @@ -3297,6 +3362,7 @@ static const struct wined3d_texture_ops texture3d_ops = { texture3d_load_location, wined3d_texture_gl_upload_data, + wined3d_texture_gl_download_data, }; HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, @@ -3870,17 +3936,30 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx) { + unsigned int src_level, dst_level, dst_row_pitch, dst_slice_pitch; + unsigned int dst_location = dst_texture->resource.map_binding; struct wined3d_context *context; struct wined3d_bo_address data; - DWORD dst_location = dst_texture->resource.map_binding; + struct wined3d_box src_box; + unsigned int src_location; context = context_acquire(src_texture->resource.device, NULL, 0); wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &data, dst_location); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(src_texture), wined3d_context_gl(context), - !(src_texture->sub_resources[src_sub_resource_idx].locations & WINED3D_LOCATION_TEXTURE_RGB)); - wined3d_texture_download_data(src_texture, src_sub_resource_idx, context, &data); + + if (src_texture->sub_resources[src_sub_resource_idx].locations & WINED3D_LOCATION_TEXTURE_RGB) + src_location = WINED3D_LOCATION_TEXTURE_RGB; + else + src_location = WINED3D_LOCATION_TEXTURE_SRGB; + src_level = src_sub_resource_idx % src_texture->level_count; + wined3d_texture_get_level_box(src_texture, src_level, &src_box); + + dst_level = dst_sub_resource_idx % dst_texture->level_count; + wined3d_texture_get_pitch(dst_texture, dst_level, &dst_row_pitch, &dst_slice_pitch); + + src_texture->texture_ops->texture_download_data(context, src_texture, src_sub_resource_idx, src_location, + &src_box, &data, dst_texture->resource.format, 0, 0, 0, dst_row_pitch, dst_slice_pitch); context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 31eb31a..bbcc6ac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3386,6 +3386,11 @@ struct wined3d_texture_ops const struct wined3d_format *src_format, const struct wined3d_box *src_box, unsigned int src_row_pitch, unsigned int src_slice_pitch, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, unsigned int dst_location, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z); + void (*texture_download_data)(struct wined3d_context *context, struct wined3d_texture *src_texture, + unsigned int src_sub_resource_idx, unsigned int src_location, const struct wined3d_box *src_box, + const struct wined3d_bo_address *dst_bo_addr, const struct wined3d_format *dst_format, + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch); }; #define WINED3D_TEXTURE_COND_NP2 0x00000001

1 0

Paul Gofman : d3d9/tests: Add test for 'nrm' opcode.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: b56fb673119a00f61e85b40fb9add91ff00e4dec URL: https://source.winehq.org/git/wine.git/?a=commit;h=b56fb673119a00f61e85b40f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 14 16:20:46 2019 +0300 d3d9/tests: Add test for 'nrm' opcode. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 229 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 229 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b56fb673119a00f61e85…

1 0

Huw Davies : kernel32/tests: Add a test for GetTickCount().
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 2706b94dd011b08113f541fe123c251ffd751734 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2706b94dd011b08113f541fe… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 14 11:50:30 2019 +0100 kernel32/tests: Add a test for GetTickCount(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/time.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 536f233..5faabd3 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -32,6 +32,7 @@ static int (WINAPI *pGetCalendarInfoW)(LCID,CALID,CALTYPE,LPWSTR,int,LPDWORD); static DWORD (WINAPI *pGetDynamicTimeZoneInformation)(DYNAMIC_TIME_ZONE_INFORMATION*); static void (WINAPI *pGetSystemTimePreciseAsFileTime)(LPFILETIME); static BOOL (WINAPI *pGetTimeZoneInformationForYear)(USHORT, PDYNAMIC_TIME_ZONE_INFORMATION, LPTIME_ZONE_INFORMATION); +static ULONG (WINAPI *pNtGetTickCount)(void); #define SECSPERMIN 60 #define SECSPERDAY 86400 @@ -1004,9 +1005,32 @@ static void test_GetTimeZoneInformationForYear(void) "GetTimeZoneInformationForYear err %u\n", GetLastError()); } +static void test_GetTickCount(void) +{ + DWORD t1, t2, t3; + int i = 0; + + if (!pNtGetTickCount) + { + win_skip("NtGetTickCount not implemented\n"); + return; + } + + do + { + t1 = pNtGetTickCount(); + t2 = GetTickCount(); + t3 = pNtGetTickCount(); + } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ + + ok(t1 <= t2, "out of order %d %d\n", t1, t2); + ok(t2 <= t3, "out of order %d %d\n", t2, t3); +} + START_TEST(time) { HMODULE hKernel = GetModuleHandleA("kernel32"); + HMODULE hntdll = GetModuleHandleA("ntdll"); pTzSpecificLocalTimeToSystemTime = (void *)GetProcAddress(hKernel, "TzSpecificLocalTimeToSystemTime"); pSystemTimeToTzSpecificLocalTime = (void *)GetProcAddress( hKernel, "SystemTimeToTzSpecificLocalTime"); pGetSystemTimes = (void *)GetProcAddress( hKernel, "GetSystemTimes"); @@ -1015,6 +1039,7 @@ START_TEST(time) pGetDynamicTimeZoneInformation = (void *)GetProcAddress(hKernel, "GetDynamicTimeZoneInformation"); pGetSystemTimePreciseAsFileTime = (void *)GetProcAddress(hKernel, "GetSystemTimePreciseAsFileTime"); pGetTimeZoneInformationForYear = (void *)GetProcAddress(hKernel, "GetTimeZoneInformationForYear"); + pNtGetTickCount = (void *)GetProcAddress(hntdll, "NtGetTickCount"); test_conversions(); test_invalid_arg(); @@ -1029,4 +1054,5 @@ START_TEST(time) test_GetSystemTimeAsFileTime(); test_GetSystemTimePreciseAsFileTime(); test_GetTimeZoneInformationForYear(); + test_GetTickCount(); }

1 0

Zebediah Figura : widl: Mark unions, user types, and ranges as IsSimpleRef.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 0afbcee924d0a9a7461291ea389c5a78d3ed2227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0afbcee924d0a9a7461291ea… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 13 17:49:34 2019 -0500 widl: Mark unions, user types, and ranges as IsSimpleRef. This fixes a regression introduced by 02976b655a5d9ad8ee25dbfb2051acb5b7431381. That patch should only have affected arrays. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f320f57..fbc9f3c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1064,7 +1064,8 @@ static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned case TGT_UNION: case TGT_USER_TYPE: case TGT_RANGE: - *flags |= MustFree; + *flags |= MustFree | IsSimpleRef; + *typestring_offset = ref->typestring_offset; if (!is_in && is_out) server_size = type_memsize( ref ); break; case TGT_ARRAY:

1 0

Zebediah Figura : widl: Remove the unused "indent" parameter from write_type_tfs().
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: fcb96cf8456f12a521dd87412ca8a935a29c5b5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcb96cf8456f12a521dd8741… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 13 17:49:35 2019 -0500 widl: Remove the unused "indent" parameter from write_type_tfs(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index fbc9f3c..c62ba96 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3577,9 +3577,8 @@ static unsigned int write_range_tfs(FILE *file, const attr_list_t *attrs, return start_offset; } -static unsigned int write_type_tfs(FILE *file, int indent, - const attr_list_t *attrs, type_t *type, - const char *name, +static unsigned int write_type_tfs(FILE *file, const attr_list_t *attrs, + type_t *type, const char *name, enum type_context context, unsigned int *typeformat_offset) { @@ -3660,13 +3659,13 @@ static unsigned int write_type_tfs(FILE *file, int indent, if (context != TYPE_CONTEXT_CONTAINER_NO_POINTERS) write_pointer_tfs(file, attrs, type, *typeformat_offset + 4, context, typeformat_offset); - offset = write_type_tfs(file, indent, attrs, ref, name, ref_context, typeformat_offset); + offset = write_type_tfs(file, attrs, ref, name, ref_context, typeformat_offset); if (context == TYPE_CONTEXT_CONTAINER_NO_POINTERS) return 0; return offset; } - offset = write_type_tfs( file, indent, attrs, type_pointer_get_ref(type), name, + offset = write_type_tfs( file, attrs, type_pointer_get_ref(type), name, ref_context, typeformat_offset); if (context == TYPE_CONTEXT_CONTAINER_NO_POINTERS) return 0; @@ -3682,7 +3681,7 @@ static unsigned int write_type_tfs(FILE *file, int indent, static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *type, const char *name, int write_ptr, unsigned int *tfsoff) { - return write_type_tfs(file, 2, attrs, type, name, write_ptr ? TYPE_CONTEXT_CONTAINER : TYPE_CONTEXT_CONTAINER_NO_POINTERS, tfsoff); + return write_type_tfs(file, attrs, type, name, write_ptr ? TYPE_CONTEXT_CONTAINER : TYPE_CONTEXT_CONTAINER_NO_POINTERS, tfsoff); } static void process_tfs_iface(type_t *iface, FILE *file, int indent, unsigned int *offset) @@ -3709,12 +3708,12 @@ static void process_tfs_iface(type_t *iface, FILE *file, int indent, unsigned in var = type_function_get_retval(func->type); if (!is_void(var->type)) - var->typestring_offset = write_type_tfs( file, 2, var->attrs, var->type, func->name, + var->typestring_offset = write_type_tfs( file, var->attrs, var->type, func->name, TYPE_CONTEXT_RETVAL, offset); if (type_get_function_args(func->type)) LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), var_t, entry ) - var->typestring_offset = write_type_tfs( file, 2, var->attrs, var->type, var->name, + var->typestring_offset = write_type_tfs( file, var->attrs, var->type, var->name, TYPE_CONTEXT_TOPLEVELPARAM, offset ); break; @@ -3726,7 +3725,7 @@ static void process_tfs_iface(type_t *iface, FILE *file, int indent, unsigned in { if (is_attr(type_entry->type->attrs, ATTR_ENCODE) || is_attr(type_entry->type->attrs, ATTR_DECODE)) - type_entry->type->typestring_offset = write_type_tfs( file, 2, + type_entry->type->typestring_offset = write_type_tfs( file, type_entry->type->attrs, type_entry->type, type_entry->type->name, TYPE_CONTEXT_CONTAINER, offset); }

1 0

Zebediah Figura : qcap/avimux: Use strmbase_sink_init() and heap_alloc_zero() in create_input_pin().
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 81ec19dc4b725701b9d7593d016bd515b94b88ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=81ec19dc4b725701b9d7593d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 13 18:09:18 2019 -0500 qcap/avimux: Use strmbase_sink_init() and heap_alloc_zero() in create_input_pin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index d289d2b..9dcff50 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -139,7 +139,8 @@ static void avi_mux_destroy(BaseFilter *iface) IPin_Disconnect(&filter->in[i]->pin.pin.IPin_iface); IMemAllocator_Release(filter->in[i]->samples_allocator); filter->in[i]->samples_allocator = NULL; - BaseInputPinImpl_Release(&filter->in[i]->pin.pin.IPin_iface); + strmbase_sink_cleanup(&filter->in[i]->pin); + heap_free(filter->in[i]); } heap_free(filter->idx1); @@ -2214,6 +2215,7 @@ static const IQualityControlVtbl AviMuxIn_QualityControlVtbl = { static HRESULT create_input_pin(AviMux *avimux) { static const WCHAR name[] = {'I','n','p','u','t',' ','0','0',0}; + AviMuxIn *object; PIN_INFO info; HRESULT hr; @@ -2226,40 +2228,39 @@ static HRESULT create_input_pin(AviMux *avimux) info.achName[7] = '0' + (avimux->input_pin_no+1) % 10; info.achName[6] = '0' + (avimux->input_pin_no+1) / 10; - hr = BaseInputPin_Construct(&AviMuxIn_PinVtbl, sizeof(AviMuxIn), &info, - &AviMuxIn_BaseInputFuncTable, &avimux->filter.csFilter, NULL, (IPin**)&avimux->in[avimux->input_pin_no]); - if(FAILED(hr)) - return hr; - avimux->in[avimux->input_pin_no]->pin.IMemInputPin_iface.lpVtbl = &AviMuxIn_MemInputPinVtbl; - avimux->in[avimux->input_pin_no]->IAMStreamControl_iface.lpVtbl = &AviMuxIn_AMStreamControlVtbl; - avimux->in[avimux->input_pin_no]->IPropertyBag_iface.lpVtbl = &AviMuxIn_PropertyBagVtbl; - avimux->in[avimux->input_pin_no]->IQualityControl_iface.lpVtbl = &AviMuxIn_QualityControlVtbl; + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + strmbase_sink_init(&object->pin, &AviMuxIn_PinVtbl, &info, + &AviMuxIn_BaseInputFuncTable, &avimux->filter.csFilter, NULL); + object->pin.IMemInputPin_iface.lpVtbl = &AviMuxIn_MemInputPinVtbl; + object->IAMStreamControl_iface.lpVtbl = &AviMuxIn_AMStreamControlVtbl; + object->IPropertyBag_iface.lpVtbl = &AviMuxIn_PropertyBagVtbl; + object->IQualityControl_iface.lpVtbl = &AviMuxIn_QualityControlVtbl; - avimux->in[avimux->input_pin_no]->samples_head = NULL; hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, - &IID_IMemAllocator, (void**)&avimux->in[avimux->input_pin_no]->samples_allocator); - if(FAILED(hr)) { - BaseInputPinImpl_Release(&avimux->in[avimux->input_pin_no]->pin.pin.IPin_iface); + &IID_IMemAllocator, (void **)&object->samples_allocator); + if (FAILED(hr)) + { + strmbase_sink_cleanup(&object->pin); + heap_free(object); return hr; } hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, - &IID_IMemAllocator, (void**)&avimux->in[avimux->input_pin_no]->pin.pAllocator); - if(FAILED(hr)) { - IMemAllocator_Release(avimux->in[avimux->input_pin_no]->samples_allocator); - BaseInputPinImpl_Release(&avimux->in[avimux->input_pin_no]->pin.pin.IPin_iface); + &IID_IMemAllocator, (void **)&object->pin.pAllocator); + if (FAILED(hr)) + { + IMemAllocator_Release(object->samples_allocator); + strmbase_sink_cleanup(&object->pin); + heap_free(object); return hr; } - avimux->in[avimux->input_pin_no]->stream_time = 0; - memset(&avimux->in[avimux->input_pin_no]->strh, 0, sizeof(avimux->in[avimux->input_pin_no]->strh)); - avimux->in[avimux->input_pin_no]->strf = NULL; - memset(&avimux->in[avimux->input_pin_no]->indx_data, 0, sizeof(avimux->in[avimux->input_pin_no]->indx_data)); - memset(&avimux->in[avimux->input_pin_no]->ix_data, 0, sizeof(avimux->in[avimux->input_pin_no]->ix_data)); - avimux->in[avimux->input_pin_no]->indx = (AVISUPERINDEX*)&avimux->in[avimux->input_pin_no]->indx_data; - avimux->in[avimux->input_pin_no]->ix = (AVISTDINDEX*)avimux->in[avimux->input_pin_no]->ix_data; + object->indx = (AVISUPERINDEX *)&object->indx_data; + object->ix = (AVISTDINDEX *)object->ix_data; - avimux->input_pin_no++; + avimux->in[avimux->input_pin_no++] = object; return S_OK; }

1 0

Zebediah Figura : strmbase: Return void from OutputPin_Init().
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 2922615d0288c1a30a2f0e8a96c72802a208c467 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2922615d0288c1a30a2f0e8a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 13 18:09:19 2019 -0500 strmbase: Return void from OutputPin_Init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index aa195c3..eb0f469 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -740,14 +740,12 @@ static void strmbase_pin_init(BasePin *pin, const IPinVtbl *vtbl, pin->pFuncsTable = func_table; } -static HRESULT OutputPin_Init(const IPinVtbl *vtbl, const PIN_INFO *info, - const BaseOutputPinFuncTable *func_table, CRITICAL_SECTION *cs, BaseOutputPin *pin) +static void strmbase_source_init(BaseOutputPin *pin, const IPinVtbl *vtbl, + const PIN_INFO *info, const BaseOutputPinFuncTable *func_table, CRITICAL_SECTION *cs) { memset(pin, 0, sizeof(*pin)); strmbase_pin_init(&pin->pin, vtbl, &func_table->base, info, cs); pin->pFuncsTable = func_table; - - return S_OK; } HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outputpin_size, const PIN_INFO * pPinInfo, const BaseOutputPinFuncTable* vtbl, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) @@ -770,14 +768,9 @@ HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outp if (!pPinImpl) return E_OUTOFMEMORY; - if (SUCCEEDED(OutputPin_Init(OutputPin_Vtbl, pPinInfo, vtbl, pCritSec, pPinImpl))) - { - *ppPin = &pPinImpl->pin.IPin_iface; - return S_OK; - } - - CoTaskMemFree(pPinImpl); - return E_FAIL; + strmbase_source_init(pPinImpl, OutputPin_Vtbl, pPinInfo, vtbl, pCritSec); + *ppPin = &pPinImpl->pin.IPin_iface; + return S_OK; } HRESULT WINAPI BaseOutputPin_Destroy(BaseOutputPin *This)

1 0

Zebediah Figura : strmbase: Factor out strmbase_source_cleanup().
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 79ed388e70e16d9d273481d089ce2cbf1df45a1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=79ed388e70e16d9d273481d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 13 18:09:20 2019 -0500 strmbase: Factor out strmbase_source_cleanup(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index eb0f469..f1b24c3 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -773,12 +773,17 @@ HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outp return S_OK; } +static void strmbase_source_cleanup(BaseOutputPin *pin) +{ + FreeMediaType(&pin->pin.mtCurrent); + if (pin->pAllocator) + IMemAllocator_Release(pin->pAllocator); + pin->pAllocator = NULL; +} + HRESULT WINAPI BaseOutputPin_Destroy(BaseOutputPin *This) { - FreeMediaType(&This->pin.mtCurrent); - if (This->pAllocator) - IMemAllocator_Release(This->pAllocator); - This->pAllocator = NULL; + strmbase_source_cleanup(This); CoTaskMemFree(This); return S_OK; }

1 0

Zebediah Figura : qcap/avico: Store the source pin inline in the AviCompressor structure.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 17b118a09f19c5413ad3269edcd175127d4c844f URL: https://source.winehq.org/git/wine.git/?a=commit;h=17b118a09f19c5413ad3269e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 13 18:09:21 2019 -0500 qcap/avico: Store the source pin inline in the AviCompressor structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 23 ++++++++--------------- dlls/strmbase/pin.c | 4 ++-- include/wine/strmbase.h | 3 +++ 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 841db70..399fe09 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -38,7 +38,7 @@ typedef struct { IPersistPropertyBag IPersistPropertyBag_iface; BaseInputPin sink; - BaseOutputPin *out; + BaseOutputPin source; DWORD fcc_handler; HIC hic; @@ -148,7 +148,7 @@ static HRESULT WINAPI AVICompressor_Run(IBaseFilter *iface, REFERENCE_TIME tStar if(This->filter.state == State_Running) return S_OK; - hres = IMemAllocator_Commit(This->out->pAllocator); + hres = IMemAllocator_Commit(This->source.pAllocator); if(FAILED(hres)) { FIXME("Commit failed: %08x\n", hres); return hres; @@ -185,7 +185,7 @@ static IPin *avi_compressor_get_pin(BaseFilter *iface, unsigned int index) if (index == 0) return &filter->sink.pin.IPin_iface; else if (index == 1) - return &filter->out->pin.IPin_iface; + return &filter->source.pin.IPin_iface; return NULL; } @@ -197,8 +197,7 @@ static void avi_compressor_destroy(BaseFilter *iface) ICClose(filter->hic); heap_free(filter->videoinfo); strmbase_sink_cleanup(&filter->sink); - if (filter->out) - BaseOutputPinImpl_Release(&filter->out->pin.IPin_iface); + strmbase_source_cleanup(&filter->source); strmbase_filter_cleanup(&filter->filter); heap_free(filter); } @@ -472,7 +471,7 @@ static HRESULT WINAPI AVICompressorIn_Receive(BaseInputPin *base, IMediaSample * return hres; } - hres = BaseOutputPinImpl_GetDeliveryBuffer(This->out, &out_sample, &start, &stop, 0); + hres = BaseOutputPinImpl_GetDeliveryBuffer(&This->source, &out_sample, &start, &stop, 0); if(FAILED(hres)) return hres; @@ -503,7 +502,7 @@ static HRESULT WINAPI AVICompressorIn_Receive(BaseInputPin *base, IMediaSample * else IMediaSample_SetMediaTime(out_sample, NULL, NULL); - hres = BaseOutputPinImpl_Deliver(This->out, out_sample); + hres = BaseOutputPinImpl_Deliver(&This->source, out_sample); if(FAILED(hres)) WARN("Deliver failed: %08x\n", hres); @@ -618,7 +617,6 @@ IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) PIN_INFO in_pin_info = {NULL, PINDIR_INPUT, {'I','n',0}}; PIN_INFO out_pin_info = {NULL, PINDIR_OUTPUT, {'O','u','t',0}}; AVICompressor *compressor; - HRESULT hres; compressor = heap_alloc_zero(sizeof(*compressor)); if(!compressor) { @@ -636,13 +634,8 @@ IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) &AVICompressorBaseInputPinVtbl, &compressor->filter.csFilter, NULL); out_pin_info.pFilter = &compressor->filter.IBaseFilter_iface; - hres = BaseOutputPin_Construct(&AVICompressorOutputPinVtbl, sizeof(BaseOutputPin), &out_pin_info, - &AVICompressorBaseOutputPinVtbl, &compressor->filter.csFilter, (IPin**)&compressor->out); - if(FAILED(hres)) { - strmbase_filter_cleanup(&compressor->filter); - *phr = hres; - return NULL; - } + strmbase_source_init(&compressor->source, &AVICompressorOutputPinVtbl, &out_pin_info, + &AVICompressorBaseOutputPinVtbl, &compressor->filter.csFilter); *phr = S_OK; return &compressor->filter.IUnknown_inner; diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index f1b24c3..f578751 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -740,7 +740,7 @@ static void strmbase_pin_init(BasePin *pin, const IPinVtbl *vtbl, pin->pFuncsTable = func_table; } -static void strmbase_source_init(BaseOutputPin *pin, const IPinVtbl *vtbl, +void strmbase_source_init(BaseOutputPin *pin, const IPinVtbl *vtbl, const PIN_INFO *info, const BaseOutputPinFuncTable *func_table, CRITICAL_SECTION *cs) { memset(pin, 0, sizeof(*pin)); @@ -773,7 +773,7 @@ HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outp return S_OK; } -static void strmbase_source_cleanup(BaseOutputPin *pin) +void strmbase_source_cleanup(BaseOutputPin *pin) { FreeMediaType(&pin->pin.mtCurrent); if (pin->pAllocator) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 8c6123c..1a8b8aa 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -135,6 +135,9 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BaseOutputPin *pin, IPin *pee HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outputpin_size, const PIN_INFO * pPinInfo, const BaseOutputPinFuncTable* pBaseOutputFuncsTable, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); HRESULT WINAPI BaseOutputPin_Destroy(BaseOutputPin *This); +void strmbase_source_cleanup(BaseOutputPin *pin); +void strmbase_source_init(BaseOutputPin *pin, const IPinVtbl *vtbl, const PIN_INFO *info, + const BaseOutputPinFuncTable *func_table, CRITICAL_SECTION *cs); /* Base Input Pin */ HRESULT WINAPI BaseInputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv);

1 0