wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Ken Thomases : dbghelp: Implement the image_private.h functions for Mach-O modules.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 0bfa11455c29d13334c0cdecf76b54916458157a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bfa11455c29d13334c0cdecf… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 24 17:17:47 2015 -0500 dbghelp: Implement the image_private.h functions for Mach-O modules. --- dlls/dbghelp/image_private.h | 33 +++++--- dlls/dbghelp/macho_module.c | 182 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 177 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0bfa11455c29d13334c0c…

1 0

Ken Thomases : dbghelp: For Mach-O, keep the module file mapped for as long as the module is tracked.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 729b53fb9eb52e16633ef8efe4931b98d88039c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=729b53fb9eb52e16633ef8efe… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 24 17:17:46 2015 -0500 dbghelp: For Mach-O, keep the module file mapped for as long as the module is tracked. --- dlls/dbghelp/macho_module.c | 70 ++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 39 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 234812a..76280c8 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -95,6 +95,7 @@ typedef struct nlist macho_nlist; struct macho_module_info { + struct image_file_map file_map; unsigned long load_addr; unsigned short in_use : 1, is_loader : 1; @@ -429,6 +430,19 @@ static int macho_load_section_info(struct macho_file_map* fmap, const struct loa } /****************************************************************** + * reset_file_map + */ +static inline void reset_file_map(struct image_file_map* ifm) +{ + struct macho_file_map* fmap = &ifm->u.macho; + + fmap->fd = -1; + fmap->load_commands = IMAGE_NO_MAP; + fmap->num_sections = 0; + fmap->sect = NULL; +} + +/****************************************************************** * macho_map_file * * Maps a Mach-O file into memory (and checks it's a real Mach-O file) @@ -445,10 +459,7 @@ static BOOL macho_map_file(const WCHAR* filenameW, struct image_file_map* ifm) TRACE("(%s, %p)\n", debugstr_w(filenameW), fmap); - fmap->fd = -1; - fmap->load_commands = IMAGE_NO_MAP; - fmap->num_sections = 0; - fmap->sect = NULL; + reset_file_map(ifm); ifm->modtype = DMT_MACHO; #ifdef _WIN64 @@ -854,20 +865,24 @@ static void macho_finish_stabs(struct module* module, struct hash_table* ht_symt } /****************************************************************** - * macho_load_debug_info_from_map + * macho_load_debug_info * - * Loads the symbolic information from a Mach-O module. - * Returns - * FALSE if the file doesn't contain symbolic info (or this info - * cannot be read or parsed) - * TRUE on success + * Loads Mach-O debugging information from the module image file. */ -static BOOL macho_load_debug_info_from_map(struct module* module, - struct macho_file_map* fmap) +BOOL macho_load_debug_info(struct module* module) { BOOL ret = FALSE; struct macho_debug_info mdi; int result; + struct macho_file_map *fmap; + + if (module->type != DMT_MACHO || !module->format_info[DFI_MACHO]->u.macho_info) + { + ERR("Bad Mach-O module '%s'\n", debugstr_w(module->module.LoadedImageName)); + return FALSE; + } + + fmap = &module->format_info[DFI_MACHO]->u.macho_info->file_map.u.macho; TRACE("(%p, %p/%d)\n", module, fmap, fmap->fd); @@ -890,32 +905,6 @@ static BOOL macho_load_debug_info_from_map(struct module* module, } /****************************************************************** - * macho_load_debug_info - * - * Loads Mach-O debugging information from the module image file. - */ -BOOL macho_load_debug_info(struct module* module) -{ - BOOL ret = TRUE; - struct image_file_map fmap; - - TRACE("(%p)\n", module); - - if (module->type != DMT_MACHO || !module->format_info[DFI_MACHO]->u.macho_info) - { - ERR("Bad Mach-O module '%s'\n", debugstr_w(module->module.LoadedImageName)); - return FALSE; - } - - ret = macho_map_file(module->module.LoadedImageName, &fmap); - if (ret) - ret = macho_load_debug_info_from_map(module, &fmap.u.macho); - - macho_unmap_file(&fmap); - return ret; -} - -/****************************************************************** * macho_fetch_file_info * * Gathers some more information for a Mach-O module from a given file @@ -940,6 +929,7 @@ BOOL macho_fetch_file_info(const WCHAR* name, DWORD_PTR* base, */ static void macho_module_remove(struct process* pcs, struct module_format* modfmt) { + macho_unmap_file(&modfmt->u.macho_info->file_map); HeapFree(GetProcessHeap(), 0, modfmt); } @@ -1043,9 +1033,11 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, macho_module_info->load_addr = load_addr; + macho_module_info->file_map = fmap; + reset_file_map(&fmap); if (dbghelp_options & SYMOPT_DEFERRED_LOADS) macho_info->module->module.SymType = SymDeferred; - else if (!macho_load_debug_info_from_map(macho_info->module, &fmap.u.macho)) + else if (!macho_load_debug_info(macho_info->module)) ret = FALSE; macho_info->module->format_info[DFI_MACHO]->u.macho_info->in_use = 1;

1 0

Ken Thomases : dbghelp: Move the macho_file_map structure into image_file_map.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: e15e9331cb856768ae2889dd090296a2d12c8929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e15e9331cb856768ae2889dd0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 24 17:17:45 2015 -0500 dbghelp: Move the macho_file_map structure into image_file_map. --- dlls/dbghelp/image_private.h | 32 +++++++ dlls/dbghelp/macho_module.c | 210 +++++++++++++++++++------------------------ 2 files changed, 124 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e15e9331cb856768ae288…

1 0

Ken Thomases : dbghelp: Use existing IMAGE_NO_MAP constant instead of redundant MACHO_NO_MAP.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: dcbec3bf6acfdf83efcd224e8d6474b3ce2cbafe URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcbec3bf6acfdf83efcd224e8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 24 17:13:58 2015 -0500 dbghelp: Use existing IMAGE_NO_MAP constant instead of redundant MACHO_NO_MAP. --- dlls/dbghelp/dbghelp_private.h | 1 - dlls/dbghelp/macho_module.c | 29 +++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index b620020..827cfa6 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -569,7 +569,6 @@ struct elf_thunk_area; extern int elf_is_in_thunk_area(unsigned long addr, const struct elf_thunk_area* thunks) DECLSPEC_HIDDEN; /* macho_module.c */ -#define MACHO_NO_MAP ((const void*)-1) extern BOOL macho_enum_modules(HANDLE hProc, enum_modules_cb, void*) DECLSPEC_HIDDEN; extern BOOL macho_fetch_file_info(const WCHAR* name, DWORD_PTR* base, DWORD* size, DWORD* checksum) DECLSPEC_HIDDEN; extern BOOL macho_load_debug_info(struct module* module) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 0e353e7..ac9ea5e 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -65,6 +65,7 @@ struct dyld_all_image_infos { #include "winternl.h" #include "wine/library.h" #include "wine/debug.h" +#include "image_private.h" #ifdef WORDS_BIGENDIAN #define swap_ulong_be_to_host(n) (n) @@ -190,7 +191,7 @@ static const char* macho_map_range(const struct macho_file_map* fmap, unsigned l TRACE("Mapped (0x%08lx - 0x%08lx) to %p\n", aligned_offset, aligned_map_end, aligned_ptr); - if (aligned_ptr == MAP_FAILED) return MACHO_NO_MAP; + if (aligned_ptr == MAP_FAILED) return IMAGE_NO_MAP; return (const char*)aligned_ptr + misalign; } @@ -204,7 +205,7 @@ static void macho_unmap_range(const void** mapped, const struct macho_file_map* { TRACE("(%p, %p/%d, 0x%08lx, 0x%08lx)\n", mapped, fmap, fmap->fd, offset, len); - if (mapped && *mapped != MACHO_NO_MAP) + if (mapped && *mapped != IMAGE_NO_MAP) { unsigned long misalign, aligned_offset, aligned_map_end, map_size; void* aligned_ptr; @@ -216,7 +217,7 @@ static void macho_unmap_range(const void** mapped, const struct macho_file_map* if (munmap(aligned_ptr, map_size) < 0) WARN("Couldn't unmap the range\n"); TRACE("Unmapped (0x%08lx - 0x%08lx) from %p - %p\n", aligned_offset, aligned_map_end, aligned_ptr, (char*)aligned_ptr + map_size); - *mapped = MACHO_NO_MAP; + *mapped = IMAGE_NO_MAP; } } @@ -244,10 +245,10 @@ static BOOL macho_map_ranges(const struct macho_file_map* fmap, if (aligned_map_end1 < aligned_offset2 || aligned_map_end2 < aligned_offset1) { *mapped1 = macho_map_range(fmap, offset1, len1); - if (*mapped1 != MACHO_NO_MAP) + if (*mapped1 != IMAGE_NO_MAP) { *mapped2 = macho_map_range(fmap, offset2, len2); - if (*mapped2 == MACHO_NO_MAP) + if (*mapped2 == IMAGE_NO_MAP) macho_unmap_range(mapped1, fmap, offset1, len1); } } @@ -256,20 +257,20 @@ static BOOL macho_map_ranges(const struct macho_file_map* fmap, if (offset1 < offset2) { *mapped1 = macho_map_range(fmap, offset1, offset2 + len2 - offset1); - if (*mapped1 != MACHO_NO_MAP) + if (*mapped1 != IMAGE_NO_MAP) *mapped2 = (const char*)*mapped1 + offset2 - offset1; } else { *mapped2 = macho_map_range(fmap, offset2, offset1 + len1 - offset2); - if (*mapped2 != MACHO_NO_MAP) + if (*mapped2 != IMAGE_NO_MAP) *mapped1 = (const char*)*mapped2 + offset1 - offset2; } } TRACE(" => %p, %p\n", *mapped1, *mapped2); - return (*mapped1 != MACHO_NO_MAP) && (*mapped2 != MACHO_NO_MAP); + return (*mapped1 != IMAGE_NO_MAP) && (*mapped2 != IMAGE_NO_MAP); } /****************************************************************** @@ -303,12 +304,12 @@ static void macho_unmap_ranges(const struct macho_file_map* fmap, if (offset1 < offset2) { macho_unmap_range(mapped1, fmap, offset1, offset2 + len2 - offset1); - *mapped2 = MACHO_NO_MAP; + *mapped2 = IMAGE_NO_MAP; } else { macho_unmap_range(mapped2, fmap, offset2, offset1 + len1 - offset2); - *mapped1 = MACHO_NO_MAP; + *mapped1 = IMAGE_NO_MAP; } } } @@ -320,7 +321,7 @@ static void macho_unmap_ranges(const struct macho_file_map* fmap, */ static const struct load_command* macho_map_load_commands(struct macho_file_map* fmap) { - if (fmap->load_commands == MACHO_NO_MAP) + if (fmap->load_commands == IMAGE_NO_MAP) { fmap->load_commands = (const struct load_command*) macho_map_range( fmap, sizeof(fmap->mach_header), fmap->mach_header.sizeofcmds); @@ -337,7 +338,7 @@ static const struct load_command* macho_map_load_commands(struct macho_file_map* */ static void macho_unmap_load_commands(struct macho_file_map* fmap) { - if (fmap->load_commands != MACHO_NO_MAP) + if (fmap->load_commands != IMAGE_NO_MAP) { TRACE("Unmapping load commands: %p\n", fmap->load_commands); macho_unmap_range((const void**)&fmap->load_commands, fmap, @@ -376,7 +377,7 @@ static int macho_enum_load_commands(struct macho_file_map* fmap, unsigned cmd, TRACE("(%p/%d, %u, %p, %p)\n", fmap, fmap->fd, cmd, cb, user); - if ((lc = macho_map_load_commands(fmap)) == MACHO_NO_MAP) return -1; + if ((lc = macho_map_load_commands(fmap)) == IMAGE_NO_MAP) return -1; TRACE("%d total commands\n", fmap->mach_header.ncmds); @@ -456,7 +457,7 @@ static BOOL macho_map_file(const WCHAR* filenameW, struct macho_file_map* fmap) TRACE("(%s, %p)\n", debugstr_w(filenameW), fmap); fmap->fd = -1; - fmap->load_commands = MACHO_NO_MAP; + fmap->load_commands = IMAGE_NO_MAP; RtlInitializeBitMap(&fmap->sect_is_code, fmap->sect_is_code_buff, MAX_SECT + 1); len = WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, NULL, 0, NULL, NULL);

1 0

Ken Thomases : dbghelp: Remove the unused arch_size field of struct macho_file_map.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 41d741761f47d8aa2af8268b4ed5ef35f23b479b URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d741761f47d8aa2af8268b4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 24 17:13:57 2015 -0500 dbghelp: Remove the unused arch_size field of struct macho_file_map. It was set, but never read. --- dlls/dbghelp/macho_module.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 54801ef..0e353e7 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -129,7 +129,6 @@ struct macho_file_map /* The portion of the file which is this architecture. mach_header was * read from arch_offset. */ unsigned arch_offset; - unsigned arch_size; /* The range of address space covered by all segments. */ size_t segs_start; @@ -501,7 +500,6 @@ static BOOL macho_map_file(const WCHAR* filenameW, struct macho_file_map* fmap) if (swap_ulong_be_to_host(fat_arch.cputype) == TARGET_CPU_TYPE) { fmap->arch_offset = swap_ulong_be_to_host(fat_arch.offset); - fmap->arch_size = swap_ulong_be_to_host(fat_arch.size); break; } } @@ -511,7 +509,6 @@ static BOOL macho_map_file(const WCHAR* filenameW, struct macho_file_map* fmap) else { fmap->arch_offset = 0; - fmap->arch_size = statbuf.st_size; TRACE("... not a fat header\n"); }

1 0

Ken Thomases : dbghelp: Enable enumerating and loading 64-bit Mach-O modules.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 4923f9afd54a761b1f7598e274f617d0e8c102f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4923f9afd54a761b1f7598e27… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 24 17:13:56 2015 -0500 dbghelp: Enable enumerating and loading 64-bit Mach-O modules. --- dlls/dbghelp/macho_module.c | 129 +++++++++++++++++++++++++------------------- 1 file changed, 75 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4923f9afd54a761b1f759…

1 0

Ken Thomases : dbghelp: Fix a leak of the Mach-O module structure by adding a module_remove callback.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 378d557d77cb32d6855201b5fcbdf4dff460fb09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=378d557d77cb32d6855201b5f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 24 17:13:55 2015 -0500 dbghelp: Fix a leak of the Mach-O module structure by adding a module_remove callback. --- dlls/dbghelp/macho_module.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 31beafa..73beb57 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -943,6 +943,14 @@ BOOL macho_fetch_file_info(const WCHAR* name, DWORD_PTR* base, } /****************************************************************** + * macho_module_remove + */ +static void macho_module_remove(struct process* pcs, struct module_format* modfmt) +{ + HeapFree(GetProcessHeap(), 0, modfmt); +} + +/****************************************************************** * macho_load_file * * Loads the information for Mach-O module stored in 'filename'. @@ -1036,7 +1044,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, macho_info->module->format_info[DFI_MACHO] = modfmt; modfmt->module = macho_info->module; - modfmt->remove = NULL; + modfmt->remove = macho_module_remove; modfmt->loc_compute = NULL; modfmt->u.macho_info = macho_module_info;

1 0

Ken Thomases : dbghelp: Eliminate an unnecessary parameter from macho_load_debug_info().
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 8430ebc6b535a3550a72a01422f0d50825ae8a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8430ebc6b535a3550a72a0142… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 24 17:13:54 2015 -0500 dbghelp: Eliminate an unnecessary parameter from macho_load_debug_info(). >From outside of macho_module.c, it's only called with NULL. When it's called with a non-NULL parameter, it's just a thin wrapper around macho_load_debug_info_from_map(), so the code can just call that directly. --- dlls/dbghelp/dbghelp_private.h | 3 +-- dlls/dbghelp/macho_module.c | 20 ++++++++------------ dlls/dbghelp/module.c | 2 +- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 56a5bb8..b620020 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -572,8 +572,7 @@ extern int elf_is_in_thunk_area(unsigned long addr, const struct elf_th #define MACHO_NO_MAP ((const void*)-1) extern BOOL macho_enum_modules(HANDLE hProc, enum_modules_cb, void*) DECLSPEC_HIDDEN; extern BOOL macho_fetch_file_info(const WCHAR* name, DWORD_PTR* base, DWORD* size, DWORD* checksum) DECLSPEC_HIDDEN; -struct macho_file_map; -extern BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap) DECLSPEC_HIDDEN; +extern BOOL macho_load_debug_info(struct module* module) DECLSPEC_HIDDEN; extern struct module* macho_load_module(struct process* pcs, const WCHAR* name, unsigned long) DECLSPEC_HIDDEN; extern BOOL macho_read_wine_loader_dbg_info(struct process* pcs) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index bb49aa5..31beafa 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -901,12 +901,12 @@ static BOOL macho_load_debug_info_from_map(struct module* module, * * Loads Mach-O debugging information from the module image file. */ -BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap) +BOOL macho_load_debug_info(struct module* module) { BOOL ret = TRUE; - struct macho_file_map my_fmap; + struct macho_file_map fmap; - TRACE("(%p, %p/%d)\n", module, fmap, fmap ? fmap->fd : -1); + TRACE("(%p)\n", module); if (module->type != DMT_MACHO || !module->format_info[DFI_MACHO]->u.macho_info) { @@ -914,15 +914,11 @@ BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap) return FALSE; } - if (!fmap) - { - fmap = &my_fmap; - ret = macho_map_file(module->module.LoadedImageName, fmap); - } + ret = macho_map_file(module->module.LoadedImageName, &fmap); if (ret) - ret = macho_load_debug_info_from_map(module, fmap); + ret = macho_load_debug_info_from_map(module, &fmap); - if (fmap == &my_fmap) macho_unmap_file(fmap); + macho_unmap_file(&fmap); return ret; } @@ -1048,7 +1044,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, if (dbghelp_options & SYMOPT_DEFERRED_LOADS) macho_info->module->module.SymType = SymDeferred; - else if (!macho_load_debug_info(macho_info->module, &fmap)) + else if (!macho_load_debug_info_from_map(macho_info->module, &fmap)) ret = FALSE; macho_info->module->format_info[DFI_MACHO]->u.macho_info->in_use = 1; @@ -1480,7 +1476,7 @@ struct module* macho_load_module(struct process* pcs, const WCHAR* name, unsign return NULL; } -BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap) +BOOL macho_load_debug_info(struct module* module) { return FALSE; } diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 15769e8..10b0107 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -366,7 +366,7 @@ BOOL module_get_debug(struct module_pair* pair) &idslW64); break; case DMT_MACHO: - ret = macho_load_debug_info(pair->effective, NULL); + ret = macho_load_debug_info(pair->effective); break; default: ret = FALSE;

