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

Alexandre Julliard : ntdll: Disallow relative paths in wine_unix_to_nt_file_name(), handle them in the caller.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: 49fcd632e4b512421810ec4e35dc455b3f7697d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49fcd632e4b512421810ec4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 8 13:53:14 2020 +0200 ntdll: Disallow relative paths in wine_unix_to_nt_file_name(), handle them in the caller. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 18 ++++++++++++++++-- dlls/ntdll/path.c | 17 ++--------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index d0f27d3359..33c39865b9 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -301,10 +301,24 @@ WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ) { UNICODE_STRING nt_name; ANSI_STRING unix_name; + NTSTATUS status; + WCHAR *buffer; DWORD len; - RtlInitAnsiString( &unix_name, str ); - if (!set_ntstatus( wine_unix_to_nt_file_name( &unix_name, &nt_name ))) return NULL; + if (str[0] != '/') /* relative path name */ + { + len = strlen( str ) + 1; + if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return NULL; + MultiByteToWideChar( CP_UNIXCP, 0, str, len, buffer, len ); + status = RtlDosPathNameToNtPathName_U_WithStatus( buffer, &nt_name, NULL, NULL ); + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + } + else + { + RtlInitAnsiString( &unix_name, str ); + status = wine_unix_to_nt_file_name( &unix_name, &nt_name ); + } + if (!set_ntstatus( status )) return NULL; if (nt_name.Buffer[5] == ':') { /* get rid of the \??\ prefix */ diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index c22189a7e7..fb85942eca 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -891,23 +891,10 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir) */ NTSTATUS CDECL wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRING *nt ) { - unsigned int lenW, lenA = name->Length; + unsigned int lenA = name->Length; const char *path = name->Buffer; if (!lenA) return STATUS_INVALID_PARAMETER; - - if (path[0] != '/') /* relative path name */ - { - WCHAR *tmp; - NTSTATUS status; - - if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, (lenA + 1) * sizeof(WCHAR) ))) - return STATUS_NO_MEMORY; - lenW = ntdll_umbstowcs( path, lenA, tmp, lenA ); - tmp[lenW] = 0; - status = RtlDosPathNameToNtPathName_U_WithStatus( tmp, nt, NULL, NULL ); - RtlFreeHeap( GetProcessHeap(), 0, tmp ); - return status; - } + if (path[0] != '/') return STATUS_INVALID_PARAMETER; /* relative path not supported */ return unix_funcs->unix_to_nt_file_name( name, nt ); }

1 0

