June 2015 - Wine-Commits - list.winehq.org

Michael Stefaniuc : dmband/tests: Add some basic IDirectMusicTrack8 tests.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: 8fae7fd4cc40679187b6bb4b7a911a7161e9aa01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fae7fd4cc40679187b6bb4b7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 25 00:32:57 2015 +0200 dmband/tests: Add some basic IDirectMusicTrack8 tests. --- dlls/dmband/tests/dmband.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 0041807..e1f00ae 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -185,6 +185,44 @@ static void test_bandtrack(void) &IID_IDirectMusicTrack8, (void**)&dmt8); ok(hr == S_OK, "DirectMusicBandTrack create failed: %08x, expected S_OK\n", hr); + /* IDirectMusicTrack8 */ + todo_wine { + hr = IDirectMusicTrack8_Init(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %08x\n", hr); + hr = IDirectMusicTrack8_InitPlay(dmt8, NULL, NULL, NULL, 0, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_EndPlay(dmt8, NULL); + ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); + todo_wine { + hr = IDirectMusicTrack8_Play(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == DMUS_S_END, "IDirectMusicTrack8_Play failed: %08x\n", hr); + hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + todo_wine { + hr = IDirectMusicTrack8_Clone(dmt8, 0, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == DMUS_S_END, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr);

1 0

Michael Stefaniuc : dmband: IsParamSupported method doesn' t crashes on NULL.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: 6e98db3d4575e48cd688cc2e9313a77acad63018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e98db3d4575e48cd688cc2e9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 25 00:12:53 2015 +0200 dmband: IsParamSupported method doesn't crashes on NULL. --- dlls/dmband/bandtrack.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 14e368d..08dde14 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -159,6 +159,10 @@ static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_IsParamSupported ( ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); + + if (!rguidType) + return E_POINTER; + if (IsEqualGUID (rguidType, &GUID_BandParam) || IsEqualGUID (rguidType, &GUID_Clear_All_Bands) || IsEqualGUID (rguidType, &GUID_ConnectToDLSCollection)

1 0

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

June 25, 2015

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

Michael Stefaniuc : dmband: Implement the E_NOTIMPL methods of IDirectMusicTrack8.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: 6cbd743b30e758a259c9a299d6117405e5151416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cbd743b30e758a259c9a299d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 25 00:31:17 2015 +0200 dmband: Implement the E_NOTIMPL methods of IDirectMusicTrack8. --- dlls/dmband/bandtrack.c | 74 +++++++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 30 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 08dde14..3c00415 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -91,6 +91,11 @@ static const IUnknownVtbl DirectMusicBandTrack_Unknown_Vtbl = { }; /* IDirectMusicBandTrack IDirectMusicTrack8 part: */ +static inline IDirectMusicBandTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicBandTrack, TrackVtbl); +} + static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); @@ -182,16 +187,22 @@ static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_IsParamSupported ( return DMUS_E_TYPE_UNSUPPORTED; } -static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_AddNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_RemoveNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) { @@ -230,10 +241,13 @@ static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_SetParamEx(LPDIREC return S_OK; } -static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); - FIXME("(%p, %p, %d, %p): stub\n", This, pContext, dwTrackGroup, ppResultTrack); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context, + DWORD trackgroup, IDirectMusicTrack **track) +{ + IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + return E_NOTIMPL; } static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 iface, IDirectMusicTrack* pNewTrack, MUSIC_TIME mtJoin, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { @@ -243,24 +257,24 @@ static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Join (LPDIRECTMUSI } static const IDirectMusicTrack8Vtbl DirectMusicBandTrack_DirectMusicTrack_Vtbl = { - IDirectMusicBandTrack_IDirectMusicTrack_QueryInterface, - IDirectMusicBandTrack_IDirectMusicTrack_AddRef, - IDirectMusicBandTrack_IDirectMusicTrack_Release, - IDirectMusicBandTrack_IDirectMusicTrack_Init, - IDirectMusicBandTrack_IDirectMusicTrack_InitPlay, - IDirectMusicBandTrack_IDirectMusicTrack_EndPlay, - IDirectMusicBandTrack_IDirectMusicTrack_Play, - IDirectMusicBandTrack_IDirectMusicTrack_GetParam, - IDirectMusicBandTrack_IDirectMusicTrack_SetParam, - IDirectMusicBandTrack_IDirectMusicTrack_IsParamSupported, - IDirectMusicBandTrack_IDirectMusicTrack_AddNotificationType, - IDirectMusicBandTrack_IDirectMusicTrack_RemoveNotificationType, - IDirectMusicBandTrack_IDirectMusicTrack_Clone, - IDirectMusicBandTrack_IDirectMusicTrack_PlayEx, - IDirectMusicBandTrack_IDirectMusicTrack_GetParamEx, - IDirectMusicBandTrack_IDirectMusicTrack_SetParamEx, - IDirectMusicBandTrack_IDirectMusicTrack_Compose, - IDirectMusicBandTrack_IDirectMusicTrack_Join + IDirectMusicBandTrack_IDirectMusicTrack_QueryInterface, + IDirectMusicBandTrack_IDirectMusicTrack_AddRef, + IDirectMusicBandTrack_IDirectMusicTrack_Release, + IDirectMusicBandTrack_IDirectMusicTrack_Init, + IDirectMusicBandTrack_IDirectMusicTrack_InitPlay, + IDirectMusicBandTrack_IDirectMusicTrack_EndPlay, + IDirectMusicBandTrack_IDirectMusicTrack_Play, + IDirectMusicBandTrack_IDirectMusicTrack_GetParam, + IDirectMusicBandTrack_IDirectMusicTrack_SetParam, + IDirectMusicBandTrack_IDirectMusicTrack_IsParamSupported, + IDirectMusicTrack8Impl_AddNotificationType, + IDirectMusicTrack8Impl_RemoveNotificationType, + IDirectMusicBandTrack_IDirectMusicTrack_Clone, + IDirectMusicBandTrack_IDirectMusicTrack_PlayEx, + IDirectMusicBandTrack_IDirectMusicTrack_GetParamEx, + IDirectMusicBandTrack_IDirectMusicTrack_SetParamEx, + IDirectMusicTrack8Impl_Compose, + IDirectMusicBandTrack_IDirectMusicTrack_Join }; /* IDirectMusicBandTrack IPersistStream part: */

1 0

Ken Thomases : dbghelp: Move the macho_file_map structure into image_file_map.
by Alexandre Julliard June 25, 2015

June 25, 2015

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

June 25, 2015

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

Thomas Faber : dimm.idl: Add IActiveIMMMessagePumpOwner.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: 38fb26fbb3a2e3318575197d0a9e7592f8853c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=38fb26fbb3a2e3318575197d0… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Jun 23 15:36:53 2015 +0200 dimm.idl: Add IActiveIMMMessagePumpOwner. --- include/dimm.idl | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/include/dimm.idl b/include/dimm.idl index 851ec90..3e31811 100644 --- a/include/dimm.idl +++ b/include/dimm.idl @@ -579,6 +579,20 @@ interface IActiveIMMApp : IUnknown } [ + object, + uuid(b5cf2cfa-8aeb-11d1-9364-0060b067b86e), + pointer_default(unique) +] +interface IActiveIMMMessagePumpOwner : IUnknown +{ + HRESULT Start(); + HRESULT End(); + HRESULT OnTranslateMessage([in] const MSG *msg); + HRESULT Pause([out] DWORD *cookie); + HRESULT Resume([in] DWORD cookie); +} + +[ uuid(4955dd33-b159-11d0-8fcf-00aa006bcc59) ] coclass CActiveIMM @@ -586,5 +600,5 @@ coclass CActiveIMM [default] interface IActiveIMMApp; /* interface IActiveIMMIME; */ /* interface IActiveIMMRegistrar; */ - /* interface IActiveIMMMessagePumpOwner; */ + interface IActiveIMMMessagePumpOwner; }

