wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Jan Sikorski : ddraw: Don't grab wined3d lock for wined3d_resource_unmap().
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 48bc9ba47a165ea0766de17142bb45083495fe2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=48bc9ba47a165ea0766de171… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:20 2021 +0200 ddraw: Don't grab wined3d lock for wined3d_resource_unmap(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/vertexbuffer.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 584d9d162b9..dd35b445cc5 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -214,11 +214,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_Unlock(IDirect3DVertexBuffer7 *iface) struct d3d_vertex_buffer *buffer = impl_from_IDirect3DVertexBuffer7(iface); TRACE("iface %p.\n", iface); - - wined3d_mutex_lock(); wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0); - wined3d_mutex_unlock(); - return D3D_OK; }

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d deferred context functions.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 713d6558dbd059598ff423a19e93bf318120803d URL: https://source.winehq.org/git/wine.git/?a=commit;h=713d6558dbd059598ff423a1… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:18 2021 +0200 d3d11: Don't grab wined3d lock for wined3d deferred context functions. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 67264e1d862..8d88ee26222 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2704,8 +2704,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_context_FinishCommandList(ID3D11De if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - wined3d_mutex_lock(); - if (FAILED(hr = wined3d_deferred_context_record_command_list(context->wined3d_context, !!restore, &object->wined3d_list))) { @@ -2714,8 +2712,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_context_FinishCommandList(ID3D11De return hr; } - wined3d_mutex_unlock(); - object->ID3D11CommandList_iface.lpVtbl = &d3d11_command_list_vtbl; object->refcount = 1; object->device = &context->device->ID3D11Device2_iface; @@ -3687,15 +3683,12 @@ static HRESULT d3d11_deferred_context_create(struct d3d_device *device, return E_OUTOFMEMORY; d3d11_device_context_init(object, device, D3D11_DEVICE_CONTEXT_DEFERRED); - wined3d_mutex_lock(); if (FAILED(hr = wined3d_deferred_context_create(device->wined3d_device, &object->wined3d_context))) { WARN("Failed to create wined3d deferred context, hr %#x.\n", hr); heap_free(object); - wined3d_mutex_unlock(); return hr; } - wined3d_mutex_unlock(); TRACE("Created deferred context %p.\n", object); *context = object;

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d_device_context_execute_command_list().
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 9457c8d172c450e64df15a9cd5fd824b34139b97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9457c8d172c450e64df15a9c… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:17 2021 +0200 d3d11: Don't grab wined3d lock for wined3d_device_context_execute_command_list(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 6d125e06ace..67264e1d862 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1519,9 +1519,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_ExecuteCommandList(ID3D11Devi TRACE("iface %p, command_list %p, restore_state %#x.\n", iface, command_list, restore_state); - wined3d_mutex_lock(); wined3d_device_context_execute_command_list(context->wined3d_context, list_impl->wined3d_list, !!restore_state); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_HSSetShaderResources(ID3D11DeviceContext1 *iface,

1 0

