diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-12-11 21:40:51 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-12-12 20:06:26 +0100 |
| commit | d28687d5171784e1ec23d4cf13d7b3c56cc52782 (patch) | |
| tree | cfe0a8c86a0eb7de9273f9a0f8a1e1df10adb0ea /winaccessibility/Library_uacccom.mk | |
| parent | f5a54cbf120efb335205e00ba18a9038449b92c9 (diff) | |
winaccessibility: fix locking in UAccCOM
The COM components will (usually? always?) be called on the main thread
via COM, and may also be called on any thread from the UNO event
listeners. Both ways may access the global AccWinObjectManager.
So the easiest way to lock all that without introducing new deadlocks
seems to be to just use the SolarMutex.
The fact that the main thread is in a COM STA is rather irrelevant here
since we don't currently do the required manual marshalling of the COM
pointers so they can be accessed from UNO event listeners running in
threads other than the main thread anyway.
To get that to build:
- use prewin.h and postwin.h around ATL headers
- link UAccCOM against vcl
- define both UNICODE and _UNICODE to not break on mis-matching TCHAR
nonsense
Change-Id: I1ccdf7a4a5c2b5f0b9c29ef39d126c4b8a16898a
Diffstat (limited to 'winaccessibility/Library_uacccom.mk')
| -rw-r--r-- | winaccessibility/Library_uacccom.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/winaccessibility/Library_uacccom.mk b/winaccessibility/Library_uacccom.mk index 750d41cfaf8f..b7760a7ac091 100644 --- a/winaccessibility/Library_uacccom.mk +++ b/winaccessibility/Library_uacccom.mk @@ -21,7 +21,8 @@ $(eval $(call gb_Library_set_include,UAccCOM,\ $(eval $(call gb_Library_add_defs,UAccCOM,\ -DUACCCOM_DLLIMPLEMENTATION \ - -D_UNICODE=1 \ + -D_UNICODE \ + -DUNICODE \ )) $(eval $(call gb_Library_use_sdk_api,UAccCOM)) @@ -54,6 +55,7 @@ $(eval $(call gb_Library_add_ldflags,UAccCOM,\ )) $(eval $(call gb_Library_use_libraries,UAccCOM,\ + vcl \ cppu \ sal \ )) |