June 2018 - Wine-commits - list.winehq.org

Zebediah Figura : winedbg: Add a backend-specific vector for retrieving a thread's context.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: wine Branch: master Commit: 23261793122e6bce51374556d000a6387b91538b URL: https://source.winehq.org/git/wine.git/?a=commit;h=23261793122e6bce51374556… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jun 12 19:01:50 2018 -0500 winedbg: Add a backend-specific vector for retrieving a thread's context. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 11 +++++++++++ programs/winedbg/be_arm64.c | 11 +++++++++++ programs/winedbg/be_cpu.h | 3 +++ programs/winedbg/be_i386.c | 7 +++++++ programs/winedbg/be_ppc.c | 11 +++++++++++ programs/winedbg/be_x86_64.c | 11 +++++++++++ programs/winedbg/gdbproxy.c | 2 +- programs/winedbg/stack.c | 4 +--- programs/winedbg/tgt_active.c | 14 +------------- 9 files changed, 57 insertions(+), 17 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index b7e42e1..a0e8027 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1889,6 +1889,16 @@ static BOOL be_arm_store_integer(const struct dbg_lvalue* lvalue, unsigned size, return memory_write_value(lvalue, size, &val); } +static BOOL be_arm_get_context(HANDLE thread, dbg_ctx_t *ctx) +{ +#ifdef __arm__ + ctx->ctx.ContextFlags = CONTEXT_ALL; + return GetThreadContext(thread, &ctx->ctx); +#else + WINE_FIXME("Cannot debug an ARM process on this architecture.\n"); +#endif +} + struct backend_cpu be_arm = { IMAGE_FILE_MACHINE_ARMNT, @@ -1915,5 +1925,6 @@ struct backend_cpu be_arm = be_arm_fetch_integer, be_arm_fetch_float, be_arm_store_integer, + be_arm_get_context, }; #endif diff --git a/programs/winedbg/be_arm64.c b/programs/winedbg/be_arm64.c index dfeb552..6aa26a6 100644 --- a/programs/winedbg/be_arm64.c +++ b/programs/winedbg/be_arm64.c @@ -278,6 +278,16 @@ void be_arm64_disasm_one_insn(ADDRESS64 *addr, int display) dbg_printf("be_arm64_disasm_one_insn: not done\n"); } +static BOOL be_arm64_get_context(HANDLE thread, dbg_ctx_t *ctx) +{ +#ifdef __aarch64__ + ctx->ctx.ContextFlags = CONTEXT_ALL; + return GetThreadContext(thread, &ctx->ctx); +#else + WINE_FIXME("Cannot debug an ARM64 process on this architecture.\n"); +#endif +} + struct backend_cpu be_arm64 = { IMAGE_FILE_MACHINE_ARM64, @@ -304,5 +314,6 @@ struct backend_cpu be_arm64 = be_arm64_fetch_integer, be_arm64_fetch_float, be_arm64_store_integer, + be_arm64_get_context, }; #endif diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h index 03776d0..aa7d9f0 100644 --- a/programs/winedbg/be_cpu.h +++ b/programs/winedbg/be_cpu.h @@ -21,6 +21,7 @@ enum be_cpu_addr {be_cpu_addr_pc, be_cpu_addr_stack, be_cpu_addr_frame}; enum be_xpoint_type {be_xpoint_break, be_xpoint_watch_exec, be_xpoint_watch_read, be_xpoint_watch_write, be_xpoint_free=-1}; + struct backend_cpu { const DWORD machine; @@ -114,6 +115,8 @@ struct backend_cpu BOOL (*fetch_float)(const struct dbg_lvalue* lvalue, unsigned size, long double*); /* Writes an integer to memory */ BOOL (*store_integer)(const struct dbg_lvalue* lvalue, unsigned size, BOOL is_signed, LONGLONG); + + BOOL (*get_context)(HANDLE thread, dbg_ctx_t *ctx); }; /* some handy functions for non segmented CPUs */ diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index bdc2ece..c7f5ac1 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -853,6 +853,12 @@ static BOOL be_i386_store_integer(const struct dbg_lvalue* lvalue, unsigned size return memory_write_value(lvalue, size, &val); } +static BOOL be_i386_get_context(HANDLE thread, dbg_ctx_t *ctx) +{ + ctx->x86.ContextFlags = WOW64_CONTEXT_ALL; + return Wow64GetThreadContext(thread, &ctx->x86); +} + struct backend_cpu be_i386 = { IMAGE_FILE_MACHINE_I386, @@ -879,5 +885,6 @@ struct backend_cpu be_i386 = be_i386_fetch_integer, be_i386_fetch_float, be_i386_store_integer, + be_i386_get_context, }; #endif diff --git a/programs/winedbg/be_ppc.c b/programs/winedbg/be_ppc.c index f1543bf..baf77dc 100644 --- a/programs/winedbg/be_ppc.c +++ b/programs/winedbg/be_ppc.c @@ -180,6 +180,16 @@ static BOOL be_ppc_store_integer(const struct dbg_lvalue* lvalue, unsigned size, return FALSE; } +static BOOL be_ppc_get_context(HANDLE thread, dbg_ctx_t *ctx) +{ +#ifdef __powerpc__ + ctx->ctx.ContextFlags = CONTEXT_ALL; + return GetThreadContext(thread, &ctx->ctx); +#else + WINE_FIXME("Cannot debug a PowerPC process on this architecture.\n"); +#endif +} + struct backend_cpu be_ppc = { IMAGE_FILE_MACHINE_POWERPC, @@ -206,5 +216,6 @@ struct backend_cpu be_ppc = be_ppc_fetch_integer, be_ppc_fetch_float, be_ppc_store_integer, + be_ppc_get_context, }; #endif diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 450cc87..434f007 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -674,6 +674,16 @@ static BOOL be_x86_64_store_integer(const struct dbg_lvalue* lvalue, unsigned si return memory_write_value(lvalue, size, &val); } +static BOOL be_x86_64_get_context(HANDLE thread, dbg_ctx_t *ctx) +{ +#ifdef __x86_64__ + ctx->ctx.ContextFlags = CONTEXT_ALL; + return GetThreadContext(thread, &ctx->ctx); +#else + WINE_FIXME("Cannot debug an x86-64 process on this architecture.\n"); +#endif +} + struct backend_cpu be_x86_64 = { IMAGE_FILE_MACHINE_AMD64, @@ -700,5 +710,6 @@ struct backend_cpu be_x86_64 = be_x86_64_fetch_integer, be_x86_64_fetch_float, be_x86_64_store_integer, + be_x86_64_get_context, }; #endif diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index d5786b2..b11a8b0 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -552,7 +552,7 @@ static inline void cpu_register_hex_from(dbg_ctx_t* ctx, unsigned idx, const cha static BOOL fetch_context(struct gdb_context *gdbctx, HANDLE h, dbg_ctx_t *ctx) { - if (!GetThreadContext(h, &ctx->ctx)) + if (!gdbctx->process->be_cpu->get_context(h, ctx)) { if (gdbctx->trace & GDBPXY_TRC_WIN32_ERROR) fprintf(stderr, "Can't get thread's context\n"); diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index a036107..820200d 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -354,11 +354,9 @@ static void backtrace_tid(struct dbg_process* pcs, DWORD tid) dbg_ctx_t ctx = {0}; dbg_curr_tid = dbg_curr_thread->tid; - - ctx.ctx.ContextFlags = CONTEXT_FULL; if (SuspendThread(dbg_curr_thread->handle) != -1) { - if (!GetThreadContext(dbg_curr_thread->handle, &ctx.ctx)) + if (!pcs->be_cpu->get_context(dbg_curr_thread->handle, &ctx)) { dbg_printf("Can't get context for thread %04x in current process\n", tid); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 8c94402..fccae0c 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -91,19 +91,7 @@ BOOL dbg_attach_debuggee(DWORD pid, BOOL cofe) static unsigned dbg_fetch_context(void) { - dbg_context.ctx.ContextFlags = CONTEXT_CONTROL - | CONTEXT_INTEGER -#ifdef CONTEXT_FLOATING_POINT - | CONTEXT_FLOATING_POINT -#endif -#ifdef CONTEXT_SEGMENTS - | CONTEXT_SEGMENTS -#endif -#ifdef CONTEXT_DEBUG_REGISTERS - | CONTEXT_DEBUG_REGISTERS -#endif - ; - if (!GetThreadContext(dbg_curr_thread->handle, &dbg_context.ctx)) + if (!dbg_curr_process->be_cpu->get_context(dbg_curr_thread->handle, &dbg_context)) { WINE_WARN("Can't get thread's context\n"); return FALSE;

1 0

Zebediah Figura : winedbg: Add a backend-specific vector for setting a thread's context.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: wine Branch: master Commit: cf349cea69a7da9ac8381be776b74c0509559a7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf349cea69a7da9ac8381be7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jun 12 17:53:20 2018 -0500 winedbg: Add a backend-specific vector for setting a thread's context. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 5 +++++ programs/winedbg/be_arm64.c | 5 +++++ programs/winedbg/be_cpu.h | 1 + programs/winedbg/be_i386.c | 6 ++++++ programs/winedbg/be_ppc.c | 6 ++++++ programs/winedbg/be_x86_64.c | 6 ++++++ programs/winedbg/gdbproxy.c | 10 ++++++---- programs/winedbg/tgt_active.c | 6 +++--- programs/winedbg/tgt_minidump.c | 8 ++++++++ 9 files changed, 46 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index a0e8027..9883476 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1899,6 +1899,11 @@ static BOOL be_arm_get_context(HANDLE thread, dbg_ctx_t *ctx) #endif } +static BOOL be_arm_set_context(HANDLE thread, const dbg_ctx_t *ctx) +{ + return SetThreadContext(thread, &ctx->ctx); +} + struct backend_cpu be_arm = { IMAGE_FILE_MACHINE_ARMNT, diff --git a/programs/winedbg/be_arm64.c b/programs/winedbg/be_arm64.c index 6aa26a6..418d6e0 100644 --- a/programs/winedbg/be_arm64.c +++ b/programs/winedbg/be_arm64.c @@ -288,6 +288,11 @@ static BOOL be_arm64_get_context(HANDLE thread, dbg_ctx_t *ctx) #endif } +static BOOL be_arm64_set_context(HANDLE thread, const dbg_ctx_t *ctx) +{ + return SetThreadContext(thread, &ctx->ctx); +} + struct backend_cpu be_arm64 = { IMAGE_FILE_MACHINE_ARM64, diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h index aa7d9f0..1a67c06 100644 --- a/programs/winedbg/be_cpu.h +++ b/programs/winedbg/be_cpu.h @@ -117,6 +117,7 @@ struct backend_cpu BOOL (*store_integer)(const struct dbg_lvalue* lvalue, unsigned size, BOOL is_signed, LONGLONG); BOOL (*get_context)(HANDLE thread, dbg_ctx_t *ctx); + BOOL (*set_context)(HANDLE thread, const dbg_ctx_t *ctx); }; /* some handy functions for non segmented CPUs */ diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index c7f5ac1..f46ebb1 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -859,6 +859,11 @@ static BOOL be_i386_get_context(HANDLE thread, dbg_ctx_t *ctx) return Wow64GetThreadContext(thread, &ctx->x86); } +static BOOL be_i386_set_context(HANDLE thread, const dbg_ctx_t *ctx) +{ + return Wow64SetThreadContext(thread, &ctx->x86); +} + struct backend_cpu be_i386 = { IMAGE_FILE_MACHINE_I386, @@ -886,5 +891,6 @@ struct backend_cpu be_i386 = be_i386_fetch_float, be_i386_store_integer, be_i386_get_context, + be_i386_set_context, }; #endif diff --git a/programs/winedbg/be_ppc.c b/programs/winedbg/be_ppc.c index baf77dc..40aee55 100644 --- a/programs/winedbg/be_ppc.c +++ b/programs/winedbg/be_ppc.c @@ -190,6 +190,11 @@ static BOOL be_ppc_get_context(HANDLE thread, dbg_ctx_t *ctx) #endif } +static BOOL be_ppc_set_context(HANDLE thread, const dbg_ctx_t *ctx) +{ + return SetThreadContext(thread, &ctx->ctx); +} + struct backend_cpu be_ppc = { IMAGE_FILE_MACHINE_POWERPC, @@ -217,5 +222,6 @@ struct backend_cpu be_ppc = be_ppc_fetch_float, be_ppc_store_integer, be_ppc_get_context, + be_ppc_set_context, }; #endif diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 434f007..15f84a6 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -684,6 +684,11 @@ static BOOL be_x86_64_get_context(HANDLE thread, dbg_ctx_t *ctx) #endif } +static BOOL be_x86_64_set_context(HANDLE thread, const dbg_ctx_t *ctx) +{ + return SetThreadContext(thread, &ctx->ctx); +} + struct backend_cpu be_x86_64 = { IMAGE_FILE_MACHINE_AMD64, @@ -711,5 +716,6 @@ struct backend_cpu be_x86_64 = be_x86_64_fetch_float, be_x86_64_store_integer, be_x86_64_get_context, + be_x86_64_set_context, }; #endif diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index b11a8b0..81cd7de 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -768,7 +768,7 @@ static void resume_debuggee(struct gdb_context* gdbctx, DWORD cont) { if (dbg_curr_thread) { - if (!SetThreadContext(dbg_curr_thread->handle, &gdbctx->context.ctx)) + if (!gdbctx->process->be_cpu->set_context(dbg_curr_thread->handle, &gdbctx->context)) if (gdbctx->trace & GDBPXY_TRC_WIN32_ERROR) fprintf(stderr, "Cannot set context on thread %04x\n", dbg_curr_thread->tid); if (!ContinueDebugEvent(gdbctx->process->pid, dbg_curr_thread->tid, cont)) @@ -788,7 +788,7 @@ static void resume_debuggee_thread(struct gdb_context* gdbctx, DWORD cont, unsig { if(dbg_curr_thread->tid == threadid){ /* Windows debug and GDB don't seem to work well here, windows only likes ContinueDebugEvent being used on the reporter of the event */ - if (!SetThreadContext(dbg_curr_thread->handle, &gdbctx->context.ctx)) + if (!gdbctx->process->be_cpu->set_context(dbg_curr_thread->handle, &gdbctx->context)) if (gdbctx->trace & GDBPXY_TRC_WIN32_ERROR) fprintf(stderr, "Cannot set context on thread %04x\n", dbg_curr_thread->tid); if (!ContinueDebugEvent(gdbctx->process->pid, dbg_curr_thread->tid, cont)) @@ -1478,7 +1478,8 @@ static enum packet_return packet_write_registers(struct gdb_context* gdbctx) for (i = 0; i < cpu_num_regs; i++) cpu_register_hex_from(pctx, i, &ptr); - if (pctx != &gdbctx->context && !SetThreadContext(gdbctx->other_thread->handle, &pctx->ctx)) + if (pctx != &gdbctx->context && + !gdbctx->process->be_cpu->set_context(gdbctx->other_thread->handle, pctx)) { if (gdbctx->trace & GDBPXY_TRC_WIN32_ERROR) fprintf(stderr, "Cannot set context on thread %04x\n", gdbctx->other_thread->tid); @@ -1677,7 +1678,8 @@ static enum packet_return packet_write_register(struct gdb_context* gdbctx) } cpu_register_hex_from(pctx, reg, (const char**)&ptr); - if (pctx != &gdbctx->context && !SetThreadContext(gdbctx->other_thread->handle, &pctx->ctx)) + if (pctx != &gdbctx->context && + !gdbctx->process->be_cpu->set_context(gdbctx->other_thread->handle, pctx)) { if (gdbctx->trace & GDBPXY_TRC_WIN32_ERROR) fprintf(stderr, "Cannot set context for thread %04x\n", gdbctx->other_thread->tid); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index fccae0c..e5fd07d 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -344,7 +344,7 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) de->u.Exception.dwFirstChance); if (cont && dbg_curr_thread) { - SetThreadContext(dbg_curr_thread->handle, &dbg_context.ctx); + dbg_curr_process->be_cpu->set_context(dbg_curr_thread->handle, &dbg_context); } } break; @@ -527,7 +527,7 @@ static void dbg_resume_debuggee(DWORD cont) dbg_curr_thread->exec_count); if (dbg_curr_thread) { - if (!SetThreadContext(dbg_curr_thread->handle, &dbg_context.ctx)) + if (!dbg_curr_process->be_cpu->set_context(dbg_curr_thread->handle, &dbg_context)) dbg_printf("Cannot set ctx on %04lx\n", dbg_curr_tid); } } @@ -989,7 +989,7 @@ static BOOL tgt_process_active_close_process(struct dbg_process* pcs, BOOL kill) dbg_curr_process->be_cpu->single_step(&dbg_context, FALSE); if (dbg_curr_thread->in_exception) { - SetThreadContext(dbg_curr_thread->handle, &dbg_context.ctx); + dbg_curr_process->be_cpu->set_context(dbg_curr_thread->handle, &dbg_context); ContinueDebugEvent(dbg_curr_pid, dbg_curr_tid, DBG_CONTINUE); } } diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index f168633..95af7a6 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -59,6 +59,14 @@ void minidump_write(const char* file, const EXCEPTION_RECORD* rec) MINIDUMP_EXCEPTION_INFORMATION mei; EXCEPTION_POINTERS ep; +#ifdef __x86_64__ + if (dbg_curr_process->be_cpu->machine != IMAGE_FILE_MACHINE_AMD64) + { + FIXME("Cannot write minidump for 32-bit process using 64-bit winedbg\n"); + return; + } +#endif + hFile = CreateFileA(file, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);

1 0

Zebediah Figura : ndrtypes.h: Add more constants.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: wine Branch: master Commit: 57bc426c3227c0fe0ba37755ab9e93631eeb2c49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57bc426c3227c0fe0ba37755… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 12 21:19:09 2018 -0500 ndrtypes.h: Add more constants. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ndrtypes.h | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/include/ndrtypes.h b/include/ndrtypes.h index b353ce5..938dc65 100644 --- a/include/ndrtypes.h +++ b/include/ndrtypes.h @@ -168,8 +168,113 @@ typedef enum FC_SMVARRAY, /* 0x1f */ /* small (<64k) varying array */ FC_LGVARRAY, /* 0x20 */ /* large (>= 64k) varying array */ FC_BOGUS_ARRAY, /* 0x21 */ /* complex array */ + + FC_C_CSTRING, /* 0x22 */ /* conformant char string */ + FC_C_BSTRING, /* 0x23 */ + FC_C_SSTRING, /* 0x24 */ + FC_C_WSTRING, /* 0x25 */ /* conformant wchar string */ + FC_CSTRING, /* 0x26 */ /* non-conformant char string */ + FC_BSTRING, /* 0x27 */ + FC_SSTRING, /* 0x28 */ + FC_WSTRING, /* 0x29 */ /* non-conformant wchar string */ + + FC_ENCAPSULATED_UNION, /* 0x2a */ + FC_NON_ENCAPSULATED_UNION, /* 0x2b */ + + FC_BYTE_COUNT_POINTER, /* 0x2c */ /* [byte_count] ACF attribute */ + + FC_TRANSMIT_AS, /* 0x2d */ + FC_REPRESENT_AS, /* 0x2e */ + + FC_IP, /* 0x2f */ /* interface pointer */ + + FC_BIND_CONTEXT, /* 0x30 */ + + FC_BIND_GENERIC, /* 0x31 */ + FC_BIND_PRIMITIVE, /* 0x32 */ + FC_AUTO_HANDLE, /* 0x33 */ + FC_CALLBACK_HANDLE, /* 0x34 */ + + FC_UNUSED1, /* 0x35 */ + + FC_POINTER, /* 0x36 */ + + FC_ALIGNM2, /* 0x37 */ + FC_ALIGNM4, /* 0x38 */ + FC_ALIGNM8, /* 0x39 */ + + FC_UNUSED2, /* 0x3a */ + FC_UNUSED3, /* 0x3b */ + FC_UNUSED4, /* 0x3c */ + + FC_STRUCTPAD1, /* 0x3d */ + FC_STRUCTPAD2, /* 0x3e */ + FC_STRUCTPAD3, /* 0x3f */ + FC_STRUCTPAD4, /* 0x40 */ + FC_STRUCTPAD5, /* 0x41 */ + FC_STRUCTPAD6, /* 0x42 */ + FC_STRUCTPAD7, /* 0x43 */ + + FC_STRING_SIZED, /* 0x44 */ + + FC_UNUSED5, /* 0x45 */ + + FC_NO_REPEAT, /* 0x46 */ + FC_FIXED_REPEAT, /* 0x47 */ + FC_VARIABLE_REPEAT, /* 0x48 */ + FC_FIXED_OFFSET, /* 0x49 */ + FC_VARIABLE_OFFSET, /* 0x4a */ + + FC_PP, /* 0x4b */ /* pointer layout */ +/* FC_PP: FC_PAD layouts */ +/* layouts: FC_NO_REPEAT FC_PAD instance */ +/* instance: NdrFcShort(memofs), NdrFcShort(bufofs), desc */ + + FC_EMBEDDED_COMPLEX, /* 0x4c */ + + FC_IN_PARAM, /* 0x4d */ + FC_IN_PARAM_BASETYPE, /* 0x4e */ + FC_IN_PARAM_NO_FREE_INST, /* 0x4f */ + FC_IN_OUT_PARAM, /* 0x50 */ + FC_OUT_PARAM, /* 0x51 */ + FC_RETURN_PARAM, /* 0x52 */ + FC_RETURN_PARAM_BASETYPE, /* 0x53 */ + + FC_DEREFERENCE, /* 0x54 */ + FC_DIV_2, /* 0x55 */ + FC_MULT_2, /* 0x56 */ + FC_ADD_1, /* 0x57 */ + FC_SUB_1, /* 0x58 */ + + FC_CALLBACK, /* 0x59 */ + + FC_CONSTANT_IID, /* 0x5a */ + + FC_END, /* 0x5b */ + FC_PAD, /* 0x5c */ + + FC_HARD_STRUCT = 0xb1, + + FC_TRANSMIT_AS_PTR, /* 0xb2 */ + FC_REPRESENT_AS_PTR, /* 0xb3 */ + + FC_USER_MARSHAL, /* 0xb4 */ + + FC_PIPE, /* 0xb5 */ + FC_BLKHOLE, /* 0xb6 */ + + FC_RANGE, /* 0xb7 */ + + FC_INT3264, /* 0xb8 */ + FC_UINT3264, /* 0xb9 */ } FORMAT_CHARACTER; +#define FC_ALLOCATE_ALL_NODES 0x01 +#define FC_DONT_FREE 0x02 +#define FC_ALLOCED_ON_STACK 0x04 +#define FC_SIMPLE_POINTER 0x08 +#define FC_POINTER_DEREF 0x10 + /* flags for all handle types */ #define HANDLE_PARAM_IS_VIA_PTR 0x80 #define HANDLE_PARAM_IS_IN 0x40 @@ -182,4 +287,23 @@ typedef enum #define NDR_CONTEXT_HANDLE_SERIALIZE 0x02 #define NDR_CONTEXT_HANDLE_CANNOT_BE_NULL 0x01 +#define Oi_FULL_PTR_USED 0x01 +#define Oi_RPCSS_ALLOC_USED 0x02 +#define Oi_OBJECT_PROC 0x04 +#define Oi_HAS_RPCFLAGS 0x08 +#define Oi_OBJ_USE_V2_INTERPRETER 0x20 +#define Oi_HAS_COMM_OR_FAULT 0x20 +#define Oi_USE_NEW_INIT_ROUTINES 0x40 + +#define FC_NORMAL_CONFORMANCE (unsigned char) 0x00 +#define FC_POINTER_CONFORMANCE (unsigned char) 0x10 +#define FC_TOP_LEVEL_CONFORMANCE (unsigned char) 0x20 +#define FC_CONSTANT_CONFORMANCE (unsigned char) 0x40 +#define FC_TOP_LEVEL_MULTID_CONFORMANCE (unsigned char) 0x80 + +#define USER_MARSHAL_UNIQUE 0x80 +#define USER_MARSHAL_REF 0x40 +#define USER_MARSHAL_POINTER 0xc0 +#define USER_MARSHAL_IID 0x20 + #endif

