March 2010 - Wine-commits - list.winehq.org

Damjan Jovanovic : usbd.sys: Add USB descriptor parsing functions.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 6e4873691c15bd87fda4cf6aa10d7882b1c435aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4873691c15bd87fda4cf6aa… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Mar 18 21:29:01 2010 +0200 usbd.sys: Add USB descriptor parsing functions. --- dlls/usbd.sys/usbd.c | 77 +++++++++++++++++++++++++++++++++++++++++++ dlls/usbd.sys/usbd.sys.spec | 10 +++--- include/ddk/usbdlib.h | 4 ++ 3 files changed, 86 insertions(+), 5 deletions(-) diff --git a/dlls/usbd.sys/usbd.c b/dlls/usbd.sys/usbd.c index e734acd..daeb5c0 100644 --- a/dlls/usbd.sys/usbd.c +++ b/dlls/usbd.sys/usbd.c @@ -27,10 +27,87 @@ #include "winbase.h" #include "winternl.h" #include "ddk/wdm.h" +#include "ddk/usb.h" +#include "ddk/usbdlib.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(usbd); +PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptorEx( + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, + PVOID StartPosition, LONG InterfaceNumber, + LONG AlternateSetting, LONG InterfaceClass, + LONG InterfaceSubClass, LONG InterfaceProtocol ) +{ + /* http://blogs.msdn.com/usbcoreblog/archive/2009/12/12/ + * what-is-the-right-way-to-validate-and-parse-configuration-descriptors.aspx + */ + + PUSB_INTERFACE_DESCRIPTOR interface; + + TRACE( "(%p, %p, %d, %d, %d, %d, %d)\n", ConfigurationDescriptor, + StartPosition, InterfaceNumber, AlternateSetting, + InterfaceClass, InterfaceSubClass, InterfaceProtocol ); + + interface = (PUSB_INTERFACE_DESCRIPTOR) USBD_ParseDescriptors( + ConfigurationDescriptor, ConfigurationDescriptor->wTotalLength, + StartPosition, USB_INTERFACE_DESCRIPTOR_TYPE ); + while (interface != NULL) + { + if ((InterfaceNumber == -1 || interface->bInterfaceNumber == InterfaceNumber) && + (AlternateSetting == -1 || interface->bAlternateSetting == AlternateSetting) && + (InterfaceClass == -1 || interface->bInterfaceClass == InterfaceClass) && + (InterfaceSubClass == -1 || interface->bInterfaceSubClass == InterfaceSubClass) && + (InterfaceProtocol == -1 || interface->bInterfaceProtocol == InterfaceProtocol)) + { + return interface; + } + interface = (PUSB_INTERFACE_DESCRIPTOR) USBD_ParseDescriptors( + ConfigurationDescriptor, ConfigurationDescriptor->wTotalLength, + interface + 1, USB_INTERFACE_DESCRIPTOR_TYPE ); + } + return NULL; +} + +PUSB_COMMON_DESCRIPTOR WINAPI USBD_ParseDescriptors( + PVOID DescriptorBuffer, + ULONG TotalLength, + PVOID StartPosition, + LONG DescriptorType ) +{ + PUSB_COMMON_DESCRIPTOR common; + + TRACE( "(%p, %u, %p, %d)\n", DescriptorBuffer, TotalLength, StartPosition, DescriptorType ); + + for (common = (PUSB_COMMON_DESCRIPTOR)DescriptorBuffer; + ((char*)common) + sizeof(USB_COMMON_DESCRIPTOR) <= ((char*)DescriptorBuffer) + TotalLength; + common = (PUSB_COMMON_DESCRIPTOR)(((char*)common) + common->bLength)) + { + if (StartPosition <= (PVOID)common && common->bDescriptorType == DescriptorType) + return common; + } + return NULL; +} + +ULONG WINAPI USBD_GetInterfaceLength( + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor, + PUCHAR BufferEnd ) +{ + PUSB_COMMON_DESCRIPTOR common; + ULONG total = InterfaceDescriptor->bLength; + + TRACE( "(%p, %p)\n", InterfaceDescriptor, BufferEnd ); + + for (common = (PUSB_COMMON_DESCRIPTOR)(InterfaceDescriptor + 1); + (((PUCHAR)common) + sizeof(USB_COMMON_DESCRIPTOR)) <= BufferEnd && + common->bDescriptorType != USB_INTERFACE_DESCRIPTOR_TYPE; + common = (PUSB_COMMON_DESCRIPTOR)(((char*)common) + common->bLength)) + { + total += common->bLength; + } + return total; +} + NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) ); diff --git a/dlls/usbd.sys/usbd.sys.spec b/dlls/usbd.sys/usbd.sys.spec index c8f1d68..47e0bdb 100644 --- a/dlls/usbd.sys/usbd.sys.spec +++ b/dlls/usbd.sys/usbd.sys.spec @@ -1,6 +1,6 @@ @ stub USBD_CreateConfigurationRequestEx -@ stub USBD_ParseConfigurationDescriptorEx -@ stub USBD_ParseDescriptors +@ stdcall USBD_ParseConfigurationDescriptorEx(ptr ptr long long long long long) +@ stdcall USBD_ParseDescriptors(ptr long ptr long) @ stub USBD_AllocateDeviceName @ stub USBD_CalculateUsbBandwidth @ stub USBD_CompleteRequest @@ -14,15 +14,15 @@ @ stub USBD_FreeDeviceMutex @ stub USBD_FreeDeviceName @ stub USBD_GetDeviceInformation -@ stub USBD_GetInterfaceLength +@ stdcall USBD_GetInterfaceLength(ptr ptr) @ stub USBD_GetPdoRegistryParameter @ stub USBD_GetSuspendPowerState @ stub USBD_GetUSBDIVersion @ stub USBD_InitializeDevice @ stub USBD_MakePdoName @ stub USBD_ParseConfigurationDescriptor -@ stub _USBD_ParseConfigurationDescriptorEx(a)28 -@ stub _USBD_ParseDescriptors(a)16 +@ stdcall _USBD_ParseConfigurationDescriptorEx(a)28(ptr ptr long long long long long) USBD_ParseConfigurationDescriptorEx +@ stdcall _USBD_ParseDescriptors(a)16(ptr long ptr long) USBD_ParseDescriptors @ stub USBD_QueryBusTime @ stub USBD_RegisterHcDeviceCapabilities @ stub USBD_RegisterHcFilter diff --git a/include/ddk/usbdlib.h b/include/ddk/usbdlib.h index c0adc46..ce3cc86 100644 --- a/include/ddk/usbdlib.h +++ b/include/ddk/usbdlib.h @@ -25,4 +25,8 @@ typedef struct _USBD_INTERFACE_LIST_ENTRY { } USBD_INTERFACE_LIST_ENTRY; typedef struct _USBD_INTERFACE_LIST_ENTRY *PUSBD_INTERFACE_LIST_ENTRY; +PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptorEx(PUSB_CONFIGURATION_DESCRIPTOR,PVOID,LONG,LONG,LONG,LONG,LONG); +ULONG WINAPI USBD_GetInterfaceLength(PUSB_INTERFACE_DESCRIPTOR,PUCHAR); +PUSB_COMMON_DESCRIPTOR WINAPI USBD_ParseDescriptors(PVOID,ULONG,PVOID,LONG); + #endif

