April 2022 - Wine-Commits - list.winehq.org

Huw Davies : wineoss: Move set_volumes to the unixlib.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: 1a2482be2dce854bed01bcf0202be0eb7cef8931 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a2482be2dce854bed01bcf0… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 15 21:40:43 2022 +0100 wineoss: Move set_volumes to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 35 ++++++----------------------------- dlls/wineoss.drv/oss.c | 35 +++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 31 ++++++++++--------------------- 3 files changed, 51 insertions(+), 50 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index cdd9b09bff7..9e3380ca8d9 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -18,22 +18,7 @@ */ #define COBJMACROS -#include "config.h" - #include <stdarg.h> -#include <errno.h> -#include <limits.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/ioctl.h> -#include <fcntl.h> -#include <unistd.h> -#include <math.h> -#include <sys/soundcard.h> -#include <pthread.h> #include "windef.h" #include "winbase.h" @@ -277,16 +262,6 @@ static DWORD WINAPI timer_thread(void *user) return 0; } -static void oss_lock(struct oss_stream *stream) -{ - pthread_mutex_lock(&stream->lock); -} - -static void oss_unlock(struct oss_stream *stream) -{ - pthread_mutex_unlock(&stream->lock); -} - static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -361,11 +336,13 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) static void set_stream_volumes(ACImpl *This) { - struct oss_stream *stream = This->stream; + struct set_volumes_params params; - oss_lock(stream); - stream->mute = This->session->mute; - oss_unlock(stream); + params.stream = This->stream; + params.master_volume = (This->session->mute ? 0.0f : This->session->master_vol); + params.volumes = This->vols; + params.session_volumes = This->session->channel_vols; + OSS_CALL(set_volumes, &params); } static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 79f2e994d89..b4e2cbda704 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -44,6 +44,28 @@ #include "unixlib.h" +struct oss_stream +{ + WAVEFORMATEX *fmt; + EDataFlow flow; + UINT flags; + AUDCLNT_SHAREMODE share; + HANDLE event; + + int fd; + + BOOL playing, mute, please_quit; + UINT64 written_frames, last_pos_frames; + UINT32 period_frames, bufsize_frames, held_frames, tmp_buffer_frames, in_oss_frames; + UINT32 oss_bufsize_bytes, lcl_offs_frames; /* offs into local_buffer where valid data starts */ + REFERENCE_TIME period; + + BYTE *local_buffer, *tmp_buffer; + INT32 getbuf_last; /* <0 when using tmp_buffer */ + + pthread_mutex_t lock; +}; + WINE_DEFAULT_DEBUG_CHANNEL(oss); /* copied from kernelbase */ @@ -1316,6 +1338,18 @@ static NTSTATUS get_position(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS set_volumes(void *args) +{ + struct set_volumes_params *params = args; + struct oss_stream *stream = params->stream; + + oss_lock(stream); + stream->mute = !params->master_volume; + oss_unlock(stream); + + return STATUS_SUCCESS; +} + static NTSTATUS set_event_handle(void *args) { struct set_event_handle_params *params = args; @@ -1368,6 +1402,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_next_packet_size, get_frequency, get_position, + set_volumes, set_event_handle, is_started, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index ed93f0836b1..1ed152fe794 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -18,27 +18,7 @@ #include "mmdeviceapi.h" -struct oss_stream -{ - WAVEFORMATEX *fmt; - EDataFlow flow; - UINT flags; - AUDCLNT_SHAREMODE share; - HANDLE event; - - int fd; - - BOOL playing, mute, please_quit; - UINT64 written_frames, last_pos_frames; - UINT32 period_frames, bufsize_frames, held_frames, tmp_buffer_frames, in_oss_frames; - UINT32 oss_bufsize_bytes, lcl_offs_frames; /* offs into local_buffer where valid data starts */ - REFERENCE_TIME period; - - BYTE *local_buffer, *tmp_buffer; - INT32 getbuf_last; /* <0 when using tmp_buffer */ - - pthread_mutex_t lock; -}; +struct stream_oss; /* From <dlls/mmdevapi/mmdevapi.h> */ enum DriverPriority @@ -208,6 +188,14 @@ struct get_position_params UINT64 *qpctime; }; +struct set_volumes_params +{ + struct oss_stream *stream; + float master_volume; + const float *volumes; + const float *session_volumes; +}; + struct set_event_handle_params { struct oss_stream *stream; @@ -243,6 +231,7 @@ enum oss_funcs oss_get_next_packet_size, oss_get_frequency, oss_get_position, + oss_set_volumes, oss_set_event_handle, oss_is_started, };

1 0

