December 2020 - Wine-Commits

Rémi Bernon : gdi32: Index scalable faces by full name in rbtree.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 7f4a8890784bea82a97f715339aa8ffd64c391f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f4a8890784bea82a97f7153… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 27 15:38:02 2020 +0100 gdi32: Index scalable faces by full name in rbtree. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 28179aec54a..7338d5fbb03 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -83,6 +83,7 @@ struct gdi_font_face struct bitmap_font_size size; /* set if face is a bitmap */ struct gdi_font_family *family; struct gdi_font_enum_data *cached_enum_data; + struct wine_rb_entry full_name_entry; }; static const struct font_backend_funcs *font_funcs; @@ -583,8 +584,20 @@ static int family_second_name_compare( const void *key, const struct wine_rb_ent return family_namecmp( (const WCHAR *)key, family->second_name ); } +static int face_full_name_compare( const void *key, const struct wine_rb_entry *entry ) +{ + const struct gdi_font_face *face = WINE_RB_ENTRY_VALUE( entry, const struct gdi_font_face, full_name_entry ); + return facename_compare( (const WCHAR *)key, face->full_name, LF_FULLFACESIZE - 1 ); +} + static struct wine_rb_tree family_name_tree = { family_name_compare }; static struct wine_rb_tree family_second_name_tree = { family_second_name_compare }; +static struct wine_rb_tree face_full_name_tree = { face_full_name_compare }; + +static int face_is_in_full_name_tree( const struct gdi_font_face *face ) +{ + return face->full_name_entry.parent || face_full_name_tree.root == &face->full_name_entry; +} static struct gdi_font_family *create_family( const WCHAR *name, const WCHAR *second_name ) { @@ -631,6 +644,13 @@ static struct gdi_font_family *find_family_from_any_name( const WCHAR *name ) return WINE_RB_ENTRY_VALUE( entry, struct gdi_font_family, second_name_entry ); } +static struct gdi_font_face *find_face_from_full_name( const WCHAR *full_name ) +{ + struct wine_rb_entry *entry; + if (!(entry = wine_rb_get( &face_full_name_tree, full_name ))) return NULL; + return WINE_RB_ENTRY_VALUE( entry, struct gdi_font_face, full_name_entry ); +} + static const struct list *get_family_face_list( const struct gdi_font_family *family ) { return family->replacement ? &family->replacement->faces : &family->faces; @@ -819,6 +839,7 @@ static void release_face( struct gdi_font_face *face ) list_remove( &face->entry ); release_family( face->family ); } + if (face_is_in_full_name_tree( face )) wine_rb_remove( &face_full_name_tree, &face->full_name_entry ); HeapFree( GetProcessHeap(), 0, face->file ); HeapFree( GetProcessHeap(), 0, face->style_name ); HeapFree( GetProcessHeap(), 0, face->full_name ); @@ -913,6 +934,11 @@ static BOOL insert_face_in_family_list( struct gdi_font_face *face, struct gdi_f face->family = family; family->refcount++; face->refcount++; + if (face_is_in_full_name_tree( cursor )) + { + wine_rb_replace( &face_full_name_tree, &cursor->full_name_entry, &face->full_name_entry ); + memset( &cursor->full_name_entry, 0, sizeof(cursor->full_name_entry) ); + } release_face( cursor ); return TRUE; } @@ -923,6 +949,7 @@ static BOOL insert_face_in_family_list( struct gdi_font_face *face, struct gdi_f TRACE( "Adding face %s in family %s from %s\n", debugstr_w(face->full_name), debugstr_w(family->family_name), debugstr_w(face->file) ); list_add_before( &cursor->entry, &face->entry ); + if (face->scalable) wine_rb_put( &face_full_name_tree, face->full_name, &face->full_name_entry ); face->family = family; family->refcount++; face->refcount++; @@ -7889,7 +7916,7 @@ static void update_external_font_keys( HKEY hkey ) static void load_registry_fonts(void) { - WCHAR value[LF_FULLFACESIZE + 12], data[MAX_PATH]; + WCHAR value[LF_FULLFACESIZE + 12], data[MAX_PATH], *tmp; DWORD i = 0, type, dlen, vlen; struct wine_rb_entry *entry; HKEY hkey; @@ -7918,6 +7945,11 @@ static void load_registry_fonts(void) goto next; } } + + if ((tmp = wcsrchr( value, ' ' )) && !facename_compare( tmp, L" (TrueType)", -1 )) *tmp = 0; + if (find_face_from_full_name( value )) goto next; + if (tmp && !*tmp) *tmp = ' '; + if (data[0] && data[1] == ':') add_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); else if (dlen >= 6 && !wcsicmp( data + dlen - 5, L".fon" ))

