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

Francois Gouget : po: Fix a trailing full stop inconsistency in the Asturian translation.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: bfd82be0ffe699e809777c7e1750f6a63c3d7d07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfd82be0ffe699e809777c7e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 27 15:36:36 2022 +0200 po: Fix a trailing full stop inconsistency in the Asturian translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ast.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ast.po b/po/ast.po index dcc15692f70..8e614d4a0ab 100644 --- a/po/ast.po +++ b/po/ast.po @@ -16954,7 +16954,7 @@ msgstr "Usu: taskkill [/?] [/f] [/im NomeProcesu | /pid IDProcesu]\n" msgid "Error: Unknown or invalid command line option specified.\n" msgstr "" "Fallu: Especificáronse na llinia de comandos opciones non\n" -"válides o desconocíes\n" +"válides o desconocíes.\n" #: programs/taskkill/taskkill.rc:32 msgid "Error: Invalid command line parameter specified.\n"

1 0

Francois Gouget : gdi32/tests: Trace the invalid height in test_max_height().
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: 0519aec31019bfabdf5f1aa183e9049c5a376676 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0519aec31019bfabdf5f1aa1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 27 15:20:03 2022 +0200 gdi32/tests: Trace the invalid height in test_max_height(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 9c616e6a30b..76d787c1440 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6523,6 +6523,7 @@ static void test_max_height(void) /* test an invalid value */ for (i = 0; i < ARRAY_SIZE(invalid_height); i++) { + winetest_push_context("height=%ld", invalid_height[i]); lf.lfHeight = invalid_height[i]; hfont = CreateFontIndirectA(&lf); hfont_old = SelectObject(hdc, hfont); @@ -6534,6 +6535,7 @@ static void test_max_height(void) ok(tm.tmAveCharWidth == tm1.tmAveCharWidth, "expected 1 ppem value (%ld), got %ld\n", tm1.tmAveCharWidth, tm.tmAveCharWidth); DeleteObject(SelectObject(hdc, hfont_old)); + winetest_pop_context(); } ReleaseDC(NULL, hdc);

1 0

Francois Gouget : po: Fix the indentation of a usage message in the Brazilian translation.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: 327e7e770cf50285e51c3f09c130d7ed91ba526e URL: https://source.winehq.org/git/wine.git/?a=commit;h=327e7e770cf50285e51c3f09… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 27 15:32:55 2022 +0200 po: Fix the indentation of a usage message in the Brazilian translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index a2e3bfb7e94..4d189662d18 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -16449,7 +16449,7 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" -" /reg:32\n" +" /reg:32\n" " Acessa o registro utilizando o modo 32-bits.\n" "\n" " /reg:64\n"

1 0

Huw Davies : wineoss: Move MIDM_START to the unixlib.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: b50f9f0af544aa9a915e21a97713a84205c9a9e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b50f9f0af544aa9a915e21a9… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 27 08:03:19 2022 +0100 wineoss: Move MIDM_START to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/midi.c | 17 ----------------- dlls/wineoss.drv/ossmidi.c | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 8d4c9bab68c..9df97530865 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -490,21 +490,6 @@ static DWORD midClose(WORD wDevID) return ret; } -/************************************************************************** - * midStart [internal] - */ -static DWORD midStart(WORD wDevID) -{ - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; - if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - - MidiInDev[wDevID].state = 1; - MidiInDev[wDevID].startTime = GetTickCount(); - return MMSYSERR_NOERROR; -} - /************************************************************************** * midStop [internal] */ @@ -544,8 +529,6 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: return midClose(wDevID); - case MIDM_START: - return midStart(wDevID); case MIDM_STOP: return midStop(wDevID); } diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index d63ba936239..091eccd6d53 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -1210,6 +1210,21 @@ static UINT midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, UINT size) return MMSYSERR_NOERROR; } +static UINT midi_in_start(WORD dev_id) +{ + struct midi_src *src; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID; + src = srcs + dev_id; + if (src->state == -1) return MIDIERR_NODEVICE; + + src->state = 1; + src->startTime = NtGetTickCount(); + return MMSYSERR_NOERROR; +} + static UINT midi_in_reset(WORD dev_id, struct notify_context *notify) { UINT cur_time = NtGetTickCount(); @@ -1322,6 +1337,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_GETNUMDEVS: *params->err = num_srcs; break; + case MIDM_START: + *params->err = midi_in_start(params->dev_id); + break; case MIDM_RESET: *params->err = midi_in_reset(params->dev_id, params->notify); break;

1 0

Jacek Caban : winex11: Move CF_HDROP filtering to import_xdnd_selection.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: f7ac2c7833ceaa015501aef76b8f10f5fbd9cd92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7ac2c7833ceaa015501aef7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:01:16 2022 +0100 winex11: Move CF_HDROP filtering to import_xdnd_selection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 11 +++++++++++ dlls/winex11.drv/xdnd.c | 26 -------------------------- 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 92284d436dd..6baa87c5ce1 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1108,14 +1108,25 @@ struct format_entry *import_xdnd_selection( Display *display, Window win, Atom s void *data; struct clipboard_format *format; struct format_entry *ret = NULL, *entry; + BOOL have_hdrop = FALSE; register_x11_formats( targets, count ); *ret_size = 0; + for (i = 0; i < count; i++) + { + if (!(format = find_x11_format( targets[i] ))) continue; + if (format->id != CF_HDROP) continue; + have_hdrop = TRUE; + break; + } + for (i = 0; i < count; i++) { if (!(format = find_x11_format( targets[i] ))) continue; if (!format->id) continue; + if (have_hdrop && format->id != CF_HDROP && format->id < CF_MAX) continue; + if (!(data = import_selection( display, win, selection, format, &size ))) continue; entry_size = (FIELD_OFFSET( struct format_entry, data[size] ) + 7) & ~7; diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index aa46467f6f7..b892a70949a 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -530,8 +530,6 @@ 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); @@ -554,30 +552,6 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, } } } - - /* On Windows when there is a CF_HDROP, there are no other CF_ formats. - * foobar2000 relies on this (spaces -> %20's without it). - */ - LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) - { - if (current->cf_win == CF_HDROP) - { - haveHDROP = TRUE; - break; - } - } - if (haveHDROP) - { - LIST_FOR_EACH_ENTRY_SAFE(current, next, &xdndData, XDNDDATA, entry) - { - if (current->cf_win != CF_HDROP && current->cf_win < CF_MAX) - { - list_remove(&current->entry); - GlobalFree(current->contents); - HeapFree(GetProcessHeap(), 0, current); - } - } - } }

