wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Alexandre Julliard : regedit: Add message contexts for accelerators that can be translated.
by Alexandre Julliard 24 Jan '12

24 Jan '12

1 0

Alexandre Julliard : notepad: Add message contexts for accelerators that can be translated.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: eaa8fad52eda4f7a33782f08929aae4f52037bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa8fad52eda4f7a33782f089… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 14:20:05 2012 +0100 notepad: Add message contexts for accelerators that can be translated. --- po/ar.po | 55 ++++++++++++++++++++++++++++++++++++++++ po/bg.po | 55 ++++++++++++++++++++++++++++++++++++++++ po/ca.po | 58 +++++++++++++++++++++++++++++++++++++++++++ po/cs.po | 56 +++++++++++++++++++++++++++++++++++++++++ po/da.po | 58 +++++++++++++++++++++++++++++++++++++++++++ po/de.po | 58 +++++++++++++++++++++++++++++++++++++++++++ po/el.po | 55 ++++++++++++++++++++++++++++++++++++++++ po/en.po | 55 ++++++++++++++++++++++++++++++++++++++++ po/en_US.po | 55 ++++++++++++++++++++++++++++++++++++++++ po/eo.po | 55 ++++++++++++++++++++++++++++++++++++++++ po/es.po | 56 +++++++++++++++++++++++++++++++++++++++++ po/fa.po | 55 ++++++++++++++++++++++++++++++++++++++++ po/fi.po | 55 ++++++++++++++++++++++++++++++++++++++++ po/fr.po | 58 +++++++++++++++++++++++++++++++++++++++++++ po/he.po | 58 +++++++++++++++++++++++++++++++++++++++++++ po/hi.po | 55 ++++++++++++++++++++++++++++++++++++++++ po/hu.po | 56 +++++++++++++++++++++++++++++++++++++++++ po/it.po | 58 +++++++++++++++++++++++++++++++++++++++++++ po/ja.po | 58 +++++++++++++++++++++++++++++++++++++++++++ po/ko.po | 58 +++++++++++++++++++++++++++++++++++++++++++ po/lt.po | 58 +++++++++++++++++++++++++++++++++++++++++++ po/ml.po | 55 ++++++++++++++++++++++++++++++++++++++++ po/nb_NO.po | 58 +++++++++++++++++++++++++++++++++++++++++++ po/nl.po | 58 +++++++++++++++++++++++++++++++++++++++++++ po/or.po | 55 ++++++++++++++++++++++++++++++++++++++++ po/pa.po | 55 ++++++++++++++++++++++++++++++++++++++++ po/pl.po | 58 +++++++++++++++++++++++++++++++++++++++++++ po/pt_BR.po | 58 +++++++++++++++++++++++++++++++++++++++++++ po/pt_PT.po | 58 +++++++++++++++++++++++++++++++++++++++++++ po/rm.po | 55 ++++++++++++++++++++++++++++++++++++++++ po/ro.po | 58 +++++++++++++++++++++++++++++++++++++++++++ po/ru.po | 58 +++++++++++++++++++++++++++++++++++++++++++ po/sk.po | 55 ++++++++++++++++++++++++++++++++++++++++ po/sl.po | 58 +++++++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 56 +++++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)latin.po | 56 +++++++++++++++++++++++++++++++++++++++++ po/sv.po | 58 +++++++++++++++++++++++++++++++++++++++++++ po/te.po | 55 ++++++++++++++++++++++++++++++++++++++++ po/th.po | 55 ++++++++++++++++++++++++++++++++++++++++ po/tr.po | 55 ++++++++++++++++++++++++++++++++++++++++ po/uk.po | 57 ++++++++++++++++++++++++++++++++++++++++++ po/wa.po | 55 ++++++++++++++++++++++++++++++++++++++++ po/wine.pot | 55 ++++++++++++++++++++++++++++++++++++++++ po/zh_CN.po | 55 ++++++++++++++++++++++++++++++++++++++++ po/zh_TW.po | 55 ++++++++++++++++++++++++++++++++++++++++ programs/notepad/notepad.rc | 22 ++++++++-------- 46 files changed, 2547 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eaa8fad52eda4f7a33782…

1 0

