November 2021 - Wine-commits

Conor McCarthy : vkd3d-shader/spirv: Apply 'Patch' decorations to builtin patch constant inputs.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: vkd3d Branch: master Commit: 9a1f6c7daff0302bd77b18f5d68d34f120e81937 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9a1f6c7daff0302bd77b18f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Nov 17 13:05:58 2021 +0100 vkd3d-shader/spirv: Apply 'Patch' decorations to builtin patch constant inputs. Prevents a crash in radv when such inputs are present. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 698c305..8827c43 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4582,6 +4582,8 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi if (builtin) { input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, storage_class, array_size); + if (reg->type == VKD3DSPR_PATCHCONST) + vkd3d_spirv_build_op_decorate(builder, input_id, SpvDecorationPatch, NULL, 0); } else {

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle arrayed builtin inputs.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: vkd3d Branch: master Commit: c41931c7508e0f2e6467db55319438ec2b24e16b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c41931c7508e0f2e6467db5… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Nov 17 13:05:59 2021 +0100 vkd3d-shader/spirv: Handle arrayed builtin inputs. Fixes invalid SPIR-V being generated in Monster Hunter: World. Based on vkd3d-proton patches by Hans-Kristian Arntzen and Philip Rebohle. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8827c43..e1a7dd3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4416,6 +4416,13 @@ static bool needs_private_io_variable(const struct vkd3d_shader_signature *signa bool have_sysval = false; unsigned int i, count; + /* Always use private variables for arrayed builtins. These are generally + * scalars on the D3D side, so would need extra array indices when + * accessing them. It may be feasible to insert those indices at the point + * where the builtins are used, but it's not clear it's worth the effort. */ + if (builtin && (builtin->spirv_array_size || builtin->fixup_pfn)) + return true; + if (*component_count == VKD3D_VEC4_SIZE) return false; @@ -4519,8 +4526,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi component_idx = vkd3d_write_mask_get_component_idx(signature_element->mask); } - if (!(use_private_var = builtin && builtin->fixup_pfn) - && needs_private_io_variable(shader_signature, reg_idx, builtin, &input_component_count, &write_mask) + if (needs_private_io_variable(shader_signature, reg_idx, builtin, &input_component_count, &write_mask) && (compiler->shader_type != VKD3D_SHADER_TYPE_HULL || (reg->type != VKD3DSPR_INCONTROLPOINT && reg->type != VKD3DSPR_PATCHCONST))) use_private_var = true; @@ -4644,6 +4650,16 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi val_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, ptr_type_id, input_id, index); dst_reg.idx[0].offset = i; } + else if (builtin && builtin->spirv_array_size) + { + /* The D3D builtin is not an array, but the SPIR-V builtin is, + * so we'll need to index into the SPIR-V builtin when loading + * it. This happens when reading TessLevel in domain shaders. */ + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassInput, type_id); + index = vkd3d_dxbc_compiler_get_constant_uint(compiler, builtin->member_idx); + val_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, ptr_type_id, input_id, index); + dst_reg.idx[0].offset = reg_idx + i; + } val_id = vkd3d_spirv_build_op_load(builder, type_id, val_id, SpvMemoryAccessMaskNone); if (builtin && builtin->fixup_pfn) @@ -4947,11 +4963,11 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler const struct vkd3d_spirv_builtin *builtin; const struct vkd3d_shader_phase *phase; struct vkd3d_symbol *symbol = NULL; + bool use_private_variable = false; struct vkd3d_symbol reg_symbol; SpvStorageClass storage_class; struct rb_entry *entry = NULL; unsigned int signature_idx; - bool use_private_variable; unsigned int write_mask; unsigned int array_size; bool is_patch_constant; @@ -4991,11 +5007,10 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler storage_class = SpvStorageClassOutput; - if (!(use_private_variable = builtin && builtin->spirv_array_size) - && (get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_SHADER_NO_SWIZZLE + if (get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_SHADER_NO_SWIZZLE || needs_private_io_variable(shader_signature, signature_element->register_index, builtin, &output_component_count, &write_mask) - || is_patch_constant)) + || is_patch_constant) use_private_variable = true; else component_idx = vkd3d_write_mask_get_component_idx(write_mask);

1 0