Brendan Shanks : wow64cpu: Use different JMP instruction to work around Rosetta bug.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: 6d19495ed7baea31dc27a46bcd039db8152d274b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d19495ed7baea31dc27a46b… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Apr 14 10:19:07 2022 -0700 wow64cpu: Use different JMP instruction to work around Rosetta bug. Rosetta 2 on macOS 11 and 12 (before 12.4) does not support the 0xEA JMP instruction, use the indirect form instead. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64cpu/cpu.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wow64cpu/cpu.c b/dlls/wow64cpu/cpu.c index a029b251be0..34c3f3ad493 100644 --- a/dlls/wow64cpu/cpu.c +++ b/dlls/wow64cpu/cpu.c @@ -33,7 +33,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(wow); #include "pshpack1.h" struct thunk_32to64 { - BYTE ljmp; /* ljmp %cs:1f */ + BYTE ljmp; /* jump far, absolute indirect */ + BYTE modrm; /* address=disp32, opcode=5 */ + DWORD op; DWORD addr; WORD cs; }; @@ -195,7 +197,9 @@ NTSTATUS WINAPI BTCpuProcessInit(void) ds64_sel = context.SegDs; fs32_sel = context.SegFs; - thunk->ljmp = 0xea; + thunk->ljmp = 0xff; + thunk->modrm = 0x2d; + thunk->op = PtrToUlong( &thunk->addr ); thunk->addr = PtrToUlong( syscall_32to64 ); thunk->cs = cs64_sel; NtProtectVirtualMemory( GetCurrentProcess(), (void **)&thunk, &size, PAGE_EXECUTE_READ, &old_prot );

1 0

Brendan Shanks : ntdll/tests: Test that threads have unique TEBs.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: 6d4ec1255acceec7152ed98764ee29991ac04f10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d4ec1255acceec7152ed987… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Apr 18 11:25:10 2022 -0700 ntdll/tests: Test that threads have unique TEBs. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/thread.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/ntdll/tests/thread.c b/dlls/ntdll/tests/thread.c index a41b1f2cc6a..7a47486a3b6 100644 --- a/dlls/ntdll/tests/thread.c +++ b/dlls/ntdll/tests/thread.c @@ -118,9 +118,45 @@ static void test_dbg_hidden_thread_creation(void) CloseHandle( thread ); } +static void CALLBACK test_unique_teb_proc(void *param) +{ + TEB **teb = param; + *teb = NtCurrentTeb(); +} + +static void test_unique_teb(void) +{ + HANDLE threads[2]; + TEB *teb1, *teb2; + NTSTATUS status; + + if (!pNtCreateThreadEx) + { + win_skip( "NtCreateThreadEx is not available.\n" ); + return; + } + + status = pNtCreateThreadEx( &threads[0], THREAD_ALL_ACCESS, NULL, GetCurrentProcess(), test_unique_teb_proc, + &teb1, 0, 0, 0, 0, NULL ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); + + status = pNtCreateThreadEx( &threads[1], THREAD_ALL_ACCESS, NULL, GetCurrentProcess(), test_unique_teb_proc, + &teb2, 0, 0, 0, 0, NULL ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); + + WaitForMultipleObjects( 2, threads, TRUE, INFINITE ); + CloseHandle( threads[0] ); + CloseHandle( threads[1] ); + + ok( NtCurrentTeb() != teb1, "Multiple threads have TEB %p.\n", teb1 ); + ok( NtCurrentTeb() != teb2, "Multiple threads have TEB %p.\n", teb2 ); + ok( teb1 != teb2, "Multiple threads have TEB %p.\n", teb1 ); +} + START_TEST(thread) { init_function_pointers(); test_dbg_hidden_thread_creation(); + test_unique_teb(); }

1 0

