June 2021 - Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader: Store the register type for reservations as a char.
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: vkd3d Branch: master Commit: bb79ca76aec7c3f416fd156288df27716881e817 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bb79ca76aec7c3f416fd156… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 31 21:41:13 2021 -0500 vkd3d-shader: Store the register type for reservations as a char. Essentially because the meaning of 'b' differs between SM1-3 and SM4+. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 22 +--------------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 4fe90a9..906d864 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -212,7 +212,7 @@ struct hlsl_src struct hlsl_reg_reservation { - enum vkd3d_shader_register_type type; + char type; DWORD regnum; }; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index cab46ae..d8ad1f9 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -782,29 +782,9 @@ static bool add_func_parameter(struct hlsl_ctx *ctx, struct list *list, static struct hlsl_reg_reservation *parse_reg_reservation(struct hlsl_ctx *ctx, const char *reg_string) { - enum vkd3d_shader_register_type type; struct hlsl_reg_reservation *reg_res; DWORD regnum = 0; - switch (reg_string[0]) - { - case 'c': - type = VKD3DSPR_CONST; - break; - case 'i': - type = VKD3DSPR_CONSTINT; - break; - case 'b': - type = VKD3DSPR_CONSTBOOL; - break; - case 's': - type = VKD3DSPR_SAMPLER; - break; - default: - FIXME("Unsupported register type.\n"); - return NULL; - } - if (!sscanf(reg_string + 1, "%u", &regnum)) { FIXME("Unsupported register reservation syntax.\n"); @@ -813,7 +793,7 @@ static struct hlsl_reg_reservation *parse_reg_reservation(struct hlsl_ctx *ctx, if (!(reg_res = hlsl_alloc(ctx, sizeof(*reg_res)))) return NULL; - reg_res->type = type; + reg_res->type = reg_string[0]; reg_res->regnum = regnum; return reg_res; }

1 0

Zebediah Figura : vkd3d-shader: Write SM1 subtraction instructions.
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: vkd3d Branch: master Commit: 98149da91a0c8e6c90f8e2a6377b02038d53d237 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=98149da91a0c8e6c90f8e2a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 31 21:41:10 2021 -0500 vkd3d-shader: Write SM1 subtraction instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index afa096b..7395772 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1733,6 +1733,10 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, write_sm1_binary_op(ctx, buffer, D3DSIO_MUL, &instr->reg, &arg1->reg, &arg2->reg); break; + case HLSL_IR_BINOP_SUB: + write_sm1_binary_op(ctx, buffer, D3DSIO_SUB, &instr->reg, &arg1->reg, &arg2->reg); + break; + case HLSL_IR_UNOP_NEG: write_sm1_unary_op(ctx, buffer, D3DSIO_MOV, &instr->reg, &arg1->reg, D3DSPSM_NEG); break;

1 0

Zebediah Figura : vkd3d-shader: Fold constant casts from uint to float.
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: vkd3d Branch: master Commit: 56bf11d813d97e09bd241bf1055df6dd3096db70 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=56bf11d813d97e09bd241bf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 31 21:41:11 2021 -0500 vkd3d-shader: Fold constant casts from uint to float. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 42 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 7395772..aa1b8d5 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -332,7 +332,7 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; struct hlsl_ir_expr *expr; - unsigned int i; + unsigned int i, dimx; if (instr->type != HLSL_IR_EXPR) return false; @@ -346,6 +346,7 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi arg1 = hlsl_ir_constant(expr->operands[0].node); if (expr->operands[1].node) arg2 = hlsl_ir_constant(expr->operands[1].node); + dimx = instr->data_type->dimx; if (!(res = hlsl_alloc(ctx, sizeof(*res)))) return false; @@ -353,10 +354,45 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi switch (instr->data_type->base_type) { - case HLSL_TYPE_UINT: + case HLSL_TYPE_FLOAT: { - unsigned int i; + switch (expr->op) + { + case HLSL_IR_UNOP_CAST: + if (instr->data_type->dimx != arg1->node.data_type->dimx + || instr->data_type->dimy != arg1->node.data_type->dimy) + { + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), + debug_hlsl_type(ctx, instr->data_type)); + vkd3d_free(res); + return false; + } + switch (arg1->node.data_type->base_type) + { + case HLSL_TYPE_UINT: + for (i = 0; i < dimx; ++i) + res->value.f[i] = arg1->value.u[i]; + break; + + default: + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), + debug_hlsl_type(ctx, instr->data_type)); + vkd3d_free(res); + return false; + } + break; + + default: + FIXME("Fold float op %#x.\n", expr->op); + vkd3d_free(res); + return false; + } + break; + } + + case HLSL_TYPE_UINT: + { switch (expr->op) { case HLSL_IR_BINOP_ADD:

1 0

Zebediah Figura : vkd3d-shader: Write SM1 reciprocal instructions.
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: vkd3d Branch: master Commit: abd6ceb4892c5a5547d4f029bfd7ffc21cfdc540 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=abd6ceb4892c5a5547d4f02… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 31 21:41:12 2021 -0500 vkd3d-shader: Write SM1 reciprocal instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index aa1b8d5..3b1b19c 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1106,6 +1106,13 @@ static unsigned int map_swizzle(unsigned int swizzle, unsigned int writemask) { unsigned int i, ret = 0; + /* Leave replicate swizzles alone; some instructions need them. */ + if (swizzle == HLSL_SWIZZLE(X, X, X, X) + || swizzle == HLSL_SWIZZLE(Y, Y, Y, Y) + || swizzle == HLSL_SWIZZLE(Z, Z, Z, Z) + || swizzle == HLSL_SWIZZLE(W, W, W, W)) + return swizzle; + for (i = 0; i < 4; ++i) { if (writemask & (1 << i)) @@ -1750,6 +1757,7 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, struct hlsl_ir_expr *expr = hlsl_ir_expr(instr); struct hlsl_ir_node *arg1 = expr->operands[0].node; struct hlsl_ir_node *arg2 = expr->operands[1].node; + unsigned int i; assert(instr->reg.allocated); @@ -1777,6 +1785,17 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, write_sm1_unary_op(ctx, buffer, D3DSIO_MOV, &instr->reg, &arg1->reg, D3DSPSM_NEG); break; + case HLSL_IR_UNOP_RCP: + for (i = 0; i < instr->data_type->dimx; ++i) + { + struct hlsl_reg src = arg1->reg, dst = instr->reg; + + src.writemask = combine_writemasks(src.writemask, 1u << i); + dst.writemask = combine_writemasks(dst.writemask, 1u << i); + write_sm1_unary_op(ctx, buffer, D3DSIO_RCP, &dst, &src, 0); + } + break; + default: FIXME("Unhandled op %u.\n", expr->op); break;

1 0

Zebediah Figura : vkd3d-shader: Store the hlsl_reg_reservation struct directly.
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: vkd3d Branch: master Commit: e8e138ed54ba5b3b2348f74adc64ec626ab77245 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e8e138ed54ba5b3b2348f74… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 31 21:41:14 2021 -0500 vkd3d-shader: Store the hlsl_reg_reservation struct directly. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 4 ++-- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 44 ++++++++++++++++------------------------ libs/vkd3d-shader/hlsl_codegen.c | 2 +- 4 files changed, 22 insertions(+), 30 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 441fd6c..e9bfc37 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -95,7 +95,6 @@ void hlsl_free_var(struct hlsl_ir_var *decl) { vkd3d_free((void *)decl->name); vkd3d_free((void *)decl->semantic.name); - vkd3d_free((void *)decl->reg_reservation); vkd3d_free(decl); } @@ -406,7 +405,8 @@ struct hlsl_ir_var *hlsl_new_var(struct hlsl_ctx *ctx, const char *name, struct if (semantic) var->semantic = *semantic; var->modifiers = modifiers; - var->reg_reservation = reg_reservation; + if (reg_reservation) + var->reg_reservation = *reg_reservation; return var; } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 906d864..d9e51b8 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -223,7 +223,7 @@ struct hlsl_ir_var const char *name; struct hlsl_semantic semantic; unsigned int modifiers; - const struct hlsl_reg_reservation *reg_reservation; + struct hlsl_reg_reservation reg_reservation; struct list scope_entry, param_entry, extern_entry; unsigned int first_write, last_read; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d8ad1f9..2e631fa 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -33,14 +33,14 @@ struct parse_parameter struct hlsl_type *type; const char *name; struct hlsl_semantic semantic; - const struct hlsl_reg_reservation *reg_reservation; + struct hlsl_reg_reservation reg_reservation; unsigned int modifiers; }; struct parse_colon_attribute { struct hlsl_semantic semantic; - struct hlsl_reg_reservation *reg_reservation; + struct hlsl_reg_reservation reg_reservation; }; struct parse_initializer @@ -64,7 +64,7 @@ struct parse_variable_def char *name; struct parse_array_sizes arrays; struct hlsl_semantic semantic; - struct hlsl_reg_reservation *reg_reservation; + struct hlsl_reg_reservation reg_reservation; struct parse_initializer initializer; }; @@ -767,7 +767,7 @@ static bool add_func_parameter(struct hlsl_ctx *ctx, struct list *list, hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, "Parameter '%s' is declared as both \"out\" and \"uniform\".", param->name); - if (!(var = hlsl_new_var(ctx, param->name, param->type, loc, &param->semantic, param->modifiers, param->reg_reservation))) + if (!(var = hlsl_new_var(ctx, param->name, param->type, loc, &param->semantic, param->modifiers, &param->reg_reservation))) return false; var->is_param = 1; @@ -780,22 +780,17 @@ static bool add_func_parameter(struct hlsl_ctx *ctx, struct list *list, return true; } -static struct hlsl_reg_reservation *parse_reg_reservation(struct hlsl_ctx *ctx, const char *reg_string) +static struct hlsl_reg_reservation parse_reg_reservation(const char *reg_string) { - struct hlsl_reg_reservation *reg_res; - DWORD regnum = 0; + struct hlsl_reg_reservation reservation = {0}; - if (!sscanf(reg_string + 1, "%u", &regnum)) + if (!sscanf(reg_string + 1, "%u", &reservation.regnum)) { FIXME("Unsupported register reservation syntax.\n"); - return NULL; + return reservation; } - - if (!(reg_res = hlsl_alloc(ctx, sizeof(*reg_res)))) - return NULL; - reg_res->type = reg_string[0]; - reg_res->regnum = regnum; - return reg_res; + reservation.type = reg_string[0]; + return reservation; } static const struct hlsl_ir_function_decl *get_overloaded_func(struct rb_tree *funcs, char *name, @@ -1354,7 +1349,6 @@ static void free_parse_variable_def(struct parse_variable_def *v) vkd3d_free(v->arrays.sizes); vkd3d_free(v->name); vkd3d_free((void *)v->semantic.name); - vkd3d_free(v->reg_reservation); vkd3d_free(v); } @@ -1393,7 +1387,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (type->type != HLSL_CLASS_MATRIX) check_invalid_matrix_modifiers(ctx, modifiers, v->loc); - if (!(var = hlsl_new_var(ctx, v->name, type, v->loc, &v->semantic, modifiers, v->reg_reservation))) + if (!(var = hlsl_new_var(ctx, v->name, type, v->loc, &v->semantic, modifiers, &v->reg_reservation))) { free_parse_variable_def(v); continue; @@ -1564,7 +1558,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t struct parse_if_body if_body; enum parse_unary_op unary_op; enum parse_assign_op assign_op; - struct hlsl_reg_reservation *reg_reservation; + struct hlsl_reg_reservation reg_reservation; struct parse_colon_attribute colon_attribute; struct hlsl_semantic semantic; } @@ -1962,11 +1956,9 @@ func_prototype: "Semantics are not allowed on void functions."); } - if ($7.reg_reservation) - { + if ($7.reg_reservation.type) FIXME("Unexpected register reservation for a function.\n"); - vkd3d_free($7.reg_reservation); - } + if (!($$.decl = hlsl_new_func_decl(ctx, $2, $5, &$7.semantic, @3))) YYABORT; $$.name = $3; @@ -1999,12 +1991,12 @@ colon_attribute: %empty { $$.semantic.name = NULL; - $$.reg_reservation = NULL; + $$.reg_reservation.type = 0; } | semantic { $$.semantic = $1; - $$.reg_reservation = NULL; + $$.reg_reservation.type = 0; } | register_opt { @@ -2028,7 +2020,7 @@ semantic: register_opt: ':' KW_REGISTER '(' any_identifier ')' { - $$ = parse_reg_reservation(ctx, $4); + $$ = parse_reg_reservation($4); vkd3d_free($4); } | ':' KW_REGISTER '(' any_identifier ',' any_identifier ')' @@ -2036,7 +2028,7 @@ register_opt: FIXME("Ignoring shader target %s in a register reservation.\n", debugstr_a($4)); vkd3d_free($4); - $$ = parse_reg_reservation(ctx, $6); + $$ = parse_reg_reservation($6); vkd3d_free($6); } diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 3b1b19c..366b8bd 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -35,7 +35,7 @@ static void prepend_uniform_copy(struct hlsl_ctx *ctx, struct list *instrs, stru /* Use the synthetic name for the temp, rather than the uniform, so that we * can write the uniform name into the shader reflection data. */ - if (!(uniform = hlsl_new_var(ctx, temp->name, temp->data_type, temp->loc, NULL, 0, temp->reg_reservation))) + if (!(uniform = hlsl_new_var(ctx, temp->name, temp->data_type, temp->loc, NULL, 0, &temp->reg_reservation))) return; list_add_before(&temp->scope_entry, &uniform->scope_entry); list_add_tail(&ctx->extern_vars, &uniform->extern_entry);

1 0

Alexandre Julliard : ntdll: Support growing both 32- and 64-bit stacks.
by Alexandre Julliard June 17, 2021

June 17, 2021

Module: wine Branch: master Commit: de89ce1bfedeb386baddd047884dc73dfe6f70bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=de89ce1bfedeb386baddd047… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 17 09:25:19 2021 +0200 ntdll: Support growing both 32- and 64-bit stacks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 90 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 63 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 0a4004d2db9..52af195aa56 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3131,29 +3131,67 @@ void virtual_map_user_shared_data(void) } +struct thread_stack_info +{ + char *start; + char *limit; + char *end; + SIZE_T guaranteed; + BOOL is_wow; +}; + +/*********************************************************************** + * is_inside_thread_stack + */ +static BOOL is_inside_thread_stack( void *ptr, struct thread_stack_info *stack ) +{ + TEB *teb = NtCurrentTeb(); + WOW_TEB *wow_teb = get_wow_teb( teb ); + + stack->start = teb->DeallocationStack; + stack->limit = teb->Tib.StackLimit; + stack->end = teb->Tib.StackBase; + stack->guaranteed = max( teb->GuaranteedStackBytes, page_size * (is_win64 ? 2 : 1) ); + stack->is_wow = FALSE; + if ((char *)ptr > stack->start && (char *)ptr <= stack->end) return TRUE; + + if (!wow_teb) return FALSE; + stack->start = ULongToPtr( wow_teb->DeallocationStack ); + stack->limit = ULongToPtr( wow_teb->Tib.StackLimit ); + stack->end = ULongToPtr( wow_teb->Tib.StackBase ); + stack->guaranteed = max( wow_teb->GuaranteedStackBytes, page_size * (is_win64 ? 1 : 2) ); + stack->is_wow = TRUE; + return ((char *)ptr > stack->start && (char *)ptr <= stack->end); +} + + /*********************************************************************** * grow_thread_stack */ -static NTSTATUS grow_thread_stack( char *page ) +static NTSTATUS grow_thread_stack( char *page, struct thread_stack_info *stack_info ) { NTSTATUS ret = 0; - size_t guaranteed = max( NtCurrentTeb()->GuaranteedStackBytes, page_size * (is_win64 ? 2 : 1) ); set_page_vprot_bits( page, page_size, 0, VPROT_GUARD ); mprotect_range( page, page_size, 0, 0 ); - if (page >= (char *)NtCurrentTeb()->DeallocationStack + page_size + guaranteed) + if (page >= stack_info->start + page_size + stack_info->guaranteed) { set_page_vprot_bits( page - page_size, page_size, VPROT_COMMITTED | VPROT_GUARD, 0 ); mprotect_range( page - page_size, page_size, 0, 0 ); } else /* inside guaranteed space -> overflow exception */ { - page = (char *)NtCurrentTeb()->DeallocationStack + page_size; - set_page_vprot_bits( page, guaranteed, VPROT_COMMITTED, VPROT_GUARD ); - mprotect_range( page, guaranteed, 0, 0 ); + page = stack_info->start + page_size; + set_page_vprot_bits( page, stack_info->guaranteed, VPROT_COMMITTED, VPROT_GUARD ); + mprotect_range( page, stack_info->guaranteed, 0, 0 ); ret = STATUS_STACK_OVERFLOW; } - NtCurrentTeb()->Tib.StackLimit = page; + if (stack_info->is_wow) + { + WOW_TEB *wow_teb = get_wow_teb( NtCurrentTeb() ); + wow_teb->Tib.StackLimit = PtrToUlong( page ); + } + else NtCurrentTeb()->Tib.StackLimit = page; return ret; } @@ -3171,14 +3209,14 @@ NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack ) vprot = get_page_vprot( page ); if (!is_inside_signal_stack( stack ) && (vprot & VPROT_GUARD)) { - if (page < (char *)NtCurrentTeb()->DeallocationStack || - page >= (char *)NtCurrentTeb()->Tib.StackBase) + struct thread_stack_info stack_info; + if (!is_inside_thread_stack( page, &stack_info )) { set_page_vprot_bits( page, page_size, 0, VPROT_GUARD ); mprotect_range( page, page_size, 0, 0 ); ret = STATUS_GUARD_PAGE_VIOLATION; } - else ret = grow_thread_stack( page ); + else ret = grow_thread_stack( page, &stack_info ); } else if (err & EXCEPTION_WRITE_FAULT) { @@ -3205,19 +3243,16 @@ NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack ) void *virtual_setup_exception( void *stack_ptr, size_t size, EXCEPTION_RECORD *rec ) { char *stack = stack_ptr; + struct thread_stack_info stack_info; - if (is_inside_signal_stack( stack )) - { - ERR( "nested exception on signal stack in thread %04x addr %p stack %p (%p-%p-%p)\n", - GetCurrentThreadId(), rec->ExceptionAddress, stack, NtCurrentTeb()->DeallocationStack, - NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); - abort_thread(1); - } - - if (stack - size > stack || /* check for overflow in subtraction */ - stack <= (char *)NtCurrentTeb()->DeallocationStack || - stack > (char *)NtCurrentTeb()->Tib.StackBase) + if (!is_inside_thread_stack( stack, &stack_info )) { + if (is_inside_signal_stack( stack )) + { + ERR( "nested exception on signal stack in thread %04x addr %p stack %p\n", + GetCurrentThreadId(), rec->ExceptionAddress, stack ); + abort_thread(1); + } WARN( "exception outside of stack limits in thread %04x addr %p stack %p (%p-%p-%p)\n", GetCurrentThreadId(), rec->ExceptionAddress, stack, NtCurrentTeb()->DeallocationStack, NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); @@ -3226,19 +3261,20 @@ void *virtual_setup_exception( void *stack_ptr, size_t size, EXCEPTION_RECORD *r stack -= size; - if (stack < (char *)NtCurrentTeb()->DeallocationStack + 4096) + if (stack < stack_info.start + 4096) { /* stack overflow on last page, unrecoverable */ - UINT diff = (char *)NtCurrentTeb()->DeallocationStack + 4096 - stack; + UINT diff = stack_info.start + 4096 - stack; ERR( "stack overflow %u bytes in thread %04x addr %p stack %p (%p-%p-%p)\n", - diff, GetCurrentThreadId(), rec->ExceptionAddress, stack, NtCurrentTeb()->DeallocationStack, - NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); + diff, GetCurrentThreadId(), rec->ExceptionAddress, stack, stack_info.start, + stack_info.limit, stack_info.end ); abort_thread(1); } - else if (stack < (char *)NtCurrentTeb()->Tib.StackLimit) + else if (stack < stack_info.limit) { mutex_lock( &virtual_mutex ); /* no need for signal masking inside signal handler */ - if ((get_page_vprot( stack ) & VPROT_GUARD) && grow_thread_stack( ROUND_ADDR( stack, page_mask ))) + if ((get_page_vprot( stack ) & VPROT_GUARD) && + grow_thread_stack( ROUND_ADDR( stack, page_mask ), &stack_info )) { rec->ExceptionCode = STATUS_STACK_OVERFLOW; rec->NumberParameters = 0;

1 0

Zebediah Figura : ws2_32: Move the getpeername() implementation to ntdll.
by Alexandre Julliard June 17, 2021

June 17, 2021

Module: wine Branch: master Commit: 569f1ac018cd29d38d0943e694acb52d05775002 URL: https://source.winehq.org/git/wine.git/?a=commit;h=569f1ac018cd29d38d0943e6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 16 23:33:12 2021 -0500 ws2_32: Move the getpeername() implementation to ntdll. This adds todo_wine to a couple of tests; however, these are overly zealous invalid parameter tests, and fixing them is nontrivial. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 26 +++++++++++++++++++++++++ dlls/ws2_32/socket.c | 49 +++++++++++++++++++++--------------------------- dlls/ws2_32/tests/sock.c | 4 ++-- include/wine/afd.h | 1 + 4 files changed, 50 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 02700d37d6a..04db120dcbd 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1540,6 +1540,32 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc break; } + case IOCTL_AFD_WINE_GETPEERNAME: + { + union unix_sockaddr unix_addr; + socklen_t unix_len = sizeof(unix_addr); + int len; + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + + if (getpeername( fd, &unix_addr.addr, &unix_len ) < 0) + { + status = sock_errno_to_status( errno ); + break; + } + + len = sockaddr_from_unix( &unix_addr, out_buffer, out_size ); + if (out_size < len) + { + status = STATUS_BUFFER_TOO_SMALL; + break; + } + io->Information = len; + status = STATUS_SUCCESS; + break; + } + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1a484da1527..a4d89e728b8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2077,42 +2077,35 @@ static BOOL WINAPI WS2_DisconnectEx( SOCKET s, OVERLAPPED *overlapped, DWORD fla return !status; } + /*********************************************************************** - * getpeername (WS2_32.5) + * getpeername (ws2_32.5) */ -int WINAPI WS_getpeername(SOCKET s, struct WS_sockaddr *name, int *namelen) +int WINAPI WS_getpeername( SOCKET s, struct WS_sockaddr *addr, int *len ) { - int fd; - int res; - - TRACE("socket %04lx, ptr %p, len %08x\n", s, name, namelen ? *namelen : 0); + IO_STATUS_BLOCK io; + NTSTATUS status; - fd = get_sock_fd( s, 0, NULL ); - res = SOCKET_ERROR; + TRACE( "socket %#lx, addr %p, len %d\n", s, addr, len ? *len : 0 ); - if (fd != -1) + if (!socket_list_find( s )) { - union generic_unix_sockaddr uaddr; - socklen_t uaddrlen = sizeof(uaddr); + WSASetLastError( WSAENOTSOCK ); + return -1; + } - if (getpeername(fd, &uaddr.addr, &uaddrlen) == 0) - { - if (!name || !namelen) - SetLastError(WSAEFAULT); - else if (ws_sockaddr_u2ws(&uaddr.addr, name, namelen) != 0) - /* The buffer was too small */ - SetLastError(WSAEFAULT); - else - { - res = 0; - TRACE("=> %s\n", debugstr_sockaddr(name)); - } - } - else - SetLastError(wsaErrno()); - release_sock_fd( s, fd ); + if (!len) + { + SetLastError( WSAEFAULT ); + return -1; } - return res; + + status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, + IOCTL_AFD_WINE_GETPEERNAME, NULL, 0, addr, *len ); + if (!status) + *len = io.Information; + SetLastError( NtStatusToWSAError( status ) ); + return status ? -1 : 0; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3e6461ad994..f67bc4efae5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7752,7 +7752,7 @@ static void test_getpeername(void) ret = getpeername(sock, NULL, NULL); ok(ret == SOCKET_ERROR, "Expected getpeername to return SOCKET_ERROR, got %d\n", ret); - ok(WSAGetLastError() == WSAENOTCONN, + todo_wine ok(WSAGetLastError() == WSAENOTCONN, "Expected WSAGetLastError() to return WSAENOTCONN, got %d\n", WSAGetLastError()); memset(&sa, 0, sizeof(sa)); @@ -7767,7 +7767,7 @@ static void test_getpeername(void) ret = getpeername(sock, NULL, NULL); ok(ret == SOCKET_ERROR, "Expected getpeername to return SOCKET_ERROR, got %d\n", ret); - ok(WSAGetLastError() == WSAENOTCONN, + todo_wine ok(WSAGetLastError() == WSAENOTCONN, "Expected WSAGetLastError() to return WSAENOTCONN, got %d\n", WSAGetLastError()); ret = connect(sock, (struct sockaddr*)&sa, sizeof(sa)); diff --git a/include/wine/afd.h b/include/wine/afd.h index 19c1e064aaf..ad8e3abf5ba 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -156,6 +156,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_INTERFACE_LIST CTL_CODE(FILE_DEVICE_NETWORK, 213, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_KEEPALIVE_VALS CTL_CODE(FILE_DEVICE_NETWORK, 214, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_MESSAGE_SELECT CTL_CODE(FILE_DEVICE_NETWORK, 215, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GETPEERNAME CTL_CODE(FILE_DEVICE_NETWORK, 216, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params {

1 0

Alexandre Julliard : ntdll: Add a helper to get the Wow64 TEB.
by Alexandre Julliard June 17, 2021

June 17, 2021

Module: wine Branch: master Commit: 7b4ca95ab63c86549bb6fd7a6acbe43b9b28c964 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b4ca95ab63c86549bb6fd7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 17 09:25:06 2021 +0200 ntdll: Add a helper to get the Wow64 TEB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/thread.c | 34 +++++++++++++--------------------- dlls/ntdll/unix/unix_private.h | 7 +++++++ dlls/ntdll/unix/virtual.c | 20 ++++++-------------- 3 files changed, 26 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index c7b94eba923..f8ef274db0c 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -761,19 +761,14 @@ static SIZE_T get_machine_context_size( USHORT machine ) */ void set_thread_id( TEB *teb, DWORD pid, DWORD tid ) { + WOW_TEB *wow_teb = get_wow_teb( teb ); + teb->ClientId.UniqueProcess = ULongToHandle( pid ); teb->ClientId.UniqueThread = ULongToHandle( tid ); - if (teb->WowTebOffset) + if (wow_teb) { -#ifdef _WIN64 - TEB32 *teb32 = (TEB32 *)((char *)teb + teb->WowTebOffset); - teb32->ClientId.UniqueProcess = pid; - teb32->ClientId.UniqueThread = tid; -#else - TEB64 *teb64 = (TEB64 *)((char *)teb + teb->WowTebOffset); - teb64->ClientId.UniqueProcess = pid; - teb64->ClientId.UniqueThread = tid; -#endif + wow_teb->ClientId.UniqueProcess = pid; + wow_teb->ClientId.UniqueThread = tid; } } @@ -784,24 +779,23 @@ void set_thread_id( TEB *teb, DWORD pid, DWORD tid ) NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR zero_bits, SIZE_T reserve_size, SIZE_T commit_size ) { struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; + WOW_TEB *wow_teb = get_wow_teb( teb ); INITIAL_TEB stack; NTSTATUS status; - if (teb->WowTebOffset) + if (wow_teb) { WOW64_CPURESERVED *cpu; SIZE_T cpusize = sizeof(WOW64_CPURESERVED) + ((get_machine_context_size( main_image_info.Machine ) + 7) & ~7) + sizeof(ULONG64); #ifdef _WIN64 - TEB32 *teb32 = (TEB32 *)((char *)teb + teb->WowTebOffset); - /* 32-bit stack */ if ((status = virtual_alloc_thread_stack( &stack, zero_bits, reserve_size, commit_size, 0 ))) return status; - teb32->Tib.StackBase = PtrToUlong( stack.StackBase ); - teb32->Tib.StackLimit = PtrToUlong( stack.StackLimit ); - teb32->DeallocationStack = PtrToUlong( stack.DeallocationStack ); + wow_teb->Tib.StackBase = PtrToUlong( stack.StackBase ); + wow_teb->Tib.StackLimit = PtrToUlong( stack.StackLimit ); + wow_teb->DeallocationStack = PtrToUlong( stack.DeallocationStack ); /* 64-bit stack */ if ((status = virtual_alloc_thread_stack( &stack, 0, 0x40000, 0x40000, kernel_stack_size ))) @@ -814,16 +808,14 @@ NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR zero_bits, SIZE_T reserve_size, thread_data->kernel_stack = stack.StackBase; return STATUS_SUCCESS; #else - TEB64 *teb64 = (TEB64 *)((char *)teb + teb->WowTebOffset); - /* 64-bit stack */ if ((status = virtual_alloc_thread_stack( &stack, 0, 0x40000, 0x40000, 0 ))) return status; cpu = (WOW64_CPURESERVED *)(((ULONG_PTR)stack.StackBase - cpusize) & ~15); cpu->Machine = main_image_info.Machine; - teb64->Tib.StackBase = teb64->TlsSlots[WOW64_TLS_CPURESERVED] = PtrToUlong( cpu ); - teb64->Tib.StackLimit = PtrToUlong( stack.StackLimit ); - teb64->DeallocationStack = PtrToUlong( stack.DeallocationStack ); + wow_teb->Tib.StackBase = wow_teb->TlsSlots[WOW64_TLS_CPURESERVED] = PtrToUlong( cpu ); + wow_teb->Tib.StackLimit = PtrToUlong( stack.StackLimit ); + wow_teb->DeallocationStack = PtrToUlong( stack.DeallocationStack ); #endif } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index c8c959029d0..a864604377e 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -321,11 +321,18 @@ static inline void mutex_unlock( pthread_mutex_t *mutex ) } #ifdef _WIN64 +typedef TEB32 WOW_TEB; static inline TEB64 *NtCurrentTeb64(void) { return NULL; } #else +typedef TEB64 WOW_TEB; static inline TEB64 *NtCurrentTeb64(void) { return (TEB64 *)NtCurrentTeb()->GdiBatchCount; } #endif +static inline WOW_TEB *get_wow_teb( TEB *teb ) +{ + return teb->WowTebOffset ? (WOW_TEB *)((char *)teb + teb->WowTebOffset) : NULL; +} + enum loadorder { LO_INVALID, diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 6c3bc04ace7..c268b66f50c 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2985,9 +2985,10 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) void virtual_free_teb( TEB *teb ) { struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; - void *ptr = teb; + void *ptr; SIZE_T size; sigset_t sigset; + WOW_TEB *wow_teb = get_wow_teb( teb ); signal_free_thread( teb ); if (teb->DeallocationStack) @@ -3000,24 +3001,15 @@ void virtual_free_teb( TEB *teb ) size = 0; NtFreeVirtualMemory( GetCurrentProcess(), &thread_data->kernel_stack, &size, MEM_RELEASE ); } - if (teb->WowTebOffset) + if (wow_teb && (ptr = ULongToPtr( wow_teb->DeallocationStack ))) { -#ifdef _WIN64 - TEB32 *teb32 = (TEB32 *)((char *)teb + teb->WowTebOffset); - void *addr = ULongToPtr( teb32->DeallocationStack ); -#else - TEB64 *teb64 = (TEB64 *)((char *)teb + teb->WowTebOffset); - void *addr = ULongToPtr( teb64->DeallocationStack ); -#endif - if (addr) - { - size = 0; - NtFreeVirtualMemory( GetCurrentProcess(), &addr, &size, MEM_RELEASE ); - } + size = 0; + NtFreeVirtualMemory( GetCurrentProcess(), &ptr, &size, MEM_RELEASE ); } server_enter_uninterrupted_section( &virtual_mutex, &sigset ); list_remove( &thread_data->entry ); + ptr = teb; if (!is_win64) ptr = (char *)ptr - teb_offset; *(void **)ptr = next_free_teb; next_free_teb = ptr;

1 0

Giovanni Mascellani : winegstreamer: Expose the MF_MT_VIDEO_ROTATION attribute.
by Alexandre Julliard June 17, 2021

June 17, 2021

Module: wine Branch: master Commit: 997074224a01041f57aeb23c1b73f03002216e1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=997074224a01041f57aeb23c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Jun 17 13:30:36 2021 +0200 winegstreamer: Expose the MF_MT_VIDEO_ROTATION attribute. The stricter checks imposed by commit ac39b313b618ab8d1613302c3604ba505afff0df, while being valid in general, require that media source attaches to media types the attributes that application can request. This patch exposes the MF_MT_VIDEO_ROTATION attribute, which is for example requested by Legend of Keepers. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 7 +++++++ dlls/winegstreamer/mfplat.c | 1 + include/mfapi.h | 8 ++++++++ 3 files changed, 16 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ff24c2c0ec0..f1c041b7eb4 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -664,6 +664,7 @@ static void test_source_resolver(void) HRESULT hr; GUID guid; float rate; + UINT32 rotation; if (!pMFCreateSourceResolver) { @@ -849,6 +850,12 @@ static void test_source_resolver(void) ok(hr == S_OK, "Failed to get media sub type, hr %#x.\n", hr); todo_wine ok(IsEqualGUID(&guid, &MFVideoFormat_M4S2), "Unexpected sub type %s.\n", debugstr_guid(&guid)); + + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_ROTATION, &rotation); + ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */, "Failed to get rotation, hr %#x.\n", hr); + if (hr == S_OK) + ok(rotation == MFVideoRotationFormat_0, "Got wrong rotation %u.\n", rotation); + IMFMediaType_Release(media_type); hr = IMFPresentationDescriptor_SelectStream(descriptor, 0); diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index bb632c2cc2c..dfa448afcfe 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -596,6 +596,7 @@ static IMFMediaType *mf_media_type_from_wg_format_video(const struct wg_format * make_uint64(format->u.video.fps_n, format->u.video.fps_d)); IMFMediaType_SetUINT32(type, &MF_MT_COMPRESSED, FALSE); IMFMediaType_SetUINT32(type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + IMFMediaType_SetUINT32(type, &MF_MT_VIDEO_ROTATION, MFVideoRotationFormat_0); return type; } diff --git a/include/mfapi.h b/include/mfapi.h index e4a1f6a3dc0..382210ad9e2 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -449,6 +449,14 @@ typedef enum _MFWaveFormatExConvertFlags MFWaveFormatExConvertFlag_ForceExtensible = 1, } MFWaveFormatExConvertFlags; +typedef enum _MFVideoRotationFormat +{ + MFVideoRotationFormat_0 = 0, + MFVideoRotationFormat_90 = 90, + MFVideoRotationFormat_180 = 180, + MFVideoRotationFormat_270 = 270 +} MFVideoRotationFormat; + enum _MFT_ENUM_FLAG { MFT_ENUM_FLAG_SYNCMFT = 0x00000001,

1 0

Nikolay Sivov : include: Add IMFWorkQueueServicesEx definition.
by Alexandre Julliard June 17, 2021

June 17, 2021

Module: wine Branch: master Commit: 0ca8b6dd1f7e8a1ee1099353f0e4c48615fe26a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ca8b6dd1f7e8a1ee1099353… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 17 15:07:26 2021 +0300 include: Add IMFWorkQueueServicesEx definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 4e1a29d43d6..76e0d0dfeb4 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1270,6 +1270,165 @@ interface IMFRealTimeClientEx : IUnknown ); } +[ + object, + uuid(35fe1bb8-a3a9-40fe-bbec-eb569c9ccca3), +] +interface IMFWorkQueueServices : IUnknown +{ + [local] + HRESULT BeginRegisterTopologyWorkQueuesWithMMCSS( + [in] IMFAsyncCallback *callback, + [in] IUnknown *state + ); + + [call_as(BeginRegisterTopologyWorkQueuesWithMMCSS)] + HRESULT RemoteBeginRegisterTopologyWorkQueuesWithMMCSS( + [in] IMFRemoteAsyncCallback *callback + ); + + [local] + HRESULT EndRegisterTopologyWorkQueuesWithMMCSS( + [in] IMFAsyncResult *result + ); + + [call_as(EndRegisterTopologyWorkQueuesWithMMCSS)] + HRESULT RemoteEndRegisterTopologyWorkQueuesWithMMCSS( + [in] IUnknown *result + ); + + [local] + HRESULT BeginUnregisterTopologyWorkQueuesWithMMCSS( + [in] IMFAsyncCallback *callback, + [in] IUnknown *state + ); + + [call_as(BeginUnregisterTopologyWorkQueuesWithMMCSS)] + HRESULT RemoteBeginUnregisterTopologyWorkQueuesWithMMCSS( + [in] IMFRemoteAsyncCallback *callback + ); + + [local] + HRESULT EndUnregisterTopologyWorkQueuesWithMMCSS( + [in] IMFAsyncResult *result + ); + + [call_as(EndUnregisterTopologyWorkQueuesWithMMCSS)] + HRESULT RemoteEndUnregisterTopologyWorkQueuesWithMMCSS( + [in] IUnknown *result + ); + + HRESULT GetTopologyWorkQueueMMCSSClass( + [in] DWORD queue, + [out, size_is(*classname_len)] LPWSTR classname, + [in, out] DWORD *classname_len + ); + + HRESULT GetTopologyWorkQueueMMCSSTaskId( + [in] DWORD queue, + [out] DWORD *taksid + ); + + [local] + HRESULT BeginRegisterPlatformWorkQueueWithMMCSS( + [in] DWORD platform_queue, + [in] LPCWSTR classname, + [in] DWORD taskid, + [in] IMFAsyncCallback *callback, + [in] IUnknown *state + ); + + [call_as(BeginRegisterPlatformWorkQueueWithMMCSS)] + HRESULT RemoteBeginRegisterPlatformWorkQueueWithMMCSS( + [in] DWORD platform_queue, + [in] LPCWSTR classname, + [in] DWORD taskid, + [in] IMFRemoteAsyncCallback *callback + ); + + [local] + HRESULT EndRegisterPlatformWorkQueueWithMMCSS( + [in] IMFAsyncResult *result, + [out] DWORD *taskid + ); + + [call_as(EndRegisterPlatformWorkQueueWithMMCSS)] + HRESULT RemoteEndRegisterPlatformWorkQueueWithMMCSS( + [in] IUnknown *result, + [out] DWORD *taskid + ); + + [local] + HRESULT BeginUnregisterPlatformWorkQueueWithMMCSS( + [in] DWORD platform_queue, + [in] IMFAsyncCallback *callback, + [in] IUnknown *state + ); + + [call_as(BeginUnregisterPlatformWorkQueueWithMMCSS)] + HRESULT RemoteBeginUnregisterPlatformWorkQueueWithMMCSS( + [in] DWORD platform_queue, + [in] IMFRemoteAsyncCallback *callback + ); + + [local] + HRESULT EndUnregisterPlatformWorkQueueWithMMCSS( + [in] IMFAsyncResult *result + ); + + [call_as(EndUnregisterPlatformWorkQueueWithMMCSS)] + HRESULT RemoteEndUnregisterPlatformWorkQueueWithMMCSS( + [in] IUnknown *result + ); + + HRESULT GetPlaftormWorkQueueMMCSSClass( + [in] DWORD platform_queue, + [out, size_is(*classname_len)] LPWSTR classname, + [in, out] DWORD *classname_len + ); + + HRESULT GetPlatformWorkQueueMMCSSTaskId( + [in] DWORD platform_queue, + [out] DWORD *taskid + ); +} + +[ + object, + uuid(96bf961b-40fe-42f1-ba9d-320238b49700), +] +interface IMFWorkQueueServicesEx : IMFWorkQueueServices +{ + HRESULT GetTopologyWorkQueueMMCSSPriority( + [in] DWORD queueid, + [out] LONG *priority + ); + + [local] + HRESULT BeginRegisterPlatformWorkQueueWithMMCSSEx( + [in] DWORD platform_queue, + [in] LPCWSTR classname, + [in] DWORD taskid, + [in] LONG priority, + [in] IMFAsyncCallback *callback, + [in] IUnknown *state + ); + + [call_as(BeginRegisterPlatformWorkQueueWithMMCSSEx)] + HRESULT RemoteBeginRegisterPlatformWorkQueueWithMMCSSEx( + [in] DWORD platform_queue, + [in] LPCWSTR classname, + [in] DWORD taskid, + [in] LONG priority, + [in] IMFRemoteAsyncCallback *callback + ); + + HRESULT GetPlatformWorkQueueMMCSSPriority( + [in] DWORD platform_queue, + [out] LONG *priority + ); +} + enum { MF_ACTIVATE_CUSTOM_MIXER_ALLOWFAIL = 0x00000001, @@ -1386,6 +1545,7 @@ cpp_quote("EXTERN_GUID(MR_CAPTURE_POLICY_VOLUME_SERVICE, 0x24030acd, 0x107a, 0x4 cpp_quote("EXTERN_GUID(MR_STREAM_VOLUME_SERVICE, 0xf8b5fa2f, 0x32ef, 0x46f5, 0xb1, 0x72, 0x13, 0x21, 0x21, 0x2f, 0xb2, 0xc4);") cpp_quote("EXTERN_GUID(MR_AUDIO_POLICY_SERVICE, 0x911fd737, 0x6775, 0x4ab0, 0xa6, 0x14, 0x29, 0x78, 0x62, 0xfd, 0xac, 0x88);") cpp_quote("EXTERN_GUID(MF_PROPERTY_HANDLER_SERVICE, 0xa3face02, 0x32b8, 0x41dd, 0x90, 0xe7, 0x5f, 0xef, 0x7c, 0x89, 0x91, 0xb5);") +cpp_quote("EXTERN_GUID(MF_WORKQUEUE_SERVICES, 0x8e37d489, 0x41e0, 0x413a, 0x90, 0x68, 0x28, 0x7c, 0x88, 0x6d, 0x8d, 0xda);") cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET, 0x62e3d776, 0x8100, 0x4e03, 0xa6, 0xe8, 0xbd, 0x38, 0x57, 0xac, 0x9c, 0x47);") cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, 0x0efda2c0, 0x2b69, 0x4e2e, 0xab, 0x8d, 0x46, 0xdc, 0xbf, 0xf7, 0xd2, 0x5d);")

1 0