1 0

Ken Thomases : dbghelp: Implement the image_private.h functions for Mach-O modules.
by Alexandre Julliard June 25, 2015

June 25, 2015

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

Akihiro Sagawa : winetest: Add SystemPreferredUILanguages to the log.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: c908c9c7c9e0da51a2b35915965e5a1d519497dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c908c9c7c9e0da51a2b359159… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 25 00:42:07 2015 +0900 winetest: Add SystemPreferredUILanguages to the log. A few GDI functions are affected by System account's display language (by GetSystemPreferredUILanguages). --- programs/winetest/main.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 0149377..1eb49b6 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -445,20 +445,35 @@ static void print_version (void) static void print_language(void) { HMODULE hkernel32; + BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, PULONG, PZZWSTR, PULONG); LANGID (WINAPI *pGetUserDefaultUILanguage)(void); LANGID (WINAPI *pGetThreadUILanguage)(void); - xprintf (" SystemDefaultLCID=%x\n", GetSystemDefaultLCID()); - xprintf (" UserDefaultLCID=%x\n", GetUserDefaultLCID()); - xprintf (" ThreadLocale=%x\n", GetThreadLocale()); + xprintf (" SystemDefaultLCID=%04x\n", GetSystemDefaultLCID()); + xprintf (" UserDefaultLCID=%04x\n", GetUserDefaultLCID()); + xprintf (" ThreadLocale=%04x\n", GetThreadLocale()); hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetSystemPreferredUILanguages = (void*)GetProcAddress(hkernel32, "GetSystemPreferredUILanguages"); pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); + + if (pGetSystemPreferredUILanguages && !running_under_wine()) + { + WCHAR langW[32]; + ULONG num, size = sizeof(langW)/sizeof(langW[0]); + if (pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &num, langW, &size)) + { + char lang[32], *p = lang; + WideCharToMultiByte(CP_ACP, 0, langW, size, lang, sizeof(lang), NULL, NULL); + for (p += strlen(p) + 1; *p != '\0'; p += strlen(p) + 1) *(p - 1) = ','; + xprintf (" SystemPreferredUILanguages=%s\n", lang); + } + } if (pGetUserDefaultUILanguage) - xprintf (" UserDefaultUILanguage=%x\n", pGetUserDefaultUILanguage()); + xprintf (" UserDefaultUILanguage=%04x\n", pGetUserDefaultUILanguage()); if (pGetThreadUILanguage) - xprintf (" ThreadUILanguage=%x\n", pGetThreadUILanguage()); + xprintf (" ThreadUILanguage=%04x\n", pGetThreadUILanguage()); } static inline BOOL is_dot_dir(const char* x)

1 0

Sebastian Lackner : windowscodecs/tests: Fix test condition which is always true.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: c0f5d024ca0d2b1248b9ba0478f4678c5e981a4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f5d024ca0d2b1248b9ba047… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jun 25 03:17:47 2015 +0200 windowscodecs/tests: Fix test condition which is always true. --- dlls/windowscodecs/tests/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 8a22970..64ccab5 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -223,7 +223,7 @@ static void test_pixelformat_info(void) memset(value, 0xaa, 256 * sizeof(WCHAR)); hr = IWICComponentInfo_GetAuthor(info, len-1, value, NULL); ok(hr == E_INVALIDARG, "GetAuthor failed, hr=%x\n", hr); - ok(value[0] = 0xaaaa, "string modified\n"); + ok(value[0] == 0xaaaa, "string modified\n"); len = 0xdeadbeef; memset(value, 0xaa, 256 * sizeof(WCHAR));

1 0