wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Eric Pouech : dbghelp: Extend elf_map_file so that it can also handle ELF maps directly from debuggee address space .
by Alexandre Julliard 28 Dec '10

28 Dec '10

Module: wine Branch: master Commit: 749dafd987111543279a62f8a480c904f8b04667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=749dafd987111543279a62f8a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 27 15:03:30 2010 +0100 dbghelp: Extend elf_map_file so that it can also handle ELF maps directly from debuggee address space. --- dlls/dbghelp/elf_module.c | 126 ++++++++++++++++++++++++++++++++++++------ dlls/dbghelp/image_private.h | 1 + 2 files changed, 109 insertions(+), 18 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 1b8ba70..305f420 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -110,6 +110,10 @@ const char* elf_map_section(struct image_section_map* ism) fmap->sect[ism->sidx].shdr.sh_type == SHT_NOBITS) return IMAGE_NO_MAP; + if (fmap->target_copy) + { + return fmap->target_copy + fmap->sect[ism->sidx].shdr.sh_offset; + } /* align required information on page size (we assume pagesize is a power of 2) */ ofst = fmap->sect[ism->sidx].shdr.sh_offset & ~(pgsz - 1); size = ((fmap->sect[ism->sidx].shdr.sh_offset + @@ -166,7 +170,8 @@ void elf_unmap_section(struct image_section_map* ism) { struct elf_file_map* fmap = &ism->fmap->u.elf; - if (ism->sidx >= 0 && ism->sidx < fmap->elfhdr.e_shnum && fmap->sect[ism->sidx].mapped != IMAGE_NO_MAP) + if (ism->sidx >= 0 && ism->sidx < fmap->elfhdr.e_shnum && !fmap->target_copy && + fmap->sect[ism->sidx].mapped != IMAGE_NO_MAP) { unsigned long pgsz = getpagesize(); unsigned long ofst, size; @@ -223,6 +228,41 @@ static inline void elf_reset_file_map(struct image_file_map* fmap) fmap->u.elf.fd = -1; fmap->u.elf.shstrtab = IMAGE_NO_MAP; fmap->u.elf.alternate = NULL; + fmap->u.elf.target_copy = NULL; +} + +struct elf_map_file_data +{ + enum {from_file, from_process} kind; + union + { + struct + { + const WCHAR* filename; + } file; + struct + { + HANDLE handle; + void* load_addr; + } process; + } u; +}; + +static BOOL elf_map_file_read(struct image_file_map* fmap, struct elf_map_file_data* emfd, + void* buf, size_t len, off_t off) +{ + SIZE_T dw; + + switch (emfd->kind) + { + case from_file: + return pread(fmap->u.elf.fd, buf, len, off) == len; + case from_process: + return ReadProcessMemory(emfd->u.process.handle, + (void*)((unsigned long)emfd->u.process.load_addr + (unsigned long)off), + buf, len, &dw) && dw == len; + default: assert(0); + } } /****************************************************************** @@ -230,7 +270,7 @@ static inline void elf_reset_file_map(struct image_file_map* fmap) * * Maps an ELF file into memory (and checks it's a real ELF file) */ -static BOOL elf_map_file(const WCHAR* filenameW, struct image_file_map* fmap) +static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* fmap) { static const BYTE elf_signature[4] = { ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3 }; struct stat statbuf; @@ -241,21 +281,40 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct image_file_map* fmap) unsigned len; BOOL ret = FALSE; - len = WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, NULL, 0, NULL, NULL); - if (!(filename = HeapAlloc(GetProcessHeap(), 0, len))) return FALSE; - WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, filename, len, NULL, NULL); + switch (emfd->kind) + { + case from_file: + len = WideCharToMultiByte(CP_UNIXCP, 0, emfd->u.file.filename, -1, NULL, 0, NULL, NULL); + if (!(filename = HeapAlloc(GetProcessHeap(), 0, len))) return FALSE; + WideCharToMultiByte(CP_UNIXCP, 0, emfd->u.file.filename, -1, filename, len, NULL, NULL); + break; + case from_process: + filename = NULL; + break; + default: assert(0); + } elf_reset_file_map(fmap); fmap->modtype = DMT_ELF; - /* check that the file exists, and that the module hasn't been loaded yet */ - if (stat(filename, &statbuf) == -1 || S_ISDIR(statbuf.st_mode)) goto done; - - /* Now open the file, so that we can mmap() it. */ - if ((fmap->u.elf.fd = open(filename, O_RDONLY)) == -1) goto done; + fmap->u.elf.fd = -1; + fmap->u.elf.target_copy = NULL; - if (read(fmap->u.elf.fd, &fmap->u.elf.elfhdr, sizeof(fmap->u.elf.elfhdr)) != sizeof(fmap->u.elf.elfhdr)) + switch (emfd->kind) + { + case from_file: + /* check that the file exists, and that the module hasn't been loaded yet */ + if (stat(filename, &statbuf) == -1 || S_ISDIR(statbuf.st_mode)) goto done; + + /* Now open the file, so that we can mmap() it. */ + if ((fmap->u.elf.fd = open(filename, O_RDONLY)) == -1) goto done; + break; + case from_process: + break; + } + if (!elf_map_file_read(fmap, emfd, &fmap->u.elf.elfhdr, sizeof(fmap->u.elf.elfhdr), 0)) goto done; + /* and check for an ELF header */ if (memcmp(fmap->u.elf.elfhdr.e_ident, elf_signature, sizeof(elf_signature))) goto done; @@ -271,8 +330,8 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct image_file_map* fmap) for (i = 0; i < fmap->u.elf.elfhdr.e_shnum; i++) { - if (pread(fmap->u.elf.fd, &fmap->u.elf.sect[i].shdr, sizeof(fmap->u.elf.sect[i].shdr), - fmap->u.elf.elfhdr.e_shoff + i * sizeof(fmap->u.elf.sect[i].shdr)) != sizeof(fmap->u.elf.sect[i].shdr)) + if (!elf_map_file_read(fmap, emfd, &fmap->u.elf.sect[i].shdr, sizeof(fmap->u.elf.sect[i].shdr), + fmap->u.elf.elfhdr.e_shoff + i * sizeof(fmap->u.elf.sect[i].shdr))) { HeapFree(GetProcessHeap(), 0, fmap->u.elf.sect); fmap->u.elf.sect = NULL; @@ -286,8 +345,8 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct image_file_map* fmap) fmap->u.elf.elf_start = ~0L; for (i = 0; i < fmap->u.elf.elfhdr.e_phnum; i++) { - if (pread(fmap->u.elf.fd, &phdr, sizeof(phdr), - fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) == sizeof(phdr) && + if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr), + fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) && phdr.p_type == PT_LOAD) { tmp = (phdr.p_vaddr + phdr.p_memsz + page_mask) & ~page_mask; @@ -299,6 +358,25 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct image_file_map* fmap) * otherwise, all addresses are zero based and start has no effect */ fmap->u.elf.elf_size -= fmap->u.elf.elf_start; + + switch (emfd->kind) + { + case from_file: break; + case from_process: + if (!(fmap->u.elf.target_copy = HeapAlloc(GetProcessHeap(), 0, fmap->u.elf.elf_size))) + { + HeapFree(GetProcessHeap(), 0, fmap->u.elf.sect); + goto done; + } + if (!ReadProcessMemory(emfd->u.process.handle, emfd->u.process.load_addr, fmap->u.elf.target_copy, + fmap->u.elf.elf_size, NULL)) + { + HeapFree(GetProcessHeap(), 0, fmap->u.elf.target_copy); + HeapFree(GetProcessHeap(), 0, fmap->u.elf.sect); + goto done; + } + break; + } ret = TRUE; done: HeapFree(GetProcessHeap(), 0, filename); @@ -325,6 +403,7 @@ static void elf_unmap_file(struct image_file_map* fmap) HeapFree(GetProcessHeap(), 0, fmap->u.elf.sect); close(fmap->u.elf.fd); } + HeapFree(GetProcessHeap(), 0, fmap->u.elf.target_copy); fmap = fmap->u.elf.alternate; } } @@ -737,7 +816,11 @@ static int elf_new_public_symbols(struct module* module, const struct hash_table static BOOL elf_check_debug_link(const WCHAR* file, struct image_file_map* fmap, DWORD crc) { BOOL ret; - if (!elf_map_file(file, fmap)) return FALSE; + struct elf_map_file_data emfd; + + emfd.kind = from_file; + emfd.u.file.filename = file; + if (!elf_map_file(&emfd, fmap)) return FALSE; if (!(ret = crc == calc_crc32(fmap->u.elf.fd))) { WARN("Bad CRC for file %s (got %08x while expecting %08x)\n", @@ -979,7 +1062,11 @@ BOOL elf_fetch_file_info(const WCHAR* name, DWORD_PTR* base, { struct image_file_map fmap; - if (!elf_map_file(name, &fmap)) return FALSE; + struct elf_map_file_data emfd; + + emfd.kind = from_file; + emfd.u.file.filename = name; + if (!elf_map_file(&emfd, &fmap)) return FALSE; if (base) *base = fmap.u.elf.elf_start; *size = fmap.u.elf.elf_size; *checksum = calc_crc32(fmap.u.elf.fd); @@ -1110,10 +1197,13 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, { BOOL ret = FALSE; struct image_file_map fmap; + struct elf_map_file_data emfd; TRACE("Processing elf file '%s' at %08lx\n", debugstr_w(filename), load_offset); - if (!elf_map_file(filename, &fmap)) return ret; + emfd.kind = from_file; + emfd.u.file.filename = filename; + if (!elf_map_file(&emfd, &fmap)) return ret; /* Next, we need to find a few of the internal ELF headers within * this thing. We need the main executable header, and the section diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 808f6a1..34e2c18 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -81,6 +81,7 @@ struct image_file_map int fd; const char* shstrtab; struct image_file_map* alternate; /* another ELF file (linked to this one) */ + char* target_copy; #ifdef __ELF__ Elf_Ehdr elfhdr; struct

1 0

Eric Pouech : dbghelp: Use pread instead of read in elf_map_file.
by Alexandre Julliard 28 Dec '10

28 Dec '10

Module: wine Branch: master Commit: 737b5b95bb09cbf61a45a9a24b3628bb8e553364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=737b5b95bb09cbf61a45a9a24… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 27 15:03:24 2010 +0100 dbghelp: Use pread instead of read in elf_map_file. --- dlls/dbghelp/elf_module.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 53b7f55..1b8ba70 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -269,10 +269,10 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct image_file_map* fmap) fmap->u.elf.elfhdr.e_shnum * sizeof(fmap->u.elf.sect[0])); if (!fmap->u.elf.sect) goto done; - lseek(fmap->u.elf.fd, fmap->u.elf.elfhdr.e_shoff, SEEK_SET); for (i = 0; i < fmap->u.elf.elfhdr.e_shnum; i++) { - if (read(fmap->u.elf.fd, &fmap->u.elf.sect[i].shdr, sizeof(fmap->u.elf.sect[i].shdr)) != sizeof(fmap->u.elf.sect[i].shdr)) + if (pread(fmap->u.elf.fd, &fmap->u.elf.sect[i].shdr, sizeof(fmap->u.elf.sect[i].shdr), + fmap->u.elf.elfhdr.e_shoff + i * sizeof(fmap->u.elf.sect[i].shdr)) != sizeof(fmap->u.elf.sect[i].shdr)) { HeapFree(GetProcessHeap(), 0, fmap->u.elf.sect); fmap->u.elf.sect = NULL; @@ -282,12 +282,12 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct image_file_map* fmap) } /* grab size of module once loaded in memory */ - lseek(fmap->u.elf.fd, fmap->u.elf.elfhdr.e_phoff, SEEK_SET); fmap->u.elf.elf_size = 0; fmap->u.elf.elf_start = ~0L; for (i = 0; i < fmap->u.elf.elfhdr.e_phnum; i++) { - if (read(fmap->u.elf.fd, &phdr, sizeof(phdr)) == sizeof(phdr) && + if (pread(fmap->u.elf.fd, &phdr, sizeof(phdr), + fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) == sizeof(phdr) && phdr.p_type == PT_LOAD) { tmp = (phdr.p_vaddr + phdr.p_memsz + page_mask) & ~page_mask;

1 0

Eric Pouech : dbghelp: Split elf_load_file into two functions ( one for creating a file-map, another one for loading info out of a file-map ).
by Alexandre Julliard 28 Dec '10

28 Dec '10

Module: wine Branch: master Commit: 655247354a5396147ac9ad766509020c2f2f6dee URL: http://source.winehq.org/git/wine.git/?a=commit;h=655247354a5396147ac9ad766… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 27 15:03:18 2010 +0100 dbghelp: Split elf_load_file into two functions (one for creating a file-map, another one for loading info out of a file-map). --- dlls/dbghelp/elf_module.c | 97 +++++++++++++++++++++++++-------------------- 1 files changed, 54 insertions(+), 43 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index b8ddfcb..53b7f55 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -987,51 +987,27 @@ BOOL elf_fetch_file_info(const WCHAR* name, DWORD_PTR* base, return TRUE; } -/****************************************************************** - * elf_load_file - * - * Loads the information for ELF module stored in 'filename' - * the module has been loaded at 'load_offset' address - * returns - * -1 if the file cannot be found/opened - * 0 if the file doesn't contain symbolic info (or this info cannot be - * read or parsed) - * 1 on success - */ -static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, - unsigned long load_offset, unsigned long dyn_addr, - struct elf_info* elf_info) +static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename, + struct image_file_map* fmap, unsigned long load_offset, + unsigned long dyn_addr, struct elf_info* elf_info) { - BOOL ret = FALSE; - struct image_file_map fmap; - - TRACE("Processing elf file '%s' at %08lx\n", debugstr_w(filename), load_offset); - - if (!elf_map_file(filename, &fmap)) return ret; - - /* Next, we need to find a few of the internal ELF headers within - * this thing. We need the main executable header, and the section - * table. - */ - if (!fmap.u.elf.elf_start && !load_offset) - ERR("Relocatable ELF %s, but no load address. Loading at 0x0000000\n", - debugstr_w(filename)); + BOOL ret = FALSE; if (elf_info->flags & ELF_INFO_DEBUG_HEADER) { struct image_section_map ism; - if (elf_find_section(&fmap, ".dynamic", SHT_DYNAMIC, &ism)) + if (elf_find_section(fmap, ".dynamic", SHT_DYNAMIC, &ism)) { Elf_Dyn dyn; - char* ptr = (char*)fmap.u.elf.sect[ism.sidx].shdr.sh_addr; + char* ptr = (char*)fmap->u.elf.sect[ism.sidx].shdr.sh_addr; unsigned long len; do { if (!ReadProcessMemory(pcs->handle, ptr, &dyn, sizeof(dyn), &len) || len != sizeof(dyn)) - goto leave; + return ret; if (dyn.d_tag == DT_DEBUG) { elf_info->dbg_hdr_addr = dyn.d_un.d_ptr; @@ -1042,9 +1018,9 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, } ptr += sizeof(dyn); } while (dyn.d_tag != DT_NULL); - if (dyn.d_tag == DT_NULL) goto leave; + if (dyn.d_tag == DT_NULL) return ret; } - elf_end_find(&fmap); + elf_end_find(fmap); } if (elf_info->flags & ELF_INFO_MODULE) @@ -1054,12 +1030,12 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, struct image_section_map ism; unsigned long modbase = load_offset; - if (elf_find_section(&fmap, ".dynamic", SHT_DYNAMIC, &ism)) + if (elf_find_section(fmap, ".dynamic", SHT_DYNAMIC, &ism)) { unsigned long rva_dyn = elf_get_map_rva(&ism); TRACE("For module %s, got ELF (start=%lx dyn=%lx), link_map (start=%lx dyn=%lx)\n", - debugstr_w(filename), (unsigned long)fmap.u.elf.elf_start, rva_dyn, + debugstr_w(filename), (unsigned long)fmap->u.elf.elf_start, rva_dyn, load_offset, dyn_addr); if (dyn_addr && load_offset + rva_dyn != dyn_addr) { @@ -1067,19 +1043,19 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, modbase = dyn_addr - rva_dyn; } } else WARN("For module %s, no .dynamic section\n", debugstr_w(filename)); - elf_end_find(&fmap); + elf_end_find(fmap); modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct elf_module_info)); - if (!modfmt) goto leave; + if (!modfmt) return FALSE; elf_info->module = module_new(pcs, filename, DMT_ELF, FALSE, modbase, - fmap.u.elf.elf_size, 0, calc_crc32(fmap.u.elf.fd)); + fmap->u.elf.elf_size, 0, calc_crc32(fmap->u.elf.fd)); if (!elf_info->module) { HeapFree(GetProcessHeap(), 0, modfmt); - goto leave; + return FALSE; } - elf_info->module->reloc_delta = elf_info->module->module.BaseOfImage - fmap.u.elf.elf_start; + elf_info->module->reloc_delta = elf_info->module->module.BaseOfImage - fmap->u.elf.elf_start; elf_module_info = (void*)(modfmt + 1); elf_info->module->format_info[DFI_ELF] = modfmt; modfmt->module = elf_info->module; @@ -1089,8 +1065,8 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, elf_module_info->elf_addr = load_offset; - elf_module_info->file_map = fmap; - elf_reset_file_map(&fmap); + elf_module_info->file_map = *fmap; + elf_reset_file_map(fmap); if (dbghelp_options & SYMOPT_DEFERRED_LOADS) { elf_info->module->module.SymType = SymDeferred; @@ -1113,7 +1089,42 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, } else ret = FALSE; } -leave: + + return ret; +} + +/****************************************************************** + * elf_load_file + * + * Loads the information for ELF module stored in 'filename' + * the module has been loaded at 'load_offset' address + * returns + * -1 if the file cannot be found/opened + * 0 if the file doesn't contain symbolic info (or this info cannot be + * read or parsed) + * 1 on success + */ +static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, + unsigned long load_offset, unsigned long dyn_addr, + struct elf_info* elf_info) +{ + BOOL ret = FALSE; + struct image_file_map fmap; + + TRACE("Processing elf file '%s' at %08lx\n", debugstr_w(filename), load_offset); + + if (!elf_map_file(filename, &fmap)) return ret; + + /* Next, we need to find a few of the internal ELF headers within + * this thing. We need the main executable header, and the section + * table. + */ + if (!fmap.u.elf.elf_start && !load_offset) + ERR("Relocatable ELF %s, but no load address. Loading at 0x0000000\n", + debugstr_w(filename)); + + ret = elf_load_file_from_fmap(pcs, filename, &fmap, load_offset, dyn_addr, elf_info); + elf_unmap_file(&fmap); return ret;

1 0

Eric Pouech : dbghelp: Factorize a bit the ELF enumeration callbacks.
by Alexandre Julliard 28 Dec '10

28 Dec '10

Module: wine Branch: master Commit: 8740f1dc1e4d0f2d831c0928f66456bfcaefe82d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8740f1dc1e4d0f2d831c0928f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 27 15:03:12 2010 +0100 dbghelp: Factorize a bit the ELF enumeration callbacks. --- dlls/dbghelp/elf_module.c | 128 +++++++++++++++++++++----------------------- 1 files changed, 61 insertions(+), 67 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index b3502ca..b8ddfcb 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1279,65 +1279,6 @@ static BOOL elf_enum_modules_internal(const struct process* pcs, return TRUE; } -struct elf_sync -{ - struct process* pcs; - struct elf_info elf_info; -}; - -static BOOL elf_enum_sync_cb(const WCHAR* name, unsigned long load_addr, - unsigned long dyn_addr, void* user) -{ - struct elf_sync* es = user; - - elf_search_and_load_file(es->pcs, name, load_addr, dyn_addr, &es->elf_info); - return TRUE; -} - -/****************************************************************** - * elf_synchronize_module_list - * - * this functions rescans the debuggee module's list and synchronizes it with - * the one from 'pcs', ie: - * - if a module is in debuggee and not in pcs, it's loaded into pcs - * - if a module is in pcs and not in debuggee, it's unloaded from pcs - */ -BOOL elf_synchronize_module_list(struct process* pcs) -{ - struct module* module; - struct elf_sync es; - - for (module = pcs->lmodules; module; module = module->next) - { - if (module->type == DMT_ELF && !module->is_virtual) - module->format_info[DFI_ELF]->u.elf_info->elf_mark = 0; - } - - es.pcs = pcs; - es.elf_info.flags = ELF_INFO_MODULE; - if (!elf_enum_modules_internal(pcs, NULL, elf_enum_sync_cb, &es)) - return FALSE; - - module = pcs->lmodules; - while (module) - { - if (module->type == DMT_ELF && !module->is_virtual) - { - struct elf_module_info* elf_info = module->format_info[DFI_ELF]->u.elf_info; - - if (!elf_info->elf_mark && !elf_info->elf_loader) - { - module_remove(pcs, module); - /* restart all over */ - module = pcs->lmodules; - continue; - } - } - module = module->next; - } - return TRUE; -} - /****************************************************************** * elf_search_loader * @@ -1440,19 +1381,25 @@ static BOOL elf_load_cb(const WCHAR* name, unsigned long load_addr, unsigned long dyn_addr, void* user) { struct elf_load* el = user; + BOOL ret = TRUE; const WCHAR* p; - /* memcmp is needed for matches when bufstr contains also version information - * el->name: libc.so, name: libc.so.6.0 - */ - p = strrchrW(name, '/'); - if (!p++) p = name; - if (!memcmp(p, el->name, lstrlenW(el->name) * sizeof(WCHAR))) + if (el->name) + { + /* memcmp is needed for matches when bufstr contains also version information + * el->name: libc.so, name: libc.so.6.0 + */ + p = strrchrW(name, '/'); + if (!p++) p = name; + } + + if (!el->name || !memcmp(p, el->name, lstrlenW(el->name) * sizeof(WCHAR))) { el->ret = elf_search_and_load_file(el->pcs, name, load_addr, dyn_addr, &el->elf_info); - return FALSE; + if (el->name) ret = FALSE; } - return TRUE; + + return ret; } /****************************************************************** @@ -1494,6 +1441,53 @@ struct module* elf_load_module(struct process* pcs, const WCHAR* name, unsigned return el.elf_info.module; } +/****************************************************************** + * elf_synchronize_module_list + * + * this functions rescans the debuggee module's list and synchronizes it with + * the one from 'pcs', ie: + * - if a module is in debuggee and not in pcs, it's loaded into pcs + * - if a module is in pcs and not in debuggee, it's unloaded from pcs + */ +BOOL elf_synchronize_module_list(struct process* pcs) +{ + struct module* module; + struct elf_load el; + + for (module = pcs->lmodules; module; module = module->next) + { + if (module->type == DMT_ELF && !module->is_virtual) + module->format_info[DFI_ELF]->u.elf_info->elf_mark = 0; + } + + el.pcs = pcs; + el.elf_info.flags = ELF_INFO_MODULE; + el.ret = FALSE; + el.name = NULL; /* fetch all modules */ + + if (!elf_enum_modules_internal(pcs, NULL, elf_load_cb, &el)) + return FALSE; + + module = pcs->lmodules; + while (module) + { + if (module->type == DMT_ELF && !module->is_virtual) + { + struct elf_module_info* elf_info = module->format_info[DFI_ELF]->u.elf_info; + + if (!elf_info->elf_mark && !elf_info->elf_loader) + { + module_remove(pcs, module); + /* restart all over */ + module = pcs->lmodules; + continue; + } + } + module = module->next; + } + return TRUE; +} + #else /* !__ELF__ */ BOOL elf_find_section(struct image_file_map* fmap, const char* name,

1 0

Andrew Nguyen : wined3d: Handle the swapchain presentation interval with wglSwapIntervalEXT.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 12880784fea51b8f9f8e60c159f442a0f9f8e8e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12880784fea51b8f9f8e60c15… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Dec 27 06:44:21 2010 -0600 wined3d: Handle the swapchain presentation interval with wglSwapIntervalEXT. --- dlls/wined3d/context.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/wined3d_gl.h | 6 +++++- 3 files changed, 40 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d8988f8..f9b99b9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1280,6 +1280,7 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, int numSamples = 0; int pixel_format; unsigned int s; + int swap_interval; DWORD state; HGLRC ctx; HDC hdc; @@ -1460,6 +1461,36 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, goto out; } + switch (swapchain->presentParms.PresentationInterval) + { + case WINED3DPRESENT_INTERVAL_IMMEDIATE: + swap_interval = 0; + break; + case WINED3DPRESENT_INTERVAL_DEFAULT: + case WINED3DPRESENT_INTERVAL_ONE: + swap_interval = 1; + break; + case WINED3DPRESENT_INTERVAL_TWO: + swap_interval = 2; + break; + case WINED3DPRESENT_INTERVAL_THREE: + swap_interval = 3; + break; + case WINED3DPRESENT_INTERVAL_FOUR: + swap_interval = 4; + break; + default: + FIXME("Unknown presentation interval %08x\n", swapchain->presentParms.PresentationInterval); + swap_interval = 1; + } + + if (gl_info->supported[WGL_EXT_SWAP_CONTROL]) + { + if (!GL_EXTCALL(wglSwapIntervalEXT(swap_interval))) + ERR("wglSwapIntervalEXT failed to set swap interval %d for context %p, last error %#x\n", + swap_interval, ret, GetLastError()); + } + ENTER_GL(); glGetIntegerv(GL_AUX_BUFFERS, &ret->aux_buffers); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 742627d..da179a7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2572,6 +2572,10 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) gl_info->supported[WGL_ARB_PIXEL_FORMAT] = TRUE; TRACE_(d3d_caps)("FOUND: WGL_ARB_pixel_format support\n"); } + if (!strcmp(ThisExtn, "WGL_EXT_swap_control")) { + gl_info->supported[WGL_EXT_SWAP_CONTROL] = TRUE; + TRACE_(d3d_caps)("FOUND: WGL_EXT_swap_control support\n"); + } if (!strcmp(ThisExtn, "WGL_WINE_pixel_format_passthrough")) { gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH] = TRUE; TRACE_(d3d_caps)("FOUND: WGL_WINE_pixel_format_passthrough support\n"); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 0635347..a2e0140 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1836,6 +1836,7 @@ typedef enum wined3d_gl_extension SGIS_GENERATE_MIPMAP, /* WGL extensions */ WGL_ARB_PIXEL_FORMAT, + WGL_EXT_SWAP_CONTROL, WGL_WINE_PIXEL_FORMAT_PASSTHROUGH, /* Internally used */ WINED3D_GL_NORMALIZED_TEXRECT, @@ -3796,6 +3797,8 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLCHOOSEPIXELFORMATARBPROC)(HDC hdc, const int typedef BOOL (WINAPI *WINED3D_PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd); +typedef BOOL (WINAPI *WINED3D_PFNWGLSWAPINTERVALEXTPROC)(int interval); + #define GL_EXT_FUNCS_GEN \ /* GL_APPLE_fence */ \ USE_GL_FUNC(PGLFNGENFENCESAPPLEPROC, \ @@ -4531,6 +4534,7 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelForma USE_GL_FUNC(WINED3D_PFNWGLGETPIXELFORMATATTRIBIVARBPROC, wglGetPixelFormatAttribivARB, 0, NULL) \ USE_GL_FUNC(WINED3D_PFNWGLGETPIXELFORMATATTRIBFVARBPROC, wglGetPixelFormatAttribfvARB, 0, NULL) \ USE_GL_FUNC(WINED3D_PFNWGLCHOOSEPIXELFORMATARBPROC, wglChoosePixelFormatARB, 0, NULL) \ - USE_GL_FUNC(WINED3D_PFNWGLSETPIXELFORMATWINE, wglSetPixelFormatWINE, 0, NULL) + USE_GL_FUNC(WINED3D_PFNWGLSETPIXELFORMATWINE, wglSetPixelFormatWINE, 0, NULL) \ + USE_GL_FUNC(WINED3D_PFNWGLSWAPINTERVALEXTPROC, wglSwapIntervalEXT, 0, NULL) #endif /* __WINE_WINED3D_GL */

1 0

Andrew Nguyen : winex11.drv: Enhance the wrapper functions for WGL_EXT_swap_control.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: a7346e9fc85ae6bb27ebda494fa67bc5929d817f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7346e9fc85ae6bb27ebda494… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Dec 27 06:44:11 2010 -0600 winex11.drv: Enhance the wrapper functions for WGL_EXT_swap_control. --- dlls/winex11.drv/opengl.c | 44 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 8ea7ddb..792bc13 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -505,9 +505,11 @@ static BOOL has_opengl(void) /* It doesn't matter if these fail. They'll only be used if the driver reports the associated extension is available (and if a driver reports the extension is available but fails to provide the functions, it's quite broken) */ -#define LOAD_FUNCPTR(f) p##f = (void*)pglXGetProcAddressARB((const unsigned char*)#f) +#define LOAD_FUNCPTR(f) p##f = pglXGetProcAddressARB((const GLubyte *)#f) /* ARB GLX Extension */ LOAD_FUNCPTR(glXCreateContextAttribsARB); + /* SGI GLX Extension */ + LOAD_FUNCPTR(glXSwapIntervalSGI); /* NV GLX Extension */ LOAD_FUNCPTR(glXAllocateMemoryNV); LOAD_FUNCPTR(glXFreeMemoryNV); @@ -3400,7 +3402,9 @@ static const char * WINAPI X11DRV_wglGetExtensionsStringEXT(void) { * WGL_EXT_swap_control: wglGetSwapIntervalEXT */ static int WINAPI X11DRV_wglGetSwapIntervalEXT(VOID) { - FIXME("(),stub!\n"); + /* GLX_SGI_swap_control doesn't have any provisions for getting the swap + * interval, so the swap interval has to be tracked. */ + TRACE("()\n"); return swap_interval; } @@ -3413,13 +3417,37 @@ static BOOL WINAPI X11DRV_wglSwapIntervalEXT(int interval) { BOOL ret = TRUE; TRACE("(%d)\n", interval); - swap_interval = interval; - if (NULL != pglXSwapIntervalSGI) { - wine_tsx11_lock(); - ret = !pglXSwapIntervalSGI(interval); - wine_tsx11_unlock(); + + if (interval < 0) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + else if (interval == 0) + { + /* wglSwapIntervalEXT considers an interval value of zero to mean that + * vsync should be disabled, but glXSwapIntervalSGI considers such a + * value to be an error. Just silently ignore the request for now. */ + WARN("Request to disable vertical sync is not handled\n"); + swap_interval = 0; + } + else + { + if (pglXSwapIntervalSGI) + { + wine_tsx11_lock(); + ret = !pglXSwapIntervalSGI(interval); + wine_tsx11_unlock(); + } + else + WARN("GLX_SGI_swap_control extension is not available\n"); + + if (ret) + swap_interval = interval; + else + SetLastError(ERROR_DC_NOT_FOUND); } - else WARN("(): GLX_SGI_swap_control extension seems not supported\n"); + return ret; }

1 0

Andrew Nguyen : wined3d: Fix typo in GL_SGIS_generate_mipmap preprocessor definition.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 0f050b3ecb8aa77ffabf285248c2be70455999b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f050b3ecb8aa77ffabf28524… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Dec 27 06:44:01 2010 -0600 wined3d: Fix typo in GL_SGIS_generate_mipmap preprocessor definition. --- dlls/wined3d/wined3d_gl.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 0532207..0635347 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3710,8 +3710,8 @@ typedef void (WINE_GLAPI *PGLFNGETCOMBINERSTAGEPARAMETERFVNVPROC)(GLenum stage, #endif /* GL_SGIS_generate_mipmap */ -#ifndef GLX_SGIS_generate_mipmap -#define GLX_SGIS_generate_mipmap 1 +#ifndef GL_SGIS_generate_mipmap +#define GL_SGIS_generate_mipmap 1 #define GL_GENERATE_MIPMAP_SGIS 0x8191 #define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192 #endif

1 0

Andrew Nguyen : wined3d: Remove references to GLX_SGI_video_sync.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 7e13b1afaf11166710fb1c8a5474005559e8afef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e13b1afaf11166710fb1c8a5… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Dec 27 06:43:30 2010 -0600 wined3d: Remove references to GLX_SGI_video_sync. Usage of GLX_SGI_video_sync is problematic, and wined3d cannot use GLX extensions. --- dlls/wined3d/swapchain.c | 43 ------------------------------------------- dlls/wined3d/wined3d_gl.h | 10 ---------- 2 files changed, 0 insertions(+), 53 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e5ff786..8f594ae 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -229,8 +229,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, struct wined3d_context *context; RECT src_rect, dst_rect; BOOL render_to_fbo; - unsigned int sync; - int retval; IWineD3DSwapChain_SetDestWindowOverride(iface, hDestWindowOverride); @@ -453,47 +451,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, } } - if (This->presentParms.PresentationInterval != WINED3DPRESENT_INTERVAL_IMMEDIATE - && gl_info->supported[SGI_VIDEO_SYNC]) - { - if ((retval = GL_EXTCALL(glXGetVideoSyncSGI(&sync)))) - ERR("glXGetVideoSyncSGI failed(retval = %d\n", retval); - - switch(This->presentParms.PresentationInterval) { - case WINED3DPRESENT_INTERVAL_DEFAULT: - case WINED3DPRESENT_INTERVAL_ONE: - if(sync <= This->vSyncCounter) { - retval = GL_EXTCALL(glXWaitVideoSyncSGI(1, 0, &This->vSyncCounter)); - } else { - This->vSyncCounter = sync; - } - break; - case WINED3DPRESENT_INTERVAL_TWO: - if(sync <= This->vSyncCounter + 1) { - retval = GL_EXTCALL(glXWaitVideoSyncSGI(2, This->vSyncCounter & 0x1, &This->vSyncCounter)); - } else { - This->vSyncCounter = sync; - } - break; - case WINED3DPRESENT_INTERVAL_THREE: - if(sync <= This->vSyncCounter + 2) { - retval = GL_EXTCALL(glXWaitVideoSyncSGI(3, This->vSyncCounter % 0x3, &This->vSyncCounter)); - } else { - This->vSyncCounter = sync; - } - break; - case WINED3DPRESENT_INTERVAL_FOUR: - if(sync <= This->vSyncCounter + 3) { - retval = GL_EXTCALL(glXWaitVideoSyncSGI(4, This->vSyncCounter & 0x3, &This->vSyncCounter)); - } else { - This->vSyncCounter = sync; - } - break; - default: - FIXME("Unknown presentation interval %08x\n", This->presentParms.PresentationInterval); - } - } - context_release(context); TRACE("returning\n"); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 9c2c0c1..0532207 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1834,7 +1834,6 @@ typedef enum wined3d_gl_extension NV_VERTEX_PROGRAM3, /* SGI */ SGIS_GENERATE_MIPMAP, - SGI_VIDEO_SYNC, /* WGL extensions */ WGL_ARB_PIXEL_FORMAT, WGL_WINE_PIXEL_FORMAT_PASSTHROUGH, @@ -3717,10 +3716,6 @@ typedef void (WINE_GLAPI *PGLFNGETCOMBINERSTAGEPARAMETERFVNVPROC)(GLenum stage, #define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192 #endif -/* GLX_SGI_video_sync */ -typedef int (WINE_GLAPI *PGLXFNGETVIDEOSYNCSGIPROC)(unsigned int *); -typedef int (WINE_GLAPI *PGLXFNWAITVIDEOSYNCSGIPROC)(int, int, unsigned int *); - /* WGL_ARB_extensions_string */ typedef const char *(WINAPI *WINED3D_PFNWGLGETEXTENSIONSSTRINGARBPROC)(HDC hdc); @@ -4530,11 +4525,6 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelForma glCombinerParameterivNV, NV_REGISTER_COMBINERS, NULL) \ USE_GL_FUNC(PGLFNFINALCOMBINERINPUTNVPROC, \ glFinalCombinerInputNV, NV_REGISTER_COMBINERS, NULL) \ - /* GLX_SGI_video_sync */ \ - USE_GL_FUNC(PGLXFNGETVIDEOSYNCSGIPROC, \ - glXGetVideoSyncSGI, SGI_VIDEO_SYNC, NULL) \ - USE_GL_FUNC(PGLXFNWAITVIDEOSYNCSGIPROC, \ - glXWaitVideoSyncSGI, SGI_VIDEO_SYNC, NULL) #define WGL_EXT_FUNCS_GEN \ USE_GL_FUNC(WINED3D_PFNWGLGETEXTENSIONSSTRINGARBPROC, wglGetExtensionsStringARB, 0, NULL) \

1 0

Michael Stefaniuc : mshtml: COM cleanup for the rest of the *Window* ifaces in HTMLWindow.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 6b90fc236ee4c6bbad4d8f54a0b7739fdb666bdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b90fc236ee4c6bbad4d8f54a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 14:22:27 2010 +0100 mshtml: COM cleanup for the rest of the *Window* ifaces in HTMLWindow. --- dlls/mshtml/htmlwindow.c | 115 +++++++++++++++++++++--------------------- dlls/mshtml/mshtml_private.h | 8 +-- 2 files changed, 61 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b90fc236ee4c6bbad4d8…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLWindow2 iface.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 2e24de635d59e3709e2a38652ae759e09d7c5a4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e24de635d59e3709e2a38652… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 12:50:32 2010 +0100 mshtml: COM cleanup for the IHTMLWindow2 iface. --- dlls/mshtml/htmldoc.c | 12 +- dlls/mshtml/htmlframe.c | 2 +- dlls/mshtml/htmlframebase.c | 4 +- dlls/mshtml/htmlwindow.c | 228 +++++++++++++++++++++--------------------- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/nsio.c | 12 +- dlls/mshtml/nsservice.c | 2 +- dlls/mshtml/oleobj.c | 2 +- dlls/mshtml/persist.c | 2 +- dlls/mshtml/script.c | 2 +- 10 files changed, 135 insertions(+), 134 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e24de635d59e3709e2a3…

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 December 2010