October 2021 - Wine-commits

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: 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/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

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

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 : 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 : dxgi: Don't grab wined3d lock for wined3d_resource_map/unmap().
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 98e2668949f8a75be56891593103942f23a2cc56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98e2668949f8a75be5689159… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:21 2021 +0200 dxgi: Don't grab wined3d lock for wined3d_resource_map/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/dxgi/surface.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 4b1b83b84a9..ad2c0d7ff1e 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -196,14 +196,12 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_Map(IDXGISurface1 *iface, DXGI_MAP if (flags & DXGI_MAP_DISCARD) wined3d_map_flags |= WINED3D_MAP_DISCARD; - wined3d_mutex_lock(); if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), 0, &wined3d_map_desc, NULL, wined3d_map_flags))) { mapped_rect->Pitch = wined3d_map_desc.row_pitch; mapped_rect->pBits = wined3d_map_desc.data; } - wined3d_mutex_unlock(); return hr; } @@ -213,11 +211,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_Unmap(IDXGISurface1 *iface) struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); TRACE("iface %p.\n", iface); - - wined3d_mutex_lock(); wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), 0); - wined3d_mutex_unlock(); - return S_OK; }

1 0

Alexandre Julliard : oledb32: Return INT_PTR instead of LRESULT in dialog procedures.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 63895aaf2895b61bec5996d86e24b226ea149a42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63895aaf2895b61bec5996d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 16:42:13 2021 +0200 oledb32: Return INT_PTR instead of LRESULT in dialog procedures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/dslocator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index c74fb5133d2..95fd7687560 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -329,7 +329,7 @@ static void add_connections_providers(HWND lv) RegCloseKey(key); } -static LRESULT CALLBACK data_link_properties_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +static INT_PTR CALLBACK data_link_properties_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); @@ -477,7 +477,7 @@ static void connection_toggle_controls(HWND parent) EnableWindow(GetDlgItem(parent, IDC_BTN_BUILD), !checked); } -static LRESULT CALLBACK data_link_connection_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +static INT_PTR CALLBACK data_link_connection_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); @@ -549,7 +549,7 @@ static void advanced_fill_permission_list(HWND parent) } } -static LRESULT CALLBACK data_link_advanced_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +static INT_PTR CALLBACK data_link_advanced_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); @@ -593,7 +593,7 @@ static void create_page_all_columns(HWND lv) SendMessageW(lv, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); } -static LRESULT CALLBACK data_link_all_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +static INT_PTR CALLBACK data_link_all_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp);

1 0

Alexandre Julliard : user32: Return INT_PTR instead of LRESULT in dialog procedures.
by Alexandre Julliard 19 Oct '21

19 Oct '21

Module: wine Branch: master Commit: 7637e49c448dc0431f9497d0f6ed9854814e8ced URL: https://source.winehq.org/git/wine.git/?a=commit;h=7637e49c448dc0431f9497d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 16:42:25 2021 +0200 user32: Return INT_PTR instead of LRESULT in dialog procedures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 2 +- dlls/user32/tests/msg.c | 6 +++--- dlls/user32/winproc.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index fcfaf5c12d6..4b1336b62c5 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -488,7 +488,7 @@ static LRESULT CALLBACK main_window_procA (HWND hwnd, UINT uiMsg, WPARAM wParam, return DefWindowProcA (hwnd, uiMsg, wParam, lParam); } -static LRESULT CALLBACK disabled_test_proc (HWND hwnd, UINT uiMsg, +static INT_PTR CALLBACK disabled_test_proc (HWND hwnd, UINT uiMsg, WPARAM wParam, LPARAM lParam) { switch (uiMsg) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 43253953a9e..4b2495f4197 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -10110,7 +10110,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam return message == WM_COMPAREITEM ? -1 : ret; } -static INT_PTR CALLBACK StopQuitMsgCheckProcA(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) +static LRESULT CALLBACK StopQuitMsgCheckProcA(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) { if (message == WM_CREATE) PostMessageA(hwnd, WM_CLOSE, 0, 0); @@ -14381,7 +14381,7 @@ static void test_dialog_messages(void) cls.lpszClassName = "MyDialogClass"; cls.hInstance = GetModuleHandleA(NULL); /* need a cast since a dlgproc is used as a wndproc */ - cls.lpfnWndProc = test_dlg_proc; + cls.lpfnWndProc = (WNDPROC)test_dlg_proc; if (!RegisterClassA(&cls)) assert(0); SetFocus(0); @@ -14534,7 +14534,7 @@ static void test_EndDialog(void) ok(GetClassInfoA(0, "#32770", &cls), "GetClassInfo failed\n"); cls.lpszClassName = "MyDialogClass"; cls.hInstance = GetModuleHandleA(NULL); - cls.lpfnWndProc = test_dlg_proc; + cls.lpfnWndProc = (WNDPROC)test_dlg_proc; if (!RegisterClassA(&cls)) assert(0); flush_sequence(); diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 81fbcab928d..449fdae7b15 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1046,7 +1046,7 @@ INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, if (!func) return 0; - if (!(proc = handle_to_proc( func ))) + if (!(proc = handle_to_proc( (WNDPROC)func ))) ret = call_dialog_proc( hwnd, msg, wParam, lParam, &result, func ); else if (proc == WINPROC_PROC16) { @@ -1071,7 +1071,7 @@ INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, if (!func) return 0; - if (!(proc = handle_to_proc( func ))) + if (!(proc = handle_to_proc( (WNDPROC)func ))) ret = call_dialog_proc( hwnd, msg, wParam, lParam, &result, func ); else if (proc == WINPROC_PROC16) {

1 0

Alexandre Julliard : libs: Import upstream code from libjpeg 9d.
by Alexandre Julliard 19 Oct '21

19 Oct '21

1 0