diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-08-28 19:58:32 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-09-26 09:42:11 +0200 |
| commit | 4baec725e0dc0713f0d47003e9b10bc3b62f56ff (patch) | |
| tree | 72f21c28416068e46133964e420ca094af8b7587 /vcl/osx | |
| parent | f633dcdfc0ad7a13d096d97b6753b55e8f8a3f07 (diff) | |
WIN run main thread redirects ignoring SolarMutex
This way we can drop all the special nReleased handling. Instead
we use the same mechanism as on Mac, where we keep the lock, but
disable it for the main thread. As a security measure we assert on
duplicate redirects, which should not happen.
As a result we can't use SendMessage on the main thread itself,
which would normally just call the WinProc directly. This could be
accomplished by converting the redirect bool into a counter, which
should be safe, as no other thread could acquire the SolarMutex,
as we don't release it.
Change-Id: Icd87b3da37a2489f3cad2bc80215bf93fc41d388
Reviewed-on: https://gerrit.libreoffice.org/42583
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/osx')
| -rw-r--r-- | vcl/osx/salinst.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 54f6ffdd7021..947e484b5c1d 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -533,10 +533,8 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH SAL_WNODEPRECATED_DECLARATIONS_POP } -bool AquaSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong const nReleased) +bool AquaSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents) { - (void) nReleased; - assert(nReleased == 0); // not implemented bool bHadEvent = false; // ensure that the per thread autorelease pool is top level and |