1 0

Francois Gouget : testbot: Remove the unneeded Build.pl parameters.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: tools Branch: master Commit: fb84879ce70a0ad379bc779a5c9c1c1483443874 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fb84879ce70a0ad379bc779… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 13 10:23:28 2018 +0200 testbot: Remove the unneeded Build.pl parameters. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 7a474e7..12e34d5 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -363,8 +363,7 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) } my $Script = "#!/bin/sh\n" . "rm -f Build.log\n" . - "../bin/build/Build.pl patch.diff " . $Step->FileType . - " $BaseName 32"; + "../bin/build/Build.pl patch.diff 32"; $Script .= ",64"if ($Run64); $Script .= " >>Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n");

1 0

Francois Gouget : testbot: Create a single Job per patch even for multiple modules.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: tools Branch: master Commit: 6fbd57b4f50c5a39e394dfbf0f97662e8a15a226 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6fbd57b4f50c5a39e394dfb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 13 10:23:42 2018 +0200 testbot: Create a single Job per patch even for multiple modules. So far a build task could only provide the 32 and 64 bit test executables for a single dll or program. Also, because of the lack of proper dependency support between steps it was impossible to have multiple build steps. So the TestBot used to create one job per module. However the patch status site can only keep track of one job per patch. This means some failures could be missed if they did not happen in the one job tracked by the patch status site. Now that Build.pl rebuilds all the impacted test executables the Testbot systematically creates a single job and a single build task and retrieves all the test executables in one go. This also has the advantage of reducing the number of VM reverts. Another side-effect of this change is that if the patch modifies the tests of multiple modules and the compilation of one them fails, no test will be run. Before only the tests impacted by the failed compilation would have been skipped. However a compilation error is grounds for resubmitting the patch, at which time the tests will be rerun anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 65 ++++++----------- testbot/lib/WineTestBot/Patches.pm | 143 +++++++++++++++++-------------------- 2 files changed, 85 insertions(+), 123 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 12e34d5..61deb50 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -43,6 +43,7 @@ $Name0 =~ s+^.*/++; use WineTestBot::Config; use WineTestBot::Jobs; +use WineTestBot::PatchUtils; use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::Engine::Notify; @@ -323,31 +324,15 @@ elsif ($Debug and !$VM->GetDomain()->IsPoweredOn()) # Figure out what to build # -my ($Run64, $BaseName); -foreach my $OtherStep (@{$Job->Steps->GetItems()}) +my (%Bitnesses, %TestExes); +foreach my $TestStep (@{$Job->Steps->GetItems()}) { - next if ($OtherStep->No == $StepNo); - - $Run64 = 1 if ($OtherStep->FileType eq "exe64"); - my $OtherFileName = $OtherStep->FileName; - if ($OtherFileName =~ m/^([\w_.]+)_test(?:64)?\.exe$/) + if ($TestStep->FileType =~ /^exe([0-9]+)$/) { - my $OtherBaseName = $1; - if ($Step->FileType eq "patchprograms") - { - $OtherBaseName =~ s/\.exe$//; - } - if (defined $BaseName and $BaseName ne $OtherBaseName) - { - FatalError("$OtherBaseName doesn't match previously found $BaseName\n"); - } - $BaseName = $OtherBaseName; + $Bitnesses{$1} = 1; + $TestExes{$TestStep->FileName} = 1; } } -if (!defined $BaseName) -{ - FatalError("Could not determine the test executable's base name\n"); -} # @@ -363,9 +348,8 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) } my $Script = "#!/bin/sh\n" . "rm -f Build.log\n" . - "../bin/build/Build.pl patch.diff 32"; -$Script .= ",64"if ($Run64); -$Script .= " >>Build.log 2>&1\n"; + "../bin/build/Build.pl patch.diff ". join(",", keys %Bitnesses) . + " >>Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) { @@ -456,34 +440,25 @@ FatalTAError(undef, $TAError) if (defined $TAError); # Grab the executables for the next steps # -# Don't try copying the test executables if the build step failed -if ($NewStatus eq "completed") +my $Impacts = GetPatchImpact($FileName, "nounit"); +my $StepDir = $Step->CreateDir(); +foreach my $TestInfo (values %{$Impacts->{Tests}}) { - my $StepDir = $Step->CreateDir(); - foreach my $OtherStep (@{$Job->Steps->GetItems()}) + foreach my $Bits ("", "64") { - next if ($OtherStep->No == $StepNo); - - my $OtherFileName = $OtherStep->FileName; - next if ($OtherFileName !~ /^[\w_.]+_test(?:64)?\.exe$/); + my $Local = "$TestInfo->{ExeBase}$Bits.exe"; + next if (!$TestExes{$Local}); - my $Bits = $OtherStep->FileType eq "exe64" ? "64" : "32"; - my $TestExecutable; - if ($Step->FileType ne "patchprograms") - { - $TestExecutable = "build-mingw$Bits/dlls/$BaseName/tests/${BaseName}_test.exe"; - } - else + my $Remote = "build-mingw". ($Bits || "32") ."/$TestInfo->{Path}/$TestInfo->{ExeBase}.exe"; + Debug(Elapsed($Start), " Retrieving '$Local'\n"); + if ($TA->GetFile($Remote, "$StepDir/$Local")) { - $TestExecutable = "build-mingw$Bits/programs/$BaseName/tests/${BaseName}.exe_test.exe"; + chmod 0664, "$StepDir/$Local"; } - - Debug(Elapsed($Start), " Retrieving '$OtherFileName'\n"); - if (!$TA->GetFile($TestExecutable, "$StepDir/$OtherFileName")) + elsif ($TA->GetLastError() !~ /: No such file or directory/) { - FatalTAError($TA, "Could not retrieve '$OtherFileName'"); + FatalTAError($TA, "Could not retrieve '$Local'"); } - chmod 0664, "$StepDir/$OtherFileName"; } } $TA->Disconnect(); diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index e349dfe..258aa2c 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -157,59 +157,55 @@ sub Submit($$$) $User = GetBatchUser(); } - my $Disposition = "Submitted job "; - my $First = 1; - foreach my $Module (sort keys %{$Impacts->{Tests}}) - { - my $TestInfo = $Impacts->{Tests}->{$Module}; - my $Jobs = CreateJobs(); - - # Create a new job for this patch - my $NewJob = $Jobs->Add(); - $NewJob->User($User); - $NewJob->Priority(6); - my $PropertyDescriptor = $Jobs->GetPropertyDescriptorByName("Remarks"); - my $Subject = $self->Subject; - $Subject =~ s/\[PATCH[^\]]*]//i; - $Subject =~ s/[[$]?\d+\/\d+[$\]]?//; - $Subject =~ s/^\s*//; - $NewJob->Remarks(substr("[wine-patches] " . $Subject, 0, - $PropertyDescriptor->GetMaxLength())); - $NewJob->Patch($self); + # Create a new job for this patch + my $Jobs = CreateJobs(); + my $NewJob = $Jobs->Add(); + $NewJob->User($User); + $NewJob->Priority(6); + my $PropertyDescriptor = $Jobs->GetPropertyDescriptorByName("Remarks"); + my $Subject = $self->Subject; + $Subject =~ s/\[PATCH[^\]]*]//i; + $Subject =~ s/[[$]?\d+\/\d+[$\]]?//; + $Subject =~ s/^\s*//; + $NewJob->Remarks(substr("[wine-patches] " . $Subject, 0, + $PropertyDescriptor->GetMaxLength())); + $NewJob->Patch($self); + + # Add build step to the job + my $BuildStep = $NewJob->Steps->Add(); + $BuildStep->FileName("patch.diff"); + $BuildStep->FileType("patchdlls"); # This is irrelevant now + $BuildStep->InStaging(!1); + $BuildStep->Type("build"); + $BuildStep->DebugLevel(0); - # Add build step to the job - my $Steps = $NewJob->Steps; - my $NewStep = $Steps->Add(); - $NewStep->FileName("patch.diff"); - $NewStep->FileType($TestInfo->{Type}); - $NewStep->InStaging(!1); - $NewStep->Type("build"); - $NewStep->DebugLevel(0); - - # Add build task - my $VMs = CreateVMs(); - $VMs->AddFilter("Type", ["build"]); - $VMs->AddFilter("Role", ["base"]); - my $BuildVM = ${$VMs->GetItems()}[0]; - my $Task = $NewStep->Tasks->Add(); - $Task->VM($BuildVM); - $Task->Timeout($BuildTimeout); - - # Save the build step so other steps can reference it - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); - if (defined($ErrMessage)) - { - $self->Disposition("Failed to submit build step"); - return $ErrMessage; - } + # Add build task + my $VMs = CreateVMs(); + $VMs->AddFilter("Type", ["build"]); + $VMs->AddFilter("Role", ["base"]); + my $BuildVM = ${$VMs->GetItems()}[0]; + my $Task = $BuildStep->Tasks->Add(); + $Task->VM($BuildVM); + $Task->Timeout($BuildTimeout); + + # Save the build step so the others can reference it. + my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + if (defined($ErrMessage)) + { + $self->Disposition("Failed to submit build step"); + return $ErrMessage; + } - # Stage the patch so it can be picked up by the job - if (!link($PatchFileName, "$DataDir/staging/job". $NewJob->Id ."_patch.diff")) - { - $self->Disposition("Failed to prepare patch file"); - return $!; - } + # Stage the patch so it can be picked up by the job + if (!link($PatchFileName, "$DataDir/staging/job". $NewJob->Id ."_patch.diff")) + { + $self->Disposition("Failed to stage the patch file"); + return $!; + } + foreach my $Module (sort keys %{$Impacts->{Tests}}) + { + my $TestInfo = $Impacts->{Tests}->{$Module}; foreach my $Unit (sort keys %{$TestInfo->{Units}}) { # Add 32 and 64-bit tasks @@ -221,8 +217,8 @@ sub Submit($$$) if (@{$VMs->GetKeys()}) { # Create the corresponding Step - my $NewStep = $Steps->Add(); - $NewStep->PreviousNo(1); + my $NewStep = $NewJob->Steps->Add(); + $NewStep->PreviousNo($BuildStep->No); my $FileName = $TestInfo->{ExeBase}; $FileName .= "64" if ($Bits eq "64"); $NewStep->FileName("$FileName.exe"); @@ -243,35 +239,26 @@ sub Submit($$$) } } } + } - # Save it all - ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); - if (defined $ErrMessage) - { - $self->Disposition("Failed to submit job"); - return $ErrMessage; - } - - # Switch Status to staging to indicate we are done setting up the job - $NewJob->Status("staging"); - ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); - if (defined $ErrMessage) - { - $self->Disposition("Failed to submit job (staging)"); - return $ErrMessage; - } + # Save it all + ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + if (defined $ErrMessage) + { + $self->Disposition("Failed to submit job"); + return $ErrMessage; + } - if ($First) - { - $First = !1; - } - else - { - $Disposition .= ", "; - } - $Disposition .= $NewJob->Id; + # Switch Status to staging to indicate we are done setting up the job + $NewJob->Status("staging"); + ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + if (defined $ErrMessage) + { + $self->Disposition("Failed to submit job (staging)"); + return $ErrMessage; } - $self->Disposition($Disposition); + + $self->Disposition("Submitted job ". $NewJob->Id); return undef; }