1 0

Nikolay Sivov : dwrite/font: Use consistent traces for the font object.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 5f219eccd5706b971069fa2a6aa0bdd635c30f2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f219eccd5706b971069fa2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 15:14:59 2020 +0300 dwrite/font: Use consistent traces for the font object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 121 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 68 insertions(+), 53 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index aa51c744297..9889add8899 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -151,9 +151,10 @@ struct dwrite_fontlist struct dwrite_fontfamily *family; }; -struct dwrite_font { +struct dwrite_font +{ IDWriteFont3 IDWriteFont3_iface; - LONG ref; + LONG refcount; DWRITE_FONT_STYLE style; struct dwrite_font_data *data; @@ -1848,9 +1849,7 @@ static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace5 static HRESULT WINAPI dwritefont_QueryInterface(IDWriteFont3 *iface, REFIID riid, void **obj) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IDWriteFont3) || IsEqualIID(riid, &IID_IDWriteFont2) || @@ -1871,57 +1870,67 @@ static HRESULT WINAPI dwritefont_QueryInterface(IDWriteFont3 *iface, REFIID riid static ULONG WINAPI dwritefont_AddRef(IDWriteFont3 *iface) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); - return ref; + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + ULONG refcount = InterlockedIncrement(&font->refcount); + + TRACE("%p, refcount %d.\n", iface, refcount); + + return refcount; } static ULONG WINAPI dwritefont_Release(IDWriteFont3 *iface) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + ULONG refcount = InterlockedDecrement(&font->refcount); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("%p, refcount %d.\n", iface, refcount); - if (!ref) { - IDWriteFontFamily2_Release(&This->family->IDWriteFontFamily2_iface); - release_font_data(This->data); - heap_free(This); + if (!refcount) + { + IDWriteFontFamily2_Release(&font->family->IDWriteFontFamily2_iface); + release_font_data(font->data); + heap_free(font); } - return ref; + return refcount; } static HRESULT WINAPI dwritefont_GetFontFamily(IDWriteFont3 *iface, IDWriteFontFamily **family) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)->(%p)\n", This, family); + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p, %p.\n", iface, family); - *family = (IDWriteFontFamily*)This->family; + *family = (IDWriteFontFamily *)font->family; IDWriteFontFamily_AddRef(*family); return S_OK; } static DWRITE_FONT_WEIGHT WINAPI dwritefont_GetWeight(IDWriteFont3 *iface) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)\n", This); - return This->data->weight; + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p.\n", iface); + + return font->data->weight; } static DWRITE_FONT_STRETCH WINAPI dwritefont_GetStretch(IDWriteFont3 *iface) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)\n", This); - return This->data->stretch; + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p.\n", iface); + + return font->data->stretch; } static DWRITE_FONT_STYLE WINAPI dwritefont_GetStyle(IDWriteFont3 *iface) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)\n", This); - return This->style; + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p.\n", iface); + + return font->style; } static BOOL WINAPI dwritefont_IsSymbolFont(IDWriteFont3 *iface) @@ -1960,17 +1969,20 @@ static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont3 *iface, static DWRITE_FONT_SIMULATIONS WINAPI dwritefont_GetSimulations(IDWriteFont3 *iface) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)\n", This); - return This->data->simulations; + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p.\n", iface); + + return font->data->simulations; } static void WINAPI dwritefont_GetMetrics(IDWriteFont3 *iface, DWRITE_FONT_METRICS *metrics) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); + struct dwrite_font *font = impl_from_IDWriteFont3(iface); - TRACE("(%p)->(%p)\n", This, metrics); - memcpy(metrics, &This->data->metrics, sizeof(*metrics)); + TRACE("%p, %p.\n", iface, metrics); + + memcpy(metrics, &font->data->metrics, sizeof(*metrics)); } static BOOL dwritefont_has_character(struct dwrite_font *font, UINT32 ch) @@ -2003,16 +2015,20 @@ static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont3 *iface, IDWriteFont static void WINAPI dwritefont1_GetMetrics(IDWriteFont3 *iface, DWRITE_FONT_METRICS1 *metrics) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)->(%p)\n", This, metrics); - *metrics = This->data->metrics; + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p, %p.\n", iface, metrics); + + *metrics = font->data->metrics; } static void WINAPI dwritefont1_GetPanose(IDWriteFont3 *iface, DWRITE_PANOSE *panose) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)->(%p)\n", This, panose); - *panose = This->data->panose; + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p, %p.\n", iface, panose); + + *panose = font->data->panose; } static HRESULT WINAPI dwritefont1_GetUnicodeRanges(IDWriteFont3 *iface, UINT32 max_count, DWRITE_UNICODE_RANGE *ranges, @@ -2093,8 +2109,8 @@ static BOOL WINAPI dwritefont3_HasCharacter(IDWriteFont3 *iface, UINT32 ch) static DWRITE_LOCALITY WINAPI dwritefont3_GetLocality(IDWriteFont3 *iface) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - FIXME("(%p): stub\n", This); + FIXME("%p: stub.\n", iface); + return DWRITE_LOCALITY_LOCAL; } @@ -2179,23 +2195,22 @@ HRESULT get_fontsig_from_fontface(IDWriteFontFace *iface, FONTSIGNATURE *fontsig static HRESULT create_font(struct dwrite_fontfamily *family, UINT32 index, IDWriteFont3 **font) { - struct dwrite_font *This; + struct dwrite_font *object; *font = NULL; - This = heap_alloc(sizeof(*This)); - if (!This) + if (!(object = heap_alloc(sizeof(*object)))) return E_OUTOFMEMORY; - This->IDWriteFont3_iface.lpVtbl = &dwritefontvtbl; - This->ref = 1; - This->family = family; + object->IDWriteFont3_iface.lpVtbl = &dwritefontvtbl; + object->refcount = 1; + object->family = family; IDWriteFontFamily2_AddRef(&family->IDWriteFontFamily2_iface); - This->data = family->data->fonts[index]; - This->style = This->data->style; - addref_font_data(This->data); + object->data = family->data->fonts[index]; + object->style = object->data->style; + addref_font_data(object->data); - *font = &This->IDWriteFont3_iface; + *font = &object->IDWriteFont3_iface; return S_OK; }

1 0

Nikolay Sivov : mf/topoloader: Set MF_TOPONODE_MEDIASTART for all source nodes.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: deda3f8172efc8b4ab19367680f383d9d65b121e URL: https://source.winehq.org/git/wine.git/?a=commit;h=deda3f8172efc8b4ab193676… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 15:16:28 2020 +0300 mf/topoloader: Set MF_TOPONODE_MEDIASTART for all source nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 8 ++++++++ dlls/mf/topology.c | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c36a76d83bb..b2cb45668cb 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2136,6 +2136,7 @@ static void test_topology_loader_evr(void) IMFTopoLoader *loader; IMFMediaSink *sink; WORD node_count; + UINT64 value64; HWND window; HRESULT hr; @@ -2232,6 +2233,13 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!value, "Unexpected stream id %u.\n", value); } + else if (node_type == MF_TOPOLOGY_SOURCESTREAM_NODE) + { + value64 = 1; + hr = IMFTopologyNode_GetUINT64(node, &MF_TOPONODE_MEDIASTART, &value64); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!value64, "Unexpected value.\n"); + } } IMFTopology_Release(full_topology); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 6f73bb859cd..825b9d538f3 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2380,10 +2380,16 @@ static void topology_loader_resolve_complete(struct topoloader_context *context) if (node_type == MF_TOPOLOGY_OUTPUT_NODE) { - /* Make sure MF_TOPONODE_STREAMID is set for all outputs. */ + /* Set MF_TOPONODE_STREAMID for all outputs. */ if (FAILED(IMFTopologyNode_GetItem(node, &MF_TOPONODE_STREAMID, NULL))) IMFTopologyNode_SetUINT32(node, &MF_TOPONODE_STREAMID, 0); } + else if (node_type == MF_TOPOLOGY_SOURCESTREAM_NODE) + { + /* Set MF_TOPONODE_MEDIASTART for all sources. */ + if (FAILED(IMFTopologyNode_GetItem(node, &MF_TOPONODE_MEDIASTART, NULL))) + IMFTopologyNode_SetUINT64(node, &MF_TOPONODE_MEDIASTART, 0); + } IMFTopologyNode_Release(node); }

1 0

Nikolay Sivov : mf/topoloader: Set MF_TOPONODE_TRANSFORM_OBJECTID for created transforms when CLSID is available.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: a50bd9d12fba087b5648fb3d73c0e5cae2e79559 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a50bd9d12fba087b5648fb3d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 15:16:26 2020 +0300 mf/topoloader: Set MF_TOPONODE_TRANSFORM_OBJECTID for created transforms when CLSID is available. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 6 ++++++ dlls/mf/topology.c | 13 +++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index d7d7fdfa60e..4d4c6283be8 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2045,6 +2045,9 @@ todo_wine { ok(value == 1, "Unexpected value.\n"); } + hr = IMFTopologyNode_GetItem(mft_node, &MF_TOPONODE_TRANSFORM_OBJECTID, NULL); + ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); + hr = IUnknown_QueryInterface(node_object, &IID_IMFTransform, (void **)&transform); ok(hr == S_OK, "Failed to get IMFTransform from transform node's object, hr %#x.\n", hr); IUnknown_Release(node_object); @@ -2068,6 +2071,9 @@ todo_wine { ok(hr == S_OK, "Failed to get transform node type in resolved topology, hr %#x.\n", hr); ok(node_type == MF_TOPOLOGY_TRANSFORM_NODE, "Unexpected node type %u.\n", node_type); + hr = IMFTopologyNode_GetItem(mft_node, &MF_TOPONODE_TRANSFORM_OBJECTID, NULL); + ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); + hr = IMFTopologyNode_GetObject(mft_node, &node_object); ok(hr == S_OK, "Failed to get object of transform node, hr %#x.\n", hr); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index efa28e9f457..77baa1128c4 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1996,7 +1996,7 @@ struct transform_output_type { IMFMediaType *type; IMFTransform *transform; - const GUID *category; + IMFActivate *activate; }; struct connect_context @@ -2054,7 +2054,7 @@ static HRESULT topology_loader_enumerate_output_types(const GUID *category, IMFM unsigned int output_count = 0; output_type.transform = transform; - output_type.category = category; + output_type.activate = activates[i]; while (SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, output_count++, &output_type.type))) { hr = connect_func(&output_type, context); @@ -2079,17 +2079,22 @@ static HRESULT topology_loader_create_transform(const struct transform_output_ty IMFTopologyNode **node) { HRESULT hr; + GUID guid; if (FAILED(hr = MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, node))) return hr; IMFTopologyNode_SetObject(*node, (IUnknown *)output_type->transform); - if (IsEqualGUID(output_type->category, &MFT_CATEGORY_AUDIO_DECODER) || - IsEqualGUID(output_type->category, &MFT_CATEGORY_VIDEO_DECODER)) + + if (SUCCEEDED(IMFActivate_GetGUID(output_type->activate, &MF_TRANSFORM_CATEGORY_Attribute, &guid)) && + (IsEqualGUID(&guid, &MFT_CATEGORY_AUDIO_DECODER) || IsEqualGUID(&guid, &MFT_CATEGORY_VIDEO_DECODER))) { IMFTopologyNode_SetUINT32(*node, &MF_TOPONODE_DECODER, 1); } + if (SUCCEEDED(IMFActivate_GetGUID(output_type->activate, &MFT_TRANSFORM_CLSID_Attribute, &guid))) + IMFTopologyNode_SetGUID(*node, &MF_TOPONODE_TRANSFORM_OBJECTID, &guid); + return hr; }

