diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-08-15 08:05:51 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-09-19 09:25:14 +0200 |
| commit | 3840aede596e6fc24f7ed7df9100fb028134aac6 (patch) | |
| tree | 74d1d5efa3b2ad5448181fc185faf226aed192e4 /vcl/inc/win | |
| parent | 10b49dfb3996f99dec8dd0d2ffae2aef4022f395 (diff) | |
Unify SolarMutex implementations
All backends implement the SolarMutex in mostly the same way.
So this consolidates this code into a GenericSolarMutex.
We still need the abstract SolarMutex class for the fake AKA
fascade implementation in dbaccess.
The patch also replaces various places of direct mutex usage with
either SolarMutexGuard or SolarMutexReleaser objects.
Change-Id: Ia0146dd6c51a3b9a513cc6af34a66def58aad831
Reviewed-on: https://gerrit.libreoffice.org/42325
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/inc/win')
| -rw-r--r-- | vcl/inc/win/saldata.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/win/salinst.h | 5 | ||||
| -rw-r--r-- | vcl/inc/win/salprn.h | 3 |
3 files changed, 6 insertions, 6 deletions
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index 4d8361d57325..bc5b9c5db1eb 100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -172,11 +172,9 @@ bool ImplLoadSalIcon( int nId, HICON& rIcon, HICON& rSmallIcon ); void ImplInitSalGDI(); void ImplFreeSalGDI(); -void ImplSalYieldMutexAcquireWithWait( sal_uLong nCount = 1 ); +void ImplSalYieldMutexAcquireWithWait( sal_uInt32 nCount = 1 ); bool ImplSalYieldMutexTryToAcquire(); void ImplSalYieldMutexRelease(); -sal_uLong ImplSalReleaseYieldMutex(); -void ImplSalAcquireYieldMutex( sal_uLong nCount ); LRESULT CALLBACK SalFrameWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ); diff --git a/vcl/inc/win/salinst.h b/vcl/inc/win/salinst.h index 03ba573c523b..6efecbd6bd5e 100644 --- a/vcl/inc/win/salinst.h +++ b/vcl/inc/win/salinst.h @@ -59,9 +59,8 @@ public: virtual SalSystem* CreateSalSystem() override; virtual SalBitmap* CreateSalBitmap() override; virtual comphelper::SolarMutex* GetYieldMutex() override; - virtual sal_uIntPtr ReleaseYieldMutex() override; - virtual void AcquireYieldMutex( sal_uIntPtr nCount ) override; - virtual bool CheckYieldMutex() override; + virtual sal_uInt32 ReleaseYieldMutex( bool bUnlockAll = false ) override; + virtual void AcquireYieldMutex( sal_uInt32 nCount = 1 ) override; virtual bool IsMainThread() const override; virtual bool DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong nReleased) override; diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h index a483e2502cc7..ed6005283661 100644 --- a/vcl/inc/win/salprn.h +++ b/vcl/inc/win/salprn.h @@ -84,6 +84,9 @@ public: bool mbValid; +protected: + void DoEndDoc(HDC hDC); + public: WinSalPrinter(); virtual ~WinSalPrinter() override; |