wine-devel July 2020

wine-devel@winehq.org

75 participants
841 discussions

Start a nNew thread

[PATCH 2/4] xactengine3_7: Register the com classes.
by Vijay Kiran Kamuju 02 Jul '20

02 Jul '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] mlang: Fix a MSVC warning C4334.
by Serge Gautherie 02 Jul '20

02 Jul '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- '...\mlang.c(3568): warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)' --- dlls/mlang/mlang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 1b1aed3..a209cc4 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3565,7 +3565,7 @@ static HRESULT WINAPI fnIMLangFontLink2_GetScriptFontInfo(IMLangFontLink2* This, { if (j >= *puiFonts) break; - pScriptFont[j].scripts = 1 << mlang_data[i].sid; + pScriptFont[j].scripts = 1LL << mlang_data[i].sid; if (dwFlags == SCRIPTCONTF_FIXED_FONT) { MultiByteToWideChar(CP_ACP, 0, mlang_data[i].fixed_font, -1, -- 2.10.0.windows.1

1 0

[PATCH 1/5] d3dcompiler: Track def-use chains for anonymous nodes.
by Zebediah Figura 02 Jul '20

02 Jul '20

This is useful for replacing one instruction with another of a different type, which is useful for some optimizations such as constant folding. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 33 ++++++++++++--- dlls/d3dcompiler_43/hlsl.y | 49 +++++++++++----------- dlls/d3dcompiler_43/utils.c | 50 ++++++++++++++--------- 3 files changed, 83 insertions(+), 49 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 50457b2e64e..23eff210940 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -662,6 +662,8 @@ struct hlsl_ir_node enum hlsl_ir_node_type type; struct hlsl_type *data_type; + struct list uses; + struct source_location loc; /* Liveness ranges. "index" is the index of this instruction. Since this is @@ -671,6 +673,12 @@ struct hlsl_ir_node unsigned int index, last_read; }; +struct hlsl_src +{ + struct hlsl_ir_node *node; + struct list entry; +}; + #define HLSL_STORAGE_EXTERN 0x00000001 #define HLSL_STORAGE_NOINTERPOLATION 0x00000002 #define HLSL_MODIFIER_PRECISE 0x00000004 @@ -733,7 +741,7 @@ struct hlsl_ir_function_decl struct hlsl_ir_if { struct hlsl_ir_node node; - struct hlsl_ir_node *condition; + struct hlsl_src condition; struct list *then_instrs; struct list *else_instrs; }; @@ -817,7 +825,7 @@ struct hlsl_ir_expr { struct hlsl_ir_node node; enum hlsl_ir_expr_op op; - struct hlsl_ir_node *operands[3]; + struct hlsl_src operands[3]; }; enum hlsl_ir_jump_type @@ -837,14 +845,14 @@ struct hlsl_ir_jump struct hlsl_ir_swizzle { struct hlsl_ir_node node; - struct hlsl_ir_node *val; + struct hlsl_src val; DWORD swizzle; }; struct hlsl_deref { struct hlsl_ir_var *var; - struct hlsl_ir_node *offset; + struct hlsl_src offset; }; struct hlsl_ir_load @@ -857,7 +865,7 @@ struct hlsl_ir_assignment { struct hlsl_ir_node node; struct hlsl_deref lhs; - struct hlsl_ir_node *rhs; + struct hlsl_src rhs; unsigned char writemask; }; @@ -1055,6 +1063,21 @@ static inline void init_node(struct hlsl_ir_node *node, enum hlsl_ir_node_type t node->type = type; node->data_type = data_type; node->loc = loc; + list_init(&node->uses); +} + +static inline void hlsl_src_from_node(struct hlsl_src *src, struct hlsl_ir_node *node) +{ + src->node = node; + if (node) + list_add_tail(&node->uses, &src->entry); +} + +static inline void hlsl_src_remove(struct hlsl_src *src) +{ + if (src->node) + list_remove(&src->entry); + src->node = NULL; } struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lhs, diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 21828337939..475fd414fd7 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -308,7 +308,7 @@ static BOOL append_conditional_break(struct list *cond_list) return FALSE; } init_node(&iff->node, HLSL_IR_IF, NULL, condition->loc); - iff->condition = not; + 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)))) @@ -421,7 +421,7 @@ static struct hlsl_ir_swizzle *new_swizzle(DWORD s, unsigned int components, return NULL; init_node(&swizzle->node, HLSL_IR_SWIZZLE, new_hlsl_type(NULL, HLSL_CLASS_VECTOR, val->data_type->base_type, components, 1), *loc); - swizzle->val = val; + hlsl_src_from_node(&swizzle->val, val); swizzle->swizzle = s; return swizzle; } @@ -551,8 +551,8 @@ static struct hlsl_ir_assignment *new_assignment(struct hlsl_ir_var *var, struct init_node(&assign->node, HLSL_IR_ASSIGNMENT, NULL, loc); assign->lhs.var = var; - assign->lhs.offset = offset; - assign->rhs = rhs; + hlsl_src_from_node(&assign->lhs.offset, offset); + hlsl_src_from_node(&assign->rhs, rhs); assign->writemask = writemask; return assign; } @@ -616,7 +616,7 @@ struct hlsl_ir_node *new_unary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node return NULL; init_node(&expr->node, HLSL_IR_EXPR, arg->data_type, loc); expr->op = op; - expr->operands[0] = arg; + hlsl_src_from_node(&expr->operands[0], arg); return &expr->node; } @@ -631,8 +631,8 @@ struct hlsl_ir_node *new_binary_expr(enum hlsl_ir_expr_op op, return NULL; init_node(&expr->node, HLSL_IR_EXPR, arg1->data_type, arg1->loc); expr->op = op; - expr->operands[0] = arg1; - expr->operands[1] = arg2; + hlsl_src_from_node(&expr->operands[0], arg1); + hlsl_src_from_node(&expr->operands[1], arg2); return &expr->node; } @@ -662,9 +662,9 @@ static struct hlsl_ir_load *add_load(struct list *instrs, struct hlsl_ir_node *v const struct hlsl_deref *src = &load_from_node(var_node)->src; var = src->var; - if (src->offset) + if (src->offset.node) { - if (!(add = new_binary_expr(HLSL_IR_BINOP_ADD, src->offset, offset))) + if (!(add = new_binary_expr(HLSL_IR_BINOP_ADD, src->offset.node, offset))) return NULL; list_add_tail(instrs, &add->entry); offset = add; @@ -691,7 +691,7 @@ static struct hlsl_ir_load *add_load(struct list *instrs, struct hlsl_ir_node *v return NULL; init_node(&load->node, HLSL_IR_LOAD, data_type, loc); load->src.var = var; - load->src.offset = offset; + hlsl_src_from_node(&load->src.offset, offset); list_add_tail(instrs, &load->node.entry); return load; } @@ -2212,16 +2212,18 @@ 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); + if (!instr) { ERR("Out of memory\n"); YYABORT; } init_node(&instr->node, HLSL_IR_IF, NULL, get_location(&@1)); - instr->condition = node_from_list($3); + hlsl_src_from_node(&instr->condition, condition); instr->then_instrs = $5.then_instrs; instr->else_instrs = $5.else_instrs; - if (instr->condition->data_type->dimx > 1 || instr->condition->data_type->dimy > 1) + if (condition->data_type->dimx > 1 || condition->data_type->dimy > 1) { hlsl_report_message(instr->node.loc, HLSL_LEVEL_ERROR, "if condition requires a scalar"); @@ -2883,19 +2885,18 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs var = assignment->lhs.var; if (!var->first_write) var->first_write = loop_first ? min(instr->index, loop_first) : instr->index; - assignment->rhs->last_read = instr->index; - if (assignment->lhs.offset) - assignment->lhs.offset->last_read = instr->index; + assignment->rhs.node->last_read = instr->index; + if (assignment->lhs.offset.node) + assignment->lhs.offset.node->last_read = instr->index; break; } case HLSL_IR_EXPR: { struct hlsl_ir_expr *expr = expr_from_node(instr); - expr->operands[0]->last_read = instr->index; - if (expr->operands[1]) - expr->operands[1]->last_read = instr->index; - if (expr->operands[2]) - expr->operands[2]->last_read = instr->index; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(expr->operands) && expr->operands[i].node; ++i) + expr->operands[i].node->last_read = instr->index; break; } case HLSL_IR_IF: @@ -2904,7 +2905,7 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs compute_liveness_recurse(iff->then_instrs, loop_first, loop_last); if (iff->else_instrs) compute_liveness_recurse(iff->else_instrs, loop_first, loop_last); - iff->condition->last_read = instr->index; + iff->condition.node->last_read = instr->index; break; } case HLSL_IR_LOAD: @@ -2912,8 +2913,8 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs struct hlsl_ir_load *load = load_from_node(instr); var = load->src.var; var->last_read = loop_last ? max(instr->index, loop_last) : instr->index; - if (load->src.offset) - load->src.offset->last_read = instr->index; + if (load->src.offset.node) + load->src.offset.node->last_read = instr->index; break; } case HLSL_IR_LOOP: @@ -2926,7 +2927,7 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs case HLSL_IR_SWIZZLE: { struct hlsl_ir_swizzle *swizzle = swizzle_from_node(instr); - swizzle->val->last_read = instr->index; + swizzle->val.node->last_read = instr->index; break; } case HLSL_IR_CONSTANT: diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 30aa9de1dd4..4bc3b9b0a64 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1369,9 +1369,8 @@ struct hlsl_ir_expr *add_expr(struct list *instrs, enum hlsl_ir_expr_op op, stru return NULL; init_node(&expr->node, HLSL_IR_EXPR, type, *loc); expr->op = op; - expr->operands[0] = operands[0]; - expr->operands[1] = operands[1]; - expr->operands[2] = operands[2]; + for (i = 0; i <= 2; ++i) + hlsl_src_from_node(&expr->operands[i], operands[i]); list_add_tail(instrs, &expr->node.entry); return expr; @@ -1485,11 +1484,12 @@ struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lh if (lhs->data_type->type == HLSL_CLASS_MATRIX) FIXME("Assignments with writemasks and matrices on lhs are not supported yet.\n"); - lhs_inner = swizzle->val; + lhs_inner = swizzle->val.node; + hlsl_src_remove(&swizzle->val); list_remove(&lhs->entry); list_add_after(&rhs->entry, &lhs->entry); - swizzle->val = rhs; + hlsl_src_from_node(&swizzle->val, rhs); if (!invert_swizzle(&swizzle->swizzle, &writemask, &width)) { hlsl_report_message(lhs->loc, HLSL_LEVEL_ERROR, "invalid writemask"); @@ -1513,7 +1513,8 @@ struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lh init_node(&assign->node, HLSL_IR_ASSIGNMENT, lhs_type, lhs->loc); assign->writemask = writemask; - assign->lhs = load_from_node(lhs)->src; + assign->lhs.var = load_from_node(lhs)->src.var; + hlsl_src_from_node(&assign->lhs.offset, load_from_node(lhs)->src.offset.node); if (assign_op != ASSIGN_OP_ASSIGN) { enum hlsl_ir_expr_op op = op_from_assignment(assign_op); @@ -1524,7 +1525,7 @@ struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lh list_add_after(&rhs->entry, &expr->entry); rhs = expr; } - assign->rhs = rhs; + hlsl_src_from_node(&assign->rhs, rhs); list_add_tail(instrs, &assign->node.entry); return &assign->node; @@ -1787,12 +1788,12 @@ static void debug_dump_instr_list(const struct list *list) } } -static void debug_dump_src(const struct hlsl_ir_node *node) +static void debug_dump_src(const struct hlsl_src *src) { - if (node->index) - wine_dbg_printf("@%u", node->index); + if (src->node->index) + wine_dbg_printf("@%u", src->node->index); else - wine_dbg_printf("%p", node); + wine_dbg_printf("%p", src->node); } static void debug_dump_ir_var(const struct hlsl_ir_var *var) @@ -1806,15 +1807,15 @@ static void debug_dump_ir_var(const struct hlsl_ir_var *var) static void debug_dump_deref(const struct hlsl_deref *deref) { - if (deref->offset) + if (deref->offset.node) /* Print the variable's type for convenience. */ wine_dbg_printf("(%s %s)", debug_hlsl_type(deref->var->data_type), deref->var->name); else wine_dbg_printf("%s", deref->var->name); - if (deref->offset) + if (deref->offset.node) { wine_dbg_printf("["); - debug_dump_src(deref->offset); + debug_dump_src(&deref->offset); wine_dbg_printf("]"); } } @@ -1942,9 +1943,9 @@ static void debug_dump_ir_expr(const struct hlsl_ir_expr *expr) unsigned int i; wine_dbg_printf("%s (", debug_expr_op(expr)); - for (i = 0; i < 3 && expr->operands[i]; ++i) + for (i = 0; i < 3 && expr->operands[i].node; ++i) { - debug_dump_src(expr->operands[i]); + debug_dump_src(&expr->operands[i]); wine_dbg_printf(" "); } wine_dbg_printf(")"); @@ -1976,7 +1977,7 @@ static void debug_dump_ir_assignment(const struct hlsl_ir_assignment *assign) if (assign->writemask != BWRITERSP_WRITEMASK_ALL) wine_dbg_printf("%s", debug_writemask(assign->writemask)); wine_dbg_printf(" "); - debug_dump_src(assign->rhs); + debug_dump_src(&assign->rhs); wine_dbg_printf(")"); } @@ -1984,9 +1985,9 @@ static void debug_dump_ir_swizzle(const struct hlsl_ir_swizzle *swizzle) { unsigned int i; - debug_dump_src(swizzle->val); + debug_dump_src(&swizzle->val); wine_dbg_printf("."); - if (swizzle->val->data_type->dimy > 1) + if (swizzle->val.node->data_type->dimy > 1) { for (i = 0; i < swizzle->node.data_type->dimx; ++i) wine_dbg_printf("_m%u%u", (swizzle->swizzle >> i * 8) & 0xf, (swizzle->swizzle >> (i * 8 + 4)) & 0xf); @@ -2022,7 +2023,7 @@ static void debug_dump_ir_jump(const struct hlsl_ir_jump *jump) static void debug_dump_ir_if(const struct hlsl_ir_if *if_node) { wine_dbg_printf("if ("); - debug_dump_src(if_node->condition); + debug_dump_src(&if_node->condition); wine_dbg_printf(")\n{\n"); debug_dump_instr_list(if_node->then_instrs); wine_dbg_printf("}\n"); @@ -2135,21 +2136,29 @@ static void free_ir_constant(struct hlsl_ir_constant *constant) static void free_ir_load(struct hlsl_ir_load *load) { + hlsl_src_remove(&load->src.offset); d3dcompiler_free(load); } static void free_ir_swizzle(struct hlsl_ir_swizzle *swizzle) { + hlsl_src_remove(&swizzle->val); d3dcompiler_free(swizzle); } static void free_ir_expr(struct hlsl_ir_expr *expr) { + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(expr->operands); ++i) + hlsl_src_remove(&expr->operands[i]); d3dcompiler_free(expr); } static void free_ir_assignment(struct hlsl_ir_assignment *assignment) { + hlsl_src_remove(&assignment->rhs); + hlsl_src_remove(&assignment->lhs.offset); d3dcompiler_free(assignment); } @@ -2157,6 +2166,7 @@ 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); + hlsl_src_remove(&if_node->condition); d3dcompiler_free(if_node); } -- 2.27.0

