wine-commits October 2008

wine-commits@winehq.org

3 participants
1216 discussions

Eric Pouech : dbghelp: Now fully reading the leafs as variant for constants .
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: 1a1be65e8eb9aba449112ff57c85e1353f666a05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a1be65e8eb9aba449112ff57… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Sep 29 21:31:53 2008 +0200 dbghelp: Now fully reading the leafs as variant for constants. Also added missing creation for V3 constants. --- dlls/dbghelp/msc.c | 136 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 130 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index d236b16..c2cd107 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -169,6 +169,132 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_32PHRESULT]= &symt_new_pointer(module, cv_basic_types[T_HRESULT])->symt; } +static int leaf_as_variant(VARIANT* v, const unsigned short int* leaf) +{ + unsigned short int type = *leaf++; + int length = 2; + + if (type < LF_NUMERIC) + { + v->n1.n2.vt = VT_UINT; + v->n1.n2.n3.uintVal = type; + } + else + { + switch (type) + { + case LF_CHAR: + length += 1; + v->n1.n2.vt = VT_I1; + v->n1.n2.n3.cVal = *(const char*)leaf; + break; + + case LF_SHORT: + length += 2; + v->n1.n2.vt = VT_I2; + v->n1.n2.n3.iVal = *(const short*)leaf; + break; + + case LF_USHORT: + length += 2; + v->n1.n2.vt = VT_UI2; + v->n1.n2.n3.uiVal = *leaf; + break; + + case LF_LONG: + length += 4; + v->n1.n2.vt = VT_I4; + v->n1.n2.n3.lVal = *(const int*)leaf; + break; + + case LF_ULONG: + length += 4; + v->n1.n2.vt = VT_UI4; + v->n1.n2.n3.uiVal = *(const unsigned int*)leaf; + break; + + case LF_QUADWORD: + length += 8; + v->n1.n2.vt = VT_I8; + v->n1.n2.n3.llVal = *(const long long int*)leaf; + break; + + case LF_UQUADWORD: + length += 8; + v->n1.n2.vt = VT_UI8; + v->n1.n2.n3.ullVal = *(const long long unsigned int*)leaf; + break; + + case LF_REAL32: + length += 4; + v->n1.n2.vt = VT_R4; + v->n1.n2.n3.fltVal = *(const float*)leaf; + break; + + case LF_REAL48: + FIXME("Unsupported numeric leaf type %04x\n", type); + length += 6; + v->n1.n2.vt = VT_EMPTY; /* FIXME */ + break; + + case LF_REAL64: + length += 8; + v->n1.n2.vt = VT_R8; + v->n1.n2.n3.fltVal = *(const double*)leaf; + break; + + case LF_REAL80: + FIXME("Unsupported numeric leaf type %04x\n", type); + length += 10; + v->n1.n2.vt = VT_EMPTY; /* FIXME */ + break; + + case LF_REAL128: + FIXME("Unsupported numeric leaf type %04x\n", type); + length += 16; + v->n1.n2.vt = VT_EMPTY; /* FIXME */ + break; + + case LF_COMPLEX32: + FIXME("Unsupported numeric leaf type %04x\n", type); + length += 4; + v->n1.n2.vt = VT_EMPTY; /* FIXME */ + break; + + case LF_COMPLEX64: + FIXME("Unsupported numeric leaf type %04x\n", type); + length += 8; + v->n1.n2.vt = VT_EMPTY; /* FIXME */ + break; + + case LF_COMPLEX80: + FIXME("Unsupported numeric leaf type %04x\n", type); + length += 10; + v->n1.n2.vt = VT_EMPTY; /* FIXME */ + break; + + case LF_COMPLEX128: + FIXME("Unsupported numeric leaf type %04x\n", type); + length += 16; + v->n1.n2.vt = VT_EMPTY; /* FIXME */ + break; + + case LF_VARSTRING: + FIXME("Unsupported numeric leaf type %04x\n", type); + length += 2 + *leaf; + v->n1.n2.vt = VT_EMPTY; /* FIXME */ + break; + + default: + FIXME("Unknown numeric leaf type %04x\n", type); + v->n1.n2.vt = VT_EMPTY; /* FIXME */ + break; + } + } + + return length; +} + static int numeric_leaf(int* value, const unsigned short int* leaf) { unsigned short int type = *leaf++; @@ -1621,8 +1747,7 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root struct symt* se; VARIANT v; - v.n1.n2.vt = VT_I4; - vlen = numeric_leaf(&v.n1.n2.n3.intVal, &sym->constant_v1.cvalue); + vlen = leaf_as_variant(&v, &sym->constant_v1.cvalue); name = (const struct p_string*)((const char*)&sym->constant_v1.cvalue + vlen); se = codeview_get_type(sym->constant_v1.type, FALSE); @@ -1639,8 +1764,7 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root struct symt* se; VARIANT v; - v.n1.n2.vt = VT_I4; - vlen = numeric_leaf(&v.n1.n2.n3.intVal, &sym->constant_v2.cvalue); + vlen = leaf_as_variant(&v, &sym->constant_v2.cvalue); name = (const struct p_string*)((const char*)&sym->constant_v2.cvalue + vlen); se = codeview_get_type(sym->constant_v2.type, FALSE); @@ -1657,14 +1781,14 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root struct symt* se; VARIANT v; - v.n1.n2.vt = VT_I4; - vlen = numeric_leaf(&v.n1.n2.n3.intVal, &sym->constant_v3.cvalue); + vlen = leaf_as_variant(&v, &sym->constant_v3.cvalue); name = (const char*)&sym->constant_v3.cvalue + vlen; se = codeview_get_type(sym->constant_v3.type, FALSE); TRACE("S-Constant-V3 %u %s %x\n", v.n1.n2.n3.intVal, name, sym->constant_v3.type); /* FIXME: we should add this as a constant value */ + symt_new_constant(msc_dbg->module, compiland, name, se, &v); } break;