1 0

Eric Pouech : dbghelp: Make the ELF mapping code easier to use.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 770f0d834fc504613c1505281e30600d0d77db36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=770f0d834fc504613c1505281… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Mar 18 21:30:47 2010 +0100 dbghelp: Make the ELF mapping code easier to use. --- dlls/dbghelp/dbghelp_private.h | 1 - dlls/dbghelp/dwarf.c | 3 +- dlls/dbghelp/elf_module.c | 125 +++++++++++----------------------------- dlls/dbghelp/image_private.h | 94 ++++++++++++++++++++++++++++++ 4 files changed, 130 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=770f0d834fc504613c150…

1 0

Eric Pouech : dbghelp: Extend the ELF image management to PE modules so we get a rather uniform interface to image manipulation .
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: fb169502a57b0c90570ebdb3dfed136967ed7240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb169502a57b0c90570ebdb3d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Mar 18 21:30:55 2010 +0100 dbghelp: Extend the ELF image management to PE modules so we get a rather uniform interface to image manipulation. --- dlls/dbghelp/image_private.h | 27 +++- dlls/dbghelp/pe_module.c | 473 +++++++++++++++++++++++++++++------------- 2 files changed, 359 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb169502a57b0c90570eb…

1 0

Eric Pouech : dbghelp: Create the notion of image (PE, ELF modules) to uniformize some handlings.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: cbff4f063f6d1316cb271c036b601cd0a80ae6f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbff4f063f6d1316cb271c036… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Mar 18 21:31:03 2010 +0100 dbghelp: Create the notion of image (PE, ELF modules) to uniformize some handlings. --- dlls/dbghelp/dbghelp_private.h | 4 +- dlls/dbghelp/elf_module.c | 309 ++++++++++++++++++++++------------------ dlls/dbghelp/image_private.h | 132 ++++++++++++------ dlls/dbghelp/pe_module.c | 235 +++++++++++++++--------------- 4 files changed, 382 insertions(+), 298 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cbff4f063f6d1316cb271…