4 11

[PATCH 1/3] ntdll: Reimplement NtQuerySystemInformation(SystemProcessInformation) using a single server call.
by Zebediah Figura 02 Jul '20

02 Jul '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- This decreases CPU usage by wineserver from about 65% to about 45% for me in Street Fighter V, which for some reason calls this 15-20 times per second. dlls/ntdll/unix/system.c | 177 ++++++++++++++++----------------------- server/process.c | 56 +++++++++++++ server/protocol.def | 30 +++++++ server/trace.c | 34 ++++++++ 4 files changed, 191 insertions(+), 106 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 7045bc1550b..f89208997e2 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2083,132 +2083,97 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, case SystemProcessInformation: { - SYSTEM_PROCESS_INFORMATION *spi = info; - SYSTEM_PROCESS_INFORMATION *last = NULL; - HANDLE handle = 0; - WCHAR procname[1024]; - WCHAR* exename; - DWORD wlen = 0; - DWORD procstructlen = 0; + unsigned int process_count, i, j; + const struct process_info *server_process; + void *buffer = NULL; - SERVER_START_REQ( create_snapshot ) + if (size && !(buffer = RtlAllocateHeap( GetProcessHeap(), 0, size ))) { - req->flags = SNAP_PROCESS | SNAP_THREAD; - if (!(ret = wine_server_call( req ))) handle = wine_server_ptr_handle( reply->handle ); + ret = STATUS_NO_MEMORY; + break; } - SERVER_END_REQ; - len = 0; - while (ret == STATUS_SUCCESS) + SERVER_START_REQ( list_processes ) { - int unix_pid = -1; - SERVER_START_REQ( next_process ) - { - req->handle = wine_server_obj_handle( handle ); - req->reset = (len == 0); - wine_server_set_reply( req, procname, sizeof(procname) - sizeof(WCHAR) ); - if (!(ret = wine_server_call( req ))) - { - unix_pid = reply->unix_pid; - - /* Make sure procname is 0 terminated */ - procname[wine_server_reply_size(reply) / sizeof(WCHAR)] = 0; - - /* Get only the executable name, not the path */ - if ((exename = wcsrchr(procname, '\\')) != NULL) exename++; - else exename = procname; - - wlen = (wcslen(exename) + 1) * sizeof(WCHAR); - procstructlen = sizeof(*spi) + wlen + ((reply->threads - 1) * sizeof(SYSTEM_THREAD_INFORMATION)); + wine_server_set_reply( req, buffer, size ); + ret = wine_server_call( req ); + len = reply->user_len; + process_count = reply->process_count; + } + SERVER_END_REQ; - if (size >= len + procstructlen) - { - /* ftCreationTime, ftUserTime, ftKernelTime; - * vmCounters, ioCounters - */ - memset(spi, 0, sizeof(*spi)); + if (ret) + { + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + break; + } - spi->NextEntryOffset = procstructlen - wlen; - spi->dwThreadCount = reply->threads; + server_process = buffer; + len = 0; - /* spi->pszProcessName will be set later on */ + for (i = 0; i < process_count; i++) + { + const WCHAR *server_name = (const WCHAR *)(server_process + 1); + SYSTEM_PROCESS_INFORMATION *nt_process = (SYSTEM_PROCESS_INFORMATION *)((char *)info + len); + const struct thread_info *server_thread; + const WCHAR *file_part; + ULONG proc_len; + ULONG name_len = 0; - spi->dwBasePriority = reply->priority; - spi->UniqueProcessId = UlongToHandle(reply->pid); - spi->ParentProcessId = UlongToHandle(reply->ppid); - spi->HandleCount = reply->handles; + file_part = server_name + (server_process->name_len / sizeof(WCHAR)); + while (file_part > server_name && file_part[-1] != '\\') + { + file_part--; + name_len++; + } - /* spi->ti will be set later on */ + proc_len = sizeof(*nt_process) + server_process->thread_count * sizeof(SYSTEM_THREAD_INFORMATION) + + (name_len + 1) * sizeof(WCHAR); + len += proc_len; - } - len += procstructlen; - } - } - SERVER_END_REQ; - if (ret != STATUS_SUCCESS) + if (len <= size) { - if (ret == STATUS_NO_MORE_FILES) ret = STATUS_SUCCESS; - break; + memset(nt_process, 0, sizeof(*nt_process)); + if (i < process_count - 1) + nt_process->NextEntryOffset = proc_len; + nt_process->dwThreadCount = server_process->thread_count; + nt_process->dwBasePriority = server_process->priority; + nt_process->UniqueProcessId = UlongToHandle(server_process->pid); + nt_process->ParentProcessId = UlongToHandle(server_process->parent_pid); + nt_process->HandleCount = server_process->handle_count; + get_thread_times( server_process->unix_pid, -1, &nt_process->KernelTime, &nt_process->UserTime ); } - if (size >= len) + server_thread = (const struct thread_info *)((const char *)server_name + server_process->name_len); + for (j = 0; j < server_process->thread_count; j++) { - int i, j; - - get_thread_times(unix_pid, -1, &spi->KernelTime, &spi->UserTime); - - /* set thread info */ - i = j = 0; - while (ret == STATUS_SUCCESS) + if (len <= size) { - int unix_tid, pid, tid, base_pri, delta_pri; - SERVER_START_REQ( next_thread ) - { - req->handle = wine_server_obj_handle( handle ); - req->reset = (j == 0); - if (!(ret = wine_server_call( req ))) - { - unix_tid = reply->unix_tid; - pid = reply->pid; - tid = reply->tid; - base_pri = reply->base_pri; - delta_pri = reply->delta_pri; - j++; - } - } - SERVER_END_REQ; - - if (!ret) - { - if (UlongToHandle(pid) == spi->UniqueProcessId) - { - memset(&spi->ti[i], 0, sizeof(spi->ti)); - - spi->ti[i].CreateTime.QuadPart = 0xdeadbeef; - spi->ti[i].ClientId.UniqueProcess = UlongToHandle(pid); - spi->ti[i].ClientId.UniqueThread = UlongToHandle(tid); - spi->ti[i].dwCurrentPriority = base_pri + delta_pri; - spi->ti[i].dwBasePriority = base_pri; - get_thread_times(unix_pid, unix_tid, &spi->ti[i].KernelTime, &spi->ti[i].UserTime); - i++; - } - } + nt_process->ti[j].CreateTime.QuadPart = 0xdeadbeef; + 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; + nt_process->ti[j].dwBasePriority = server_thread->base_priority; + get_thread_times( server_process->unix_pid, server_thread->unix_tid, + &nt_process->ti[j].KernelTime, &nt_process->ti[j].UserTime ); } - if (ret == STATUS_NO_MORE_FILES) ret = STATUS_SUCCESS; - - /* now append process name */ - spi->ProcessName.Buffer = (WCHAR*)((char*)spi + spi->NextEntryOffset); - spi->ProcessName.Length = wlen - sizeof(WCHAR); - spi->ProcessName.MaximumLength = wlen; - memcpy( spi->ProcessName.Buffer, exename, wlen ); - spi->NextEntryOffset += wlen; - last = spi; - spi = (SYSTEM_PROCESS_INFORMATION*)((char*)spi + spi->NextEntryOffset); + + server_thread++; } + + if (len <= size) + { + nt_process->ProcessName.Buffer = (WCHAR *)&nt_process->ti[server_process->thread_count]; + nt_process->ProcessName.Length = name_len * sizeof(WCHAR); + nt_process->ProcessName.MaximumLength = (name_len + 1) * sizeof(WCHAR); + memcpy(nt_process->ProcessName.Buffer, file_part, name_len * sizeof(WCHAR)); + nt_process->ProcessName.Buffer[name_len] = 0; + } + + server_process = (const struct process_info *)server_thread; } - if (ret == STATUS_SUCCESS && last) last->NextEntryOffset = 0; + if (len > size) ret = STATUS_INFO_LENGTH_MISMATCH; - if (handle) NtClose( handle ); break; } diff --git a/server/process.c b/server/process.c index 283edc09c5e..452861491f8 100644 --- a/server/process.c +++ b/server/process.c @@ -22,6 +22,7 @@ #include "wine/port.h" #include <assert.h> +#include <errno.h> #include <limits.h> #include <signal.h> #include <string.h> @@ -1819,3 +1820,58 @@ DECL_HANDLER(resume_process) release_object( process ); } } + +/* Get a list of processes and threads currently running */ +DECL_HANDLER(list_processes) +{ + struct process_info *process_info; + struct process *process; + struct thread *thread; + + reply->process_count = 0; + reply->user_len = 0; + + LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) + { + struct process_dll *exe = get_process_exe_module( process ); + reply->user_len += sizeof(struct process_info) + exe->namelen; + reply->user_len += process->running_threads * sizeof(struct thread_info); + reply->process_count++; + } + + if (reply->user_len > get_reply_max_size()) + { + set_error( STATUS_INFO_LENGTH_MISMATCH ); + return; + } + + process_info = set_reply_data_size( reply->user_len ); + if (!process_info) return; + + LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) + { + struct process_dll *exe = get_process_exe_module( process ); + WCHAR *name = (WCHAR *)(process_info + 1); + struct thread_info *thread_info = (struct thread_info *)((char *)name + exe->namelen); + + process_info->name_len = exe->namelen; + process_info->thread_count = process->running_threads; + process_info->priority = process->priority; + process_info->pid = process->id; + process_info->parent_pid = process->parent_id; + process_info->handle_count = get_handle_table_count(process); + process_info->unix_pid = process->unix_pid; + memcpy( name, exe->filename, exe->namelen ); + + LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) + { + thread_info->tid = thread->id; + thread_info->base_priority = thread->priority; + thread_info->current_priority = thread->priority; /* FIXME */ + thread_info->unix_tid = thread->unix_tid; + thread_info++; + } + + process_info = (struct process_info *)thread_info; + } +} diff --git a/server/protocol.def b/server/protocol.def index 6416306c0a1..bd531a1a727 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1919,6 +1919,36 @@ enum char_info_mode @END +struct thread_info +{ + thread_id_t tid; + int base_priority; + int current_priority; + int unix_tid; +}; + +struct process_info +{ + data_size_t name_len; + unsigned int thread_count; + int priority; + process_id_t pid; + process_id_t parent_pid; + unsigned int handle_count; + int unix_pid; + /* VARARG(name,unicode_str,name_len); */ + /* VARARG(threads,struct thread_info,thread_count); */ +}; + +/* Get a list of processes and threads currently running */ +@REQ(list_processes) +@REPLY + data_size_t user_len; /* length needed to store user */ + unsigned int process_count; + VARARG(data,process_info); +@END + + /* Wait for a debug event */ @REQ(wait_debug_event) int get_handle; /* should we alloc a handle for waiting? */ diff --git a/server/trace.c b/server/trace.c index 2fb5afd5ef1..f39c7402d41 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1115,6 +1115,40 @@ static void dump_varargs_token_groups( const char *prefix, data_size_t size ) fputc( '}', stderr ); } +static void dump_varargs_process_info( const char *prefix, data_size_t size ) +{ + const struct process_info *process = cur_data; + const struct thread_info *thread; + data_size_t pos = 0; + unsigned int i; + + fprintf( stderr,"%s{", prefix ); + + while (size - pos >= sizeof(*process)) + { + fprintf( stderr, "[thread_count=%u,priority=%d,pid=%04x,parent_pid=%04x,handle_count=%08x,unix_pid=%d,", + process->thread_count, process->priority, process->pid, + process->parent_pid, process->handle_count, process->unix_pid ); + pos += sizeof(*process); + pos = dump_inline_unicode_string( "name=L\"", pos, process->name_len, size ); + fprintf( stderr, "\",threads={" ); + thread = (const struct thread_info *)((const char *)cur_data + pos); + for (i = 0; i < process->thread_count; i++) + { + if (size - pos < sizeof(*thread)) break; + 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); + thread++; + } + fprintf( stderr, "}," ); + + process = (const struct process_info *)thread; + } + + fputc( '}', stderr ); +} + static void dump_varargs_object_attributes( const char *prefix, data_size_t size ) { const struct object_attributes *objattr = cur_data; -- 2.27.0

