diff options
| author | Marc Mondesir <timepilot3000@gmail.com> | 2024-10-07 11:06:31 -0700 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2024-10-10 11:22:24 +0200 |
| commit | e26afef055b8df5f0eb2f39caa282d47cbda6efe (patch) | |
| tree | 05b2eba35faee407e1341d2207f601627bff3e56 | |
| parent | 646e4cfa4f8f1858d8ab762594f60a9c91cf19e4 (diff) | |
Log SetGestureConfig failure. Remove redundant mutex.
Log warning if SetGestureConfig fails. Remove mutex around ImplHandleGestureMsg call since mutex called inside function.
Change-Id: Icd614d7119c1b8a39c410e203748d5e502c3f5a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174306
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
| -rw-r--r-- | vcl/win/window/salframe.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 4c7f6814c6f0..f61d5a316c15 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -5919,7 +5919,10 @@ static LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LP { GID_ROTATE, GC_ROTATE, 0 }, { GID_PAN, dwPanWant, dwPanBlock } }; UINT uiGcs = 3; - SetGestureConfig(hWnd, 0, uiGcs, gc, sizeof(GESTURECONFIG)); + if (!SetGestureConfig(hWnd, 0, uiGcs, gc, sizeof(GESTURECONFIG))) + { + SAL_WARN("vcl", "SetGestureConfig failed: " << WindowsErrorString(GetLastError())); + } } return 0; } @@ -5939,9 +5942,7 @@ static LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LP switch( nMsg ) { case WM_GESTURE: - ImplSalYieldMutexAcquireWithWait(); rDef = !ImplHandleGestureMsg(hWnd, lParam); - ImplSalYieldMutexRelease(); break; case WM_MOUSEMOVE: @@ -6001,7 +6002,7 @@ static LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LP { bInWheelMsg = true; rDef = !ImplHandleWheelMsg( hWnd, nMsg, wParam, lParam ); - // If we did not process the message, re-check if here is a + // If we did not process the message, re-check if there is a // connected (?) window that we have to notify. if ( rDef ) rDef = ImplSalWheelMousePos( hWnd, nMsg, wParam, lParam, nRet ); |