1 0

Ken Thomases : dbghelp: Fix STABS support for 64-bit on OS X.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 604ce29cb3b31c71496d581a415f8e41f4d026a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604ce29cb3b31c71496d581a4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 24 16:31:14 2015 -0500 dbghelp: Fix STABS support for 64-bit on OS X. OS X uses a struct nlist_64 for 64-bit images, where the n_value field is a 64-bit unsigned integer. --- dlls/dbghelp/stabs.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 1d0d858..177c6bc 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -111,7 +111,11 @@ struct stab_nlist unsigned char n_type; char n_other; short n_desc; +#if defined(__APPLE__) && defined(_WIN64) + unsigned long n_value; +#else unsigned n_value; +#endif }; static void stab_strcpy(char* dest, int sz, const char* source) @@ -1465,7 +1469,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, case 35: case 36: loc.reg = CV_REG_MM0 + stab_ptr->n_value - 29; break; default: - FIXME("Unknown register value (%u)\n", stab_ptr->n_value); + FIXME("Unknown register value (%lu)\n", (unsigned long)stab_ptr->n_value); loc.reg = CV_REG_NONE; break; } @@ -1615,7 +1619,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, case N_EXCL: if (stabs_add_include(stabs_find_include(ptr, stab_ptr->n_value)) < 0) { - ERR("Excluded header not found (%s,%d)\n", ptr, stab_ptr->n_value); + ERR("Excluded header not found (%s,%ld)\n", ptr, (unsigned long)stab_ptr->n_value); module_reset_debug_info(module); ret = FALSE; goto done; @@ -1661,8 +1665,8 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, break; } stabbuff[0] = '\0'; - TRACE("0x%02x %x %s\n", - stab_ptr->n_type, stab_ptr->n_value, debugstr_a(strs + stab_ptr->n_strx)); + TRACE("0x%02x %lx %s\n", + stab_ptr->n_type, (unsigned long)stab_ptr->n_value, debugstr_a(strs + stab_ptr->n_strx)); } module->module.SymType = SymDia; module->module.CVSig = 'S' | ('T' << 8) | ('A' << 16) | ('B' << 24);

