March 2020 - Wine-Commits - list.winehq.org

Nikolay Sivov : mfplat: Add some MFT-related attributes GUIDs.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 063e58fbaba7e279277e76140bbab6bb5656cf9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=063e58fbaba7e279277e7614… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 3 12:22:43 2020 +0300 mfplat: Add some MFT-related attributes GUIDs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 31 +++++++++++++++++++++++++++++++ include/mfapi.h | 3 +++ include/mfidl.idl | 2 ++ include/mftransform.idl | 25 +++++++++++++++++++++++++ 4 files changed, 61 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=063e58fbaba7e279277e…

1 0

Zebediah Figura : d3dcompiler: Parse return statements without a value.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: e597b9e5554f05287377233233adc370449667d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e597b9e5554f052873772332… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 1 22:55:24 2020 -0600 d3dcompiler: Parse return statements without a value. 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 | 55 +++++++++++++++++++++++++---------- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 2 +- 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index b6478bf3fe..0f9676df16 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -481,6 +481,28 @@ 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_ir_jump *jump = d3dcompiler_alloc(sizeof(*jump)); + if (!jump) + { + ERR("Out of memory\n"); + return NULL; + } + jump->node.type = HLSL_IR_JUMP; + jump->node.loc = loc; + jump->type = HLSL_IR_JUMP_RETURN; + jump->node.data_type = value ? value->data_type + : new_hlsl_type(d3dcompiler_strdup("void"), HLSL_CLASS_OBJECT, HLSL_TYPE_VOID, 1, 1); + jump->return_value = value; + + FIXME("Check for valued return on void function.\n"); + FIXME("Implicit conversion to the return type if needed, " + "error out if conversion not possible.\n"); + + return jump; +} + static void struct_var_initializer(struct list *list, struct hlsl_ir_var *var, struct parse_initializer *initializer) { @@ -1769,28 +1791,31 @@ statement: declaration_statement | selection_statement | loop_statement - /* FIXME: add rule for return with no value */ jump_statement: KW_RETURN expr ';' { - struct hlsl_ir_jump *jump = d3dcompiler_alloc(sizeof(*jump)); - if (!jump) - { - ERR("Out of memory\n"); - YYABORT; - } - jump->node.type = HLSL_IR_JUMP; - set_location(&jump->node.loc, &@1); - jump->type = HLSL_IR_JUMP_RETURN; - jump->node.data_type = node_from_list($2)->data_type; - jump->return_value = node_from_list($2); + struct source_location loc; + struct hlsl_ir_jump *jump; - FIXME("Check for valued return on void function.\n"); - FIXME("Implicit conversion to the return type if needed, " - "error out if conversion not possible.\n"); + set_location(&loc, &@1); + if (!(jump = new_return(node_from_list($2), loc))) + YYABORT; $$ = $2; list_add_tail($$, &jump->node.entry); } + | KW_RETURN ';' + { + struct source_location loc; + struct hlsl_ir_jump *jump; + + set_location(&loc, &@1); + if (!(jump = new_return(NULL, loc))) + YYABORT; + + $$ = d3dcompiler_alloc(sizeof(*$$)); + list_init($$); + list_add_tail($$, &jump->node.entry); + } selection_statement: KW_IF '(' expr ')' if_body { diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 062ef0a84a..f1ce5dc5bc 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -730,7 +730,7 @@ static void test_fail(void) compiled = errors = NULL; hr = ppD3DCompile(tests[i], strlen(tests[i]), NULL, NULL, NULL, "test", targets[j], 0, 0, &compiled, &errors); todo_wine ok(hr == E_FAIL, "Test %u, target %s, got unexpected hr %#x.\n", i, targets[j], hr); - todo_wine_if (i == 1 || i >= 8) ok(!!errors, "Test %u, target %s, expected non-NULL error blob.\n", i, targets[j]); + todo_wine_if (i == 1 || i >= 7) ok(!!errors, "Test %u, target %s, expected non-NULL error blob.\n", i, targets[j]); ok(!compiled, "Test %u, target %s, expected no compiled shader blob.\n", i, targets[j]); if (errors) ID3D10Blob_Release(errors);

1 0

Zebediah Figura : d3dcompiler: Check for implicit type compatibility in implicit_conversion().
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 60f78a14769520f41a984d1abb3e5a38154080df URL: https://source.winehq.org/git/wine.git/?a=commit;h=60f78a14769520f41a984d1a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 1 22:55:25 2020 -0600 d3dcompiler: Check for implicit type compatibility in implicit_conversion(). 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/utils.c | 60 ++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 5e497495e6..65f5ead333 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1275,16 +1275,31 @@ static struct hlsl_type *expr_common_type(struct hlsl_type *t1, struct hlsl_type return new_hlsl_type(NULL, type, base, dimx, dimy); } -static struct hlsl_ir_node *implicit_conversion(struct hlsl_ir_node *node, struct hlsl_type *type, +static struct hlsl_ir_node *implicit_conversion(struct hlsl_ir_node *node, struct hlsl_type *dst_type, struct source_location *loc) { + struct hlsl_type *src_type = node->data_type; struct hlsl_ir_expr *cast; - if (compare_hlsl_types(node->data_type, type)) + if (compare_hlsl_types(src_type, dst_type)) return node; - TRACE("Implicit conversion of expression to %s\n", debug_hlsl_type(type)); - if ((cast = new_cast(node, type, loc))) - list_add_after(&node->entry, &cast->node.entry); + + if (!implicit_compatible_data_types(src_type, dst_type)) + { + hlsl_report_message(loc->file, loc->line, loc->col, HLSL_LEVEL_ERROR, + "can't implicitly convert %s to %s", debug_hlsl_type(src_type), debug_hlsl_type(dst_type)); + return NULL; + } + + if (dst_type->dimx * dst_type->dimy < src_type->dimx * src_type->dimy) + hlsl_report_message(loc->file, loc->line, loc->col, HLSL_LEVEL_WARNING, + "implicit truncation of vector type"); + + TRACE("Implicit conversion from %s to %s.\n", debug_hlsl_type(src_type), debug_hlsl_type(dst_type)); + + if (!(cast = new_cast(node, dst_type, loc))) + return NULL; + list_add_after(&node->entry, &cast->node.entry); return &cast->node; } @@ -1316,6 +1331,8 @@ struct hlsl_ir_expr *new_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node **ope } for (i = 0; i <= 2; ++i) { + struct hlsl_ir_expr *cast; + if (!operands[i]) break; if (compare_hlsl_types(operands[i]->data_type, type)) @@ -1328,13 +1345,14 @@ struct hlsl_ir_expr *new_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node **ope operands[i]->loc.line, operands[i]->loc.col, HLSL_LEVEL_WARNING, "implicit truncation of vector/matrix type"); } - operands[i] = implicit_conversion(operands[i], type, &operands[i]->loc); - if (!operands[i]) + + if (!(cast = new_cast(operands[i], type, &operands[i]->loc))) { - ERR("Impossible to convert expression operand %u to %s\n", i + 1, debug_hlsl_type(type)); d3dcompiler_free(expr); return NULL; } + list_add_after(&operands[i]->entry, &cast->node.entry); + operands[i] = &cast->node; } expr->node.data_type = type; expr->op = op; @@ -1463,31 +1481,7 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig lhs = left; /* FIXME: check for invalid writemasks on the lhs. */ - if (!compare_hlsl_types(type, rhs->data_type)) - { - struct hlsl_ir_node *converted_rhs; - - if (!implicit_compatible_data_types(rhs->data_type, type)) - { - hlsl_report_message(rhs->loc.file, rhs->loc.line, rhs->loc.col, HLSL_LEVEL_ERROR, - "can't implicitly convert %s to %s", - debug_hlsl_type(rhs->data_type), debug_hlsl_type(type)); - d3dcompiler_free(assign); - return NULL; - } - if (lhs->data_type->dimx * lhs->data_type->dimy < rhs->data_type->dimx * rhs->data_type->dimy) - hlsl_report_message(rhs->loc.file, rhs->loc.line, rhs->loc.col, HLSL_LEVEL_WARNING, - "implicit truncation of vector type"); - - converted_rhs = implicit_conversion(rhs, type, &rhs->loc); - if (!converted_rhs) - { - ERR("Couldn't implicitly convert expression to %s.\n", debug_hlsl_type(type)); - d3dcompiler_free(assign); - return NULL; - } - rhs = converted_rhs; - } + rhs = implicit_conversion(rhs, type, &rhs->loc); assign->lhs = lhs; if (assign_op != ASSIGN_OP_ASSIGN)

1 0

Zebediah Figura : d3dcompiler: Verify a returned value against the function's type and cast it if necessary.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 09b2e42e92a1dfe55ecdbb19b27922f39dd8c6c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09b2e42e92a1dfe55ecdbb19… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 1 22:55:26 2020 -0600 d3dcompiler: Verify a returned value against the function's type and cast it if necessary. 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 | 3 +++ dlls/d3dcompiler_43/hlsl.y | 24 +++++++++++++++++------- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 2 +- dlls/d3dcompiler_43/utils.c | 2 +- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 22cc41db56..ab712c8d96 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -1046,6 +1046,7 @@ struct hlsl_parse_ctx struct list types; struct wine_rb_tree functions; + const struct hlsl_ir_function_decl *cur_function; enum hlsl_matrix_majority matrix_majority; }; @@ -1138,6 +1139,8 @@ struct hlsl_ir_expr *new_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node **ope struct source_location *loc) DECLSPEC_HIDDEN; struct hlsl_ir_expr *new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, struct source_location *loc) DECLSPEC_HIDDEN; +struct hlsl_ir_node *implicit_conversion(struct hlsl_ir_node *node, struct hlsl_type *type, + struct source_location *loc) DECLSPEC_HIDDEN; struct hlsl_ir_deref *new_var_deref(struct hlsl_ir_var *var) DECLSPEC_HIDDEN; struct hlsl_ir_deref *new_record_deref(struct hlsl_ir_node *record, struct hlsl_struct_field *field) DECLSPEC_HIDDEN; struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assign_op assign_op, diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 0f9676df16..34adab2855 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -492,13 +492,22 @@ static struct hlsl_ir_jump *new_return(struct hlsl_ir_node *value, struct source jump->node.type = HLSL_IR_JUMP; jump->node.loc = loc; jump->type = HLSL_IR_JUMP_RETURN; - jump->node.data_type = value ? value->data_type - : new_hlsl_type(d3dcompiler_strdup("void"), HLSL_CLASS_OBJECT, HLSL_TYPE_VOID, 1, 1); - jump->return_value = value; - - FIXME("Check for valued return on void function.\n"); - FIXME("Implicit conversion to the return type if needed, " - "error out if conversion not possible.\n"); + jump->node.data_type = hlsl_ctx.cur_function->return_type; + if (value) + { + if (!(jump->return_value = implicit_conversion(value, jump->node.data_type, &loc))) + { + d3dcompiler_free(jump); + return NULL; + } + } + else if (jump->node.data_type->base_type != HLSL_TYPE_VOID) + { + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "non-void function must return a value"); + d3dcompiler_free(jump); + return NULL; + } return jump; } @@ -1336,6 +1345,7 @@ func_prototype: var_modifiers type var_identifier '(' parameters ')' c $$.name = $3; $$.decl->semantic = $7.semantic; set_location(&$$.decl->loc, &@3); + hlsl_ctx.cur_function = $$.decl; } compound_statement: '{' '}' diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index f1ce5dc5bc..c673e2be32 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -730,7 +730,7 @@ static void test_fail(void) compiled = errors = NULL; hr = ppD3DCompile(tests[i], strlen(tests[i]), NULL, NULL, NULL, "test", targets[j], 0, 0, &compiled, &errors); todo_wine ok(hr == E_FAIL, "Test %u, target %s, got unexpected hr %#x.\n", i, targets[j], hr); - todo_wine_if (i == 1 || i >= 7) ok(!!errors, "Test %u, target %s, expected non-NULL error blob.\n", i, targets[j]); + todo_wine_if (i == 1) ok(!!errors, "Test %u, target %s, expected non-NULL error blob.\n", i, targets[j]); ok(!compiled, "Test %u, target %s, expected no compiled shader blob.\n", i, targets[j]); if (errors) ID3D10Blob_Release(errors); diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 65f5ead333..28ec47423a 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1275,7 +1275,7 @@ static struct hlsl_type *expr_common_type(struct hlsl_type *t1, struct hlsl_type return new_hlsl_type(NULL, type, base, dimx, dimy); } -static struct hlsl_ir_node *implicit_conversion(struct hlsl_ir_node *node, struct hlsl_type *dst_type, +struct hlsl_ir_node *implicit_conversion(struct hlsl_ir_node *node, struct hlsl_type *dst_type, struct source_location *loc) { struct hlsl_type *src_type = node->data_type;

1 0

Alistair Leslie-Hughes : oledb32: Initialize data provider when switching tabs.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 67a791270f35abb6d2aa13ef93cf77303f0ac95c URL: https://source.winehq.org/git/wine.git/?a=commit;h=67a791270f35abb6d2aa13ef… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 3 00:01:21 2020 +0000 oledb32: Initialize data provider when switching tabs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/dslocator.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/oledb32/resource.h | 1 + dlls/oledb32/version.rc | 1 + po/ar.po | 64 ++++++++++++++------------ po/ast.po | 64 ++++++++++++++------------ po/bg.po | 64 ++++++++++++++------------ po/ca.po | 64 ++++++++++++++------------ po/cs.po | 64 ++++++++++++++------------ po/da.po | 64 ++++++++++++++------------ po/de.po | 64 ++++++++++++++------------ po/el.po | 64 ++++++++++++++------------ po/en.po | 66 +++++++++++++++------------ po/en_US.po | 66 +++++++++++++++------------ po/eo.po | 64 ++++++++++++++------------ po/es.po | 64 ++++++++++++++------------ po/fa.po | 64 ++++++++++++++------------ po/fi.po | 64 ++++++++++++++------------ po/fr.po | 64 ++++++++++++++------------ po/he.po | 64 ++++++++++++++------------ po/hi.po | 64 ++++++++++++++------------ po/hr.po | 64 ++++++++++++++------------ po/hu.po | 64 ++++++++++++++------------ po/it.po | 64 ++++++++++++++------------ po/ja.po | 64 ++++++++++++++------------ po/ko.po | 64 ++++++++++++++------------ po/lt.po | 64 ++++++++++++++------------ po/ml.po | 64 ++++++++++++++------------ po/nb_NO.po | 64 ++++++++++++++------------ po/nl.po | 64 ++++++++++++++------------ po/or.po | 64 ++++++++++++++------------ po/pa.po | 64 ++++++++++++++------------ po/pl.po | 64 ++++++++++++++------------ po/pt_BR.po | 64 ++++++++++++++------------ po/pt_PT.po | 64 ++++++++++++++------------ po/rm.po | 64 ++++++++++++++------------ po/ro.po | 64 ++++++++++++++------------ po/ru.po | 64 ++++++++++++++------------ po/si.po | 64 ++++++++++++++------------ po/sk.po | 64 ++++++++++++++------------ po/sl.po | 64 ++++++++++++++------------ po/sr_RS(a)cyrillic.po | 64 ++++++++++++++------------ po/sr_RS(a)latin.po | 64 ++++++++++++++------------ po/sv.po | 64 ++++++++++++++------------ po/ta.po | 64 ++++++++++++++------------ po/te.po | 64 ++++++++++++++------------ po/th.po | 64 ++++++++++++++------------ po/tr.po | 64 ++++++++++++++------------ po/uk.po | 64 ++++++++++++++------------ po/wa.po | 64 ++++++++++++++------------ po/wine.pot | 64 ++++++++++++++------------ po/zh_CN.po | 64 ++++++++++++++------------ po/zh_TW.po | 64 ++++++++++++++------------ 52 files changed, 1834 insertions(+), 1423 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=67a791270f35abb6d2aa…

1 0

Vijay Kiran Kamuju : include: Fix QUOTA_LIMITS_EX in winnt.h.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 739b975b1eb9c3f2024b40efa88c50c172285515 URL: https://source.winehq.org/git/wine.git/?a=commit;h=739b975b1eb9c3f2024b40ef… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Mar 1 07:21:57 2020 +0100 include: Fix QUOTA_LIMITS_EX in winnt.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 771f769f2f..50a6213ef0 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5342,6 +5342,15 @@ typedef struct _QUOTA_LIMITS { #define QUOTA_LIMITS_HARDWS_MIN_DISABLE 0x00000002 #define QUOTA_LIMITS_HARDWS_MAX_ENABLE 0x00000004 #define QUOTA_LIMITS_HARDWS_MAX_DISABLE 0x00000008 +#define QUOTA_LIMITS_USE_DEFAULT_LIMITS 0x00000010 + +typedef union _RATE_QUOTA_LIMIT { + DWORD RateData; + struct { + DWORD RatePercent:7; + DWORD Reserved0:25; + } DUMMYSTRUCTNAME; +} RATE_QUOTA_LIMIT, *PRATE_QUOTA_LIMIT; typedef struct _QUOTA_LIMITS_EX { SIZE_T PagedPoolLimit; @@ -5350,12 +5359,12 @@ typedef struct _QUOTA_LIMITS_EX { SIZE_T MaximumWorkingSetSize; SIZE_T PagefileLimit; LARGE_INTEGER TimeLimit; - SIZE_T Reserved1; + SIZE_T WorkingSetLimit; SIZE_T Reserved2; SIZE_T Reserved3; SIZE_T Reserved4; DWORD Flags; - DWORD Reserved5; + RATE_QUOTA_LIMIT CpuRateLimit; } QUOTA_LIMITS_EX, *PQUOTA_LIMITS_EX; #define SECTION_QUERY 0x0001

1 0

Vijay Kiran Kamuju : include: Add some missing defines in winnt.h.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: c921f9724a2c37e8d2e7a99bebfaffdff504a45e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c921f9724a2c37e8d2e7a99b… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Mar 1 07:16:16 2020 +0100 include: Add some missing defines in winnt.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index adb7ef5669..771f769f2f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4340,6 +4340,12 @@ typedef struct _ACL_SIZE_INFORMATION #define SE_MANAGE_VOLUME_NAME L"SeManageVolumePrivilege" #define SE_IMPERSONATE_NAME L"SeImpersonatePrivilege" #define SE_CREATE_GLOBAL_NAME L"SeCreateGlobalPrivilege" +#define SE_TRUSTED_CREDMAN_ACCESS_NAME L"SeTrustedCredManAccessPrivilege" +#define SE_RELABEL_NAME L"SeRelabelPrivilege" +#define SE_INC_WORKING_SET_NAME L"SeIncreaseWorkingSetPrivilege" +#define SE_TIME_ZONE_NAME L"SeTimeZonePrivilege" +#define SE_CREATE_SYMBOLIC_LINK_NAME L"SeCreateSymbolicLinkPrivilege" +#define SE_DELEGATE_SESSION_USER_IMPERSONATE_NAME L"SeDelegateSessionUserImpersonatePrivilege" #else /* _MSC_VER/__MINGW32__ */ static const WCHAR SE_CREATE_TOKEN_NAME[] = { 'S','e','C','r','e','a','t','e','T','o','k','e','n','P','r','i','v','i','l','e','g','e',0 }; static const WCHAR SE_ASSIGNPRIMARYTOKEN_NAME[] = { 'S','e','A','s','s','i','g','n','P','r','i','m','a','r','y','T','o','k','e','n','P','r','i','v','i','l','e','g','e',0 }; @@ -4370,6 +4376,12 @@ static const WCHAR SE_ENABLE_DELEGATION_NAME[] = { 'S','e','E','n','a','b','l',' static const WCHAR SE_MANAGE_VOLUME_NAME[] = { 'S','e','M','a','n','a','g','e','V','o','l','u','m','e','P','r','i','v','i','l','e','g','e',0 }; static const WCHAR SE_IMPERSONATE_NAME[] = { 'S','e','I','m','p','e','r','s','o','n','a','t','e','P','r','i','v','i','l','e','g','e',0 }; static const WCHAR SE_CREATE_GLOBAL_NAME[] = { 'S','e','C','r','e','a','t','e','G','l','o','b','a','l','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_TRUSTED_CREDMAN_ACCESS_NAME[] = { 'S','e','T','r','u','s','t','e','d','C','r','e','d','M','a','n','A','c','c','e','s','s','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_RELABEL_NAME[] = { 'S','e','R','e','l','a','b','e','l','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_INC_WORKING_SET_NAME[] = { 'S','e','I','n','c','r','e','a','s','e','W','o','r','k','i','n','g','S','e','t','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_TIME_ZONE_NAME[] = { 'S','e','T','i','m','e','Z','o','n','e','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_CREATE_SYMBOLIC_LINK_NAME[] = { 'S','e','C','r','e','a','t','e','S','y','m','b','o','l','i','c','L','i','n','k','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_DELEGATE_SESSION_USER_IMPERSONATE_NAME[] = { 'S','e','D','e','l','e','g','a','t','e','S','e','s','s','i','o','n','U','s','e','r','I','m','p','e','r','s','o','n','a','t','e','P','r','i','v','i','l','e','g','e',0 }; #endif #else /* UNICODE */ #define SE_CREATE_TOKEN_NAME "SeCreateTokenPrivilege" @@ -4401,6 +4413,12 @@ static const WCHAR SE_CREATE_GLOBAL_NAME[] = { 'S','e','C','r','e','a','t','e',' #define SE_MANAGE_VOLUME_NAME "SeManageVolumePrivilege" #define SE_IMPERSONATE_NAME "SeImpersonatePrivilege" #define SE_CREATE_GLOBAL_NAME "SeCreateGlobalPrivilege" +#define SE_TRUSTED_CREDMAN_ACCESS_NAME "SeTrustedCredManAccessPrivilege" +#define SE_RELABEL_NAME "SeRelabelPrivilege" +#define SE_INC_WORKING_SET_NAME "SeIncreaseWorkingSetPrivilege" +#define SE_TIME_ZONE_NAME "SeTimeZonePrivilege" +#define SE_CREATE_SYMBOLIC_LINK_NAME "SeCreateSymbolicLinkPrivilege" +#define SE_DELEGATE_SESSION_USER_IMPERSONATE_NAME "SeDelegateSessionUserImpersonatePrivilege" #endif #define SE_GROUP_MANDATORY 0x00000001 @@ -5452,6 +5470,8 @@ typedef struct _QUOTA_LIMITS_EX { #define FILE_SUPPORTS_INTEGRITY_STREAMS 0x04000000 #define FILE_SUPPORTS_BLOCK_REFCOUNTING 0x08000000 #define FILE_SUPPORTS_SPARSE_VDL 0x10000000 +#define FILE_DAX_VOLUME 0x20000000 +#define FILE_SUPPORTS_GHOSTING 0x40000000 /* File alignments (NT) */ #define FILE_BYTE_ALIGNMENT 0x00000000

1 0

Alexandre Julliard : kernel32: Move Idn functions to kernelbase.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 80e8c138f17663fe5d09cb26d90eb273443fde3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=80e8c138f17663fe5d09cb26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 18:35:03 2020 +0100 kernel32: Move Idn functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 +++--- dlls/kernel32/locale.c | 31 ------------------------------- dlls/kernelbase/kernelbase.spec | 6 +++--- dlls/kernelbase/locale.c | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 37 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 99297ea824..b8eaa6cdde 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -938,9 +938,9 @@ @ stub HeapUsage @ stdcall -import HeapValidate(long long ptr) @ stdcall -import HeapWalk(long ptr) -@ stdcall IdnToAscii(long wstr long ptr long) -@ stdcall IdnToNameprepUnicode(long wstr long ptr long) -@ stdcall IdnToUnicode(long wstr long ptr long) +@ stdcall -import IdnToAscii(long wstr long ptr long) +@ stdcall -import IdnToNameprepUnicode(long wstr long ptr long) +@ stdcall -import IdnToUnicode(long wstr long ptr long) @ stdcall InitAtomTable(long) @ stdcall InitOnceBeginInitialize(ptr long ptr ptr) kernelbase.InitOnceBeginInitialize @ stdcall InitOnceComplete(ptr long ptr) kernelbase.InitOnceComplete diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index cb77ec8c7d..ac04e85946 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -541,37 +541,6 @@ INT WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, LPSTR data, int data_len, L } -/****************************************************************************** - * IdnToAscii (KERNEL32.@) - */ -INT WINAPI IdnToAscii( DWORD flags, const WCHAR *src, INT srclen, WCHAR *dst, INT dstlen ) -{ - NTSTATUS status = RtlIdnToAscii( flags, src, srclen, dst, &dstlen ); - if (!set_ntstatus( status )) return 0; - return dstlen; -} - -/****************************************************************************** - * IdnToNameprepUnicode (KERNEL32.@) - */ -INT WINAPI IdnToNameprepUnicode( DWORD flags, const WCHAR *src, INT srclen, WCHAR *dst, INT dstlen ) -{ - NTSTATUS status = RtlIdnToNameprepUnicode( flags, src, srclen, dst, &dstlen ); - if (!set_ntstatus( status )) return 0; - return dstlen; -} - -/****************************************************************************** - * IdnToUnicode (KERNEL32.@) - */ -INT WINAPI IdnToUnicode( DWORD flags, const WCHAR *src, INT srclen, WCHAR *dst, INT dstlen ) -{ - NTSTATUS status = RtlIdnToUnicode( flags, src, srclen, dst, &dstlen ); - if (!set_ntstatus( status )) return 0; - return dstlen; -} - - /****************************************************************************** * GetFileMUIPath (KERNEL32.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 63719b514d..4f39f15f0b 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -785,9 +785,9 @@ @ stdcall HeapUnlock(long) @ stdcall HeapValidate(long long ptr) @ stdcall HeapWalk(long ptr) -@ stdcall IdnToAscii(long wstr long ptr long) kernel32.IdnToAscii -@ stdcall IdnToNameprepUnicode(long wstr long ptr long) kernel32.IdnToNameprepUnicode -@ stdcall IdnToUnicode(long wstr long ptr long) kernel32.IdnToUnicode +@ stdcall IdnToAscii(long wstr long ptr long) +@ stdcall IdnToNameprepUnicode(long wstr long ptr long) +@ stdcall IdnToUnicode(long wstr long ptr long) @ stdcall ImpersonateAnonymousToken(long) @ stdcall ImpersonateLoggedOnUser(long) @ stdcall ImpersonateNamedPipeClient(long) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index aad2422db2..169da01608 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -4459,6 +4459,42 @@ GEOID WINAPI DECLSPEC_HOTPATCH GetUserGeoID( GEOCLASS geoclass ) } +/****************************************************************************** + * IdnToAscii (kernelbase.@) + */ +INT WINAPI DECLSPEC_HOTPATCH IdnToAscii( DWORD flags, const WCHAR *src, INT srclen, + WCHAR *dst, INT dstlen ) +{ + NTSTATUS status = RtlIdnToAscii( flags, src, srclen, dst, &dstlen ); + if (!set_ntstatus( status )) return 0; + return dstlen; +} + + +/****************************************************************************** + * IdnToNameprepUnicode (kernelbase.@) + */ +INT WINAPI DECLSPEC_HOTPATCH IdnToNameprepUnicode( DWORD flags, const WCHAR *src, INT srclen, + WCHAR *dst, INT dstlen ) +{ + NTSTATUS status = RtlIdnToNameprepUnicode( flags, src, srclen, dst, &dstlen ); + if (!set_ntstatus( status )) return 0; + return dstlen; +} + + +/****************************************************************************** + * IdnToUnicode (kernelbase.@) + */ +INT WINAPI DECLSPEC_HOTPATCH IdnToUnicode( DWORD flags, const WCHAR *src, INT srclen, + WCHAR *dst, INT dstlen ) +{ + NTSTATUS status = RtlIdnToUnicode( flags, src, srclen, dst, &dstlen ); + if (!set_ntstatus( status )) return 0; + return dstlen; +} + + /****************************************************************************** * IsCharAlphaA (kernelbase.@) */

1 0

Alexandre Julliard : ntdll: Reimplement IdnToUnicode() using the normalization table and the ntdll helpers.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: ab9fe967f14cd2838ea7e4a43031665c6781b9ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab9fe967f14cd2838ea7e4a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 16:28:48 2020 +0100 ntdll: Reimplement IdnToUnicode() using the normalization table and the ntdll helpers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 173 +------------------------------------------ dlls/kernel32/tests/locale.c | 19 +++-- dlls/ntdll/locale.c | 129 ++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 1 + 5 files changed, 148 insertions(+), 175 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab9fe967f14cd2838ea7…

1 0

Ziqing Hui : comctl32/tests: Add tests for alpha channel of imagelist.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 5784343db8e81006f411f114f10e5c78a96169e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5784343db8e81006f411f114… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Mar 2 10:30:44 2020 +0800 comctl32/tests: Add tests for alpha channel of imagelist. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 70 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index daa1715e7e..9271354edb 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -63,6 +63,7 @@ typedef struct _ILHEAD static HIMAGELIST (WINAPI *pImageList_Create)(int, int, UINT, int, int); static BOOL (WINAPI *pImageList_Destroy)(HIMAGELIST); static int (WINAPI *pImageList_Add)(HIMAGELIST, HBITMAP, HBITMAP); +static int (WINAPI *pImageList_AddMasked)(HIMAGELIST, HBITMAP, COLORREF); static BOOL (WINAPI *pImageList_DrawIndirect)(IMAGELISTDRAWPARAMS*); static BOOL (WINAPI *pImageList_SetImageCount)(HIMAGELIST,UINT); static HRESULT (WINAPI *pImageList_CoCreateInstance)(REFCLSID,const IUnknown *, @@ -2260,6 +2261,73 @@ static void test_loadimage(void) pImageList_Destroy( list ); } +#define GetAValue(argb) ((BYTE) ((argb) >> 24)) + +static void get_image_alpha(HIMAGELIST himl, int index, int width, int height, UINT32 *alpha) +{ + int i; + HBITMAP hbm_dst; + void *bitmap_bits; + BITMAPINFO bitmap_info = {{sizeof(BITMAPINFOHEADER), width, height, 1, 32, BI_RGB, 0, 0, 0, 0, 0}}; + + HDC hdc_dst = CreateCompatibleDC(0); + hbm_dst = CreateDIBSection(hdc_dst, &bitmap_info, DIB_RGB_COLORS, &bitmap_bits, NULL, 0); + SelectObject(hdc_dst, hbm_dst); + + pImageList_Draw(himl, index, hdc_dst, 0, 0, ILD_TRANSPARENT); + memcpy(alpha, bitmap_bits, (size_t)(width * height * 32 / 8)); + for (i = 0; i < width * height; i++) + alpha[i] = GetAValue(alpha[i]); + + DeleteObject(hbm_dst); + DeleteDC(hdc_dst); +} + +static void test_alpha(void) +{ + /* each line is a 2*1 bitmap */ + const static UINT32 test_bitmaps[] = + { + 0x00654321, 0x00ABCDEF, + 0x00654321, 0xFFABCDEF, + 0x00654321, 0x89ABCDEF, + 0xFF654321, 0x00ABCDEF, + 0xFF654321, 0xFFABCDEF, + 0xFF654321, 0x89ABCDEF, + 0x87654321, 0x00ABCDEF, + 0x87654321, 0xFFABCDEF, + 0x87654321, 0x89ABCDEF + }; + + int i, ret; + HDC hdc; + HBITMAP hbm_test; + HIMAGELIST himl; + UINT32 alpha[2]; + + hdc = CreateCompatibleDC(0); + himl = pImageList_Create(2, 1, ILC_COLOR32 | ILC_MASK, 0, 10); + + for (i = 0; i < ARRAY_SIZE(test_bitmaps); i += 2) + { + hbm_test = create_test_bitmap(hdc, 32, test_bitmaps[i], test_bitmaps[i + 1]); + ret = pImageList_AddMasked(himl, hbm_test, CLR_NONE); + ok(ret == i / 2, "ImageList_AddMasked returned %d, expected %d\n", ret, i / 2); + DeleteObject(hbm_test); + + get_image_alpha(himl, i / 2, 2, 1, alpha); + + todo_wine_if(i == 0) + ok(alpha[0] == GetAValue(test_bitmaps[i]) && alpha[1] == GetAValue(test_bitmaps[i + 1]), + "Bitmap [%08X, %08X] returned alpha value [%02X, %02X], expected [%02X, %02X]\n", + test_bitmaps[i], test_bitmaps[i + 1], alpha[0], alpha[1], + GetAValue(test_bitmaps[i]), GetAValue(test_bitmaps[i + 1])); + } + + pImageList_Destroy(himl); + DeleteDC(hdc); +} + static void test_IImageList_Clone(void) { IImageList *imgl, *imgl2; @@ -2391,6 +2459,7 @@ static void init_functions(void) X(ImageList_Create); X(ImageList_Destroy); X(ImageList_Add); + X(ImageList_AddMasked); X(ImageList_DrawIndirect); X(ImageList_SetImageCount); X(ImageList_SetImageCount); @@ -2461,6 +2530,7 @@ START_TEST(imagelist) test_color_table(ILC_COLOR8); test_copy(); test_loadimage(); + test_alpha(); test_ImageList_DrawIndirect(); test_shell_imagelist();

1 0