Gijs Vermeulen : wbemprox/tests: Add Win32_SoundDevice tests.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: d16a353700088549af8c06894eda3129e16d867c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d16a353700088549af8c0689… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Jul 8 12:26:02 2020 +0200 wbemprox/tests: Add Win32_SoundDevice tests. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 7dcfd35e93..da47773da2 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1551,6 +1551,35 @@ static void test_Win32_QuickFixEngineering( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_SoundDevice( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ); + BSTR query = SysAllocString( L"SELECT * FROM Win32_SoundDevice" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + check_property( obj, L"ProductName", VT_BSTR, CIM_STRING ); + check_property( obj, L"StatusInfo", VT_I4, CIM_UINT16 ); + check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -1602,6 +1631,7 @@ START_TEST(query) test_Win32_Processor( services ); test_Win32_QuickFixEngineering( services ); test_Win32_Service( services ); + test_Win32_SoundDevice( services ); test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services ); test_Win32_WinSAT( services );

1 0

Zhiyi Zhang : wined3d: Use valid adapter LUIDs if they are available.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: 122a28a31341472fdf25e0f0f3eb85ca0f22493d URL: https://source.winehq.org/git/wine.git/?a=commit;h=122a28a31341472fdf25e0f0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jul 8 15:58:34 2020 +0800 wined3d: Use valid adapter LUIDs if they are available. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/tests/d3d12.c | 2 +- dlls/dxgi/tests/dxgi.c | 4 ++-- dlls/wined3d/adapter_gl.c | 6 +++++- dlls/wined3d/adapter_vk.c | 18 +++++++++++------- dlls/wined3d/directx.c | 31 +++++++++++++++++++++---------- dlls/wined3d/utils.c | 35 +++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 3 ++- 7 files changed, 77 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=122a28a31341472fdf25…

1 0

Zebediah Figura : d3dcompiler: Store the "then" and "else" instruction lists directly in the hlsl_ir_if structure.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: 0a9f2d8b0a5394a0803c418c726ef4da488e15e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a9f2d8b0a5394a0803c418c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 7 23:09:24 2020 +0200 d3dcompiler: Store the "then" and "else" instruction lists directly in the hlsl_ir_if structure. 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 | 4 +-- dlls/d3dcompiler_43/hlsl.y | 51 +++++++++++++++---------------- dlls/d3dcompiler_43/utils.c | 18 +++++------ 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 3e91f74645..4bf1ce8f1b 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -742,8 +742,8 @@ struct hlsl_ir_if { struct hlsl_ir_node node; struct hlsl_src condition; - struct list *then_instrs; - struct list *else_instrs; + struct list then_instrs; + struct list else_instrs; }; struct hlsl_ir_loop diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 475fd414fd..3c9f1bd604 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -284,6 +284,19 @@ static BOOL type_is_void(const struct hlsl_type *type) return type->type == HLSL_CLASS_OBJECT && type->base_type == HLSL_TYPE_VOID; } +static struct hlsl_ir_if *new_if(struct hlsl_ir_node *condition, struct source_location loc) +{ + struct hlsl_ir_if *iff; + + if (!(iff = d3dcompiler_alloc(sizeof(*iff)))) + return NULL; + init_node(&iff->node, HLSL_IR_IF, NULL, loc); + hlsl_src_from_node(&iff->condition, condition); + list_init(&iff->then_instrs); + list_init(&iff->else_instrs); + return iff; +} + static BOOL append_conditional_break(struct list *cond_list) { struct hlsl_ir_node *condition, *not; @@ -302,22 +315,13 @@ static BOOL append_conditional_break(struct list *cond_list) } list_add_tail(cond_list, &not->entry); - if (!(iff = d3dcompiler_alloc(sizeof(*iff)))) + if (!(iff = new_if(not, condition->loc))) { ERR("Out of memory.\n"); return FALSE; } - init_node(&iff->node, HLSL_IR_IF, NULL, condition->loc); - hlsl_src_from_node(&iff->condition, not); list_add_tail(cond_list, &iff->node.entry); - if (!(iff->then_instrs = d3dcompiler_alloc(sizeof(*iff->then_instrs)))) - { - ERR("Out of memory.\n"); - return FALSE; - } - list_init(iff->then_instrs); - if (!(jump = d3dcompiler_alloc(sizeof(*jump)))) { ERR("Out of memory.\n"); @@ -325,7 +329,7 @@ static BOOL append_conditional_break(struct list *cond_list) } init_node(&jump->node, HLSL_IR_JUMP, NULL, condition->loc); jump->type = HLSL_IR_JUMP_BREAK; - list_add_head(iff->then_instrs, &jump->node.entry); + list_add_head(&iff->then_instrs, &jump->node.entry); return TRUE; } @@ -2211,18 +2215,15 @@ jump_statement: selection_statement: KW_IF '(' expr ')' if_body { - struct hlsl_ir_if *instr = d3dcompiler_alloc(sizeof(*instr)); struct hlsl_ir_node *condition = node_from_list($3); + struct hlsl_ir_if *instr; - if (!instr) - { - ERR("Out of memory\n"); + if (!(instr = new_if(condition, get_location(&@1)))) YYABORT; - } - init_node(&instr->node, HLSL_IR_IF, NULL, get_location(&@1)); - hlsl_src_from_node(&instr->condition, condition); - instr->then_instrs = $5.then_instrs; - instr->else_instrs = $5.else_instrs; + list_move_tail(&instr->then_instrs, $5.then_instrs); + list_move_tail(&instr->else_instrs, $5.else_instrs); + d3dcompiler_free($5.then_instrs); + d3dcompiler_free($5.else_instrs); if (condition->data_type->dimx > 1 || condition->data_type->dimy > 1) { hlsl_report_message(instr->node.loc, HLSL_LEVEL_ERROR, @@ -2851,9 +2852,8 @@ static unsigned int index_instructions(struct list *instrs, unsigned int index) if (instr->type == HLSL_IR_IF) { struct hlsl_ir_if *iff = if_from_node(instr); - index = index_instructions(iff->then_instrs, index); - if (iff->else_instrs) - index = index_instructions(iff->else_instrs, index); + index = index_instructions(&iff->then_instrs, index); + index = index_instructions(&iff->else_instrs, index); } else if (instr->type == HLSL_IR_LOOP) { @@ -2902,9 +2902,8 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs case HLSL_IR_IF: { struct hlsl_ir_if *iff = if_from_node(instr); - compute_liveness_recurse(iff->then_instrs, loop_first, loop_last); - if (iff->else_instrs) - compute_liveness_recurse(iff->else_instrs, loop_first, loop_last); + compute_liveness_recurse(&iff->then_instrs, loop_first, loop_last); + compute_liveness_recurse(&iff->else_instrs, loop_first, loop_last); iff->condition.node->last_read = instr->index; break; } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 7f0c451ce9..8599ffe69a 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2018,14 +2018,10 @@ static void debug_dump_ir_if(const struct hlsl_ir_if *if_node) wine_dbg_printf("if ("); debug_dump_src(&if_node->condition); wine_dbg_printf(")\n{\n"); - debug_dump_instr_list(if_node->then_instrs); + debug_dump_instr_list(&if_node->then_instrs); + wine_dbg_printf("}\nelse\n{\n"); + debug_dump_instr_list(&if_node->else_instrs); wine_dbg_printf("}\n"); - if (if_node->else_instrs) - { - wine_dbg_printf("else\n{\n"); - debug_dump_instr_list(if_node->else_instrs); - wine_dbg_printf("}\n"); - } } static void debug_dump_ir_loop(const struct hlsl_ir_loop *loop) @@ -2157,8 +2153,12 @@ static void free_ir_assignment(struct hlsl_ir_assignment *assignment) static void free_ir_if(struct hlsl_ir_if *if_node) { - free_instr_list(if_node->then_instrs); - free_instr_list(if_node->else_instrs); + struct hlsl_ir_node *node, *next_node; + + LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &if_node->then_instrs, struct hlsl_ir_node, entry) + free_instr(node); + LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &if_node->else_instrs, struct hlsl_ir_node, entry) + free_instr(node); hlsl_src_remove(&if_node->condition); d3dcompiler_free(if_node); }

1 0

Zebediah Figura : d3dcompiler: Store the loop body directly in the hlsr_ir_loop structure.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: 644dbf06447aba2ac6a13ac3e34f6d917ad01b62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=644dbf06447aba2ac6a13ac3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 5 17:45:36 2020 -0500 d3dcompiler: Store the loop body directly in the hlsr_ir_loop structure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 +- dlls/d3dcompiler_43/hlsl.y | 19 +++++++------------ dlls/d3dcompiler_43/utils.c | 7 +++++-- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 4bf1ce8f1b..34e8917069 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -750,7 +750,7 @@ struct hlsl_ir_loop { struct hlsl_ir_node node; /* loop condition is stored in the body (as "if (!condition) break;") */ - struct list *body; + struct list body; unsigned int next_index; /* liveness index of the end of the loop */ }; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 3c9f1bd604..b0270b6ba2 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -360,24 +360,21 @@ static struct list *create_loop(enum loop_type type, struct list *init, struct l goto oom; init_node(&loop->node, HLSL_IR_LOOP, NULL, loc); list_add_tail(list, &loop->node.entry); - loop->body = d3dcompiler_alloc(sizeof(*loop->body)); - if (!loop->body) - goto oom; - list_init(loop->body); + list_init(&loop->body); if (!append_conditional_break(cond)) goto oom; if (type != LOOP_DO_WHILE) - list_move_tail(loop->body, cond); + list_move_tail(&loop->body, cond); - list_move_tail(loop->body, body); + list_move_tail(&loop->body, body); if (iter) - list_move_tail(loop->body, iter); + list_move_tail(&loop->body, iter); if (type == LOOP_DO_WHILE) - list_move_tail(loop->body, cond); + list_move_tail(&loop->body, cond); d3dcompiler_free(init); d3dcompiler_free(cond); @@ -386,8 +383,6 @@ static struct list *create_loop(enum loop_type type, struct list *init, struct l oom: ERR("Out of memory.\n"); - if (loop) - d3dcompiler_free(loop->body); d3dcompiler_free(loop); d3dcompiler_free(cond_jump); d3dcompiler_free(list); @@ -2857,7 +2852,7 @@ static unsigned int index_instructions(struct list *instrs, unsigned int index) } else if (instr->type == HLSL_IR_LOOP) { - index = index_instructions(loop_from_node(instr)->body, index); + index = index_instructions(&loop_from_node(instr)->body, index); loop_from_node(instr)->next_index = index; } } @@ -2919,7 +2914,7 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs case HLSL_IR_LOOP: { struct hlsl_ir_loop *loop = loop_from_node(instr); - compute_liveness_recurse(loop->body, loop_first ? loop_first : instr->index, + compute_liveness_recurse(&loop->body, loop_first ? loop_first : instr->index, loop_last ? loop_last : loop->next_index); break; } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 8599ffe69a..336bf0d9bc 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2027,7 +2027,7 @@ static void debug_dump_ir_if(const struct hlsl_ir_if *if_node) static void debug_dump_ir_loop(const struct hlsl_ir_loop *loop) { wine_dbg_printf("for (;;)\n{\n"); - debug_dump_instr_list(loop->body); + debug_dump_instr_list(&loop->body); wine_dbg_printf("}\n"); } @@ -2165,7 +2165,10 @@ static void free_ir_if(struct hlsl_ir_if *if_node) static void free_ir_loop(struct hlsl_ir_loop *loop) { - free_instr_list(loop->body); + struct hlsl_ir_node *node, *next_node; + + LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &loop->body, struct hlsl_ir_node, entry) + free_instr(node); d3dcompiler_free(loop); }

1 0

Zebediah Figura : ntdll: Set the process creation time in NtQuerySystemInformation(SystemProcessInformation).
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: 829739273425ba3a275aa8b93cde82bdff02975c URL: https://source.winehq.org/git/wine.git/?a=commit;h=829739273425ba3a275aa8b9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 7 18:58:33 2020 -0500 ntdll: Set the process creation time in NtQuerySystemInformation(SystemProcessInformation). Process Hacker displays this information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 1 + include/wine/server_protocol.h | 4 +++- server/process.c | 1 + server/protocol.def | 2 ++ server/trace.c | 3 ++- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 29c133e656..051bd37fa3 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2140,6 +2140,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, memset(nt_process, 0, sizeof(*nt_process)); if (i < process_count - 1) nt_process->NextEntryOffset = proc_len; + nt_process->CreationTime.QuadPart = server_process->start_time; nt_process->dwThreadCount = server_process->thread_count; nt_process->dwBasePriority = server_process->priority; nt_process->UniqueProcessId = UlongToHandle(server_process->pid); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 33a0dee4b9..87a6619703 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2416,6 +2416,7 @@ struct thread_info struct process_info { + timeout_t start_time; data_size_t name_len; int thread_count; int priority; @@ -2423,6 +2424,7 @@ struct process_info process_id_t parent_pid; int handle_count; int unix_pid; + int __pad; }; @@ -6652,7 +6654,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 618 +#define SERVER_PROTOCOL_VERSION 619 /* ### protocol_version end ### */ diff --git a/server/process.c b/server/process.c index 9482da98be..8d57879cc1 100644 --- a/server/process.c +++ b/server/process.c @@ -1829,6 +1829,7 @@ DECL_HANDLER(list_processes) pos = (pos + 7) & ~7; process_info = (struct process_info *)(buffer + pos); + process_info->start_time = process->start_time; process_info->name_len = exe ? exe->namelen : 0; process_info->thread_count = process->running_threads; process_info->priority = process->priority; diff --git a/server/protocol.def b/server/protocol.def index bad8fef790..bf91637e9d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1870,6 +1870,7 @@ struct thread_info struct process_info { + timeout_t start_time; data_size_t name_len; int thread_count; int priority; @@ -1877,6 +1878,7 @@ struct process_info process_id_t parent_pid; int handle_count; int unix_pid; + int __pad; /* VARARG(name,unicode_str,name_len); */ /* VARARG(threads,struct thread_info,thread_count); */ }; diff --git a/server/trace.c b/server/trace.c index dfb3930066..288dad718d 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1113,7 +1113,8 @@ static void dump_varargs_process_info( const char *prefix, data_size_t size ) process = (const struct process_info *)((const char *)cur_data + pos); if (size - pos < sizeof(*process)) break; if (pos) fputc( ',', stderr ); - fprintf( stderr, "{thread_count=%u,priority=%d,pid=%04x,parent_pid=%04x,handle_count=%u,unix_pid=%d,", + dump_timeout( "{start_time=", &process->start_time ); + fprintf( stderr, ",thread_count=%u,priority=%d,pid=%04x,parent_pid=%04x,handle_count=%u,unix_pid=%d,", process->thread_count, process->priority, process->pid, process->parent_pid, process->handle_count, process->unix_pid ); pos += sizeof(*process);

1 0

Alexandre Julliard : kernel32: Move RemoveDirectoryA/W() implementation to kernelbase.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: f8699c0a71a528d287b84cd0bc5b5bb7cec924f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8699c0a71a528d287b84cd0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 8 12:47:46 2020 +0200 kernel32: Move RemoveDirectoryA/W() implementation to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +-- dlls/kernel32/path.c | 62 ----------------------------------------- dlls/kernelbase/file.c | 44 +++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 4 +-- dlls/ntdll/tests/file.c | 3 +- 5 files changed, 50 insertions(+), 67 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b19dfa00df..0c64144d7f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1268,8 +1268,8 @@ @ stdcall ReleaseSemaphoreWhenCallbackReturns(ptr long long) ntdll.TpCallbackReleaseSemaphoreOnCompletion @ stdcall ReleaseSRWLockExclusive(ptr) ntdll.RtlReleaseSRWLockExclusive @ stdcall ReleaseSRWLockShared(ptr) ntdll.RtlReleaseSRWLockShared -@ stdcall RemoveDirectoryA(str) -@ stdcall RemoveDirectoryW(wstr) +@ stdcall -import RemoveDirectoryA(str) +@ stdcall -import RemoveDirectoryW(wstr) # @ stub RemoveLocalAlternateComputerNameA # @ stub RemoveLocalAlternateComputerNameW @ stdcall RemoveVectoredContinueHandler(ptr) ntdll.RtlRemoveVectoredContinueHandler diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index db2c1fb024..d0f27d3359 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -228,68 +228,6 @@ BOOL WINAPI CreateDirectoryExA( LPCSTR template, LPCSTR path, LPSECURITY_ATTRIBU } -/*********************************************************************** - * RemoveDirectoryW (KERNEL32.@) - */ -BOOL WINAPI RemoveDirectoryW( LPCWSTR path ) -{ - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nt_name; - ANSI_STRING unix_name; - IO_STATUS_BLOCK io; - NTSTATUS status; - HANDLE handle; - BOOL ret = FALSE; - - TRACE( "%s\n", debugstr_w(path) ); - - if (!RtlDosPathNameToNtPathName_U( path, &nt_name, NULL, NULL )) - { - SetLastError( ERROR_PATH_NOT_FOUND ); - return FALSE; - } - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.Attributes = OBJ_CASE_INSENSITIVE; - attr.ObjectName = &nt_name; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - - if (!set_ntstatus( NtOpenFile( &handle, DELETE | SYNCHRONIZE, &attr, &io, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ))) - { - RtlFreeUnicodeString( &nt_name ); - return FALSE; - } - - status = wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN ); - RtlFreeUnicodeString( &nt_name ); - if (!set_ntstatus( status )) - { - NtClose( handle ); - return FALSE; - } - - if (!(ret = (rmdir( unix_name.Buffer ) != -1))) FILE_SetDosError(); - RtlFreeAnsiString( &unix_name ); - NtClose( handle ); - return ret; -} - - -/*********************************************************************** - * RemoveDirectoryA (KERNEL32.@) - */ -BOOL WINAPI RemoveDirectoryA( LPCSTR path ) -{ - WCHAR *pathW; - - if (!(pathW = FILE_name_AtoW( path, FALSE ))) return FALSE; - return RemoveDirectoryW( pathW ); -} - - /*********************************************************************** * GetSystemDirectoryW (KERNEL32.@) * diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index bd87f75665..9d082f1a64 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3448,6 +3448,50 @@ BOOL WINAPI DECLSPEC_HOTPATCH ReadFileScatter( HANDLE file, FILE_SEGMENT_ELEMENT } +/*********************************************************************** + * RemoveDirectoryA (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH RemoveDirectoryA( LPCSTR path ) +{ + WCHAR *pathW; + + if (!(pathW = file_name_AtoW( path, FALSE ))) return FALSE; + return RemoveDirectoryW( pathW ); +} + + +/*********************************************************************** + * RemoveDirectoryW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH RemoveDirectoryW( LPCWSTR path ) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nt_name; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE handle; + + TRACE( "%s\n", debugstr_w(path) ); + + status = RtlDosPathNameToNtPathName_U_WithStatus( path, &nt_name, NULL, NULL ); + if (!set_ntstatus( status )) return FALSE; + + InitializeObjectAttributes( &attr, &nt_name, OBJ_CASE_INSENSITIVE, 0, NULL ); + status = NtOpenFile( &handle, DELETE | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); + RtlFreeUnicodeString( &nt_name ); + + if (!status) + { + FILE_DISPOSITION_INFORMATION info = { TRUE }; + status = NtSetInformationFile( handle, &io, &info, sizeof(info), FileDispositionInformation ); + NtClose( handle ); + } + return set_ntstatus( status ); +} + + /************************************************************************** * SetEndOfFile (kernelbase.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 8c184ff4f4..3f778685a7 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1331,8 +1331,8 @@ @ stdcall ReleaseSemaphoreWhenCallbackReturns(ptr long long) ntdll.TpCallbackReleaseSemaphoreOnCompletion # @ stub ReleaseStateLock @ stdcall RemapPredefinedHandleInternal(long long) -@ stdcall RemoveDirectoryA(str) kernel32.RemoveDirectoryA -@ stdcall RemoveDirectoryW(wstr) kernel32.RemoveDirectoryW +@ stdcall RemoveDirectoryA(str) +@ stdcall RemoveDirectoryW(wstr) @ stdcall RemoveDllDirectory(ptr) # @ stub RemovePackageStatus # @ stub RemovePackageStatusForUser diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 9e65a1f6dd..6164b0c4bd 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3082,16 +3082,17 @@ todo_wine fileDeleted = RemoveDirectoryA( buffer ); ok( fileDeleted, "Directory should have been deleted\n" ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; -todo_wine ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); res = nt_get_file_attrs( buffer, &fdi2 ); todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted directory */ handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); +todo_wine ok( handle2 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); + if (handle2 != INVALID_HANDLE_VALUE) CloseHandle( handle2 ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( fileDeleted, "Directory should have been deleted\n" );

1 0

Alexandre Julliard : mountmgr: Use wine_get_dos_file_name() instead of wine_unix_to_nt_file_name().
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: 3aa4feb578fb1afd4a3b600c86b6eda48a3f0305 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aa4feb578fb1afd4a3b600c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 8 14:16:21 2020 +0200 mountmgr: Use wine_get_dos_file_name() instead of wine_unix_to_nt_file_name(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 22 ++++++++-------------- dlls/mountmgr.sys/mountmgr.c | 19 +++++++++++-------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 40176131ca..f7a1f1e9b5 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1017,32 +1017,26 @@ static struct volume *find_matching_volume( const char *udi, const char *device, static BOOL get_volume_device_info( struct volume *volume ) { const char *unix_device = volume->device->unix_device; - ANSI_STRING unix_name; - UNICODE_STRING nt_name; - OBJECT_ATTRIBUTES attr; + WCHAR *name; HANDLE handle; - NTSTATUS ret; CDROM_TOC toc; DWORD size; BYTE superblock[SUPERBLOCK_SIZE]; - IO_STATUS_BLOCK io; if (!unix_device) return FALSE; - RtlInitAnsiString( &unix_name, unix_device ); - if ((ret = wine_unix_to_nt_file_name( &unix_name, &nt_name ))) + if (!(name = wine_get_dos_file_name( unix_device ))) { - ERR("Failed to convert %s to NT, status %#x\n", debugstr_a(unix_device), ret); + ERR("Failed to convert %s to NT, err %u\n", debugstr_a(unix_device), GetLastError()); return FALSE; } - - InitializeObjectAttributes( &attr, &nt_name, OBJ_CASE_INSENSITIVE, 0, NULL ); - if ((ret = NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ))) + handle = CreateFileW( name, GENERIC_READ | SYNCHRONIZE, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, 0 ); + RtlFreeHeap( GetProcessHeap(), 0, name ); + if (handle == INVALID_HANDLE_VALUE) { - WARN("Failed to open %s, status %#x\n", debugstr_a(unix_device), ret); - RtlFreeUnicodeString( &nt_name ); + WARN("Failed to open %s, err %u\n", debugstr_a(unix_device), GetLastError()); return FALSE; } diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index cf12f03a73..6393dbf022 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -432,7 +432,7 @@ static void WINAPI query_symbol_file( TP_CALLBACK_INSTANCE *instance, void *cont IRP *irp = context; MOUNTMGR_TARGET_NAME *result; CFStringRef query_cfstring; - WCHAR *unix_buf = NULL; + WCHAR *filename, *unix_buf = NULL; ANSI_STRING unix_path; UNICODE_STRING path; MDQueryRef mdquery; @@ -489,16 +489,19 @@ static void WINAPI query_symbol_file( TP_CALLBACK_INSTANCE *instance, void *cont HeapFree( GetProcessHeap(), 0, unix_buf ); if (status) goto done; - status = wine_unix_to_nt_file_name( &unix_path, &path ); + filename = wine_get_dos_file_name( unix_path.Buffer ); RtlFreeAnsiString( &unix_path ); - if (status) goto done; - + if (!filename) + { + status = STATUS_NO_SUCH_FILE; + goto done; + } result = irp->AssociatedIrp.SystemBuffer; - result->DeviceNameLength = path.Length; - size = FIELD_OFFSET(MOUNTMGR_TARGET_NAME, DeviceName[path.Length / sizeof(WCHAR)]); + result->DeviceNameLength = lstrlenW(filename) * sizeof(WCHAR); + size = FIELD_OFFSET(MOUNTMGR_TARGET_NAME, DeviceName[lstrlenW(filename)]); if (size <= IoGetCurrentIrpStackLocation(irp)->Parameters.DeviceIoControl.OutputBufferLength) { - memcpy( result->DeviceName, path.Buffer, path.Length ); + memcpy( result->DeviceName, filename, lstrlenW(filename) * sizeof(WCHAR) ); irp->IoStatus.Information = size; status = STATUS_SUCCESS; } @@ -507,7 +510,7 @@ static void WINAPI query_symbol_file( TP_CALLBACK_INSTANCE *instance, void *cont irp->IoStatus.Information = sizeof(*result); status = STATUS_BUFFER_OVERFLOW; } - RtlFreeUnicodeString( &path ); + RtlFreeHeap( GetProcessHeap(), 0, filename ); done: irp->IoStatus.u.Status = status;

1 0

Daniel Lehman : msxml3: Set internal error on loading from IStream.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: 50650c26fe8412a8b0de68edfce6e8e6e332dd81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50650c26fe8412a8b0de68ed… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Jun 23 21:28:17 2020 -0700 msxml3: Set internal error on loading from IStream. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/tests/Makefile.in | 2 +- dlls/msxml3/tests/domdoc.c | 56 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 76d3fdb601..c86a4931c5 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2276,7 +2276,7 @@ static HRESULT WINAPI domdoc_load( if (hr == S_OK) { - hr = domdoc_load_from_stream(This, stream); + hr = This->error = domdoc_load_from_stream(This, stream); if (hr == S_OK) *isSuccessful = VARIANT_TRUE; ISequentialStream_Release(stream); diff --git a/dlls/msxml3/tests/Makefile.in b/dlls/msxml3/tests/Makefile.in index c397295142..bc1f051b09 100644 --- a/dlls/msxml3/tests/Makefile.in +++ b/dlls/msxml3/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = msxml3.dll -IMPORTS = oleaut32 ole32 user32 +IMPORTS = oleaut32 ole32 user32 shlwapi C_SRCS = \ domdoc.c \ diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 49768b8dbe..0ebc5165a3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -37,8 +37,10 @@ #include "dispex.h" #include "objsafe.h" #include "mshtml.h" +#include "xmlparser.h" #include "initguid.h" #include "asptlb.h" +#include "shlwapi.h" #include "wine/heap.h" #include "wine/test.h" @@ -700,6 +702,36 @@ static void _expect_list_len(IXMLDOMNodeList *list, LONG len, int line) #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) +#define EXPECT_PARSE_ERROR(doc, hr_exp, hr_todo) _expect_parse_error(doc, hr_exp, hr_todo, __LINE__) +static void _expect_parse_error(IXMLDOMDocument *doc, HRESULT hr_exp, BOOL hr_todo, int line) +{ + IXMLDOMParseError *error; + HRESULT hr; + LONG code; + + error = NULL; + hr = IXMLDOMDocument_get_parseError(doc, &error); + ok_(__FILE__,line)(hr == S_OK, "got 0x%08x\n", hr); + ok_(__FILE__,line)(!!error, "got NULL parseError\n"); + + code = 0xdeadbeef; + hr = IXMLDOMParseError_get_errorCode(error, &code); + if (FAILED(hr_exp)) + { + ok_(__FILE__,line)(hr == S_OK, "got 0x%08x\n", hr); + ok_(__FILE__,line)(FAILED(code), "expected failure HRESULT\n"); + todo_wine_if(hr_todo) + ok_(__FILE__,line)(hr_exp == code, "expected 0x%08x, got 0x%08x\n", hr_exp, code); + } + else + { + ok_(__FILE__,line)(hr == S_FALSE, "got 0x%08x\n", hr); + ok_(__FILE__,line)(SUCCEEDED(code), "expected successful HRESULT\n"); + } + + IXMLDOMParseError_Release(error); +} + static const WCHAR szEmpty[] = { 0 }; static const WCHAR szIncomplete[] = { '<','?','x','m','l',' ', @@ -10242,6 +10274,7 @@ static void test_load(void) IXMLDOMNodeList *list; IXMLDOMDocument *doc; BSTR bstr1, bstr2; + IStream *stream; VARIANT_BOOL b; VARIANT src; HRESULT hr; @@ -10419,6 +10452,29 @@ static void test_load(void) ok(b == VARIANT_FALSE, "got %d\n", b); VariantClear(&src); + + /* test istream with empty content */ + stream = SHCreateMemStream((const BYTE*)nocontent, strlen(nocontent)); + V_VT(&src) = VT_UNKNOWN; + V_UNKNOWN(&src) = (IUnknown*)stream; + b = VARIANT_TRUE; + hr = IXMLDOMDocument_load(doc, src, &b); + todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(b == VARIANT_FALSE, "got %d\n", b); + EXPECT_PARSE_ERROR(doc, XML_E_INVALIDATROOTLEVEL, TRUE); + VariantClear(&src); + + /* test istream with valid xml */ + stream = SHCreateMemStream((const BYTE*)complete4A, strlen(complete4A)); + V_VT(&src) = VT_UNKNOWN; + V_UNKNOWN(&src) = (IUnknown*)stream; + b = VARIANT_FALSE; + hr = IXMLDOMDocument_load(doc, src, &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE, "got %d\n", b); + EXPECT_PARSE_ERROR(doc, S_OK, FALSE); + VariantClear(&src); + IXMLDOMDocument_Release(doc); free_bstrs();

1 0

Daniel Lehman : msxml3: Set internal error on loading from IPersistStream.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: da3893fe48ed458388afa7f520b97b267d25844e URL: https://source.winehq.org/git/wine.git/?a=commit;h=da3893fe48ed458388afa7f5… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Jun 23 21:28:18 2020 -0700 msxml3: Set internal error on loading from IPersistStream. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/tests/domdoc.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index c86a4931c5..b740b2e9d3 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -824,7 +824,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream if (!stream) return E_INVALIDARG; - return domdoc_load_from_stream(This, (ISequentialStream*)stream); + return This->error = domdoc_load_from_stream(This, (ISequentialStream*)stream); } static HRESULT WINAPI PersistStreamInit_Save( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0ebc5165a3..ef29bf6a59 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2181,6 +2181,7 @@ static void test_persiststream(void) IXMLDOMDocument *doc; ULARGE_INTEGER size; IPersist *persist; + IStream *istream; HRESULT hr; CLSID clsid; @@ -2214,6 +2215,21 @@ static void test_persiststream(void) ok(IsEqualGUID(&clsid, &CLSID_DOMDocument2), "wrong clsid %s\n", wine_dbgstr_guid(&clsid)); IPersistStream_Release(stream); + + /* test Load */ + istream = SHCreateMemStream((const BYTE*)complete4A, strlen(complete4A)); + hr = IPersistStreamInit_Load(streaminit, istream); + ok(hr == S_OK, "got 0x%08x\n", hr); + IStream_Release(istream); + EXPECT_PARSE_ERROR(doc, S_OK, FALSE); + + istream = SHCreateMemStream((const BYTE*)"", 0); + hr = IPersistStreamInit_Load(streaminit, istream); + todo_wine ok(hr == XML_E_MISSINGROOT, "got 0x%08x\n", hr); + ok(FAILED(hr), "got success\n"); + IStream_Release(istream); + EXPECT_PARSE_ERROR(doc, XML_E_MISSINGROOT, TRUE); + IPersistStreamInit_Release(streaminit); IXMLDOMDocument_Release(doc); }

1 0