January 2011 - Wine-commits

Greg Geldorp : kernel32/tests: Set TrueType console font before running tests.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 6b8812add123ab45f7a10b20d8a584a9c1ee64fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8812add123ab45f7a10b20d… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Mon Jan 10 12:11:50 2011 +0100 kernel32/tests: Set TrueType console font before running tests. ReadConsoleOutputW doesn't retrieve characters from the output buffer correctly for characters that don't have a glyph in the console font. --- dlls/kernel32/tests/console.c | 54 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 455aecd..fa26136 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1857,9 +1857,15 @@ static void test_FillConsoleOutputAttribute(HANDLE output_handle) START_TEST(console) { + static const char font_name[] = "Lucida Console"; HANDLE hConIn, hConOut; BOOL ret; CONSOLE_SCREEN_BUFFER_INFO sbi; + LONG err; + HKEY console_key; + char old_font[LF_FACESIZE]; + BOOL delete = FALSE; + DWORD size; init_function_pointers(); @@ -1870,9 +1876,55 @@ START_TEST(console) * the curses backend */ - /* first, we detach and open a fresh console to play with */ + /* ReadConsoleOutputW doesn't retrieve characters from the output buffer + * correctly for characters that don't have a glyph in the console font. So, + * we first set the console font to Lucida Console (which has a wider + * selection of glyphs available than the default raster fonts). We want + * to be able to restore the original font afterwards, so don't change + * if we can't read the original font. + */ + err = RegOpenKeyExA(HKEY_CURRENT_USER, "Console", 0, + KEY_QUERY_VALUE | KEY_SET_VALUE, &console_key); + if (err == ERROR_SUCCESS) + { + size = sizeof(old_font); + err = RegQueryValueExA(console_key, "FaceName", NULL, NULL, + (LPBYTE) old_font, &size); + if (err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND) + { + delete = (err == ERROR_FILE_NOT_FOUND); + err = RegSetValueExA(console_key, "FaceName", 0, REG_SZ, + (const BYTE *) font_name, sizeof(font_name)); + if (err != ERROR_SUCCESS) + trace("Unable to change default console font, error %d\n", err); + } + else + { + trace("Unable to query default console font, error %d\n", err); + RegCloseKey(console_key); + console_key = NULL; + } + } + else + { + trace("Unable to open HKCU\\Console, error %d\n", err); + console_key = NULL; + } + + /* Now detach and open a fresh console to play with */ FreeConsole(); ok(AllocConsole(), "Couldn't alloc console\n"); + + /* Restore default console font if needed */ + if (console_key != NULL) + { + if (delete) + err = RegDeleteValueA(console_key, "FaceName"); + else + err = RegSetValueExA(console_key, "FaceName", 0, REG_SZ, + (const BYTE *) old_font, strlen(old_font) + 1); + ok(err == ERROR_SUCCESS, "Unable to restore default console font, error %d\n", err); + } hConIn = CreateFileA("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); hConOut = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0);

1 0

Greg Geldorp : gdi32/tests: Fix some font test failures on non-English machines.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 857ebf02dfe87b14146000cee0f7a052541761f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=857ebf02dfe87b14146000cee… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Sun Jan 9 21:48:57 2011 +0100 gdi32/tests: Fix some font test failures on non-English machines. --- dlls/gdi32/tests/font.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 71a667f..bd4d97d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2228,7 +2228,9 @@ typedef struct static void expect_ff(const TEXTMETRICA *tmA, const TT_OS2_V2 *os2, WORD family, const char *name) { - ok((tmA->tmPitchAndFamily & 0xf0) == family, "%s: expected family %02x got %02x. panose %d-%d-%d-%d-...\n", + ok((tmA->tmPitchAndFamily & 0xf0) == family || + broken(PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH), + "%s: expected family %02x got %02x. panose %d-%d-%d-%d-...\n", name, family, tmA->tmPitchAndFamily, os2->panose.bFamilyType, os2->panose.bSerifStyle, os2->panose.bWeight, os2->panose.bProportion); } @@ -2387,7 +2389,9 @@ static void test_text_metrics(const LOGFONTA *lf) const char *font_name = lf->lfFaceName; DWORD cmap_first = 0, cmap_last = 0; cmap_type cmap_type; + BOOL sys_lang_non_english; + sys_lang_non_english = PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH; hdc = GetDC(0); SetLastError(0xdeadbeef); @@ -2486,7 +2490,8 @@ static void test_text_metrics(const LOGFONTA *lf) "A: tmLastChar for %s got %02x expected %02x\n", font_name, tmA.tmLastChar, expect_last_A); ok(tmA.tmBreakChar == expect_break_A, "A: tmBreakChar for %s got %02x expected %02x\n", font_name, tmA.tmBreakChar, expect_break_A); - ok(tmA.tmDefaultChar == expect_default_A, "A: tmDefaultChar for %s got %02x expected %02x\n", + ok(tmA.tmDefaultChar == expect_default_A || broken(sys_lang_non_english), + "A: tmDefaultChar for %s got %02x expected %02x\n", font_name, tmA.tmDefaultChar, expect_default_A); @@ -2513,7 +2518,8 @@ static void test_text_metrics(const LOGFONTA *lf) font_name, tmW.tmLastChar, expect_last_W); ok(tmW.tmBreakChar == expect_break_W, "W: tmBreakChar for %s got %02x expected %02x\n", font_name, tmW.tmBreakChar, expect_break_W); - ok(tmW.tmDefaultChar == expect_default_W, "W: tmDefaultChar for %s got %02x expected %02x\n", + ok(tmW.tmDefaultChar == expect_default_W || broken(sys_lang_non_english), + "W: tmDefaultChar for %s got %02x expected %02x\n", font_name, tmW.tmDefaultChar, expect_default_W); /* Test the aspect ratio while we have tmW */

1 0

Alexandre Julliard : tools: Upgrade the config.guess/config.sub scripts.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: e6c8c6a541e7d78a92595ce0ebd18f17d78896e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6c8c6a541e7d78a92595ce0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 10 13:03:02 2011 +0100 tools: Upgrade the config.guess/config.sub scripts. --- tools/config.guess | 10 ++++++++-- tools/config.sub | 20 +++++++++++++++----- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/tools/config.guess b/tools/config.guess index 115f944..4c8f032 100755 --- a/tools/config.guess +++ b/tools/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2010-04-03' +timestamp='2010-09-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -552,7 +552,7 @@ EOF echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -968,6 +968,9 @@ EOF sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-tilera-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; @@ -1231,6 +1234,9 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; diff --git a/tools/config.sub b/tools/config.sub index ae35431..3ec94f1 100755 --- a/tools/config.sub +++ b/tools/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2010-03-22' +timestamp='2010-12-11' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -124,8 +124,9 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os @@ -282,6 +283,7 @@ case $basic_machine in | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ | or32 \ @@ -377,6 +379,7 @@ case $basic_machine in | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ @@ -536,7 +539,7 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -859,6 +862,12 @@ case $basic_machine in np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -1307,7 +1316,8 @@ case $os in | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \

1 0

Alexandre Julliard : view: Convert menu and string table resources to po files.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 9d6489a346d25aeb022ce3ad3db4c853ea891151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6489a346d25aeb022ce3ad3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 10 13:25:22 2011 +0100 view: Convert menu and string table resources to po files. --- configure | 2 +- configure.ac | 2 +- po/ar.po | 34 ++++++++++++++++-- po/bg.po | 35 +++++++++++++++++-- po/cs.po | 36 +++++++++++++++++-- po/da.po | 35 ++++++++++++++++-- po/de.po | 34 ++++++++++++++++-- po/el.po | 34 ++++++++++++++++-- po/en.po | 35 +++++++++++++++++-- po/en_US.po | 34 ++++++++++++++++-- po/eo.po | 50 +++++++++++++++++++++++--- po/es.po | 34 ++++++++++++++++-- po/fa.po | 34 ++++++++++++++++-- po/fi.po | 35 +++++++++++++++++-- po/fr.po | 34 ++++++++++++++++-- po/he.po | 34 ++++++++++++++++-- po/hi.po | 34 ++++++++++++++++-- po/hu.po | 35 +++++++++++++++++-- po/it.po | 34 ++++++++++++++++-- po/ja.po | 34 ++++++++++++++++-- po/ko.po | 48 ++++++++++++++++++++----- po/lt.po | 37 +++++++++++++++++-- po/ml.po | 34 ++++++++++++++++-- po/nb_NO.po | 34 ++++++++++++++++-- po/nl.po | 34 ++++++++++++++++-- po/or.po | 34 ++++++++++++++++-- po/pa.po | 34 ++++++++++++++++-- po/pl.po | 48 ++++++++++++++++++++++--- po/pt_BR.po | 34 ++++++++++++++++-- po/pt_PT.po | 34 ++++++++++++++++-- po/ro.po | 41 +++++++++++++++++++-- po/ru.po | 34 ++++++++++++++++-- po/sk.po | 34 ++++++++++++++++-- po/sl.po | 34 ++++++++++++++++-- po/sr_RS(a)cyrillic.po | 35 +++++++++++++++++-- po/sr_RS(a)latin.po | 35 +++++++++++++++++-- po/sv.po | 34 ++++++++++++++++-- po/te.po | 34 ++++++++++++++++-- po/th.po | 34 ++++++++++++++++-- po/tr.po | 34 ++++++++++++++++-- po/uk.po | 41 +++++++++++++++++++-- po/wa.po | 34 ++++++++++++++++-- po/wine.pot | 34 ++++++++++++++++-- po/zh_CN.po | 41 +++++++++++++++++++-- po/zh_TW.po | 41 +++++++++++++++++++-- programs/view/Cs.rc | 45 ----------------------- programs/view/Cy.rc | 43 ---------------------- programs/view/Da.rc | 43 ---------------------- programs/view/De.rc | 43 ---------------------- programs/view/En.rc | 43 ---------------------- programs/view/Eo.rc | 43 ---------------------- programs/view/Es.rc | 43 ---------------------- programs/view/Fr.rc | 42 ---------------------- programs/view/He.rc | 43 ---------------------- programs/view/It.rc | 43 ---------------------- programs/view/Ja.rc | 43 ---------------------- programs/view/Ko.rc | 43 ---------------------- programs/view/Lt.rc | 43 ---------------------- programs/view/Makefile.in | 5 ++- programs/view/Nl.rc | 43 ---------------------- programs/view/No.rc | 43 ---------------------- programs/view/Pl.rc | 43 ---------------------- programs/view/Pt.rc | 74 -------------------------------------- programs/view/Ro.rc | 43 ---------------------- programs/view/Ru.rc | 43 ---------------------- programs/view/Si.rc | 43 ---------------------- programs/view/Sv.rc | 43 ---------------------- programs/view/Tr.rc | 44 ----------------------- programs/view/Uk.rc | 43 ---------------------- programs/view/Zh.rc | 86 --------------------------------------------- programs/view/view.rc | 47 ++++++++++++++++++++++++ 71 files changed, 1451 insertions(+), 1259 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d6489a346d25aeb022ce…

1 0

Alexandre Julliard : wineconsole: Convert string table resources to po files.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 389f0e7714cef183dda829ee2024db0bbfe1ee54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=389f0e7714cef183dda829ee2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 10 13:42:09 2011 +0100 wineconsole: Convert string table resources to po files. --- configure | 2 +- configure.ac | 2 +- po/ar.po | 106 ++++++++++++++++++++++- po/bg.po | 108 ++++++++++++++++++++++- po/cs.po | 122 ++++++++++++++++++++++++-- po/da.po | 123 ++++++++++++++++++++++++++- po/de.po | 133 +++++++++++++++++++++++++++- po/el.po | 106 ++++++++++++++++++++++- po/en.po | 109 +++++++++++++++++++++++- po/en_US.po | 121 +++++++++++++++++++++++++- po/eo.po | 123 +++++++++++++++++++++++++-- po/es.po | 122 ++++++++++++++++++++++++++- po/fa.po | 106 ++++++++++++++++++++++- po/fi.po | 109 +++++++++++++++++++++++- po/fr.po | 129 ++++++++++++++++++++++++++-- po/he.po | 126 ++++++++++++++++++++++++++- po/hi.po | 104 ++++++++++++++++++++++- po/hu.po | 109 +++++++++++++++++++++++- po/it.po | 128 +++++++++++++++++++++++++++- po/ja.po | 109 +++++++++++++++++++++++- po/ko.po | 117 ++++++++++++++++++++++++- po/lt.po | 126 ++++++++++++++++++++++++++- po/ml.po | 104 ++++++++++++++++++++++- po/nb_NO.po | 118 +++++++++++++++++++++++++- po/nl.po | 130 +++++++++++++++++++++++++++- po/or.po | 104 ++++++++++++++++++++++- po/pa.po | 104 ++++++++++++++++++++++- po/pl.po | 132 +++++++++++++++++++++++++++- po/pt_BR.po | 134 +++++++++++++++++++++++++++-- po/pt_PT.po | 134 +++++++++++++++++++++++++++-- po/ro.po | 133 +++++++++++++++++++++++++++- po/ru.po | 127 ++++++++++++++++++++++++++- po/sk.po | 104 ++++++++++++++++++++++- po/sl.po | 119 +++++++++++++++++++++++++- po/sr_RS(a)cyrillic.po | 109 +++++++++++++++++++++++- po/sr_RS(a)latin.po | 109 +++++++++++++++++++++++- po/sv.po | 147 ++++++++++++++++++++++++++++++-- po/te.po | 104 ++++++++++++++++++++++- po/th.po | 106 ++++++++++++++++++++++- po/tr.po | 125 +++++++++++++++++++++++++-- po/uk.po | 124 ++++++++++++++++++++++++++- po/wa.po | 106 ++++++++++++++++++++++- po/wine.pot | 104 ++++++++++++++++++++++- po/zh_CN.po | 118 ++++++++++++++++++++++++- po/zh_TW.po | 104 ++++++++++++++++++++++- programs/wineconsole/Makefile.in | 3 + programs/wineconsole/wineconsole.rc | 54 ++++++++++++ programs/wineconsole/wineconsole_Cs.rc | 19 ---- programs/wineconsole/wineconsole_Da.rc | 32 ------- programs/wineconsole/wineconsole_De.rc | 33 ------- programs/wineconsole/wineconsole_En.rc | 33 ------- programs/wineconsole/wineconsole_Eo.rc | 19 ---- programs/wineconsole/wineconsole_Es.rc | 32 ------- programs/wineconsole/wineconsole_Fr.rc | 33 ------- programs/wineconsole/wineconsole_He.rc | 33 ------- programs/wineconsole/wineconsole_Hu.rc | 19 ---- programs/wineconsole/wineconsole_It.rc | 32 ------- programs/wineconsole/wineconsole_Ko.rc | 33 ------- programs/wineconsole/wineconsole_Lt.rc | 33 ------- programs/wineconsole/wineconsole_Nl.rc | 34 -------- programs/wineconsole/wineconsole_No.rc | 33 ------- programs/wineconsole/wineconsole_Pl.rc | 33 ------- programs/wineconsole/wineconsole_Pt.rc | 70 --------------- programs/wineconsole/wineconsole_Ro.rc | 40 --------- programs/wineconsole/wineconsole_Ru.rc | 34 -------- programs/wineconsole/wineconsole_Si.rc | 34 -------- programs/wineconsole/wineconsole_Sv.rc | 33 ------- programs/wineconsole/wineconsole_Tr.rc | 19 ---- programs/wineconsole/wineconsole_Uk.rc | 33 ------- programs/wineconsole/wineconsole_Zh.rc | 52 ----------- 70 files changed, 4896 insertions(+), 966 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=389f0e7714cef183dda82…

1 0

Eric Pouech : winedbg: Try to detect jump (potentially thunk code) while getting the status.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: c22eaccd15b8e4113361c5e0cf0679c5abc2acb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c22eaccd15b8e4113361c5e0c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 8 14:09:03 2011 +0100 winedbg: Try to detect jump (potentially thunk code) while getting the status. --- programs/winedbg/symbol.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 6602785..60e1c55 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -535,7 +535,15 @@ enum dbg_line_status symbol_get_function_line_status(const ADDRESS64* addr) /* do we have some info for lin address ? */ if (!SymFromAddr(dbg_curr_process->handle, lin, &disp64, sym)) + { + ADDRESS64 jumpee; + /* some compilers insert thunks in their code without debug info associated + * take care of this situation + */ + if (be_cpu->is_jump((void*)lin, &jumpee)) + return symbol_get_function_line_status(&jumpee); return dbg_no_line_info; + } switch (sym->Tag) {

1 0

Eric Pouech : dbghelp: Better support for OOM conditions when creating source file table.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: cbd5811e90c13e2a0ba563140d6315b338b88050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbd5811e90c13e2a0ba563140… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 8 14:15:25 2011 +0100 dbghelp: Better support for OOM conditions when creating source file table. --- dlls/dbghelp/source.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/source.c b/dlls/dbghelp/source.c index c8ecf26..92c68b7 100644 --- a/dlls/dbghelp/source.c +++ b/dlls/dbghelp/source.c @@ -73,27 +73,31 @@ unsigned source_new(struct module* module, const char* base, const char* name) } if (!module->sources || (ret = source_find(module, full)) == (unsigned)-1) { + char* new; int len = strlen(full) + 1; if (module->sources_used + len + 1 > module->sources_alloc) { if (!module->sources) { module->sources_alloc = (module->sources_used + len + 1 + 255) & ~255; - module->sources = HeapAlloc(GetProcessHeap(), 0, module->sources_alloc); + new = HeapAlloc(GetProcessHeap(), 0, module->sources_alloc); } else { module->sources_alloc = max( module->sources_alloc * 2, (module->sources_used + len + 1 + 255) & ~255 ); - module->sources = HeapReAlloc(GetProcessHeap(), 0, module->sources, - module->sources_alloc); + new = HeapReAlloc(GetProcessHeap(), 0, module->sources, + module->sources_alloc); } + if (!new) goto done; + module->sources = new; } ret = module->sources_used; memcpy(module->sources + module->sources_used, full, len); module->sources_used += len; module->sources[module->sources_used] = '\0'; } +done: HeapFree(GetProcessHeap(), 0, tmp); return ret; }

1 0

Eric Pouech : dbghelp: Speed up source string creation (by using rb trees).
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: c7c8c0dea78f3f1f8a310b48fa41933e2d775e7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7c8c0dea78f3f1f8a310b48f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 8 14:15:31 2011 +0100 dbghelp: Speed up source string creation (by using rb trees). --- dlls/dbghelp/dbghelp_private.h | 3 ++ dlls/dbghelp/module.c | 2 + dlls/dbghelp/source.c | 60 ++++++++++++++++++++++++++++++++++------ 3 files changed, 56 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index bb82ad3..fb91114 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -31,6 +31,7 @@ #include "winnls.h" #include "wine/list.h" #include "wine/unicode.h" +#include "wine/rbtree.h" #include "cvconst.h" @@ -348,6 +349,7 @@ struct module_format } u; }; +extern const struct wine_rb_functions source_rb_functions; struct module { struct process* process; @@ -382,6 +384,7 @@ struct module unsigned sources_used; unsigned sources_alloc; char* sources; + struct wine_rb_tree sources_offsets_tree; }; struct process diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index adadcb7..debfd5d 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -189,6 +189,7 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->sources_used = 0; module->sources_alloc = 0; module->sources = 0; + wine_rb_init(&module->sources_offsets_tree, &source_rb_functions); return module; } @@ -638,6 +639,7 @@ BOOL module_remove(struct process* pcs, struct module* module) } hash_table_destroy(&module->ht_symbols); hash_table_destroy(&module->ht_types); + wine_rb_destroy(&module->sources_offsets_tree, NULL, NULL); HeapFree(GetProcessHeap(), 0, module->sources); HeapFree(GetProcessHeap(), 0, module->addr_sorttab); pool_destroy(&module->pool); diff --git a/dlls/dbghelp/source.c b/dlls/dbghelp/source.c index 92c68b7..a5bb86f 100644 --- a/dlls/dbghelp/source.c +++ b/dlls/dbghelp/source.c @@ -29,21 +29,55 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); +static struct module* rb_module; +struct source_rb +{ + struct wine_rb_entry entry; + unsigned source; +}; + +static void *source_rb_alloc(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static void *source_rb_realloc(void *ptr, size_t size) +{ + return HeapReAlloc(GetProcessHeap(), 0, ptr, size); +} + +static void source_rb_free(void *ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + +static int source_rb_compare(const void *key, const struct wine_rb_entry *entry) +{ + const struct source_rb *t = WINE_RB_ENTRY_VALUE(entry, const struct source_rb, entry); + + return strcmp((const char*)key, rb_module->sources + t->source); +} + +const struct wine_rb_functions source_rb_functions = +{ + source_rb_alloc, + source_rb_realloc, + source_rb_free, + source_rb_compare, +}; + /****************************************************************** * source_find * * check whether a source file has already been stored */ -static unsigned source_find(const struct module* module, const char* name) +static unsigned source_find(const char* name) { - char* ptr = module->sources; + struct wine_rb_entry* e; - while (*ptr) - { - if (strcmp(ptr, name) == 0) return ptr - module->sources; - ptr += strlen(ptr) + 1; - } - return (unsigned)-1; + e = wine_rb_get(&rb_module->sources_offsets_tree, name); + if (!e) return -1; + return WINE_RB_ENTRY_VALUE(e, struct source_rb, entry)->source; } /****************************************************************** @@ -71,10 +105,13 @@ unsigned source_new(struct module* module, const char* base, const char* name) if (tmp[bsz - 1] != '/') tmp[bsz++] = '/'; strcpy(&tmp[bsz], name); } - if (!module->sources || (ret = source_find(module, full)) == (unsigned)-1) + rb_module = module; + if (!module->sources || (ret = source_find(full)) == (unsigned)-1) { char* new; int len = strlen(full) + 1; + struct source_rb* rb; + if (module->sources_used + len + 1 > module->sources_alloc) { if (!module->sources) @@ -96,6 +133,11 @@ unsigned source_new(struct module* module, const char* base, const char* name) memcpy(module->sources + module->sources_used, full, len); module->sources_used += len; module->sources[module->sources_used] = '\0'; + if ((rb = pool_alloc(&module->pool, sizeof(*rb)))) + { + rb->source = ret; + wine_rb_put(&module->sources_offsets_tree, full, &rb->entry); + } } done: HeapFree(GetProcessHeap(), 0, tmp);

1 0

Eric Pouech : dbghelp: Restructure internal PDB information.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 1acbb1c0eded796737fc4234456ccb3abbdaeed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1acbb1c0eded796737fc42344… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 8 14:04:01 2011 +0100 dbghelp: Restructure internal PDB information. --- dlls/dbghelp/dbghelp_private.h | 19 +--- dlls/dbghelp/msc.c | 201 +++++++++++++++++++++++----------------- dlls/dbghelp/path.c | 45 +++------- 3 files changed, 134 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1acbb1c0eded796737fc4…

1 0

Eric Pouech : dbghelp: Use new file/ debug format framework to allow keeping pdb files opened.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 0693572e4c6961a58eb5fc404636e573dcc23892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0693572e4c6961a58eb5fc404… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 8 14:04:08 2011 +0100 dbghelp: Use new file/debug format framework to allow keeping pdb files opened. --- dlls/dbghelp/dbghelp_private.h | 2 + dlls/dbghelp/msc.c | 73 +++++++++++++++++++++++++++++++--------- 2 files changed, 59 insertions(+), 16 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index e2d91de..88247ec 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -326,6 +326,7 @@ enum format_info DFI_PE, DFI_MACHO, DFI_DWARF, + DFI_PDB, DFI_LAST }; @@ -343,6 +344,7 @@ struct module_format struct dwarf2_module_info_s* dwarf2_info; struct pe_module_info* pe_info; struct macho_module_info* macho_info; + struct pdb_module_info* pdb_info; } u; }; diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 1e19802..74db2e9 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -81,6 +81,14 @@ struct pdb_file_info } u; }; +/* FIXME: don't make it static */ +#define CV_MAX_MODULES 32 +struct pdb_module_info +{ + unsigned used_subfiles; + struct pdb_file_info pdb_files[CV_MAX_MODULES]; +}; + /*======================================================================== * Debug file access helper routines */ @@ -2167,6 +2175,15 @@ static void pdb_free_file(struct pdb_file_info* pdb_file) } } +static void pdb_module_remove(struct process* pcsn, struct module_format* modfmt) +{ + unsigned i; + + for (i = 0; i < modfmt->u.pdb_info->used_subfiles; i++) + pdb_free_file(&modfmt->u.pdb_info->pdb_files[i]); + HeapFree(GetProcessHeap(), 0, modfmt); +} + static void pdb_convert_types_header(PDB_TYPES* types, const BYTE* image) { memset(types, 0, sizeof(PDB_TYPES)); @@ -2447,7 +2464,7 @@ static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info* static BOOL pdb_process_internal(const struct process* pcs, const struct msc_debug_info* msc_dbg, const struct pdb_lookup* pdb_lookup, - struct pdb_file_info* pdb_file, + struct pdb_module_info* pdb_module_info, unsigned module_index); static void pdb_process_symbol_imports(const struct process* pcs, @@ -2456,6 +2473,7 @@ static void pdb_process_symbol_imports(const struct process* pcs, const void* symbols_image, const char* image, const struct pdb_lookup* pdb_lookup, + struct pdb_module_info* pdb_module_info, unsigned module_index) { if (module_index == -1 && symbols && symbols->pdbimport_size) @@ -2465,6 +2483,7 @@ static void pdb_process_symbol_imports(const struct process* pcs, const void* last; const char* ptr; int i = 0; + struct pdb_file_info sf0 = pdb_module_info->pdb_files[0]; imp = (const PDB_SYMBOL_IMPORT*)((const char*)symbols_image + sizeof(PDB_SYMBOLS) + symbols->module_size + symbols->offset_size + @@ -2479,11 +2498,11 @@ static void pdb_process_symbol_imports(const struct process* pcs, { if (module_index != -1) FIXME("Twice the entry\n"); else module_index = i; + pdb_module_info->pdb_files[i] = sf0; } else { struct pdb_lookup imp_pdb_lookup; - struct pdb_file_info pdb_file; /* FIXME: this is an import of a JG PDB file * how's a DS PDB handled ? @@ -2494,13 +2513,19 @@ static void pdb_process_symbol_imports(const struct process* pcs, imp_pdb_lookup.age = imp->Age; TRACE("got for %s: age=%u ts=%x\n", imp->filename, imp->Age, imp->TimeDateStamp); - pdb_process_internal(pcs, msc_dbg, &imp_pdb_lookup, &pdb_file, i); + pdb_process_internal(pcs, msc_dbg, &imp_pdb_lookup, pdb_module_info, i); } i++; imp = (const PDB_SYMBOL_IMPORT*)((const char*)first + ((ptr - (const char*)first + strlen(ptr) + 1 + 3) & ~3)); } + pdb_module_info->used_subfiles = i; + } + if (module_index == -1) + { + module_index = 0; + pdb_module_info->used_subfiles = 1; } - cv_current_module = &cv_zmodules[(module_index == -1) ? 0 : module_index]; + cv_current_module = &cv_zmodules[module_index]; if (cv_current_module->allowed) FIXME("Already allowed ??\n"); cv_current_module->allowed = TRUE; } @@ -2508,7 +2533,7 @@ static void pdb_process_symbol_imports(const struct process* pcs, static BOOL pdb_process_internal(const struct process* pcs, const struct msc_debug_info* msc_dbg, const struct pdb_lookup* pdb_lookup, - struct pdb_file_info* pdb_file, + struct pdb_module_info* pdb_module_info, unsigned module_index) { BOOL ret = FALSE; @@ -2518,9 +2543,11 @@ static BOOL pdb_process_internal(const struct process* pcs, char* files_image = NULL; DWORD files_size = 0; unsigned matched; + struct pdb_file_info* pdb_file; TRACE("Processing PDB file %s\n", pdb_lookup->filename); + pdb_file = &pdb_module_info->pdb_files[module_index == -1 ? 0 : module_index]; /* Open and map() .PDB file */ if ((hFile = open_pdb_file(pcs, pdb_lookup, msc_dbg->module)) == NULL || ((hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) == NULL) || @@ -2571,7 +2598,8 @@ static BOOL pdb_process_internal(const struct process* pcs, } } - pdb_process_symbol_imports(pcs, msc_dbg, &symbols, symbols_image, image, pdb_lookup, module_index); + pdb_process_symbol_imports(pcs, msc_dbg, &symbols, symbols_image, image, + pdb_lookup, pdb_module_info, module_index); pdb_process_types(msc_dbg, image, pdb_file); /* Read global symbol table */ @@ -2604,7 +2632,7 @@ static BOOL pdb_process_internal(const struct process* pcs, codeview_snarf_linetab(msc_dbg, modimage + sfile.symbol_size, sfile.lineno_size, - pdb_lookup->kind == PDB_JG); + pdb_file->kind == PDB_JG); if (files_image) codeview_snarf_linetab2(msc_dbg, modimage + sfile.symbol_size + sfile.lineno_size, pdb_get_file_size(pdb_file, sfile.file) - sfile.symbol_size - sfile.lineno_size, @@ -2621,13 +2649,12 @@ static BOOL pdb_process_internal(const struct process* pcs, { codeview_snarf_public(msc_dbg, globalimage, 0, pdb_get_file_size(pdb_file, symbols.gsym_file)); - pdb_free(globalimage); } } else - pdb_process_symbol_imports(pcs, msc_dbg, NULL, NULL, image, pdb_lookup, - module_index); + pdb_process_symbol_imports(pcs, msc_dbg, NULL, NULL, image, + pdb_lookup, pdb_module_info, module_index); ret = TRUE; leave: @@ -2648,20 +2675,34 @@ static BOOL pdb_process_file(const struct process* pcs, struct pdb_lookup* pdb_lookup) { BOOL ret; - struct pdb_file_info pdb_file; + struct module_format* modfmt; + struct pdb_module_info* pdb_module_info; + + modfmt = HeapAlloc(GetProcessHeap(), 0, + sizeof(struct module_format) + sizeof(struct pdb_module_info)); + if (!modfmt) return FALSE; + + pdb_module_info = (void*)(modfmt + 1); + msc_dbg->module->format_info[DFI_PDB] = modfmt; + modfmt->module = msc_dbg->module; + modfmt->remove = pdb_module_remove; + modfmt->loc_compute = NULL; + modfmt->u.pdb_info = pdb_module_info; memset(cv_zmodules, 0, sizeof(cv_zmodules)); codeview_init_basic_types(msc_dbg->module); - ret = pdb_process_internal(pcs, msc_dbg, pdb_lookup, &pdb_file, -1); + ret = pdb_process_internal(pcs, msc_dbg, pdb_lookup, + msc_dbg->module->format_info[DFI_PDB]->u.pdb_info, -1); codeview_clear_type_table(); if (ret) { + struct pdb_module_info* pdb_info = msc_dbg->module->format_info[DFI_PDB]->u.pdb_info; msc_dbg->module->module.SymType = SymCv; - if (pdb_lookup->kind == PDB_JG) - msc_dbg->module->module.PdbSig = pdb_file.u.jg.timestamp; + if (pdb_info->pdb_files[0].kind == PDB_JG) + msc_dbg->module->module.PdbSig = pdb_info->pdb_files[0].u.jg.timestamp; else - msc_dbg->module->module.PdbSig70 = pdb_file.u.ds.guid; - msc_dbg->module->module.PdbAge = pdb_file.age; + msc_dbg->module->module.PdbSig70 = pdb_info->pdb_files[0].u.ds.guid; + msc_dbg->module->module.PdbAge = pdb_info->pdb_files[0].age; MultiByteToWideChar(CP_ACP, 0, pdb_lookup->filename, -1, msc_dbg->module->module.LoadedPdbName, sizeof(msc_dbg->module->module.LoadedPdbName) / sizeof(WCHAR));

1 0