March 2020 - Wine-Commits - list.winehq.org

Jactry Zeng : news: Google Summer of Code 2020.
by Alexandre Julliard March 24, 2020

March 24, 2020

Module: website Branch: master Commit: 4d0b8d10872c131d443969264b27703bb001ee5b URL: https://source.winehq.org/git/website.git/?a=commit;h=4d0b8d10872c131d44396… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Tue Mar 24 11:25:45 2020 +0800 news: Google Summer of Code 2020. Signed-off-by: Jactry Zeng <jactry92(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020032401.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/news/en/2020032401.xml b/news/en/2020032401.xml new file mode 100644 index 00000000..024e0be3 --- /dev/null +++ b/news/en/2020032401.xml @@ -0,0 +1,9 @@ +<news> +<date>March 24, 2020</date> +<title>Google Summer of Code 2020</title> +<body> +The Wine Project is again selected as a Google Summer of Code organization this year. Students can apply now! Any student who wants to contribute to the Wine project will be welcome! Please have a look at this page for potential proposals you might be interested in: <a href="https://wiki.winehq.org/Summer_Of_Code">https://wiki.winehq.org/Summer_Of_Code</a> +It's great if you have your own idea, please post it on wine-devel mailing list. +Deadline for students to apply is March 31, 18:00 UTC. +See <a href="https://summerofcode.withgoogle.com">Google Summer of Code's website</a> for more details on Google Summer of Code. +</body></news>

1 0