Jacek Caban : winex11: Use pthread for xrender locking.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: b8a2198d40de9bb3dd5c4aad7ae860602f4de3f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8a2198d40de9bb3dd5c4aad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 14:41:37 2022 +0200 winex11: Use pthread for xrender locking. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrender.c | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index fd92bd63389..be64da90290 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -190,14 +190,7 @@ MAKE_FUNCPTR(XRenderQueryExtension) #undef MAKE_FUNCPTR -static CRITICAL_SECTION xrender_cs; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &xrender_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": xrender_cs") } -}; -static CRITICAL_SECTION xrender_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t xrender_mutex = PTHREAD_MUTEX_INITIALIZER; #define MS_MAKE_TAG( _x1, _x2, _x3, _x4 ) \ ( ( (ULONG)_x4 << 24 ) | \ @@ -566,7 +559,7 @@ static Picture get_no_alpha_mask(void) static Pixmap pixmap; static Picture pict; - EnterCriticalSection( &xrender_cs ); + pthread_mutex_lock( &xrender_mutex ); if (!pict) { XRenderPictureAttributes pa; @@ -581,7 +574,7 @@ static Picture get_no_alpha_mask(void) col.alpha = 0; pXRenderFillRectangle( gdi_display, PictOpSrc, pict, &col, 0, 0, 1, 1 ); } - LeaveCriticalSection( &xrender_cs ); + pthread_mutex_unlock( &xrender_mutex ); return pict; } @@ -877,11 +870,11 @@ static HFONT CDECL xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_fla lfsz_calc_hash(&lfsz); - EnterCriticalSection(&xrender_cs); + pthread_mutex_lock( &xrender_mutex ); if (physdev->cache_index != -1) dec_ref_cache( physdev->cache_index ); physdev->cache_index = GetCacheEntry( &lfsz ); - LeaveCriticalSection(&xrender_cs); + pthread_mutex_unlock( &xrender_mutex ); return ret; } @@ -970,9 +963,9 @@ static BOOL CDECL xrenderdrv_DeleteDC( PHYSDEV dev ) free_xrender_picture( physdev ); - EnterCriticalSection( &xrender_cs ); + pthread_mutex_lock( &xrender_mutex ); if (physdev->cache_index != -1) dec_ref_cache( physdev->cache_index ); - LeaveCriticalSection( &xrender_cs ); + pthread_mutex_unlock( &xrender_mutex ); HeapFree( GetProcessHeap(), 0, physdev ); return TRUE; @@ -1022,7 +1015,7 @@ static void CDECL xrenderdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) /************************************************************************ * UploadGlyph * - * Helper to ExtTextOut. Must be called inside xrender_cs + * Helper to ExtTextOut. Must be called inside xrender_mutex */ static void UploadGlyph(struct xrender_physdev *physDev, UINT glyph, enum glyph_type type) { @@ -1224,7 +1217,7 @@ static void UploadGlyph(struct xrender_physdev *physDev, UINT glyph, enum glyph_ * get_tile_pict * * Returns an appropriate Picture for tiling the text colour. - * Call and use result within the xrender_cs + * Call and use result within the xrender_mutex */ static Picture get_tile_pict( enum wxr_format wxr_format, const XRenderColor *color) { @@ -1273,7 +1266,7 @@ static Picture get_tile_pict( enum wxr_format wxr_format, const XRenderColor *co * get_mask_pict * * Returns an appropriate Picture for masking with the specified alpha. - * Call and use result within the xrender_cs + * Call and use result within the xrender_mutex */ static Picture get_mask_pict( int alpha ) { @@ -1352,7 +1345,7 @@ static BOOL CDECL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, if(count == 0) return TRUE; - EnterCriticalSection(&xrender_cs); + pthread_mutex_lock( &xrender_mutex ); entry = glyphsetCache + physdev->cache_index; formatEntry = entry->format[type][aa_type_from_flags( physdev->aa_flags )]; @@ -1369,7 +1362,7 @@ static BOOL CDECL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, if (!formatEntry) { WARN("could not upload requested glyphs\n"); - LeaveCriticalSection(&xrender_cs); + pthread_mutex_unlock( &xrender_mutex ); return FALSE; } @@ -1440,7 +1433,7 @@ static BOOL CDECL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, 0, 0, 0, 0, elts, count); HeapFree(GetProcessHeap(), 0, elts); - LeaveCriticalSection(&xrender_cs); + pthread_mutex_unlock( &xrender_mutex ); add_device_bounds( physdev->x11dev, &bounds ); return TRUE; } @@ -1557,7 +1550,7 @@ static void xrender_mono_blit( Picture src_pict, Picture dst_pict, * contains a 1x1 picture for tiling. The source data effectively acts as an alpha channel to * the tile data. */ - EnterCriticalSection( &xrender_cs ); + pthread_mutex_lock( &xrender_mutex ); color = *bg; color.alpha = 0xffff; /* tile pict needs 100% alpha */ tile_pict = get_tile_pict( dst_format, &color ); @@ -1581,7 +1574,7 @@ static void xrender_mono_blit( Picture src_pict, Picture dst_pict, } pXRenderComposite(gdi_display, PictOpOver, tile_pict, src_pict, dst_pict, 0, 0, x_offset, y_offset, x_dst, y_dst, width_dst, height_dst ); - LeaveCriticalSection( &xrender_cs ); + pthread_mutex_unlock( &xrender_mutex ); /* force the alpha channel for background pixels, it has been set to 100% by the tile */ if (bg->alpha != 0xffff && (dst_format == WXR_FORMAT_A8R8G8B8 || dst_format == WXR_FORMAT_B8G8R8A8)) @@ -1919,7 +1912,7 @@ static DWORD CDECL xrenderdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const s dst_pict = get_xrender_picture( physdev, 0, &dst->visrect ); - EnterCriticalSection( &xrender_cs ); + pthread_mutex_lock( &xrender_mutex ); mask_pict = get_mask_pict( func.SourceConstantAlpha * 257 ); xrender_blit( PictOpOver, src_pict, mask_pict, dst_pict, @@ -1931,7 +1924,7 @@ static DWORD CDECL xrenderdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const s pXRenderFreePicture( gdi_display, src_pict ); XFreePixmap( gdi_display, src_pixmap ); - LeaveCriticalSection( &xrender_cs ); + pthread_mutex_unlock( &xrender_mutex ); add_device_bounds( physdev->x11dev, &dst->visrect ); } return ret; @@ -2008,7 +2001,7 @@ static BOOL CDECL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords * if (tmp_pict) src_pict = tmp_pict; - EnterCriticalSection( &xrender_cs ); + pthread_mutex_lock( &xrender_mutex ); mask_pict = get_mask_pict( blendfn.SourceConstantAlpha * 257 ); xrender_blit( PictOpOver, src_pict, mask_pict, dst_pict, @@ -2022,7 +2015,7 @@ static BOOL CDECL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords * if (tmp_pict) pXRenderFreePicture( gdi_display, tmp_pict ); if (tmp_pixmap) XFreePixmap( gdi_display, tmp_pixmap ); - LeaveCriticalSection( &xrender_cs ); + pthread_mutex_unlock( &xrender_mutex ); add_device_bounds( physdev_dst->x11dev, &dst->visrect ); return TRUE; }

