October 2021 - Wine-Devel - list.winehq.org

[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

[PATCH v2 1/8] gdi32: Use pthread mutex in driver.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/Makefile.in | 2 +- dlls/gdi32/driver.c | 31 +++++++++++++------------------ 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index a1b153edf07..6a5df55bfeb 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -3,7 +3,7 @@ MODULE = gdi32.dll IMPORTLIB = gdi32 IMPORTS = advapi32 EXTRAINCL = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) -EXTRALIBS = $(CARBON_LIBS) $(APPKIT_LIBS) +EXTRALIBS = $(CARBON_LIBS) $(APPKIT_LIBS) $(PTHREAD_LIBS) DELAYIMPORTS = setupapi C_SRCS = \ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 24b8a6b27b5..849be65c480 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -27,6 +27,8 @@ #include <stdarg.h> #include <string.h> #include <stdio.h> +#include <pthread.h> + #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -59,14 +61,7 @@ const struct gdi_dc_funcs *driver_funcs; static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); static struct list d3dkmt_devices = LIST_INIT( d3dkmt_devices ); -static CRITICAL_SECTION driver_section; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &driver_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": driver_section") } -}; -static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t driver_lock = PTHREAD_MUTEX_INITIALIZER; /********************************************************************** * get_display_driver @@ -802,7 +797,7 @@ NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) if (!desc || !desc->hAdapter) return STATUS_INVALID_PARAMETER; - EnterCriticalSection( &driver_section ); + pthread_mutex_lock( &driver_lock ); LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) { if (adapter->handle == desc->hAdapter) @@ -813,7 +808,7 @@ NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) break; } } - LeaveCriticalSection( &driver_section ); + pthread_mutex_unlock( &driver_lock ); return status; } @@ -848,10 +843,10 @@ NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc if (!(adapter = malloc( sizeof( *adapter ) ))) return STATUS_NO_MEMORY; - EnterCriticalSection( &driver_section ); + pthread_mutex_lock( &driver_lock ); desc->hAdapter = adapter->handle = ++handle_start; list_add_tail( &d3dkmt_adapters, &adapter->entry ); - LeaveCriticalSection( &driver_section ); + pthread_mutex_unlock( &driver_lock ); return STATUS_SUCCESS; } @@ -870,7 +865,7 @@ NTSTATUS WINAPI NtGdiDdDDICreateDevice( D3DKMT_CREATEDEVICE *desc ) if (!desc) return STATUS_INVALID_PARAMETER; - EnterCriticalSection( &driver_section ); + pthread_mutex_lock( &driver_lock ); LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) { if (adapter->handle == desc->hAdapter) @@ -879,7 +874,7 @@ NTSTATUS WINAPI NtGdiDdDDICreateDevice( D3DKMT_CREATEDEVICE *desc ) break; } } - LeaveCriticalSection( &driver_section ); + pthread_mutex_unlock( &driver_lock ); if (!found) return STATUS_INVALID_PARAMETER; @@ -891,10 +886,10 @@ NTSTATUS WINAPI NtGdiDdDDICreateDevice( D3DKMT_CREATEDEVICE *desc ) if (!device) return STATUS_NO_MEMORY; - EnterCriticalSection( &driver_section ); + pthread_mutex_lock( &driver_lock ); device->handle = ++handle_start; list_add_tail( &d3dkmt_devices, &device->entry ); - LeaveCriticalSection( &driver_section ); + pthread_mutex_unlock( &driver_lock ); desc->hDevice = device->handle; return STATUS_SUCCESS; @@ -914,7 +909,7 @@ NTSTATUS WINAPI NtGdiDdDDIDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) if (!desc || !desc->hDevice) return STATUS_INVALID_PARAMETER; - EnterCriticalSection( &driver_section ); + pthread_mutex_lock( &driver_lock ); LIST_FOR_EACH_ENTRY( device, &d3dkmt_devices, struct d3dkmt_device, entry ) { if (device->handle == desc->hDevice) @@ -928,7 +923,7 @@ NTSTATUS WINAPI NtGdiDdDDIDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) break; } } - LeaveCriticalSection( &driver_section ); + pthread_mutex_unlock( &driver_lock ); return status; } -- 2.23.0

1 0

[PATCH 1/2] winedbg: Adapt build_command_line() from winevdm
by Robbert van der Helm Oct. 4, 2021

Oct. 4, 2021

The only difference between the two versions is that this one doesn't prefix the result with the command line's length. Signed-off-by: Robbert van der Helm <mail(a)robbertvanderhelm.nl> --- Instead of having having four almost identical copies of this function spread around Wine's code base (two for WCHAR*, two for char*), someone who's more familiar with Wine's code base than I am should probably merge these and move them to somewhere in `include/wine/`. --- programs/winedbg/tgt_active.c | 110 ++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 508e1c58040..f499b26648a 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -774,6 +774,116 @@ static void output_system_info(void) } } +/*********************************************************************** + * build_command_line + * + * Build the command line of a process from the argv array. + * Copied from winevdm, which in turn adapted it from ENV_BuildCommandLine. The difference between + * this and the winevdm version is the command line is not prefixed with its length. + */ +static char *build_command_line(char **argv) +{ + int len; + char *p, **arg, *cmd_line; + + len = 0; + for (arg = argv; *arg; arg++) + { + BOOL has_space; + int bcount; + char* a; + + has_space=FALSE; + bcount=0; + a=*arg; + if( !*a ) has_space=TRUE; + while (*a!='\0') { + if (*a=='\\') { + bcount++; + } else { + if (*a==' ' || *a=='\t') { + has_space=TRUE; + } else if (*a=='"') { + /* doubling of '\' preceding a '"', + * plus escaping of said '"' + */ + len+=2*bcount+1; + } + bcount=0; + } + a++; + } + len+=(a-*arg)+1 /* for the separating space */; + if (has_space) + len+=2; /* for the quotes */ + } + + if (!(cmd_line = HeapAlloc( GetProcessHeap(), 0, len ? len : 1 ))) + return NULL; + + p = cmd_line; + for (arg = argv; *arg; arg++) + { + BOOL has_space,has_quote; + char* a; + + /* Check for quotes and spaces in this argument */ + has_space=has_quote=FALSE; + a=*arg; + if( !*a ) has_space=TRUE; + while (*a!='\0') { + if (*a==' ' || *a=='\t') { + has_space=TRUE; + if (has_quote) + break; + } else if (*a=='"') { + has_quote=TRUE; + if (has_space) + break; + } + a++; + } + + /* Now transfer it to the command line */ + if (has_space) + *p++='"'; + if (has_quote) { + int bcount; + + bcount=0; + a=*arg; + while (*a!='\0') { + if (*a=='\\') { + *p++=*a; + bcount++; + } else { + if (*a=='"') { + int i; + + /* Double all the '\\' preceding this '"', plus one */ + for (i=0;i<=bcount;i++) + *p++='\\'; + *p++='"'; + } else { + *p++=*a; + } + bcount=0; + } + a++; + } + } else { + strcpy(p,*arg); + p+=strlen(*arg); + } + if (has_space) + *p++='"'; + *p++=' '; + } + if (len) p--; /* remove last space */ + *p = '\0'; + return cmd_line; +} + /****************************************************************** * dbg_active_attach * -- 2.33.0