Zebediah Figura : d3d10core/tests: Relax some color comparisons.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: 00e55c8fc0c08e14c39880e62526f8503468b641 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00e55c8fc0c08e14c39880e6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 22 18:27:45 2020 -0500 d3d10core/tests: Relax some color comparisons. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index b5b5715282..f29ebf97f2 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -18163,7 +18163,7 @@ static void test_color_mask(void) { get_texture_readback(rts[i], 0, &rb); color = get_readback_color(&rb, 320, 240); - ok(color == expected_colors[i], "%u: Got unexpected color 0x%08x.\n", i, color); + ok(compare_color(color, expected_colors[i], 1), "%u: Got unexpected color 0x%08x.\n", i, color); release_resource_readback(&rb); ID3D10Texture2D_Release(rts[i]); @@ -18274,7 +18274,7 @@ static void test_independent_blend(void) { get_texture_readback(rts[i], 0, &rb); color = get_readback_color(&rb, 320, 240); - ok(color == ((i & 1) ? 0x80008080 : 0x8000ff00), "%u: Got unexpected color 0x%08x.\n", i, color); + ok(compare_color(color, (i & 1) ? 0x80008080 : 0x8000ff00, 1), "%u: Got unexpected color 0x%08x.\n", i, color); release_resource_readback(&rb); ID3D10Texture2D_Release(rts[i]);

1 0

Jacek Caban : dbghelp: Use search_dll_path in elf_search_and_load_file.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: ee5d29b7aa85c109bf9ad5ac59fbe484f53da0ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee5d29b7aa85c109bf9ad5ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 23 16:16:11 2020 +0100 dbghelp: Use search_dll_path in elf_search_and_load_file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 59 +++++++++++++++++------------------------------ 1 file changed, 21 insertions(+), 38 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 34fffdae5b..0433bf77e0 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -38,7 +38,6 @@ #include "image_private.h" -#include "wine/library.h" #include "wine/debug.h" #include "wine/heap.h" @@ -1261,6 +1260,20 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, return ret; } +struct elf_load_file_params +{ + struct process *process; + ULONG_PTR load_offset; + ULONG_PTR dyn_addr; + struct elf_info *elf_info; +}; + +static BOOL elf_load_file_cb(void *param, HANDLE handle, const WCHAR *filename) +{ + struct elf_load_file_params *load_file = param; + return elf_load_file(load_file->process, filename, load_file->load_offset, load_file->dyn_addr, load_file->elf_info); +} + /****************************************************************** * elf_load_file_from_path * tries to load an ELF file from a set of paths (separated by ':') @@ -1302,41 +1315,6 @@ static BOOL elf_load_file_from_path(HANDLE hProcess, return ret; } -/****************************************************************** - * elf_load_file_from_dll_path - * - * Tries to load an ELF file from the dll path - */ -static BOOL elf_load_file_from_dll_path(HANDLE hProcess, - const WCHAR* filename, - unsigned long load_offset, - unsigned long dyn_addr, - struct elf_info* elf_info) -{ - BOOL ret = FALSE; - unsigned int index = 0; - const char *path; - - while (!ret && (path = wine_dll_enum_load_path( index++ ))) - { - WCHAR *name; - unsigned len; - - len = MultiByteToWideChar(CP_UNIXCP, 0, path, -1, NULL, 0); - - name = HeapAlloc( GetProcessHeap(), 0, - (len + lstrlenW(filename) + 2) * sizeof(WCHAR) ); - - if (!name) break; - MultiByteToWideChar(CP_UNIXCP, 0, path, -1, name, len); - strcatW( name, S_SlashW ); - strcatW( name, filename ); - ret = elf_load_file(hProcess, name, load_offset, dyn_addr, elf_info); - HeapFree( GetProcessHeap(), 0, name ); - } - return ret; -} - #ifdef AT_SYSINFO_EHDR /****************************************************************** * elf_search_auxv @@ -1434,12 +1412,17 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, /* if relative pathname, try some absolute base dirs */ if (!ret && filename == file_name(filename)) { + struct elf_load_file_params load_elf; + load_elf.process = pcs; + load_elf.load_offset = load_offset; + load_elf.dyn_addr = dyn_addr; + load_elf.elf_info = elf_info; + ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, getenv("PATH"), elf_info) || elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, getenv("LD_LIBRARY_PATH"), elf_info); - if (!ret) ret = elf_load_file_from_dll_path(pcs, filename, - load_offset, dyn_addr, elf_info); + if (!ret) ret = search_dll_path(filename, elf_load_file_cb, &load_elf); } return ret;

1 0

Rémi Bernon : winemac.drv: Remove frame when non-client area is empty.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: 062ce94fd5a0c0f119559d90ba1f95625b988a84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=062ce94fd5a0c0f119559d90… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 18 14:46:08 2020 +0100 winemac.drv: Remove frame when non-client area is empty. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46857 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 605c0c87f1..066eb553f7 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -57,12 +57,15 @@ static DWORD activate_on_focus_time; */ static void get_cocoa_window_features(struct macdrv_win_data *data, DWORD style, DWORD ex_style, - struct macdrv_window_features* wf) + struct macdrv_window_features* wf, + const RECT *window_rect, + const RECT *client_rect) { memset(wf, 0, sizeof(*wf)); if (disable_window_decorations) return; - if (IsRectEmpty(&data->window_rect)) return; + if (IsRectEmpty(window_rect)) return; + if (EqualRect(window_rect, client_rect)) return; if ((style & WS_CAPTION) == WS_CAPTION && !(ex_style & WS_EX_LAYERED)) { @@ -130,7 +133,8 @@ static void get_cocoa_window_state(struct macdrv_win_data *data, * * Helper for macdrv_window_to_mac_rect and macdrv_mac_to_window_rect. */ -static void get_mac_rect_offset(struct macdrv_win_data *data, DWORD style, RECT *rect) +static void get_mac_rect_offset(struct macdrv_win_data *data, DWORD style, RECT *rect, + const RECT *window_rect, const RECT *client_rect) { DWORD ex_style, style_mask = 0, ex_style_mask = 0; @@ -141,7 +145,7 @@ static void get_mac_rect_offset(struct macdrv_win_data *data, DWORD style, RECT if (!data->shaped) { struct macdrv_window_features wf; - get_cocoa_window_features(data, style, ex_style, &wf); + get_cocoa_window_features(data, style, ex_style, &wf, window_rect, client_rect); if (wf.title_bar) { @@ -167,14 +171,15 @@ static void get_mac_rect_offset(struct macdrv_win_data *data, DWORD style, RECT * * Convert a rect from client to Mac window coordinates */ -static void macdrv_window_to_mac_rect(struct macdrv_win_data *data, DWORD style, RECT *rect) +static void macdrv_window_to_mac_rect(struct macdrv_win_data *data, DWORD style, RECT *rect, + const RECT *window_rect, const RECT *client_rect) { RECT rc; if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return; if (IsRectEmpty(rect)) return; - get_mac_rect_offset(data, style, &rc); + get_mac_rect_offset(data, style, &rc, window_rect, client_rect); rect->left -= rc.left; rect->right -= rc.right; @@ -198,7 +203,7 @@ static void macdrv_mac_to_window_rect(struct macdrv_win_data *data, RECT *rect) if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return; if (IsRectEmpty(rect)) return; - get_mac_rect_offset(data, style, &rc); + get_mac_rect_offset(data, style, &rc, &data->window_rect, &data->client_rect); rect->left += rc.left; rect->right += rc.right; @@ -351,7 +356,7 @@ static void set_cocoa_window_properties(struct macdrv_win_data *data) owner_win = macdrv_get_cocoa_window(owner, TRUE); macdrv_set_cocoa_parent_window(data->cocoa_window, owner_win); - get_cocoa_window_features(data, style, ex_style, &wf); + get_cocoa_window_features(data, style, ex_style, &wf, &data->window_rect, &data->client_rect); macdrv_set_cocoa_window_features(data->cocoa_window, &wf); get_cocoa_window_state(data, style, ex_style, &state); @@ -620,7 +625,7 @@ static void sync_window_min_max_info(HWND hwnd) CGSize min_size, max_size; SetRect(&min_rect, 0, 0, minmax.ptMinTrackSize.x, minmax.ptMinTrackSize.y); - macdrv_window_to_mac_rect(data, style, &min_rect); + macdrv_window_to_mac_rect(data, style, &min_rect, &data->window_rect, &data->client_rect); min_size = CGSizeMake(min_rect.right - min_rect.left, min_rect.bottom - min_rect.top); if (minmax.ptMaxTrackSize.x == GetSystemMetrics(SM_CXMAXTRACK) && @@ -629,7 +634,7 @@ static void sync_window_min_max_info(HWND hwnd) else { SetRect(&max_rect, 0, 0, minmax.ptMaxTrackSize.x, minmax.ptMaxTrackSize.y); - macdrv_window_to_mac_rect(data, style, &max_rect); + macdrv_window_to_mac_rect(data, style, &max_rect, &data->window_rect, &data->client_rect); max_size = CGSizeMake(max_rect.right - max_rect.left, max_rect.bottom - max_rect.top); } @@ -691,9 +696,9 @@ static void create_cocoa_window(struct macdrv_win_data *data) ex_style = GetWindowLongW(data->hwnd, GWL_EXSTYLE); data->whole_rect = data->window_rect; - macdrv_window_to_mac_rect(data, style, &data->whole_rect); + macdrv_window_to_mac_rect(data, style, &data->whole_rect, &data->window_rect, &data->client_rect); - get_cocoa_window_features(data, style, ex_style, &wf); + get_cocoa_window_features(data, style, ex_style, &wf, &data->window_rect, &data->client_rect); frame = cgrect_from_rect(data->whole_rect); constrain_window_frame(&frame); @@ -2063,7 +2068,7 @@ void CDECL macdrv_WindowPosChanging(HWND hwnd, HWND insert_after, UINT swp_flags if (!data && !(data = macdrv_create_win_data(hwnd, window_rect, client_rect))) return; *visible_rect = *window_rect; - macdrv_window_to_mac_rect(data, style, visible_rect); + macdrv_window_to_mac_rect(data, style, visible_rect, window_rect, client_rect); TRACE("visible_rect %s -> %s\n", wine_dbgstr_rect(window_rect), wine_dbgstr_rect(visible_rect)); @@ -2845,7 +2850,8 @@ BOOL query_resize_size(HWND hwnd, macdrv_query *query) if (SendMessageW(hwnd, WM_SIZING, corner, (LPARAM)&rect)) { - macdrv_window_to_mac_rect(data, GetWindowLongW(hwnd, GWL_STYLE), &rect); + macdrv_window_to_mac_rect(data, GetWindowLongW(hwnd, GWL_STYLE), &rect, + &data->window_rect, &data->client_rect); query->resize_size.rect = cgrect_from_rect(rect); ret = TRUE; }

1 0

Jacek Caban : dbghelp: Rename helpers to make unicode variants default.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: 63d41a41f21c4d9f32b484d6c7ed78c9d7b2a48d URL: https://source.winehq.org/git/wine.git/?a=commit;h=63d41a41f21c4d9f32b484d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 23 16:15:31 2020 +0100 dbghelp: Rename helpers to make unicode variants default. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/path.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index feb951ad55..704fbbdee3 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -31,22 +31,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); -static inline BOOL is_sep(char ch) {return ch == '/' || ch == '\\';} -static inline BOOL is_sepW(WCHAR ch) {return ch == '/' || ch == '\\';} +static inline BOOL is_sepA(char ch) {return ch == '/' || ch == '\\';} +static inline BOOL is_sep(WCHAR ch) {return ch == '/' || ch == '\\';} -static inline const char* file_name(const char* str) +static inline const char* file_nameA(const char* str) { const char* p; - for (p = str + strlen(str) - 1; p >= str && !is_sep(*p); p--); + for (p = str + strlen(str) - 1; p >= str && !is_sepA(*p); p--); return p + 1; } -static inline const WCHAR* file_nameW(const WCHAR* str) +static inline const WCHAR* file_name(const WCHAR* str) { const WCHAR* p; - for (p = str + strlenW(str) - 1; p >= str && !is_sepW(*p); p--); + for (p = str + strlenW(str) - 1; p >= str && !is_sep(*p); p--); return p + 1; } @@ -54,7 +54,7 @@ static inline void file_pathW(const WCHAR *src, WCHAR *dst) { int len; - for (len = strlenW(src) - 1; (len > 0) && (!is_sepW(src[len])); len--); + for (len = strlenW(src) - 1; (len > 0) && (!is_sep(src[len])); len--); memcpy( dst, src, len * sizeof(WCHAR) ); dst[len] = 0; } @@ -71,7 +71,7 @@ HANDLE WINAPI FindDebugInfoFile(PCSTR FileName, PCSTR SymbolPath, PSTR DebugFile OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { - if (!SearchPathA(SymbolPath, file_name(FileName), NULL, MAX_PATH, DebugFilePath, NULL)) + if (!SearchPathA(SymbolPath, file_nameA(FileName), NULL, MAX_PATH, DebugFilePath, NULL)) return NULL; h = CreateFileA(DebugFilePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -181,7 +181,7 @@ BOOL WINAPI SymMatchFileNameW(PCWSTR file, PCWSTR match, while (fptr >= file && mptr >= match) { - if (toupperW(*fptr) != toupperW(*mptr) && !(is_sepW(*fptr) && is_sepW(*mptr))) + if (toupperW(*fptr) != toupperW(*mptr) && !(is_sep(*fptr) && is_sep(*mptr))) break; fptr--; mptr--; } @@ -208,7 +208,7 @@ BOOL WINAPI SymMatchFileName(PCSTR file, PCSTR match, while (fptr >= file && mptr >= match) { - if (toupper(*fptr) != toupper(*mptr) && !(is_sep(*fptr) && is_sep(*mptr))) + if (toupper(*fptr) != toupper(*mptr) && !(is_sepA(*fptr) && is_sepA(*mptr))) break; fptr--; mptr--; } @@ -385,7 +385,7 @@ BOOL WINAPI SymFindFileInPathW(HANDLE hProcess, PCWSTR searchPath, PCWSTR full_p s.cb = cb; s.user = user; - filename = file_nameW(full_path); + filename = file_name(full_path); /* first check full path to file */ if (sffip_cb(full_path, &s)) @@ -642,7 +642,7 @@ BOOL path_find_symbol_file(const struct process* pcs, const struct module* modul mf.matched = 0; MultiByteToWideChar(CP_ACP, 0, full_path, -1, full_pathW, MAX_PATH); - filename = file_nameW(full_pathW); + filename = file_name(full_pathW); mf.kind = module_get_type_by_name(filename); *is_unmatched = FALSE;

1 0

Jacek Caban : dbghelp: Use file_name helper in more places.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: 77e880e6d22ef9be031f783fbb4b6a5e8c8826e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77e880e6d22ef9be031f783f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 23 16:15:44 2020 +0100 dbghelp: Use file_name helper in more places. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 2 ++ dlls/dbghelp/elf_module.c | 14 +++++--------- dlls/dbghelp/macho_module.c | 21 +++++++-------------- dlls/dbghelp/module.c | 4 ++-- dlls/dbghelp/path.c | 4 ++-- 5 files changed, 18 insertions(+), 27 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 8fa9e799c0..81ae1507e0 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -670,6 +670,8 @@ extern BOOL path_find_symbol_file(const struct process* pcs, const struc PCSTR full_path, const GUID* guid, DWORD dw1, DWORD dw2, WCHAR *buffer, BOOL* is_unmatched) DECLSPEC_HIDDEN; extern WCHAR *get_dos_file_name(const WCHAR *filename) DECLSPEC_HIDDEN; +extern const WCHAR* file_name(const WCHAR* str) DECLSPEC_HIDDEN; +extern const char* file_nameA(const char* str) DECLSPEC_HIDDEN; /* pe_module.c */ extern BOOL pe_load_nt_header(HANDLE hProc, DWORD64 base, IMAGE_NT_HEADERS* nth) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index a11e73a0e1..34fffdae5b 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -727,8 +727,7 @@ static const Elf64_Sym *elf_lookup_symtab(const struct module* module, { compiland_name = source_get(module, ((const struct symt_compiland*)compiland)->source); - compiland_basename = strrchr(compiland_name, '/'); - if (!compiland_basename++) compiland_basename = compiland_name; + compiland_basename = file_nameA(compiland_name); } else compiland_name = compiland_basename = NULL; @@ -745,8 +744,7 @@ static const Elf64_Sym *elf_lookup_symtab(const struct module* module, const char* filename = source_get(module, ste->compiland->source); if (strcmp(filename, compiland_name)) { - base = strrchr(filename, '/'); - if (!base++) base = filename; + base = file_nameA(filename); if (strcmp(base, compiland_basename)) continue; } } @@ -1434,7 +1432,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, if (strstrW(filename, S_libstdcPPW)) return FALSE; /* We know we can't do it */ ret = elf_load_file(pcs, filename, load_offset, dyn_addr, elf_info); /* if relative pathname, try some absolute base dirs */ - if (!ret && !strchrW(filename, '/')) + if (!ret && filename == file_name(filename)) { ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, getenv("PATH"), elf_info) || @@ -1689,8 +1687,7 @@ static BOOL elf_load_cb(const WCHAR* name, unsigned long load_addr, /* 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; + p = file_name(name); } if (!el->name || !memcmp(p, el->name, lstrlenW(el->name) * sizeof(WCHAR))) @@ -1724,8 +1721,7 @@ struct module* elf_load_module(struct process* pcs, const WCHAR* name, unsigned /* do only the lookup from the filename, not the path (as we lookup module * name in the process' loaded module list) */ - el.name = strrchrW(name, '/'); - if (!el.name++) el.name = name; + el.name = file_name(name); el.ret = FALSE; if (!elf_enum_modules_internal(pcs, NULL, elf_load_cb, &el)) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 8fa05d312a..4bc0a3e903 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1193,10 +1193,7 @@ static void find_and_map_dsym(struct process *pcs, struct module* module) if (!fmap->uuid) return; - if ((p = strrchrW(module->module.LoadedImageName, '/'))) - p++; - else - p = module->module.LoadedImageName; + p = file_name(module->module.LoadedImageName); len = strlenW(module->module.LoadedImageName) + strlenW(dot_dsym) + strlenW(dsym_subpath) + strlenW(p) + 1; path = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!path) @@ -1637,19 +1634,17 @@ static BOOL macho_search_and_load_file(struct process* pcs, const WCHAR* filenam if (strstrW(filename, S_libstdcPPW)) return FALSE; /* We know we can't do it */ /* If has no directories, try PATH first. */ - if (!strchrW(filename, '/')) + p = file_name(filename); + if (p == filename) { ret = macho_load_file_from_path(pcs, filename, load_addr, getenv("PATH"), macho_info); } /* Try DYLD_LIBRARY_PATH, with just the filename (no directories). */ if (!ret) - { - if ((p = strrchrW(filename, '/'))) p++; - else p = filename; ret = macho_load_file_from_path(pcs, p, load_addr, getenv("DYLD_LIBRARY_PATH"), macho_info); - } + /* Try the path as given. */ if (!ret) ret = macho_load_file(pcs, filename, load_addr, macho_info); @@ -1661,7 +1656,7 @@ static BOOL macho_search_and_load_file(struct process* pcs, const WCHAR* filenam fallback = "/usr/local/lib:/lib:/usr/lib"; ret = macho_load_file_from_path(pcs, p, load_addr, fallback, macho_info); } - if (!ret && !strchrW(filename, '/')) + if (!ret && p == filename) ret = macho_load_file_from_dll_path(pcs, filename, load_addr, macho_info); return ret; @@ -1957,8 +1952,7 @@ static BOOL macho_load_cb(const WCHAR* name, unsigned long addr, void* user) /* memcmp is needed for matches when bufstr contains also version information * ml->name: libc.so, name: libc.so.6.0 */ - p = strrchrW(name, '/'); - if (!p++) p = name; + p = file_name(name); if (!memcmp(p, ml->name, lstrlenW(ml->name) * sizeof(WCHAR))) { ml->ret = macho_search_and_load_file(ml->pcs, name, addr, &ml->macho_info); @@ -1989,8 +1983,7 @@ struct module* macho_load_module(struct process* pcs, const WCHAR* name, unsign /* do only the lookup from the filename, not the path (as we lookup module * name in the process' loaded module list) */ - ml.name = strrchrW(name, '/'); - if (!ml.name++) ml.name = name; + ml.name = file_name(name); ml.ret = FALSE; if (!macho_enum_modules_internal(pcs, NULL, macho_load_cb, &ml)) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 0a90595b8c..74502a9d6b 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -82,14 +82,14 @@ static BOOL is_wine_loader(const WCHAR *module) static const WCHAR wineW[] = {'w','i','n','e',0}; static const WCHAR suffixW[] = {'6','4',0}; const WCHAR *filename = get_filename(module, NULL); - const char *ptr, *p; + const char *ptr; BOOL ret = FALSE; WCHAR *buffer; DWORD len; if ((ptr = getenv("WINELOADER"))) { - if ((p = strrchr(ptr, '/'))) ptr = p + 1; + ptr = file_nameA(ptr); len = 2 + MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, NULL, 0 ); buffer = heap_alloc( len * sizeof(WCHAR) ); MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, buffer, len ); diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 704fbbdee3..1b04d97e13 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); static inline BOOL is_sepA(char ch) {return ch == '/' || ch == '\\';} static inline BOOL is_sep(WCHAR ch) {return ch == '/' || ch == '\\';} -static inline const char* file_nameA(const char* str) +const char* file_nameA(const char* str) { const char* p; @@ -42,7 +42,7 @@ static inline const char* file_nameA(const char* str) return p + 1; } -static inline const WCHAR* file_name(const WCHAR* str) +const WCHAR* file_name(const WCHAR* str) { const WCHAR* p;

1 0

Jacek Caban : dbghelp: Make dll builtin PE path search helper more generic.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: 21af2e194792aaa263c144c8fb42fe678ad2ecd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21af2e194792aaa263c144c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 23 16:15:58 2020 +0100 dbghelp: Make dll builtin PE path search helper more generic. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/path.c | 86 +++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/pe_module.c | 91 ++++++++++-------------------------------- 3 files changed, 107 insertions(+), 71 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 81ae1507e0..e846d21054 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -670,6 +670,7 @@ extern BOOL path_find_symbol_file(const struct process* pcs, const struc PCSTR full_path, const GUID* guid, DWORD dw1, DWORD dw2, WCHAR *buffer, BOOL* is_unmatched) DECLSPEC_HIDDEN; extern WCHAR *get_dos_file_name(const WCHAR *filename) DECLSPEC_HIDDEN; +extern BOOL search_dll_path(const WCHAR *name, BOOL (*match)(void*, HANDLE, const WCHAR*), void *param) DECLSPEC_HIDDEN; extern const WCHAR* file_name(const WCHAR* str) DECLSPEC_HIDDEN; extern const char* file_nameA(const char* str) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 1b04d97e13..99f6d00395 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -720,3 +720,89 @@ WCHAR *get_dos_file_name(const WCHAR *filename) } return dos_path; } + +BOOL search_dll_path(const WCHAR *name, BOOL (*match)(void*, HANDLE, const WCHAR*), void *param) +{ + size_t len, i; + HANDLE file; + WCHAR *buf; + BOOL ret; + + static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R',0}; + static const WCHAR winedlldirW[] = {'W','I','N','E','D','L','L','D','I','R','%','u',0}; + + name = file_name(name); + + if ((len = GetEnvironmentVariableW(winebuilddirW, NULL, 0))) + { + WCHAR *p, *end; + const WCHAR dllsW[] = { '\\','d','l','l','s','\\' }; + const WCHAR programsW[] = { '\\','p','r','o','g','r','a','m','s','\\' }; + const WCHAR dot_dllW[] = {'.','d','l','l',0}; + const WCHAR dot_exeW[] = {'.','e','x','e',0}; + const WCHAR dot_soW[] = {'.','s','o',0}; + + if (!(buf = heap_alloc((len + 8 + 3 * lstrlenW(name)) * sizeof(WCHAR)))) return FALSE; + end = buf + GetEnvironmentVariableW(winebuilddirW, buf, len); + + memcpy(end, dllsW, sizeof(dllsW)); + strcpyW(end + ARRAY_SIZE(dllsW), name); + if ((p = strrchrW(end, '.')) && !lstrcmpW(p, dot_soW)) *p = 0; + if ((p = strrchrW(end, '.')) && !lstrcmpW(p, dot_dllW)) *p = 0; + p = end + strlenW(end); + *p++ = '\\'; + strcpyW(p, name); + file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file != INVALID_HANDLE_VALUE) + { + ret = match(param, file, buf); + CloseHandle(file); + if (ret) goto found; + } + + memcpy(end, programsW, sizeof(programsW)); + end += ARRAY_SIZE(programsW); + strcpyW(end, name); + if ((p = strrchrW(end, '.')) && !lstrcmpW(p, dot_soW)) *p = 0; + if ((p = strrchrW(end, '.')) && !lstrcmpW(p, dot_exeW)) *p = 0; + p = end + strlenW(end); + *p++ = '\\'; + strcpyW(p, name); + file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file != INVALID_HANDLE_VALUE) + { + ret = match(param, file, buf); + CloseHandle(file); + if (ret) goto found; + } + + heap_free(buf); + } + + for (i = 0;; i++) + { + WCHAR env_name[64]; + sprintfW(env_name, winedlldirW, i); + if (!(len = GetEnvironmentVariableW(env_name, NULL, 0))) break; + if (!(buf = heap_alloc((len + lstrlenW(name) + 2) * sizeof(WCHAR)))) return FALSE; + + len = GetEnvironmentVariableW(env_name, buf, len); + buf[len++] = '\\'; + strcpyW(buf + len, name); + file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file != INVALID_HANDLE_VALUE) + { + ret = match(param, file, buf); + CloseHandle(file); + if (ret) goto found; + } + heap_free(buf); + } + + return FALSE; + +found: + TRACE("found %s\n", debugstr_w(buf)); + heap_free(buf); + return TRUE; +} diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 8c120e00dc..a9410fea58 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -740,68 +740,23 @@ BOOL pe_load_debug_info(const struct process* pcs, struct module* module) return ret; } -static WCHAR *find_builtin_pe(const WCHAR *path, HANDLE *file) +struct builtin_search { - const WCHAR *base_name; - size_t len, i; - WCHAR *buf; + WCHAR *path; + struct image_file_map fmap; +}; - static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R',0}; - static const WCHAR winedlldirW[] = {'W','I','N','E','D','L','L','D','I','R','%','u',0}; +static BOOL search_builtin_pe(void *param, HANDLE handle, const WCHAR *path) +{ + struct builtin_search *search = param; + size_t size; - if ((base_name = strrchrW(path, '\\'))) base_name++; - else base_name = path; + if (!pe_map_file(handle, &search->fmap, DMT_PE)) return FALSE; - if ((len = GetEnvironmentVariableW(winebuilddirW, NULL, 0))) - { - WCHAR *p, *end; - const WCHAR dllsW[] = { '\\','d','l','l','s','\\' }; - const WCHAR programsW[] = { '\\','p','r','o','g','r','a','m','s','\\' }; - const WCHAR dot_dllW[] = {'.','d','l','l',0}; - const WCHAR dot_exeW[] = {'.','e','x','e',0}; - - if (!(buf = heap_alloc((len + 8 + 2 * lstrlenW(base_name)) * sizeof(WCHAR)))) return NULL; - end = buf + GetEnvironmentVariableW(winebuilddirW, buf, len); - - memcpy(end, dllsW, sizeof(dllsW)); - strcpyW(end + ARRAY_SIZE(dllsW), base_name); - if ((p = strchrW(end, '.')) && !lstrcmpW(p, dot_dllW)) *p = 0; - p = end + strlenW(end); - *p++ = '\\'; - strcpyW(p, base_name); - *file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (*file != INVALID_HANDLE_VALUE) return buf; - - memcpy(end, programsW, sizeof(programsW)); - end += ARRAY_SIZE(programsW); - strcpyW(end, base_name); - if ((p = strchrW(end, '.')) && !lstrcmpW(p, dot_exeW)) *p = 0; - p = end + strlenW(end); - *p++ = '\\'; - strcpyW(p, base_name); - *file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (*file != INVALID_HANDLE_VALUE) return buf; - - heap_free(buf); - } - - for (i = 0;; i++) - { - WCHAR name[64]; - sprintfW(name, winedlldirW, i); - if (!(len = GetEnvironmentVariableW(name, NULL, 0))) break; - if (!(buf = heap_alloc((len + lstrlenW(base_name) + 2) * sizeof(WCHAR)))) return NULL; - - GetEnvironmentVariableW(name, buf, len); - buf[len++] = '\\'; - strcpyW(buf + len, base_name); - *file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (*file != INVALID_HANDLE_VALUE) return buf; - - heap_free(buf); - } - - return NULL; + size = (lstrlenW(path) + 1) * sizeof(WCHAR); + if ((search->path = heap_alloc(size))) + memcpy(search->path, path, size); + return TRUE; } /****************************************************************** @@ -833,18 +788,12 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, modfmt->u.pe_info = (struct pe_module_info*)(modfmt + 1); if (pe_map_file(hFile, &modfmt->u.pe_info->fmap, DMT_PE)) { - WCHAR *builtin_path = NULL; - HANDLE builtin_module; - if (modfmt->u.pe_info->fmap.u.pe.builtin && (builtin_path = find_builtin_pe(loaded_name, &builtin_module))) + struct builtin_search builtin = { NULL }; + if (modfmt->u.pe_info->fmap.u.pe.builtin && search_dll_path(loaded_name, search_builtin_pe, &builtin)) { - struct image_file_map builtin_fmap; - if (pe_map_file(builtin_module, &builtin_fmap, DMT_PE)) - { - TRACE("reloaded %s from %s\n", debugstr_w(loaded_name), debugstr_w(builtin_path)); - image_unmap_file(&modfmt->u.pe_info->fmap); - modfmt->u.pe_info->fmap = builtin_fmap; - } - CloseHandle(builtin_module); + TRACE("reloaded %s from %s\n", debugstr_w(loaded_name), debugstr_w(builtin.path)); + image_unmap_file(&modfmt->u.pe_info->fmap); + modfmt->u.pe_info->fmap = builtin.fmap; } 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; @@ -854,7 +803,7 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, modfmt->u.pe_info->fmap.u.pe.ntheader.OptionalHeader.CheckSum); if (module) { - module->real_path = builtin_path; + module->real_path = builtin.path; modfmt->module = module; modfmt->remove = pe_module_remove; modfmt->loc_compute = NULL; @@ -869,7 +818,7 @@ 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)); - heap_free(module->real_path); + heap_free(builtin.path); image_unmap_file(&modfmt->u.pe_info->fmap); } }

1 0

Jacek Caban : dbghelp: Introduce search_unix_path helper and use it in elf_search_and_load_file.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: ca49552f646bf30b492da4668745f9f65b9de18d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca49552f646bf30b492da466… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 23 16:16:27 2020 +0100 dbghelp: Introduce search_unix_path helper and use it in elf_search_and_load_file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/elf_module.c | 49 +++--------------------------------------- dlls/dbghelp/path.c | 43 ++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 46 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index e846d21054..9415881c57 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -671,6 +671,7 @@ extern BOOL path_find_symbol_file(const struct process* pcs, const struc WCHAR *buffer, BOOL* is_unmatched) DECLSPEC_HIDDEN; extern WCHAR *get_dos_file_name(const WCHAR *filename) DECLSPEC_HIDDEN; extern BOOL search_dll_path(const WCHAR *name, BOOL (*match)(void*, HANDLE, const WCHAR*), void *param) DECLSPEC_HIDDEN; +extern BOOL search_unix_path(const WCHAR *name, const char *path, BOOL (*match)(void*, HANDLE, const WCHAR*), void *param) DECLSPEC_HIDDEN; extern const WCHAR* file_name(const WCHAR* str) DECLSPEC_HIDDEN; extern const char* file_nameA(const char* str) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 0433bf77e0..0b60524fc4 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1274,47 +1274,6 @@ static BOOL elf_load_file_cb(void *param, HANDLE handle, const WCHAR *filename) return elf_load_file(load_file->process, filename, load_file->load_offset, load_file->dyn_addr, load_file->elf_info); } -/****************************************************************** - * elf_load_file_from_path - * tries to load an ELF file from a set of paths (separated by ':') - */ -static BOOL elf_load_file_from_path(HANDLE hProcess, - const WCHAR* filename, - unsigned long load_offset, - unsigned long dyn_addr, - const char* path, - struct elf_info* elf_info) -{ - BOOL ret = FALSE; - WCHAR *s, *t, *fn; - WCHAR* pathW = NULL; - unsigned len; - - if (!path) return FALSE; - - len = MultiByteToWideChar(CP_UNIXCP, 0, path, -1, NULL, 0); - pathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!pathW) return FALSE; - MultiByteToWideChar(CP_UNIXCP, 0, path, -1, pathW, len); - - for (s = pathW; s && *s; s = (t) ? (t+1) : NULL) - { - t = strchrW(s, ':'); - if (t) *t = '\0'; - fn = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(filename) + 1 + lstrlenW(s) + 1) * sizeof(WCHAR)); - if (!fn) break; - strcpyW(fn, s); - strcatW(fn, S_SlashW); - strcatW(fn, filename); - ret = elf_load_file(hProcess, fn, load_offset, dyn_addr, elf_info); - HeapFree(GetProcessHeap(), 0, fn); - if (ret) break; - } - - HeapFree(GetProcessHeap(), 0, pathW); - return ret; -} - #ifdef AT_SYSINFO_EHDR /****************************************************************** * elf_search_auxv @@ -1418,11 +1377,9 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, load_elf.dyn_addr = dyn_addr; load_elf.elf_info = elf_info; - ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, - getenv("PATH"), elf_info) || - elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, - getenv("LD_LIBRARY_PATH"), elf_info); - if (!ret) ret = search_dll_path(filename, elf_load_file_cb, &load_elf); + ret = search_unix_path(filename, getenv("PATH"), elf_load_file_cb, &load_elf) + || search_unix_path(filename, getenv("LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf) + || search_dll_path(filename, elf_load_file_cb, &load_elf); } return ret; diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 99f6d00395..15e5d344e7 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -806,3 +806,46 @@ found: heap_free(buf); return TRUE; } + +BOOL search_unix_path(const WCHAR *name, const char *path, BOOL (*match)(void*, HANDLE, const WCHAR*), void *param) +{ + const char *iter, *next; + size_t size, len; + WCHAR *dos_path; + char *buf; + BOOL ret = FALSE; + + if (!path) return FALSE; + name = file_name(name); + + size = WideCharToMultiByte(CP_UNIXCP, 0, name, -1, NULL, 0, NULL, NULL) + strlen(path) + 1; + if (!(buf = heap_alloc(size))) return FALSE; + + for (iter = path;; iter = next + 1) + { + if (!(next = strchr(iter, ':'))) next = iter + strlen(iter); + if (*iter == '/') + { + len = next - iter; + memcpy(buf, iter, len); + if (buf[len - 1] != '/') buf[len++] = '/'; + WideCharToMultiByte(CP_UNIXCP, 0, name, -1, buf + len, size - len, NULL, NULL); + if ((dos_path = wine_get_dos_file_name(buf))) + { + HANDLE file = CreateFileW(dos_path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file != INVALID_HANDLE_VALUE) + { + ret = match(param, file, dos_path); + CloseHandle(file); + if (ret) TRACE("found %s\n", debugstr_w(dos_path)); + } + heap_free(dos_path); + if (ret) break; + } + } + if (*next != ':') break; + } + + heap_free(buf); + return ret; +}

1 0

Jacek Caban : dbghelp: Use search_unix_path to load seach macho files.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: c3bb866bfc53b8c3b7b7355cb8311325a40a0a6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3bb866bfc53b8c3b7b7355c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 23 16:16:46 2020 +0100 dbghelp: Use search_unix_path to load seach macho files. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/macho_module.c | 63 ++++++++++++--------------------------------- 1 file changed, 17 insertions(+), 46 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 4bc0a3e903..038319ce35 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1523,49 +1523,17 @@ leave: return ret; } -/****************************************************************** - * macho_load_file_from_path - * Tries to load a Mach-O file from a set of paths (separated by ':') - */ -static BOOL macho_load_file_from_path(struct process* pcs, - const WCHAR* filename, - unsigned long load_addr, - const char* path, - struct macho_info* macho_info) +struct macho_load_params { - BOOL ret = FALSE; - WCHAR *s, *t, *fn; - WCHAR* pathW = NULL; - unsigned len; - - TRACE("(%p/%p, %s, 0x%08lx, %s, %p)\n", pcs, pcs->handle, debugstr_w(filename), load_addr, - debugstr_a(path), macho_info); - - if (!path) return FALSE; - - len = MultiByteToWideChar(CP_UNIXCP, 0, path, -1, NULL, 0); - pathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!pathW) return FALSE; - MultiByteToWideChar(CP_UNIXCP, 0, path, -1, pathW, len); - - for (s = pathW; s && *s; s = (t) ? (t+1) : NULL) - { - t = strchrW(s, ':'); - if (t) *t = '\0'; - fn = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(filename) + 1 + lstrlenW(s) + 1) * sizeof(WCHAR)); - if (!fn) break; - strcpyW(fn, s); - strcatW(fn, S_SlashW); - strcatW(fn, filename); - ret = macho_load_file(pcs, fn, load_addr, macho_info); - HeapFree(GetProcessHeap(), 0, fn); - if (ret) break; - s = (t) ? (t+1) : NULL; - } + struct process *process; + ULONG_PTR load_addr; + struct macho_info *macho_info; +}; - TRACE(" => %d\n", ret); - HeapFree(GetProcessHeap(), 0, pathW); - return ret; +static BOOL macho_load_file_cb(void *param, HANDLE handle, const WCHAR *filename) +{ + struct macho_load_params *macho_load = param; + return macho_load_file(macho_load->process, filename, macho_load->load_addr, macho_load->macho_info); } /****************************************************************** @@ -1619,6 +1587,7 @@ static BOOL macho_search_and_load_file(struct process* pcs, const WCHAR* filenam struct module* module; static const WCHAR S_libstdcPPW[] = {'l','i','b','s','t','d','c','+','+','\0'}; const WCHAR* p; + struct macho_load_params load_params; TRACE("(%p/%p, %s, 0x%08lx, %p)\n", pcs, pcs->handle, debugstr_w(filename), load_addr, macho_info); @@ -1633,17 +1602,19 @@ static BOOL macho_search_and_load_file(struct process* pcs, const WCHAR* filenam if (strstrW(filename, S_libstdcPPW)) return FALSE; /* We know we can't do it */ + load_params.process = pcs; + load_params.load_addr = load_addr; + load_params.macho_info = macho_info; + /* If has no directories, try PATH first. */ p = file_name(filename); if (p == filename) { - ret = macho_load_file_from_path(pcs, filename, load_addr, - getenv("PATH"), macho_info); + ret = search_unix_path(filename, getenv("PATH"), macho_load_file_cb, &load_params); } /* Try DYLD_LIBRARY_PATH, with just the filename (no directories). */ if (!ret) - ret = macho_load_file_from_path(pcs, p, load_addr, - getenv("DYLD_LIBRARY_PATH"), macho_info); + ret = search_unix_path(p, getenv("DYLD_LIBRARY_PATH"), macho_load_file_cb, &load_params); /* Try the path as given. */ if (!ret) @@ -1654,7 +1625,7 @@ static BOOL macho_search_and_load_file(struct process* pcs, const WCHAR* filenam const char* fallback = getenv("DYLD_FALLBACK_LIBRARY_PATH"); if (!fallback) fallback = "/usr/local/lib:/lib:/usr/lib"; - ret = macho_load_file_from_path(pcs, p, load_addr, fallback, macho_info); + ret = search_unix_path(p, fallback, macho_load_file_cb, &load_params); } if (!ret && p == filename) ret = macho_load_file_from_dll_path(pcs, filename, load_addr, macho_info);

1 0

Zebediah Figura : d2d1/tests: Adjust a color to prevent test failures.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: 7ce3b65f1e1931a746f1fed921991a102a597341 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ce3b65f1e1931a746f1fed9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 22 18:11:34 2020 -0500 d2d1/tests: Adjust a color to prevent test failures. Different drivers may produce either #ff7f00 or #ff8000 here, both on Windows and Linux. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 77899ccd6e..8548a0a4aa 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1250,7 +1250,7 @@ static void test_clip(void) translate_matrix(&matrix, 0.1f, 0.0f); ID2D1RenderTarget_SetTransform(rt, &matrix); set_rect(&rect, 110.0f, 250.25f, 150.0f, 300.25f); - set_color(&color, 0.0f, 0.5f, 1.0f, 1.0f); + set_color(&color, 0.0f, 1.0f, 0.0f, 1.0f); ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); ID2D1RenderTarget_Clear(rt, &color); ID2D1RenderTarget_PopAxisAlignedClip(rt); @@ -1277,7 +1277,7 @@ static void test_clip(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - match = compare_surface(surface, "a958d1fe69ee880200d47b206948e4c1ef382748"); + match = compare_surface(surface, "cb418ec4a7c8407b5e36db06fc6292a06bb8476c"); ok(match, "Surface does not match.\n"); ID2D1RenderTarget_Release(rt);

1 0