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

Zebediah Figura : d3dcompiler: Store the loop body directly in the hlsr_ir_loop structure.
by Alexandre Julliard 08 Jul '20

08 Jul '20

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 08 Jul '20

08 Jul '20

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

Zebediah Figura : ntdll: Set the thread creation time in NtQuerySystemInformation(SystemProcessInformation).
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 82cd85b07918a4437428497ffaf7f13286b83479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82cd85b07918a4437428497f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 7 18:58:34 2020 -0500 ntdll: Set the thread 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 | 2 +- include/wine/server_protocol.h | 3 ++- server/process.c | 1 + server/protocol.def | 1 + server/trace.c | 3 ++- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 051bd37fa3..a80d3c4fd4 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2156,7 +2156,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, if (len <= size) { - nt_process->ti[j].CreateTime.QuadPart = 0xdeadbeef; + nt_process->ti[j].CreateTime.QuadPart = server_thread->start_time; nt_process->ti[j].ClientId.UniqueProcess = UlongToHandle(server_process->pid); nt_process->ti[j].ClientId.UniqueThread = UlongToHandle(server_thread->tid); nt_process->ti[j].dwCurrentPriority = server_thread->current_priority; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 87a6619703..df1bd853ea 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2408,6 +2408,7 @@ struct is_same_mapping_reply struct thread_info { + timeout_t start_time; thread_id_t tid; int base_priority; int current_priority; @@ -6654,7 +6655,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 619 +#define SERVER_PROTOCOL_VERSION 620 /* ### protocol_version end ### */ diff --git a/server/process.c b/server/process.c index 8d57879cc1..5e587b28cb 100644 --- a/server/process.c +++ b/server/process.c @@ -1850,6 +1850,7 @@ DECL_HANDLER(list_processes) { struct thread_info *thread_info = (struct thread_info *)(buffer + pos); + thread_info->start_time = thread->creation_time; thread_info->tid = thread->id; thread_info->base_priority = thread->priority; thread_info->current_priority = thread->priority; /* FIXME */ diff --git a/server/protocol.def b/server/protocol.def index bf91637e9d..943c1ade1a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1862,6 +1862,7 @@ enum char_info_mode struct thread_info { + timeout_t start_time; thread_id_t tid; int base_priority; int current_priority; diff --git a/server/trace.c b/server/trace.c index 288dad718d..55d7bd85dd 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1128,7 +1128,8 @@ static void dump_varargs_process_info( const char *prefix, data_size_t size ) const struct thread_info *thread = (const struct thread_info *)((const char *)cur_data + pos); if (size - pos < sizeof(*thread)) break; if (i) fputc( ',', stderr ); - fprintf( stderr, "{tid=%04x,base_priority=%d,current_priority=%d,unix_tid=%d}", + dump_timeout( "{start_time=", &thread->start_time ); + fprintf( stderr, ",tid=%04x,base_priority=%d,current_priority=%d,unix_tid=%d}", thread->tid, thread->base_priority, thread->current_priority, thread->unix_tid ); pos += sizeof(*thread); }

1 0

Alexandre Julliard : winebuild: Generate Windows-style syscall thunks on x86.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 20715ee3fdaa794a7b6ba285cdb72b68991c65af URL: https://source.winehq.org/git/wine.git/?a=commit;h=20715ee3fdaa794a7b6ba285… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 8 08:26:54 2020 +0200 winebuild: Generate Windows-style syscall thunks on x86. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 54 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index dcdca021c0..b40c2c3107 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1441,19 +1441,47 @@ void output_syscalls( DLLSPEC *spec ) switch (target_cpu) { case CPU_x86: + output( "\tpushl %%ebp\n" ); + output_cfi( ".cfi_adjust_cfa_offset 4\n" ); + output_cfi( ".cfi_rel_offset %%ebp,0\n" ); + output( "\tmovl %%esp,%%ebp\n" ); + output_cfi( ".cfi_def_cfa_register %%ebp\n" ); + output( "\tpushl %%esi\n" ); + output_cfi( ".cfi_rel_offset %%esi,-4\n" ); + output( "\tpushl %%edi\n" ); + output_cfi( ".cfi_rel_offset %%edi,-8\n" ); output( "\tcmpl $%u,%%eax\n", count ); - output( "\tjae 1f\n" ); - output( "\taddl $4,%%esp\n" ); + output( "\tjae 3f\n" ); if (UsePIC) { output( "\tmovl %%eax,%%edx\n" ); output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); - output( "1:\tjmp *.Lsyscall_table-1b(%%eax,%%edx,4)\n" ); + output( "1:\tmovzbl .Lsyscall_args-1b(%%eax,%%edx,1),%%ecx\n" ); needs_get_pc_thunk = 1; } - else output( "\tjmp *.Lsyscall_table(,%%eax,4)\n" ); - output( "1:\tmovl $0x%x,%%eax\n", invalid_param ); + else output( "\tmovzbl .Lsyscall_args(%%eax),%%ecx\n" ); + output( "\tsubl %%ecx,%%esp\n" ); + output( "\tshrl $2,%%ecx\n" ); + output( "\tleal 12(%%ebp),%%esi\n" ); + output( "\tandl $~15,%%esp\n" ); + output( "\tmovl %%esp,%%edi\n" ); + output( "\tcld\n" ); + output( "\trep; movsl\n" ); + if (UsePIC) + output( "\tcall *.Lsyscall_table-1b(%%eax,%%edx,4)\n" ); + else + output( "\tcall *.Lsyscall_table(,%%eax,4)\n" ); + output( "\tleal -8(%%ebp),%%esp\n" ); + output( "2:\tpopl %%edi\n" ); + output_cfi( ".cfi_same_value %%edi\n" ); + output( "\tpopl %%esi\n" ); + output_cfi( ".cfi_same_value %%esi\n" ); + output( "\tpopl %%ebp\n" ); + output_cfi( ".cfi_def_cfa %%esp,4\n" ); + output_cfi( ".cfi_same_value %%ebp\n" ); output( "\tret\n" ); + output( "3:\tmovl $0x%x,%%eax\n", invalid_param ); + output( "\tjmp 2b\n" ); break; case CPU_x86_64: output( "\tcmpq $%u,%%rax\n", count ); @@ -1501,6 +1529,9 @@ void output_syscalls( DLLSPEC *spec ) output( ".Lsyscall_table:\n" ); for (i = 0; i < count; i++) output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name( get_link_name( syscalls[i] ))); + output( ".Lsyscall_args:\n" ); + for (i = 0; i < count; i++) + output( "\t.byte %u\n", get_args_size( syscalls[i] )); return; } @@ -1515,20 +1546,19 @@ void output_syscalls( DLLSPEC *spec ) switch (target_cpu) { case CPU_x86: - /* FIXME: syscall thunks not binary-compatible yet */ if (UsePIC) { output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); output( "1:\tmovl %s-1b(%%eax),%%edx\n", asm_name("__wine_syscall_dispatcher") ); output( "\tmovl $%u,%%eax\n", i ); - output( "\tcall *%%edx\n" ); needs_get_pc_thunk = 1; } else { output( "\tmovl $%u,%%eax\n", i ); - output( "\tcall *(%s)\n", asm_name("__wine_syscall_dispatcher") ); + output( "\tmovl $__wine_syscall,%%edx\n" ); } + output( "\tcall *%%edx\n" ); output( "\tret $%u\n", get_args_size( odp )); break; case CPU_x86_64: @@ -1559,6 +1589,14 @@ void output_syscalls( DLLSPEC *spec ) output_function_size( name ); } + if (target_cpu == CPU_x86 && !UsePIC) + { + output( "\t.align %d\n", get_alignment(16) ); + output( "\t%s\n", func_declaration("__wine_syscall") ); + output( "__wine_syscall:\n" ); + output( "\tjmp *(%s)\n", asm_name("__wine_syscall_dispatcher") ); + output_function_size( "__wine_syscall" ); + } output( "\t.data\n" ); output( "\t.align %d\n", get_alignment( get_ptr_size() ) ); output( "%s\n", asm_globl("__wine_syscall_dispatcher") );

1 0

Alexandre Julliard : winebuild: Generate Windows-style syscall thunks on x86_64.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 917a206b01c82170a862e8497cbe26b6f1bfade0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=917a206b01c82170a862e849… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 8 09:20:57 2020 +0200 winebuild: Generate Windows-style syscall thunks on x86_64. Based on patches by Michael Müller. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mapping.c | 6 ++++- tools/winebuild/import.c | 68 +++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 67 insertions(+), 7 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 07c51c246d..ce70b696bd 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -964,7 +964,11 @@ struct object *create_user_data_mapping( struct object *root, const struct unico if (!(mapping = create_mapping( root, name, OBJ_OPENIF, sizeof(KSHARED_USER_DATA), SEC_COMMIT, 0, FILE_READ_DATA | FILE_WRITE_DATA, NULL ))) return NULL; ptr = mmap( NULL, mapping->size, PROT_WRITE, MAP_SHARED, get_unix_fd( mapping->fd ), 0 ); - if (ptr != MAP_FAILED) user_shared_data = ptr; + if (ptr != MAP_FAILED) + { + user_shared_data = ptr; + user_shared_data->SystemCallPad[0] = 1; + } return &mapping->obj; } diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index b40c2c3107..b725e81163 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1484,12 +1484,46 @@ void output_syscalls( DLLSPEC *spec ) output( "\tjmp 2b\n" ); break; case CPU_x86_64: + output( "\tpushq %%rbp\n" ); + output_cfi( ".cfi_adjust_cfa_offset 8" ); + output_cfi( ".cfi_rel_offset %%rbp,0" ); + output( "\tmovq %%rsp,%%rbp\n" ); + output_cfi( ".cfi_def_cfa_register %%rbp" ); + output( "\tpushq %%rsi\n" ); + output_cfi( ".cfi_rel_offset %%rsi,-8" ); + output( "\tpushq %%rdi\n" ); + output_cfi( ".cfi_rel_offset %%rdi,-16" ); + /* Legends of Runeterra hooks the first system call return instruction, and + * depends on us returning to it. Adjust the return address accordingly. */ + output( "\tsubq $0xb,0x8(%%rbp)\n" ); output( "\tcmpq $%u,%%rax\n", count ); - output( "\tjae 1f\n" ); + output( "\tjae 3f\n" ); + output( "\tmovzbq .Lsyscall_args(%%rip),%%rcx\n" ); + output( "\tsubq $0x20,%%rcx\n" ); + output( "\tjbe 1f\n" ); + output( "\tsubq %%rcx,%%rsp\n" ); + output( "\tshrq $3,%%rcx\n" ); + output( "\tleaq 0x38(%%rbp),%%rsi\n" ); + output( "\tandq $~15,%%rsp\n\t" ); + output( "\tmovq %%rsp,%%rdi\n" ); + output( "\tcld\n" ); + output( "\trep; movsq\n" ); + output( "1:\tmovq %%r10,%%rcx\n" ); + output( "\tsubq $0x20,%%rsp\n" ); output( "\tleaq .Lsyscall_table(%%rip),%%r10\n" ); - output( "\tjmpq *(%%r10,%%rax,8)\n" ); - output( "1:\tmovl $0x%x,%%eax\n", invalid_param ); + output( "\tcallq *(%%r10,%%rax,8)\n" ); + output( "2:\tleaq -0x10(%%rbp),%%rsp\n" ); + output( "\tpopq %%rdi\n" ); + output_cfi( ".cfi_same_value %%rdi" ); + output( "\tpopq %%rsi\n" ); + output_cfi( ".cfi_same_value %%rsi" ); + output_cfi( ".cfi_def_cfa_register %%rsp" ); + output( "\tpopq %%rbp\n" ); + output_cfi( ".cfi_adjust_cfa_offset -8" ); + output_cfi( ".cfi_same_value %%rbp" ); output( "\tret\n" ); + output( "3:\tmovl $0x%x,%%eax\n", invalid_param ); + output( "\tjmp 2b\n" ); break; case CPU_ARM: output( "\tldr r1, 4f\n" ); @@ -1562,9 +1596,31 @@ void output_syscalls( DLLSPEC *spec ) output( "\tret $%u\n", get_args_size( odp )); break; case CPU_x86_64: - /* FIXME: syscall thunks not binary-compatible yet */ - output( "\tmovl $%u,%%eax\n", i ); - output( "\tjmpq *%s(%%rip)\n", asm_name("__wine_syscall_dispatcher") ); + /* Chromium depends on syscall thunks having the same form as on + * Windows. For 64-bit systems the only viable form we can emulate is + * having an int $0x2e fallback. Since actually using an interrupt is + * expensive, and since for some reason Chromium doesn't actually + * validate that instruction, we can just put a jmp there instead. */ + output( "\t.byte 0x4c,0x8b,0xd1\n" ); /* movq %rcx,%r10 */ + output( "\t.byte 0xb8\n" ); /* movl $i,%eax */ + output( "\t.long %u\n", i ); + output( "\t.byte 0xf6,0x04,0x25,0x08,0x03,0xfe,0x7f,0x01\n" ); /* testb $1,0x7ffe0308 */ + output( "\t.byte 0x75,0x03\n" ); /* jne 1f */ + output( "\t.byte 0x0f,0x05\n" ); /* syscall */ + output( "\t.byte 0xc3\n" ); /* ret */ + output( "\tjmp 1f\n" ); + output( "\t.byte 0xc3\n" ); /* ret */ + if (target_platform == PLATFORM_WINDOWS) + { + output( "1:\t.byte 0xff,0x14,0x25\n" ); /* 2: callq *(__wine_syscall_dispatcher) */ + output( "\t.long __wine_syscall_dispatcher\n" ); + } + else + { + output( "\tnop\n" ); + output( "1:\tcallq *%s(%%rip)\n", asm_name("__wine_syscall_dispatcher") ); + } + output( "\tret\n" ); break; case CPU_ARM: output( "\tpush {r0-r1}\n" );

1 0

Alexandre Julliard : ntdll: Move NtQueryObject/NtSetInformationObject to the Unix library.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 518decf16b8445f49cb8bddfd081e7911ae28212 URL: https://source.winehq.org/git/wine.git/?a=commit;h=518decf16b8445f49cb8bddf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 8 12:21:38 2020 +0200 ntdll: Move NtQueryObject/NtSetInformationObject to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 34 -------- dlls/ntdll/ntdll_misc.h | 2 - dlls/ntdll/om.c | 192 +------------------------------------------ dlls/ntdll/unix/file.c | 210 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/loader.c | 2 + dlls/ntdll/unixlib.h | 6 +- 6 files changed, 219 insertions(+), 227 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=518decf16b8445f49cb8…

1 0

Alexandre Julliard : kernel32: Move RemoveDirectoryA/W() implementation to kernelbase.
by Alexandre Julliard 08 Jul '20

08 Jul '20

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 08 Jul '20

08 Jul '20

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

Alexandre Julliard : ntdll: Disallow relative paths in wine_unix_to_nt_file_name(), handle them in the caller.
by Alexandre Julliard 08 Jul '20

08 Jul '20

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

Daniel Lehman : msxml3: Set internal error on loading from IStream.
by Alexandre Julliard 08 Jul '20

08 Jul '20

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