- Wine-Devel - list.winehq.org

[PATCH 2/3] configure: Stop checking for poll(2).
by Huw Davies Oct. 4, 2021

Oct. 4, 2021

In most places we're not dealing with its absence correctly anyway. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- configure.ac | 1 - programs/winedbg/gdbproxy.c | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 7e85e46b87b..6e82e4fbb8d 100644 --- a/configure.ac +++ b/configure.ac @@ -2144,7 +2144,6 @@ AC_CHECK_FUNCS(\ lstat \ mach_continuous_time \ pipe2 \ - poll \ port_create \ posix_fadvise \ posix_fallocate \ diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index fb875cd1b29..b64abd6f205 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -53,11 +53,6 @@ # include <unistd.h> #endif -/* if we don't have poll support on this system - * we won't provide gdb proxy support here... - */ -#ifdef HAVE_POLL - #include "debugger.h" #include "windef.h" @@ -2311,11 +2306,9 @@ static int gdb_remote(unsigned flags, unsigned port) wait(NULL); return 0; } -#endif int gdb_main(int argc, char* argv[]) { -#ifdef HAVE_POLL unsigned gdb_flags = 0, port = 0; char *port_end; @@ -2350,8 +2343,6 @@ int gdb_main(int argc, char* argv[]) if (dbg_active_attach(argc, argv) == start_ok || dbg_active_launch(argc, argv) == start_ok) return gdb_remote(gdb_flags, port); -#else - fprintf(stderr, "GdbProxy mode not supported on this platform\n"); -#endif + return -1; } -- 2.23.0

1 0

[PATCH 1/3] configure: No longer use libpoll.
by Huw Davies Oct. 4, 2021

Oct. 4, 2021

This became unnecessary after macOS 10.5. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- configure.ac | 6 ------ dlls/ws2_32/Makefile.in | 1 - programs/winedbg/Makefile.in | 1 - server/Makefile.in | 2 +- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 913692c828a..7e85e46b87b 100644 --- a/configure.ac +++ b/configure.ac @@ -2166,12 +2166,6 @@ dnl Check for -ldl AC_SEARCH_LIBS(dlopen, dl) WINE_CHECK_LIB_FUNCS(dladdr dlinfo,[$DL_LIBS]) -dnl Check for -lpoll for Mac OS X/Darwin -if test "$ac_cv_func_poll" = no -then - AC_CHECK_LIB(poll,poll,[AC_DEFINE(HAVE_POLL,1) AC_SUBST(POLL_LIBS,"-lpoll")]) -fi - dnl Check for -lnsl for Solaris AC_SEARCH_LIBS(gethostbyname, nsl) diff --git a/dlls/ws2_32/Makefile.in b/dlls/ws2_32/Makefile.in index bf9018260a4..232ce7f31fd 100644 --- a/dlls/ws2_32/Makefile.in +++ b/dlls/ws2_32/Makefile.in @@ -2,7 +2,6 @@ MODULE = ws2_32.dll UNIXLIB = ws2_32.so IMPORTLIB = ws2_32 DELAYIMPORTS = advapi32 iphlpapi user32 -EXTRALIBS = $(POLL_LIBS) C_SRCS = \ async.c \ diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index bf036fc9b01..620b70bdf40 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -1,7 +1,6 @@ MODULE = winedbg.exe IMPORTS = dbghelp advapi32 DELAYIMPORTS = comdlg32 shell32 comctl32 user32 gdi32 -EXTRALIBS = $(POLL_LIBS) EXTRADLLFLAGS = -mconsole -mcygwin diff --git a/server/Makefile.in b/server/Makefile.in index 4264e3db108..b6197cffec3 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -49,6 +49,6 @@ MANPAGES = \ wineserver.fr.UTF-8.man.in \ wineserver.man.in -EXTRALIBS = $(LDEXECFLAGS) $(POLL_LIBS) $(RT_LIBS) $(INOTIFY_LIBS) +EXTRALIBS = $(LDEXECFLAGS) $(RT_LIBS) $(INOTIFY_LIBS) unicode_EXTRADEFS = -DNLSDIR="\"${nlsdir}\"" -DBIN_TO_NLSDIR=\"`$(MAKEDEP) -R ${bindir} ${nlsdir}`\" -- 2.23.0

1 0

[PATCH 6/8] gdi32: Don't use RtlDosPathNameToNtPathName_U get_unix_file name.
by Jacek Caban Oct. 4, 2021

Oct. 4, 2021

Paths are already in NT format. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/freetype.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)

2 1

[PATCH v2 8/8] gdi32: Use local helpers for Unicode conversion in Unix lib.
by Huw Davies Oct. 4, 2021

Oct. 4, 2021