1 0

Eric Pouech : winedump: Improved a bit the MS Tool V3 description.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: da6d5eaa8b548b43cfb56e91f4f51eb6ac3021a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da6d5eaa8b548b43cfb56e91f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Sep 29 21:31:47 2008 +0200 winedump: Improved a bit the MS Tool V3 description. --- tools/winedump/msc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 864beff..c49406e 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1231,7 +1231,7 @@ int codeview_dump_symbols(const void* root, unsigned long size) const char* x1; const char* x2 = (const char*)&ptr[9]; /* FIXME: what are all those values for ? */ - printf("\tTool V3 ??? %x-%x-%x-%x-%x-%x-%x-%x-%x %s\n", + printf("\tTool V3 unk=%04x%04x%04x front=%d.%d.%d.0 back=%d.%d.%d.0 %s\n", ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7], ptr[8], x2); while (*(x1 = x2 + strlen(x2) + 1))

1 0

Eric Pouech : dbghelp,winedump: Added support for symbol symbol.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: 81df3de0fc2c3e808045c02fc34bac4eb6b4a459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81df3de0fc2c3e808045c02fc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Sep 29 21:31:41 2008 +0200 dbghelp,winedump: Added support for symbol symbol. --- dlls/dbghelp/msc.c | 1 + include/wine/mscvpdb.h | 1 + tools/winedump/msc.c | 5 +++++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 661783f..d236b16 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1733,6 +1733,7 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root case S_SECUCOOKIE_V3: case S_SECTINFO_V3: case S_SUBSECTINFO_V3: + case S_ENTRYPOINT_V3: case 0x1139: TRACE("Unsupported symbol id %x\n", sym->generic.id); break; diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 00f7214..2136ab8 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1619,6 +1619,7 @@ union codeview_symbol #define S_PUB_FUNC2_V3 0x1127 #define S_SECTINFO_V3 0x1136 #define S_SUBSECTINFO_V3 0x1137 +#define S_ENTRYPOINT_V3 0x1138 #define S_SECUCOOKIE_V3 0x113A #define S_MSTOOLINFO_V3 0x113C #define S_MSTOOLENV_V3 0x113D diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 3bc1856..864beff 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1299,6 +1299,11 @@ int codeview_dump_symbols(const void* root, unsigned long size) (const char*)sym + 18); break; + case S_ENTRYPOINT_V3: + printf("\tSEntryPoint: id=%x '%s'\n", + *(unsigned*)((const char*)sym + 4), (const char*)sym + 8); + break; + default: printf(">>> Unsupported symbol-id %x sz=%d\n", sym->generic.id, sym->generic.len + 2); dump_data((const void*)sym, sym->generic.len + 2, " ");

