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

Zebediah Figura : d3dcompiler: Check for implicit type compatibility in implicit_conversion().
by Alexandre Julliard 03 Mar '20

03 Mar '20

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 03 Mar '20

03 Mar '20

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

Zebediah Figura : d3dcompiler: Don't set the node type for return instructions.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 1947f7fb808726d7c97c211180a6d03bff58b15b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1947f7fb808726d7c97c2111… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 1 22:55:27 2020 -0600 d3dcompiler: Don't set the node type for return instructions. Essentially just because it doesn't make sense to do so; a return instruction is not an expression usable as a source to other instructions. 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 34adab2855..3d04677f2e 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -483,6 +483,7 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha 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) { @@ -492,16 +493,15 @@ 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 = hlsl_ctx.cur_function->return_type; if (value) { - if (!(jump->return_value = implicit_conversion(value, jump->node.data_type, &loc))) + if (!(jump->return_value = implicit_conversion(value, return_type, &loc))) { d3dcompiler_free(jump); return NULL; } } - else if (jump->node.data_type->base_type != HLSL_TYPE_VOID) + else if (return_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");

1 0

Francois Gouget : kernel32/tests: Fix test_Toolhelp()'s nested process lookup.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: e4c15b5bbd567694dbcdb142751e7410e323c691 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4c15b5bbd567694dbcdb142… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 2 18:27:30 2020 +0100 kernel32/tests: Fix test_Toolhelp()'s nested process lookup. On Windows, processes are not reassigned to pid 1 when their parent dies. This means many processes could have the same ppid despite being started by unrelated processes. It also means test_Toolhelp() cannot reliably look up the nested process by its ppid. So look up for the nested process by its pid and only then check its ppid, executable file, etc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48664 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b32560358d..b5ed99062e 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1157,6 +1157,7 @@ static void test_Toolhelp(void) STARTUPINFOA startup; PROCESS_INFORMATION info; HANDLE process, thread, snapshot; + DWORD nested_pid; PROCESSENTRY32 pe; THREADENTRY32 te; DWORD ret; @@ -1209,17 +1210,24 @@ static void test_Toolhelp(void) /* The following test fails randomly on some Windows versions, but Gothic 2 depends on it */ ok(i < 20 || broken(i == 20), "process object not released\n"); + /* Look for the nested process by pid */ + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + nested_pid = GetPrivateProfileIntA("Nested", "Pid", 0, resfile); + DeleteFileA(resfile); + snapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); ok(snapshot != INVALID_HANDLE_VALUE, "CreateToolhelp32Snapshot failed %u\n", GetLastError()); memset(&pe, 0, sizeof(pe)); pe.dwSize = sizeof(pe); if (pProcess32First(snapshot, &pe)) { - while (pe.th32ParentProcessID != info.dwProcessId) + while (pe.th32ProcessID != nested_pid) if (!pProcess32Next(snapshot, &pe)) break; } CloseHandle(snapshot); - ok(pe.th32ParentProcessID == info.dwProcessId, "failed to find nested child process\n"); + ok(pe.th32ProcessID == nested_pid, "failed to find nested child process\n"); + ok(pe.th32ParentProcessID == info.dwProcessId, "nested child process has parent %u instead of %u\n", pe.th32ParentProcessID, info.dwProcessId); + ok(stricmp(pe.szExeFile, exename) == 0, "nested executable is %s instead of %s\n", pe.szExeFile, exename); process = OpenProcess(PROCESS_ALL_ACCESS_NT4, FALSE, pe.th32ProcessID); ok(process != NULL, "OpenProcess failed %u\n", GetLastError()); @@ -1242,7 +1250,8 @@ static void test_Toolhelp(void) ok(ret == 1, "expected 1, got %u\n", ret); CloseHandle(thread); - ok(WaitForSingleObject(process, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + ret = WaitForSingleObject(process, 30000); + ok(ret == WAIT_OBJECT_0, "Child process termination got %u le=%u\n", ret, GetLastError()); CloseHandle(process); WritePrivateProfileStringA(NULL, NULL, NULL, resfile); @@ -4048,6 +4057,7 @@ START_TEST(process) char buffer[MAX_PATH + 26]; STARTUPINFOA startup; PROCESS_INFORMATION info; + HANDLE hFile; memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -4058,6 +4068,14 @@ START_TEST(process) ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &startup, &info), "CreateProcess failed\n"); CloseHandle(info.hProcess); CloseHandle(info.hThread); + + /* The nested process is suspended so we can use the same resource + * file and it's up to the parent to read it before resuming the + * nested process. + */ + hFile = CreateFileA(myARGV[3], GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + childPrintf(hFile, "[Nested]\nPid=%08u\n", info.dwProcessId); + CloseHandle(hFile); return; } else if (!strcmp(myARGV[2], "parent") && myARGC >= 5)

1 0

