January 2012 - Wine-Commits

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

Jan. 24, 2012

1 0

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

Jan. 24, 2012

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

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

Jan. 24, 2012

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

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

Jan. 24, 2012

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 : winedbg: Enhance algorithm to look up for memory data inside a minidump.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

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 CPU backends to add specific information into a minidump.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

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

Francois Gouget : po: Remove spaces before a '\n'.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: bf044ed50cf0652ab17b1f5da503161f8b027194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf044ed50cf0652ab17b1f5da… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:36:42 2012 +0100 po: Remove spaces before a '\n'. --- po/ca.po | 2 +- po/fa.po | 2 +- po/ja.po | 4 ++-- po/ko.po | 22 +++++++++++----------- po/nl.po | 4 ++-- po/sl.po | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/po/ca.po b/po/ca.po index b871546..1a8e42f 100644 --- a/po/ca.po +++ b/po/ca.po @@ -10093,7 +10093,7 @@ msgid "" "Error: Setting the system hostname is not possible with the hostname " "utility.\n" msgstr "" -"Error: Establir el nom d'equip del sistema no és possible amb la utilitat \n" +"Error: Establir el nom d'equip del sistema no és possible amb la utilitat\n" "hostname.\n" #: ipconfig.rc:27 diff --git a/po/fa.po b/po/fa.po index b79ff57..4ad62ff 100644 --- a/po/fa.po +++ b/po/fa.po @@ -8324,7 +8324,7 @@ msgid "" "Not enough memory available for this task. Quit one or more applications to " "increase available memory, and then try again." msgstr "" -"حافظه‌ی موقت برای انجام این کار وجود ندارد. \n" +"حافظه‌ی موقت برای انجام این کار وجود ندارد.\n" "یک یا چند ابزار و برنامه‌ی دیگر را ببندید تا مقدار آزاد حافظه‌ی موقت را افزایش " "دهید." diff --git a/po/ja.po b/po/ja.po index d4e055b..d040d31 100644 --- a/po/ja.po +++ b/po/ja.po @@ -11402,11 +11402,11 @@ msgid "" msgstr "" "start.exe バージョン 0.2 Copyright (C) 2003, Dan Kegel\n" "このプログラムはフリーソフトウェアです。あなたはこれを、フリーソフトウェ\n" -"ア財団によって発行されたGNU 劣等一般公衆利用許諾契約書(バージョン2.1 \n" +"ア財団によって発行されたGNU 劣等一般公衆利用許諾契約書(バージョン2.1\n" "か、希望によってはそれ以降のバージョンのうちどれか)の定める条件の下で\n" "再頒布または改変することができます。\n" "\n" -"このプログラムは有用であることを願って頒布されますが、*全くの無保証* \n" +"このプログラムは有用であることを願って頒布されますが、*全くの無保証*\n" "です。商業可能性の保証や特定の目的への適合性は、言外に示されたものも含\n" "め全く存在しません。詳しくはGNU 劣等一般公衆利用許諾契約書をご覧くださ\n" "い。\n" diff --git a/po/ko.po b/po/ko.po index a6aa913..a907518 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3832,7 +3832,7 @@ msgstr "세마포어가 설정되었습니다\n" #: winerror.mc:391 msgid "Too many semaphore requests\n" -msgstr "세마포어 요청이 너무 많습니다 \n" +msgstr "세마포어 요청이 너무 많습니다\n" #: winerror.mc:396 msgid "Invalid at interrupt time\n" @@ -3924,7 +3924,7 @@ msgstr "~에 대해 대기하는 자식 프로세스가 없음\n" #: winerror.mc:511 msgid "Child process has not completed\n" -msgstr "자식 프로세스가 완료되지 않았습니다 \n" +msgstr "자식 프로세스가 완료되지 않았습니다\n" #: winerror.mc:516 msgid "Invalid use of direct access handle\n" @@ -4080,7 +4080,7 @@ msgstr "올바르지 않은 세그멘트 번호\n" #: winerror.mc:711 msgid "Invalid ordinal for %1\n" -msgstr "올바르지 않은 %1 오디널 \n" +msgstr "올바르지 않은 %1 오디널\n" #: winerror.mc:716 msgid "File already exists\n" @@ -4108,7 +4108,7 @@ msgstr "%1의 올바르지 않은 모듈 형식\n" #: winerror.mc:746 msgid "Invalid EXE signature in %1\n" -msgstr "%1 의 올바르지 않은 EXE 서명 \n" +msgstr "%1 의 올바르지 않은 EXE 서명\n" #: winerror.mc:751 msgid "EXE %1 is marked invalid\n" @@ -4124,7 +4124,7 @@ msgstr "%1의 반복 데이타가 64k를 넘음\n" #: winerror.mc:766 msgid "Invalid MinAllocSize in %1\n" -msgstr "%1의 올바르지 않은 MinAllocSize \n" +msgstr "%1의 올바르지 않은 MinAllocSize\n" #: winerror.mc:771 msgid "Dynlink from invalid ring\n" @@ -4136,7 +4136,7 @@ msgstr "IOPL는 가능하지 않습니다\n" #: winerror.mc:781 msgid "Invalid SEGDPL in %1\n" -msgstr "%1의 올바르지 않은 SEGDPL \n" +msgstr "%1의 올바르지 않은 SEGDPL\n" #: winerror.mc:786 msgid "Auto data segment exceeds 64k\n" @@ -5520,7 +5520,7 @@ msgstr "올바르지 않은 편집 높이\n" #: winerror.mc:2521 msgid "DC not found\n" -msgstr "DC를 찾을 수 없습니다 \n" +msgstr "DC를 찾을 수 없습니다\n" #: winerror.mc:2526 msgid "Invalid hook filter\n" @@ -5616,7 +5616,7 @@ msgstr "올바르지 않은 스코롤바 범위\n" #: winerror.mc:2641 msgid "Invalid ShowWin command\n" -msgstr "올바르지 않은 ShowWin 명령 \n" +msgstr "올바르지 않은 ShowWin 명령\n" #: winerror.mc:2646 msgid "No system resources\n" @@ -6197,7 +6197,7 @@ msgstr "RPC 요구는 이미 작업중입니다\n" #: winerror.mc:3371 msgid "NETLOGON is not started\n" -msgstr "NETLOGON 는 시작되어 있지 않습니다 \n" +msgstr "NETLOGON 는 시작되어 있지 않습니다\n" #: winerror.mc:3376 msgid "Account expired\n" @@ -9695,7 +9695,7 @@ msgid "" "presses an allowed Key from a selectable list.\n" "CHOICE is mainly used to build a menu selection in a batch file.\n" msgstr "" -"CHOICE는 텍스트를 보여주고, 사용자가 선택된 목록에서 \n" +"CHOICE는 텍스트를 보여주고, 사용자가 선택된 목록에서\n" "허용하는 키를 누를 때까지 기다립니다.\n" "CHOICE는 주로 배치 파일에서 메뉴 선택을 넣는 데 사용됩니다..\n" @@ -13941,7 +13941,7 @@ msgstr "%1를 덮어쓰겠습니까? (예|아니오|모두)\n" #: xcopy.rc:37 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "r/c %3!d!로 '%1'를 '%2'로 복사 실패 \n" +msgstr "r/c %3!d!로 '%1'를 '%2'로 복사 실패\n" #: xcopy.rc:39 msgid "Failed during reading of '%1'\n" diff --git a/po/nl.po b/po/nl.po index 8952efb..77a6ebc 100644 --- a/po/nl.po +++ b/po/nl.po @@ -9733,8 +9733,8 @@ msgstr "" "SETLOCAL begint localisatie van omgevingswijzigingen in een batchbestand.\n" "\n" "Omgevingswijzigingen na een SETLOCAL opdracht zijn alleen in het\n" -"batchbestand zichtbaar en worden behouden tot de volgende ENDLOCAL \n" -"opdracht (of tot het eind van het bestand, welke eerst komst), \n" +"batchbestand zichtbaar en worden behouden tot de volgende ENDLOCAL\n" +"opdracht (of tot het eind van het bestand, welke eerst komst),\n" "waar de vorige omgevingsvariabelen worden teruggezet.\n" #: cmd.rc:220 diff --git a/po/sl.po b/po/sl.po index 209b011..56d859b 100644 --- a/po/sl.po +++ b/po/sl.po @@ -5631,7 +5631,7 @@ msgstr "Neveljaven obseg drsnika\n" #: winerror.mc:2641 msgid "Invalid ShowWin command\n" -msgstr "Neveljaven ukaz ShowWin \n" +msgstr "Neveljaven ukaz ShowWin\n" #: winerror.mc:2646 msgid "No system resources\n"