1 1

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

Oct. 4, 2021

Based on ntdll. Signed-off-by: Jacek Caban <jacek(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(-)

1 0

[PATCH 2/2] wpcap: Convert pcap_pkthdr structures.
by Hans Leidekker Oct. 4, 2021

Oct. 4, 2021

Structure layout is different on 64-bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51818 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wpcap/unixlib.c | 60 ++++++++++++++++++++++++++++++++++++-------- dlls/wpcap/unixlib.h | 26 +++++++++++++------ dlls/wpcap/wpcap.c | 13 +++++----- 3 files changed, 75 insertions(+), 24 deletions(-) diff --git a/dlls/wpcap/unixlib.c b/dlls/wpcap/unixlib.c index b48a5540edc..96e30fe2f11 100644 --- a/dlls/wpcap/unixlib.c +++ b/dlls/wpcap/unixlib.c @@ -28,6 +28,7 @@ #include <stdarg.h> #include <stdlib.h> +#include <limits.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -37,6 +38,7 @@ #include "wine/debug.h" #include "unixlib.h" +WINE_DEFAULT_DEBUG_CHANNEL(wpcap); WINE_DECLARE_DEBUG_CHANNEL(winediag); static const struct pcap_callbacks *callbacks; @@ -101,12 +103,19 @@ static const char * CDECL wrap_datalink_val_to_name( int link ) static void wrap_pcap_handler( unsigned char *user, const struct pcap_pkthdr *hdr, const unsigned char *packet ) { struct handler_callback *cb = (struct handler_callback *)user; - callbacks->handler( cb, hdr, packet ); + struct pcap_pkthdr_win32 hdr_win32; + + if (hdr->ts.tv_sec > INT_MAX || hdr->ts.tv_usec > INT_MAX) WARN( "truncating timeval values(s)\n" ); + hdr_win32.ts.tv_sec = hdr->ts.tv_sec; + hdr_win32.ts.tv_usec = hdr->ts.tv_usec; + hdr_win32.caplen = hdr->caplen; + hdr_win32.len = hdr->len; + callbacks->handler( cb, &hdr_win32, packet ); } static int CDECL wrap_dispatch( struct pcap *pcap, int count, - void (CALLBACK *callback)(unsigned char *, const void *, const unsigned char *), - unsigned char *user ) + void (CALLBACK *callback)(unsigned char *, const struct pcap_pkthdr_win32 *, + const unsigned char *), unsigned char *user ) { if (callback) { @@ -118,9 +127,15 @@ static int CDECL wrap_dispatch( struct pcap *pcap, int count, return pcap_dispatch( pcap->handle, count, NULL, user ); } -static void CDECL wrap_dump( unsigned char *user, const void *hdr, const unsigned char *packet ) +static void CDECL wrap_dump( unsigned char *user, const struct pcap_pkthdr_win32 *hdr, const unsigned char *packet ) { - return pcap_dump( user, hdr, packet ); + struct pcap_pkthdr hdr_unix; + + hdr_unix.ts.tv_sec = hdr->ts.tv_sec; + hdr_unix.ts.tv_usec = hdr->ts.tv_usec; + hdr_unix.caplen = hdr->caplen; + hdr_unix.len = hdr->len; + return pcap_dump( user, &hdr_unix, packet ); } static void * CDECL wrap_dump_open( struct pcap *pcap, const char *name ) @@ -193,8 +208,8 @@ static int CDECL wrap_lookupnet( const char *device, unsigned int *net, unsigned } static int CDECL wrap_loop( struct pcap *pcap, int count, - void (CALLBACK *callback)(unsigned char *, const void *, const unsigned char *), - unsigned char *user ) + void (CALLBACK *callback)(unsigned char *, const struct pcap_pkthdr_win32 *, + const unsigned char *), unsigned char *user ) { if (callback) { @@ -216,14 +231,37 @@ static int CDECL wrap_minor_version( struct pcap *pcap ) return pcap_minor_version( pcap->handle ); } -static const unsigned char * CDECL wrap_next( struct pcap *pcap, void *hdr ) +static const unsigned char * CDECL wrap_next( struct pcap *pcap, struct pcap_pkthdr_win32 *hdr ) { - return pcap_next( pcap->handle, hdr ); + struct pcap_pkthdr hdr_unix; + const unsigned char *ret; + + if ((ret = pcap_next( pcap->handle, &hdr_unix ))) + { + if (hdr_unix.ts.tv_sec > INT_MAX || hdr_unix.ts.tv_usec > INT_MAX) WARN( "truncating timeval values(s)\n" ); + hdr->ts.tv_sec = hdr_unix.ts.tv_sec; + hdr->ts.tv_usec = hdr_unix.ts.tv_usec; + hdr->caplen = hdr_unix.caplen; + hdr->len = hdr_unix.len; + } + return ret; } -static int CDECL wrap_next_ex( struct pcap *pcap, void **hdr, const unsigned char **data ) +static int CDECL wrap_next_ex( struct pcap *pcap, struct pcap_pkthdr_win32 **hdr, const unsigned char **data ) { - return pcap_next_ex( pcap->handle, (struct pcap_pkthdr **)hdr, data ); + struct pcap_pkthdr *hdr_unix; + int ret; + + if ((ret = pcap_next_ex( pcap->handle, &hdr_unix, data )) == 1) + { + if (hdr_unix->ts.tv_sec > INT_MAX || hdr_unix->ts.tv_usec > INT_MAX) WARN( "truncating timeval values(s)\n" ); + pcap->hdr.ts.tv_sec = hdr_unix->ts.tv_sec; + pcap->hdr.ts.tv_usec = hdr_unix->ts.tv_usec; + pcap->hdr.caplen = hdr_unix->caplen; + pcap->hdr.len = hdr_unix->len; + *hdr = &pcap->hdr; + } + return ret; } static struct pcap * CDECL wrap_open_live( const char *source, int snaplen, int promisc, int to_ms, char *errbuf ) diff --git a/dlls/wpcap/unixlib.h b/dlls/wpcap/unixlib.h index c5279f860fd..aa00bc33153 100644 --- a/dlls/wpcap/unixlib.h +++ b/dlls/wpcap/unixlib.h @@ -23,14 +23,26 @@ struct pcap_if_hdr char *name; }; +struct pcap_pkthdr_win32 +{ + struct + { + int tv_sec; + int tv_usec; + } ts; + unsigned int caplen; + unsigned int len; +}; + struct pcap { void *handle; + struct pcap_pkthdr_win32 hdr; }; struct handler_callback { - void (CALLBACK *callback)( unsigned char *, const void *, const unsigned char * ); + void (CALLBACK *callback)( unsigned char *, const struct pcap_pkthdr_win32 *, const unsigned char * ); void *user; }; @@ -47,9 +59,9 @@ struct pcap_funcs const char * (CDECL *datalink_val_to_description)( int ); const char * (CDECL *datalink_val_to_name)( int ); int (CDECL *dispatch)( struct pcap *, int, - void (CALLBACK *)(unsigned char *, const void *, const unsigned char *), + void (CALLBACK *)(unsigned char *, const struct pcap_pkthdr_win32 *, const unsigned char *), unsigned char * ); - void (CDECL *dump)( unsigned char *, const void *, const unsigned char * ); + void (CDECL *dump)( unsigned char *, const struct pcap_pkthdr_win32 *, const unsigned char * ); void * (CDECL *dump_open)( struct pcap *, const char * ); int (CDECL *findalldevs)( struct pcap_if_hdr **, char * ); void (CDECL *free_datalinks)( int * ); @@ -64,12 +76,12 @@ struct pcap_funcs int (CDECL *list_tstamp_types)( struct pcap *, int ** ); int (CDECL *lookupnet)( const char *, unsigned int *, unsigned int *, char * ); int (CDECL *loop)( struct pcap *, int, - void (CALLBACK *)(unsigned char *, const void *, const unsigned char *), + void (CALLBACK *)(unsigned char *, const struct pcap_pkthdr_win32 *, const unsigned char *), unsigned char * ); int (CDECL *major_version)( struct pcap * ); int (CDECL *minor_version)( struct pcap * ); - const unsigned char * (CDECL *next)( struct pcap *, void * ); - int (CDECL *next_ex)( struct pcap *, void **, const unsigned char ** ); + const unsigned char * (CDECL *next)( struct pcap *, struct pcap_pkthdr_win32 * ); + int (CDECL *next_ex)( struct pcap *, struct pcap_pkthdr_win32 **, const unsigned char ** ); struct pcap * (CDECL *open_live)( const char *, int, int, int, char * ); int (CDECL *sendpacket)( struct pcap *, const unsigned char *, int ); int (CDECL *set_buffer_size)( struct pcap *, int ); @@ -92,5 +104,5 @@ struct pcap_funcs struct pcap_callbacks { - void (CDECL *handler)( struct handler_callback *, const void *, const unsigned char * ); + void (CDECL *handler)( struct handler_callback *, const struct pcap_pkthdr_win32 *, const unsigned char * ); }; diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index a190634ac22..ffdb1a3e8d3 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -94,14 +94,14 @@ const char * CDECL pcap_datalink_val_to_name( int link ) } int CDECL pcap_dispatch( struct pcap *pcap, int count, - void (CALLBACK *callback)(unsigned char *, const void *, const unsigned char *), + void (CALLBACK *callback)(unsigned char *, const struct pcap_pkthdr_win32 *, const unsigned char *), unsigned char *user ) { TRACE( "%p, %d, %p, %p\n", pcap, count, callback, user ); return pcap_funcs->dispatch( pcap, count, callback, user ); } -void CDECL pcap_dump( unsigned char *user, const void *hdr, const unsigned char *packet ) +void CDECL pcap_dump( unsigned char *user, const struct pcap_pkthdr_win32 *hdr, const unsigned char *packet ) { TRACE( "%p, %p, %p\n", user, hdr, packet ); pcap_funcs->dump( user, hdr, packet ); @@ -249,7 +249,7 @@ int CDECL pcap_lookupnet( const char *device, unsigned int *net, unsigned int *m } int CDECL pcap_loop( struct pcap *pcap, int count, - void (CALLBACK *callback)(unsigned char *, const void *, const unsigned char *), + void (CALLBACK *callback)(unsigned char *, const struct pcap_pkthdr_win32 *, const unsigned char *), unsigned char *user) { TRACE( "%p, %d, %p, %p\n", pcap, count, callback, user ); @@ -268,13 +268,13 @@ int CDECL pcap_minor_version( struct pcap *pcap ) return pcap_funcs->minor_version( pcap ); } -const unsigned char * CDECL pcap_next( struct pcap *pcap, void *hdr ) +const unsigned char * CDECL pcap_next( struct pcap *pcap, struct pcap_pkthdr_win32 *hdr ) { TRACE( "%p, %p\n", pcap, hdr ); return pcap_funcs->next( pcap, hdr ); } -int CDECL pcap_next_ex( struct pcap *pcap, void **hdr, const unsigned char **data ) +int CDECL pcap_next_ex( struct pcap *pcap, struct pcap_pkthdr_win32 **hdr, const unsigned char **data ) { TRACE( "%p, %p, %p\n", pcap, hdr, data ); return pcap_funcs->next_ex( pcap, hdr, data ); @@ -450,7 +450,8 @@ int CDECL wsockinit( void ) return 0; } -static void CDECL pcap_handler_cb( struct handler_callback *cb, const void *hdr, const unsigned char *packet ) +static void CDECL pcap_handler_cb( struct handler_callback *cb, const struct pcap_pkthdr_win32 *hdr, + const unsigned char *packet ) { TRACE( "%p, %p, %p\n", cb, hdr, packet ); cb->callback( cb->user, hdr, packet ); -- 2.30.2

1 0

[PATCH 1/2] wpcap: Wrap native handles in a structure.
by Hans Leidekker Oct. 4, 2021

Oct. 4, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wpcap/unixlib.c | 150 +++++++++++++++++--------------- dlls/wpcap/unixlib.h | 73 +++++++++------- dlls/wpcap/wpcap.c | 200 +++++++++++++++++++++---------------------- 3 files changed, 222 insertions(+), 201 deletions(-) diff --git a/dlls/wpcap/unixlib.c b/dlls/wpcap/unixlib.c index f3eb06a2849..b48a5540edc 100644 --- a/dlls/wpcap/unixlib.c +++ b/dlls/wpcap/unixlib.c @@ -27,6 +27,7 @@ #include <pcap/pcap.h> #include <stdarg.h> +#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -40,39 +41,46 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static const struct pcap_callbacks *callbacks; -static int CDECL wrap_activate( void *handle ) +static int CDECL wrap_activate( struct pcap *pcap ) { - return pcap_activate( handle ); + return pcap_activate( pcap->handle ); } -static void CDECL wrap_breakloop( void *handle ) +static void CDECL wrap_breakloop( struct pcap *pcap ) { - return pcap_breakloop( handle ); + return pcap_breakloop( pcap->handle ); } -static int CDECL wrap_can_set_rfmon( void *handle ) +static int CDECL wrap_can_set_rfmon( struct pcap *pcap ) { - return pcap_can_set_rfmon( handle ); + return pcap_can_set_rfmon( pcap->handle ); } -static void CDECL wrap_close( void *handle ) +static void CDECL wrap_close( struct pcap *pcap ) { - pcap_close( handle ); + pcap_close( pcap->handle ); + free( pcap ); } -static int CDECL wrap_compile( void *handle, void *program, const char *buf, int optimize, unsigned int mask ) +static int CDECL wrap_compile( struct pcap *pcap, void *program, const char *buf, int optimize, unsigned int mask ) { - return pcap_compile( handle, program, buf, optimize, mask ); + return pcap_compile( pcap->handle, program, buf, optimize, mask ); } -static void * CDECL wrap_create( const char *src, char *errbuf ) +static struct pcap * CDECL wrap_create( const char *src, char *errbuf ) { - return pcap_create( src, errbuf ); + struct pcap *ret = malloc( sizeof(*ret) ); + if (ret && !(ret->handle = pcap_create( src, errbuf ))) + { + free( ret ); + return NULL; + } + return ret; } -static int CDECL wrap_datalink( void *handle ) +static int CDECL wrap_datalink( struct pcap *pcap ) { - return pcap_datalink( handle ); + return pcap_datalink( pcap->handle ); } static int CDECL wrap_datalink_name_to_val( const char *name ) @@ -96,7 +104,7 @@ static void wrap_pcap_handler( unsigned char *user, const struct pcap_pkthdr *hd callbacks->handler( cb, hdr, packet ); } -static int CDECL wrap_dispatch( void *handle, int count, +static int CDECL wrap_dispatch( struct pcap *pcap, int count, void (CALLBACK *callback)(unsigned char *, const void *, const unsigned char *), unsigned char *user ) { @@ -105,9 +113,9 @@ static int CDECL wrap_dispatch( void *handle, int count, struct handler_callback cb; cb.callback = callback; cb.user = user; - return pcap_dispatch( handle, count, wrap_pcap_handler, (unsigned char *)&cb ); + return pcap_dispatch( pcap->handle, count, wrap_pcap_handler, (unsigned char *)&cb ); } - return pcap_dispatch( handle, count, NULL, user ); + return pcap_dispatch( pcap->handle, count, NULL, user ); } static void CDECL wrap_dump( unsigned char *user, const void *hdr, const unsigned char *packet ) @@ -115,9 +123,9 @@ static void CDECL wrap_dump( unsigned char *user, const void *hdr, const unsigne return pcap_dump( user, hdr, packet ); } -static void * CDECL wrap_dump_open( void *handle, const char *name ) +static void * CDECL wrap_dump_open( struct pcap *pcap, const char *name ) { - return pcap_dump_open( handle, name ); + return pcap_dump_open( pcap->handle, name ); } static int CDECL wrap_findalldevs( struct pcap_if_hdr **devs, char *errbuf ) @@ -149,19 +157,19 @@ static void CDECL wrap_freecode( void *program ) return pcap_freecode( program ); } -static int CDECL wrap_get_tstamp_precision( void *handle ) +static int CDECL wrap_get_tstamp_precision( struct pcap *pcap ) { - return pcap_get_tstamp_precision( handle ); + return pcap_get_tstamp_precision( pcap->handle ); } -static char * CDECL wrap_geterr( void *handle ) +static char * CDECL wrap_geterr( struct pcap *pcap ) { - return pcap_geterr( handle ); + return pcap_geterr( pcap->handle ); } -static int CDECL wrap_getnonblock( void *handle, char *errbuf ) +static int CDECL wrap_getnonblock( struct pcap *pcap, char *errbuf ) { - return pcap_getnonblock( handle, errbuf ); + return pcap_getnonblock( pcap->handle, errbuf ); } static const char * CDECL wrap_lib_version( void ) @@ -169,14 +177,14 @@ static const char * CDECL wrap_lib_version( void ) return pcap_lib_version(); } -static int CDECL wrap_list_datalinks( void *handle, int **buf ) +static int CDECL wrap_list_datalinks( struct pcap *pcap, int **buf ) { - return pcap_list_datalinks( handle, buf ); + return pcap_list_datalinks( pcap->handle, buf ); } -static int CDECL wrap_list_tstamp_types( void *handle, int **types ) +static int CDECL wrap_list_tstamp_types( struct pcap *pcap, int **types ) { - return pcap_list_tstamp_types( handle, types ); + return pcap_list_tstamp_types( pcap->handle, types ); } static int CDECL wrap_lookupnet( const char *device, unsigned int *net, unsigned int *mask, char *errbuf ) @@ -184,7 +192,7 @@ static int CDECL wrap_lookupnet( const char *device, unsigned int *net, unsigned return pcap_lookupnet( device, net, mask, errbuf ); } -static int CDECL wrap_loop( void *handle, int count, +static int CDECL wrap_loop( struct pcap *pcap, int count, void (CALLBACK *callback)(unsigned char *, const void *, const unsigned char *), unsigned char *user ) { @@ -193,99 +201,105 @@ static int CDECL wrap_loop( void *handle, int count, struct handler_callback cb; cb.callback = callback; cb.user = user; - return pcap_loop( handle, count, wrap_pcap_handler, (unsigned char *)&cb ); + return pcap_loop( pcap->handle, count, wrap_pcap_handler, (unsigned char *)&cb ); } - return pcap_loop( handle, count, NULL, user ); + return pcap_loop( pcap->handle, count, NULL, user ); } -static int CDECL wrap_major_version( void *handle ) +static int CDECL wrap_major_version( struct pcap *pcap ) { - return pcap_major_version( handle ); + return pcap_major_version( pcap->handle ); } -static int CDECL wrap_minor_version( void *handle ) +static int CDECL wrap_minor_version( struct pcap *pcap ) { - return pcap_minor_version( handle ); + return pcap_minor_version( pcap->handle ); } -static const unsigned char * CDECL wrap_next( void *handle, void *hdr ) +static const unsigned char * CDECL wrap_next( struct pcap *pcap, void *hdr ) { - return pcap_next( handle, hdr ); + return pcap_next( pcap->handle, hdr ); } -static int CDECL wrap_next_ex( void *handle, void **hdr, const unsigned char **data ) +static int CDECL wrap_next_ex( struct pcap *pcap, void **hdr, const unsigned char **data ) { - return pcap_next_ex( handle, (struct pcap_pkthdr **)hdr, data ); + return pcap_next_ex( pcap->handle, (struct pcap_pkthdr **)hdr, data ); } -static void * CDECL wrap_open_live( const char *source, int snaplen, int promisc, int to_ms, char *errbuf ) +static struct pcap * CDECL wrap_open_live( const char *source, int snaplen, int promisc, int to_ms, char *errbuf ) { - return pcap_open_live( source, snaplen, promisc, to_ms, errbuf ); + struct pcap *ret = malloc( sizeof(*ret) ); + if (ret && !(ret->handle = pcap_open_live( source, snaplen, promisc, to_ms, errbuf ))) + { + free( ret ); + return NULL; + } + return ret; } -static int CDECL wrap_sendpacket( void *handle, const unsigned char *buf, int size ) +static int CDECL wrap_sendpacket( struct pcap *pcap, const unsigned char *buf, int size ) { - return pcap_sendpacket( handle, buf, size ); + return pcap_sendpacket( pcap->handle, buf, size ); } -static int CDECL wrap_set_buffer_size( void *handle, int size ) +static int CDECL wrap_set_buffer_size( struct pcap *pcap, int size ) { - return pcap_set_buffer_size( handle, size ); + return pcap_set_buffer_size( pcap->handle, size ); } -static int CDECL wrap_set_datalink( void *handle, int link ) +static int CDECL wrap_set_datalink( struct pcap *pcap, int link ) { - return pcap_set_datalink( handle, link ); + return pcap_set_datalink( pcap->handle, link ); } -static int CDECL wrap_set_promisc( void *handle, int enable ) +static int CDECL wrap_set_promisc( struct pcap *pcap, int enable ) { - return pcap_set_promisc( handle, enable ); + return pcap_set_promisc( pcap->handle, enable ); } -static int CDECL wrap_set_rfmon( void *handle, int enable ) +static int CDECL wrap_set_rfmon( struct pcap *pcap, int enable ) { - return pcap_set_rfmon( handle, enable ); + return pcap_set_rfmon( pcap->handle, enable ); } -static int CDECL wrap_set_snaplen( void *handle, int len ) +static int CDECL wrap_set_snaplen( struct pcap *pcap, int len ) { - return pcap_set_snaplen( handle, len ); + return pcap_set_snaplen( pcap->handle, len ); } -static int CDECL wrap_set_timeout( void *handle, int timeout ) +static int CDECL wrap_set_timeout( struct pcap *pcap, int timeout ) { - return pcap_set_timeout( handle, timeout ); + return pcap_set_timeout( pcap->handle, timeout ); } -static int CDECL wrap_set_tstamp_precision( void *handle, int precision ) +static int CDECL wrap_set_tstamp_precision( struct pcap *pcap, int precision ) { - return pcap_set_tstamp_precision( handle, precision ); + return pcap_set_tstamp_precision( pcap->handle, precision ); } -static int CDECL wrap_set_tstamp_type( void *handle, int type ) +static int CDECL wrap_set_tstamp_type( struct pcap *pcap, int type ) { - return pcap_set_tstamp_type( handle, type ); + return pcap_set_tstamp_type( pcap->handle, type ); } -static int CDECL wrap_setfilter( void *handle, void *program ) +static int CDECL wrap_setfilter( struct pcap *pcap, void *program ) { - return pcap_setfilter( handle, program ); + return pcap_setfilter( pcap->handle, program ); } -static int CDECL wrap_setnonblock( void *handle, int nonblock, char *errbuf ) +static int CDECL wrap_setnonblock( struct pcap *pcap, int nonblock, char *errbuf ) { - return pcap_setnonblock( handle, nonblock, errbuf ); + return pcap_setnonblock( pcap->handle, nonblock, errbuf ); } -static int CDECL wrap_snapshot( void *handle ) +static int CDECL wrap_snapshot( struct pcap *pcap ) { - return pcap_snapshot( handle ); + return pcap_snapshot( pcap->handle ); } -static int CDECL wrap_stats( void *handle, void *stats ) +static int CDECL wrap_stats( struct pcap *pcap, void *stats ) { - return pcap_stats( handle, stats ); + return pcap_stats( pcap->handle, stats ); } static const char * CDECL wrap_statustostr( int status ) diff --git a/dlls/wpcap/unixlib.h b/dlls/wpcap/unixlib.h index 71ee298e689..c5279f860fd 100644 --- a/dlls/wpcap/unixlib.h +++ b/dlls/wpcap/unixlib.h @@ -23,6 +23,11 @@ struct pcap_if_hdr char *name; }; +struct pcap +{ + void *handle; +}; + struct handler_callback { void (CALLBACK *callback)( unsigned char *, const void *, const unsigned char * ); @@ -31,52 +36,54 @@ struct handler_callback struct pcap_funcs { - int (CDECL *activate)( void * ); - void (CDECL *breakloop)( void * ); - int (CDECL *can_set_rfmon)( void * ); - void (CDECL *close)( void * ); - int (CDECL *compile)( void *, void *, const char *, int, unsigned int ); - void * (CDECL *create)( const char *, char * ); - int (CDECL *datalink)( void * ); + int (CDECL *activate)( struct pcap * ); + void (CDECL *breakloop)( struct pcap * ); + int (CDECL *can_set_rfmon)( struct pcap * ); + void (CDECL *close)( struct pcap * ); + int (CDECL *compile)( struct pcap *, void *, const char *, int, unsigned int ); + struct pcap * (CDECL *create)( const char *, char * ); + int (CDECL *datalink)( struct pcap * ); int (CDECL *datalink_name_to_val)( const char * ); const char * (CDECL *datalink_val_to_description)( int ); const char * (CDECL *datalink_val_to_name)( int ); - int (CDECL *dispatch)( void *, int, void (CALLBACK *)(unsigned char *, const void *, const unsigned char *), + int (CDECL *dispatch)( struct pcap *, int, + void (CALLBACK *)(unsigned char *, const void *, const unsigned char *), unsigned char * ); void (CDECL *dump)( unsigned char *, const void *, const unsigned char * ); - void * (CDECL *dump_open)( void *, const char * ); + void * (CDECL *dump_open)( struct pcap *, const char * ); int (CDECL *findalldevs)( struct pcap_if_hdr **, char * ); void (CDECL *free_datalinks)( int * ); void (CDECL *free_tstamp_types)( int * ); void (CDECL *freealldevs)( struct pcap_if_hdr * ); void (CDECL *freecode)( void * ); - int (CDECL *get_tstamp_precision)( void * ); - char * (CDECL *geterr)( void * ); - int (CDECL *getnonblock)( void *, char * ); + int (CDECL *get_tstamp_precision)( struct pcap * ); + char * (CDECL *geterr)( struct pcap * ); + int (CDECL *getnonblock)( struct pcap *, char * ); const char * (CDECL *lib_version)( void ); - int (CDECL *list_datalinks)( void *, int ** ); - int (CDECL *list_tstamp_types)( void *, int ** ); + int (CDECL *list_datalinks)( struct pcap *, int ** ); + int (CDECL *list_tstamp_types)( struct pcap *, int ** ); int (CDECL *lookupnet)( const char *, unsigned int *, unsigned int *, char * ); - int (CDECL *loop)( void *, int, void (CALLBACK *)(unsigned char *, const void *, const unsigned char *), + int (CDECL *loop)( struct pcap *, int, + void (CALLBACK *)(unsigned char *, const void *, const unsigned char *), unsigned char * ); - int (CDECL *major_version)( void * ); - int (CDECL *minor_version)( void * ); - const unsigned char * (CDECL *next)( void *, void * ); - int (CDECL *next_ex)( void *, void **, const unsigned char ** ); - void * (CDECL *open_live)( const char *, int, int, int, char * ); - int (CDECL *sendpacket)( void *, const unsigned char *, int ); - int (CDECL *set_buffer_size)( void *, int ); - int (CDECL *set_datalink)( void *, int ); - int (CDECL *set_promisc)( void *, int ); - int (CDECL *set_rfmon)( void *, int ); - int (CDECL *set_snaplen)( void *, int ); - int (CDECL *set_timeout)( void *, int ); - int (CDECL *set_tstamp_precision)( void *, int ); - int (CDECL *set_tstamp_type)( void *, int ); - int (CDECL *setfilter)( void *, void * ); - int (CDECL *setnonblock)( void *, int, char * ); - int (CDECL *snapshot)( void * ); - int (CDECL *stats)( void *, void * ); + int (CDECL *major_version)( struct pcap * ); + int (CDECL *minor_version)( struct pcap * ); + const unsigned char * (CDECL *next)( struct pcap *, void * ); + int (CDECL *next_ex)( struct pcap *, void **, const unsigned char ** ); + struct pcap * (CDECL *open_live)( const char *, int, int, int, char * ); + int (CDECL *sendpacket)( struct pcap *, const unsigned char *, int ); + int (CDECL *set_buffer_size)( struct pcap *, int ); + int (CDECL *set_datalink)( struct pcap *, int ); + int (CDECL *set_promisc)( struct pcap *, int ); + int (CDECL *set_rfmon)( struct pcap *, int ); + int (CDECL *set_snaplen)( struct pcap *, int ); + int (CDECL *set_timeout)( struct pcap *, int ); + int (CDECL *set_tstamp_precision)( struct pcap *, int ); + int (CDECL *set_tstamp_type)( struct pcap *, int ); + int (CDECL *setfilter)( struct pcap *, void * ); + int (CDECL *setnonblock)( struct pcap *, int, char * ); + int (CDECL *snapshot)( struct pcap * ); + int (CDECL *stats)( struct pcap *, void * ); const char * (CDECL *statustostr)( int ); int (CDECL *tstamp_type_name_to_val)( const char * ); const char * (CDECL *tstamp_type_val_to_description)( int ); diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 009a51c5a2b..a190634ac22 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -33,46 +33,46 @@ WINE_DEFAULT_DEBUG_CHANNEL(wpcap); const struct pcap_funcs *pcap_funcs = NULL; -int CDECL pcap_activate( void *handle ) +int CDECL pcap_activate( struct pcap *pcap ) { - TRACE( "%p\n", handle ); - return pcap_funcs->activate( handle ); + TRACE( "%p\n", pcap ); + return pcap_funcs->activate( pcap ); } -void CDECL pcap_breakloop( void *handle ) +void CDECL pcap_breakloop( struct pcap *pcap ) { - TRACE( "%p\n", handle ); - pcap_funcs->breakloop( handle ); + TRACE( "%p\n", pcap ); + pcap_funcs->breakloop( pcap ); } -int CDECL pcap_can_set_rfmon( void *handle ) +int CDECL pcap_can_set_rfmon( struct pcap *pcap ) { - TRACE( "%p\n", handle ); - return pcap_funcs->can_set_rfmon( handle ); + TRACE( "%p\n", pcap ); + return pcap_funcs->can_set_rfmon( pcap ); } -void CDECL pcap_close( void *handle ) +void CDECL pcap_close( struct pcap *pcap ) { - TRACE( "%p\n", handle ); - pcap_funcs->close( handle ); + TRACE( "%p\n", pcap ); + pcap_funcs->close( pcap ); } -int CDECL pcap_compile( void *handle, void *program, const char *buf, int optimize, unsigned int mask ) +int CDECL pcap_compile( struct pcap *pcap, void *program, const char *buf, int optimize, unsigned int mask ) { - TRACE( "%p, %p, %s, %d, %u\n", handle, program, debugstr_a(buf), optimize, mask ); - return pcap_funcs->compile( handle, program, buf, optimize, mask ); + TRACE( "%p, %p, %s, %d, %u\n", pcap, program, debugstr_a(buf), optimize, mask ); + return pcap_funcs->compile( pcap, program, buf, optimize, mask ); } -void * CDECL pcap_create( const char *src, char *errbuf ) +struct pcap * CDECL pcap_create( const char *src, char *errbuf ) { TRACE( "%s, %p\n", src, errbuf ); return pcap_funcs->create( src, errbuf ); } -int CDECL pcap_datalink( void *handle ) +int CDECL pcap_datalink( struct pcap *pcap ) { - TRACE( "%p\n", handle ); - return pcap_funcs->datalink( handle ); + TRACE( "%p\n", pcap ); + return pcap_funcs->datalink( pcap ); } int CDECL pcap_datalink_name_to_val( const char *name ) @@ -93,12 +93,12 @@ const char * CDECL pcap_datalink_val_to_name( int link ) return pcap_funcs->datalink_val_to_name( link ); } -int CDECL pcap_dispatch( void *handle, int count, +int CDECL pcap_dispatch( struct pcap *pcap, int count, void (CALLBACK *callback)(unsigned char *, const void *, const unsigned char *), unsigned char *user ) { - TRACE( "%p, %d, %p, %p\n", handle, count, callback, user ); - return pcap_funcs->dispatch( handle, count, callback, user ); + TRACE( "%p, %d, %p, %p\n", pcap, count, callback, user ); + return pcap_funcs->dispatch( pcap, count, callback, user ); } void CDECL pcap_dump( unsigned char *user, const void *hdr, const unsigned char *packet ) @@ -118,13 +118,13 @@ static inline WCHAR *strdupAW( const char *str ) return ret; } -void * CDECL pcap_dump_open( void *handle, const char *filename ) +void * CDECL pcap_dump_open( struct pcap *pcap, const char *filename ) { void *dumper; WCHAR *filenameW; char *unix_path; - TRACE( "%p, %s\n", handle, debugstr_a(filename) ); + TRACE( "%p, %s\n", pcap, debugstr_a(filename) ); if (!(filenameW = strdupAW( filename ))) return NULL; unix_path = wine_get_unix_file_name( filenameW ); @@ -133,7 +133,7 @@ void * CDECL pcap_dump_open( void *handle, const char *filename ) TRACE( "unix_path %s\n", debugstr_a(unix_path) ); - dumper = pcap_funcs->dump_open( handle, unix_path ); + dumper = pcap_funcs->dump_open( pcap, unix_path ); RtlFreeHeap( GetProcessHeap(), 0, unix_path ); return dumper; } @@ -174,28 +174,28 @@ void CDECL pcap_freecode( void *program ) pcap_funcs->freecode( program ); } -void * CDECL pcap_get_airpcap_handle( void *handle ) +void * CDECL pcap_get_airpcap_handle( struct pcap *pcap ) { - TRACE( "%p\n", handle ); + TRACE( "%p\n", pcap ); return NULL; } -int CDECL pcap_get_tstamp_precision( void *handle ) +int CDECL pcap_get_tstamp_precision( struct pcap *pcap ) { - TRACE( "%p\n", handle ); - return pcap_funcs->get_tstamp_precision( handle ); + TRACE( "%p\n", pcap ); + return pcap_funcs->get_tstamp_precision( pcap ); } -char * CDECL pcap_geterr( void *handle ) +char * CDECL pcap_geterr( struct pcap *pcap ) { - TRACE( "%p\n", handle ); - return pcap_funcs->geterr( handle ); + TRACE( "%p\n", pcap ); + return pcap_funcs->geterr( pcap ); } -int CDECL pcap_getnonblock( void *handle, char *errbuf ) +int CDECL pcap_getnonblock( struct pcap *pcap, char *errbuf ) { - TRACE( "%p, %p\n", handle, errbuf ); - return pcap_funcs->getnonblock( handle, errbuf ); + TRACE( "%p, %p\n", pcap, errbuf ); + return pcap_funcs->getnonblock( pcap, errbuf ); } static char lib_version[256]; @@ -214,16 +214,16 @@ const char * CDECL pcap_lib_version( void ) return lib_version; } -int CDECL pcap_list_datalinks( void *handle, int **buf ) +int CDECL pcap_list_datalinks( struct pcap *pcap, int **buf ) { - TRACE( "%p, %p\n", handle, buf ); - return pcap_funcs->list_datalinks( handle, buf ); + TRACE( "%p, %p\n", pcap, buf ); + return pcap_funcs->list_datalinks( pcap, buf ); } -int CDECL pcap_list_tstamp_types( void *handle, int **types ) +int CDECL pcap_list_tstamp_types( struct pcap *pcap, int **types ) { - TRACE( "%p, %p\n", handle, types ); - return pcap_funcs->list_tstamp_types( handle, types ); + TRACE( "%p, %p\n", pcap, types ); + return pcap_funcs->list_tstamp_types( pcap, types ); } char * CDECL pcap_lookupdev( char *errbuf ) @@ -248,46 +248,46 @@ int CDECL pcap_lookupnet( const char *device, unsigned int *net, unsigned int *m return pcap_funcs->lookupnet( device, net, mask, errbuf ); } -int CDECL pcap_loop( void *handle, int count, +int CDECL pcap_loop( struct pcap *pcap, int count, void (CALLBACK *callback)(unsigned char *, const void *, const unsigned char *), unsigned char *user) { - TRACE( "%p, %d, %p, %p\n", handle, count, callback, user ); - return pcap_funcs->loop( handle, count, callback, user ); + TRACE( "%p, %d, %p, %p\n", pcap, count, callback, user ); + return pcap_funcs->loop( pcap, count, callback, user ); } -int CDECL pcap_major_version( void *handle ) +int CDECL pcap_major_version( struct pcap *pcap ) { - TRACE( "%p\n", handle ); - return pcap_funcs->major_version( handle ); + TRACE( "%p\n", pcap ); + return pcap_funcs->major_version( pcap ); } -int CDECL pcap_minor_version( void *handle ) +int CDECL pcap_minor_version( struct pcap *pcap ) { - TRACE( "%p\n", handle ); - return pcap_funcs->minor_version( handle ); + TRACE( "%p\n", pcap ); + return pcap_funcs->minor_version( pcap ); } -const unsigned char * CDECL pcap_next( void *handle, void *hdr ) +const unsigned char * CDECL pcap_next( struct pcap *pcap, void *hdr ) { - TRACE( "%p, %p\n", handle, hdr ); - return pcap_funcs->next( handle, hdr ); + TRACE( "%p, %p\n", pcap, hdr ); + return pcap_funcs->next( pcap, hdr ); } -int CDECL pcap_next_ex( void *handle, void **hdr, const unsigned char **data ) +int CDECL pcap_next_ex( struct pcap *pcap, void **hdr, const unsigned char **data ) { - TRACE( "%p, %p, %p\n", handle, hdr, data ); - return pcap_funcs->next_ex( handle, hdr, data ); + TRACE( "%p, %p, %p\n", pcap, hdr, data ); + return pcap_funcs->next_ex( pcap, hdr, data ); } #define PCAP_OPENFLAG_PROMISCUOUS 1 -void * CDECL pcap_open( const char *source, int snaplen, int flags, int timeout, void *auth, char *errbuf ) +struct pcap * CDECL pcap_open( const char *source, int snaplen, int flags, int timeout, void *auth, char *errbuf ) { FIXME( "%s, %d, %d, %d, %p, %p: partial stub\n", debugstr_a(source), snaplen, flags, timeout, auth, errbuf ); return pcap_funcs->open_live( source, snaplen, flags & PCAP_OPENFLAG_PROMISCUOUS, timeout, errbuf ); } -void * CDECL pcap_open_live( const char *source, int snaplen, int promisc, int to_ms, char *errbuf ) +struct pcap * CDECL pcap_open_live( const char *source, int snaplen, int promisc, int to_ms, char *errbuf ) { TRACE( "%s, %d, %d, %d, %p\n", debugstr_a(source), snaplen, promisc, to_ms, errbuf ); return pcap_funcs->open_live( source, snaplen, promisc, to_ms, errbuf ); @@ -334,88 +334,88 @@ int CDECL pcap_parsesrcstr( const char *source, int *type, char *host, char *por return 0; } -int CDECL pcap_sendpacket( void *handle, const unsigned char *buf, int size ) +int CDECL pcap_sendpacket( struct pcap *pcap, const unsigned char *buf, int size ) { - TRACE( "%p, %p, %d\n", handle, buf, size ); - return pcap_funcs->sendpacket( handle, buf, size ); + TRACE( "%p, %p, %d\n", pcap, buf, size ); + return pcap_funcs->sendpacket( pcap, buf, size ); } -int CDECL pcap_set_buffer_size( void *handle, int size ) +int CDECL pcap_set_buffer_size( struct pcap *pcap, int size ) { - TRACE( "%p, %d\n", handle, size ); - return pcap_funcs->set_buffer_size( handle, size ); + TRACE( "%p, %d\n", pcap, size ); + return pcap_funcs->set_buffer_size( pcap, size ); } -int CDECL pcap_set_datalink( void *handle, int link ) +int CDECL pcap_set_datalink( struct pcap *pcap, int link ) { - TRACE( "%p, %d\n", handle, link ); - return pcap_funcs->set_datalink( handle, link ); + TRACE( "%p, %d\n", pcap, link ); + return pcap_funcs->set_datalink( pcap, link ); } -int CDECL pcap_set_promisc( void *handle, int enable ) +int CDECL pcap_set_promisc( struct pcap *pcap, int enable ) { - TRACE( "%p, %d\n", handle, enable ); - return pcap_funcs->set_promisc( handle, enable ); + TRACE( "%p, %d\n", pcap, enable ); + return pcap_funcs->set_promisc( pcap, enable ); } -int CDECL pcap_set_rfmon( void *handle, int enable ) +int CDECL pcap_set_rfmon( struct pcap *pcap, int enable ) { - TRACE( "%p, %d\n", handle, enable ); - return pcap_funcs->set_rfmon( handle, enable ); + TRACE( "%p, %d\n", pcap, enable ); + return pcap_funcs->set_rfmon( pcap, enable ); } -int CDECL pcap_set_snaplen( void *handle, int len ) +int CDECL pcap_set_snaplen( struct pcap *pcap, int len ) { - TRACE( "%p, %d\n", handle, len ); - return pcap_funcs->set_snaplen( handle, len ); + TRACE( "%p, %d\n", pcap, len ); + return pcap_funcs->set_snaplen( pcap, len ); } -int CDECL pcap_set_timeout( void *handle, int timeout ) +int CDECL pcap_set_timeout( struct pcap *pcap, int timeout ) { - TRACE( "%p, %d\n", handle, timeout ); - return pcap_funcs->set_timeout( handle, timeout ); + TRACE( "%p, %d\n", pcap, timeout ); + return pcap_funcs->set_timeout( pcap, timeout ); } -int CDECL pcap_set_tstamp_precision( void *handle, int precision ) +int CDECL pcap_set_tstamp_precision( struct pcap *pcap, int precision ) { - TRACE( "%p, %d\n", handle, precision ); - return pcap_funcs->set_tstamp_precision( handle, precision ); + TRACE( "%p, %d\n", pcap, precision ); + return pcap_funcs->set_tstamp_precision( pcap, precision ); } -int CDECL pcap_set_tstamp_type( void *handle, int type ) +int CDECL pcap_set_tstamp_type( struct pcap *pcap, int type ) { - TRACE( "%p, %d\n", handle, type ); - return pcap_funcs->set_tstamp_type( handle, type ); + TRACE( "%p, %d\n", pcap, type ); + return pcap_funcs->set_tstamp_type( pcap, type ); } -int CDECL pcap_setbuff( void *handle, int size ) +int CDECL pcap_setbuff( struct pcap *pcap, int size ) { - FIXME( "%p, %d\n", handle, size ); + FIXME( "%p, %d\n", pcap, size ); return 0; } -int CDECL pcap_setfilter( void *handle, void *program ) +int CDECL pcap_setfilter( struct pcap *pcap, void *program ) { - TRACE( "%p, %p\n", handle, program ); - return pcap_funcs->setfilter( handle, program ); + TRACE( "%p, %p\n", pcap, program ); + return pcap_funcs->setfilter( pcap, program ); } -int CDECL pcap_setnonblock( void *handle, int nonblock, char *errbuf ) +int CDECL pcap_setnonblock( struct pcap *pcap, int nonblock, char *errbuf ) { - TRACE( "%p, %d, %p\n", handle, nonblock, errbuf ); - return pcap_funcs->setnonblock( handle, nonblock, errbuf ); + TRACE( "%p, %d, %p\n", pcap, nonblock, errbuf ); + return pcap_funcs->setnonblock( pcap, nonblock, errbuf ); } -int CDECL pcap_snapshot( void *handle ) +int CDECL pcap_snapshot( struct pcap *pcap ) { - TRACE( "%p\n", handle ); - return pcap_funcs->snapshot( handle ); + TRACE( "%p\n", pcap ); + return pcap_funcs->snapshot( pcap ); } -int CDECL pcap_stats( void *handle, void *stats ) +int CDECL pcap_stats( struct pcap *pcap, void *stats ) { - TRACE( "%p, %p\n", handle, stats ); - return pcap_funcs->stats( handle, stats ); + TRACE( "%p, %p\n", pcap, stats ); + return pcap_funcs->stats( pcap, stats ); } const char * CDECL pcap_statustostr( int status ) -- 2.30.2

1 0

[PATCH 7/8] gdi32: Avoid using RtlOpenCurrentUser.
by Jacek Caban Oct. 4, 2021

Oct. 4, 2021

Based on open_hkcu_key. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)

1 0

[PATCH 5/8] gdi32: Use win32u_wcsicmp instead of RtlCompareUnicodeStrings.
by Jacek Caban Oct. 4, 2021

Oct. 4, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/freetype.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)

1 0

[PATCH 4/8] gdi32: Use pthread mutex in dib driver.
by Jacek Caban Oct. 4, 2021

Oct. 4, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dibdrv/graphics.c | 16 +++++----------- dlls/gdi32/win32u_private.h | 3 --- 2 files changed, 5 insertions(+), 14 deletions(-)

1 0