From: Jacek Caban <jacek(a)codeweavers.com> Based on ntdll. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 99 +++++++++++++++++++++++++++++++++++-- dlls/gdi32/freetype.c | 10 ++-- dlls/gdi32/win32u_private.h | 5 ++ 3 files changed, 106 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 0b32a94f7fe..c6bc3a716be 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3200,6 +3200,7 @@ static UINT get_glyph_index_symbol( struct gdi_font *font, UINT glyph ) CPTABLEINFO *get_cptable( WORD cp ) { static CPTABLEINFO tables[100]; + CPTABLEINFO *info; unsigned int i; USHORT *ptr; SIZE_T size; @@ -3207,9 +3208,101 @@ CPTABLEINFO *get_cptable( WORD cp ) for (i = 0; i < ARRAY_SIZE(tables) && tables[i].CodePage; i++) if (tables[i].CodePage == cp) return &tables[i]; if (NtGetNlsSectionPtr( 11, cp, NULL, (void **)&ptr, &size )) return NULL; - if (i == ARRAY_SIZE(tables)) ERR( "too many code pages\n" ); - RtlInitCodePageTable( ptr, &tables[i] ); - return &tables[i]; + if (i == ARRAY_SIZE(tables)) + { + ERR( "too many code pages\n" ); + return NULL; + } + + info = &tables[i]; + info->CodePage = ptr[1]; + info->MaximumCharacterSize = ptr[2]; + info->DefaultChar = ptr[3]; + info->UniDefaultChar = ptr[4]; + info->TransDefaultChar = ptr[5]; + info->TransUniDefaultChar = ptr[6]; + memcpy( info->LeadByte, ptr + 7, sizeof(info->LeadByte) ); + ptr += ptr[0]; + + info->WideCharTable = ptr + ptr[0] + 1; + info->MultiByteTable = ++ptr; + ptr += 256; + if (*ptr++) ptr += 256; /* glyph table */ + info->DBCSRanges = ptr; + if (*ptr) /* dbcs ranges */ + { + info->DBCSCodePage = 1; + info->DBCSOffsets = ptr + 1; + } + else + { + info->DBCSCodePage = 0; + info->DBCSOffsets = NULL; + } + + return info; +} + +DWORD win32u_wctomb( CPTABLEINFO *info, char *dst, DWORD dstlen, const WCHAR *src, DWORD srclen ) +{ + DWORD i, ret; + + if (!info && !(info = get_cptable( get_acp() ))) return 0; + + srclen /= sizeof(WCHAR); + if (info->DBCSCodePage) + { + WCHAR *uni2cp = info->WideCharTable; + + for (i = dstlen; srclen && i; i--, srclen--, src++) + { + if (uni2cp[*src] & 0xff00) + { + if (i == 1) break; /* do not output a partial char */ + i--; + *dst++ = uni2cp[*src] >> 8; + } + *dst++ = (char)uni2cp[*src]; + } + ret = dstlen - i; + } + else + { + char *uni2cp = info->WideCharTable; + ret = min( srclen, dstlen ); + for (i = 0; i < ret; i++) dst[i] = uni2cp[src[i]]; + } + return ret; +} + +DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *src, DWORD srclen ) +{ + DWORD i, ret; + + if (!info && !(info = get_cptable( get_acp() ))) return 0; + + dstlen /= sizeof(WCHAR); + if (info->DBCSOffsets) + { + for (i = dstlen; srclen && i; i--, srclen--, src++, dst++) + { + USHORT off = info->DBCSOffsets[(unsigned char)*src]; + if (off && srclen > 1) + { + src++; + srclen--; + *dst = info->DBCSOffsets[off + (unsigned char)*src]; + } + else *dst = info->MultiByteTable[(unsigned char)*src]; + } + ret = dstlen - i; + } + else + { + ret = min( srclen, dstlen ); + for (i = 0; i < ret; i++) dst[i] = info->MultiByteTable[(unsigned char)src[i]]; + } + return ret * sizeof(WCHAR); } static BOOL wc_to_index( UINT cp, WCHAR wc, unsigned char *dst, BOOL allow_default ) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 44d5dc26cff..04b24b7f570 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -602,7 +602,7 @@ static WCHAR *towstr(const char *str) { DWORD len = strlen(str) + 1; WCHAR *wstr = malloc( len * sizeof(WCHAR) ); - RtlMultiByteToUnicodeN( wstr, len * sizeof(WCHAR), &len, str, len ); + win32u_mbtowc( NULL, wstr, len * sizeof(WCHAR), str, len ); return wstr; } @@ -805,8 +805,8 @@ static WCHAR *copy_name_table_string( const FT_SfntName *name ) case TT_PLATFORM_MACINTOSH: if (!(cp = get_mac_code_page( name ))) return NULL; ret = malloc( (name->string_len + 1) * sizeof(WCHAR) ); - RtlCustomCPToUnicodeN( cp, ret, name->string_len * sizeof(WCHAR), &i, - (char *)name->string, name->string_len ); + i = win32u_mbtowc( cp, ret, name->string_len * sizeof(WCHAR), + (char *)name->string, name->string_len ); ret[i / sizeof(WCHAR)] = 0; return ret; } @@ -1165,7 +1165,7 @@ static WCHAR *decode_opentype_name( struct opentype_name *name ) { CPTABLEINFO *cptable = get_cptable( name->codepage ); if (!cptable) return NULL; - RtlCustomCPToUnicodeN( cptable, buffer, sizeof(buffer), &len, name->bytes, name->length ); + len = win32u_mbtowc( cptable, buffer, sizeof(buffer), name->bytes, name->length ); len /= sizeof(WCHAR); } @@ -2577,7 +2577,7 @@ static BOOL CDECL freetype_get_glyph_index( struct gdi_font *font, UINT *glyph, DWORD len; char ch; - RtlUnicodeToMultiByteN( &ch, 1, &len, &wc, sizeof(wc) ); + len = win32u_wctomb( NULL, &ch, 1, &wc, sizeof(wc) ); if (len) *glyph = get_glyph_index_symbol( font, (unsigned char)ch ); } return TRUE; diff --git a/dlls/gdi32/win32u_private.h b/dlls/gdi32/win32u_private.h index d986bf339c3..f867c556bff 100644 --- a/dlls/gdi32/win32u_private.h +++ b/dlls/gdi32/win32u_private.h @@ -395,4 +395,9 @@ static inline LONG win32u_wcstol( LPCWSTR s, LPWSTR *end, INT base ) #define wcsrchr(s,c) win32u_wcsrchr(s,c) #define wcstol(s,e,b) win32u_wcstol(s,e,b) +DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *src, + DWORD srclen ) DECLSPEC_HIDDEN; +DWORD win32u_wctomb( CPTABLEINFO *info, char *dst, DWORD dstlen, const WCHAR *src, + DWORD srclen ) DECLSPEC_HIDDEN; + #endif /* __WINE_WIN32U_PRIVATE */ -- 2.23.0