1 0

Dmitry Timoshkov : ntdll: Add an access check for file mappings.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: 3a5ee02735d49a808f3f3fc3a3f39d8e14089a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a5ee02735d49a808f3f3fc3a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 24 17:45:54 2012 +0800 ntdll: Add an access check for file mappings. --- dlls/kernel32/tests/loader.c | 2 +- dlls/kernel32/tests/virtual.c | 1 - dlls/ntdll/virtual.c | 48 +++++++++++++++++++++++++++++++++++----- 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 398e5f5..0b67bb6 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -639,7 +639,7 @@ static void test_VirtualProtect(void *base, void *section) ret = VirtualProtect(section, si.dwPageSize, td[i].prot_set, &old_prot); if (td[i].prot_get) { - ok(ret, "%d: VirtualProtect error %d\n", i, GetLastError()); + ok(ret, "%d: VirtualProtect error %d, requested prot %#x\n", i, GetLastError(), td[i].prot_set); ok(old_prot == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, old_prot); SetLastError(0xdeadbeef); diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 915f92d..d502bbf 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2207,7 +2207,6 @@ static void test_mapping(void) /* NT4 doesn't fail on incompatible map and view */ if (ret) { - todo_wine ok(broken(ret), "VirtualProtect should fail, map %#x, view %#x, requested prot %#x\n", page_prot[i], view[j].prot, page_prot[k]); skip("Incompatible map and view are not properly handled on this platform\n"); break; /* NT4 won't pass remaining tests */ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 344a81a..717917d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -73,6 +73,7 @@ struct file_view void *base; /* Base address */ size_t size; /* Size in bytes */ HANDLE mapping; /* Handle to the file mapping */ + unsigned int map_protect; /* Mapping protection */ unsigned int protect; /* Protection for all pages at allocation time */ BYTE prot[1]; /* Protection byte for each page */ }; @@ -474,6 +475,7 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz view->base = base; view->size = size; view->mapping = 0; + view->map_protect = 0; view->protect = vprot; memset( view->prot, vprot, size >> page_shift ); @@ -1116,7 +1118,7 @@ static NTSTATUS stat_mapping_file( struct file_view *view, struct stat *st ) * Map an executable (PE format) image into memory. */ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_size, SIZE_T mask, - SIZE_T header_size, int shared_fd, HANDLE dup_mapping, PVOID *addr_ptr ) + SIZE_T header_size, int shared_fd, HANDLE dup_mapping, unsigned int map_vprot, PVOID *addr_ptr ) { IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; @@ -1363,6 +1365,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz done: view->mapping = dup_mapping; + view->map_protect = map_vprot; server_leave_uninterrupted_section( &csVirtual, &sigset ); *addr_ptr = ptr; @@ -2039,6 +2042,34 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *si return status; } +static ULONG map_protection_to_access( ULONG vprot ) +{ + vprot &= VPROT_READ | VPROT_WRITE | VPROT_EXEC | VPROT_WRITECOPY; + if (vprot & VPROT_EXEC) + { + if (vprot & VPROT_WRITE) vprot |= VPROT_WRITECOPY; + } + else vprot &= ~VPROT_WRITECOPY; + return vprot; +} + +static BOOL is_compatible_protection( const struct file_view *view, ULONG new_prot ) +{ + ULONG view_prot, map_prot; + + view_prot = map_protection_to_access( view->protect ); + new_prot = map_protection_to_access( new_prot ); + + if (view_prot == new_prot) return TRUE; + if (!view_prot) return FALSE; + + if ((view_prot & new_prot) != new_prot) return FALSE; + + map_prot = map_protection_to_access( view->map_protect ); + if ((map_prot & new_prot) == new_prot) return TRUE; + + return FALSE; +} /*********************************************************************** * NtProtectVirtualMemory (NTDLL.@) @@ -2099,9 +2130,13 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T status = STATUS_INVALID_PAGE_PROTECTION; else { - new_vprot |= VPROT_COMMITTED; - if (old_prot) *old_prot = VIRTUAL_GetWin32Prot( vprot ); - if (!VIRTUAL_SetProt( view, base, size, new_vprot )) status = STATUS_ACCESS_DENIED; + if (!view->mapping || is_compatible_protection( view, new_vprot )) + { + new_vprot |= VPROT_COMMITTED; + if (old_prot) *old_prot = VIRTUAL_GetWin32Prot( vprot ); + if (!VIRTUAL_SetProt( view, base, size, new_vprot )) status = STATUS_ACCESS_DENIED; + } + else status = STATUS_INVALID_PAGE_PROTECTION; } } } @@ -2571,14 +2606,14 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p if ((res = server_get_unix_fd( shared_file, FILE_READ_DATA|FILE_WRITE_DATA, &shared_fd, &shared_needs_close, NULL, NULL ))) goto done; res = map_image( handle, unix_handle, base, size, mask, header_size, - shared_fd, dup_mapping, addr_ptr ); + shared_fd, dup_mapping, map_vprot, addr_ptr ); if (shared_needs_close) close( shared_fd ); NtClose( shared_file ); } else { res = map_image( handle, unix_handle, base, size, mask, header_size, - -1, dup_mapping, addr_ptr ); + -1, dup_mapping, map_vprot, addr_ptr ); } if (needs_close) close( unix_handle ); if (res >= 0) *size_ptr = size; @@ -2628,6 +2663,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p *addr_ptr = view->base; *size_ptr = size; view->mapping = dup_mapping; + view->map_protect = map_vprot; dup_mapping = 0; /* don't close it */ } else