1 0

Huw Davies : wineoss: Move get_frequency to the unixlib.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: 4e32993717cc2c127603c199435456ed546eae21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e32993717cc2c127603c199… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 15 21:40:40 2022 +0100 wineoss: Move get_frequency to the unixlib. Technically the lock doesn't need to be taken here since the data is static, however doing so keeps the implementation consistent with the others. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 11 +++++------ dlls/wineoss.drv/oss.c | 17 +++++++++++++++++ dlls/wineoss.drv/unixlib.h | 8 ++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c101d757836..6498a4750d4 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1427,16 +1427,15 @@ static ULONG WINAPI AudioClock_Release(IAudioClock *iface) static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) { ACImpl *This = impl_from_IAudioClock(iface); - struct oss_stream *stream = This->stream; + struct get_frequency_params params; TRACE("(%p)->(%p)\n", This, freq); - if(stream->share == AUDCLNT_SHAREMODE_SHARED) - *freq = (UINT64)stream->fmt->nSamplesPerSec * stream->fmt->nBlockAlign; - else - *freq = stream->fmt->nSamplesPerSec; + params.stream = This->stream; + params.frequency = freq; + OSS_CALL(get_frequency, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index ffea1bb8338..3a512c7cd9e 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1256,6 +1256,22 @@ static NTSTATUS get_next_packet_size(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_frequency(void *args) +{ + struct get_frequency_params *params = args; + struct oss_stream *stream = params->stream; + UINT64 *freq = params->frequency; + + oss_lock(stream); + + if(stream->share == AUDCLNT_SHAREMODE_SHARED) + *freq = (UINT64)stream->fmt->nSamplesPerSec * stream->fmt->nBlockAlign; + else + *freq = stream->fmt->nSamplesPerSec; + + return oss_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS set_event_handle(void *args) { struct set_event_handle_params *params = args; @@ -1296,5 +1312,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_latency, get_current_padding, get_next_packet_size, + get_frequency, set_event_handle, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index a809ad41d3e..9a544ae7899 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -193,6 +193,13 @@ struct get_next_packet_size_params UINT32 *frames; }; +struct get_frequency_params +{ + struct oss_stream *stream; + HRESULT result; + UINT64 *frequency; +}; + struct set_event_handle_params { struct oss_stream *stream; @@ -220,6 +227,7 @@ enum oss_funcs oss_get_latency, oss_get_current_padding, oss_get_next_packet_size, + oss_get_frequency, oss_set_event_handle, };

1 0

Jacek Caban : winex11: Use pthread for synchronization in vulkan.c.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: 83501c7eaabcff25373910b33b4e5c779b56f398 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83501c7eaabcff25373910b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 14:40:54 2022 +0200 winex11: Use pthread for synchronization in vulkan.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 453b729aa42..f4fe202dfaf 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -44,14 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); #ifdef SONAME_LIBVULKAN WINE_DECLARE_DEBUG_CHANNEL(fps); -static CRITICAL_SECTION context_section; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &context_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": context_section") } -}; -static CRITICAL_SECTION context_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t vulkan_mutex; static XContext vulkan_hwnd_context; @@ -109,12 +102,14 @@ static inline struct wine_vk_surface *surface_from_handle(VkSurfaceKHR handle) static void *vulkan_handle; -static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) +static void wine_vk_init(void) { + init_recursive_mutex(&vulkan_mutex); + if (!(vulkan_handle = dlopen(SONAME_LIBVULKAN, RTLD_NOW))) { ERR("Failed to load %s.\n", SONAME_LIBVULKAN); - return TRUE; + return; } #define LOAD_FUNCPTR(f) if (!(p##f = dlsym(vulkan_handle, #f))) goto fail @@ -143,13 +138,11 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) #undef LOAD_OPTIONAL_FUNCPTR vulkan_hwnd_context = XUniqueContext(); - - return TRUE; + return; fail: dlclose(vulkan_handle); vulkan_handle = NULL; - return TRUE; } /* Helper function for converting between win32 and X11 compatible VkInstanceCreateInfo. @@ -213,9 +206,9 @@ static void wine_vk_surface_release(struct wine_vk_surface *surface) if (surface->entry.next) { - EnterCriticalSection(&context_section); + pthread_mutex_lock(&vulkan_mutex); list_remove(&surface->entry); - LeaveCriticalSection(&context_section); + pthread_mutex_unlock(&vulkan_mutex); } if (surface->window) @@ -227,7 +220,7 @@ static void wine_vk_surface_release(struct wine_vk_surface *surface) void wine_vk_surface_destroy(HWND hwnd) { struct wine_vk_surface *surface; - EnterCriticalSection(&context_section); + pthread_mutex_lock(&vulkan_mutex); if (!XFindContext(gdi_display, (XID)hwnd, vulkan_hwnd_context, (char **)&surface)) { surface->hwnd_thread_id = 0; @@ -235,7 +228,7 @@ void wine_vk_surface_destroy(HWND hwnd) wine_vk_surface_release(surface); } XDeleteContext(gdi_display, (XID)hwnd, vulkan_hwnd_context); - LeaveCriticalSection(&context_section); + pthread_mutex_unlock(&vulkan_mutex); } void vulkan_thread_detach(void) @@ -243,7 +236,7 @@ void vulkan_thread_detach(void) struct wine_vk_surface *surface, *next; DWORD thread_id = GetCurrentThreadId(); - EnterCriticalSection(&context_section); + pthread_mutex_lock(&vulkan_mutex); LIST_FOR_EACH_ENTRY_SAFE(surface, next, &surface_list, struct wine_vk_surface, entry) { if (surface->hwnd_thread_id != thread_id) @@ -254,7 +247,7 @@ void vulkan_thread_detach(void) XSync(gdi_display, False); wine_vk_surface_destroy(surface->hwnd); } - LeaveCriticalSection(&context_section); + pthread_mutex_unlock(&vulkan_mutex); } static VkResult X11DRV_vkCreateInstance(const VkInstanceCreateInfo *create_info, @@ -362,14 +355,14 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, goto err; } - EnterCriticalSection(&context_section); + pthread_mutex_lock(&vulkan_mutex); if (x11_surface->hwnd) { wine_vk_surface_destroy( x11_surface->hwnd ); XSaveContext(gdi_display, (XID)create_info->hwnd, vulkan_hwnd_context, (char *)wine_vk_surface_grab(x11_surface)); } list_add_tail(&surface_list, &x11_surface->entry); - LeaveCriticalSection(&context_section); + pthread_mutex_unlock(&vulkan_mutex); *surface = (uintptr_t)x11_surface; @@ -723,7 +716,7 @@ static void *X11DRV_get_vk_instance_proc_addr(VkInstance instance, const char *n const struct vulkan_funcs *get_vulkan_driver(UINT version) { - static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + static pthread_once_t init_once = PTHREAD_ONCE_INIT; if (version != WINE_VULKAN_DRIVER_VERSION) { @@ -731,7 +724,7 @@ const struct vulkan_funcs *get_vulkan_driver(UINT version) return NULL; } - InitOnceExecuteOnce(&init_once, wine_vk_init, NULL, NULL); + pthread_once(&init_once, wine_vk_init); if (vulkan_handle) return &vulkan_funcs;