1 0

Nikolay Sivov : mfplat/mediatype: Do not add user data when converting from WAVE_FORMAT_EXTENSIBLE.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 940adfdd56607cfd191baca815d9057b4915006f URL: https://source.winehq.org/git/wine.git/?a=commit;h=940adfdd56607cfd191baca8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 15:16:24 2020 +0300 mfplat/mediatype: Do not add user data when converting from WAVE_FORMAT_EXTENSIBLE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 2 +- dlls/mfplat/tests/mfplat.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 62d75e80146..2bf9b674ea7 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3011,7 +3011,7 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA mediatype_set_uint32(mediatype, &MF_MT_ALL_SAMPLES_INDEPENDENT, 1, &hr); } - if (format->cbSize) + if (format->cbSize && format->wFormatTag != WAVE_FORMAT_EXTENSIBLE) mediatype_set_blob(mediatype, &MF_MT_USER_DATA, (const UINT8 *)(format + 1), format->cbSize, &hr); return hr; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 38e8acb966e..b361d4da162 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5625,9 +5625,13 @@ static void test_MFInitMediaTypeFromWaveFormatEx(void) waveformatext.dwChannelMask = 0x8; memcpy(&waveformatext.SubFormat, &MFAudioFormat_Base, sizeof(waveformatext.SubFormat)); waveformatext.SubFormat.Data1 = waveformatex_tests[i].wFormatTag; + hr = MFInitMediaTypeFromWaveFormatEx(mediatype, &waveformatext.Format, sizeof(waveformatext)); ok(hr == S_OK, "Failed to initialize media type, hr %#x.\n", hr); + hr = IMFMediaType_GetItem(mediatype, &MF_MT_USER_DATA, NULL); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + validate_media_type(mediatype, &waveformatext.Format); }