1 0

Francois Gouget : testbot/build: Move GitPull() and call it a bit later in Reconfig.pl.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: tools Branch: master Commit: d37f1dbbce2982a4cf1ed66e7cbe48c4acf454fe URL: https://source.winehq.org/git/tools.git/?a=commit;h=d37f1dbbce2982a4cf1ed66… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 13 11:44:12 2018 +0200 testbot/build: Move GitPull() and call it a bit later in Reconfig.pl. The functions are now declared in the order in which they are called. Reconfig.pl now builds the TestBot tools and only then grabs the latest Wine and recompiles it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 64 +++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 977df6e..63fb01b 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -6,6 +6,7 @@ # 32 and 64 bit winetest binaries. # # Copyright 2009 Ge van Geldorp +# Copyright 2012-2014, 2017-2018 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -70,35 +71,6 @@ sub FatalError(@) exit 1; } -sub GitPull() -{ - InfoMsg "Updating the Wine source\n"; - system("cd $DataDir/wine && git pull >> $LogDir/Reconfig.log 2>&1"); - if ($? != 0) - { - LogMsg "Git pull failed\n"; - return !1; - } - - if (open(my $fh, ">", "$DataDir/testlist.txt")) - { - foreach my $TestFile (glob("$DataDir/wine/*/*/tests/*.c"), - glob("$DataDir/wine/*/*/tests/*.spec")) - { - next if ($TestFile =~ m=/testlist\.c$=); - $TestFile =~ s=^$DataDir/wine/==; - print $fh "$TestFile\n"; - } - close($fh); - } - else - { - LogMsg "Could not open 'testlist.txt' for writing: $!\n"; - } - - return 1; -} - my $ncpus; sub CountCPUs() { @@ -156,6 +128,35 @@ sub BuildTestLauncher() return 1; } +sub GitPull() +{ + InfoMsg "Updating the Wine source\n"; + system("cd $DataDir/wine && git pull >> $LogDir/Reconfig.log 2>&1"); + if ($? != 0) + { + LogMsg "Git pull failed\n"; + return !1; + } + + if (open(my $fh, ">", "$DataDir/testlist.txt")) + { + foreach my $TestFile (glob("$DataDir/wine/*/*/tests/*.c"), + glob("$DataDir/wine/*/*/tests/*.spec")) + { + next if ($TestFile =~ m=/testlist\.c$=); + $TestFile =~ s=^$DataDir/wine/==; + print $fh "$TestFile\n"; + } + close($fh); + } + else + { + LogMsg "Could not open 'testlist.txt' for writing: $!\n"; + } + + return 1; +} + sub BuildNative() { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); @@ -211,15 +212,12 @@ if (! -d "$DataDir/staging" and ! mkdir "$DataDir/staging") LogMsg "Unable to create '$DataDir/staging': $!\n"; exit(1); } -if (! GitPull()) -{ - exit(1); -} CountCPUs(); if (!BuildTestAgentd() || !BuildTestLauncher() || + !GitPull() || !BuildNative() || !BuildCross(32) || !BuildCross(64))