1 0

Jacek Caban : winex11: Use pthread for settings locking.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: 870d0080b04ee1789f2d71767c664ee3d834c502 URL: https://source.winehq.org/git/wine.git/?a=commit;h=870d0080b04ee1789f2d7176… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 14:40:49 2022 +0200 winex11: Use pthread for settings locking. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 1e711354c07..dd1d2a54024 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -70,14 +70,7 @@ static DWORD cached_flags; static DEVMODEW *cached_modes; static UINT cached_mode_count; -static CRITICAL_SECTION modes_section; -static CRITICAL_SECTION_DEBUG modes_critsect_debug = -{ - 0, 0, &modes_section, - {&modes_critsect_debug.ProcessLocksList, &modes_critsect_debug.ProcessLocksList}, - 0, 0, {(DWORD_PTR)(__FILE__ ": modes_section")} -}; -static CRITICAL_SECTION modes_section = {&modes_critsect_debug, -1, 0, 0, 0, 0}; +static pthread_mutex_t settings_mutex = PTHREAD_MUTEX_INITIALIZER; void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *new_handler) { @@ -427,13 +420,13 @@ static void set_display_depth(ULONG_PTR display_id, DWORD depth) { struct x11drv_display_depth *display_depth; - EnterCriticalSection(&modes_section); + pthread_mutex_lock( &settings_mutex ); LIST_FOR_EACH_ENTRY(display_depth, &x11drv_display_depth_list, struct x11drv_display_depth, entry) { if (display_depth->display_id == display_id) { display_depth->depth = depth; - LeaveCriticalSection(&modes_section); + pthread_mutex_unlock( &settings_mutex ); return; } } @@ -442,14 +435,14 @@ static void set_display_depth(ULONG_PTR display_id, DWORD depth) if (!display_depth) { ERR("Failed to allocate memory.\n"); - LeaveCriticalSection(&modes_section); + pthread_mutex_unlock( &settings_mutex ); return; } display_depth->display_id = display_id; display_depth->depth = depth; list_add_head(&x11drv_display_depth_list, &display_depth->entry); - LeaveCriticalSection(&modes_section); + pthread_mutex_unlock( &settings_mutex ); } static DWORD get_display_depth(ULONG_PTR display_id) @@ -457,17 +450,17 @@ static DWORD get_display_depth(ULONG_PTR display_id) struct x11drv_display_depth *display_depth; DWORD depth; - EnterCriticalSection(&modes_section); + pthread_mutex_lock( &settings_mutex ); LIST_FOR_EACH_ENTRY(display_depth, &x11drv_display_depth_list, struct x11drv_display_depth, entry) { if (display_depth->display_id == display_id) { depth = display_depth->depth; - LeaveCriticalSection(&modes_section); + pthread_mutex_unlock( &settings_mutex ); return depth; } } - LeaveCriticalSection(&modes_section); + pthread_mutex_unlock( &settings_mutex ); return screen_bpp; } @@ -507,13 +500,13 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW goto done; } - EnterCriticalSection(&modes_section); + pthread_mutex_lock( &settings_mutex ); if (n == 0 || lstrcmpiW(cached_device_name, name) || cached_flags != flags) { if (!handler.get_id(name, &id) || !handler.get_modes(id, flags, &modes, &mode_count)) { ERR("Failed to get %s supported display modes.\n", wine_dbgstr_w(name)); - LeaveCriticalSection(&modes_section); + pthread_mutex_unlock( &settings_mutex ); return FALSE; } @@ -529,14 +522,14 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW if (n >= cached_mode_count) { - LeaveCriticalSection(&modes_section); + pthread_mutex_unlock( &settings_mutex ); WARN("handler:%s device:%s mode index:%#x not found.\n", handler.name, wine_dbgstr_w(name), n); SetLastError(ERROR_NO_MORE_FILES); return FALSE; } memcpy(devmode, (BYTE *)cached_modes + (sizeof(*cached_modes) + cached_modes[0].dmDriverExtra) * n, sizeof(*devmode)); - LeaveCriticalSection(&modes_section); + pthread_mutex_unlock( &settings_mutex ); done: /* Set generic fields */