1 0

Zebediah Figura : quartz/dsoundrender: Don't drop stream_cs in DSoundRender_HandleEndOfStream().
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 2d6043eb4f2f1b104416137ff7f5caecfcf62d66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d6043eb4f2f1b104416137f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 30 23:51:33 2020 -0600 quartz/dsoundrender: Don't drop stream_cs in DSoundRender_HandleEndOfStream(). We don't grab stream_cs to change any variables checked here, except to reset flush_event, and that cannot result in a deadlock. The only possible deadlocks here are: (1) between this function and Receive(), which is correct, as the two should presumably be serialized; (2) between this function and EndFlush(); however, in that case we expect BeginFlush() first, which will unblock the streaming thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 788643af372..98ff21c0da1 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -236,9 +236,7 @@ static HRESULT DSoundRender_HandleEndOfStream(struct dsound_render *This) if (pos1 == pos2) break; - LeaveCriticalSection(&This->stream_cs); WaitForSingleObject(This->flush_event, 10); - EnterCriticalSection(&This->stream_cs); } return S_OK;

1 0

Alexandre Julliard : libport: Remove the ffs() function replacement.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: c4e45400533f5d361fa56cb372f60c8fee627ef3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4e45400533f5d361fa56cb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 10:16:59 2020 +0100 libport: Remove the ffs() function replacement. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- include/wine/port.h | 5 ---- libs/port/Makefile.in | 1 - libs/port/ffs.c | 64 --------------------------------------------------- 6 files changed, 75 deletions(-) diff --git a/configure b/configure index e6596361ff1..0e3ef007a84 100755 --- a/configure +++ b/configure @@ -17754,7 +17754,6 @@ for ac_func in \ __res_getservers \ _spawnvp \ epoll_create \ - ffs \ fnmatch \ fork \ fstatfs \ diff --git a/configure.ac b/configure.ac index 705ab04295d..2b6ab1543cf 100644 --- a/configure.ac +++ b/configure.ac @@ -2163,7 +2163,6 @@ AC_CHECK_FUNCS(\ __res_getservers \ _spawnvp \ epoll_create \ - ffs \ fnmatch \ fork \ fstatfs \ diff --git a/include/config.h.in b/include/config.h.in index 7367a5ac8dd..c047fb471b4 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -162,9 +162,6 @@ /* Define to 1 if you have the <FAudio.h> header file. */ #undef HAVE_FAUDIO_H -/* Define to 1 if you have the `ffs' function. */ -#undef HAVE_FFS - /* Define to 1 if you have the <float.h> header file. */ #undef HAVE_FLOAT_H diff --git a/include/wine/port.h b/include/wine/port.h index 993cf483c15..c963abbd4e0 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -274,10 +274,6 @@ extern int getopt_long_only (int ___argc, char *const *___argv, const struct option *__longopts, int *__longind); #endif /* HAVE_GETOPT_LONG_ONLY */ -#ifndef HAVE_FFS -int ffs( int x ); -#endif - #ifndef HAVE_LSTAT int lstat(const char *file_name, struct stat *buf); #endif /* HAVE_LSTAT */ @@ -332,7 +328,6 @@ extern int mkstemps(char *template, int suffix_len); #define __WINE_NOT_PORTABLE(func) func##_is_not_portable func##_is_not_portable -#define ffs __WINE_NOT_PORTABLE(ffs) #define fstatvfs __WINE_NOT_PORTABLE(fstatvfs) #define getopt_long __WINE_NOT_PORTABLE(getopt_long) #define getopt_long_only __WINE_NOT_PORTABLE(getopt_long_only) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 435598c2856..7c9c27da1fe 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -1,7 +1,6 @@ STATICLIB = libwine_port.a C_SRCS = \ - ffs.c \ fstatvfs.c \ getopt.c \ isfinite.c \ diff --git a/libs/port/ffs.c b/libs/port/ffs.c deleted file mode 100644 index 76330559b5a..00000000000 --- a/libs/port/ffs.c +++ /dev/null @@ -1,64 +0,0 @@ -/* - * ffs function - * - * Copyright 2004 Hans Leidekker - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#ifndef HAVE_FFS -int ffs( int x ) -{ - unsigned int y = (unsigned int)x; - - if (y & 0x00000001) return 1; - if (y & 0x00000002) return 2; - if (y & 0x00000004) return 3; - if (y & 0x00000008) return 4; - if (y & 0x00000010) return 5; - if (y & 0x00000020) return 6; - if (y & 0x00000040) return 7; - if (y & 0x00000080) return 8; - if (y & 0x00000100) return 9; - if (y & 0x00000200) return 10; - if (y & 0x00000400) return 11; - if (y & 0x00000800) return 12; - if (y & 0x00001000) return 13; - if (y & 0x00002000) return 14; - if (y & 0x00004000) return 15; - if (y & 0x00008000) return 16; - if (y & 0x00010000) return 17; - if (y & 0x00020000) return 18; - if (y & 0x00040000) return 19; - if (y & 0x00080000) return 20; - if (y & 0x00100000) return 21; - if (y & 0x00200000) return 22; - if (y & 0x00400000) return 23; - if (y & 0x00800000) return 24; - if (y & 0x01000000) return 25; - if (y & 0x02000000) return 26; - if (y & 0x04000000) return 27; - if (y & 0x08000000) return 28; - if (y & 0x10000000) return 29; - if (y & 0x20000000) return 30; - if (y & 0x40000000) return 31; - if (y & 0x80000000) return 32; - - return 0; -} -#endif /* HAVE_FFS */

1 0

Alexandre Julliard : libport: Remove the strnlen() function replacement.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: db7c934f8e141315824004cbd90ecda07f12ba6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=db7c934f8e141315824004cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 10:19:50 2020 +0100 libport: Remove the strnlen() function replacement. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/wined3d/shader_sm4.c | 7 +------ include/config.h.in | 3 --- include/wine/port.h | 5 ----- libs/port/Makefile.in | 1 - libs/port/strnlen.c | 31 ------------------------------- 7 files changed, 1 insertion(+), 48 deletions(-) diff --git a/configure b/configure index 6c2bcc37f95..7ac509dec10 100755 --- a/configure +++ b/configure @@ -17783,7 +17783,6 @@ for ac_func in \ setprogname \ settimeofday \ sigprocmask \ - strnlen \ strtold \ symlink \ sysinfo \ diff --git a/configure.ac b/configure.ac index 2233c7266fc..69254a9631d 100644 --- a/configure.ac +++ b/configure.ac @@ -2192,7 +2192,6 @@ AC_CHECK_FUNCS(\ setprogname \ settimeofday \ sigprocmask \ - strnlen \ strtold \ symlink \ sysinfo \ diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 90135553d8f..4635910269f 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1939,18 +1939,13 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, static const char *shader_get_string(const char *data, size_t data_size, DWORD offset) { - size_t len, max_len; - if (offset >= data_size) { WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); return NULL; } - max_len = data_size - offset; - len = strnlen(data + offset, max_len); - - if (len == max_len) + if (!memchr( data + offset, 0, data_size - offset )) return NULL; return data + offset; diff --git a/include/config.h.in b/include/config.h.in index 94232030cf0..a6d45bf031f 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -807,9 +807,6 @@ /* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H -/* Define to 1 if you have the `strnlen' function. */ -#undef HAVE_STRNLEN - /* Define to 1 if you have the <stropts.h> header file. */ #undef HAVE_STROPTS_H diff --git a/include/wine/port.h b/include/wine/port.h index 2b127e59e20..a4bcbc757b7 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -273,10 +273,6 @@ ssize_t pwrite( int fd, const void *buf, size_t count, off_t offset ); int readlink( const char *path, char *buf, size_t size ); #endif /* HAVE_READLINK */ -#ifndef HAVE_STRNLEN -size_t strnlen( const char *str, size_t maxlen ); -#endif /* !defined(HAVE_STRNLEN) */ - #ifndef HAVE_SYMLINK int symlink(const char *from, const char *to); #endif @@ -296,7 +292,6 @@ extern int mkstemps(char *template, int suffix_len); #define lstat __WINE_NOT_PORTABLE(lstat) #define pread __WINE_NOT_PORTABLE(pread) #define pwrite __WINE_NOT_PORTABLE(pwrite) -#define strnlen __WINE_NOT_PORTABLE(strnlen) #define usleep __WINE_NOT_PORTABLE(usleep) #endif /* NO_LIBWINE_PORT */ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 8a963d22b8d..26b8fae4f3d 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -12,6 +12,5 @@ C_SRCS = \ pwrite.c \ readlink.c \ spawn.c \ - strnlen.c \ symlink.c \ usleep.c diff --git a/libs/port/strnlen.c b/libs/port/strnlen.c deleted file mode 100644 index ab6668d3466..00000000000 --- a/libs/port/strnlen.c +++ /dev/null @@ -1,31 +0,0 @@ -/* - * strnlen function - * - * Copyright 2017 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#ifndef HAVE_STRNLEN -size_t strnlen( const char *str, size_t maxlen ) -{ - const char *ptr = memchr( str, 0, maxlen ); - if (!ptr) return maxlen; - return ptr - str; -} -#endif /* HAVE_STRNLEN */

1 0

Alexandre Julliard : libport: Remove the usleep() function replacement.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 7b4e10c7076ae97145de0c8a1575bf9590f6edb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b4e10c7076ae97145de0c8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 10:21:21 2020 +0100 libport: Remove the usleep() function replacement. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 +--- configure.ac | 4 +--- dlls/winex11.drv/clipboard.c | 6 +++--- include/config.h.in | 6 ------ include/wine/port.h | 5 ----- libs/port/Makefile.in | 3 +-- libs/port/usleep.c | 47 -------------------------------------------- 7 files changed, 6 insertions(+), 69 deletions(-) diff --git a/configure b/configure index 7ac509dec10..283cac2f979 100755 --- a/configure +++ b/configure @@ -17778,7 +17778,6 @@ for ac_func in \ readdir \ readlink \ sched_yield \ - select \ setproctitle \ setprogname \ settimeofday \ @@ -17787,8 +17786,7 @@ for ac_func in \ symlink \ sysinfo \ tcdrain \ - thr_kill2 \ - usleep + thr_kill2 do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index 69254a9631d..853f99e8b1c 100644 --- a/configure.ac +++ b/configure.ac @@ -2187,7 +2187,6 @@ AC_CHECK_FUNCS(\ readdir \ readlink \ sched_yield \ - select \ setproctitle \ setprogname \ settimeofday \ @@ -2196,8 +2195,7 @@ AC_CHECK_FUNCS(\ symlink \ sysinfo \ tcdrain \ - thr_kill2 \ - usleep + thr_kill2 ) CFLAGS="$ac_save_CFLAGS" diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 695c0406a80..8a0617cfede 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -95,7 +95,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(clipboard); /* Maximum wait time for selection notify */ #define SELECTION_RETRIES 500 /* wait for .5 seconds */ -#define SELECTION_WAIT 1000 /* us */ +#define SELECTION_WAIT 1 /* ms */ #define SELECTION_UPDATE_DELAY 2000 /* delay between checks of the X11 selection */ @@ -458,7 +458,7 @@ static BOOL convert_selection( Display *display, Window win, Atom selection, Bool res = XCheckTypedWindowEvent( display, win, SelectionNotify, &event ); if (res && event.xselection.selection == selection && event.xselection.target == format->atom) return read_property( display, win, event.xselection.property, type, data, size ); - usleep( SELECTION_WAIT ); + Sleep( SELECTION_WAIT ); } ERR( "Timed out waiting for SelectionNotify event\n" ); return FALSE; @@ -1691,7 +1691,7 @@ static BOOL read_property( Display *display, Window w, Atom prop, if (res && xe.xproperty.atom == prop && xe.xproperty.state == PropertyNewValue) break; - usleep(SELECTION_WAIT); + Sleep(SELECTION_WAIT); } if (i >= SELECTION_RETRIES || diff --git a/include/config.h.in b/include/config.h.in index a6d45bf031f..0bed21d9cea 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -762,9 +762,6 @@ /* Define to 1 if you have the <Security/Security.h> header file. */ #undef HAVE_SECURITY_SECURITY_H -/* Define to 1 if you have the `select' function. */ -#undef HAVE_SELECT - /* Define to 1 if you have the `setproctitle' function. */ #undef HAVE_SETPROCTITLE @@ -1118,9 +1115,6 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the `usleep' function. */ -#undef HAVE_USLEEP - /* Define to 1 if you have the <utime.h> header file. */ #undef HAVE_UTIME_H diff --git a/include/wine/port.h b/include/wine/port.h index a4bcbc757b7..936f69d3bde 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -277,10 +277,6 @@ int readlink( const char *path, char *buf, size_t size ); int symlink(const char *from, const char *to); #endif -#ifndef HAVE_USLEEP -int usleep (unsigned int useconds); -#endif /* !defined(HAVE_USLEEP) */ - extern int mkstemps(char *template, int suffix_len); #else /* NO_LIBWINE_PORT */ @@ -292,7 +288,6 @@ extern int mkstemps(char *template, int suffix_len); #define lstat __WINE_NOT_PORTABLE(lstat) #define pread __WINE_NOT_PORTABLE(pread) #define pwrite __WINE_NOT_PORTABLE(pwrite) -#define usleep __WINE_NOT_PORTABLE(usleep) #endif /* NO_LIBWINE_PORT */ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 26b8fae4f3d..764a56f62ae 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -12,5 +12,4 @@ C_SRCS = \ pwrite.c \ readlink.c \ spawn.c \ - symlink.c \ - usleep.c + symlink.c diff --git a/libs/port/usleep.c b/libs/port/usleep.c deleted file mode 100644 index da4ee3581c9..00000000000 --- a/libs/port/usleep.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * usleep function - * - * Copyright 1996 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#include <errno.h> - -#ifndef HAVE_USLEEP -int usleep (unsigned int useconds) -{ -#if defined(__EMX__) - DosSleep(useconds); - return 0; -#elif defined(__BEOS__) - return snooze(useconds); -#elif defined(HAVE_SELECT) - struct timeval delay; - - delay.tv_sec = useconds / 1000000; - delay.tv_usec = useconds % 1000000; - - select( 0, 0, 0, 0, &delay ); - return 0; -#else /* defined(__EMX__) || defined(__BEOS__) || defined(HAVE_SELECT) */ - errno = ENOSYS; - return -1; -#endif /* defined(__EMX__) || defined(__BEOS__) || defined(HAVE_SELECT) */ -} -#endif /* HAVE_USLEEP */

1 0

Alexandre Julliard : makedep: No longer use wine/port.h.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 0b9963ad346927fc7958687fa419c9f8062fdd32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b9963ad346927fc7958687f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 10:25:17 2020 +0100 makedep: No longer use wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/port.h | 14 -------------- tools/makedep.c | 10 ++++++++-- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index b1354395ca9..9c2eb7277bf 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -165,8 +165,6 @@ extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]); * Function definitions (only when using libwine_port) */ -#ifndef NO_LIBWINE_PORT - #ifndef HAVE_GETOPT_LONG_ONLY extern char *optarg; extern int optind; @@ -230,16 +228,4 @@ int symlink(const char *from, const char *to); extern int mkstemps(char *template, int suffix_len); -#else /* NO_LIBWINE_PORT */ - -#define __WINE_NOT_PORTABLE(func) func##_is_not_portable func##_is_not_portable - -#define getopt_long __WINE_NOT_PORTABLE(getopt_long) -#define getopt_long_only __WINE_NOT_PORTABLE(getopt_long_only) -#define lstat __WINE_NOT_PORTABLE(lstat) -#define pread __WINE_NOT_PORTABLE(pread) -#define pwrite __WINE_NOT_PORTABLE(pwrite) - -#endif /* NO_LIBWINE_PORT */ - #endif /* !defined(__WINE_WINE_PORT_H) */ diff --git a/tools/makedep.c b/tools/makedep.c index cee64fd61bf..f769713a8cf 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -19,20 +19,26 @@ */ #include "config.h" -#define NO_LIBWINE_PORT -#include "wine/port.h" #include <assert.h> #include <ctype.h> #include <errno.h> +#include <fcntl.h> #include <stdio.h> #include <stdlib.h> #include <stdarg.h> #include <signal.h> #include <string.h> +#include <sys/types.h> +#include <sys/stat.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif +#if defined(_WIN32) && !defined(__CYGWIN__) +#include <direct.h> +#include <io.h> +#define mkdir(path,mode) mkdir(path) +#endif #include "wine/list.h" struct strarray

1 0