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

Nikolay Sivov : mfmediaengine: Fully initialize error state.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: fae575cee92ed98b5084f64ed27fd5519e4d65bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=fae575cee92ed98b5084f64e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 4 13:41:46 2020 +0300 mfmediaengine: Fully initialize error state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index dba55bb937..7693205238 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -85,6 +85,7 @@ struct media_engine double volume; double duration; MF_MEDIA_ENGINE_ERR error_code; + HRESULT extended_code; IMFMediaSession *session; IMFSourceResolver *resolver; CRITICAL_SECTION cs; @@ -440,8 +441,12 @@ static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, } if (FAILED(hr)) - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_ERROR, - MF_MEDIA_ENGINE_ERR_SRC_NOT_SUPPORTED, hr); + { + engine->error_code = MF_MEDIA_ENGINE_ERR_SRC_NOT_SUPPORTED; + engine->extended_code = hr; + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_ERROR, engine->error_code, + engine->extended_code); + } LeaveCriticalSection(&engine->cs); @@ -526,7 +531,10 @@ static HRESULT WINAPI media_engine_GetError(IMFMediaEngine *iface, IMFMediaError else if (engine->error_code) { if (SUCCEEDED(hr = create_media_error(error))) + { IMFMediaError_SetErrorCode(*error, engine->error_code); + IMFMediaError_SetExtendedErrorCode(*error, engine->extended_code); + } } LeaveCriticalSection(&engine->cs);

1 0

Nikolay Sivov : mfmediaengine: Implement GetCurrentSource().
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 496a7035accadee1924f14ae609b3b8fd39c3cfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=496a7035accadee1924f14ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 4 13:41:47 2020 +0300 mfmediaengine: Implement GetCurrentSource(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/Makefile.in | 2 +- dlls/mfmediaengine/main.c | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/Makefile.in b/dlls/mfmediaengine/Makefile.in index cb593cb7ed..b97e9eec33 100644 --- a/dlls/mfmediaengine/Makefile.in +++ b/dlls/mfmediaengine/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfmediaengine.dll IMPORTLIB = mfmediaengine -IMPORTS = mfplat mf mfuuid uuid +IMPORTS = oleaut32 mfplat mf mfuuid uuid EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 7693205238..2f4a38936c 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -88,6 +88,7 @@ struct media_engine HRESULT extended_code; IMFMediaSession *session; IMFSourceResolver *resolver; + BSTR current_source; CRITICAL_SECTION cs; }; @@ -499,6 +500,7 @@ static void free_media_engine(struct media_engine *engine) IMFAttributes_Release(engine->attributes); if (engine->resolver) IMFSourceResolver_Release(engine->resolver); + SysFreeString(engine->current_source); DeleteCriticalSection(&engine->cs); heap_free(engine); } @@ -577,6 +579,11 @@ static HRESULT WINAPI media_engine_SetSource(IMFMediaEngine *iface, BSTR url) EnterCriticalSection(&engine->cs); + SysFreeString(engine->current_source); + engine->current_source = NULL; + if (url) + engine->current_source = SysAllocString(url); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); if (url) @@ -602,9 +609,22 @@ static HRESULT WINAPI media_engine_SetSource(IMFMediaEngine *iface, BSTR url) static HRESULT WINAPI media_engine_GetCurrentSource(IMFMediaEngine *iface, BSTR *url) { - FIXME("(%p, %p): stub.\n", iface, url); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, url); + + *url = NULL; + + EnterCriticalSection(&engine->cs); + if (engine->current_source) + { + if (!(*url = SysAllocString(engine->current_source))) + hr = E_OUTOFMEMORY; + } + LeaveCriticalSection(&engine->cs); + + return hr; } static USHORT WINAPI media_engine_GetNetworkState(IMFMediaEngine *iface)

1 0

Anton Baskanov : amstream: Implement MediaStreamFilter::SupportSeeking().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 77134d806d3a3c4fca3e996952a36a78c545cf72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77134d806d3a3c4fca3e9969… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Jun 3 14:28:14 2020 -0500 amstream: Implement MediaStreamFilter::SupportSeeking(). Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/filter.c | 270 ++++++++++++++++++++++++++++++++--- dlls/amstream/tests/amstream.c | 316 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 568 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=77134d806d3a3c4fca3e…

1 0