1 0

Jacek Caban : winex11: Use pthread for palette locking.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: 6db4613be926171b747562b41f98527bdc414f91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6db4613be926171b747562b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 14:40:45 2022 +0200 winex11: Use pthread for palette locking. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/palette.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index ffed08d1f35..ae4bf38d934 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -69,14 +69,7 @@ static unsigned char X11DRV_PALETTE_freeList[256]; static XContext palette_context; /* X context to associate a color mapping to a palette */ -static CRITICAL_SECTION palette_cs; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &palette_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": palette_cs") } -}; -static CRITICAL_SECTION palette_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t palette_mutex = PTHREAD_MUTEX_INITIALIZER; /**********************************************************************/ @@ -781,7 +774,7 @@ BOOL X11DRV_IsSolidColor( COLORREF color ) if (X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_VIRTUAL) return TRUE; /* no palette */ - EnterCriticalSection( &palette_cs ); + pthread_mutex_lock( &palette_mutex ); for (i = 0; i < palette_size ; i++, pEntry++) { if( i < COLOR_gapStart || i > COLOR_gapEnd ) @@ -789,11 +782,11 @@ BOOL X11DRV_IsSolidColor( COLORREF color ) (GetGValue(color) == pEntry->peGreen) && (GetBValue(color) == pEntry->peBlue)) { - LeaveCriticalSection( &palette_cs ); + pthread_mutex_unlock( &palette_mutex ); return TRUE; } } - LeaveCriticalSection( &palette_cs ); + pthread_mutex_unlock( &palette_mutex ); return FALSE; } @@ -836,9 +829,9 @@ COLORREF X11DRV_PALETTE_ToLogical(X11DRV_PDEVICE *physDev, int pixel) if ((default_visual.depth <= 8) && (pixel < 256) && !(X11DRV_PALETTE_PaletteFlags & (X11DRV_PALETTE_VIRTUAL | X11DRV_PALETTE_FIXED)) ) { COLORREF ret; - EnterCriticalSection( &palette_cs ); + pthread_mutex_lock( &palette_mutex ); ret = *(COLORREF *)(COLOR_sysPal + (X11DRV_PALETTE_XPixelToPalette ? X11DRV_PALETTE_XPixelToPalette[pixel]: pixel)) & 0x00ffffff; - LeaveCriticalSection( &palette_cs ); + pthread_mutex_unlock( &palette_mutex ); return ret; } @@ -1009,10 +1002,10 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) return (((color >> 16) & 0xff) + ((color >> 8) & 0xff) + (color & 0xff) > 255*3/2) ? 1 : 0; - EnterCriticalSection( &palette_cs ); + pthread_mutex_lock( &palette_mutex ); index = X11DRV_SysPaletteLookupPixel( color & 0xffffff, FALSE); if (X11DRV_PALETTE_PaletteToXPixel) index = X11DRV_PALETTE_PaletteToXPixel[index]; - LeaveCriticalSection( &palette_cs ); + pthread_mutex_unlock( &palette_mutex ); } } return index; @@ -1075,11 +1068,11 @@ static int X11DRV_PALETTE_LookupPixel(ColorShifts *shifts, COLORREF color ) if (!mapping) WARN("Palette %p is not realized\n", hPal); - EnterCriticalSection( &palette_cs ); + pthread_mutex_lock( &palette_mutex ); index = X11DRV_SysPaletteLookupPixel( color, FALSE); if (X11DRV_PALETTE_PaletteToXPixel) index = X11DRV_PALETTE_PaletteToXPixel[index]; - LeaveCriticalSection( &palette_cs ); + pthread_mutex_unlock( &palette_mutex ); return index; } } @@ -1221,7 +1214,7 @@ UINT CDECL X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary ) /* reset dynamic system palette entries */ - EnterCriticalSection( &palette_cs ); + pthread_mutex_lock( &palette_mutex ); if( primary && X11DRV_PALETTE_firstFree != -1) X11DRV_PALETTE_FormatSystemPalette(); @@ -1294,7 +1287,7 @@ UINT CDECL X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary ) TRACE("entry %i (%x) -> pixel %i\n", i, *(COLORREF*)&entries[i], index); } - LeaveCriticalSection( &palette_cs ); + pthread_mutex_unlock( &palette_mutex ); return iRemapped; } @@ -1331,7 +1324,7 @@ UINT CDECL X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, if (start >= palette_size) return 0; if (start + count >= palette_size) count = palette_size - start; - EnterCriticalSection( &palette_cs ); + pthread_mutex_lock( &palette_mutex ); for (i = 0; i < count; i++) { entries[i].peRed = COLOR_sysPal[start + i].peRed; @@ -1340,7 +1333,7 @@ UINT CDECL X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, entries[i].peFlags = 0; TRACE("\tidx(%02x) -> RGB(%08x)\n", start + i, *(COLORREF*)(entries + i) ); } - LeaveCriticalSection( &palette_cs ); + pthread_mutex_unlock( &palette_mutex ); return count; } @@ -1378,9 +1371,9 @@ COLORREF CDECL X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color ) color = RGB( entry.peRed, entry.peGreen, entry.peBlue ); } color &= 0x00ffffff; - EnterCriticalSection( &palette_cs ); + pthread_mutex_lock( &palette_mutex ); nearest = (0x00ffffff & *(COLORREF*)(COLOR_sysPal + X11DRV_SysPaletteLookupPixel(color, FALSE))); - LeaveCriticalSection( &palette_cs ); + pthread_mutex_unlock( &palette_mutex ); TRACE("(%06x): returning %06x\n", color, nearest ); return nearest; @@ -1402,7 +1395,7 @@ UINT CDECL X11DRV_RealizeDefaultPalette( PHYSDEV dev ) PALETTEENTRY entries[NB_RESERVED_COLORS]; get_palette_entries( GetStockObject(DEFAULT_PALETTE), 0, NB_RESERVED_COLORS, entries ); - EnterCriticalSection( &palette_cs ); + pthread_mutex_lock( &palette_mutex ); for( i = 0; i < NB_RESERVED_COLORS; i++ ) { index = X11DRV_PALETTE_LookupSystemXPixel( RGB(entries[i].peRed, @@ -1415,7 +1408,7 @@ UINT CDECL X11DRV_RealizeDefaultPalette( PHYSDEV dev ) ret++; } } - LeaveCriticalSection( &palette_cs ); + pthread_mutex_unlock( &palette_mutex ); } return ret; }