4 5

[PATCH 4/4] setupapi: Fix parameters of SPFILENOTIFY_FILEINCABINET handler.
by Vijay Kiran Kamuju 02 Jul '20

02 Jul '20

Bug 42827 references the setup application that depends on this. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42827 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 3/4] setupapi/tests: Add tests for cabinet name passed to SPFILENOTIFY_FILEEXTRACTED.
by Vijay Kiran Kamuju 02 Jul '20

02 Jul '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/4] setupapi: Fix CabinetName passed to SPFILENOTIFY_CABINETINFO handler.
by Vijay Kiran Kamuju 02 Jul '20

02 Jul '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/4] setupapi/tests: Add more tests for SPFILENOTIFY_FILEINCABINET handler.
by Vijay Kiran Kamuju 02 Jul '20

02 Jul '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 4/4] mshtml: Add IMarkupServices::CreateMarkupPointer implementation.
by Jacek Caban 02 Jul '20

02 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 6 +- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/range.c | 294 +++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 22 +++ 4 files changed, 321 insertions(+), 2 deletions(-)

2 1

[PATCH 3/4] mshtml.idl: Add missing MoveUnitBounded to IMarkupPointer2.
by Jacek Caban 02 Jul '20

02 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtml.idl | 4 ++++ 1 file changed, 4 insertions(+)

2 1

← Newer
1
...
76
77
78
79
80
81
82
...
85
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel July 2020