Anton Baskanov : amstream: Implement MediaStreamFilter::SetPositions().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 1c99a8e0952f977cc5647744d806590c13f925bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c99a8e0952f977cc5647744… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Jun 3 14:28:15 2020 -0500 amstream: Implement MediaStreamFilter::SetPositions(). Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/filter.c | 24 +++- dlls/amstream/tests/amstream.c | 245 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 265 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1c99a8e0952f977cc564…

1 0

Anton Baskanov : amstream: Call MediaStreamFilter::SupportSeeking() in AMMultiMediaStream::OpenFile().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: aba27fd5a3241635adb15fa7ef40aa43bf3978a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aba27fd5a3241635adb15fa7… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Jun 3 14:28:16 2020 -0500 amstream: Call MediaStreamFilter::SupportSeeking() in AMMultiMediaStream::OpenFile(). Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 2 ++ dlls/amstream/tests/amstream.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index e77392e483..e058e639dd 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -442,6 +442,8 @@ static HRESULT WINAPI multimedia_stream_OpenFile(IAMMultiMediaStream *iface, if (SUCCEEDED(ret) && !(flags & AMMSF_NORENDER)) ret = IGraphBuilder_Render(This->graph, This->ipin); + IMediaStreamFilter_SupportSeeking(This->filter, This->type == STREAMTYPE_READ); + if (EnumPins) IEnumPins_Release(EnumPins); if (BaseFilter) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a9d79e6b7a..f082b78347 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -224,9 +224,13 @@ static void test_openfile(void) if (pgraph) IGraphBuilder_Release(pgraph); + check_interface(pams, &IID_IMediaSeeking, FALSE); + hr = IAMMultiMediaStream_OpenFile(pams, L"test.avi", 0); ok(hr==S_OK, "IAMMultiMediaStream_OpenFile returned: %x\n", hr); + check_interface(pams, &IID_IMediaSeeking, TRUE); + hr = IAMMultiMediaStream_GetFilterGraph(pams, &pgraph); ok(hr==S_OK, "IAMMultiMediaStream_GetFilterGraph returned: %x\n", hr); ok(pgraph!=NULL, "Filtergraph should be created\n");

1 0

Zebediah Figura : d3dcompiler: Create assignment instructions more directly in struct_var_initializer().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 5900f00148148d919f5ed03161379b51f6f11c16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5900f00148148d919f5ed031… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 1 17:58:43 2020 -0500 d3dcompiler: Create assignment instructions more directly in struct_var_initializer(). In particular so that we can remove the need for creating a load instruction, which besides being unnecessary was also never added to any instruction lists. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index f94e9a6462..19e7dd7aeb 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -549,22 +549,30 @@ static struct hlsl_ir_var *new_synthetic_var(const char *name, struct hlsl_type return var; } -static struct hlsl_ir_assignment *make_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) +static struct hlsl_ir_assignment *new_assignment(struct hlsl_ir_var *var, struct hlsl_ir_node *offset, + struct hlsl_ir_node *rhs, unsigned int writemask, struct source_location loc) { struct hlsl_ir_assignment *assign; + if (!writemask && type_is_single_reg(rhs->data_type)) + writemask = (1 << rhs->data_type->dimx) - 1; + if (!(assign = d3dcompiler_alloc(sizeof(*assign)))) return NULL; - init_node(&assign->node, HLSL_IR_ASSIGNMENT, rhs->data_type, rhs->loc); - assign->lhs.var = lhs; + init_node(&assign->node, HLSL_IR_ASSIGNMENT, NULL, loc); + assign->lhs.var = var; + assign->lhs.offset = offset; assign->rhs = rhs; - if (type_is_single_reg(lhs->data_type)) - assign->writemask = (1 << lhs->data_type->dimx) - 1; - + assign->writemask = writemask; return assign; } +static struct hlsl_ir_assignment *make_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) +{ + return new_assignment(lhs, NULL, rhs, 0, rhs->loc); +} + static struct hlsl_ir_constant *new_uint_constant(unsigned int n, const struct source_location loc) { struct hlsl_ir_constant *c; @@ -693,8 +701,6 @@ static void struct_var_initializer(struct list *list, struct hlsl_ir_var *var, { struct hlsl_type *type = var->data_type; struct hlsl_struct_field *field; - struct hlsl_ir_node *assignment; - struct hlsl_ir_load *load; unsigned int i = 0; if (initializer_size(initializer) != components_count_type(type)) @@ -710,22 +716,21 @@ static void struct_var_initializer(struct list *list, struct hlsl_ir_var *var, LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) { struct hlsl_ir_node *node = initializer->args[i]; + struct hlsl_ir_assignment *assign; + struct hlsl_ir_constant *c; if (i++ >= initializer->args_count) - { - d3dcompiler_free(initializer->args); - return; - } + break; + if (components_count_type(field->type) == components_count_type(node->data_type)) { - if (!(load = new_record_load(&new_var_load(var, var->loc)->node, field, node->loc))) - { - ERR("Out of memory.\n"); + if (!(c = new_uint_constant(field->reg_offset * 4, node->loc))) break; - } - list_add_tail(list, &load->node.entry); - assignment = make_assignment(&load->node, ASSIGN_OP_ASSIGN, node); - list_add_tail(list, &assignment->entry); + list_add_tail(list, &c->node.entry); + + if (!(assign = new_assignment(var, &c->node, node, 0, node->loc))) + break; + list_add_tail(list, &assign->node.entry); } else FIXME("Initializing with \"mismatched\" fields is not supported yet.\n");

1 0

Zebediah Figura : d3dcompiler: Pass the semantic and location parameters to new_func_decl().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: c7b90bf3483ef4d926c0c3a5fdc6d7999d1e3302 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7b90bf3483ef4d926c0c3a5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 1 17:58:44 2020 -0500 d3dcompiler: Pass the semantic and location parameters to new_func_decl(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 - dlls/d3dcompiler_43/hlsl.y | 19 +++++++++++++++---- dlls/d3dcompiler_43/utils.c | 16 ---------------- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 8e96a4fbca..bc2e43cfff 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -1096,7 +1096,6 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig struct hlsl_ir_node *right) DECLSPEC_HIDDEN; void push_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; BOOL pop_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; -struct hlsl_ir_function_decl *new_func_decl(struct hlsl_type *return_type, struct list *parameters) DECLSPEC_HIDDEN; void init_functions_tree(struct wine_rb_tree *funcs) DECLSPEC_HIDDEN; void add_function_decl(struct wine_rb_tree *funcs, char *name, struct hlsl_ir_function_decl *decl, BOOL intrinsic) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 19e7dd7aeb..bf0160e369 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1248,6 +1248,20 @@ static unsigned int evaluate_array_dimension(struct hlsl_ir_node *node) } } +static struct hlsl_ir_function_decl *new_func_decl(struct hlsl_type *return_type, + struct list *parameters, const char *semantic, struct source_location loc) +{ + struct hlsl_ir_function_decl *decl; + + if (!(decl = d3dcompiler_alloc(sizeof(*decl)))) + return NULL; + decl->return_type = return_type; + decl->parameters = parameters; + decl->semantic = semantic; + decl->loc = loc; + return decl; +} + %} %locations @@ -1648,15 +1662,12 @@ func_prototype: var_modifiers type var_identifier '(' parameters ')' c FIXME("Unexpected register reservation for a function.\n"); d3dcompiler_free($7.reg_reservation); } - $$.decl = new_func_decl($2, $5); - if (!$$.decl) + if (!($$.decl = new_func_decl($2, $5, $7.semantic, get_location(&@3)))) { ERR("Out of memory.\n"); YYABORT; } $$.name = $3; - $$.decl->semantic = $7.semantic; - $$.decl->loc = get_location(&@3); hlsl_ctx.cur_function = $$.decl; } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 440ad49188..4fdda3513f 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1587,22 +1587,6 @@ BOOL pop_scope(struct hlsl_parse_ctx *ctx) return TRUE; } -struct hlsl_ir_function_decl *new_func_decl(struct hlsl_type *return_type, struct list *parameters) -{ - struct hlsl_ir_function_decl *decl; - - decl = d3dcompiler_alloc(sizeof(*decl)); - if (!decl) - { - ERR("Out of memory.\n"); - return NULL; - } - decl->return_type = return_type; - decl->parameters = parameters; - - return decl; -} - static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hlsl_type *t2) { if (t1->type != t2->type)

1 0

Zebediah Figura : d3dcompiler: Also check the type class when checking for void.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 2b77cfb7be73c08a406046bc3d0ea250c4743388 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b77cfb7be73c08a406046bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 1 17:58:45 2020 -0500 d3dcompiler: Also check the type class when checking for void. As of 867fe22346, non-void types may have a base_type of HLSL_TYPE_VOID. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index bf0160e369..70ffa70fe1 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -278,6 +278,11 @@ static void declare_predefined_types(struct hlsl_scope *scope) add_type_to_scope(scope, type); } +static BOOL type_is_void(const struct hlsl_type *type) +{ + return type->type == HLSL_CLASS_OBJECT && type->base_type == HLSL_TYPE_VOID; +} + static BOOL append_conditional_break(struct list *cond_list) { struct hlsl_ir_node *condition, *not; @@ -521,7 +526,7 @@ static struct hlsl_ir_jump *new_return(struct hlsl_ir_node *value, struct source return NULL; } } - else if (return_type->base_type != HLSL_TYPE_VOID) + else if (!type_is_void(return_type)) { hlsl_report_message(loc, HLSL_LEVEL_ERROR, "non-void function must return a value"); d3dcompiler_free(jump); @@ -1482,7 +1487,7 @@ hlsl_prog: /* empty */ } } - if ($2.decl->return_type->base_type == HLSL_TYPE_VOID && $2.decl->semantic) + if (type_is_void($2.decl->return_type) && $2.decl->semantic) { hlsl_report_message($2.decl->loc, HLSL_LEVEL_ERROR, "void function with a semantic"); @@ -1651,7 +1656,7 @@ func_prototype: var_modifiers type var_identifier '(' parameters ')' c HLSL_LEVEL_ERROR, "redefinition of '%s'\n", $3); YYABORT; } - if ($2->base_type == HLSL_TYPE_VOID && $7.semantic) + if (type_is_void($2) && $7.semantic) { hlsl_report_message(get_location(&@7), HLSL_LEVEL_ERROR, "void function with a semantic");

1 0

Zebediah Figura : d3dcompiler: Write to the function return value using a separate instruction.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 513f0def41f05dacc0b3894e33d045529bd39964 URL: https://source.winehq.org/git/wine.git/?a=commit;h=513f0def41f05dacc0b3894e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 1 17:58:46 2020 -0500 d3dcompiler: Write to the function return value using a separate instruction. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 +- dlls/d3dcompiler_43/hlsl.y | 92 ++++++++++++++++++------------- dlls/d3dcompiler_43/utils.c | 5 +- 3 files changed, 55 insertions(+), 44 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index bc2e43cfff..a61b84d6b5 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -722,6 +722,7 @@ struct hlsl_ir_function struct hlsl_ir_function_decl { struct hlsl_type *return_type; + struct hlsl_ir_var *return_var; struct source_location loc; struct wine_rb_entry entry; struct hlsl_ir_function *func; @@ -832,7 +833,6 @@ struct hlsl_ir_jump { struct hlsl_ir_node node; enum hlsl_ir_jump_type type; - struct hlsl_ir_node *return_value; }; struct hlsl_ir_swizzle diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 70ffa70fe1..1797996ddb 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -507,35 +507,6 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha return NULL; } -static struct hlsl_ir_jump *new_return(struct hlsl_ir_node *value, struct source_location loc) -{ - struct hlsl_type *return_type = hlsl_ctx.cur_function->return_type; - struct hlsl_ir_jump *jump = d3dcompiler_alloc(sizeof(*jump)); - if (!jump) - { - ERR("Out of memory\n"); - return NULL; - } - init_node(&jump->node, HLSL_IR_JUMP, NULL, loc); - jump->type = HLSL_IR_JUMP_RETURN; - if (value) - { - if (!(jump->return_value = implicit_conversion(value, return_type, &loc))) - { - d3dcompiler_free(jump); - return NULL; - } - } - else if (!type_is_void(return_type)) - { - hlsl_report_message(loc, HLSL_LEVEL_ERROR, "non-void function must return a value"); - d3dcompiler_free(jump); - return NULL; - } - - return jump; -} - static struct hlsl_ir_var *new_synthetic_var(const char *name, struct hlsl_type *type, const struct source_location loc) { @@ -578,6 +549,39 @@ static struct hlsl_ir_assignment *make_simple_assignment(struct hlsl_ir_var *lhs return new_assignment(lhs, NULL, rhs, 0, rhs->loc); } +static struct hlsl_ir_jump *new_return(struct hlsl_ir_node *return_value, struct source_location loc) +{ + struct hlsl_type *return_type = hlsl_ctx.cur_function->return_type; + struct hlsl_ir_jump *jump; + + if (return_value) + { + struct hlsl_ir_assignment *assignment; + + if (!(return_value = implicit_conversion(return_value, return_type, &loc))) + return NULL; + + if (!(assignment = make_simple_assignment(hlsl_ctx.cur_function->return_var, return_value))) + return NULL; + list_add_after(&return_value->entry, &assignment->node.entry); + } + else if (!type_is_void(return_type)) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "non-void function must return a value"); + return NULL; + } + + if (!(jump = d3dcompiler_alloc(sizeof(*jump)))) + { + ERR("Out of memory\n"); + return NULL; + } + init_node(&jump->node, HLSL_IR_JUMP, NULL, loc); + jump->type = HLSL_IR_JUMP_RETURN; + + return jump; +} + static struct hlsl_ir_constant *new_uint_constant(unsigned int n, const struct source_location loc) { struct hlsl_ir_constant *c; @@ -1264,6 +1268,21 @@ static struct hlsl_ir_function_decl *new_func_decl(struct hlsl_type *return_type decl->parameters = parameters; decl->semantic = semantic; decl->loc = loc; + + if (!type_is_void(return_type)) + { + struct hlsl_ir_var *return_var; + char name[28]; + + sprintf(name, "<retval-%p>", decl); + if (!(return_var = new_synthetic_var(name, return_type, loc))) + { + d3dcompiler_free(decl); + return NULL; + } + decl->return_var = return_var; + } + return decl; } @@ -2818,8 +2837,6 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs assignment->lhs.offset->last_read = instr->index; break; } - case HLSL_IR_CONSTANT: - break; case HLSL_IR_CONSTRUCTOR: { struct hlsl_ir_constructor *constructor = constructor_from_node(instr); @@ -2847,13 +2864,6 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs iff->condition->last_read = instr->index; break; } - case HLSL_IR_JUMP: - { - struct hlsl_ir_jump *jump = jump_from_node(instr); - if (jump->type == HLSL_IR_JUMP_RETURN && jump->return_value) - jump->return_value->last_read = instr->index; - break; - } case HLSL_IR_LOAD: { struct hlsl_ir_load *load = load_from_node(instr); @@ -2876,7 +2886,8 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs swizzle->val->last_read = instr->index; break; } - default: + case HLSL_IR_CONSTANT: + case HLSL_IR_JUMP: break; } } @@ -2899,6 +2910,9 @@ static void compute_liveness(struct hlsl_ir_function_decl *entry_func) var->last_read = UINT_MAX; } + if (entry_func->return_var) + entry_func->return_var->last_read = UINT_MAX; + compute_liveness_recurse(entry_func->body, 0, 0); } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 4fdda3513f..60bb5ff814 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2039,10 +2039,7 @@ static void debug_dump_ir_jump(const struct hlsl_ir_jump *jump) wine_dbg_printf("discard"); break; case HLSL_IR_JUMP_RETURN: - wine_dbg_printf("return "); - if (jump->return_value) - debug_dump_src(jump->return_value); - wine_dbg_printf(";"); + wine_dbg_printf("return"); break; } }

1 0

Nikolay Sivov : include: Add more Media Foundation error codes.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 04c2df85cb766d535f1522e162f2780043d305ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=04c2df85cb766d535f1522e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 20:08:37 2020 +0300 include: Add more Media Foundation error codes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mferror.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/mferror.h b/include/mferror.h index 523800d7f0..28910d2568 100644 --- a/include/mferror.h +++ b/include/mferror.h @@ -77,12 +77,28 @@ #define MF_E_DISABLED_IN_SAFEMODE _HRESULT_TYPEDEF_(0xc00d36ef) #define MF_E_CANNOT_PARSE_BYTESTREAM _HRESULT_TYPEDEF_(0xc00d36f0) #define MF_E_SOURCERESOLVER_MUTUALLY_EXCLUSIVE_FLAGS _HRESULT_TYPEDEF_(0xc00d36f1) +#define MF_E_CANNOT_CREATE_SINK _HRESULT_TYPEDEF_(0xc00d36fa) #define MF_E_BYTESTREAM_UNKNOWN_LENGTH _HRESULT_TYPEDEF_(0xc00d36fb) +#define MF_E_SESSION_PAUSEWHILESTOPPED _HRESULT_TYPEDEF_(0xc00d36fc) +#define MF_S_ACTIVATE_REPLACED _HRESULT_TYPEDEF_(0x000d36fd) +#define MF_E_FORMAT_CHANGE_NOT_SUPPORTED _HRESULT_TYPEDEF_(0xc00d36fe) #define MF_E_INVALID_WORKQUEUE _HRESULT_TYPEDEF_(0xc00d36ff) +#define MF_E_DRM_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d3700) +#define MF_E_UNAUTHORIZED _HRESULT_TYPEDEF_(0xc00d3701) +#define MF_E_OUT_OF_RANGE _HRESULT_TYPEDEF_(0xc00d3702) +#define MF_E_INVALID_CODEC_MERIT _HRESULT_TYPEDEF_(0xc00d3703) +#define MF_E_HW_MFT_FAILED_START_STREAMING _HRESULT_TYPEDEF_(0xc00d3704) +#define MF_E_OPERATION_IN_PROGRESS _HRESULT_TYPEDEF_(0xc00d3705) +#define MF_E_HARDWARE_DRM_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d3706) +#define MF_E_DURATION_TOO_LONG _HRESULT_TYPEDEF_(0xc00d3707) #define MF_E_NO_EVENTS_AVAILABLE _HRESULT_TYPEDEF_(0xc00d3e80) #define MF_E_INVALID_STATE_TRANSITION _HRESULT_TYPEDEF_(0xc00d3e82) #define MF_E_END_OF_STREAM _HRESULT_TYPEDEF_(0xc00d3e84) #define MF_E_SHUTDOWN _HRESULT_TYPEDEF_(0xc00d3e85) +#define MF_E_MP3_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d3e86) +#define MF_E_MP3_OUT_OF_DATA _HRESULT_TYPEDEF_(0xc00d3e87) +#define MF_E_MP3_NOTMP3 _HRESULT_TYPEDEF_(0xc00d3e88) +#define MF_E_MP3_NOTSUPPORTED _HRESULT_TYPEDEF_(0xc00d3e89) #define MF_E_NO_DURATION _HRESULT_TYPEDEF_(0xc00d3e8a) #define MF_E_INVALID_FORMAT _HRESULT_TYPEDEF_(0xc00d3e8c) #define MF_E_PROPERTY_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d3e8d) @@ -90,9 +106,17 @@ #define MF_E_PROPERTY_NOT_ALLOWED _HRESULT_TYPEDEF_(0xc00d3e8f) #define MF_E_MEDIA_SOURCE_NOT_STARTED _HRESULT_TYPEDEF_(0xc00d3e91) #define MF_E_UNSUPPORTED_FORMAT _HRESULT_TYPEDEF_(0xc00d3e98) +#define MF_E_MP3_BAD_CRC _HRESULT_TYPEDEF_(0xc00d3e99) +#define MF_E_NOT_PROTECTED _HRESULT_TYPEDEF_(0xc00d3e9a) #define MF_E_MEDIA_SOURCE_WRONGSTATE _HRESULT_TYPEDEF_(0xc00d3e9b) #define MF_E_MEDIA_SOURCE_NO_STREAMS_SELECTED _HRESULT_TYPEDEF_(0xc00d3e9c) +#define MF_E_CANNOT_FIND_KEYFRAME_SAMPLE _HRESULT_TYPEDEF_(0xc00d3e9d) #define MF_E_UNSUPPORTED_CHARACTERISTICS _HRESULT_TYPEDEF_(0xc00d3e9e) +#define MF_E_NO_AUDIO_RECORDING_DEVICE _HRESULT_TYPEDEF_(0xc00d3e9f) +#define MF_E_AUDIO_RECORDING_DEVICE_IN_USE _HRESULT_TYPEDEF_(0xc00d3ea0) +#define MF_E_AUDIO_RECORDING_DEVICE_INVALIDATED _HRESULT_TYPEDEF_(0xc00d3ea1) +#define MF_E_VIDEO_RECORDING_DEVICE_INVALIDATED _HRESULT_TYPEDEF_(0xc00d3ea2) +#define MF_E_VIDEO_RECORDING_DEVICE_PREEMPTED _HRESULT_TYPEDEF_(0xc00d3ea3) #define MF_E_STREAMSINK_REMOVED _HRESULT_TYPEDEF_(0xc00d4a38) #define MF_E_STREAMSINKS_OUT_OF_SYNC _HRESULT_TYPEDEF_(0xc00d4a3a)

1 0