1 0

Thomas Faber : msimtf: Add stub implementation for IActiveIMMMessagePumpOwner.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: c4be28ed2605140d3cd9f3908a0f4535ed51c1d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4be28ed2605140d3cd9f3908… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Jun 23 15:38:16 2015 +0200 msimtf: Add stub implementation for IActiveIMMMessagePumpOwner. --- dlls/msimtf/activeimmapp.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/msimtf/activeimmapp.c b/dlls/msimtf/activeimmapp.c index a9c259a..5749735 100644 --- a/dlls/msimtf/activeimmapp.c +++ b/dlls/msimtf/activeimmapp.c @@ -42,6 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msimtf); typedef struct tagActiveIMMApp { IActiveIMMApp IActiveIMMApp_iface; + IActiveIMMMessagePumpOwner IActiveIMMMessagePumpOwner_iface; LONG refCount; } ActiveIMMApp; @@ -66,6 +67,10 @@ static HRESULT WINAPI ActiveIMMApp_QueryInterface (IActiveIMMApp* iface, { *ppvOut = This; } + else if (IsEqualIID(iid, &IID_IActiveIMMMessagePumpOwner)) + { + *ppvOut = &This->IActiveIMMMessagePumpOwner_iface; + } if (*ppvOut) { @@ -812,6 +817,80 @@ static const IActiveIMMAppVtbl ActiveIMMAppVtbl = ActiveIMMApp_EnumInputContext }; +static inline ActiveIMMApp *impl_from_IActiveIMMMessagePumpOwner(IActiveIMMMessagePumpOwner *iface) +{ + return CONTAINING_RECORD(iface, ActiveIMMApp, IActiveIMMMessagePumpOwner_iface); +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_QueryInterface(IActiveIMMMessagePumpOwner* iface, + REFIID iid, LPVOID *ppvOut) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + return IActiveIMMApp_QueryInterface(&This->IActiveIMMApp_iface, iid, ppvOut); +} + +static ULONG WINAPI ActiveIMMMessagePumpOwner_AddRef(IActiveIMMMessagePumpOwner* iface) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + return IActiveIMMApp_AddRef(&This->IActiveIMMApp_iface); +} + +static ULONG WINAPI ActiveIMMMessagePumpOwner_Release(IActiveIMMMessagePumpOwner* iface) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + return IActiveIMMApp_Release(&This->IActiveIMMApp_iface); +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_Start(IActiveIMMMessagePumpOwner* iface) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + FIXME("(%p)->(): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_End(IActiveIMMMessagePumpOwner* iface) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + FIXME("(%p)->(): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_OnTranslateMessage(IActiveIMMMessagePumpOwner* iface, + const MSG *msg) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + FIXME("(%p)->(%p): stub\n", This, msg); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_Pause(IActiveIMMMessagePumpOwner* iface, + DWORD *cookie) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + FIXME("(%p)->(%p): stub\n", This, cookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_Resume(IActiveIMMMessagePumpOwner* iface, + DWORD cookie) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + FIXME("(%p)->(%u): stub\n", This, cookie); + return E_NOTIMPL; +} + +static const IActiveIMMMessagePumpOwnerVtbl ActiveIMMMessagePumpOwnerVtbl = +{ + ActiveIMMMessagePumpOwner_QueryInterface, + ActiveIMMMessagePumpOwner_AddRef, + ActiveIMMMessagePumpOwner_Release, + ActiveIMMMessagePumpOwner_Start, + ActiveIMMMessagePumpOwner_End, + ActiveIMMMessagePumpOwner_OnTranslateMessage, + ActiveIMMMessagePumpOwner_Pause, + ActiveIMMMessagePumpOwner_Resume, +}; + DECLSPEC_HIDDEN HRESULT ActiveIMMApp_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) { ActiveIMMApp *This; @@ -823,6 +902,7 @@ DECLSPEC_HIDDEN HRESULT ActiveIMMApp_Constructor(IUnknown *pUnkOuter, IUnknown * return E_OUTOFMEMORY; This->IActiveIMMApp_iface.lpVtbl = &ActiveIMMAppVtbl; + This->IActiveIMMMessagePumpOwner_iface.lpVtbl = &ActiveIMMMessagePumpOwnerVtbl; This->refCount = 1; TRACE("returning %p\n",This);

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
61
Older →

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 June 2015