Eric Pouech : dbghelp/dwarf: Properly handle error cases while computing frame_cfa.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 7bc6eb9d255f13358cfd307a9e9129c09da65ce3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bc6eb9d255f13358cfd307a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 19 15:51:55 2021 +0200 dbghelp/dwarf: Properly handle error cases while computing frame_cfa. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 8b08799dce7..e1c77569622 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3689,10 +3689,10 @@ static BOOL compute_call_frame_cfa(struct module* module, ULONG_PTR ip, struct l { case RULE_EXPRESSION: FIXME("Too complex expression for frame_CFA resolution (RULE_EXPRESSION)\n"); - break; + return FALSE; case RULE_VAL_EXPRESSION: FIXME("Too complex expression for frame_CFA resolution (RULE_VAL_EXPRESSION)\n"); - break; + return FALSE; default: frame->kind = loc_regrel; frame->reg = dbghelp_current_cpu->map_dwarf_register(info.state.cfa_reg, module, TRUE);

1 0

Eric Pouech : dbghelp: Factorize SymUnloadModule and SymUnloadModule64.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 8f272e25aff25a310b07d00edff043cd3cdd9cdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f272e25aff25a310b07d00e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 19 15:51:49 2021 +0200 dbghelp: Factorize SymUnloadModule and SymUnloadModule64. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index b645e6dbf0f..f0fd2a55016 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1032,14 +1032,7 @@ BOOL module_remove(struct process* pcs, struct module* module) */ BOOL WINAPI SymUnloadModule(HANDLE hProcess, DWORD BaseOfDll) { - struct process* pcs; - struct module* module; - - pcs = process_find_by_handle(hProcess); - if (!pcs) return FALSE; - module = module_find_by_addr(pcs, BaseOfDll, DMT_UNKNOWN); - if (!module) return FALSE; - return module_remove(pcs, module); + return SymUnloadModule64(hProcess, BaseOfDll); } /******************************************************************

1 0

Eric Pouech : dbghelp: Improve error handling in SymSetContext().
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 8b4d5e6eeff54190cf5601fa401875aef5e9622b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b4d5e6eeff54190cf5601fa… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 19 15:51:43 2021 +0200 dbghelp: Improve error handling in SymSetContext(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 585fc9cada5..00f02423fef 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -609,6 +609,8 @@ BOOL WINAPI SymSetContext(HANDLE hProcess, PIMAGEHLP_STACK_FRAME StackFrame, struct process* pcs = process_find_by_handle(hProcess); if (!pcs) return FALSE; + if (!module_find_by_addr(pcs, StackFrame->InstructionOffset, DMT_UNKNOWN)) + return FALSE; if (pcs->ctx_frame.ReturnOffset == StackFrame->ReturnOffset && pcs->ctx_frame.FrameOffset == StackFrame->FrameOffset && pcs->ctx_frame.StackOffset == StackFrame->StackOffset) @@ -618,12 +620,12 @@ BOOL WINAPI SymSetContext(HANDLE hProcess, PIMAGEHLP_STACK_FRAME StackFrame, pcs->ctx_frame.FrameOffset, pcs->ctx_frame.StackOffset); pcs->ctx_frame.InstructionOffset = StackFrame->InstructionOffset; - SetLastError(ERROR_ACCESS_DENIED); /* latest MSDN says ERROR_SUCCESS */ + SetLastError(ERROR_SUCCESS); return FALSE; } pcs->ctx_frame = *StackFrame; - /* MSDN states that Context is not (no longer?) used */ + /* Context is not (no longer?) used */ return TRUE; }

1 0