1 0

Eric Pouech : dbghelp: Keep the file map around for every PE module, so that we can access image whenever we like to.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: a2e65f13119a2a57d5f706663616e2911ccbeb93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2e65f13119a2a57d5f706663… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Mar 18 21:31:13 2010 +0100 dbghelp: Keep the file map around for every PE module, so that we can access image whenever we like to. --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/pe_module.c | 95 +++++++++++++++++++++------------------- 2 files changed, 51 insertions(+), 45 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 64e2d2f..3aa4f10 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -325,6 +325,7 @@ struct module /* specific information for debug types */ struct elf_module_info* elf_info; + struct pe_module_info* pe_info; struct dwarf2_module_info_s*dwarf2_info; void (*module_remove)(struct process* pcs, struct module* module); diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 4d83889..171d616 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -36,6 +36,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); +struct pe_module_info +{ + struct image_file_map fmap; +}; + static void* pe_map_full(struct image_file_map* fmap, IMAGE_NT_HEADERS** nth) { if (!fmap->u.pe.full_map) @@ -236,9 +241,16 @@ static void pe_unmap_file(struct image_file_map* fmap) HeapFree(GetProcessHeap(), 0, fmap->u.pe.sect); HeapFree(GetProcessHeap(), 0, (void*)fmap->u.pe.strtable); /* FIXME ugly (see pe_map_file) */ CloseHandle(fmap->u.pe.hMap); + fmap->u.pe.hMap = NULL; } } +static void pe_module_remove(struct process* pcs, struct module* module) +{ + pe_unmap_file(&module->pe_info->fmap); + HeapFree(GetProcessHeap(), 0, module->pe_info); +} + /****************************************************************** * pe_locate_with_coff_symbol_table * @@ -247,8 +259,9 @@ static void pe_unmap_file(struct image_file_map* fmap) * Mingw32 requires this for stabs debug information as address for global variables isn't filled in * (this is similar to what is done in elf_module.c when using the .symtab ELF section) */ -static BOOL pe_locate_with_coff_symbol_table(struct module* module, struct image_file_map* fmap) +static BOOL pe_locate_with_coff_symbol_table(struct module* module) { + struct image_file_map* fmap = &module->pe_info->fmap; const IMAGE_SYMBOL* isym; int i, numsym, naux; char tmp[9]; @@ -306,8 +319,9 @@ static BOOL pe_locate_with_coff_symbol_table(struct module* module, struct image * * Load public symbols out of the COFF symbol table (if any). */ -static BOOL pe_load_coff_symbol_table(struct module* module, struct image_file_map* fmap) +static BOOL pe_load_coff_symbol_table(struct module* module) { + struct image_file_map* fmap = &module->pe_info->fmap; const IMAGE_SYMBOL* isym; int i, numsym, naux; const char* strtable; @@ -382,8 +396,9 @@ static inline DWORD pe_get_sect_size(IMAGE_SECTION_HEADER* sect) * look for stabs information in PE header (it's how the mingw compiler provides * its debugging information) */ -static BOOL pe_load_stabs(const struct process* pcs, struct module* module, struct image_file_map* fmap) +static BOOL pe_load_stabs(const struct process* pcs, struct module* module) { + struct image_file_map* fmap = &module->pe_info->fmap; struct image_section_map sect_stabs, sect_stabstr; BOOL ret = FALSE; @@ -404,7 +419,7 @@ static BOOL pe_load_stabs(const struct process* pcs, struct module* module, stru } image_unmap_section(&sect_stabs); image_unmap_section(&sect_stabstr); - if (ret) pe_locate_with_coff_symbol_table(module, fmap); + if (ret) pe_locate_with_coff_symbol_table(module); } TRACE("%s the STABS debug info\n", ret ? "successfully loaded" : "failed to load"); @@ -417,9 +432,9 @@ static BOOL pe_load_stabs(const struct process* pcs, struct module* module, stru * look for dwarf information in PE header (it's also a way for the mingw compiler * to provide its debugging information) */ -static BOOL pe_load_dwarf(const struct process* pcs, struct module* module, - struct image_file_map* fmap) +static BOOL pe_load_dwarf(const struct process* pcs, struct module* module) { + struct image_file_map* fmap = &module->pe_info->fmap; struct image_section_map sect_debuginfo, sect_debugstr, sect_debugabbrev, sect_debugline, sect_debugloc; BOOL ret = FALSE; @@ -516,8 +531,9 @@ static BOOL pe_load_dbg_file(const struct process* pcs, struct module* module, * * Process MSC debug information in PE file. */ -static BOOL pe_load_msc_debug_info(const struct process* pcs, struct module* module, struct image_file_map* fmap) +static BOOL pe_load_msc_debug_info(const struct process* pcs, struct module* module) { + struct image_file_map* fmap = &module->pe_info->fmap; BOOL ret = FALSE; const IMAGE_DATA_DIRECTORY* dir; const IMAGE_DEBUG_DIRECTORY*dbg = NULL; @@ -566,8 +582,9 @@ done: /*********************************************************************** * pe_load_export_debug_info */ -static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* module, struct image_file_map* fmap) +static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* module) { + struct image_file_map* fmap = &module->pe_info->fmap; unsigned int i; const IMAGE_EXPORT_DIRECTORY* exports; DWORD base = module->module.BaseOfImage; @@ -649,48 +666,28 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* * pe_load_debug_info * */ -BOOL pe_load_debug_info_internal(const struct process* pcs, struct module* module, - struct image_file_map* fmap) +BOOL pe_load_debug_info(const struct process* pcs, struct module* module) { BOOL ret = FALSE; if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY)) { - ret = pe_load_stabs(pcs, module, fmap) || - pe_load_dwarf(pcs, module, fmap) || - pe_load_msc_debug_info(pcs, module, fmap) || - pe_load_coff_symbol_table(module, fmap); + ret = pe_load_stabs(pcs, module) || + pe_load_dwarf(pcs, module) || + pe_load_msc_debug_info(pcs, module) || + pe_load_coff_symbol_table(module); /* if we still have no debug info (we could only get SymExport at this * point), then do the SymExport except if we have an ELF container, * in which case we'll rely on the export's on the ELF side */ } -/* FIXME shouldn't we check that? if (!module_get_debug(pcs, module))l */ - if (pe_load_export_debug_info(pcs, module, fmap) && !ret) + /* FIXME shouldn't we check that? if (!module_get_debug(pcs, module)) */ + if (pe_load_export_debug_info(pcs, module) && !ret) ret = TRUE; return ret; } -BOOL pe_load_debug_info(const struct process* pcs, struct module* module) -{ - BOOL ret = FALSE; - HANDLE hFile; - struct image_file_map fmap; - - hFile = CreateFileW(module->module.LoadedImageName, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile == INVALID_HANDLE_VALUE) return FALSE; - if (pe_map_file(hFile, &fmap, DMT_PE)) - { - ret = pe_load_debug_info_internal(pcs, module, &fmap); - pe_unmap_file(&fmap); - } - CloseHandle(hFile); - - return ret; -} - /****************************************************************** * pe_load_native_module * @@ -700,7 +697,7 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, { struct module* module = NULL; BOOL opened = FALSE; - struct image_file_map fmap; + struct pe_module_info* module_info; WCHAR loaded_name[MAX_PATH]; loaded_name[0] = '\0'; @@ -715,25 +712,33 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, else if (name) strcpyW(loaded_name, name); else if (dbghelp_options & SYMOPT_DEFERRED_LOADS) FIXME("Trouble ahead (no module name passed in deferred mode)\n"); - - if (pe_map_file(hFile, &fmap, DMT_PE)) + if (!(module_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*module_info)))) + return NULL; + if (pe_map_file(hFile, &module_info->fmap, DMT_PE)) { - if (!base) base = fmap.u.pe.ntheader.OptionalHeader.ImageBase; - if (!size) size = fmap.u.pe.ntheader.OptionalHeader.SizeOfImage; + if (!base) base = module_info->fmap.u.pe.ntheader.OptionalHeader.ImageBase; + if (!size) size = module_info->fmap.u.pe.ntheader.OptionalHeader.SizeOfImage; module = module_new(pcs, loaded_name, DMT_PE, FALSE, base, size, - fmap.u.pe.ntheader.FileHeader.TimeDateStamp, - fmap.u.pe.ntheader.OptionalHeader.CheckSum); + module_info->fmap.u.pe.ntheader.FileHeader.TimeDateStamp, + module_info->fmap.u.pe.ntheader.OptionalHeader.CheckSum); if (module) { + module->pe_info = module_info; + module->module_remove = pe_module_remove; if (dbghelp_options & SYMOPT_DEFERRED_LOADS) module->module.SymType = SymDeferred; else - pe_load_debug_info_internal(pcs, module, &fmap); + pe_load_debug_info(pcs, module); + } + else + { + ERR("could not load the module '%s'\n", debugstr_w(loaded_name)); + pe_unmap_file(&module_info->fmap); } - else ERR("could not load the module '%s'\n", debugstr_w(loaded_name)); - pe_unmap_file(&fmap); } + if (!module) HeapFree(GetProcessHeap(), 0, module_info); + if (opened) CloseHandle(hFile); return module;

1 0

Eric Pouech : dbghelp: Extend the image (ELF/PE) scheme to get the RVA out of a section.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: c9bac2efd2b3590230aed946d5ed7086d19182a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9bac2efd2b3590230aed946d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Mar 18 21:31:19 2010 +0100 dbghelp: Extend the image (ELF/PE) scheme to get the RVA out of a section. --- dlls/dbghelp/elf_module.c | 12 ++++++++++++ dlls/dbghelp/image_private.h | 13 +++++++++++++ dlls/dbghelp/pe_module.c | 12 ++++++++++++ 3 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 64b8481..4719aed 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -195,6 +195,18 @@ static void elf_end_find(struct image_file_map* fmap) } /****************************************************************** + * elf_get_map_rva + * + * Get the RVA of an ELF section + */ +DWORD_PTR elf_get_map_rva(const struct image_section_map* ism) +{ + if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.elf.elfhdr.e_shnum) + return 0; + return ism->fmap->u.elf.sect[ism->sidx].shdr.sh_addr - ism->fmap->u.elf.elf_start; +} + +/****************************************************************** * elf_get_map_size * * Get the size of an ELF section diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 4eb5f83..b768deb 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -116,12 +116,14 @@ extern BOOL elf_find_section(struct image_file_map* fmap, const char* na unsigned sht, struct image_section_map* ism); extern const char* elf_map_section(struct image_section_map* ism); extern void elf_unmap_section(struct image_section_map* ism); +extern DWORD_PTR elf_get_map_rva(const struct image_section_map* ism); extern unsigned elf_get_map_size(const struct image_section_map* ism); extern BOOL pe_find_section(struct image_file_map* fmap, const char* name, struct image_section_map* ism); extern const char* pe_map_section(struct image_section_map* psm); extern void pe_unmap_section(struct image_section_map* psm); +extern DWORD_PTR pe_get_map_rva(const struct image_section_map* psm); extern unsigned pe_get_map_size(const struct image_section_map* psm); static inline BOOL image_find_section(struct image_file_map* fmap, const char* name, @@ -157,6 +159,17 @@ static inline void image_unmap_section(struct image_section_map* ism) } } +static inline DWORD_PTR image_get_map_rva(struct image_section_map* ism) +{ + if (!ism->fmap) return 0; + switch (ism->fmap->modtype) + { + case DMT_ELF: return elf_get_map_rva(ism); + case DMT_PE: return pe_get_map_rva(ism); + default: assert(0); return 0; + } +} + static inline unsigned image_get_map_size(struct image_section_map* ism) { if (!ism->fmap) return 0; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 171d616..67c2e8d 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -148,6 +148,18 @@ void pe_unmap_section(struct image_section_map* ism) } /****************************************************************** + * pe_get_map_rva + * + * Get the RVA of an PE section + */ +DWORD_PTR pe_get_map_rva(const struct image_section_map* ism) +{ + if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.pe.ntheader.FileHeader.NumberOfSections) + return 0; + return ism->fmap->u.pe.sect[ism->sidx].shdr.VirtualAddress; +} + +/****************************************************************** * pe_get_map_size * * Get the size of an PE section

1 0

Eric Pouech : dbghelp: Let dwarf_parse decide on which sections it needs to map.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 2d8c7883532b45c44ee3f08808d93fd23b2e4d49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d8c7883532b45c44ee3f0880… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Mar 18 21:31:26 2010 +0100 dbghelp: Let dwarf_parse decide on which sections it needs to map. --- dlls/dbghelp/dbghelp_private.h | 6 +-- dlls/dbghelp/dwarf.c | 90 ++++++++++++++++++++++++++++++--------- dlls/dbghelp/elf_module.c | 57 +++---------------------- dlls/dbghelp/pe_module.c | 60 +++++++-------------------- 4 files changed, 92 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d8c7883532b45c44ee3f…

1 0

Eric Pouech : dbghelp: Now that we can keep ELF sections around, don' t copy the loclist section, just don't unmap it.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 3e6920d7b866aefba74ba02d4fa6cf2dc5bd61df URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6920d7b866aefba74ba02d4… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Mar 18 21:31:36 2010 +0100 dbghelp: Now that we can keep ELF sections around, don't copy the loclist section, just don't unmap it. --- dlls/dbghelp/dwarf.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index e28163c..88a942b 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2376,7 +2376,6 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, struct image_file_map* fmap) { dwarf2_section_t section[section_max]; - unsigned char* ptr; dwarf2_traverse_context_t mod_ctx; struct image_section_map debug_sect, debug_str_sect, debug_abbrev_sect, debug_line_sect, debug_loclist_sect; @@ -2419,17 +2418,15 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, if (image_get_map_size(&debug_loclist_sect)) { /* initialize the dwarf2 specific info block for this module. - * As we'll need later on the .debug_loc section content, we copy it in - * the module structure for later reuse + * As we'll need later the .debug_loc section content, we won't unmap this + * section upon existing this function */ - module->dwarf2_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*module->dwarf2_info) + - image_get_map_size(&debug_loclist_sect)); + module->dwarf2_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*module->dwarf2_info)); if (!module->dwarf2_info) return FALSE; - ptr = (unsigned char*)(module->dwarf2_info + 1); - memcpy(ptr, image_map_section(&debug_loclist_sect), image_get_map_size(&debug_loclist_sect)); - module->dwarf2_info->debug_loc.address = ptr; + module->dwarf2_info->debug_loc.address = (const BYTE*)image_map_section(&debug_loclist_sect); module->dwarf2_info->debug_loc.size = image_get_map_size(&debug_loclist_sect); } + else image_unmap_section(&debug_loclist_sect); while (mod_ctx.data < mod_ctx.end_data) { @@ -2448,6 +2445,6 @@ leave: image_unmap_section(&debug_abbrev_sect); image_unmap_section(&debug_str_sect); image_unmap_section(&debug_line_sect); - image_unmap_section(&debug_loclist_sect); + return ret; }

