wine-devel April 2022

wine-devel@winehq.org

87 participants
938 discussions

[PATCH v2 4/6] winex11: Return selection data as a single buffer from import_xdnd_selection.
by Huw Davies 27 Apr '22

27 Apr '22

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/winex11.drv/clipboard.c | 29 +++++++++++++++++------------ dlls/winex11.drv/x11drv.h | 14 +++++++++++--- dlls/winex11.drv/xdnd.c | 26 ++++++++++++++++++++++++-- 3 files changed, 52 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index ec69778fc3c..92284d436dd 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1096,21 +1096,21 @@ static void *import_selection( Display *display, Window win, Atom selection, /************************************************************************** - * X11DRV_CLIPBOARD_ImportSelection + * import_xdnd_selection * * Import the X selection into the clipboard format registered for the given X target. */ -void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom selection, - Atom *targets, UINT count, - void (*callback)( UINT, HANDLE )) +struct format_entry *import_xdnd_selection( Display *display, Window win, Atom selection, + Atom *targets, UINT count, size_t *ret_size ) { + size_t size, buf_size = 0, entry_size; UINT i; - HANDLE handle; void *data; - size_t size; struct clipboard_format *format; + struct format_entry *ret = NULL, *entry; register_x11_formats( targets, count ); + *ret_size = 0; for (i = 0; i < count; i++) { @@ -1118,16 +1118,21 @@ void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom select if (!format->id) continue; if (!(data = import_selection( display, win, selection, format, &size ))) continue; - if ((handle = GlobalAlloc( GMEM_FIXED, size ))) + entry_size = (FIELD_OFFSET( struct format_entry, data[size] ) + 7) & ~7; + if (buf_size < size + entry_size) { - void *ptr; - ptr = GlobalLock( handle ); - memcpy( ptr, data, size ); - GlobalUnlock( handle ); - callback( format->id, handle ); + if (!(ret = realloc( ret, *ret_size + entry_size + 1024 ))) continue; + buf_size = *ret_size + entry_size + 1024; /* extra space for following entries */ } + entry = (struct format_entry *)((char *)ret + *ret_size); + entry->format = format->id; + entry->size = size; + if (size) memcpy( entry->data, data, size ); + *ret_size += entry_size; free( data ); } + + return ret; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a8d2f78aa6b..f6d28122fc3 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -297,9 +297,17 @@ extern void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) DECL extern void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; extern void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; extern void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; -extern void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom selection, - Atom *targets, UINT count, - void (*callback)( UINT, HANDLE )) DECLSPEC_HIDDEN; + +struct format_entry +{ + UINT format; + UINT size; + char data[1]; +}; + +extern struct format_entry *import_xdnd_selection( Display *display, Window win, Atom selection, + Atom *targets, UINT count, + size_t *size ) DECLSPEC_HIDDEN; /************************************************************************** * X11 GDI driver diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index b9bba1ff872..aa46467f6f7 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -79,6 +79,12 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION xdnd_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +static struct format_entry *next_format( struct format_entry *entry ) +{ + return (struct format_entry *)&entry->data[(entry->size + 7) & ~7]; +} + + /* Based on functions in dlls/ole32/ole2.c */ static HANDLE get_droptarget_local_handle(HWND hwnd) { @@ -523,15 +529,31 @@ void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count) { + struct format_entry *formats, *formats_end, *iter; XDNDDATA *current, *next; BOOL haveHDROP = FALSE; + size_t size; TRACE("count(%ld)\n", count); X11DRV_XDND_FreeDragDropOp(); /* Clear previously cached data */ - X11DRV_CLIPBOARD_ImportSelection( display, xwin, x11drv_atom(XdndSelection), - types, count, X11DRV_XDND_InsertXDNDData ); + formats = import_xdnd_selection( display, xwin, x11drv_atom(XdndSelection), types, count, &size ); + if (formats) + { + formats_end = (struct format_entry *)((char *)formats + size); + for (iter = formats; iter < formats_end; iter = next_format( iter )) + { + HANDLE handle; + if ((handle = GlobalAlloc( GMEM_FIXED, iter->size ))) + { + void *ptr = GlobalLock( handle ); + memcpy( ptr, iter->data, iter->size ); + GlobalUnlock( handle ); + X11DRV_XDND_InsertXDNDData( iter->format, handle ); + } + } + } /* On Windows when there is a CF_HDROP, there are no other CF_ formats. * foobar2000 relies on this (spaces -> %20's without it). -- 2.25.1

1 0

[PATCH v2 3/6] winex11: Directly use ntdll in clipboard.c.
by Huw Davies 27 Apr '22

27 Apr '22

1 0

[PATCH v2 2/6] winex11: Directly use win32u in import_image_bmp.
by Huw Davies 27 Apr '22

27 Apr '22

1 0

[PATCH v2 1/6] winex11: Use NtUserSetClipboardData to import clipboard data.
by Huw Davies 27 Apr '22

27 Apr '22

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/winex11.drv/clipboard.c | 192 ++++++++++++++++++----------------- 1 file changed, 100 insertions(+), 92 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index a0ccc3ebc96..7640308fadd 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -98,7 +98,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(clipboard); #define SELECTION_UPDATE_DELAY 2000 /* delay between checks of the X11 selection */ typedef BOOL (*EXPORTFUNC)( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); -typedef HANDLE (*IMPORTFUNC)( Atom type, const void *data, size_t size ); +typedef void *(*IMPORTFUNC)( Atom type, const void *data, size_t size, size_t *ret_size ); struct clipboard_format { @@ -109,17 +109,16 @@ struct clipboard_format EXPORTFUNC export; }; -static HANDLE import_data( Atom type, const void *data, size_t size ); -static HANDLE import_enhmetafile( Atom type, const void *data, size_t size ); -static HANDLE import_pixmap( Atom type, const void *data, size_t size ); -static HANDLE import_image_bmp( Atom type, const void *data, size_t size ); -static HANDLE import_string( Atom type, const void *data, size_t size ); -static HANDLE import_utf8_string( Atom type, const void *data, size_t size ); -static HANDLE import_compound_text( Atom type, const void *data, size_t size ); -static HANDLE import_text( Atom type, const void *data, size_t size ); -static HANDLE import_text_html( Atom type, const void *data, size_t size ); -static HANDLE import_text_uri_list( Atom type, const void *data, size_t size ); -static HANDLE import_targets( Atom type, const void *data, size_t size ); +static void *import_data( Atom type, const void *data, size_t size, size_t *ret_size ); +static void *import_pixmap( Atom type, const void *data, size_t size, size_t *ret_size ); +static void *import_image_bmp( Atom type, const void *data, size_t size, size_t *ret_size ); +static void *import_string( Atom type, const void *data, size_t size, size_t *ret_size ); +static void *import_utf8_string( Atom type, const void *data, size_t size, size_t *ret_size ); +static void *import_compound_text( Atom type, const void *data, size_t size, size_t *ret_size ); +static void *import_text( Atom type, const void *data, size_t size, size_t *ret_size ); +static void *import_text_html( Atom type, const void *data, size_t size, size_t *ret_size ); +static void *import_text_uri_list( Atom type, const void *data, size_t size, size_t *ret_size ); +static void *import_targets( Atom type, const void *data, size_t size, size_t *ret_size ); static BOOL export_data( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); static BOOL export_string( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); @@ -135,7 +134,7 @@ static BOOL export_multiple( Display *display, Window win, Atom prop, Atom targe static BOOL export_timestamp( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); static BOOL read_property( Display *display, Window w, Atom prop, - Atom *type, unsigned char **data, unsigned long *datasize ); + Atom *type, unsigned char **data, size_t *datasize ); /* Clipboard formats */ @@ -166,7 +165,7 @@ static const struct { 0, CF_PENDATA, XATOM_WCF_PENDATA, import_data, export_data }, { 0, CF_RIFF, XATOM_WCF_RIFF, import_data, export_data }, { 0, CF_WAVE, XATOM_WCF_WAVE, import_data, export_data }, - { 0, CF_ENHMETAFILE, XATOM_WCF_ENHMETAFILE, import_enhmetafile, export_data }, + { 0, CF_ENHMETAFILE, XATOM_WCF_ENHMETAFILE, import_data, export_data }, { 0, CF_HDROP, XATOM_text_uri_list, import_text_uri_list, export_hdrop }, { 0, CF_DIB, XATOM_image_bmp, import_image_bmp, export_image_bmp }, { RichTextFormatW, 0, XATOM_text_rtf, import_data, export_data }, @@ -442,13 +441,12 @@ static void selection_sleep(void) NtDelayExecution( FALSE, &timeout ); } - /************************************************************************** * convert_selection */ static BOOL convert_selection( Display *display, Window win, Atom selection, struct clipboard_format *format, Atom *type, - unsigned char **data, unsigned long *size ) + unsigned char **data, size_t *size ) { int i; XEvent event; @@ -504,15 +502,14 @@ static int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) * * Allocates a packed DIB and copies the bitmap data into it. */ -static HGLOBAL create_dib_from_bitmap(HBITMAP hBmp) +static void *create_dib_from_bitmap( HBITMAP hBmp, size_t *size ) { BITMAP bmp; HDC hdc; - HGLOBAL hPackedDIB; - LPBYTE pPackedDIB; LPBITMAPINFOHEADER pbmiHeader; - unsigned int cDataSize, cPackedSize, OffsetBits; + unsigned int cDataSize, OffsetBits; int nLinesCopied; + char *ret; if (!GetObjectW( hBmp, sizeof(bmp), &bmp )) return 0; @@ -523,24 +520,22 @@ static HGLOBAL create_dib_from_bitmap(HBITMAP hBmp) /* Calculate the size of the packed DIB */ cDataSize = abs( bmp.bmHeight ) * (((bmp.bmWidth * bmp.bmBitsPixel + 31) / 8) & ~3); - cPackedSize = sizeof(BITMAPINFOHEADER) + *size = sizeof(BITMAPINFOHEADER) + ( (bmp.bmBitsPixel <= 8) ? (sizeof(RGBQUAD) * (1 << bmp.bmBitsPixel)) : 0 ) + cDataSize; /* Get the offset to the bits */ - OffsetBits = cPackedSize - cDataSize; + OffsetBits = *size - cDataSize; /* Allocate the packed DIB */ - TRACE("\tAllocating packed DIB of size %d\n", cPackedSize); - hPackedDIB = GlobalAlloc( GMEM_FIXED, cPackedSize ); - if ( !hPackedDIB ) + TRACE( "\tAllocating packed DIB\n" ); + if (!(ret = malloc( *size ))) { - WARN("Could not allocate packed DIB!\n"); + WARN( "Could not allocate packed DIB!\n" ); return 0; } /* A packed DIB starts with a BITMAPINFOHEADER */ - pPackedDIB = GlobalLock(hPackedDIB); - pbmiHeader = (LPBITMAPINFOHEADER)pPackedDIB; + pbmiHeader = (LPBITMAPINFOHEADER)ret; /* Init the BITMAPINFOHEADER */ pbmiHeader->biSize = sizeof(BITMAPINFOHEADER); @@ -561,20 +556,19 @@ static HGLOBAL create_dib_from_bitmap(HBITMAP hBmp) hBmp, /* Handle to bitmap */ 0, /* First scan line to set in dest bitmap */ bmp.bmHeight, /* Number of scan lines to copy */ - pPackedDIB + OffsetBits, /* [out] Address of array for bitmap bits */ + ret + OffsetBits, /* [out] Address of array for bitmap bits */ (LPBITMAPINFO) pbmiHeader, /* [out] Address of BITMAPINFO structure */ 0); /* RGB or palette index */ - GlobalUnlock(hPackedDIB); ReleaseDC( 0, hdc ); /* Cleanup if GetDIBits failed */ if (nLinesCopied != bmp.bmHeight) { TRACE("\tGetDIBits returned %d. Actual lines=%d\n", nLinesCopied, bmp.bmHeight); - GlobalFree(hPackedDIB); - hPackedDIB = 0; + free( ret ); + ret = NULL; } - return hPackedDIB; + return ret; } @@ -690,14 +684,14 @@ static WCHAR* uri_to_dos(char *encodedURI) * * Convert a string in the specified encoding to CF_UNICODETEXT format. */ -static HANDLE unicode_text_from_string( UINT codepage, const void *data, size_t size ) +static WCHAR *unicode_text_from_string( UINT codepage, const void *data, size_t size, size_t *ret_size ) { DWORD i, j, count; WCHAR *strW; count = MultiByteToWideChar( codepage, 0, data, size, NULL, 0); - if (!(strW = GlobalAlloc( GMEM_FIXED, (count * 2 + 1) * sizeof(WCHAR) ))) return 0; + if (!(strW = malloc( (count * 2 + 1) * sizeof(WCHAR) ))) return 0; MultiByteToWideChar( codepage, 0, data, size, strW + count, count ); for (i = j = 0; i < count; i++) @@ -706,7 +700,7 @@ static HANDLE unicode_text_from_string( UINT codepage, const void *data, size_t strW[j++] = strW[i + count]; } strW[j++] = 0; - GlobalReAlloc( strW, j * sizeof(WCHAR), GMEM_FIXED ); /* release unused space */ + *ret_size = j * sizeof(WCHAR); TRACE( "returning %s\n", debugstr_wn( strW, j - 1 )); return strW; } @@ -717,9 +711,9 @@ static HANDLE unicode_text_from_string( UINT codepage, const void *data, size_t * * Import XA_STRING, converting the string to CF_UNICODETEXT. */ -static HANDLE import_string( Atom type, const void *data, size_t size ) +static void *import_string( Atom type, const void *data, size_t size, size_t *ret_size ) { - return unicode_text_from_string( 28591, data, size ); + return unicode_text_from_string( 28591, data, size, ret_size ); } @@ -728,9 +722,9 @@ static HANDLE import_string( Atom type, const void *data, size_t size ) * * Import XA_UTF8_STRING, converting the string to CF_UNICODETEXT. */ -static HANDLE import_utf8_string( Atom type, const void *data, size_t size ) +static void *import_utf8_string( Atom type, const void *data, size_t size, size_t *ret_size ) { - return unicode_text_from_string( CP_UTF8, data, size ); + return unicode_text_from_string( CP_UTF8, data, size, ret_size ); } @@ -739,12 +733,12 @@ static HANDLE import_utf8_string( Atom type, const void *data, size_t size ) * * Import COMPOUND_TEXT to CF_UNICODETEXT. */ -static HANDLE import_compound_text( Atom type, const void *data, size_t size ) +static void *import_compound_text( Atom type, const void *data, size_t size, size_t *ret_size ) { char** srcstr; int count; - HANDLE ret; XTextProperty txtprop; + void *ret; txtprop.value = (BYTE *)data; txtprop.nitems = size; @@ -753,7 +747,7 @@ static HANDLE import_compound_text( Atom type, const void *data, size_t size ) if (XmbTextPropertyToTextList( thread_display(), &txtprop, &srcstr, &count ) != Success) return 0; if (!count) return 0; - ret = unicode_text_from_string( CP_UNIXCP, srcstr[0], strlen(srcstr[0]) + 1 ); + ret = unicode_text_from_string( CP_UNIXCP, srcstr[0], strlen(srcstr[0]) + 1, ret_size ); XFreeStringList(srcstr); return ret; } @@ -764,11 +758,11 @@ static HANDLE import_compound_text( Atom type, const void *data, size_t size ) * * Import XA_TEXT, converting the string to CF_UNICODETEXT. */ -static HANDLE import_text( Atom type, const void *data, size_t size ) +static void *import_text( Atom type, const void *data, size_t size, size_t *ret_size ) { - if (type == XA_STRING) return import_string( type, data, size ); - if (type == x11drv_atom(UTF8_STRING)) return import_utf8_string( type, data, size ); - if (type == x11drv_atom(COMPOUND_TEXT)) return import_compound_text( type, data, size ); + if (type == XA_STRING) return import_string( type, data, size, ret_size ); + if (type == x11drv_atom(UTF8_STRING)) return import_utf8_string( type, data, size, ret_size ); + if (type == x11drv_atom(COMPOUND_TEXT)) return import_compound_text( type, data, size, ret_size ); FIXME( "unsupported TEXT type %s\n", debugstr_xatom( type )); return 0; } @@ -779,7 +773,7 @@ static HANDLE import_text( Atom type, const void *data, size_t size ) * * Import XA_PIXMAP, converting the image to CF_DIB. */ -static HANDLE import_pixmap( Atom type, const void *data, size_t size ) +static void *import_pixmap( Atom type, const void *data, size_t size, size_t *ret_size ) { const Pixmap *pPixmap = (const Pixmap *)data; BYTE *ptr = NULL; @@ -824,11 +818,12 @@ static HANDLE import_pixmap( Atom type, const void *data, size_t size ) { DWORD info_size = bitmap_info_size( info, DIB_RGB_COLORS ); - ptr = GlobalAlloc( GMEM_FIXED, info_size + info->bmiHeader.biSizeImage ); + ptr = malloc( info_size + info->bmiHeader.biSizeImage ); if (ptr) { memcpy( ptr, info, info_size ); memcpy( ptr + info_size, bits.ptr, info->bmiHeader.biSizeImage ); + *ret_size = info_size + info->bmiHeader.biSizeImage; } if (bits.free) bits.free( &bits ); } @@ -841,10 +836,10 @@ static HANDLE import_pixmap( Atom type, const void *data, size_t size ) * * Import image/bmp, converting the image to CF_DIB. */ -static HANDLE import_image_bmp( Atom type, const void *data, size_t size ) +static void *import_image_bmp( Atom type, const void *data, size_t size, size_t *ret_size ) { - HANDLE hClipData = 0; const BITMAPFILEHEADER *bfh = data; + void *ret = NULL; if (size >= sizeof(BITMAPFILEHEADER)+sizeof(BITMAPCOREHEADER) && bfh->bfType == 0x4d42 /* "BM" */) @@ -856,28 +851,19 @@ static HANDLE import_image_bmp( Atom type, const void *data, size_t size ) if ((hbmp = CreateDIBitmap( hdc, &bmi->bmiHeader, CBM_INIT, (const BYTE *)data + bfh->bfOffBits, bmi, DIB_RGB_COLORS ))) { - hClipData = create_dib_from_bitmap( hbmp ); + ret = create_dib_from_bitmap( hbmp, ret_size ); DeleteObject(hbmp); } ReleaseDC(0, hdc); } - return hClipData; -} - - -/************************************************************************** - * import_enhmetafile - */ -static HANDLE import_enhmetafile( Atom type, const void *data, size_t size ) -{ - return SetEnhMetaFileBits( size, data ); + return ret; } /************************************************************************** * import_text_html */ -static HANDLE import_text_html( Atom type, const void *data, size_t size ) +static void *import_text_html( Atom type, const void *data, size_t size, size_t *ret_size ) { static const char header[] = "Version:0.9\n" @@ -905,12 +891,13 @@ static HANDLE import_text_html( Atom type, const void *data, size_t size ) len = strlen( header ) + 12; /* 3 * 4 extra chars for %010lu */ total = len + size + sizeof(trailer); - if ((ret = GlobalAlloc( GMEM_FIXED, total ))) + if ((ret = malloc( total ))) { char *p = ret; p += sprintf( p, header, total - 1, len, len + size + 1 /* include the final \n in the data */ ); memcpy( p, data, size ); strcpy( p + size, trailer ); + *ret_size = total; TRACE( "returning %s\n", debugstr_a( ret )); } free( text ); @@ -923,7 +910,7 @@ static HANDLE import_text_html( Atom type, const void *data, size_t size ) * * Import text/uri-list. */ -static HANDLE import_text_uri_list( Atom type, const void *data, size_t size ) +static void *import_text_uri_list( Atom type, const void *data, size_t size, size_t *ret_size ) { const char *uriList = data; char *uri; @@ -980,7 +967,8 @@ static HANDLE import_text_uri_list( Atom type, const void *data, size_t size ) } if (out && end >= size) { - if ((dropFiles = GlobalAlloc( GMEM_FIXED, sizeof(DROPFILES) + (total + 1) * sizeof(WCHAR) ))) + *ret_size = sizeof(DROPFILES) + (total + 1) * sizeof(WCHAR); + if ((dropFiles = malloc( *ret_size ))) { dropFiles->pFiles = sizeof(DROPFILES); dropFiles->pt.x = 0; @@ -1001,7 +989,7 @@ static HANDLE import_text_uri_list( Atom type, const void *data, size_t size ) * * Import TARGETS and mark the corresponding clipboard formats as available. */ -static HANDLE import_targets( Atom type, const void *data, size_t size ) +static void *import_targets( Atom type, const void *data, size_t size, size_t *ret_size ) { UINT i, pos, count = size / sizeof(Atom); const Atom *properties = data; @@ -1022,9 +1010,12 @@ static HANDLE import_targets( Atom type, const void *data, size_t size ) if (i == count) continue; if (format->import && format->id) { + struct set_clipboard_params params = { .data = NULL }; + TRACE( "property %s -> format %s\n", debugstr_xatom( properties[i] ), debugstr_format( format->id )); - SetClipboardData( format->id, 0 ); + + NtUserSetClipboardData( format->id, 0, &params ); formats[pos++] = format; } else TRACE( "property %s (ignoring)\n", debugstr_xatom( properties[i] )); @@ -1033,7 +1024,8 @@ static HANDLE import_targets( Atom type, const void *data, size_t size ) free( current_x11_formats ); current_x11_formats = formats; nb_current_x11_formats = pos; - return (HANDLE)1; + *ret_size = 0; + return (void *)1; } @@ -1042,11 +1034,14 @@ static HANDLE import_targets( Atom type, const void *data, size_t size ) * * Generic import clipboard data routine. */ -static HANDLE import_data( Atom type, const void *data, size_t size ) +static void *import_data( Atom type, const void *data, size_t size, size_t *ret_size ) { - void *ret = GlobalAlloc( GMEM_FIXED, size ); - - if (ret) memcpy( ret, data, size ); + void *ret = malloc( size ); + if (ret) + { + memcpy( ret, data, size ); + *ret_size = size; + } return ret; } @@ -1056,11 +1051,11 @@ static HANDLE import_data( Atom type, const void *data, size_t size ) * * Import the specified format from the selection and return a global handle to the data. */ -static HANDLE import_selection( Display *display, Window win, Atom selection, - struct clipboard_format *format ) +static void *import_selection( Display *display, Window win, Atom selection, + struct clipboard_format *format, size_t *ret_size ) { unsigned char *data; - unsigned long size; + size_t size; Atom type; HANDLE ret; @@ -1071,7 +1066,7 @@ static HANDLE import_selection( Display *display, Window win, Atom selection, TRACE( "failed to convert selection\n" ); return 0; } - ret = format->import( type, data, size ); + ret = format->import( type, data, size, ret_size ); free( data ); return ret; } @@ -1088,6 +1083,8 @@ void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom select { UINT i; HANDLE handle; + void *data; + size_t size; struct clipboard_format *format; register_x11_formats( targets, count ); @@ -1096,8 +1093,17 @@ void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom select { if (!(format = find_x11_format( targets[i] ))) continue; if (!format->id) continue; - if (!(handle = import_selection( display, win, selection, format ))) continue; - callback( format->id, handle ); + if (!(data = import_selection( display, win, selection, format, &size ))) continue; + + if ((handle = GlobalAlloc( GMEM_FIXED, size ))) + { + void *ptr; + ptr = GlobalLock( handle ); + memcpy( ptr, data, size ); + GlobalUnlock( handle ); + callback( format->id, handle ); + } + free( data ); } } @@ -1105,23 +1111,25 @@ void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom select /************************************************************************** * render_format */ -static HANDLE render_format( UINT id ) +static BOOL render_format( UINT id ) { Display *display = thread_display(); unsigned int i; - HANDLE handle = 0; if (!current_selection) return 0; for (i = 0; i < nb_current_x11_formats; i++) { + struct set_clipboard_params params; if (current_x11_formats[i]->id != id) continue; - if (!(handle = import_selection( display, import_window, - current_selection, current_x11_formats[i] ))) continue; - SetClipboardData( id, handle ); - break; + if (!(params.data = import_selection( display, import_window, current_selection, + current_x11_formats[i], &params.size ))) continue; + params.seqno = 0; + NtUserSetClipboardData( id, 0, &params ); + if (params.size) free( params.data ); + return TRUE; } - return handle; + return FALSE; } @@ -1615,7 +1623,7 @@ static BOOL export_timestamp( Display *display, Window win, Atom prop, Atom targ * Gets type, data and size. */ static BOOL X11DRV_CLIPBOARD_GetProperty(Display *display, Window w, Atom prop, - Atom *atype, unsigned char** data, unsigned long* datasize) + Atom *atype, unsigned char **data, size_t *datasize) { int aformat; unsigned long pos = 0, nitems, remain, count; @@ -1652,7 +1660,7 @@ static BOOL X11DRV_CLIPBOARD_GetProperty(Display *display, Window w, Atom prop, pos += count / sizeof(int); } - TRACE( "got property %s type %s format %u len %lu from window %lx\n", + TRACE( "got property %s type %s format %u len %zu from window %lx\n", debugstr_xatom( prop ), debugstr_xatom( *atype ), aformat, *datasize, w ); /* Delete the property on the window now that we are done @@ -1674,7 +1682,7 @@ struct clipboard_data_packet { * Reads the contents of the X selection property. */ static BOOL read_property( Display *display, Window w, Atom prop, - Atom *type, unsigned char **data, unsigned long *datasize ) + Atom *type, unsigned char **data, size_t *datasize ) { XEvent xe; @@ -1704,7 +1712,7 @@ static BOOL read_property( Display *display, Window w, Atom prop, { int i; unsigned char *prop_data; - unsigned long prop_size; + size_t prop_size; /* Wait until PropertyNotify is received */ for (i = 0; i < SELECTION_RETRIES; i++) @@ -1830,7 +1838,7 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) struct clipboard_format *format = NULL; Window owner = 0; unsigned char *data = NULL; - unsigned long size = 0; + size_t import_size, size = 0; Atom type = 0; static Atom last_selection; @@ -1883,7 +1891,7 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) is_clipboard_owner = TRUE; rendered_formats = 0; - if (format) format->import( type, data, size ); + if (format) format->import( type, data, size, &import_size ); free( last_data ); last_selection = current_selection; -- 2.25.1

1 0

[PATCH 1/2] programs/wineconsole: use wmain as entry point
by Eric Pouech 27 Apr '22

27 Apr '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/wineconsole/Makefile.in | 3 - programs/wineconsole/wineconsole.c | 95 ++++++++++++++++++++++++++++++++++-- 2 files changed, 91 insertions(+), 7 deletions(-) diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in index b859ef8a27a..08ad51d2b6a 100644 --- a/programs/wineconsole/Makefile.in +++ b/programs/wineconsole/Makefile.in @@ -1,6 +1,5 @@ MODULE = wineconsole.exe -IMPORTS = advapi32 -DELAYIMPORTS = comctl32 user32 gdi32 +DELAYIMPORTS = user32 EXTRADLLFLAGS = -mwindows -municode diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 1924bf791e6..c703127c238 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -32,14 +32,101 @@ WINE_DEFAULT_DEBUG_CHANNEL(console); -int WINAPI wWinMain( HINSTANCE inst, HINSTANCE prev, WCHAR *cmdline, INT show ) +static const unsigned int EC_INTERNAL = 255; /* value of exit_code for internal errors */ + +/*********************************************************************** + * build_command_line + * + * Build the command line of a process from the argv array. + * (copied from dlls/ntdll/unix/env.c) + * + * We must quote and escape characters so that the argv array can be rebuilt + * from the command line: + * - spaces and tabs must be quoted + * 'a b' -> '"a b"' + * - quotes must be escaped + * '"' -> '\"' + * - if '\'s are followed by a '"', they must be doubled and followed by '\"', + * resulting in an odd number of '\' followed by a '"' + * '\"' -> '\\\"' + * '\\"' -> '\\\\\"' + * - '\'s are followed by the closing '"' must be doubled, + * resulting in an even number of '\' followed by a '"' + * ' \' -> '" \\"' + * ' \\' -> '" \\\\"' + * - '\'s that are not followed by a '"' can be left as is + * 'a\b' == 'a\b' + * 'a\\b' == 'a\\b' + */ +static WCHAR *build_command_line( WCHAR **wargv ) +{ + int len; + WCHAR **arg, *ret; + LPWSTR p; + + len = 1; + for (arg = wargv; *arg; arg++) len += 3 + 2 * wcslen( *arg ); + if (!(ret = malloc( len * sizeof(WCHAR) ))) return NULL; + + p = ret; + for (arg = wargv; *arg; arg++) + { + BOOL has_space, has_quote; + int i, bcount; + WCHAR *a; + + /* check for quotes and spaces in this argument (first arg is always quoted) */ + has_space = (arg == wargv) || !**arg || wcschr( *arg, ' ' ) || wcschr( *arg, '\t' ); + has_quote = wcschr( *arg, '"' ) != NULL; + + /* now transfer it to the command line */ + if (has_space) *p++ = '"'; + if (has_quote || has_space) + { + bcount = 0; + for (a = *arg; *a; a++) + { + if (*a == '\\') bcount++; + else + { + if (*a == '"') /* double all the '\\' preceding this '"', plus one */ + for (i = 0; i <= bcount; i++) *p++ = '\\'; + bcount = 0; + } + *p++ = *a; + } + } + else + { + wcscpy( p, *arg ); + p += wcslen( p ); + } + if (has_space) + { + /* Double all the '\' preceding the closing quote */ + for (i = 0; i < bcount; i++) *p++ = '\\'; + *p++ = '"'; + } + *p++ = ' '; + } + if (p > ret) p--; /* remove last space */ + *p = 0; + if (p - ret >= 32767) + { + ERR( "command line too long (%Iu)\n", p - ret ); + exit( EC_INTERNAL ); + } + return ret; +} + +int wmain( int argc, WCHAR *argv[] ) { STARTUPINFOW startup = { sizeof(startup) }; PROCESS_INFORMATION info; - WCHAR *cmd = cmdline; + WCHAR *cmd; DWORD exit_code; - static WCHAR default_cmd[] = L"cmd"; + cmd = argc > 1 ? build_command_line( &argv[1] ) : wcsdup( L"cmd.exe" ); FreeConsole(); /* make sure we're not connected to inherited console */ if (!AllocConsole()) @@ -48,8 +135,6 @@ int WINAPI wWinMain( HINSTANCE inst, HINSTANCE prev, WCHAR *cmdline, INT show ) return 1; } - if (!*cmd) cmd = default_cmd; - startup.dwFlags = STARTF_USESTDHANDLES; startup.hStdInput = CreateFileW( L"CONIN$", GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0 );

1 1

crypt32: Remove obsolete -D_CRYPT32_ from Makefile.in
by Drew Ronneberg 27 Apr '22

27 Apr '22

1 0

[PATCH v2 1/3] dinput/tests: Enforce HID report descriptor buffer size.
by Rémi Bernon 27 Apr '22

27 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Remove unnecessary length checks in PATCH 3 instead of borking them. dlls/dinput/tests/driver_bus.c | 2 +- dlls/dinput/tests/driver_hid.h | 4 +++- dlls/dinput/tests/force_feedback.c | 11 +++++++---- dlls/dinput/tests/hid.c | 4 ++++ dlls/dinput/tests/hotplug.c | 1 + dlls/dinput/tests/joystick8.c | 21 ++++++++++++++++----- 6 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/tests/driver_bus.c b/dlls/dinput/tests/driver_bus.c index 45a984b6c36..9ece4414a1a 100644 --- a/dlls/dinput/tests/driver_bus.c +++ b/dlls/dinput/tests/driver_bus.c @@ -458,7 +458,7 @@ struct phys_device BOOL use_report_id; DWORD report_descriptor_len; - char report_descriptor_buf[1024]; + char report_descriptor_buf[MAX_HID_DESCRIPTOR_LEN]; HIDP_CAPS caps; HID_DEVICE_ATTRIBUTES attributes; diff --git a/dlls/dinput/tests/driver_hid.h b/dlls/dinput/tests/driver_hid.h index 1010499fc41..4711d391bfe 100644 --- a/dlls/dinput/tests/driver_hid.h +++ b/dlls/dinput/tests/driver_hid.h @@ -62,13 +62,15 @@ struct hid_expect }; /* create/remove device */ +#define MAX_HID_DESCRIPTOR_LEN 2048 + struct hid_device_desc { BOOL is_polled; BOOL use_report_id; DWORD report_descriptor_len; - char report_descriptor_buf[1024]; + char report_descriptor_buf[MAX_HID_DESCRIPTOR_LEN]; HIDP_CAPS caps; HID_DEVICE_ATTRIBUTES attributes; diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index d9dad38446c..f6525657450 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -1672,7 +1672,8 @@ static void test_condition_effect( IDirectInputDevice8W *device, HANDLE file, DW static BOOL test_force_feedback_joystick( DWORD version ) { #include "psh_hid_macros.h" - const unsigned char report_descriptor[] = { + const unsigned char report_descriptor[] = + { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), USAGE(1, HID_USAGE_GENERIC_JOYSTICK), COLLECTION(1, Application), @@ -2005,7 +2006,7 @@ static BOOL test_force_feedback_joystick( DWORD version ) END_COLLECTION, END_COLLECTION, }; -#undef REPORT_ID_OR_USAGE_PAGE + C_ASSERT(sizeof(report_descriptor) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = @@ -3460,6 +3461,7 @@ static void test_device_managed_effect(void) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(report_descriptor) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = @@ -4576,7 +4578,8 @@ struct bool_async_handler default_bool_async_handler = {{&bool_async_handler_vtb static void test_windows_gaming_input(void) { #include "psh_hid_macros.h" - const unsigned char report_desc[] = { + const unsigned char report_desc[] = + { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), USAGE(1, HID_USAGE_GENERIC_JOYSTICK), COLLECTION(1, Application), @@ -4997,7 +5000,7 @@ static void test_windows_gaming_input(void) END_COLLECTION, END_COLLECTION, }; -#undef REPORT_ID_OR_USAGE_PAGE + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 4e107625064..66019e766ad 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -2855,6 +2855,7 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) END_COLLECTION, }; #undef REPORT_ID_OR_USAGE_PAGE + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" const HIDP_CAPS caps = @@ -3063,6 +3064,7 @@ static void test_hidp_kdr(void) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = @@ -3572,6 +3574,7 @@ DWORD WINAPI dinput_test_device_thread( void *stop_event ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(gamepad_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" static const HID_DEVICE_ATTRIBUTES attributes = { @@ -3616,6 +3619,7 @@ static void test_bus_driver(void) INPUT(1, Data|Var|Abs), END_COLLECTION, }; + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" static const HID_DEVICE_ATTRIBUTES attributes = diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index 2d000317c9f..fca04c36ef5 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -133,6 +133,7 @@ static BOOL test_input_lost( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 32d03a603c3..eeb8b90d0c8 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -396,7 +396,7 @@ static void test_simple_joystick( DWORD version ) END_COLLECTION, END_COLLECTION, }; -#undef REPORT_ID_OR_USAGE_PAGE + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = @@ -2110,6 +2110,7 @@ static BOOL test_device_types( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(unknown_desc) < MAX_HID_DESCRIPTOR_LEN); static const unsigned char limited_desc[] = { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), @@ -2140,6 +2141,7 @@ static BOOL test_device_types( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(limited_desc) < MAX_HID_DESCRIPTOR_LEN); static const unsigned char gamepad_desc[] = { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), @@ -2170,6 +2172,7 @@ static BOOL test_device_types( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(gamepad_desc) < MAX_HID_DESCRIPTOR_LEN); static const unsigned char joystick_desc[] = { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), @@ -2210,6 +2213,7 @@ static BOOL test_device_types( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(joystick_desc) < MAX_HID_DESCRIPTOR_LEN); static const unsigned char wheel_steering_only_desc[] = { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), @@ -2248,6 +2252,7 @@ static BOOL test_device_types( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(wheel_steering_only_desc) < MAX_HID_DESCRIPTOR_LEN); static const unsigned char wheel_dualpedals_desc[] = { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), @@ -2289,6 +2294,7 @@ static BOOL test_device_types( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(wheel_dualpedals_desc) < MAX_HID_DESCRIPTOR_LEN); static const unsigned char wheel_threepedals_desc[] = { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), @@ -2331,6 +2337,7 @@ static BOOL test_device_types( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(wheel_threepedals_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" static struct device_desc device_desc[] = @@ -2690,7 +2697,7 @@ static void test_many_axes_joystick(void) END_COLLECTION, END_COLLECTION, }; -#undef REPORT_ID_OR_USAGE_PAGE + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = @@ -3221,7 +3228,7 @@ static void test_driving_wheel_axes(void) END_COLLECTION, END_COLLECTION, }; -#undef REPORT_ID_OR_USAGE_PAGE + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = @@ -3415,7 +3422,8 @@ done: static BOOL test_winmm_joystick(void) { #include "psh_hid_macros.h" - const unsigned char report_desc[] = { + const unsigned char report_desc[] = + { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), USAGE(1, HID_USAGE_GENERIC_JOYSTICK), COLLECTION(1, Application), @@ -3461,6 +3469,7 @@ static BOOL test_winmm_joystick(void) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = @@ -3864,7 +3873,8 @@ static struct controller_handler controller_added = {{&controller_handler_vtbl}} static void test_windows_gaming_input(void) { #include "psh_hid_macros.h" - const unsigned char report_desc[] = { + const unsigned char report_desc[] = + { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), USAGE(1, HID_USAGE_GENERIC_GAMEPAD), COLLECTION(1, Application), @@ -3906,6 +3916,7 @@ static void test_windows_gaming_input(void) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = -- 2.35.1

2 6

[v3 PATCH] mfplay: Prevent usage of uninitialized pointer in error case (Coverity)
by Nikolay Sivov 27 Apr '22

27 Apr '22

From: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v3: make sure pointers are zeroed for every stream. dlls/mfplay/player.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 7d9a4da8649..c500717b8d0 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1378,7 +1378,6 @@ static HRESULT media_item_create_sink_node(IUnknown *sink, IMFTopologyNode **nod static HRESULT media_item_create_topology(struct media_player *player, struct media_item *item, IMFTopology **out) { - IMFTopologyNode *src_node, *sink_node; BOOL selected, video_added = FALSE; IMFStreamDescriptor *sd; IMFTopology *topology; @@ -1421,6 +1420,8 @@ static HRESULT media_item_create_topology(struct media_player *player, struct me if (sink) { + IMFTopologyNode *src_node = NULL, *sink_node = NULL; + hr = media_item_create_source_node(item, sd, &src_node); if (SUCCEEDED(hr)) hr = media_item_create_sink_node(sink, &sink_node); -- 2.35.1

1 0

[PATCH] comctl32: Remove obsolete -D_COMCTL32_ from Makefile.in
by Drew Ronneberg 27 Apr '22

27 Apr '22

1 0

[PATCH 1/2] dwrite/opentype: Use stdint type for color font structures.
by Nikolay Sivov 27 Apr '22

27 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/opentype.c | 110 +++++++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 49 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 195607aa67f..9aeef88c92c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -243,25 +243,25 @@ struct tt_hhea struct sbix_header { - WORD version; - WORD flags; - DWORD num_strikes; - DWORD strike_offset[1]; + uint16_t version; + uint16_t flags; + uint32_t num_strikes; + uint32_t strike_offset[1]; }; struct sbix_strike { - WORD ppem; - WORD ppi; - DWORD glyphdata_offsets[1]; + uint16_t ppem; + uint16_t ppi; + uint32_t glyphdata_offsets[1]; }; struct sbix_glyph_data { - WORD originOffsetX; - WORD originOffsetY; - DWORD graphic_type; - BYTE data[1]; + int16_t originOffsetX; + int16_t originOffsetY; + uint32_t graphic_type; + uint8_t data[1]; }; struct maxp @@ -272,29 +272,41 @@ struct maxp struct cblc_header { - WORD major_version; - WORD minor_version; - DWORD num_sizes; + uint16_t major_version; + uint16_t minor_version; + uint32_t num_sizes; }; -typedef struct { - BYTE res[12]; -} sbitLineMetrics; +struct sbit_line_metrics +{ + int8_t ascender; + int8_t descender; + uint8_t widthMax; + int8_t caretSlopeNumerator; + int8_t caretSlopeDenominator; + int8_t caretOffset; + int8_t minOriginSB; + int8_t minAdvanceSB; + int8_t maxBeforeBL; + int8_t minAfterBL; + int8_t pad1; + int8_t pad2; +}; struct cblc_bitmapsize_table { - DWORD indexSubTableArrayOffset; - DWORD indexTablesSize; - DWORD numberofIndexSubTables; - DWORD colorRef; - sbitLineMetrics hori; - sbitLineMetrics vert; - WORD startGlyphIndex; - WORD endGlyphIndex; - BYTE ppemX; - BYTE ppemY; - BYTE bit_depth; - BYTE flags; + uint32_t indexSubTableArrayOffset; + uint32_t indexTablesSize; + uint32_t numberofIndexSubTables; + uint32_t colorRef; + struct sbit_line_metrics hori; + struct sbit_line_metrics vert; + uint16_t startGlyphIndex; + uint16_t endGlyphIndex; + uint8_t ppemX; + uint8_t ppemY; + uint8_t bit_depth; + int8_t flags; }; struct gasp_range @@ -1204,43 +1216,43 @@ static const UINT16 dwriteid_to_opentypeid[DWRITE_INFORMATIONAL_STRING_WEIGHT_ST /* CPAL table */ struct cpal_header_0 { - USHORT version; - USHORT num_palette_entries; - USHORT num_palettes; - USHORT num_color_records; - ULONG offset_first_color_record; - USHORT color_record_indices[1]; + uint16_t version; + uint16_t num_palette_entries; + uint16_t num_palettes; + uint16_t num_color_records; + uint32_t offset_first_color_record; + uint16_t color_record_indices[1]; }; struct cpal_color_record { - BYTE blue; - BYTE green; - BYTE red; - BYTE alpha; + uint8_t blue; + uint8_t green; + uint8_t red; + uint8_t alpha; }; /* COLR table */ struct colr_header { - USHORT version; - USHORT num_baseglyph_records; - ULONG offset_baseglyph_records; - ULONG offset_layer_records; - USHORT num_layer_records; + uint16_t version; + uint16_t num_baseglyph_records; + uint32_t offset_baseglyph_records; + uint32_t offset_layer_records; + uint16_t num_layer_records; }; struct colr_baseglyph_record { - USHORT glyph; - USHORT first_layer_index; - USHORT num_layers; + uint16_t glyph; + uint16_t first_layer_index; + uint16_t num_layers; }; struct colr_layer_record { - USHORT glyph; - USHORT palette_index; + uint16_t glyph; + uint16_t palette_index; }; struct meta_data_map -- 2.35.1

1 1

← Newer
1
...
11
12
13
14
15
16
17
...
94
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel April 2022