1 0

[PATCH v2 7/8] gdi32: Avoid using RtlOpenCurrentUser.
by Huw Davies Oct. 4, 2021

Oct. 4, 2021

From: Jacek Caban <jacek(a)codeweavers.com> Based on open_hkcu_key. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 0c08816945a..0b32a94f7fe 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6196,6 +6196,28 @@ static void load_registry_fonts(void) NtClose( hkey ); } +static HKEY open_hkcu(void) +{ + char buffer[256]; + WCHAR bufferW[256]; + DWORD_PTR sid_data[(sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE) / sizeof(DWORD_PTR)]; + DWORD i, len = sizeof(sid_data); + SID *sid; + + if (NtQueryInformationToken( GetCurrentThreadEffectiveToken(), TokenUser, sid_data, len, &len )) + return 0; + + sid = ((TOKEN_USER *)sid_data)->User.Sid; + len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, + MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], sid->IdentifierAuthority.Value[4] ), + MAKEWORD( sid->IdentifierAuthority.Value[3], sid->IdentifierAuthority.Value[2] ))); + for (i = 0; i < sid->SubAuthorityCount; i++) + len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] ); + ascii_to_unicode( bufferW, buffer, len + 1 ); + + return reg_open_key( NULL, bufferW, len * sizeof(WCHAR) ); +} + /*********************************************************************** * font_init */ @@ -6214,7 +6236,7 @@ UINT font_init(void) {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','F','o','n','t','s'}; static const WCHAR cacheW[] = {'C','a','c','h','e'}; - if (RtlOpenCurrentUser( MAXIMUM_ALLOWED, &hkcu )) return 0; + if (!(hkcu = open_hkcu())) return 0; wine_fonts_key = reg_create_key( hkcu, wine_fonts_keyW, sizeof(wine_fonts_keyW), 0, NULL ); if (wine_fonts_key) dpi = init_font_options( hkcu ); NtClose( hkcu ); -- 2.23.0

1 0

[PATCH v2 6/8] gdi32: Don't use RtlDosPathNameToNtPathName_U in get_unix_file_name.
by Huw Davies Oct. 4, 2021

Oct. 4, 2021

From: Jacek Caban <jacek(a)codeweavers.com> Paths are already in NT format. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index bd4a29bb723..44d5dc26cff 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1364,7 +1364,7 @@ static WCHAR *get_dos_file_name( LPCSTR str ) return buffer; } -static char *get_unix_file_name( LPCWSTR dosW ) +static char *get_unix_file_name( LPCWSTR path ) { UNICODE_STRING nt_name; OBJECT_ATTRIBUTES attr; @@ -1372,24 +1372,19 @@ static char *get_unix_file_name( LPCWSTR dosW ) ULONG size = 256; char *buffer; - if (!RtlDosPathNameToNtPathName_U( dosW, &nt_name, NULL, NULL )) return NULL; + nt_name.Buffer = (WCHAR *)path; + nt_name.MaximumLength = nt_name.Length = lstrlenW( path ) * sizeof(WCHAR); InitializeObjectAttributes( &attr, &nt_name, 0, 0, NULL ); for (;;) { - if (!(buffer = malloc( size ))) - { - RtlFreeUnicodeString( &nt_name ); - return NULL; - } + if (!(buffer = malloc( size ))) return NULL; status = wine_nt_to_unix_file_name( &attr, buffer, &size, FILE_OPEN_IF ); if (status != STATUS_BUFFER_TOO_SMALL) break; free( buffer ); } - RtlFreeUnicodeString( &nt_name ); if (status && status != STATUS_NO_SUCH_FILE) { free( buffer ); - RtlSetLastWin32ErrorAndNtStatusFromNtStatus( status ); return NULL; } return buffer; -- 2.23.0

1 0

[PATCH v2 5/8] gdi32: Use win32u_wcsicmp instead of RtlCompareUnicodeStrings.
by Huw Davies Oct. 4, 2021

Oct. 4, 2021

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d8bae670d7f..bd4a29bb723 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1277,13 +1277,11 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr This->second_name = ft_face_get_family_name( This->ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); /* try to find another secondary name, preferring the lowest langids */ - if (!RtlCompareUnicodeStrings( This->family_name, lstrlenW( This->family_name ), - This->second_name, lstrlenW( This->second_name ), TRUE )) + if (!wcsicmp( This->family_name, This->second_name )) { free( This->second_name ); This->second_name = ft_face_get_family_name( This->ft_face, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) ); - if (!RtlCompareUnicodeStrings( This->family_name, lstrlenW( This->family_name ), - This->second_name, lstrlenW( This->second_name ), TRUE )) + if (!wcsicmp( This->family_name, This->second_name )) { free( This->second_name ); This->second_name = NULL; -- 2.23.0

1 0

[PATCH v2 4/8] gdi32: Use pthread mutex in dib driver.
by Huw Davies Oct. 4, 2021

Oct. 4, 2021

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/dibdrv/graphics.c | 16 +++++----------- dlls/gdi32/win32u_private.h | 3 --- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 875ae308546..410f29e8f19 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -23,6 +23,7 @@ #endif #include <assert.h> +#include <pthread.h> #include "ntgdi_private.h" #include "dibdrv.h" @@ -59,14 +60,7 @@ struct cached_font static struct list font_cache = LIST_INIT( font_cache ); -static CRITICAL_SECTION font_cache_cs; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &font_cache_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": font_cache_cs") } -}; -static CRITICAL_SECTION font_cache_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t font_cache_lock = PTHREAD_MUTEX_INITIALIZER; static BOOL brush_rect( dibdrv_physdev *pdev, dib_brush *brush, const RECT *rect, HRGN clip ) @@ -575,7 +569,7 @@ static struct cached_font *add_cached_font( DC *dc, HFONT hfont, UINT aa_flags ) font.aa_flags = aa_flags; font.hash = font_cache_hash( &font ); - EnterCriticalSection( &font_cache_cs ); + pthread_mutex_lock( &font_cache_lock ); LIST_FOR_EACH_ENTRY( ptr, &font_cache, struct cached_font, entry ) { if (!font_cache_cmp( &font, ptr )) @@ -608,7 +602,7 @@ static struct cached_font *add_cached_font( DC *dc, HFONT hfont, UINT aa_flags ) } else if (!(ptr = malloc( sizeof(*ptr) ))) { - LeaveCriticalSection( &font_cache_cs ); + pthread_mutex_unlock( &font_cache_lock ); return NULL; } @@ -617,7 +611,7 @@ static struct cached_font *add_cached_font( DC *dc, HFONT hfont, UINT aa_flags ) memset( ptr->glyphs, 0, sizeof(ptr->glyphs) ); done: list_add_head( &font_cache, &ptr->entry ); - LeaveCriticalSection( &font_cache_cs ); + pthread_mutex_unlock( &font_cache_lock ); TRACE( "%d %s -> %p\n", ptr->lf.lfHeight, debugstr_w(ptr->lf.lfFaceName), ptr ); return ptr; } diff --git a/dlls/gdi32/win32u_private.h b/dlls/gdi32/win32u_private.h index 836d8014f01..d986bf339c3 100644 --- a/dlls/gdi32/win32u_private.h +++ b/dlls/gdi32/win32u_private.h @@ -395,7 +395,4 @@ static inline LONG win32u_wcstol( LPCWSTR s, LPWSTR *end, INT base ) #define wcsrchr(s,c) win32u_wcsrchr(s,c) #define wcstol(s,e,b) win32u_wcstol(s,e,b) -#define EnterCriticalSection RtlEnterCriticalSection -#define LeaveCriticalSection RtlLeaveCriticalSection - #endif /* __WINE_WIN32U_PRIVATE */ -- 2.23.0

1 0

[PATCH v2 3/8] gdi32: Use pthread mutex in font.c.
by Huw Davies Oct. 4, 2021

Oct. 4, 2021

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 95 ++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 50 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 98c70a6e2a8..0c08816945a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -29,6 +29,8 @@ #include <stdlib.h> #include <string.h> #include <assert.h> +#include <pthread.h> + #include "winerror.h" #include "windef.h" #include "winbase.h" @@ -508,14 +510,7 @@ static inline BOOL is_dbcs_ansi_cp(UINT ansi_cp) || ansi_cp == 950 ); /* CP950 for Chinese Traditional */ } -static CRITICAL_SECTION font_cs; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &font_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": font_cs") } -}; -static CRITICAL_SECTION font_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t font_lock = PTHREAD_MUTEX_INITIALIZER; #ifndef WINE_FONT_DIR #define WINE_FONT_DIR "fonts" @@ -1068,7 +1063,7 @@ static int remove_font( const WCHAR *file, DWORD flags ) struct gdi_font_face *face, *face_next; int count = 0; - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR( family, family_next, &family_name_tree, struct gdi_font_family, name_entry ) { family->refcount++; @@ -1085,7 +1080,7 @@ static int remove_font( const WCHAR *file, DWORD flags ) } release_family( family ); } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return count; } @@ -2565,7 +2560,7 @@ static void release_gdi_font( struct gdi_font *font ) TRACE( "font %p\n", font ); /* add it to the unused list */ - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); list_add_head( &unused_gdi_font_list, &font->unused_entry ); if (unused_font_count > UNUSED_CACHE_SIZE) { @@ -2576,7 +2571,7 @@ static void release_gdi_font( struct gdi_font *font ) free_gdi_font( font ); } else unused_font_count++; - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); } static void add_font_list(HKEY hkey, const struct nls_update_font_list *fl, int dpi) @@ -3113,9 +3108,9 @@ static BOOL enum_face_charsets( const struct gdi_font_family *family, struct gdi elf.elfLogFont.lfCharSet, type, debugstr_w(elf.elfScript), elf.elfLogFont.lfItalic, elf.elfLogFont.lfWeight, ntm.ntmTm.ntmFlags ); /* release section before callback (FIXME) */ - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); if (!proc( &elf.elfLogFont, (TEXTMETRICW *)&ntm, type, lparam )) return FALSE; - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); } return TRUE; } @@ -3134,7 +3129,7 @@ static BOOL CDECL font_EnumFonts( PHYSDEV dev, LOGFONTW *lf, FONTENUMPROCW proc, count = create_enum_charset_list( charset, enum_charsets ); - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); if (lf && lf->lfFaceName[0]) { @@ -3170,7 +3165,7 @@ static BOOL CDECL font_EnumFonts( PHYSDEV dev, LOGFONTW *lf, FONTENUMPROCW proc, return FALSE; } } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return TRUE; } @@ -3372,13 +3367,13 @@ static BOOL CDECL font_GetCharABCWidths( PHYSDEV dev, UINT first, UINT count, TRACE( "%p, %u, %u, %p\n", physdev->font, first, count, buffer ); - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); for (i = 0; i < count; i++) { c = chars ? chars[i] : first + i; get_glyph_outline( physdev->font, c, GGO_METRICS, NULL, &buffer[i], 0, NULL, NULL ); } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return TRUE; } @@ -3399,11 +3394,11 @@ static BOOL CDECL font_GetCharABCWidthsI( PHYSDEV dev, UINT first, UINT count, W TRACE( "%p, %u, %u, %p\n", physdev->font, first, count, buffer ); - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); for (c = 0; c < count; c++, buffer++) get_glyph_outline( physdev->font, gi ? gi[c] : first + c, GGO_METRICS | GGO_GLYPH_INDEX, NULL, buffer, 0, NULL, NULL ); - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return TRUE; } @@ -3426,7 +3421,7 @@ static BOOL CDECL font_GetCharWidth( PHYSDEV dev, UINT first, UINT count, TRACE( "%p, %d, %d, %p\n", physdev->font, first, count, buffer ); - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); for (i = 0; i < count; i++) { c = chars ? chars[i] : i + first; @@ -3435,7 +3430,7 @@ static BOOL CDECL font_GetCharWidth( PHYSDEV dev, UINT first, UINT count, else buffer[i] = abc.abcA + abc.abcB + abc.abcC; } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return TRUE; } @@ -3560,7 +3555,7 @@ static DWORD CDECL font_GetGlyphIndices( PHYSDEV dev, const WCHAR *str, INT coun got_default = TRUE; } - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); for (i = 0; i < count; i++) { @@ -3589,7 +3584,7 @@ static DWORD CDECL font_GetGlyphIndices( PHYSDEV dev, const WCHAR *str, INT coun else gi[i] = get_GSUB_vert_glyph( physdev->font, glyph ); } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return count; } @@ -3608,9 +3603,9 @@ static DWORD CDECL font_GetGlyphOutline( PHYSDEV dev, UINT glyph, UINT format, dev = GET_NEXT_PHYSDEV( dev, pGetGlyphOutline ); return dev->funcs->pGetGlyphOutline( dev, glyph, format, gm, buflen, buf, mat ); } - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); ret = get_glyph_outline( physdev->font, glyph, format, gm, NULL, buflen, buf, mat ); - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return ret; } @@ -3628,11 +3623,11 @@ static DWORD CDECL font_GetKerningPairs( PHYSDEV dev, DWORD count, KERNINGPAIR * return dev->funcs->pGetKerningPairs( dev, count, pairs ); } - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); if (physdev->font->kern_count == -1) physdev->font->kern_count = font_funcs->get_kerning_pairs( physdev->font, &physdev->font->kern_pairs ); - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); if (count && pairs) { @@ -3725,7 +3720,7 @@ static UINT CDECL font_GetOutlineTextMetrics( PHYSDEV dev, UINT size, OUTLINETEX if (!physdev->font->scalable) return 0; - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); if (font_funcs->set_outline_text_metrics( physdev->font )) { ret = physdev->font->otm.otmSize; @@ -3747,7 +3742,7 @@ static UINT CDECL font_GetOutlineTextMetrics( PHYSDEV dev, UINT size, OUTLINETEX scale_outline_font_metrics( physdev->font, metrics ); } } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return ret; } @@ -3786,14 +3781,14 @@ static BOOL CDECL font_GetTextExtentExPoint( PHYSDEV dev, const WCHAR *str, INT TRACE( "%p, %s, %d\n", physdev->font, debugstr_wn(str, count), count ); - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); for (i = pos = 0; i < count; i++) { get_glyph_outline( physdev->font, str[i], GGO_METRICS, NULL, &abc, 0, NULL, NULL ); pos += abc.abcA + abc.abcB + abc.abcC; dxs[i] = pos; } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return TRUE; } @@ -3815,7 +3810,7 @@ static BOOL CDECL font_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, TRACE( "%p, %p, %d\n", physdev->font, indices, count ); - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); for (i = pos = 0; i < count; i++) { get_glyph_outline( physdev->font, indices[i], GGO_METRICS | GGO_GLYPH_INDEX, @@ -3823,7 +3818,7 @@ static BOOL CDECL font_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, pos += abc.abcA + abc.abcB + abc.abcC; dxs[i] = pos; } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return TRUE; } @@ -3910,7 +3905,7 @@ static BOOL CDECL font_GetTextMetrics( PHYSDEV dev, TEXTMETRICW *metrics ) return dev->funcs->pGetTextMetrics( dev, metrics ); } - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); if (font_funcs->set_outline_text_metrics( physdev->font ) || font_funcs->set_bitmap_text_metrics( physdev->font )) { @@ -3918,7 +3913,7 @@ static BOOL CDECL font_GetTextMetrics( PHYSDEV dev, TEXTMETRICW *metrics ) scale_font_metrics( physdev->font, metrics ); ret = TRUE; } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return ret; } @@ -4111,7 +4106,7 @@ static HFONT CDECL font_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) } TRACE( "DC transform %f %f %f %f\n", dcmat.eM11, dcmat.eM12, dcmat.eM21, dcmat.eM22 ); - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); font = select_font( &lf, dcmat, can_use_bitmap ); @@ -4128,7 +4123,7 @@ static HFONT CDECL font_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) *aa_flags = font_funcs->get_aa_flags( font, *aa_flags, antialias_fakes ); } TRACE( "%p %s %d aa %x\n", hfont, debugstr_w(lf.lfFaceName), lf.lfHeight, *aa_flags ); - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); } physdev->font = font; if (prev) release_gdi_font( prev ); @@ -5891,16 +5886,16 @@ static int add_system_font_resource( const WCHAR *file, DWORD flags ) /* try in %WINDIR%/fonts, needed for Fotobuch Designer */ get_fonts_win_dir_path( file, path ); - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); ret = font_funcs->add_font( path, flags ); - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); /* try in datadir/fonts (or builddir/fonts), needed for Magic the Gathering Online */ if (!ret) { get_fonts_data_dir_path( file, path ); - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); ret = font_funcs->add_font( path, flags ); - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); } return ret; } @@ -5928,9 +5923,9 @@ static int add_font_resource( LPCWSTR file, DWORD flags ) DWORD addfont_flags = ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE; if (!(flags & FR_PRIVATE)) addfont_flags |= ADDFONT_ADD_TO_CACHE; - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); ret = font_funcs->add_font( file, addfont_flags ); - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); } else if (!wcschr( file, '\\' )) ret = add_system_font_resource( file, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE ); @@ -6296,9 +6291,9 @@ HANDLE WINAPI NtGdiAddFontMemResourceEx( void *ptr, DWORD size, void *dv, ULONG if (!(copy = malloc( size ))) return NULL; memcpy( copy, ptr, size ); - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); num_fonts = font_funcs->add_mem_font( copy, size, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE ); - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); if (!num_fonts) { @@ -6436,7 +6431,7 @@ BOOL WINAPI NtGdiGetFontFileData( DWORD instance_id, DWORD file_index, UINT64 *o BOOL ret = FALSE; if (!font_funcs) return FALSE; - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); if ((font = get_font_from_handle( instance_id ))) { if (font->ttc_item_offset) tag = MS_TTCF_TAG; @@ -6446,7 +6441,7 @@ BOOL WINAPI NtGdiGetFontFileData( DWORD instance_id, DWORD file_index, UINT64 *o else SetLastError( ERROR_INVALID_PARAMETER ); } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); return ret; } @@ -6460,7 +6455,7 @@ BOOL WINAPI NtGdiGetFontFileInfo( DWORD instance_id, DWORD file_index, struct fo struct gdi_font *font; BOOL ret = FALSE; - EnterCriticalSection( &font_cs ); + pthread_mutex_lock( &font_lock ); if ((font = get_font_from_handle( instance_id ))) { @@ -6475,7 +6470,7 @@ BOOL WINAPI NtGdiGetFontFileInfo( DWORD instance_id, DWORD file_index, struct fo else SetLastError( ERROR_INSUFFICIENT_BUFFER ); } - LeaveCriticalSection( &font_cs ); + pthread_mutex_unlock( &font_lock ); if (needed) *needed = required_size; return ret; } -- 2.23.0

1 0

[PATCH v2 2/8] gdi32: Use pthread mutex instead of gdi_section.
by Huw Davies Oct. 4, 2021

Oct. 4, 2021

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/dc.c | 10 ++--- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/gdiobj.c | 83 ++++++++++++++++---------------------- dlls/gdi32/ntgdi_private.h | 1 - 4 files changed, 40 insertions(+), 56 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c21993a8ca5..a64522f34af 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -518,8 +518,6 @@ static BOOL DC_DeleteObject( HGDIOBJ handle ) TRACE( "%p\n", handle ); - GDI_CheckNotLock(); - if (!(dc = get_dc_ptr( handle ))) return FALSE; if (dc->refcount != 1) { @@ -528,7 +526,8 @@ static BOOL DC_DeleteObject( HGDIOBJ handle ) return FALSE; } - /* Call hook procedure to check whether is it OK to delete this DC */ + /* Call hook procedure to check whether is it OK to delete this DC, + * gdi_lock should not be locked */ if (dc->hookProc && !dc->hookProc( dc->hSelf, DCHC_DELETEDC, dc->dwHookData, 0 )) { release_dc_ptr( dc ); @@ -726,8 +725,7 @@ HDC WINAPI NtGdiOpenDCW( UNICODE_STRING *device, const DEVMODEW *devmode, UNICOD HDC hdc; DC * dc; - GDI_CheckNotLock(); - + /* gdi_lock should not be locked */ if (is_display) funcs = get_display_driver(); else if (hspool) @@ -788,7 +786,7 @@ HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ) const struct gdi_dc_funcs *funcs; PHYSDEV physDev = NULL; - GDI_CheckNotLock(); + /* gdi_lock should not be locked */ if (hdc) { diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 0512307531d..f69713c8025 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -747,7 +747,7 @@ static inline struct windrv_physdev *get_windrv_physdev( PHYSDEV dev ) static inline void lock_surface( struct windrv_physdev *dev ) { - GDI_CheckNotLock(); + /* gdi_lock should not be locked */ dev->surface->funcs->lock( dev->surface ); if (is_rect_empty( dev->dibdrv->bounds )) dev->start_ticks = NtGetTickCount(); } diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 8381c9e2746..bbfe50d2c8b 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -26,6 +26,7 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> +#include <pthread.h> #include "windef.h" #include "winbase.h" @@ -88,14 +89,7 @@ static const LOGBRUSH DkGrayBrush = { BS_SOLID, RGB(64,64,64), 0 }; static const LOGBRUSH DCBrush = { BS_SOLID, RGB(255,255,255), 0 }; -static CRITICAL_SECTION gdi_section; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &gdi_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": gdi_section") } -}; -static CRITICAL_SECTION gdi_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t gdi_lock; /**************************************************************************** @@ -469,9 +463,9 @@ void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set) { GDI_HANDLE_ENTRY *entry; - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); if ((entry = handle_entry( handle ))) entry_obj( entry )->system = !!set; - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); } /****************************************************************************** @@ -525,9 +519,9 @@ UINT GDI_get_ref_count( HGDIOBJ handle ) GDI_HANDLE_ENTRY *entry; UINT ret = 0; - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); if ((entry = handle_entry( handle ))) ret = entry_obj( entry )->selcount; - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); return ret; } @@ -541,10 +535,10 @@ HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) { GDI_HANDLE_ENTRY *entry; - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); if ((entry = handle_entry( handle ))) entry_obj( entry )->selcount++; else handle = 0; - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); return handle; } @@ -558,7 +552,7 @@ BOOL GDI_dec_ref_count( HGDIOBJ handle ) { GDI_HANDLE_ENTRY *entry; - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); if ((entry = handle_entry( handle ))) { assert( entry_obj( entry )->selcount ); @@ -566,13 +560,13 @@ BOOL GDI_dec_ref_count( HGDIOBJ handle ) { /* handle delayed DeleteObject*/ entry_obj( entry )->deleted = 0; - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); TRACE( "executing delayed DeleteObject for %p\n", handle ); NtGdiDeleteObjectApp( handle ); return TRUE; } } - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); return entry != NULL; } @@ -736,7 +730,7 @@ static void dump_gdi_objects( void ) TRACE( "%u objects:\n", GDI_MAX_HANDLE_COUNT ); - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); for (entry = gdi_shared->Handles; entry < next_unused; entry++) { if (!entry->Type) @@ -747,7 +741,7 @@ static void dump_gdi_objects( void ) gdi_obj_type( entry->ExtType << NTGDI_HANDLE_TYPE_SHIFT ), entry_obj( entry )->selcount, entry_obj( entry )->deleted ); } - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); } /*********************************************************************** @@ -762,7 +756,7 @@ HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, DWORD type, const struct g assert( type ); /* type 0 is reserved to mark free entries */ - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); entry = next_free; if (entry) @@ -771,7 +765,7 @@ HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, DWORD type, const struct g entry = next_unused++; else { - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); ERR( "out of GDI object handles, expect a crash\n" ); if (TRACE_ON(gdi)) dump_gdi_objects(); return 0; @@ -785,7 +779,7 @@ HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, DWORD type, const struct g entry->Type = entry->ExtType & 0x1f; if (++entry->Generation == 0xff) entry->Generation = 1; ret = entry_to_handle( entry ); - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); TRACE( "allocated %s %p %u/%u\n", gdi_obj_type(type), ret, InterlockedIncrement( &debug_count ), GDI_MAX_HANDLE_COUNT ); return ret; @@ -802,7 +796,7 @@ void *free_gdi_handle( HGDIOBJ handle ) void *object = NULL; GDI_HANDLE_ENTRY *entry; - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); if ((entry = handle_entry( handle ))) { TRACE( "freed %s %p %u/%u\n", gdi_obj_type( entry->ExtType << NTGDI_HANDLE_TYPE_SHIFT ), @@ -812,7 +806,7 @@ void *free_gdi_handle( HGDIOBJ handle ) entry->Object = (UINT_PTR)next_free; next_free = entry; } - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); return object; } @@ -840,7 +834,7 @@ void *get_any_obj_ptr( HGDIOBJ handle, DWORD *type ) void *ptr = NULL; GDI_HANDLE_ENTRY *entry; - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); if ((entry = handle_entry( handle ))) { @@ -848,7 +842,7 @@ void *get_any_obj_ptr( HGDIOBJ handle, DWORD *type ) *type = entry->ExtType << NTGDI_HANDLE_TYPE_SHIFT; } - if (!ptr) LeaveCriticalSection( &gdi_section ); + if (!ptr) pthread_mutex_unlock( &gdi_lock ); return ptr; } @@ -877,20 +871,7 @@ void *GDI_GetObjPtr( HGDIOBJ handle, DWORD type ) */ void GDI_ReleaseObj( HGDIOBJ handle ) { - LeaveCriticalSection( &gdi_section ); -} - - -/*********************************************************************** - * GDI_CheckNotLock - */ -void GDI_CheckNotLock(void) -{ - if (RtlIsCriticalSectionLockedByThread(&gdi_section)) - { - ERR( "BUG: holding GDI lock\n" ); - assert( 0 ); - } + pthread_mutex_unlock( &gdi_lock ); } @@ -914,10 +895,10 @@ BOOL WINAPI NtGdiDeleteObjectApp( HGDIOBJ obj ) const struct gdi_obj_funcs *funcs = NULL; struct gdi_obj_header *header; - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); if (!(entry = handle_entry( obj ))) { - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); return FALSE; } @@ -925,7 +906,7 @@ BOOL WINAPI NtGdiDeleteObjectApp( HGDIOBJ obj ) if (header->system) { TRACE("Preserving system object %p\n", obj); - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); return TRUE; } @@ -938,7 +919,7 @@ BOOL WINAPI NtGdiDeleteObjectApp( HGDIOBJ obj ) } else funcs = header->funcs; - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); TRACE("%p\n", obj ); @@ -985,13 +966,13 @@ INT WINAPI NtGdiExtGetObjectW( HGDIOBJ handle, INT count, void *buffer ) TRACE("%p %d %p\n", handle, count, buffer ); - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); if ((entry = handle_entry( handle ))) { funcs = entry_obj( entry )->funcs; handle = entry_to_handle( entry ); /* make it a full handle */ } - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); if (funcs && funcs->pGetObjectW) { @@ -1040,13 +1021,13 @@ BOOL WINAPI NtGdiUnrealizeObject( HGDIOBJ obj ) const struct gdi_obj_funcs *funcs = NULL; GDI_HANDLE_ENTRY *entry; - EnterCriticalSection( &gdi_section ); + pthread_mutex_lock( &gdi_lock ); if ((entry = handle_entry( obj ))) { funcs = entry_obj( entry )->funcs; obj = entry_to_handle( entry ); /* make it a full handle */ } - LeaveCriticalSection( &gdi_section ); + pthread_mutex_unlock( &gdi_lock ); if (funcs && funcs->pUnrealizeObject) return funcs->pUnrealizeObject( obj ); return funcs != NULL; @@ -1271,10 +1252,16 @@ static struct unix_funcs unix_funcs = NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) { + pthread_mutexattr_t attr; unsigned int dpi; if (reason != DLL_PROCESS_ATTACH) return 0; + pthread_mutexattr_init( &attr ); + pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE ); + pthread_mutex_init( &gdi_lock, &attr ); + pthread_mutexattr_destroy( &attr ); + NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); init_gdi_shared(); if (!gdi_shared) return STATUS_NO_MEMORY; diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 1b55b5ad458..44d68d26b02 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -373,7 +373,6 @@ extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern void *GDI_GetObjPtr( HGDIOBJ, DWORD ) DECLSPEC_HIDDEN; extern void *get_any_obj_ptr( HGDIOBJ, DWORD * ) DECLSPEC_HIDDEN; extern void GDI_ReleaseObj( HGDIOBJ ) DECLSPEC_HIDDEN; -extern void GDI_CheckNotLock(void) DECLSPEC_HIDDEN; extern UINT GDI_get_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern BOOL GDI_dec_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; -- 2.23.0

1 0