Jacek Caban : win32u: Move NtUserGetKeyboardLayout implementation from user32.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: 563a233284d5a3fc0741af2421e239cd7b6b721f URL: https://source.winehq.org/git/wine.git/?a=commit;h=563a233284d5a3fc0741af24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 16 12:35:43 2021 +0100 win32u: Move NtUserGetKeyboardLayout implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 35 ++++++++-------------------- dlls/user32/message.c | 4 ++-- dlls/user32/misc.c | 4 ++-- dlls/user32/sysparams.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_private.h | 30 ------------------------ dlls/win32u/input.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 5 ++++ include/ntuser.h | 30 ++++++++++++++++++++++++ 11 files changed, 106 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=563a233284d5a3fc0741…

1 0

Jacek Caban : win32u: Move NtUserGetKeyNameText implementation from user32.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: 65f3b653fad8b235dab0cc812fe42aab2ae6eb5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=65f3b653fad8b235dab0cc81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 16 12:35:59 2021 +0100 win32u: Move NtUserGetKeyNameText implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 7 +-- dlls/user32/input.c | 146 +------------------------------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/driver.c | 6 ++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 93 +++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 5 ++ 9 files changed, 110 insertions(+), 153 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=65f3b653fad8b235dab0…

1 0

Jacek Caban : win32u: Move NtUserGetOpenClipboardWindow implementation from user32.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: da01911cc17b2d5c1c4920b4ef6cf665f34a1f39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da01911cc17b2d5c1c4920b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 16 12:36:26 2021 +0100 win32u: Move NtUserGetOpenClipboardWindow implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 19 ------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/clipboard.c | 17 +++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 5 +++++ include/ntuser.h | 1 + 8 files changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 62a17f5d021..ffeb03d4435 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -750,25 +750,6 @@ BOOL WINAPI EmptyClipboard(void) } -/************************************************************************** - * GetOpenClipboardWindow (USER32.@) - */ -HWND WINAPI GetOpenClipboardWindow(void) -{ - HWND hWndOpen = 0; - - SERVER_START_REQ( get_clipboard_info ) - { - if (!wine_server_call_err( req )) hWndOpen = wine_server_ptr_handle( reply->window ); - } - SERVER_END_REQ; - - TRACE( "returning %p\n", hWndOpen ); - - return hWndOpen; -} - - /************************************************************************** * SetClipboardViewer (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 99e1157227c..ffab0fca4d4 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -353,7 +353,7 @@ @ stdcall GetNextDlgGroupItem(long long long) @ stdcall GetNextDlgTabItem(long long long) # @ stub GetNextQueueWindow -@ stdcall GetOpenClipboardWindow() +@ stdcall GetOpenClipboardWindow() NtUserGetOpenClipboardWindow @ stdcall GetParent(long) @ stdcall GetPhysicalCursorPos(ptr) @ stdcall GetPointerDevices(ptr ptr) diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index 7acab5de631..dca01708803 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -222,6 +222,23 @@ HWND WINAPI NtUserGetClipboardViewer(void) return viewer; } +/************************************************************************** + * NtUserGetOpenClipboardWindow (win32u.@) + */ +HWND WINAPI NtUserGetOpenClipboardWindow(void) +{ + HWND window = 0; + + SERVER_START_REQ( get_clipboard_info ) + { + if (!wine_server_call_err( req )) window = wine_server_ptr_handle( reply->window ); + } + SERVER_END_REQ; + + TRACE( "returning %p\n", window ); + return window; +} + /************************************************************************** * NtUserGetClipboardSequenceNumber (win32u.@) */ diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index b6419c08ea0..26471718e51 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -116,6 +116,7 @@ static void * const syscalls[] = NtUserGetKeyboardState, NtUserGetLayeredWindowAttributes, NtUserGetObjectInformation, + NtUserGetOpenClipboardWindow, NtUserGetProcessWindowStation, NtUserGetProp, NtUserGetThreadDesktop, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 1353924845c..2f4b36babe5 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -959,7 +959,7 @@ @ stub NtUserGetMouseMovePointsEx @ stdcall -syscall NtUserGetObjectInformation(long long long long ptr) @ stub NtUserGetOemBitmapSize -@ stub NtUserGetOpenClipboardWindow +@ stdcall -syscall NtUserGetOpenClipboardWindow() @ stub NtUserGetOwnerTransformedMonitorRect @ stub NtUserGetPhysicalDeviceRect @ stub NtUserGetPointerCursorId diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 09a281b5d14..d97563427ce 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -102,6 +102,7 @@ SYSCALL_ENTRY( NtUserGetKeyboardState ) \ SYSCALL_ENTRY( NtUserGetLayeredWindowAttributes ) \ SYSCALL_ENTRY( NtUserGetObjectInformation ) \ + SYSCALL_ENTRY( NtUserGetOpenClipboardWindow ) \ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserGetProp ) \ SYSCALL_ENTRY( NtUserGetThreadDesktop ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 4c47b8937cf..39f54ae82ba 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -205,6 +205,11 @@ NTSTATUS WINAPI wow64_NtUserGetClipboardOwner( UINT *args ) return HandleToUlong( NtUserGetClipboardOwner() ); } +NTSTATUS WINAPI wow64_NtUserGetOpenClipboardWindow( UINT *args ) +{ + return HandleToUlong( NtUserGetOpenClipboardWindow() ); +} + NTSTATUS WINAPI wow64_NtUserGetClipboardSequenceNumber( UINT *args ) { return NtUserGetClipboardSequenceNumber(); diff --git a/include/ntuser.h b/include/ntuser.h index d06a0aee429..536e78dfda5 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -74,6 +74,7 @@ BOOL WINAPI NtUserGetKeyboardState( BYTE *state ); BOOL WINAPI NtUserGetLayeredWindowAttributes( HWND hwnd, COLORREF *key, BYTE *alpha, DWORD *flags ); BOOL WINAPI NtUserGetObjectInformation( HANDLE handle, INT index, void *info, DWORD len, DWORD *needed ); +HWND WINAPI NtUserGetOpenClipboardWindow(void); INT WINAPI NtUserGetPriorityClipboardFormat( UINT *list, INT count ); HWINSTA WINAPI NtUserGetProcessWindowStation(void); HANDLE WINAPI NtUserGetProp( HWND hwnd, const WCHAR *str );

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.2.199.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: 4fd97c52a95ead0ffbcb16e0b1c88819af791853 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fd97c52a95ead0ffbcb16e0… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Nov 16 15:46:52 2021 +0100 winevulkan: Update to VK spec version 1.2.199. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 17 ++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 495 +++++++++++++++++++++------------------- 4 files changed, 276 insertions(+), 240 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4fd97c52a95ead0ffbcb…

1 0

Eric Pouech : dbghelp: Fix module name construction.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: e00f0d81fbf4a4153141bff6126715c746666406 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e00f0d81fbf4a4153141bff6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 16 17:46:49 2021 +0100 dbghelp: Fix module name construction. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 302f85b0747..b08a536eefa 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -103,13 +103,13 @@ static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) const WCHAR *ptr, *endptr; size_t len, l; - ptr = get_filename(in, endptr = in + lstrlenW(in)); + endptr = in + lstrlenW(in); + endptr -= match_ext(in, endptr - in); + ptr = get_filename(in, endptr); len = min(endptr - ptr, size - 1); memcpy(out, ptr, len * sizeof(WCHAR)); out[len] = '\0'; - if (len > 4 && (l = match_ext(out, len))) - out[len - l] = '\0'; - else if (is_wine_loader(out)) + if (is_wine_loader(out)) lstrcpynW(out, S_WineLoaderW, size); else {

1 0

Eric Pouech : dbghelp: Always search current directory when loading PE modules.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: 8e8243a30899273071b35eb86eff487e2d5763dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e8243a30899273071b35eb8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 16 17:47:02 2021 +0100 dbghelp: Always search current directory when loading PE modules. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/pe_module.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 35db3edf40f..77ae122901a 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -791,7 +791,8 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, { assert(name); - if ((hFile = FindExecutableImageExW(name, pcs->search_path, loaded_name, NULL, NULL)) == NULL) + if ((hFile = FindExecutableImageExW(name, pcs->search_path, loaded_name, NULL, NULL)) == NULL && + (hFile = FindExecutableImageExW(name, L".", loaded_name, NULL, NULL)) == NULL) return NULL; opened = TRUE; }

1 0

Eric Pouech : dbghelp: Allow 32bit dbghelp to handle 64 addresses.
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: 1b7bce4bf8a791465a340fbd1d02a5f3031ed5d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b7bce4bf8a791465a340fbd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 16 17:47:16 2021 +0100 dbghelp: Allow 32bit dbghelp to handle 64 addresses. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index b08a536eefa..8f8820f90a9 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -920,8 +920,6 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (Flags & ~(SLMFLAG_VIRTUAL)) FIXME("Unsupported Flags %08x for %s\n", Flags, debugstr_w(wImageName)); - if (!validate_addr64(BaseOfDll)) return 0; - pcs->loader->synchronize_module_list(pcs); /* this is a Wine extension to the API just to redo the synchronisation */ @@ -1408,10 +1406,7 @@ BOOL WINAPI SymGetModuleInfoW64(HANDLE hProcess, DWORD64 dwAddr, */ DWORD WINAPI SymGetModuleBase(HANDLE hProcess, DWORD dwAddr) { - DWORD64 ret; - - ret = SymGetModuleBase64(hProcess, dwAddr); - return validate_addr64(ret) ? ret : 0; + return (DWORD)SymGetModuleBase64(hProcess, dwAddr); } /***********************************************************************

1 0

Eric Pouech : dbghelp: Move debug info loading out of image backends into SymLoadModuleEx().
by Alexandre Julliard 16 Nov '21

16 Nov '21

Module: wine Branch: master Commit: ced12a1a3aca214c64887e1dc65df67015015394 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ced12a1a3aca214c64887e1d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 16 17:47:30 2021 +0100 dbghelp: Move debug info loading out of image backends into SymLoadModuleEx(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 7 +---- dlls/dbghelp/macho_module.c | 4 --- dlls/dbghelp/module.c | 74 ++++++++++++++++++++++++--------------------- dlls/dbghelp/pe_module.c | 9 +----- 4 files changed, 42 insertions(+), 52 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index dbae4db40d2..def8b444e4e 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1261,15 +1261,10 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename, elf_module_info->file_map = *fmap; elf_reset_file_map(fmap); - if (dbghelp_options & SYMOPT_DEFERRED_LOADS) - { - elf_info->module->module.SymType = SymDeferred; - ret = TRUE; - } - else ret = elf_load_debug_info(pcs, elf_info->module); elf_module_info->elf_mark = 1; elf_module_info->elf_loader = 0; + ret = TRUE; } else ret = TRUE; if (elf_info->flags & ELF_INFO_NAME) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index c4a19b63de0..7d0d45b3a5a 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1495,10 +1495,6 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, 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(pcs, macho_info->module)) - ret = FALSE; macho_info->module->format_info[DFI_MACHO]->u.macho_info->in_use = 1; macho_info->module->format_info[DFI_MACHO]->u.macho_info->is_loader = 0; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 8f8820f90a9..5c439dd1d3c 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -200,7 +200,7 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module_set_module(module, name); module->module.ImageName[0] = '\0'; lstrcpynW(module->module.LoadedImageName, name, ARRAY_SIZE(module->module.LoadedImageName)); - module->module.SymType = SymNone; + module->module.SymType = SymDeferred; module->module.NumSyms = 0; module->module.TimeDateStamp = stamp; module->module.CheckSum = checksum; @@ -350,54 +350,59 @@ struct module* module_get_containee(const struct process* pcs, const struct modu return NULL; } -/****************************************************************** - * module_get_debug - * - * get the debug information from a module: - * - if the module's type is deferred, then force loading of debug info (and return - * the module itself) - * - if the module has no debug info and has an ELF container, then return the ELF - * container (and also force the ELF container's debug info loading if deferred) - * - otherwise return the module itself if it has some debug info - */ -BOOL module_get_debug(struct module_pair* pair) +BOOL module_load_debug(struct module* module) { IMAGEHLP_DEFERRED_SYMBOL_LOADW64 idslW64; - if (!pair->requested) return FALSE; - /* for a PE builtin, always get info from container */ - if (!(pair->effective = module_get_container(pair->pcs, pair->requested))) - pair->effective = pair->requested; /* if deferred, force loading */ - if (pair->effective->module.SymType == SymDeferred) + if (module->module.SymType == SymDeferred) { BOOL ret; - if (pair->effective->is_virtual) ret = FALSE; - else if (pair->effective->type == DMT_PE) + if (module->is_virtual) ret = FALSE; + else if (module->type == DMT_PE) { idslW64.SizeOfStruct = sizeof(idslW64); - idslW64.BaseOfImage = pair->effective->module.BaseOfImage; - idslW64.CheckSum = pair->effective->module.CheckSum; - idslW64.TimeDateStamp = pair->effective->module.TimeDateStamp; - memcpy(idslW64.FileName, pair->effective->module.ImageName, - sizeof(pair->effective->module.ImageName)); + idslW64.BaseOfImage = module->module.BaseOfImage; + idslW64.CheckSum = module->module.CheckSum; + idslW64.TimeDateStamp = module->module.TimeDateStamp; + memcpy(idslW64.FileName, module->module.ImageName, + sizeof(module->module.ImageName)); idslW64.Reparse = FALSE; idslW64.hFile = INVALID_HANDLE_VALUE; - pcs_callback(pair->pcs, CBA_DEFERRED_SYMBOL_LOAD_START, &idslW64); - ret = pe_load_debug_info(pair->pcs, pair->effective); - pcs_callback(pair->pcs, + pcs_callback(module->process, CBA_DEFERRED_SYMBOL_LOAD_START, &idslW64); + ret = pe_load_debug_info(module->process, module); + pcs_callback(module->process, ret ? CBA_DEFERRED_SYMBOL_LOAD_COMPLETE : CBA_DEFERRED_SYMBOL_LOAD_FAILURE, &idslW64); } - else ret = pair->pcs->loader->load_debug_info(pair->pcs, pair->effective); + else ret = module->process->loader->load_debug_info(module->process, module); - if (!ret) pair->effective->module.SymType = SymNone; - assert(pair->effective->module.SymType != SymDeferred); - pair->effective->module.NumSyms = pair->effective->ht_symbols.num_elts; + if (!ret) module->module.SymType = SymNone; + assert(module->module.SymType != SymDeferred); + module->module.NumSyms = module->ht_symbols.num_elts; } - return pair->effective->module.SymType != SymNone; + return module->module.SymType != SymNone; +} + +/****************************************************************** + * module_get_debug + * + * get the debug information from a module: + * - if the module's type is deferred, then force loading of debug info (and return + * the module itself) + * - if the module has no debug info and has an ELF container, then return the ELF + * container (and also force the ELF container's debug info loading if deferred) + * - otherwise return the module itself if it has some debug info + */ +BOOL module_get_debug(struct module_pair* pair) +{ + if (!pair->requested) return FALSE; + /* for a PE builtin, always get info from container */ + if (!(pair->effective = module_get_container(pair->pcs, pair->requested))) + pair->effective = pair->requested; + return module_load_debug(pair->effective); } /*********************************************************************** @@ -966,7 +971,6 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam WARN("Couldn't locate %s\n", debugstr_w(wImageName)); return 0; } - module->module.NumSyms = module->ht_symbols.num_elts; /* by default module_new fills module.ModuleName from a derivation * of LoadedImageName. Overwrite it, if we have better information */ @@ -974,7 +978,8 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam module_set_module(module, wModuleName); if (wImageName) lstrcpynW(module->module.ImageName, wImageName, ARRAY_SIZE(module->module.ImageName)); - + if ((dbghelp_options & SYMOPT_DEFERRED_LOADS) == 0) + module_load_debug(module); return module->module.BaseOfImage; } @@ -1494,6 +1499,7 @@ static struct module* native_load_module(struct process* pcs, const WCHAR* name, static BOOL native_load_debug_info(struct process* process, struct module* module) { + module->module.SymType = SymNone; return FALSE; } diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 77ae122901a..e0266db0387 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -751,7 +751,7 @@ BOOL pe_load_debug_info(const struct process* pcs, struct module* module) /* FIXME shouldn't we check that? if (!module_get_debug(pcs, module)) */ if (pe_load_export_debug_info(pcs, module) && !ret) ret = TRUE; - + if (!ret) module->module.SymType = SymNone; return ret; } @@ -797,8 +797,6 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, opened = TRUE; } else if (name) lstrcpyW(loaded_name, name); - else if (dbghelp_options & SYMOPT_DEFERRED_LOADS) - FIXME("Trouble ahead (no module name passed in deferred mode)\n"); if (!(modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct pe_module_info)))) return NULL; modfmt->u.pe_info = (struct pe_module_info*)(modfmt + 1); @@ -824,12 +822,7 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, modfmt->module = module; modfmt->remove = pe_module_remove; modfmt->loc_compute = NULL; - module->format_info[DFI_PE] = modfmt; - if (dbghelp_options & SYMOPT_DEFERRED_LOADS) - module->module.SymType = SymDeferred; - else - pe_load_debug_info(pcs, module); module->reloc_delta = base - PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, ImageBase); } else

1 0