1 0

Eric Pouech : dbghelp,winedump: Added support for symbol 0x113c.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: 028956d1feb8c5056cb7b759932e412ad829c49b URL: http://source.winehq.org/git/wine.git/?a=commit;h=028956d1feb8c5056cb7b7599… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Sep 29 21:31:35 2008 +0200 dbghelp,winedump: Added support for symbol 0x113c. --- dlls/dbghelp/msc.c | 1 + include/wine/mscvpdb.h | 1 + tools/winedump/msc.c | 12 ++++++++++++ 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 1ab322f..661783f 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1714,6 +1714,7 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root break; case S_MSTOOL_V3: /* just to silence a few warnings */ + case S_MSTOOLINFO_V3: case S_MSTOOLENV_V3: break; diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 71ec9e6..00f7214 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1620,6 +1620,7 @@ union codeview_symbol #define S_SECTINFO_V3 0x1136 #define S_SUBSECTINFO_V3 0x1137 #define S_SECUCOOKIE_V3 0x113A +#define S_MSTOOLINFO_V3 0x113C #define S_MSTOOLENV_V3 0x113D /* ======================================== * diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index f5dc220..3bc1856 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1243,6 +1243,18 @@ int codeview_dump_symbols(const void* root, unsigned long size) } break; + case S_MSTOOLINFO_V3: + { + const unsigned short* ptr = ((const unsigned short*)sym) + 2; + + printf("\tTool info V3: unk=%04x%04x%04x front=%d.%d.%d.%d back=%d.%d.%d.%d %s\n", + ptr[0], ptr[1], ptr[2], + ptr[3], ptr[4], ptr[5], ptr[6], + ptr[7], ptr[8], ptr[9], ptr[10], + (const char*)(ptr + 11)); + } + break; + case S_MSTOOLENV_V3: { const char* x1 = (const char*)sym + 4 + 1;

1 0

Eric Pouech : dbghelp,winedump: Added support for 0x113d symbol.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: 82d1845d85e070bffe7d83ca18a8661daf47d2c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d1845d85e070bffe7d83ca1… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Sep 29 21:31:29 2008 +0200 dbghelp,winedump: Added support for 0x113d symbol. --- dlls/dbghelp/msc.c | 1 + include/wine/mscvpdb.h | 1 + tools/winedump/msc.c | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 02f9072..1ab322f 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1714,6 +1714,7 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root break; case S_MSTOOL_V3: /* just to silence a few warnings */ + case S_MSTOOLENV_V3: break; case S_SSEARCH_V1: diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index cf66053..71ec9e6 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1620,6 +1620,7 @@ union codeview_symbol #define S_SECTINFO_V3 0x1136 #define S_SUBSECTINFO_V3 0x1137 #define S_SECUCOOKIE_V3 0x113A +#define S_MSTOOLENV_V3 0x113D /* ======================================== * * Line number information diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index c788f6c..f5dc220 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1243,6 +1243,22 @@ int codeview_dump_symbols(const void* root, unsigned long size) } break; + case S_MSTOOLENV_V3: + { + const char* x1 = (const char*)sym + 4 + 1; + const char* x2; + + printf("\tTool conf V3\n"); + while (*x1) + { + x2 = x1 + strlen(x1) + 1; + if (!*x2) break; + printf("\t\t%s: %s\n", x1, x2); + x1 = x2 + strlen(x2) + 1; + } + } + break; + case S_ALIGN_V1: /* simply skip it */ break;