Eric Pouech : dbghelp: Add stub implementations for the SymSetScope* functions.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 76c4e691af3273ae2d349ef3aeb80f280edde1fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=76c4e691af3273ae2d349ef3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 19 15:51:37 2021 +0200 dbghelp: Add stub implementations for the SymSetScope* functions. Also move SymSetScopeFromAddr out of symbol.c into dbghelp.c which makes more sense as modification of process settings. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 47 +++++++++++++++++++++++++++++++++++++++++++---- dlls/dbghelp/dbghelp.spec | 4 ++-- dlls/dbghelp/symbol.c | 13 ------------- 3 files changed, 45 insertions(+), 19 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 65a57ac90dc..585fc9cada5 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -613,10 +613,10 @@ BOOL WINAPI SymSetContext(HANDLE hProcess, PIMAGEHLP_STACK_FRAME StackFrame, pcs->ctx_frame.FrameOffset == StackFrame->FrameOffset && pcs->ctx_frame.StackOffset == StackFrame->StackOffset) { - TRACE("Setting same frame {rtn=%s frm=%s stk=%s}\n", - wine_dbgstr_longlong(pcs->ctx_frame.ReturnOffset), - wine_dbgstr_longlong(pcs->ctx_frame.FrameOffset), - wine_dbgstr_longlong(pcs->ctx_frame.StackOffset)); + TRACE("Setting same frame {rtn=%I64x frm=%I64x stk=%I64x}\n", + pcs->ctx_frame.ReturnOffset, + pcs->ctx_frame.FrameOffset, + pcs->ctx_frame.StackOffset); pcs->ctx_frame.InstructionOffset = StackFrame->InstructionOffset; SetLastError(ERROR_ACCESS_DENIED); /* latest MSDN says ERROR_SUCCESS */ return FALSE; @@ -627,6 +627,45 @@ BOOL WINAPI SymSetContext(HANDLE hProcess, PIMAGEHLP_STACK_FRAME StackFrame, return TRUE; } +/****************************************************************** + * SymSetScopeFromAddr (DBGHELP.@) + */ +BOOL WINAPI SymSetScopeFromAddr(HANDLE hProcess, ULONG64 addr) +{ + struct process* pcs; + + FIXME("(%p %#I64x): stub\n", hProcess, addr); + + if (!(pcs = process_find_by_handle(hProcess))) return FALSE; + return TRUE; +} + +/****************************************************************** + * SymSetScopeFromIndex (DBGHELP.@) + */ +BOOL WINAPI SymSetScopeFromIndex(HANDLE hProcess, ULONG64 addr, DWORD index) +{ + struct process* pcs; + + FIXME("(%p %#I64x %u): stub\n", hProcess, addr, index); + + if (!(pcs = process_find_by_handle(hProcess))) return FALSE; + return TRUE; +} + +/****************************************************************** + * SymSetScopeFromInlineContext (DBGHELP.@) + */ +BOOL WINAPI SymSetScopeFromInlineContext(HANDLE hProcess, ULONG64 addr, DWORD inlinectx) +{ + struct process* pcs; + + FIXME("(%p %#I64x %u): stub\n", hProcess, addr, inlinectx); + + if (!(pcs = process_find_by_handle(hProcess))) return FALSE; + return TRUE; +} + /****************************************************************** * reg_cb64to32 (internal) * diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 696d7640aa4..471d9b6141c 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -169,8 +169,8 @@ @ stdcall SymSetOptions(long) @ stdcall SymSetParentWindow(long) @ stdcall SymSetScopeFromAddr(ptr int64) -@ stub SymSetScopeFromIndex -@ stub SymSetScopeFromInlineContext +@ stdcall SymSetScopeFromIndex(ptr int64 long) +@ stdcall SymSetScopeFromInlineContext(ptr int64 long) @ stdcall SymSetSearchPath(long str) @ stdcall SymSetSearchPathW(long wstr) @ stub SymSrvDeltaName diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 5cd62a538af..19374999070 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -2351,19 +2351,6 @@ BOOL WINAPI SymAddSymbolW(HANDLE hProcess, ULONG64 BaseOfDll, PCWSTR nameW, return SymAddSymbol(hProcess, BaseOfDll, name, addr, size, flags); } -/****************************************************************** - * SymSetScopeFromAddr (DBGHELP.@) - */ -BOOL WINAPI SymSetScopeFromAddr(HANDLE hProcess, ULONG64 addr) -{ - struct process* pcs; - - FIXME("(%p %s): stub\n", hProcess, wine_dbgstr_longlong(addr)); - - if (!(pcs = process_find_by_handle(hProcess))) return FALSE; - return TRUE; -} - /****************************************************************** * SymEnumLines (DBGHELP.@) *

1 0

Eric Pouech : dbghelp: Add stub implementations of SymGetLineFromInlineContext(W).
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 26e06f5b796feacffe4eac9a65c4c270275e315a URL: https://source.winehq.org/git/wine.git/?a=commit;h=26e06f5b796feacffe4eac9a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 19 15:51:31 2021 +0200 dbghelp: Add stub implementations of SymGetLineFromInlineContext(W). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.spec | 4 ++-- dlls/dbghelp/symbol.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 474c172df67..696d7640aa4 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -92,8 +92,8 @@ @ stdcall SymGetLineFromAddr(long long ptr ptr) @ stdcall SymGetLineFromAddr64(long int64 ptr ptr) @ stdcall SymGetLineFromAddrW64(long int64 ptr ptr) -@ stub SymGetLineFromInlineContext -@ stub SymGetLineFromInlineContextW +@ stdcall SymGetLineFromInlineContext(long int64 long int64 ptr ptr) +@ stdcall SymGetLineFromInlineContextW(long int64 long int64 ptr ptr) @ stdcall SymGetLineFromName(long str str long ptr ptr) @ stdcall SymGetLineFromName64(long str str long ptr ptr) @ stdcall SymGetLineFromNameW64(long wstr wstr long ptr ptr) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index f6fa5c8ab43..5cd62a538af 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -2540,3 +2540,27 @@ BOOL WINAPI SymFromInlineContextW(HANDLE hProcess, DWORD64 addr, ULONG inline_ct HeapFree(GetProcessHeap(), 0, si); return ret; } + +/****************************************************************** + * SymGetLineFromInlineContext (DBGHELP.@) + * + */ +BOOL WINAPI SymGetLineFromInlineContext(HANDLE hProcess, DWORD64 addr, ULONG inline_ctx, DWORD64 mod_addr, PDWORD disp, PIMAGEHLP_LINE64 line) +{ + FIXME("(%p, %#I64x, 0x%x, %#I64x, %p, %p): stub!\n", + hProcess, addr, inline_ctx, mod_addr, disp, line); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/****************************************************************** + * SymGetLineFromInlineContextW (DBGHELP.@) + * + */ +BOOL WINAPI SymGetLineFromInlineContextW(HANDLE hProcess, DWORD64 addr, ULONG inline_ctx, DWORD64 mod_addr, PDWORD disp, PIMAGEHLP_LINEW64 line) +{ + FIXME("(%p, %#I64x, 0x%x, %#I64x, %p, %p): stub!\n", + hProcess, addr, inline_ctx, mod_addr, disp, line); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Eric Pouech : dbghelp: Add stub implementation of SymFromInlineContext(W).
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 9a1a849b95fd63c10e375c4781303f75b34e7940 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a1a849b95fd63c10e375c47… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 19 15:51:24 2021 +0200 dbghelp: Add stub implementation of SymFromInlineContext(W). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.spec | 4 ++-- dlls/dbghelp/symbol.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index e96c2e0d3fd..474c172df67 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -77,8 +77,8 @@ @ stdcall SymFromAddrW(ptr int64 ptr ptr) @ stdcall SymFromIndex(long int64 long ptr) @ stdcall SymFromIndexW(long int64 long ptr) -@ stub SymFromInlineContext -@ stub SymFromInlineContextW +@ stdcall SymFromInlineContext(long int64 long ptr ptr) +@ stdcall SymFromInlineContextW(long int64 long ptr ptr) @ stdcall SymFromName(long str ptr) @ stdcall SymFromNameW(long wstr ptr) @ stub SymFromToken diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 76c92414b89..f6fa5c8ab43 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -2503,3 +2503,40 @@ PWSTR WINAPI SymSetHomeDirectoryW(HANDLE hProcess, PCWSTR dir) return NULL; } + +/****************************************************************** + * SymFromInlineContext (DBGHELP.@) + * + */ +BOOL WINAPI SymFromInlineContext(HANDLE hProcess, DWORD64 addr, ULONG inline_ctx, PDWORD64 disp, PSYMBOL_INFO si) +{ + FIXME("(%p, %#I64x, 0x%x, %p, %p): stub\n", hProcess, addr, inline_ctx, disp, si); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/****************************************************************** + * SymFromInlineContextW (DBGHELP.@) + * + */ +BOOL WINAPI SymFromInlineContextW(HANDLE hProcess, DWORD64 addr, ULONG inline_ctx, PDWORD64 disp, PSYMBOL_INFOW siW) +{ + PSYMBOL_INFO si; + unsigned len; + BOOL ret; + + TRACE("(%p, %#I64x, 0x%x, %p, %p)\n", hProcess, addr, inline_ctx, disp, siW); + + len = sizeof(*si) + siW->MaxNameLen * sizeof(WCHAR); + si = HeapAlloc(GetProcessHeap(), 0, len); + if (!si) return FALSE; + + si->SizeOfStruct = sizeof(*si); + si->MaxNameLen = siW->MaxNameLen; + if ((ret = SymFromInlineContext(hProcess, addr, inline_ctx, disp, si))) + { + copy_symbolW(siW, si); + } + HeapFree(GetProcessHeap(), 0, si); + return ret; +}

1 0

Eric Pouech : dbghelp: Start implementing StackWalkEx.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: bef7e1f202d9676256ad8e187d83ce0b468b9614 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bef7e1f202d9676256ad8e18… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 19 15:51:18 2021 +0200 dbghelp: Start implementing StackWalkEx. Simple copy of StackWalk implementation. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/stack.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index e45ac48acb2..e96c2e0d3fd 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -32,7 +32,7 @@ @ stdcall SearchTreeForFileW(wstr wstr ptr) @ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) @ stdcall StackWalk64(long long long ptr ptr ptr ptr ptr ptr) -@ stub StackWalkEx +@ stdcall StackWalkEx(long long long ptr ptr ptr ptr ptr ptr long) @ stub SymAddSourceStream @ stub SymAddSourceStreamA @ stub SymAddSourceStreamW diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index d04c0163c92..6c70fc805cb 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -245,6 +245,81 @@ BOOL WINAPI StackWalk64(DWORD MachineType, HANDLE hProcess, HANDLE hThread, return TRUE; } +/* all the fields of STACKFRAME64 are present in STACKFRAME_EX at same offset + * So casting down a STACKFRAME_EX into a STACKFRAME64 is valid! + */ +C_ASSERT(sizeof(STACKFRAME64) == FIELD_OFFSET(STACKFRAME_EX, StackFrameSize)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, AddrPC) == FIELD_OFFSET(STACKFRAME_EX, AddrPC)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, AddrReturn) == FIELD_OFFSET(STACKFRAME_EX, AddrReturn)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, AddrFrame) == FIELD_OFFSET(STACKFRAME_EX, AddrFrame)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, AddrStack) == FIELD_OFFSET(STACKFRAME_EX, AddrStack)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, AddrBStore) == FIELD_OFFSET(STACKFRAME_EX, AddrBStore)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, FuncTableEntry) == FIELD_OFFSET(STACKFRAME_EX, FuncTableEntry)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, Params) == FIELD_OFFSET(STACKFRAME_EX, Params)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, Far) == FIELD_OFFSET(STACKFRAME_EX, Far)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, Virtual) == FIELD_OFFSET(STACKFRAME_EX, Virtual)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, Reserved) == FIELD_OFFSET(STACKFRAME_EX, Reserved)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, KdHelp) == FIELD_OFFSET(STACKFRAME_EX, KdHelp)); + +/*********************************************************************** + * StackWalkEx (DBGHELP.@) + */ +BOOL WINAPI StackWalkEx(DWORD MachineType, HANDLE hProcess, HANDLE hThread, + LPSTACKFRAME_EX frame, PVOID ctx, + PREAD_PROCESS_MEMORY_ROUTINE64 f_read_mem, + PFUNCTION_TABLE_ACCESS_ROUTINE64 FunctionTableAccessRoutine, + PGET_MODULE_BASE_ROUTINE64 GetModuleBaseRoutine, + PTRANSLATE_ADDRESS_ROUTINE64 f_xlat_adr, + DWORD flags) +{ + struct cpu_stack_walk csw; + struct cpu* cpu; + + TRACE("(%d, %p, %p, %p, %p, %p, %p, %p, %p, 0x%x)\n", + MachineType, hProcess, hThread, frame, ctx, + f_read_mem, FunctionTableAccessRoutine, + GetModuleBaseRoutine, f_xlat_adr, flags); + + if (!(cpu = cpu_find(MachineType))) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (frame->StackFrameSize != sizeof(*frame)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (flags != 0) + { + FIXME("Unsupported yet flags 0x%x\n", flags); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (frame->InlineFrameContext != INLINE_FRAME_CONTEXT_IGNORE) + { + FIXME("Inlined contexts are not supported yet\n"); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + csw.hProcess = hProcess; + csw.hThread = hThread; + csw.is32 = FALSE; + csw.cpu = cpu; + /* sigh... MS isn't even consistent in the func prototypes */ + csw.u.s64.f_read_mem = (f_read_mem) ? f_read_mem : read_mem64; + csw.u.s64.f_xlat_adr = (f_xlat_adr) ? f_xlat_adr : addr_to_linear; + csw.u.s64.f_tabl_acs = (FunctionTableAccessRoutine) ? FunctionTableAccessRoutine : SymFunctionTableAccess64; + csw.u.s64.f_modl_bas = (GetModuleBaseRoutine) ? GetModuleBaseRoutine : SymGetModuleBase64; + + if (!cpu->stack_walk(&csw, (STACKFRAME64*)frame, ctx)) return FALSE; + + /* we don't handle KdHelp */ + + return TRUE; +} + /****************************************************************** * SymRegisterFunctionEntryCallback (DBGHELP.@) *

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021