1 0

Francois Gouget : po: Fix an accelerator key specification in the Walloon translation.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: 5f7f14182e43cf3a6f109a44f102d3f5f5ab7815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f7f14182e43cf3a6f109a44f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:41:16 2012 +0100 po: Fix an accelerator key specification in the Walloon translation. --- po/wa.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/wa.po b/po/wa.po index 3656015..c05d049 100644 --- a/po/wa.po +++ b/po/wa.po @@ -9835,7 +9835,7 @@ msgstr "&Rafacer\tDel" #: notepad.rc:46 msgid "Select &all\tCtrl+A" -msgstr "&Tchwezi totafwait" +msgstr "&Tchwezi totafwait\tCtrl+A" #: notepad.rc:47 msgid "&Time/Date\tF5"

1 0

Francois Gouget : po: A small Japanese translation update.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: 4f6697f455e76e5cef2b8d87c4eebd9fb72adf68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f6697f455e76e5cef2b8d87c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:26:35 2012 +0100 po: A small Japanese translation update. 'Unicode' and 'UTF-8' are used as is in Japanese (with thanks to Akihiro Sagawa). --- po/ja.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 224001c..d4e055b 100644 --- a/po/ja.po +++ b/po/ja.po @@ -10360,7 +10360,7 @@ msgstr "'%s' は見つかりませんでした" #: notepad.rc:82 msgid "Unicode (UTF-16)" -msgstr "" +msgstr "Unicode (UTF-16)" #: notepad.rc:83 msgid "Unicode (UTF-16 big-endian)" @@ -10368,7 +10368,7 @@ msgstr "" #: notepad.rc:84 msgid "Unicode (UTF-8)" -msgstr "" +msgstr "Unicode (UTF-8)" #: notepad.rc:91 msgid "" @@ -13579,7 +13579,7 @@ msgstr "常に手前に表示(&T)" #: winhlp32.rc:56 msgid "&About Wine Help" -msgstr "情報(&I)..." +msgstr "" #: winhlp32.rc:64 msgid "Annotation..."

1 0