1 0

Fabian Maurer : mfplat: Prevent use after free (Coverity).
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: f5d41f28f6442bd7e074efa17785b40ad3c65ba4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5d41f28f6442bd7e074efa1… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Apr 26 21:03:22 2022 +0200 mfplat: Prevent use after free (Coverity). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 71d55e2d232..b36a44d1e1c 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -976,6 +976,7 @@ static const MFVIDEOFORMAT * WINAPI video_mediatype_GetVideoFormat(IMFVideoMedia TRACE("%p.\n", iface); CoTaskMemFree(media_type->video_format); + media_type->video_format = NULL; if (FAILED(hr = MFCreateMFVideoFormatFromMFMediaType(&media_type->IMFMediaType_iface, &media_type->video_format, &size))) WARN("Failed to create format description, hr %#lx.\n", hr); @@ -1376,6 +1377,7 @@ static const WAVEFORMATEX * WINAPI audio_mediatype_GetAudioFormat(IMFAudioMediaT TRACE("%p.\n", iface); CoTaskMemFree(media_type->audio_format); + media_type->audio_format = NULL; if (FAILED(hr = MFCreateWaveFormatExFromMFMediaType(&media_type->IMFMediaType_iface, &media_type->audio_format, &size, MFWaveFormatExConvertFlag_Normal))) {

1 0

Alexandre Julliard : winecrt0: Avoid A->W conversion in initialization code.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: 7c6f6d27756687c3e2a3b8ca743f886e694142a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c6f6d27756687c3e2a3b8ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 27 15:52:42 2022 +0200 winecrt0: Avoid A->W conversion in initialization code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/debug.c | 2 +- dlls/winecrt0/unix_lib.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index 6e1866c7568..918fb67b140 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -51,7 +51,7 @@ static void load_func( void **func, const char *name, void *def ) if (!*func) { DWORD err = GetLastError(); - HMODULE module = GetModuleHandleA( "ntdll.dll" ); + HMODULE module = GetModuleHandleW( L"ntdll.dll" ); void *proc = GetProcAddress( module, name ); InterlockedExchangePointer( func, proc ? proc : def ); SetLastError( err ); diff --git a/dlls/winecrt0/unix_lib.c b/dlls/winecrt0/unix_lib.c index 2e9b521a1e7..c86897b9905 100644 --- a/dlls/winecrt0/unix_lib.c +++ b/dlls/winecrt0/unix_lib.c @@ -35,7 +35,7 @@ static void load_func( void **func, const char *name, void *def ) { if (!*func) { - HMODULE module = GetModuleHandleA( "ntdll.dll" ); + HMODULE module = GetModuleHandleW( L"ntdll.dll" ); void *proc = GetProcAddress( module, name ); InterlockedExchangePointer( func, proc ? proc : def ); }

1 0

Nikolay Sivov : dwrite/opentype: Use stdint types for font file structures.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: f5e33215ee2e6f9af05185e6519aa4f2620b2bf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5e33215ee2e6f9af05185e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 27 14:22:55 2022 +0300 dwrite/opentype: Use stdint types for font file structures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 194 ++++++++++++++++++++++++++----------------------- 1 file changed, 104 insertions(+), 90 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 9aeef88c92c..7df0d207bc6 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -73,39 +73,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define GLYPH_CONTEXT_MAX_LENGTH 64 #define SHAPE_MAX_NESTING_LEVEL 6 -typedef struct { - CHAR TTCTag[4]; - DWORD Version; - DWORD numFonts; - DWORD OffsetTable[1]; -} TTC_Header_V1; - -typedef struct { - DWORD version; - WORD numTables; - WORD searchRange; - WORD entrySelector; - WORD rangeShift; -} TTC_SFNT_V1; - -typedef struct { - DWORD tag; - DWORD checkSum; - DWORD offset; - DWORD length; -} TT_TableRecord; +struct ttc_header +{ + uint32_t tag; + uint16_t major_version; + uint16_t minor_version; + uint32_t num_fonts; + uint32_t offsets[1]; +}; + +struct ot_table_dir +{ + uint32_t version; + uint16_t numTables; + uint16_t searchRange; + uint16_t entrySelector; + uint16_t rangeShift; +}; + +struct ot_table_record +{ + uint32_t tag; + uint32_t checksum; + uint32_t offset; + uint32_t length; +}; struct cmap_encoding_record { - WORD platformID; - WORD encodingID; - DWORD offset; + uint16_t platformID; + uint16_t encodingID; + uint32_t offset; }; struct cmap_header { - WORD version; - WORD num_tables; + uint16_t version; + uint16_t num_tables; struct cmap_encoding_record tables[1]; }; @@ -224,21 +228,21 @@ struct tt_os2 struct tt_hhea { - USHORT majorVersion; - USHORT minorVersion; - SHORT ascender; - SHORT descender; - SHORT linegap; - USHORT advanceWidthMax; - SHORT minLeftSideBearing; - SHORT minRightSideBearing; - SHORT xMaxExtent; - SHORT caretSlopeRise; - SHORT caretSlopeRun; - SHORT caretOffset; - SHORT reserved[4]; - SHORT metricDataFormat; - USHORT numberOfHMetrics; + uint16_t majorVersion; + uint16_t minorVersion; + int16_t ascender; + int16_t descender; + int16_t linegap; + uint16_t advanceWidthMax; + int16_t minLeftSideBearing; + int16_t minRightSideBearing; + int16_t xMaxExtent; + int16_t caretSlopeRise; + int16_t caretSlopeRun; + int16_t caretOffset; + int16_t reserved[4]; + int16_t metricDataFormat; + uint16_t numberOfHMetrics; }; struct sbix_header @@ -337,49 +341,49 @@ enum OS2_FSSELECTION { struct name_record { - WORD platformID; - WORD encodingID; - WORD languageID; - WORD nameID; - WORD length; - WORD offset; + uint16_t platformID; + uint16_t encodingID; + uint16_t languageID; + uint16_t nameID; + uint16_t length; + uint16_t offset; }; struct name_header { - WORD format; - WORD count; - WORD stringOffset; + uint16_t format; + uint16_t count; + uint16_t stringOffset; struct name_record records[1]; }; struct vdmx_header { - WORD version; - WORD num_recs; - WORD num_ratios; + uint16_t version; + uint16_t num_recs; + uint16_t num_ratios; }; struct vdmx_ratio { - BYTE bCharSet; - BYTE xRatio; - BYTE yStartRatio; - BYTE yEndRatio; + uint8_t bCharSet; + uint8_t xRatio; + uint8_t yStartRatio; + uint8_t yEndRatio; }; struct vdmx_vtable { - WORD yPelHeight; - SHORT yMax; - SHORT yMin; + uint16_t yPelHeight; + int16_t yMax; + int16_t yMin; }; struct vdmx_group { - WORD recs; - BYTE startsz; - BYTE endsz; + uint16_t recs; + uint8_t startsz; + uint8_t endsz; struct vdmx_vtable entries[1]; }; @@ -1257,17 +1261,17 @@ struct colr_layer_record struct meta_data_map { - DWORD tag; - DWORD offset; - DWORD length; + uint32_t tag; + uint32_t offset; + uint32_t length; }; struct meta_header { - DWORD version; - DWORD flags; - DWORD reserved; - DWORD data_maps_count; + uint32_t version; + uint32_t flags; + uint32_t reserved; + uint32_t data_maps_count; struct meta_data_map maps[1]; }; @@ -1338,8 +1342,7 @@ typedef HRESULT (*dwrite_fontfile_analyzer)(IDWriteFontFileStream *stream, UINT3 static HRESULT opentype_ttc_analyzer(IDWriteFontFileStream *stream, UINT32 *font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type) { - static const DWORD ttctag = MS_TTCF_TAG; - const TTC_Header_V1 *header; + const struct ttc_header *header; void *context; HRESULT hr; @@ -1347,8 +1350,9 @@ static HRESULT opentype_ttc_analyzer(IDWriteFontFileStream *stream, UINT32 *font if (FAILED(hr)) return hr; - if (!memcmp(header->TTCTag, &ttctag, sizeof(ttctag))) { - *font_count = GET_BE_DWORD(header->numFonts); + if (header->tag == MS_TTCF_TAG) + { + *font_count = GET_BE_DWORD(header->num_fonts); *file_type = DWRITE_FONT_FILE_TYPE_OPENTYPE_COLLECTION; *face_type = DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION; } @@ -1519,8 +1523,8 @@ HRESULT opentype_try_get_font_table(const struct file_stream_desc *stream_desc, void **table_context, UINT32 *table_size, BOOL *found) { void *table_directory_context, *sfnt_context; - TT_TableRecord *table_record = NULL; - TTC_SFNT_V1 *font_header = NULL; + const struct ot_table_record *table_record = NULL; + const struct ot_table_dir *table_dir = NULL; UINT32 table_offset = 0; UINT16 table_count; HRESULT hr; @@ -1531,38 +1535,48 @@ HRESULT opentype_try_get_font_table(const struct file_stream_desc *stream_desc, *table_data = NULL; *table_context = NULL; - if (stream_desc->face_type == DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION) { - const TTC_Header_V1 *ttc_header; + if (stream_desc->face_type == DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION) + { + const struct ttc_header *ttc_header; void * ttc_context; - hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void**)&ttc_header, 0, sizeof(*ttc_header), &ttc_context); - if (SUCCEEDED(hr)) { - if (stream_desc->face_index >= GET_BE_DWORD(ttc_header->numFonts)) + + hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void **)&ttc_header, 0, + sizeof(*ttc_header), &ttc_context); + if (SUCCEEDED(hr)) + { + if (stream_desc->face_index >= GET_BE_DWORD(ttc_header->num_fonts)) hr = E_INVALIDARG; - else { - table_offset = GET_BE_DWORD(ttc_header->OffsetTable[stream_desc->face_index]); - hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void**)&font_header, table_offset, sizeof(*font_header), &sfnt_context); + else + { + table_offset = GET_BE_DWORD(ttc_header->offsets[stream_desc->face_index]); + hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void **)&table_dir, table_offset, + sizeof(*table_dir), &sfnt_context); } IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, ttc_context); } } else - hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void**)&font_header, 0, sizeof(*font_header), &sfnt_context); + hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void **)&table_dir, 0, + sizeof(*table_dir), &sfnt_context); if (FAILED(hr)) return hr; - table_count = GET_BE_WORD(font_header->numTables); - table_offset += sizeof(*font_header); + table_count = GET_BE_WORD(table_dir->numTables); + table_offset += sizeof(*table_dir); IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, sfnt_context); hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void **)&table_record, table_offset, table_count * sizeof(*table_record), &table_directory_context); - if (hr == S_OK) { + if (hr == S_OK) + { UINT16 i; - for (i = 0; i < table_count; i++) { - if (table_record->tag == tag) { + for (i = 0; i < table_count; ++i) + { + if (table_record->tag == tag) + { UINT32 offset = GET_BE_DWORD(table_record->offset); UINT32 length = GET_BE_DWORD(table_record->length);

1 0

Huw Davies : wineoss: Move MIDM_RESET to the unixlib.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: ab87d713265879e7785f2e8a143c932a01e241ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab87d713265879e7785f2e8a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 27 08:03:18 2022 +0100 wineoss: Move MIDM_RESET to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/midi.c | 35 +++++++-------------------------- dlls/wineoss.drv/ossmidi.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 1 + 3 files changed, 57 insertions(+), 28 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 44491a98cfa..8d4c9bab68c 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -490,31 +490,6 @@ static DWORD midClose(WORD wDevID) return ret; } -/************************************************************************** - * midReset [internal] - */ -static DWORD midReset(WORD wDevID) -{ - DWORD dwTime = GetTickCount(); - - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; - if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - - in_buffer_lock(); - while (MidiInDev[wDevID].lpQueueHdr) { - LPMIDIHDR lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime - MidiInDev[wDevID].startTime); - } - in_buffer_unlock(); - - return MMSYSERR_NOERROR; -} - /************************************************************************** * midStart [internal] */ @@ -555,6 +530,7 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { struct midi_in_message_params params; + struct notify_context notify; UINT err; TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", @@ -568,8 +544,6 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: return midClose(wDevID); - case MIDM_RESET: - return midReset(wDevID); case MIDM_START: return midStart(wDevID); case MIDM_STOP: @@ -582,8 +556,13 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, params.param_1 = dwParam1; params.param_2 = dwParam2; params.err = &err; + params.notify = &notify; - OSS_CALL(midi_in_message, &params); + do + { + OSS_CALL(midi_in_message, &params); + if ((!err || err == ERROR_RETRY) && notify.send_notify) notify_client(&notify); + } while (err == ERROR_RETRY); return err; } diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 8fca6e32c41..d63ba936239 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -155,6 +155,20 @@ NTSTATUS midi_in_lock(void *args) return STATUS_SUCCESS; } +static void set_in_notify(struct notify_context *notify, struct midi_src *src, WORD dev_id, WORD msg, + UINT_PTR param_1, UINT_PTR param_2) +{ + notify->send_notify = TRUE; + notify->dev_id = dev_id; + notify->msg = msg; + notify->param_1 = param_1; + notify->param_2 = param_2; + notify->callback = src->midiDesc.dwCallback; + notify->flags = src->wFlags; + notify->device = src->midiDesc.hMidi; + notify->instance = src->midiDesc.dwInstance; +} + static int seq_open(void) { static int midi_warn = 1; @@ -1196,6 +1210,36 @@ static UINT midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, UINT size) return MMSYSERR_NOERROR; } +static UINT midi_in_reset(WORD dev_id, struct notify_context *notify) +{ + UINT cur_time = NtGetTickCount(); + UINT err = MMSYSERR_NOERROR; + struct midi_src *src; + MIDIHDR *hdr; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID; + src = srcs + dev_id; + if (src->state == -1) return MIDIERR_NODEVICE; + + in_buffer_lock(); + + if (src->lpQueueHdr) + { + hdr = src->lpQueueHdr; + src->lpQueueHdr = hdr->lpNext; + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + set_in_notify(notify, src, dev_id, MIM_LONGDATA, (UINT_PTR)hdr, cur_time - src->startTime); + if (src->lpQueueHdr) err = ERROR_RETRY; /* ask the client to call again */ + } + + in_buffer_unlock(); + + return err; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -1254,6 +1298,8 @@ NTSTATUS midi_in_message(void *args) { struct midi_in_message_params *params = args; + params->notify->send_notify = FALSE; + switch (params->msg) { case DRVM_ENABLE: @@ -1276,6 +1322,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_GETNUMDEVS: *params->err = num_srcs; break; + case MIDM_RESET: + *params->err = midi_in_reset(params->dev_id, params->notify); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 544a462dcc4..867e1ff656e 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -264,6 +264,7 @@ struct midi_in_message_params UINT_PTR param_1; UINT_PTR param_2; UINT *err; + struct notify_context *notify; }; struct midi_seq_open_params

1 0

Jacek Caban : winex11: Use format_entry to store cached XDND formats data.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: d25c8c5770f99b29c05168855c368f7fe4583876 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d25c8c5770f99b29c0516885… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:01:17 2022 +0100 winex11: Use format_entry to store cached XDND formats data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 107 +++++++++++++++--------------------------------- 1 file changed, 32 insertions(+), 75 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index b892a70949a..34cb2a47081 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -45,14 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(xdnd); -typedef struct tagXDNDDATA -{ - int cf_win; - HANDLE contents; - struct list entry; -} XDNDDATA, *LPXDNDDATA; - -static struct list xdndData = LIST_INIT(xdndData); +static struct format_entry *xdnd_formats, *xdnd_formats_end; static POINT XDNDxy = { 0, 0 }; static IDataObject XDNDDataObject; static BOOL XDNDAccepted = FALSE; @@ -62,7 +55,6 @@ static HWND XDNDLastTargetWnd; /* might be an ancestor of XDNDLastTargetWnd */ static HWND XDNDLastDropTargetWnd; -static void X11DRV_XDND_InsertXDNDData( UINT format, HANDLE contents ); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count); static BOOL X11DRV_XDND_HasHDROP(void); @@ -529,7 +521,7 @@ 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; + struct format_entry *formats; size_t size; TRACE("count(%ld)\n", count); @@ -537,41 +529,14 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, X11DRV_XDND_FreeDragDropOp(); /* Clear previously cached data */ 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 ); - } - } - } -} - + if (!formats) return; -/************************************************************************** - * X11DRV_XDND_InsertXDNDData - * - * Cache available XDND property - */ -static void X11DRV_XDND_InsertXDNDData( UINT format, HANDLE contents ) -{ - LPXDNDDATA current = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(XDNDDATA)); - - if (current) + if ((xdnd_formats = HeapAlloc( GetProcessHeap(), 0, size ))) { - EnterCriticalSection(&xdnd_cs); - current->cf_win = format; - current->contents = contents; - list_add_tail(&xdndData, &current->entry); - LeaveCriticalSection(&xdnd_cs); + memcpy( xdnd_formats, formats, size ); + xdnd_formats_end = (struct format_entry *)((char *)xdnd_formats + size); } + free( formats ); } @@ -580,15 +545,15 @@ static void X11DRV_XDND_InsertXDNDData( UINT format, HANDLE contents ) */ static BOOL X11DRV_XDND_HasHDROP(void) { - LPXDNDDATA current = NULL; + struct format_entry *iter; BOOL found = FALSE; EnterCriticalSection(&xdnd_cs); /* Find CF_HDROP type if any */ - LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) + for (iter = xdnd_formats; iter < xdnd_formats_end; iter = next_format( iter )) { - if (current->cf_win == CF_HDROP) + if (iter->format == CF_HDROP) { found = TRUE; break; @@ -605,15 +570,15 @@ static BOOL X11DRV_XDND_HasHDROP(void) */ static HRESULT X11DRV_XDND_SendDropFiles(HWND hwnd) { + struct format_entry *iter; HRESULT hr; - LPXDNDDATA current = NULL; BOOL found = FALSE; EnterCriticalSection(&xdnd_cs); - LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) + for (iter = xdnd_formats; iter < xdnd_formats_end; iter = next_format( iter )) { - if (current->cf_win == CF_HDROP) + if (iter->format == CF_HDROP) { found = TRUE; break; @@ -621,13 +586,12 @@ static HRESULT X11DRV_XDND_SendDropFiles(HWND hwnd) } if (found) { - HGLOBAL dropHandle = GlobalAlloc(GMEM_FIXED, GlobalSize(current->contents)); + HGLOBAL dropHandle = GlobalAlloc(GMEM_FIXED, iter->size); if (dropHandle) { RECT rect; DROPFILES *lpDrop = GlobalLock(dropHandle); - memcpy(lpDrop, GlobalLock(current->contents), GlobalSize(current->contents)); - GlobalUnlock(current->contents); + memcpy(lpDrop, iter->data, iter->size); lpDrop->pt.x = XDNDxy.x; lpDrop->pt.y = XDNDxy.y; lpDrop->fNC = !(ScreenToClient(hwnd, &lpDrop->pt) && @@ -662,20 +626,12 @@ static HRESULT X11DRV_XDND_SendDropFiles(HWND hwnd) */ static void X11DRV_XDND_FreeDragDropOp(void) { - LPXDNDDATA next; - LPXDNDDATA current; - TRACE("\n"); EnterCriticalSection(&xdnd_cs); - /** Free data cache */ - LIST_FOR_EACH_ENTRY_SAFE(current, next, &xdndData, XDNDDATA, entry) - { - list_remove(&current->entry); - GlobalFree(current->contents); - HeapFree(GetProcessHeap(), 0, current); - } + HeapFree( GetProcessHeap(), 0, xdnd_formats ); + xdnd_formats = xdnd_formats_end = NULL; XDNDxy.x = XDNDxy.y = 0; XDNDLastTargetWnd = NULL; @@ -772,18 +728,18 @@ static HRESULT WINAPI XDNDDATAOBJECT_GetData(IDataObject *dataObject, hr = IDataObject_QueryGetData(dataObject, formatEtc); if (SUCCEEDED(hr)) { - XDNDDATA *current; - LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) + struct format_entry *iter; + + for (iter = xdnd_formats; iter < xdnd_formats_end; iter = next_format( iter )) { - if (current->cf_win == formatEtc->cfFormat) + if (iter->format == formatEtc->cfFormat) { pMedium->tymed = TYMED_HGLOBAL; - pMedium->u.hGlobal = GlobalAlloc(GMEM_FIXED | GMEM_ZEROINIT, GlobalSize(current->contents)); + pMedium->u.hGlobal = GlobalAlloc(GMEM_FIXED | GMEM_ZEROINIT, iter->size); if (pMedium->u.hGlobal == NULL) return E_OUTOFMEMORY; - memcpy(GlobalLock(pMedium->u.hGlobal), GlobalLock(current->contents), GlobalSize(current->contents)); + memcpy(GlobalLock(pMedium->u.hGlobal), iter->data, iter->size); GlobalUnlock(pMedium->u.hGlobal); - GlobalUnlock(current->contents); pMedium->pUnkForRelease = 0; return S_OK; } @@ -803,8 +759,8 @@ static HRESULT WINAPI XDNDDATAOBJECT_GetDataHere(IDataObject *dataObject, static HRESULT WINAPI XDNDDATAOBJECT_QueryGetData(IDataObject *dataObject, FORMATETC *formatEtc) { + struct format_entry *iter; char formatDesc[1024]; - XDNDDATA *current; TRACE("(%p, %p={.tymed=0x%x, .dwAspect=%d, .cfFormat=%d}\n", dataObject, formatEtc, formatEtc->tymed, formatEtc->dwAspect, formatEtc->cfFormat); @@ -819,9 +775,9 @@ static HRESULT WINAPI XDNDDATAOBJECT_QueryGetData(IDataObject *dataObject, * and we have no way to implement them on XDnD anyway, so ignore them too. */ - LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) + for (iter = xdnd_formats; iter < xdnd_formats_end; iter = next_format( iter )) { - if (current->cf_win == formatEtc->cfFormat) + if (iter->format == formatEtc->cfFormat) { TRACE("application found %s\n", formatDesc); return S_OK; @@ -853,7 +809,8 @@ static HRESULT WINAPI XDNDDATAOBJECT_EnumFormatEtc(IDataObject *dataObject, DWORD dwDirection, IEnumFORMATETC **ppEnumFormatEtc) { - DWORD count; + struct format_entry *iter; + DWORD count = 0; FORMATETC *formats; TRACE("(%p, %u, %p)\n", dataObject, dwDirection, ppEnumFormatEtc); @@ -864,16 +821,16 @@ static HRESULT WINAPI XDNDDATAOBJECT_EnumFormatEtc(IDataObject *dataObject, return E_NOTIMPL; } - count = list_count(&xdndData); + for (iter = xdnd_formats; iter < xdnd_formats_end; iter = next_format( iter )) count++; + formats = HeapAlloc(GetProcessHeap(), 0, count * sizeof(FORMATETC)); if (formats) { - XDNDDATA *current; DWORD i = 0; HRESULT hr; - LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) + for (iter = xdnd_formats; iter < xdnd_formats_end; iter = next_format( iter )) { - formats[i].cfFormat = current->cf_win; + formats[i].cfFormat = iter->format; formats[i].ptd = NULL; formats[i].dwAspect = DVASPECT_CONTENT; formats[i].lindex = -1;

1 0