1 0

Eric Pouech : dbghelp: Silence symbol 0x1139.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: 1a6e018f0e46db80554f9ba1b2c8ccaedb3142b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a6e018f0e46db80554f9ba1b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Sep 29 21:31:21 2008 +0200 dbghelp: Silence symbol 0x1139. --- dlls/dbghelp/msc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index c5858a2..02f9072 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1731,6 +1731,7 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root case S_SECUCOOKIE_V3: case S_SECTINFO_V3: case S_SUBSECTINFO_V3: + case 0x1139: TRACE("Unsupported symbol id %x\n", sym->generic.id); break;

1 0

Eric Pouech : winedump: Add preliminary dumping of 0x1136 and 0x1137 symbols.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: cff33cedf5ea1d59bd252fad3e4f15a4f3d90d86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cff33cedf5ea1d59bd252fad3… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Sep 29 21:31:15 2008 +0200 winedump: Add preliminary dumping of 0x1136 and 0x1137 symbols. --- dlls/dbghelp/msc.c | 2 ++ include/wine/mscvpdb.h | 2 ++ tools/winedump/msc.c | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 8c557b1..c5858a2 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1729,6 +1729,8 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root case 0x112c: case S_FUNCINFO_V2: case S_SECUCOOKIE_V3: + case S_SECTINFO_V3: + case S_SUBSECTINFO_V3: TRACE("Unsupported symbol id %x\n", sym->generic.id); break; diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index b7d870f..cf66053 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1617,6 +1617,8 @@ union codeview_symbol #define S_MSTOOL_V3 0x1116 /* compiler command line options and build information */ #define S_PUB_FUNC1_V3 0x1125 /* didn't get the difference between the two */ #define S_PUB_FUNC2_V3 0x1127 +#define S_SECTINFO_V3 0x1136 +#define S_SUBSECTINFO_V3 0x1137 #define S_SECUCOOKIE_V3 0x113A /* ======================================== * diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 56c2f5b..c788f6c 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1252,6 +1252,25 @@ int codeview_dump_symbols(const void* root, unsigned long size) sym->ssearch_v1.segment, sym->ssearch_v1.offset); break; + case S_SECTINFO_V3: + printf("\tSSection Info: seg=%04x ?=%04x rva=%08x size=%08x attr=%08x %s\n", + *(unsigned short*)((const char*)sym + 4), + *(unsigned short*)((const char*)sym + 6), + *(unsigned*)((const char*)sym + 8), + *(unsigned*)((const char*)sym + 12), + *(unsigned*)((const char*)sym + 16), + (const char*)sym + 20); + break; + + case S_SUBSECTINFO_V3: + printf("\tSSubSection Info: addr=%04x:%08x size=%08x attr=%08x %s\n", + *(unsigned short*)((const char*)sym + 16), + *(unsigned*)((const char*)sym + 12), + *(unsigned*)((const char*)sym + 4), + *(unsigned*)((const char*)sym + 8), + (const char*)sym + 18); + break; + default: printf(">>> Unsupported symbol-id %x sz=%d\n", sym->generic.id, sym->generic.len + 2); dump_data((const void*)sym, sym->generic.len + 2, " ");

1 0