1 0

Francois Gouget : testbot/build: Move up CountCPus() in Build.pl.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: tools Branch: master Commit: d60595a3bafb1aaef99a4c74d35b8d7598b9cda0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d60595a3bafb1aaef99a4c7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 13 11:44:27 2018 +0200 testbot/build: Move up CountCPus() in Build.pl. This way it matches Reconfig.pl. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 8b18590..001f5eb 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -72,6 +72,18 @@ sub FatalError(@) exit 1; } +my $ncpus; +sub CountCPUs() +{ + if (open(my $fh, "<", "/proc/cpuinfo")) + { + # Linux + map { $ncpus++ if (/^processor/); } <$fh>; + close($fh); + } + $ncpus ||= 1; +} + sub ApplyPatch($) { my ($PatchFile) = @_; @@ -117,18 +129,6 @@ sub ApplyPatch($) return $Impacts; } -my $ncpus; -sub CountCPUs() -{ - if (open(my $fh, "<", "/proc/cpuinfo")) - { - # Linux - map { $ncpus++ if (/^processor/); } <$fh>; - close($fh); - } - $ncpus ||= 1; -} - sub BuildNative() { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native");

1 0

Francois Gouget : testbot/build: Simplify logging.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: tools Branch: master Commit: 89f704eba7d29e5dc78e109a6a779cda1385d6ee URL: https://source.winehq.org/git/tools.git/?a=commit;h=89f704eba7d29e5dc78e109… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 13 11:44:59 2018 +0200 testbot/build: Simplify logging. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 29 ++++++++++++----------------- testbot/bin/build/Reconfig.pl | 33 ++++++++++++++------------------- 2 files changed, 26 insertions(+), 36 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 001f5eb..3fe0e14 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -43,32 +43,27 @@ sub BEGIN use WineTestBot::Config; use WineTestBot::PatchUtils; +my $LogFileName = "$LogDir/Build.log"; + sub InfoMsg(@) { my $OldUMask = umask(002); - if (open LOGFILE, ">>$LogDir/Build.log") + if (open(my $Log, ">>", $LogFileName)) { - print LOGFILE @_; - close LOGFILE; + print $Log @_; + close($Log); } umask($OldUMask); } sub LogMsg(@) { - my $OldUMask = umask(002); - if (open LOGFILE, ">>$LogDir/Build.log") - { - print LOGFILE "Build: ", @_; - close LOGFILE; - } - umask($OldUMask); + InfoMsg "Build: ", @_; } sub FatalError(@) { LogMsg @_; - exit 1; } @@ -92,7 +87,7 @@ sub ApplyPatch($) system("( cd $DataDir/wine && set -x && " . " git apply --verbose $PatchFile && " . " git add -A " . - ") >> $LogDir/Build.log 2>&1"); + ") >>$LogFileName 2>&1"); if ($? != 0) { LogMsg "Patch failed to apply\n"; @@ -105,7 +100,7 @@ sub ApplyPatch($) InfoMsg "\nRunning make_makefiles\n"; system("( cd $DataDir/wine && set -x && " . " ./tools/make_makefiles " . - ") >> $LogDir/Build.log 2>&1"); + ") >>$LogFileName 2>&1"); if ($? != 0) { LogMsg "make_makefiles failed\n"; @@ -118,7 +113,7 @@ sub ApplyPatch($) InfoMsg "\nRunning autoconf\n"; system("( cd $DataDir/wine && set -x && " . " autoconf " . - ") >>$LogDir/Build.log 2>&1"); + ") >>$LogFileName 2>&1"); if ($? != 0) { LogMsg "Autoconf failed\n"; @@ -136,7 +131,7 @@ sub BuildNative() InfoMsg "\nRebuilding native tools\n"; system("( cd $DataDir/build-native && set -x && " . " time make -j$ncpus __tooldeps__ " . - ") >>$LogDir/Build.log 2>&1"); + ") >>$LogFileName 2>&1"); if ($? != 0) { LogMsg "Rebuild of native tools failed\n"; @@ -162,7 +157,7 @@ sub BuildTestExecutables($$) InfoMsg "\nBuilding the $Bits-bit test executable(s)\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . " time make -j$ncpus ". join(" ", sort @BuildDirs) . - ") >>$LogDir/Build.log 2>&1"); + ") >>$LogFileName 2>&1"); if ($? != 0) { LogMsg "Rebuild of $Bits-bit crossbuild failed\n"; @@ -186,7 +181,7 @@ $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; # Start with a clean logfile -unlink("$LogDir/Build.log"); +unlink($LogFileName); my ($PatchFile, $BitIndicators); if (@ARGV == 2) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 63fb01b..706da25 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -42,32 +42,27 @@ sub BEGIN use WineTestBot::Config; +my $LogFileName = "$LogDir/Reconfig.log"; + sub InfoMsg(@) { my $OldUMask = umask(002); - if (open LOGFILE, ">>$LogDir/Reconfig.log") + if (open(my $Log, ">>", $LogFileName)) { - print LOGFILE @_; - close LOGFILE; + print $Log @_; + close($Log); } umask($OldUMask); } sub LogMsg(@) { - my $OldUMask = umask(002); - if (open LOGFILE, ">>$LogDir/Reconfig.log") - { - print LOGFILE "Reconfig: ", @_; - close LOGFILE; - } - umask($OldUMask); + InfoMsg "Reconfig: ", @_; } sub FatalError(@) { LogMsg @_; - exit 1; } @@ -92,7 +87,7 @@ sub BuildTestAgentd() InfoMsg "\nBuilding the native testagentd\n"; system("( cd $::RootDir/src/testagentd && set -x && " . " time make -j$ncpus build " . - ") >>$LogDir/Reconfig.log 2>&1"); + ") >>$LogFileName 2>&1"); if ($? != 0) { LogMsg "Build testagentd failed\n"; @@ -103,7 +98,7 @@ sub BuildTestAgentd() InfoMsg "\nRebuilding the Windows TestAgentd\n"; system("( cd $::RootDir/src/testagentd && set -x && " . " time make -j$ncpus iso " . - ") >>$LogDir/Reconfig.log 2>&1"); + ") >>$LogFileName 2>&1"); if ($? != 0) { LogMsg "Build winetestbot.iso failed\n"; @@ -118,7 +113,7 @@ sub BuildTestLauncher() InfoMsg "\nRebuilding TestLauncher\n"; system("( cd $::RootDir/src/TestLauncher && set -x && " . " time make -j$ncpus" . - ") >>$LogDir/Reconfig.log 2>&1"); + ") >>$LogFileName 2>&1"); if ($? != 0) { LogMsg "Build TestLauncher failed\n"; @@ -131,7 +126,7 @@ sub BuildTestLauncher() sub GitPull() { InfoMsg "Updating the Wine source\n"; - system("cd $DataDir/wine && git pull >> $LogDir/Reconfig.log 2>&1"); + system("cd $DataDir/wine && git pull >>$LogFileName 2>&1"); if ($? != 0) { LogMsg "Git pull failed\n"; @@ -167,7 +162,7 @@ sub BuildNative() " rm -rf * && " . " time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && " . " time make -j$ncpus __tooldeps__ " . - ") >>$LogDir/Reconfig.log 2>&1"); + ") >>$LogFileName 2>&1"); if ($? != 0) { @@ -191,7 +186,7 @@ sub BuildCross($) " rm -rf * && " . " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype --disable-winetest && " . " time make -j$ncpus buildtests" . - ") >>$LogDir/Reconfig.log 2>&1"); + ") >>$LogFileName 2>&1"); if ($? != 0) { LogMsg "Build cross ($Bits bits) failed\n"; @@ -204,8 +199,8 @@ sub BuildCross($) $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; -# Start with clean logfile -unlink("$LogDir/Reconfig.log"); +# Start with a clean logfile +unlink($LogFileName); if (! -d "$DataDir/staging" and ! mkdir "$DataDir/staging") {

1 0

Francois Gouget : testbot: Add some section headers to the scripts.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: tools Branch: master Commit: f8ab01fc59d28c5f208588a387166d73307f203a URL: https://source.winehq.org/git/tools.git/?a=commit;h=f8ab01fc59d28c5f208588a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 13 11:45:45 2018 +0200 testbot: Add some section headers to the scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 8 ++++++++ testbot/bin/WineRunBuild.pl | 4 ++++ testbot/bin/WineRunReconfig.pl | 4 ++++ testbot/bin/WineRunTask.pl | 9 +++++++++ testbot/bin/WineSendLog.pl | 10 ++++++++++ 5 files changed, 35 insertions(+) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index f7a6e33..9fb38ef 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -53,6 +53,11 @@ use WineTestBot::Tasks; use WineTestBot::Users; use WineTestBot::VMs; + +# +# Logging and error handling helpers +# + my $LogOnly; sub Trace(@) { @@ -67,6 +72,9 @@ sub Error(@) } +# +# Setup and command line processing +# $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 61deb50..31decc1 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -49,6 +49,10 @@ use WineTestBot::Log; use WineTestBot::Engine::Notify; +# +# Logging and error handling helpers +# + my $Debug; sub Debug(@) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 713712c..99b73da 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -48,6 +48,10 @@ use WineTestBot::Log; use WineTestBot::Engine::Notify; +# +# Logging and error handling helpers +# + my $Debug; sub Debug(@) { diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index d757417..3290b0b 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -47,6 +47,10 @@ use WineTestBot::Log; use WineTestBot::Engine::Notify; +# +# Logging and error handling helpers +# + my $Debug; sub Debug(@) { @@ -60,6 +64,11 @@ sub Error(@) LogMsg @_; } + +# +# Task helpers +# + sub TakeScreenshot($$) { my ($VM, $FullScreenshotFileName) = @_; diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 2a89427..e03395a 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -501,6 +501,11 @@ EOF } } + +# +# Setup and command line processing +# + $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; @@ -528,6 +533,11 @@ if (! defined($Job)) exit(1); } + +# +# Analyze the log and notify the developer +# + SendLog($Job); LogMsg "Log for job $JobId sent\n";

1 0

Francois Gouget : testbot/web: Let PatchUtils compute the test executable name for Submit.pl.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: tools Branch: master Commit: 3bb14a39a4c88079e282cacef6ead303eea8d58d URL: https://source.winehq.org/git/tools.git/?a=commit;h=3bb14a39a4c88079e282cac… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 13 11:46:02 2018 +0200 testbot/web: Let PatchUtils compute the test executable name for Submit.pl. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index d5265a3..ac9a384 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -588,7 +588,7 @@ sub DetermineFileType($$) close FH; - my ($ErrMessage, $DllBaseName, $TestUnit); + my ($ErrMessage, $ExeBase, $TestUnit); if ($FileType eq "unknown") { my $Impacts = GetPatchImpact($FileName); @@ -604,7 +604,7 @@ sub DetermineFileType($$) { my $TestInfo = (values %{$Impacts->{Tests}})[0]; $FileType = $TestInfo->{Type}; - $DllBaseName = $TestInfo->{Module}; + $ExeBase = $TestInfo->{ExeBase}; $TestUnit = (keys %{$TestInfo->{Units}})[0]; } } @@ -614,7 +614,7 @@ sub DetermineFileType($$) $FileType = "unknown"; } - return ($ErrMessage, $FileType, $DllBaseName, $TestUnit); + return ($ErrMessage, $FileType, $ExeBase, $TestUnit); } sub OnPage1Next($) @@ -644,7 +644,7 @@ sub OnPage1Next($) } close OUTFILE; - my ($ErrMessage, $FileType, $DllBaseName, $TestUnit) = $self->DetermineFileType($StagingFile); + my ($ErrMessage, $FileType, $ExeBase, $TestUnit) = $self->DetermineFileType($StagingFile); if (defined($ErrMessage)) { $self->{ErrField} = "File"; @@ -661,14 +661,9 @@ sub OnPage1Next($) $self->{FileName} = $BaseName; $self->{FileType} = $FileType; - if (defined($DllBaseName)) + if (defined $ExeBase) { - $self->{TestExecutable} = $DllBaseName; - if ($FileType eq "patchprograms") - { - $self->{TestExecutable} .= ".exe"; - } - $self->{TestExecutable} .= "_test.exe"; + $self->{TestExecutable} = "$ExeBase.exe"; } if (defined($TestUnit)) {

1 0