Jacek Caban : winetest: Build with msvcrt.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: adc34d4a29c9e8a635cccfe4dfad374f7483672b URL: https://source.winehq.org/git/wine.git/?a=commit;h=adc34d4a29c9e8a635cccfe4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:11:10 2020 +0100 winetest: Build with msvcrt. Allows running tests on Windows without ucrtbase.dll. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 0322e773c5..699ce7864c 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -1,5 +1,5 @@ MODULE = winetest.exe -IMPORTS = uuid comctl32 version user32 gdi32 advapi32 wsock32 +IMPORTS = uuid comctl32 version user32 gdi32 advapi32 wsock32 msvcrt DELAYIMPORTS = ole32 EXTRADLLFLAGS = -mconsole -mno-cygwin

1 0

Vijay Kiran Kamuju : include: Add some missing defines in winnt.h.
by Alexandre Julliard 03 Mar '20

03 Mar '20

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

Vijay Kiran Kamuju : include: Fix QUOTA_LIMITS_EX in winnt.h.
by Alexandre Julliard 03 Mar '20

03 Mar '20

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

Zebediah Figura : http.sys: Support cancelling IRPs.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: fb35743f843dea8ae47cfdeee04894465ab71c47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb35743f843dea8ae47cfdee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 2 21:34:58 2020 -0600 http.sys: Support cancelling IRPs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 28 ++++++++++++++++++++++++++-- dlls/httpapi/tests/httpapi.c | 12 ++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 4259ca618f..9587eaa9a8 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1178,6 +1178,20 @@ static struct connection *get_connection(HTTP_REQUEST_ID req_id) return NULL; } +static void WINAPI http_receive_request_cancel(DEVICE_OBJECT *device, IRP *irp) +{ + TRACE("device %p, irp %p.\n", device, irp); + + IoReleaseCancelSpinLock(irp->CancelIrql); + + EnterCriticalSection(&http_cs); + RemoveEntryList(&irp->Tail.Overlay.ListEntry); + LeaveCriticalSection(&http_cs); + + irp->IoStatus.Status = STATUS_CANCELLED; + IoCompleteRequest(irp, IO_NO_INCREMENT); +} + static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) { const struct http_receive_request_params *params = irp->AssociatedIrp.SystemBuffer; @@ -1199,8 +1213,18 @@ static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) if (params->id == HTTP_NULL_ID) { TRACE("Queuing IRP %p.\n", irp); - InsertTailList(&queue->irp_queue, &irp->Tail.Overlay.ListEntry); - ret = STATUS_PENDING; + + IoSetCancelRoutine(irp, http_receive_request_cancel); + if (irp->Cancel && !IoSetCancelRoutine(irp, NULL)) + { + /* The IRP was canceled before we set the cancel routine. */ + ret = STATUS_CANCELLED; + } + else + { + InsertTailList(&queue->irp_queue, &irp->Tail.Overlay.ListEntry); + ret = STATUS_PENDING; + } } else ret = STATUS_CONNECTION_INVALID; diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index fced1b5e2f..5a9f3c3178 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -348,6 +348,18 @@ static void test_v1_server(void) ret = remove_url_v1(queue, port); ok(ret == ERROR_FILE_NOT_FOUND, "Got error %u.\n", ret); + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), NULL, &ovl); + ok(ret == ERROR_IO_PENDING, "Got error %u.\n", ret); + + ret = CancelIo(queue); + ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); + + ret_size = 0xdeadbeef; + ret = GetOverlappedResult(queue, &ovl, &ret_size, FALSE); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "Got error %u.\n", GetLastError()); + ok(!ret_size, "Got size %u.\n", ret_size); + closesocket(s); CloseHandle(ovl.hEvent); ret = CloseHandle(queue);

1 0

Zebediah Figura : http.sys: Cancel outstanding requests when a handle is closed.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: d942f12871c22d0a11840c2ba7af3a67cf1f1317 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d942f12871c22d0a11840c2b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 2 21:34:59 2020 -0600 http.sys: Cancel outstanding requests when a handle is closed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48530 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 9587eaa9a8..5fbae66b75 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1396,8 +1396,20 @@ static NTSTATUS WINAPI dispatch_close(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); struct request_queue *queue = stack->FileObject->FsContext; + LIST_ENTRY *entry; TRACE("Closing queue %p.\n", queue); + + EnterCriticalSection(&http_cs); + + while ((entry = queue->irp_queue.Flink) != &queue->irp_queue) + { + IRP *queued_irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + IoCancelIrp(queued_irp); + } + + LeaveCriticalSection(&http_cs); + close_queue(queue); irp->IoStatus.Status = STATUS_SUCCESS;

1 0

Zebediah Figura : http.sys: Translate WSAEACCES to STATUS_ACCESS_DENIED.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 4cae0e6bc2c3a1dd1a8c2fd446d0ae1034ffa091 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cae0e6bc2c3a1dd1a8c2fd4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 2 21:35:00 2020 -0600 http.sys: Translate WSAEACCES to STATUS_ACCESS_DENIED. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 5fbae66b75..25c8a1955a 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1112,6 +1112,11 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) WARN("Address %s is already in use.\n", debugstr_a(params->url)); return STATUS_SHARING_VIOLATION; } + else if (WSAGetLastError() == WSAEACCES) + { + WARN("Not enough permissions to bind to address %s.\n", debugstr_a(params->url)); + return STATUS_ACCESS_DENIED; + } ERR("Failed to bind socket, error %u.\n", WSAGetLastError()); return STATUS_UNSUCCESSFUL; }

1 0