1 0

Eric Pouech : dbghelp: Create new infrastructure to hold specific information for multiple file/ debug formats in a single module, and use it to store dwarf2 stuff.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 73f79e7fadfd7782da717cb1dfcd2496d1d2287f URL: http://source.winehq.org/git/wine.git/?a=commit;h=73f79e7fadfd7782da717cb1d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Mar 18 21:31:43 2010 +0100 dbghelp: Create new infrastructure to hold specific information for multiple file/debug formats in a single module, and use it to store dwarf2 stuff. --- dlls/dbghelp/dbghelp_private.h | 30 +++++++++++++++++--- dlls/dbghelp/dwarf.c | 59 +++++++++++++++++++++++++--------------- dlls/dbghelp/module.c | 11 ++++++- dlls/dbghelp/symbol.c | 16 +++++++++- 4 files changed, 85 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73f79e7fadfd7782da717…

1 0

Eric Pouech : dbghelp: Move the PE debug info to the newly define scheme.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: cd92e3d1479806f2413b528585b192f67197fadd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd92e3d1479806f2413b52858… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Mar 18 21:31:50 2010 +0100 dbghelp: Move the PE debug info to the newly define scheme. --- dlls/dbghelp/dbghelp_private.h | 3 +- dlls/dbghelp/pe_module.c | 44 +++++++++++++++++++++------------------ 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index ec08993..6e4636f 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -320,6 +320,7 @@ struct module; */ enum format_info { + DFI_PE, DFI_DWARF, DFI_LAST }; @@ -335,6 +336,7 @@ struct module_format union { struct dwarf2_module_info_s* dwarf2_info; + struct pe_module_info* pe_info; } u; }; @@ -349,7 +351,6 @@ struct module /* specific information for debug types */ struct elf_module_info* elf_info; - struct pe_module_info* pe_info; void (*module_remove)(struct process* pcs, struct module* module); struct module_format* format_info[DFI_LAST]; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index b329da0..63a2b9a 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -257,10 +257,10 @@ static void pe_unmap_file(struct image_file_map* fmap) } } -static void pe_module_remove(struct process* pcs, struct module* module) +static void pe_module_remove(struct process* pcs, struct module_format* modfmt) { - pe_unmap_file(&module->pe_info->fmap); - HeapFree(GetProcessHeap(), 0, module->pe_info); + pe_unmap_file(&modfmt->u.pe_info->fmap); + HeapFree(GetProcessHeap(), 0, modfmt); } /****************************************************************** @@ -273,7 +273,7 @@ static void pe_module_remove(struct process* pcs, struct module* module) */ static BOOL pe_locate_with_coff_symbol_table(struct module* module) { - struct image_file_map* fmap = &module->pe_info->fmap; + struct image_file_map* fmap = &module->format_info[DFI_PE]->u.pe_info->fmap; const IMAGE_SYMBOL* isym; int i, numsym, naux; char tmp[9]; @@ -333,7 +333,7 @@ static BOOL pe_locate_with_coff_symbol_table(struct module* module) */ static BOOL pe_load_coff_symbol_table(struct module* module) { - struct image_file_map* fmap = &module->pe_info->fmap; + struct image_file_map* fmap = &module->format_info[DFI_PE]->u.pe_info->fmap; const IMAGE_SYMBOL* isym; int i, numsym, naux; const char* strtable; @@ -413,7 +413,7 @@ static inline DWORD pe_get_sect_size(IMAGE_SECTION_HEADER* sect) */ static BOOL pe_load_stabs(const struct process* pcs, struct module* module) { - struct image_file_map* fmap = &module->pe_info->fmap; + struct image_file_map* fmap = &module->format_info[DFI_PE]->u.pe_info->fmap; struct image_section_map sect_stabs, sect_stabstr; BOOL ret = FALSE; @@ -449,7 +449,7 @@ static BOOL pe_load_stabs(const struct process* pcs, struct module* module) */ static BOOL pe_load_dwarf(struct module* module) { - struct image_file_map* fmap = &module->pe_info->fmap; + struct image_file_map* fmap = &module->format_info[DFI_PE]->u.pe_info->fmap; BOOL ret = FALSE; ret = dwarf2_parse(module, @@ -515,7 +515,7 @@ static BOOL pe_load_dbg_file(const struct process* pcs, struct module* module, */ static BOOL pe_load_msc_debug_info(const struct process* pcs, struct module* module) { - struct image_file_map* fmap = &module->pe_info->fmap; + struct image_file_map* fmap = &module->format_info[DFI_PE]->u.pe_info->fmap; BOOL ret = FALSE; const IMAGE_DATA_DIRECTORY* dir; const IMAGE_DEBUG_DIRECTORY*dbg = NULL; @@ -566,7 +566,7 @@ done: */ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* module) { - struct image_file_map* fmap = &module->pe_info->fmap; + struct image_file_map* fmap = &module->format_info[DFI_PE]->u.pe_info->fmap; unsigned int i; const IMAGE_EXPORT_DIRECTORY* exports; DWORD base = module->module.BaseOfImage; @@ -679,7 +679,7 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, { struct module* module = NULL; BOOL opened = FALSE; - struct pe_module_info* module_info; + struct module_format* modfmt; WCHAR loaded_name[MAX_PATH]; loaded_name[0] = '\0'; @@ -694,20 +694,24 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, else if (name) strcpyW(loaded_name, name); else if (dbghelp_options & SYMOPT_DEFERRED_LOADS) FIXME("Trouble ahead (no module name passed in deferred mode)\n"); - if (!(module_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*module_info)))) + if (!(modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct pe_module_info)))) return NULL; - if (pe_map_file(hFile, &module_info->fmap, DMT_PE)) + modfmt->u.pe_info = (struct pe_module_info*)(modfmt + 1); + if (pe_map_file(hFile, &modfmt->u.pe_info->fmap, DMT_PE)) { - if (!base) base = module_info->fmap.u.pe.ntheader.OptionalHeader.ImageBase; - if (!size) size = module_info->fmap.u.pe.ntheader.OptionalHeader.SizeOfImage; + if (!base) base = modfmt->u.pe_info->fmap.u.pe.ntheader.OptionalHeader.ImageBase; + if (!size) size = modfmt->u.pe_info->fmap.u.pe.ntheader.OptionalHeader.SizeOfImage; module = module_new(pcs, loaded_name, DMT_PE, FALSE, base, size, - module_info->fmap.u.pe.ntheader.FileHeader.TimeDateStamp, - module_info->fmap.u.pe.ntheader.OptionalHeader.CheckSum); + modfmt->u.pe_info->fmap.u.pe.ntheader.FileHeader.TimeDateStamp, + modfmt->u.pe_info->fmap.u.pe.ntheader.OptionalHeader.CheckSum); if (module) { - module->pe_info = module_info; - module->module_remove = pe_module_remove; + modfmt->module = module; + modfmt->remove = pe_module_remove; + modfmt->loc_compute = NULL; + + module->format_info[DFI_PE] = modfmt; if (dbghelp_options & SYMOPT_DEFERRED_LOADS) module->module.SymType = SymDeferred; else @@ -716,10 +720,10 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, else { ERR("could not load the module '%s'\n", debugstr_w(loaded_name)); - pe_unmap_file(&module_info->fmap); + pe_unmap_file(&modfmt->u.pe_info->fmap); } } - if (!module) HeapFree(GetProcessHeap(), 0, module_info); + if (!module) HeapFree(GetProcessHeap(), 0, modfmt); if (opened) CloseHandle(hFile);

1 0