Alexandre Julliard : wrc: Add support for translating accelerators through po files.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: ceadc43c78b228b9e7d0acafff287b0403907759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceadc43c78b228b9e7d0acaff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 14:19:36 2012 +0100 wrc: Add support for translating accelerators through po files. --- tools/wrc/genres.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++- tools/wrc/parser.y | 1 + tools/wrc/po.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++-- tools/wrc/wrctypes.h | 1 + 4 files changed, 136 insertions(+), 5 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 6b2d7ed..d6e641f 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -276,6 +276,66 @@ static void string_to_upper(string_t *str) } } +static int parse_accel_string( const string_t *key, int flags ) +{ + int keycode; + + if(key->type == str_char) + { + if((flags & WRC_AF_VIRTKEY) && + !((key->str.cstr[0] >= 'A' && key->str.cstr[0] <= 'Z') || + (key->str.cstr[0] >= '0' && key->str.cstr[0] <= '9'))) + { + print_location( &key->loc ); + error("VIRTKEY code is not equal to ascii value"); + } + + if(key->str.cstr[0] == '^' && (flags & WRC_AF_CONTROL) != 0) + { + print_location( &key->loc ); + error("Cannot use both '^' and CONTROL modifier"); + } + else if(key->str.cstr[0] == '^') + { + keycode = toupper((unsigned char)key->str.cstr[1]) - '@'; + if(keycode >= ' ') + { + print_location( &key->loc ); + error("Control-code out of range"); + } + } + else + keycode = key->str.cstr[0]; + } + else + { + if((flags & WRC_AF_VIRTKEY) && + !((key->str.wstr[0] >= 'A' && key->str.wstr[0] <= 'Z') || + (key->str.wstr[0] >= '0' && key->str.wstr[0] <= '9'))) + { + print_location( &key->loc ); + error("VIRTKEY code is not equal to ascii value"); + } + if(key->str.wstr[0] == '^' && (flags & WRC_AF_CONTROL) != 0) + { + print_location( &key->loc ); + error("Cannot use both '^' and CONTROL modifier"); + } + else if(key->str.wstr[0] == '^') + { + keycode = toupperW(key->str.wstr[1]) - '@'; + if(keycode >= ' ') + { + print_location( &key->loc ); + error("Control-code out of range"); + } + } + else + keycode = key->str.wstr[0]; + } + return keycode; +} + /* ***************************************************************************** * Function : put_string @@ -514,8 +574,10 @@ static res_t *accelerator2res(name_id_t *name, accelerator_t *acc) restag = put_res_header(res, WRC_RT_ACCELERATOR, NULL, name, acc->memopt, &(acc->lvc)); while(ev) { + int key = ev->key; + if (ev->str) key = parse_accel_string( ev->str, ev->flags ); put_word(res, ev->flags | (ev->next ? 0 : 0x80)); - put_word(res, ev->key); + put_word(res, key); put_word(res, ev->id); put_word(res, 0); /* Padding */ ev = ev->next; @@ -527,8 +589,10 @@ static res_t *accelerator2res(name_id_t *name, accelerator_t *acc) restag = put_res_header(res, WRC_RT_ACCELERATOR, NULL, name, acc->memopt, NULL); while(ev) { + int key = ev->key; + if (ev->str) key = parse_accel_string( ev->str, ev->flags ); put_byte(res, ev->flags | (ev->next ? 0 : 0x80)); - put_word(res, ev->key); + put_word(res, key); put_word(res, ev->id); ev = ev->next; } diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index e1a3c68..efcc050 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -2219,6 +2219,7 @@ static event_t *add_string_event(string_t *key, int id, int flags, event_t *prev keycode = key->str.wstr[0]; } + ev->str = key; ev->key = keycode; ev->id = id; ev->flags = flags & ~WRC_AF_ASCII; diff --git a/tools/wrc/po.c b/tools/wrc/po.c index ffb584f..1d679ba 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -124,6 +124,16 @@ static char *get_message_context( char **msgid ) return context; } +static int string_has_context( const string_t *str ) +{ + char *id, *id_buffer, *context; + + id_buffer = id = convert_msgid_ascii( str, 1 ); + context = get_message_context( &id ); + free( id_buffer ); + return context != NULL; +} + static int control_has_title( const control_t *ctrl ) { if (!ctrl->title) return 0; @@ -155,6 +165,12 @@ static resource_t *dup_resource( resource_t *res, language_t *lang ) switch (res->type) { + case res_acc: + new->res.acc = xmalloc( sizeof(*(new)->res.acc) ); + *new->res.acc = *res->res.acc; + new->res.acc->lvc.language = lang; + new->res.acc->lvc.version = get_dup_version( lang ); + break; case res_dlg: new->res.dlg = xmalloc( sizeof(*(new)->res.dlg) ); *new->res.dlg = *res->res.dlg; @@ -803,6 +819,34 @@ static void add_po_menu( const resource_t *english, const resource_t *res ) add_po_menu_items( po, english_items, items, res->res.men->lvc.language ); } +static void add_pot_accel( po_file_t po, const resource_t *res ) +{ + event_t *event = res->res.acc->events; + + while (event) + { + /* accelerators without a context don't make sense in po files */ + if (event->str && string_has_context( event->str )) + add_po_string( po, event->str, NULL, NULL ); + event = event->next; + } +} + +static void add_po_accel( const resource_t *english, const resource_t *res ) +{ + event_t *english_event = english->res.acc->events; + event_t *event = res->res.acc->events; + po_file_t po = get_po_file( res->res.acc->lvc.language ); + + while (english_event && event) + { + if (english_event->str && event->str && string_has_context( english_event->str )) + add_po_string( po, english_event->str, event->str, res->res.acc->lvc.language ); + event = event->next; + english_event = english_event->next; + } +} + static resource_t *find_english_resource( resource_t *res ) { resource_t *ptr; @@ -829,7 +873,7 @@ void write_pot_file( const char *outname ) switch (res->type) { - case res_acc: break; /* FIXME */ + case res_acc: add_pot_accel( po, res ); break; case res_dlg: add_pot_dialog( po, res ); break; case res_men: add_pot_menu( po, res ); break; case res_stt: add_pot_stringtable( po, res ); break; @@ -850,7 +894,7 @@ void write_po_files( const char *outname ) if (!(english = find_english_resource( res ))) continue; switch (res->type) { - case res_acc: break; /* FIXME */ + case res_acc: add_po_accel( english, res ); break; case res_dlg: add_po_dialog( english, res ); break; case res_men: add_po_menu( english, res ); break; case res_stt: add_po_stringtable( english, res ); break; @@ -1089,6 +1133,26 @@ static void translate_dialog( dialog_t *dlg, dialog_t *new, int *found ) new->controls = translate_controls( dlg->controls, found ); } +static event_t *translate_accel( accelerator_t *acc, accelerator_t *new, int *found ) +{ + event_t *event, *new_ev, *head = NULL, *tail = NULL; + + event = acc->events; + while (event) + { + new_ev = new_event(); + *new_ev = *event; + if (event->str) new_ev->str = translate_string( event->str, found ); + if (tail) tail->next = new_ev; + else head = new_ev; + new_ev->next = NULL; + new_ev->prev = tail; + tail = new_ev; + event = event->next; + } + return head; +} + static void translate_resources( language_t *lang ) { resource_t *res; @@ -1103,7 +1167,8 @@ static void translate_resources( language_t *lang ) switch (res->type) { case res_acc: - /* FIXME */ + new = dup_resource( res, lang ); + new->res.acc->events = translate_accel( res->res.acc, new->res.acc, &found ); break; case res_dlg: new = dup_resource( res, lang ); diff --git a/tools/wrc/wrctypes.h b/tools/wrc/wrctypes.h index 4df9279..99699d7 100644 --- a/tools/wrc/wrctypes.h +++ b/tools/wrc/wrctypes.h @@ -537,6 +537,7 @@ typedef struct versioninfo { typedef struct event { struct event *next; struct event *prev; + string_t *str; int flags; int key; int id;

1 0

Eric Pouech : winedbg: Enhance algorithm to look up for memory data inside a minidump.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 1bd693b139e539a2c606d5eca914379dfc2f1cd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd693b139e539a2c606d5eca… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 23 21:37:22 2012 +0100 winedbg: Enhance algorithm to look up for memory data inside a minidump. --- programs/winedbg/tgt_minidump.c | 39 ++++++++++++++++++++++++++++++--------- 1 files changed, 30 insertions(+), 9 deletions(-) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index afa41d8..c346070 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -103,22 +103,43 @@ static BOOL tgt_process_minidump_read(HANDLE hProcess, const void* addr, { MINIDUMP_MEMORY_LIST* mml = stream; MINIDUMP_MEMORY_DESCRIPTOR* mmd = &mml->MemoryRanges[0]; - int i; - + int i, found = -1; + SIZE_T ilen, prev_len = 0; + + /* There's no reason that memory ranges inside a minidump do not overlap. + * So be smart when looking for a given memory range (either grab a + * range that covers the whole requested area, or if none, the range that + * has the largest overlap with requested area) + */ for (i = 0; i < mml->NumberOfMemoryRanges; i++, mmd++) { if (get_addr64(mmd->StartOfMemoryRange) <= (DWORD_PTR)addr && (DWORD_PTR)addr < get_addr64(mmd->StartOfMemoryRange) + mmd->Memory.DataSize) { - len = min(len, - get_addr64(mmd->StartOfMemoryRange) + mmd->Memory.DataSize - (DWORD_PTR)addr); - memcpy(buffer, - (char*)private_data(dbg_curr_process)->mapping + mmd->Memory.Rva + (DWORD_PTR)addr - get_addr64(mmd->StartOfMemoryRange), - len); - if (rlen) *rlen = len; - return TRUE; + ilen = min(len, + get_addr64(mmd->StartOfMemoryRange) + mmd->Memory.DataSize - (DWORD_PTR)addr); + if (ilen == len) /* whole range is matched */ + { + found = i; + prev_len = ilen; + break; + } + if (found == -1 || ilen > prev_len) /* partial match, keep largest one */ + { + found = i; + prev_len = ilen; + } } } + if (found != -1) + { + mmd = &mml->MemoryRanges[found]; + memcpy(buffer, + (char*)private_data(dbg_curr_process)->mapping + mmd->Memory.Rva + (DWORD_PTR)addr - get_addr64(mmd->StartOfMemoryRange), + prev_len); + if (rlen) *rlen = prev_len; + return TRUE; + } } /* FIXME: this is a dirty hack to let the last frame in a bt to work * However, we need to check who's to blame, this code or the current

1 0

Eric Pouech : dbghelp: Allow each CPU backend to save CPU specific memory ranges in minidump.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: a672a51cbf06d8e8b9a55fa29ca5f093d4ed8c20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a672a51cbf06d8e8b9a55fa29… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 23 21:37:16 2012 +0100 dbghelp: Allow each CPU backend to save CPU specific memory ranges in minidump. Used this feature to add x86_64 unwind information. --- dlls/dbghelp/cpu_arm.c | 7 +++++ dlls/dbghelp/cpu_i386.c | 9 +++++++ dlls/dbghelp/cpu_ppc.c | 7 +++++ dlls/dbghelp/cpu_sparc.c | 7 +++++ dlls/dbghelp/cpu_x86_64.c | 49 ++++++++++++++++++++++++++++++++++++++- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/minidump.c | 3 ++ 7 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index 025955e..2712db4 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -228,6 +228,12 @@ static BOOL arm_fetch_minidump_thread(struct dump_context* dc, unsigned index, u return FALSE; } +static BOOL arm_fetch_minidump_module(struct dump_context* dc, unsigned index, unsigned flags) +{ + FIXME("NIY\n"); + return FALSE; +} + DECLSPEC_HIDDEN struct cpu cpu_arm = { IMAGE_FILE_MACHINE_ARMV7, 4, @@ -239,4 +245,5 @@ DECLSPEC_HIDDEN struct cpu cpu_arm = { arm_fetch_context_reg, arm_fetch_regname, arm_fetch_minidump_thread, + arm_fetch_minidump_module, }; diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index b51d3fc..3a66def 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -673,6 +673,14 @@ static BOOL i386_fetch_minidump_thread(struct dump_context* dc, unsigned index, return TRUE; } +static BOOL i386_fetch_minidump_module(struct dump_context* dc, unsigned index, unsigned flags) +{ + /* FIXME: actually, we should probably take care of FPO data, unless it's stored in + * function table minidump stream + */ + return FALSE; +} + DECLSPEC_HIDDEN struct cpu cpu_i386 = { IMAGE_FILE_MACHINE_I386, 4, @@ -684,4 +692,5 @@ DECLSPEC_HIDDEN struct cpu cpu_i386 = { i386_fetch_context_reg, i386_fetch_regname, i386_fetch_minidump_thread, + i386_fetch_minidump_module, }; diff --git a/dlls/dbghelp/cpu_ppc.c b/dlls/dbghelp/cpu_ppc.c index b142e4a..56571c5 100644 --- a/dlls/dbghelp/cpu_ppc.c +++ b/dlls/dbghelp/cpu_ppc.c @@ -78,6 +78,12 @@ static BOOL ppc_fetch_minidump_thread(struct dump_context* dc, unsigned index, u return FALSE; } +static BOOL ppc_fetch_minidump_module(struct dump_context* dc, unsigned index, unsigned flags) +{ + FIXME("NIY\n"); + return FALSE; +} + DECLSPEC_HIDDEN struct cpu cpu_ppc = { IMAGE_FILE_MACHINE_POWERPC, 4, @@ -89,4 +95,5 @@ DECLSPEC_HIDDEN struct cpu cpu_ppc = { ppc_fetch_context_reg, ppc_fetch_regname, ppc_fetch_minidump_thread, + ppc_fetch_minidump_module, }; diff --git a/dlls/dbghelp/cpu_sparc.c b/dlls/dbghelp/cpu_sparc.c index bae1c22..7f5bfaa 100644 --- a/dlls/dbghelp/cpu_sparc.c +++ b/dlls/dbghelp/cpu_sparc.c @@ -85,6 +85,12 @@ static BOOL sparc_fetch_minidump_thread(struct dump_context* dc, unsigned index, return FALSE; } +static BOOL sparc_fetch_minidump_module(struct dump_context* dc, unsigned index, unsigned flags) +{ + FIXME("NIY\n"); + return FALSE; +} + DECLSPEC_HIDDEN struct cpu cpu_sparc = { IMAGE_FILE_MACHINE_SPARC, 4, @@ -96,4 +102,5 @@ DECLSPEC_HIDDEN struct cpu cpu_sparc = { sparc_fetch_context_reg, sparc_fetch_regname, sparc_fetch_minidump_thread, + sparc_fetch_minidump_module, }; diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 695588e..8de28ef 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -145,7 +145,7 @@ static void dump_unwind_info(struct cpu_stack_walk* csw, ULONG64 base, RUNTIME_F { if (!sw_read_mem(csw, base + function->UnwindData, &snext, sizeof(snext))) { - TRACE("Couldn't unwind RUNTIME_INFO\n"); + TRACE("Couldn't unwind RUNTIME_INFO at %lx\n", base + function->UnwindData); return; } TRACE("unwind info for function %p-%p chained to function %p-%p\n", @@ -159,7 +159,7 @@ static void dump_unwind_info(struct cpu_stack_walk* csw, ULONG64 base, RUNTIME_F !sw_read_mem(csw, addr + FIELD_OFFSET(UNWIND_INFO, UnwindCode), info->UnwindCode, info->CountOfCodes * sizeof(UNWIND_CODE))) { - FIXME("couldn't read memory for UNWIND_INFO\n"); + FIXME("couldn't read memory for UNWIND_INFO at %lx\n", addr); return; } TRACE("unwind info at %p flags %x prolog 0x%x bytes function %p-%p\n", @@ -904,6 +904,50 @@ static BOOL x86_64_fetch_minidump_thread(struct dump_context* dc, unsigned index return TRUE; } +static BOOL x86_64_fetch_minidump_module(struct dump_context* dc, unsigned index, unsigned flags) +{ + /* FIXME: not sure about the flags... */ + if (1) + { + /* FIXME: crop values across module boundaries, */ +#ifdef __x86_64__ + struct process* pcs; + struct module* module; + const RUNTIME_FUNCTION* rtf; + ULONG size; + + if (!(pcs = process_find_by_handle(dc->hProcess)) || + !(module = module_find_by_addr(pcs, dc->modules[index].base, DMT_UNKNOWN))) + return FALSE; + rtf = (const RUNTIME_FUNCTION*)pe_map_directory(module, IMAGE_DIRECTORY_ENTRY_EXCEPTION, &size); + if (rtf) + { + const RUNTIME_FUNCTION* end = (const RUNTIME_FUNCTION*)((const char*)rtf + size); + UNWIND_INFO ui; + + while (rtf + 1 < end) + { + while (rtf->UnwindData & 1) /* follow chained entry */ + { + FIXME("RunTime_Function outside IMAGE_DIRECTORY_ENTRY_EXCEPTION unimplemented yet!\n"); + return FALSE; + /* we need to read into the other process */ + /* rtf = (RUNTIME_FUNCTION*)(module->module.BaseOfImage + (rtf->UnwindData & ~1)); */ + } + if (ReadProcessMemory(dc->hProcess, + (void*)(dc->modules[index].base + rtf->UnwindData), + &ui, sizeof(ui), NULL)) + minidump_add_memory_block(dc, dc->modules[index].base + rtf->UnwindData, + FIELD_OFFSET(UNWIND_INFO, UnwindCode) + ui.CountOfCodes * sizeof(UNWIND_CODE), 0); + rtf++; + } + } +#endif + } + + return TRUE; +} + DECLSPEC_HIDDEN struct cpu cpu_x86_64 = { IMAGE_FILE_MACHINE_AMD64, 8, @@ -915,4 +959,5 @@ DECLSPEC_HIDDEN struct cpu cpu_x86_64 = { x86_64_fetch_context_reg, x86_64_fetch_regname, x86_64_fetch_minidump_thread, + x86_64_fetch_minidump_module, }; diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 3bee416..f18a0fe 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -538,6 +538,7 @@ struct cpu /* minidump per CPU extension */ BOOL (*fetch_minidump_thread)(struct dump_context* dc, unsigned index, unsigned flags, const CONTEXT* ctx); + BOOL (*fetch_minidump_module)(struct dump_context* dc, unsigned index, unsigned flags); }; extern struct cpu* dbghelp_current_cpu DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index fa3cfae..c0882b0 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -513,6 +513,9 @@ static unsigned dump_modules(struct dump_context* dc, BOOL dump_elf) } if (flags_out & ModuleWriteModule) { + /* fetch CPU dependant module info (like UNWIND_INFO) */ + dbghelp_current_cpu->fetch_minidump_module(dc, i, flags_out); + mdModule.BaseOfImage = dc->modules[i].base; mdModule.SizeOfImage = dc->modules[i].size; mdModule.CheckSum = dc->modules[i].checksum;

1 0

Eric Pouech : dbghelp: Allow CPU backends to add specific information into a minidump.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 1c5450f91f73e2a209067f21b36d800546c8ad1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c5450f91f73e2a209067f21b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 23 21:37:10 2012 +0100 dbghelp: Allow CPU backends to add specific information into a minidump. Use it to add a 256 byte block around current program counter. --- dlls/dbghelp/cpu_arm.c | 7 ++++ dlls/dbghelp/cpu_i386.c | 15 ++++++++ dlls/dbghelp/cpu_ppc.c | 7 ++++ dlls/dbghelp/cpu_sparc.c | 7 ++++ dlls/dbghelp/cpu_x86_64.c | 15 ++++++++ dlls/dbghelp/dbghelp_private.h | 55 ++++++++++++++++++++++++++++++ dlls/dbghelp/minidump.c | 72 +++++----------------------------------- 7 files changed, 115 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c5450f91f73e2a209067…

1 0

Eric Pouech : dbghelp: Add our own thread data gathering struct for minidump internals instead on relying on SYSTEM_PROCESS_INFO .
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: d02295d998d63579ec5faa963a438fb6d58f40c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d02295d998d63579ec5faa963… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 23 21:37:05 2012 +0100 dbghelp: Add our own thread data gathering struct for minidump internals instead on relying on SYSTEM_PROCESS_INFO. --- dlls/dbghelp/minidump.c | 78 ++++++++++++++++++++++++++++++---------------- 1 files changed, 51 insertions(+), 27 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index b7e098b..757e21d 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -49,13 +49,21 @@ struct dump_module WCHAR name[MAX_PATH]; }; +struct dump_thread +{ + ULONG tid; + ULONG prio_class; + ULONG curr_prio; +}; + struct dump_context { /* process & thread information */ HANDLE hProcess; DWORD pid; - void* pcs_buffer; - SYSTEM_PROCESS_INFORMATION* spi; + /* thread information */ + struct dump_thread* threads; + unsigned num_threads; /* module information */ struct dump_module* modules; unsigned num_modules; @@ -73,41 +81,55 @@ struct dump_context }; /****************************************************************** - * fetch_processes_info + * fetch_process_info * - * reads system wide process information, and make spi point to the record + * reads system wide process information, and gather from it the threads information * for process of id 'pid' */ -static BOOL fetch_processes_info(struct dump_context* dc) +static BOOL fetch_process_info(struct dump_context* dc) { ULONG buf_size = 0x1000; NTSTATUS nts; + void* pcs_buffer = NULL; - dc->pcs_buffer = NULL; - if (!(dc->pcs_buffer = HeapAlloc(GetProcessHeap(), 0, buf_size))) return FALSE; + if (!(pcs_buffer = HeapAlloc(GetProcessHeap(), 0, buf_size))) return FALSE; for (;;) { - nts = NtQuerySystemInformation(SystemProcessInformation, - dc->pcs_buffer, buf_size, NULL); + nts = NtQuerySystemInformation(SystemProcessInformation, + pcs_buffer, buf_size, NULL); if (nts != STATUS_INFO_LENGTH_MISMATCH) break; - dc->pcs_buffer = HeapReAlloc(GetProcessHeap(), 0, dc->pcs_buffer, - buf_size *= 2); - if (!dc->pcs_buffer) return FALSE; + pcs_buffer = HeapReAlloc(GetProcessHeap(), 0, pcs_buffer, buf_size *= 2); + if (!pcs_buffer) return FALSE; } if (nts == STATUS_SUCCESS) { - dc->spi = dc->pcs_buffer; + SYSTEM_PROCESS_INFORMATION* spi = pcs_buffer; + unsigned i; + for (;;) { - if (HandleToUlong(dc->spi->UniqueProcessId) == dc->pid) return TRUE; - if (!dc->spi->NextEntryOffset) break; - dc->spi = (SYSTEM_PROCESS_INFORMATION*)((char*)dc->spi + dc->spi->NextEntryOffset); + if (HandleToUlong(spi->UniqueProcessId) == dc->pid) + { + dc->num_threads = spi->dwThreadCount; + dc->threads = HeapAlloc(GetProcessHeap(), 0, + dc->num_threads * sizeof(dc->threads[0])); + if (!dc->threads) goto failed; + for (i = 0; i < dc->num_threads; i++) + { + dc->threads[i].tid = HandleToULong(spi->ti[i].ClientId.UniqueThread); + dc->threads[i].prio_class = spi->ti[i].dwBasePriority; /* FIXME */ + dc->threads[i].curr_prio = spi->ti[i].dwCurrentPriority; + } + HeapFree(GetProcessHeap(), 0, pcs_buffer); + return TRUE; + } + if (!spi->NextEntryOffset) break; + spi = (SYSTEM_PROCESS_INFORMATION*)((char*)spi + spi->NextEntryOffset); } } - HeapFree(GetProcessHeap(), 0, dc->pcs_buffer); - dc->pcs_buffer = NULL; - dc->spi = NULL; +failed: + HeapFree(GetProcessHeap(), 0, pcs_buffer); return FALSE; } @@ -147,7 +169,7 @@ static BOOL fetch_thread_info(struct dump_context* dc, int thd_idx, const MINIDUMP_EXCEPTION_INFORMATION* except, MINIDUMP_THREAD* mdThd, CONTEXT* ctx) { - DWORD tid = HandleToUlong(dc->spi->ti[thd_idx].ClientId.UniqueThread); + DWORD tid = dc->threads[thd_idx].tid; HANDLE hThread; THREAD_BASIC_INFORMATION tbi; @@ -161,8 +183,8 @@ static BOOL fetch_thread_info(struct dump_context* dc, int thd_idx, mdThd->Stack.Memory.Rva = 0; mdThd->ThreadContext.DataSize = 0; mdThd->ThreadContext.Rva = 0; - mdThd->PriorityClass = dc->spi->ti[thd_idx].dwBasePriority; /* FIXME */ - mdThd->Priority = dc->spi->ti[thd_idx].dwCurrentPriority; + mdThd->PriorityClass = dc->threads[thd_idx].prio_class; + mdThd->Priority = dc->threads[thd_idx].curr_prio; if ((hThread = OpenThread(THREAD_ALL_ACCESS, FALSE, tid)) == NULL) { @@ -740,9 +762,9 @@ static unsigned dump_threads(struct dump_context* dc, mdThdList.NumberOfThreads = 0; rva_base = dc->rva; - dc->rva += sz = sizeof(mdThdList.NumberOfThreads) + dc->spi->dwThreadCount * sizeof(mdThd); + dc->rva += sz = sizeof(mdThdList.NumberOfThreads) + dc->num_threads * sizeof(mdThd); - for (i = 0; i < dc->spi->dwThreadCount; i++) + for (i = 0; i < dc->num_threads; i++) { fetch_thread_info(dc, i, except, &mdThd, &ctx); @@ -761,7 +783,7 @@ static unsigned dump_threads(struct dump_context* dc, cbin.ProcessId = dc->pid; cbin.ProcessHandle = dc->hProcess; cbin.CallbackType = ThreadCallback; - cbin.u.Thread.ThreadId = HandleToUlong(dc->spi->ti[i].ClientId.UniqueThread); + cbin.u.Thread.ThreadId = dc->threads[i].tid; cbin.u.Thread.ThreadHandle = 0; /* FIXME */ cbin.u.Thread.Context = ctx; cbin.u.Thread.SizeOfContext = sizeof(CONTEXT); @@ -896,6 +918,8 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, dc.modules = NULL; dc.num_modules = 0; dc.alloc_modules = 0; + dc.threads = NULL; + dc.num_threads = 0; dc.cb = CallbackParam; dc.type = DumpType; dc.mem = NULL; @@ -903,7 +927,7 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, dc.alloc_mem = 0; dc.rva = 0; - if (!fetch_processes_info(&dc)) return FALSE; + if (!fetch_process_info(&dc)) return FALSE; fetch_modules_info(&dc); /* 1) init */ @@ -1007,9 +1031,9 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, for (i = idx_stream; i < nStreams; i++) writeat(&dc, mdHead.StreamDirectoryRva + i * sizeof(emptyDir), &emptyDir, sizeof(emptyDir)); - HeapFree(GetProcessHeap(), 0, dc.pcs_buffer); HeapFree(GetProcessHeap(), 0, dc.mem); HeapFree(GetProcessHeap(), 0, dc.modules); + HeapFree(GetProcessHeap(), 0, dc.threads); return TRUE; }

1 0

Eric Pouech : winedbg, winedump: Embed wine build-id information info minidump, and display it.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 2ce0e940181a04470f9937a92ae7640fe0e54646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce0e940181a04470f9937a92… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 23 21:36:59 2012 +0100 winedbg, winedump: Embed wine build-id information info minidump, and display it. --- dlls/dbghelp/minidump.c | 42 ++++++++++++++++++++++++++++++++++++++- programs/winedbg/tgt_minidump.c | 18 +++++++++++++++- tools/winedump/minidump.c | 15 +++++++++++++ 3 files changed, 73 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index fd7eb1ac..b7e098b 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -615,11 +615,29 @@ static unsigned dump_system_info(struct dump_context* dc) OSVERSIONINFOW osInfo; DWORD written; ULONG slen; + DWORD wine_extra = 0; + + const char *(CDECL *wine_get_build_id)(void); + void (CDECL *wine_get_host_version)(const char **sysname, const char **release); + const char* build_id = NULL; + const char* sys_name = NULL; + const char* release_name = NULL; GetSystemInfo(&sysInfo); osInfo.dwOSVersionInfoSize = sizeof(osInfo); GetVersionExW(&osInfo); + wine_get_build_id = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_build_id"); + wine_get_host_version = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_host_version"); + if (wine_get_build_id && wine_get_host_version) + { + /* cheat minidump system information by adding specific wine information */ + wine_extra = 4 + 4 * sizeof(slen); + build_id = wine_get_build_id(); + wine_get_host_version(&sys_name, &release_name); + wine_extra += strlen(build_id) + 1 + strlen(sys_name) + 1 + strlen(release_name) + 1; + } + mdSysInfo.ProcessorArchitecture = sysInfo.u.s.wProcessorArchitecture; mdSysInfo.ProcessorLevel = sysInfo.wProcessorLevel; mdSysInfo.ProcessorRevision = sysInfo.wProcessorRevision; @@ -630,7 +648,7 @@ static unsigned dump_system_info(struct dump_context* dc) mdSysInfo.BuildNumber = osInfo.dwBuildNumber; mdSysInfo.PlatformId = osInfo.dwPlatformId; - mdSysInfo.CSDVersionRva = dc->rva + sizeof(mdSysInfo); + mdSysInfo.CSDVersionRva = dc->rva + sizeof(mdSysInfo) + wine_extra; mdSysInfo.u1.Reserved1 = 0; mdSysInfo.u1.s.SuiteMask = VER_SUITE_TERMINAL; @@ -672,6 +690,28 @@ static unsigned dump_system_info(struct dump_context* dc) } append(dc, &mdSysInfo, sizeof(mdSysInfo)); + /* write Wine specific system information just behind the structure, and before any string */ + if (wine_extra) + { + char code[] = {'W','I','N','E'}; + + WriteFile(dc->hFile, code, 4, &written, NULL); + /* number of sub-info, so that we can extend structure if needed */ + slen = 3; + WriteFile(dc->hFile, &slen, sizeof(slen), &written, NULL); + /* we store offsets from just after the WINE marker */ + slen = 4 * sizeof(DWORD); + WriteFile(dc->hFile, &slen, sizeof(slen), &written, NULL); + slen += strlen(build_id) + 1; + WriteFile(dc->hFile, &slen, sizeof(slen), &written, NULL); + slen += strlen(sys_name) + 1; + WriteFile(dc->hFile, &slen, sizeof(slen), &written, NULL); + WriteFile(dc->hFile, build_id, strlen(build_id) + 1, &written, NULL); + WriteFile(dc->hFile, sys_name, strlen(sys_name) + 1, &written, NULL); + WriteFile(dc->hFile, release_name, strlen(release_name) + 1, &written, NULL); + dc->rva += wine_extra; + } + /* write the service pack version string after this stream. It is referenced within the stream by its RVA in the file. */ slen = lstrlenW(osInfo.szCSDVersion) * sizeof(WCHAR); diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index f5750e8..afa41d8 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -174,6 +174,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) MINIDUMP_MODULE_LIST* mml; MINIDUMP_MODULE* mm; MINIDUMP_STRING* mds; + MINIDUMP_DIRECTORY* dir; WCHAR exec_name[1024]; WCHAR nameW[1024]; unsigned len; @@ -212,7 +213,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) } } - if (MiniDumpReadDumpStream(data->mapping, SystemInfoStream, NULL, &stream, NULL)) + if (MiniDumpReadDumpStream(data->mapping, SystemInfoStream, &dir, &stream, NULL)) { MINIDUMP_SYSTEM_INFO* msi = stream; const char *str; @@ -305,6 +306,21 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) } dbg_printf(" on Windows %s (%u)\n", str, msi->BuildNumber); /* FIXME CSD: msi->CSDVersionRva */ + + if (sizeof(MINIDUMP_SYSTEM_INFO) + 4 > dir->Location.DataSize && + msi->CSDVersionRva >= dir->Location.Rva + sizeof(MINIDUMP_SYSTEM_INFO) + 4) + { + const char* code = (const char*)stream + sizeof(MINIDUMP_SYSTEM_INFO); + const DWORD* wes; + + if (code[0] == 'W' && code[1] == 'I' && code[2] == 'N' && code[3] == 'E' && + *(wes = (const DWORD*)(code += 4)) >= 3) + { + /* assume we have wine extensions */ + dbg_printf(" [on %s, on top of %s (%s)]\n", + code + wes[1], code + wes[2], code + wes[3]); + } + } } dbg_curr_process = dbg_add_process(&be_process_minidump_io, pid, hProc); diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 4cd04f3..ddd0ed6 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -341,6 +341,21 @@ void mdmp_dump(void) printf(" x86.AMDExtendedCpuFeatures: %x\n", msi->Cpu.X86CpuInfo.AMDExtendedCpuFeatures); } + if (sizeof(MINIDUMP_SYSTEM_INFO) + 4 > dir->Location.DataSize && + msi->CSDVersionRva >= dir->Location.Rva + 4) + { + const char* code = PRD(dir->Location.Rva + sizeof(MINIDUMP_SYSTEM_INFO), 4); + const DWORD* wes; + if (code && code[0] == 'W' && code[1] == 'I' && code[2] == 'N' && code[3] == 'E' && + *(wes = (const DWORD*)(code += 4)) >= 3) + { + /* assume we have wine extensions */ + printf(" Wine details:\n"); + printf(" build-id: %s\n", code + wes[1]); + printf(" system: %s\n", code + wes[2]); + printf(" release: %s\n", code + wes[3]); + } + } } break; case MiscInfoStream:

1 0

Gerald Pfeifer : configure: Use the -Wignored-qualifiers compiler option if available.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 2505dfcc57fd3bc3b3b1d33d9940a5d790303059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2505dfcc57fd3bc3b3b1d33d9… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Jan 23 21:58:35 2012 +0100 configure: Use the -Wignored-qualifiers compiler option if available. --- configure | 25 +++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/configure b/configure index fa17bcc..ef5fb31 100755 --- a/configure +++ b/configure @@ -12062,6 +12062,31 @@ $as_echo "$ac_cv_cflags__Wempty_body" >&6; } if test $ac_cv_cflags__Wempty_body = yes; then : EXTRACFLAGS="$EXTRACFLAGS -Wempty-body" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wignored-qualifiers" >&5 +$as_echo_n "checking whether the compiler supports -Wignored-qualifiers... " >&6; } +if ${ac_cv_cflags__Wignored_qualifiers+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wignored-qualifiers" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wignored_qualifiers=yes +else + ac_cv_cflags__Wignored_qualifiers=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wignored_qualifiers" >&5 +$as_echo "$ac_cv_cflags__Wignored_qualifiers" >&6; } +if test $ac_cv_cflags__Wignored_qualifiers = yes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wignored-qualifiers" +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wstrict-prototypes" >&5 $as_echo_n "checking whether the compiler supports -Wstrict-prototypes... " >&6; } if ${ac_cv_cflags__Wstrict_prototypes+:} false; then : diff --git a/configure.ac b/configure.ac index 5810111..9a4848b 100644 --- a/configure.ac +++ b/configure.ac @@ -1705,6 +1705,7 @@ then WINE_TRY_CFLAGS([-fno-strict-aliasing]) WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wempty-body]) + WINE_TRY_CFLAGS([-Wignored-qualifiers]) WINE_TRY_CFLAGS([-Wstrict-prototypes]) WINE_TRY_CFLAGS([-Wtype-limits]) WINE_TRY_CFLAGS([-Wunused-but-set-parameter])

1 0

Dan Kegel : include: ntddcdvd.h structure naming, packing fixes.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: b94fabfb5bfe9a19af22b9e28f7b6176ab1de00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b94fabfb5bfe9a19af22b9e28… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Jan 23 09:13:13 2012 -0800 include: ntddcdvd.h structure naming, packing fixes. --- include/ddk/ntddcdvd.h | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/ddk/ntddcdvd.h b/include/ddk/ntddcdvd.h index 53e164f..5313496 100644 --- a/include/ddk/ntddcdvd.h +++ b/include/ddk/ntddcdvd.h @@ -49,6 +49,8 @@ typedef enum { typedef ULONG DVD_SESSION_ID, *PDVD_SESSION_ID; +#include <pshpack1.h> + typedef struct _DVD_COPY_PROTECT_KEY { ULONG KeyLength; DVD_SESSION_ID SessionId; @@ -97,7 +99,7 @@ typedef enum _DVD_STRUCTURE_FORMAT DvdMaxDescriptor } DVD_STRUCTURE_FORMAT, *PDVD_STRUCTURE_FORMAT; -typedef struct _DVD_READ_STRUCTURE { +typedef struct DVD_READ_STRUCTURE { /* Contains an offset to the logical block address of the descriptor to be retrieved. */ LARGE_INTEGER BlockByteOffset; @@ -151,8 +153,6 @@ typedef struct _DVD_LAYER_DESCRIPTOR /* 0 indicates no BCA data */ UCHAR BCAFlag : 1; - - UCHAR Reserved6; }DVD_LAYER_DESCRIPTOR, * PDVD_LAYER_DESCRIPTOR; typedef struct _DVD_COPYRIGHT_DESCRIPTOR @@ -186,4 +186,6 @@ typedef struct _DVD_MANUFACTURER_DESCRIPTOR #define DVD_DISCKEY_SIZE 2048 #define DVD_SECTOR_PROTECTED 0x00000020 +#include <poppack.h> + #endif /* __NTDDCDVD_H */

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
98
Older →

Jump to page:

2025

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-commits January 2012