1 0

Jacek Caban : winex11: Use pthread for synchronization in opengl.c.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: 80a4919b8a9749f07fdd9d27afde620383c4c36f URL: https://source.winehq.org/git/wine.git/?a=commit;h=80a4919b8a9749f07fdd9d27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 14:40:38 2022 +0200 winex11: Use pthread for synchronization in opengl.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 90 +++++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=80a4919b8a9749f07fdd…

1 0

Jacek Caban : winex11: Use pthread for keyboard lock.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: b2bc410b7cc2966c24de69dfa16eb6830f8056b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2bc410b7cc2966c24de69df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 14:40:30 2022 +0200 winex11: Use pthread for keyboard lock. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 47 +++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index a55eaf071fe..786b6f4e084 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -67,14 +67,7 @@ static WORD keyc2vkey[256], keyc2scan[256]; static int NumLockMask, ScrollLockMask, AltGrMask; /* mask in the XKeyEvent state */ -static CRITICAL_SECTION kbd_section; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &kbd_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": kbd_section") } -}; -static CRITICAL_SECTION kbd_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t kbd_mutex = PTHREAD_MUTEX_INITIALIZER; static char KEYBOARD_MapDeadKeysym(KeySym keysym); @@ -1218,7 +1211,7 @@ BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) memset(keys, 0, sizeof(keys)); - EnterCriticalSection( &kbd_section ); + pthread_mutex_lock( &kbd_mutex ); /* the minimum keycode is always greater or equal to 8, so we can * skip the first 8 values, hence start at 1 @@ -1248,7 +1241,7 @@ BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) } } - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); if (!changed) return FALSE; update_key_state( keystate, VK_CONTROL, (keystate[VK_LCONTROL] | keystate[VK_RCONTROL]) & 0x80 ); @@ -1367,7 +1360,7 @@ BOOL X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) return TRUE; } - EnterCriticalSection( &kbd_section ); + pthread_mutex_lock( &kbd_mutex ); /* If XKB extensions are used, the state mask for AltGr will use the group index instead of the modifier mask. The group index is set in bits @@ -1402,7 +1395,7 @@ BOOL X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) TRACE_(key)("keycode %u converted to vkey 0x%X scan %02x\n", event->keycode, vkey, bScan); - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); if (!vkey) return FALSE; @@ -1597,7 +1590,7 @@ void X11DRV_InitKeyboard( Display *display ) }; int vkey_range; - EnterCriticalSection( &kbd_section ); + pthread_mutex_lock( &kbd_mutex ); XDisplayKeycodes(display, &min_keycode, &max_keycode); if (key_mapping) XFree( key_mapping ); key_mapping = XGetKeyboardMapping(display, min_keycode, @@ -1834,7 +1827,7 @@ void X11DRV_InitKeyboard( Display *display ) keyc2scan[keyc]=scan++; } - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); } static BOOL match_x11_keyboard_layout(HKL hkl) @@ -1939,13 +1932,13 @@ SHORT X11DRV_VkKeyScanEx( WCHAR wChar, HKL hkl ) TRACE("'%c'(%lx): got keycode %u\n", cChar, keysym, keycode); if (!keycode) return -1; - EnterCriticalSection( &kbd_section ); + pthread_mutex_lock( &kbd_mutex ); /* keycode -> (keyc2vkey) vkey */ ret = keyc2vkey[keycode]; if (!ret) { - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); TRACE("keycode for '%c' not found, returning -1\n", cChar); return -1; } @@ -1953,7 +1946,7 @@ SHORT X11DRV_VkKeyScanEx( WCHAR wChar, HKL hkl ) for (index = 0; index < 4; index++) /* find shift state */ if (keycode_to_keysym(display, keycode, index) == keysym) break; - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); switch (index) { @@ -1990,7 +1983,7 @@ UINT X11DRV_MapVirtualKeyEx( UINT wCode, UINT wMapType, HKL hkl ) if (!match_x11_keyboard_layout(hkl)) FIXME("keyboard layout %p is not supported\n", hkl); - EnterCriticalSection( &kbd_section ); + pthread_mutex_lock( &kbd_mutex ); switch(wMapType) { @@ -2116,7 +2109,7 @@ UINT X11DRV_MapVirtualKeyEx( UINT wCode, UINT wMapType, HKL hkl ) break; } - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); TRACE( "returning 0x%x.\n", ret ); return ret; } @@ -2193,7 +2186,7 @@ INT X11DRV_GetKeyNameText( LONG lParam, LPWSTR lpBuffer, INT nSize ) /* let's do scancode -> keycode -> keysym -> String */ - EnterCriticalSection( &kbd_section ); + pthread_mutex_lock( &kbd_mutex ); for (keyi=min_keycode; keyi<=max_keycode; keyi++) if ((keyc2scan[keyi]) == scanCode) @@ -2211,7 +2204,7 @@ INT X11DRV_GetKeyNameText( LONG lParam, LPWSTR lpBuffer, INT nSize ) char* idx = strrchr(name, '_'); if (idx && (_strnicmp(idx, "_r", -1) == 0 || _strnicmp(idx, "_l", -1) == 0)) { - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); TRACE("found scan=%04x keyc=%u keysym=%lx modified_string=%s\n", scanCode, keyc, keys, debugstr_an(name,idx-name)); rc = MultiByteToWideChar(CP_UNIXCP, 0, name, idx-name+1, lpBuffer, nSize); @@ -2223,7 +2216,7 @@ INT X11DRV_GetKeyNameText( LONG lParam, LPWSTR lpBuffer, INT nSize ) if (name) { - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); TRACE("found scan=%04x keyc=%u keysym=%04x vkey=%04x string=%s\n", scanCode, keyc, (int)keys, vkey, debugstr_a(name)); rc = MultiByteToWideChar(CP_UNIXCP, 0, name, -1, lpBuffer, nSize); @@ -2235,7 +2228,7 @@ INT X11DRV_GetKeyNameText( LONG lParam, LPWSTR lpBuffer, INT nSize ) /* Finally issue WARN for unknown keys */ - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); WARN("(%08x,%p,%d): unsupported key, vkey=%04X, ansi=%04x\n",lParam,lpBuffer,nSize,vkey,ansi); *lpBuffer = 0; return 0; @@ -2381,7 +2374,7 @@ INT X11DRV_ToUnicodeEx( UINT virtKey, UINT scanCode, const BYTE *lpKeyState, e.window = X11DRV_get_whole_window( focus ); xic = X11DRV_get_ic( focus ); - EnterCriticalSection( &kbd_section ); + pthread_mutex_lock( &kbd_mutex ); if (lpKeyState[VK_SHIFT] & 0x80) { @@ -2452,7 +2445,7 @@ INT X11DRV_ToUnicodeEx( UINT virtKey, UINT scanCode, const BYTE *lpKeyState, if (!e.keycode && virtKey != VK_NONAME) { WARN_(key)("Unknown virtual key %X !!!\n", virtKey); - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); return 0; } else TRACE_(key)("Found keycode %u\n",e.keycode); @@ -2473,7 +2466,7 @@ INT X11DRV_ToUnicodeEx( UINT virtKey, UINT scanCode, const BYTE *lpKeyState, if (lpChar == NULL) { ERR_(key)("Failed to allocate memory!\n"); - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); return 0; } ret = XmbLookupString(xic, &e, lpChar, ret, &keysym, &status); @@ -2625,7 +2618,7 @@ found: if (buf != lpChar) HeapFree(GetProcessHeap(), 0, lpChar); - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); /* Null-terminate the buffer, if there's room. MSDN clearly states that the caller must not assume this is done, but some programs (e.g. Audiosurf) do. */

1 0