dbghelp: Add even more symbol types

André Hentschel nerv at dawncrow.de
Tue Nov 10 11:10:16 CST 2015


Signed-off-by: André Hentschel <nerv at dawncrow.de>
---
 dlls/dbghelp/msc.c     | 26 +++++++++----------
 include/wine/mscvpdb.h | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c
index b9aebe1..2c1f03b 100644
--- a/dlls/dbghelp/msc.c
+++ b/dlls/dbghelp/msc.c
@@ -2005,24 +2005,24 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* roo
             break;
 
         /* the symbols we can safely ignore for now */
-        case 0x112c:
+        case S_TRAMPOLINE:
         case S_FRAMEINFO_V2:
         case S_SECUCOOKIE_V3:
         case S_SECTINFO_V3:
         case S_SUBSECTINFO_V3:
         case S_ENTRYPOINT_V3:
-        case 0x113e:
-        case 0x1139:
-        case 0x1141:
-        case 0x1142:
-        case 0x1143:
-        case 0x1144:
-        case 0x114c:
-        case 0x114d:
-        case 0x114e:
-        case 0x1145:
-        case 0x115a:
-        case 0x1153:
+        case S_LOCAL_VS2013:
+        case S_CALLSITEINFO:
+        case S_DEFRANGE_REGISTER:
+        case S_DEFRANGE_FRAMEPOINTER_REL:
+        case S_DEFRANGE_SUBFIELD_REGISTER:
+        case S_FPOFF_VS2013:
+        case S_DEFRANGE_REGISTER_REL:
+        case S_BUILDINFO:
+        case S_INLINESITE:
+        case S_INLINESITE_END:
+        case S_FILESTATIC:
+        case S_CALLEES:
             TRACE("Unsupported symbol id %x\n", sym->generic.id);
             break;
 
diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h
index 4812a3f..7e06a49 100644
--- a/include/wine/mscvpdb.h
+++ b/include/wine/mscvpdb.h
@@ -1677,10 +1677,13 @@ union codeview_symbol
 #define S_COMPILAND_V3  0x1101
 #define S_THUNK_V3      0x1102
 #define S_BLOCK_V3      0x1103
+#define S_WITH_V3       0x1104
 #define S_LABEL_V3      0x1105
 #define S_REGISTER_V3   0x1106
 #define S_CONSTANT_V3   0x1107
 #define S_UDT_V3        0x1108
+#define S_COBOLUDT_V3   0x1109
+#define S_MANYREG_V3    0x110A
 #define S_BPREL_V3      0x110B
 #define S_LDATA_V3      0x110C
 #define S_GDATA_V3      0x110D
@@ -1690,20 +1693,85 @@ union codeview_symbol
 #define S_REGREL_V3     0x1111
 #define S_LTHREAD_V3    0x1112
 #define S_GTHREAD_V3    0x1113
+#define S_LPROCMIPS     0x1114
+#define S_GPROCMIPS     0x1115
 #define S_MSTOOL_V3     0x1116  /* compiler command line options and build information */
+#define S_MANYREG2      0x1117
+#define S_LPROCIA64     0x1118
+#define S_GPROCIA64     0x1119
+#define S_LOCALSLOT     0x111A
+#define S_PARAMSLOT     0x111B
+#define S_LMANDATA      0x111C
+#define S_GMANDATA      0x111D
+#define S_MANFRAMEREL   0x111E
+#define S_MANREGISTER   0x111F
+#define S_MANSLOT       0x1120
+#define S_MANMANYREG    0x1121
+#define S_MANREGREL     0x1122
+#define S_MANMANYREG2   0x1123
+#define S_UNAMESPACE    0x1124
 #define S_PUB_FUNC1_V3  0x1125  /* didn't get the difference between the two */
+#define S_DATAREF_V3    0x1126
 #define S_PUB_FUNC2_V3  0x1127
+#define S_ANNOTATIONREF 0x1128
+#define S_TOKENREF      0x1129
+#define S_GMANPROC      0x112A
+#define S_LMANPROC      0x112B
+#define S_TRAMPOLINE    0x112C
+#define S_MANCONSTANT   0x112D
+#define S_ATTR_FRAMEREL 0x112E
+#define S_ATTR_REGISTER 0x112F
+#define S_ATTR_REGREL   0x1130
+#define S_ATTR_MANYREG  0x1131
+#define S_SEPCODE       0x1132
+#define S_LOCAL_2005    0x1133
+#define S_DEFRANGE_2005 0x1134
+#define S_DEFRANGE2_2005 0x1135
 #define S_SECTINFO_V3   0x1136
 #define S_SUBSECTINFO_V3 0x1137
 #define S_ENTRYPOINT_V3 0x1138
+#define S_CALLSITEINFO  0x1139
 #define S_SECUCOOKIE_V3 0x113A
+#define S_DISCARDED     0x113B
 #define S_MSTOOLINFO_V3 0x113C
 #define S_MSTOOLENV_V3  0x113D
 
 #define S_LOCAL_VS2013      0x113E
+#define S_DEFRANGE_VS2013   0x113F
+#define S_DEFRANGE_SUBFIELD 0x1140
+#define S_DEFRANGE_REGISTER 0x1141
+#define S_DEFRANGE_FRAMEPOINTER_REL     0x1142
+#define S_DEFRANGE_SUBFIELD_REGISTER    0x1143
 #define S_FPOFF_VS2013      0x1144
+#define S_DEFRANGE_REGISTER_REL         0x1145
 #define S_LPROC32_VS2013    0x1146
 #define S_GPROC32_VS2013    0x1147
+#define S_LPROCMIPS_ID      0x1148
+#define S_GPROCMIPS_ID      0x1149
+#define S_LPROCIA64_ID      0x114A
+#define S_GPROCIA64_ID      0x114B
+#define S_BUILDINFO         0x114C
+#define S_INLINESITE        0x114D
+#define S_INLINESITE_END    0x114E
+#define S_PROC_ID_END       0x114F
+#define S_DEFRANGE_HLSL     0x1150
+#define S_GDATA_HLSL        0x1151
+#define S_LDATA_HLSL        0x1152
+
+#define S_FILESTATIC        0x1153
+#define S_ARMSWITCHTABLE    0x1159
+#define S_CALLEES           0x115A
+#define S_CALLERS           0x115B
+#define S_POGODATA          0x115C
+#define S_INLINESITE2       0x115D
+#define S_HEAPALLOCSITE     0x115E
+#define S_MOD_TYPEREF       0x115F
+#define S_REF_MINIPDB       0x1160
+#define S_PDBMAP            0x1161
+#define S_GDATA_HLSL32      0x1162
+#define S_LDATA_HLSL32      0x1163
+#define S_GDATA_HLSL32_EX   0x1164
+#define S_LDATA_HLSL32_EX   0x1165
 
 /* ======================================== *
  *          Line number information
-- 
1.9.1




More information about the wine-patches mailing list