Author: akhaldi Date: Sat Sep 27 11:45:29 2014 New Revision: 64335
URL: http://svn.reactos.org/svn/reactos?rev=64335&view=rev Log: [DBGHELP] * Sync with Wine 1.7.27. CORE-8540
Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_private.h trunk/reactos/dll/win32/dbghelp/macho_module.c trunk/reactos/dll/win32/dbghelp/msc.c trunk/reactos/dll/win32/dbghelp/type.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_p... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp_private.h [iso-8859-1] Sat Sep 27 11:45:29 2014 @@ -391,12 +391,14 @@ } u; };
+#ifdef __REACTOS__ struct symt_idx_to_ptr { struct hash_table_elt hash_elt; DWORD idx; const struct symt *sym; }; +#endif
extern const struct wine_rb_functions source_rb_functions DECLSPEC_HIDDEN; struct module
Modified: trunk/reactos/dll/win32/dbghelp/macho_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/macho_mod... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/macho_module.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/macho_module.c [iso-8859-1] Sat Sep 27 11:45:29 2014 @@ -381,6 +381,11 @@ if (!strncmp(sc->segname, "WINE_", 5)) { TRACE("Ignoring special Wine segment %s\n", debugstr_an(sc->segname, sizeof(sc->segname))); + return 0; + } + if (!strncmp(sc->segname, "__PAGEZERO", 10)) + { + TRACE("Ignoring __PAGEZERO segment\n"); return 0; }
@@ -1005,6 +1010,8 @@ struct module_format* modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct macho_module_info)); if (!modfmt) goto leave; + if (!load_addr) + load_addr = fmap.segs_start; macho_info->module = module_new(pcs, filename, DMT_MACHO, FALSE, load_addr, fmap.segs_size, 0, calc_crc32(fmap.fd)); if (!macho_info->module)
Modified: trunk/reactos/dll/win32/dbghelp/msc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/msc.c?rev... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/msc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/msc.c [iso-8859-1] Sat Sep 27 11:45:29 2014 @@ -1968,7 +1968,12 @@ case S_SECTINFO_V3: case S_SUBSECTINFO_V3: case S_ENTRYPOINT_V3: + case 0x113e: case 0x1139: + case 0x1141: + case 0x1142: + case 0x1143: + case 0x1144: TRACE("Unsupported symbol id %x\n", sym->generic.id); break;
@@ -2219,7 +2224,7 @@ HeapFree(GetProcessHeap(), 0, pdb_file->stream_dict); }
-static BOOL pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const char* str, unsigned cb) +static void pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const char* str, unsigned cb) { DWORD* pdw; DWORD* ok_bits; @@ -2232,7 +2237,7 @@ count = *pdw++;
pdb_file->stream_dict = HeapAlloc(GetProcessHeap(), 0, (numok + 1) * sizeof(struct pdb_stream_name) + cb); - if (!pdb_file->stream_dict) return FALSE; + if (!pdb_file->stream_dict) return; cpstr = (char*)(pdb_file->stream_dict + numok + 1); memcpy(cpstr, str, cb);
@@ -2242,7 +2247,7 @@ if (*pdw++ != 0) { FIXME("unexpected value\n"); - return -1; + return; }
for (i = j = 0; i < count; i++) @@ -2258,7 +2263,6 @@ /* add sentinel */ pdb_file->stream_dict[numok].name = NULL; pdb_file->fpoext_stream = -1; - return j == numok && i == count; }
static unsigned pdb_get_stream_by_name(const struct pdb_file_info* pdb_file, const char* name) @@ -2900,8 +2904,8 @@ struct hash_table_elt elt; };
-#define PEV_ERROR(pev, msg) snprintf((pev)->error, sizeof((pev)->error), "%s", (msg)),FALSE -#define PEV_ERROR1(pev, msg, pmt) snprintf((pev)->error, sizeof((pev)->error), (msg), (pmt)),FALSE +#define PEV_ERROR(pev, msg) snprintf((pev)->error, sizeof((pev)->error), "%s", (msg)) +#define PEV_ERROR1(pev, msg, pmt) snprintf((pev)->error, sizeof((pev)->error), (msg), (pmt))
#if 0 static void pev_dump_stack(struct pevaluator* pev)
Modified: trunk/reactos/dll/win32/dbghelp/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/type.c?re... ============================================================================== --- trunk/reactos/dll/win32/dbghelp/type.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/type.c [iso-8859-1] Sat Sep 27 11:45:29 2014 @@ -682,7 +682,7 @@ symt_get_tag_str(type->tag)); /* fall through */ case SymTagFunctionType: - return 0; + return FALSE; } break;
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 27 11:45:29 2014 @@ -69,7 +69,7 @@ reactos/dll/win32/cryptdll # Synced to Wine-1.7.17 reactos/dll/win32/cryptnet # Synced to Wine-1.7.27 reactos/dll/win32/cryptui # Synced to Wine-1.7.27 -reactos/dll/win32/dbghelp # Synced to Wine-1.7.17 +reactos/dll/win32/dbghelp # Synced to Wine-1.7.27 reactos/dll/win32/dciman32 # Synced to Wine-1.7.17 reactos/dll/win32/dwmapi # Synced to Wine-1.7.17 reactos/dll/win32/faultrep # Synced to Wine-1.7.17
-
akhaldi＠svn.reactos.org