Eric Pouech : winedump: Dump a bit more of information from procedures.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: ff1767863f63691f0f586d371cdaac36d4272a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff1767863f63691f0f586d371… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Sep 29 21:31:08 2008 +0200 winedump: Dump a bit more of information from procedures. --- tools/winedump/msc.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index da5e602..56c2f5b 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -930,11 +930,14 @@ int codeview_dump_symbols(const void* root, unsigned long size) /* Global and static functions */ case S_GPROC_V1: case S_LPROC_V1: - printf("\tS-%s-Proc V1: '%s' (%04x:%08x#%x) type:%x\n", + printf("\tS-%s-Proc V1: '%s' (%04x:%08x#%x) type:%x attr:%x\n", sym->generic.id == S_GPROC_V1 ? "Global" : "-Local", p_string(&sym->proc_v1.p_name), sym->proc_v1.segment, sym->proc_v1.offset, - sym->proc_v1.proc_len, sym->proc_v1.proctype); + sym->proc_v1.proc_len, sym->proc_v1.proctype, + sym->proc_v1.flags); + printf("\t Debug: start=%08x end=%08x\n", + sym->proc_v1.debug_start, sym->proc_v1.debug_end); if (nest_block) { printf(">>> prev func '%s' still has nest_block %u count\n", curr_func, nest_block); @@ -944,18 +947,18 @@ int codeview_dump_symbols(const void* root, unsigned long size) /* EPP unsigned int pparent; */ /* EPP unsigned int pend; */ /* EPP unsigned int next; */ -/* EPP unsigned int debug_start; */ -/* EPP unsigned int debug_end; */ -/* EPP unsigned char flags; */ break; case S_GPROC_V2: case S_LPROC_V2: - printf("\tS-%s-Proc V2: '%s' (%04x:%08x#%x) type:%x\n", + printf("\tS-%s-Proc V2: '%s' (%04x:%08x#%x) type:%x attr:%x\n", sym->generic.id == S_GPROC_V2 ? "Global" : "-Local", p_string(&sym->proc_v2.p_name), sym->proc_v2.segment, sym->proc_v2.offset, - sym->proc_v2.proc_len, sym->proc_v2.proctype); + sym->proc_v2.proc_len, sym->proc_v2.proctype, + sym->proc_v2.flags); + printf("\t Debug: start=%08x end=%08x\n", + sym->proc_v2.debug_start, sym->proc_v2.debug_end); if (nest_block) { printf(">>> prev func '%s' still has nest_block %u count\n", curr_func, nest_block); @@ -965,18 +968,18 @@ int codeview_dump_symbols(const void* root, unsigned long size) /* EPP unsigned int pparent; */ /* EPP unsigned int pend; */ /* EPP unsigned int next; */ -/* EPP unsigned int debug_start; */ -/* EPP unsigned int debug_end; */ -/* EPP unsigned char flags; */ break; case S_LPROC_V3: case S_GPROC_V3: - printf("\tS-%s-Procedure V3 '%s' (%04x:%08x#%x) type:%x\n", + printf("\tS-%s-Procedure V3 '%s' (%04x:%08x#%x) type:%x attr:%x\n", sym->generic.id == S_GPROC_V3 ? "Global" : "Local", sym->proc_v3.name, sym->proc_v3.segment, sym->proc_v3.offset, - sym->proc_v3.proc_len, sym->proc_v3.proctype); + sym->proc_v3.proc_len, sym->proc_v3.proctype, + sym->proc_v3.flags); + printf("\t Debug: start=%08x end=%08x\n", + sym->proc_v3.debug_start, sym->proc_v3.debug_end); if (nest_block) { printf(">>> prev func '%s' still has nest_block %u count\n", curr_func, nest_block); @@ -986,9 +989,6 @@ int codeview_dump_symbols(const void* root, unsigned long size) /* EPP unsigned int pparent; */ /* EPP unsigned int pend; */ /* EPP unsigned int next; */ -/* EPP unsigned int debug_start; */ -/* EPP unsigned int debug_end; */ -/* EPP unsigned char flags; */ break; /* Function parameters and stack variables */

1 0

Eric Pouech : winedump: Added support for dumping long long constants.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: 3333ea8dc6a9bad5cc01ea808ac132df8777539f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3333ea8dc6a9bad5cc01ea808… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Sep 29 21:31:01 2008 +0200 winedump: Added support for dumping long long constants. --- tools/winedump/msc.c | 96 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 58 insertions(+), 38 deletions(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 522507d..da5e602 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -57,14 +57,20 @@ static const char* p_string(const struct p_string* s) return tmp; } -static int numeric_leaf(int* value, const unsigned short int* leaf) +union full_value +{ + int i; + long long unsigned llu; +}; + +static int full_numeric_leaf(union full_value* fv, const unsigned short int* leaf) { unsigned short int type = *leaf++; int length = 2; if (type < LF_NUMERIC) { - *value = type; + fv->i = type; } else { @@ -72,105 +78,117 @@ static int numeric_leaf(int* value, const unsigned short int* leaf) { case LF_CHAR: length += 1; - *value = *(const char*)leaf; + fv->i = *(const char*)leaf; break; case LF_SHORT: length += 2; - *value = *(const short*)leaf; + fv->i = *(const short*)leaf; break; case LF_USHORT: length += 2; - *value = *(const unsigned short*)leaf; + fv->i = *(const unsigned short*)leaf; break; case LF_LONG: length += 4; - *value = *(const int*)leaf; + fv->i = *(const int*)leaf; break; case LF_ULONG: length += 4; - *value = *(const unsigned int*)leaf; + fv->i = *(const unsigned int*)leaf; break; case LF_QUADWORD: + length += 8; + fv->llu = *(const long long int*)leaf; + break; + case LF_UQUADWORD: length += 8; - printf(">>> unsupported leaf value\n"); - *value = 0; /* FIXME */ + fv->llu = *(const long long unsigned int*)leaf; break; case LF_REAL32: length += 4; - printf(">>> unsupported leaf value\n"); - *value = 0; /* FIXME */ + printf(">>> unsupported leaf value %04x\n", type); + fv->i = 0; /* FIXME */ break; case LF_REAL48: length += 6; - *value = 0; /* FIXME */ - printf(">>> unsupported leaf value\n"); + fv->i = 0; /* FIXME */ + printf(">>> unsupported leaf value %04x\n", type); break; case LF_REAL64: length += 8; - *value = 0; /* FIXME */ - printf(">>> unsupported leaf value\n"); + fv->i = 0; /* FIXME */ + printf(">>> unsupported leaf value %04x\n", type); break; case LF_REAL80: length += 10; - *value = 0; /* FIXME */ - printf(">>> unsupported leaf value\n"); + fv->i = 0; /* FIXME */ + printf(">>> unsupported leaf value %04x\n", type); break; case LF_REAL128: length += 16; - *value = 0; /* FIXME */ - printf(">>> unsupported leaf value\n"); + fv->i = 0; /* FIXME */ + printf(">>> unsupported leaf value %04x\n", type); break; case LF_COMPLEX32: length += 4; - *value = 0; /* FIXME */ - printf(">>> unsupported leaf value\n"); + fv->i = 0; /* FIXME */ + printf(">>> unsupported leaf value %04x\n", type); break; case LF_COMPLEX64: length += 8; - *value = 0; /* FIXME */ - printf(">>> unsupported leaf value\n"); + fv->i = 0; /* FIXME */ + printf(">>> unsupported leaf value %04x\n", type); break; case LF_COMPLEX80: length += 10; - *value = 0; /* FIXME */ - printf(">>> unsupported leaf value\n"); + fv->i = 0; /* FIXME */ + printf(">>> unsupported leaf value %04x\n", type); break; case LF_COMPLEX128: length += 16; - *value = 0; /* FIXME */ - printf(">>> unsupported leaf value\n"); + fv->i = 0; /* FIXME */ + printf(">>> unsupported leaf value %04x\n", type); break; case LF_VARSTRING: length += 2 + *leaf; - *value = 0; /* FIXME */ - printf(">>> unsupported leaf value\n"); + fv->i = 0; /* FIXME */ + printf(">>> unsupported leaf value %04x\n", type); break; default: printf(">>> Unsupported numeric leaf-id %04x\n", type); - *value = 0; + fv->i = 0; break; } } return length; } +static int numeric_leaf(int* value, const unsigned short int* leaf) +{ + union full_value fv; + int len = len = full_numeric_leaf(&fv, leaf); + + *value = fv.i; + return len; +} + static const char* get_attr(unsigned attr) { static char tmp[256]; @@ -1149,23 +1167,25 @@ int codeview_dump_symbols(const void* root, unsigned long size) case S_CONSTANT_V2: { - int val, vlen; + int vlen; + union full_value fv; - vlen = numeric_leaf(&val, &sym->constant_v2.cvalue); - printf("\tS-Constant V2 '%s' = %u type:%x\n", + vlen = full_numeric_leaf(&fv, &sym->constant_v2.cvalue); + printf("\tS-Constant V2 '%s' = 0x%x%08x type:%x\n", p_string(PSTRING(&sym->constant_v2.cvalue, vlen)), - val, sym->constant_v2.type); + (unsigned)(fv.llu >> 32), (unsigned)fv.llu, sym->constant_v2.type); } break; case S_CONSTANT_V3: { - int val, vlen; + int vlen; + union full_value fv; - vlen = numeric_leaf(&val, &sym->constant_v3.cvalue); - printf("\tS-Constant V3 '%s' = %u type:%x\n", + vlen = full_numeric_leaf(&fv, &sym->constant_v3.cvalue); + printf("\tS-Constant V3 '%s' = 0x%x%08x type:%x\n", (const char*)&sym->constant_v3.cvalue + vlen, - val, sym->constant_v3.type); + (unsigned)(fv.llu >> 32), (unsigned)fv.llu, sym->constant_v3.type); } break;

1 0

Eric Pouech : dbghelp,winedump: Added support for symbol 0x1012.
by Alexandre Julliard 01 Oct '08

01 Oct '08

Module: wine Branch: master Commit: 076dcc845f313a4177459df04800f995c06e92e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=076dcc845f313a4177459df04… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Sep 29 21:30:55 2008 +0200 dbghelp,winedump: Added support for symbol 0x1012. --- dlls/dbghelp/msc.c | 1 + include/wine/mscvpdb.h | 18 +++++++++++++++--- tools/winedump/msc.c | 13 +++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 6ae4fdf..8c557b1 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1727,6 +1727,7 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root /* the symbols we can safely ignore for now */ case 0x112c: + case S_FUNCINFO_V2: case S_SECUCOOKIE_V3: TRACE("Unsupported symbol id %x\n", sym->generic.id); break; diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 602453e..b7d870f 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1530,6 +1530,20 @@ union codeview_symbol unsigned int offset; unsigned int unknown; } security_cookie_v3; + + struct + { + short int len; + short int id; + unsigned int unknown1; /* maybe size (of what ?) */ + unsigned int unknown2; + unsigned int unknown3; + unsigned int unknown4; /* maybe size (of what ?) */ + unsigned int unknown5; /* maybe address <offset and segment> (of what ?) */ + unsigned short unknown6; + unsigned short flags; + unsigned int unknown7; + } func_info_v2; }; #define S_COMPILAND_V1 0x0001 @@ -1583,9 +1597,7 @@ union codeview_symbol #define S_REGREL_V2 0x100d #define S_LTHREAD_V2 0x100e #define S_GTHREAD_V2 0x100f -#if 0 -#define S_XXXXXXXXX_32 0x1012 /* seems linked to a function, content unknown */ -#endif +#define S_FUNCINFO_V2 0x1012 #define S_COMPILAND_V2 0x1013 #define S_COMPILAND_V3 0x1101 diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 44f907e..522507d 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1033,6 +1033,19 @@ int codeview_dump_symbols(const void* root, unsigned long size) nest_block++; break; + /* Additional function information */ + case S_FUNCINFO_V2: + printf("\tFunction info V2 unk1:%x unk2:%x unk3:%x unk4:%x unk5:%x unk6:%x flags:%04x unk7:%x\n", + sym->func_info_v2.unknown1, + sym->func_info_v2.unknown2, + sym->func_info_v2.unknown3, + sym->func_info_v2.unknown4, + sym->func_info_v2.unknown5, + sym->func_info_v2.unknown6, + sym->func_info_v2.flags, + sym->func_info_v2.unknown7); + break; + case S_SECUCOOKIE_V3: printf("\tSecurity Cookie V3 @%d unk:%x\n", sym->security_cookie_v3.offset, sym->security_cookie_v3.unknown);

1 0

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 October 2008