March 2021 - Wine-Commits - list.winehq.org

Nikolay Sivov : dwrite: Remove unused type definitions.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 9ea34503012fe32c420f4f94b37a685d19632544 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ea34503012fe32c420f4f94… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 8 11:30:51 2021 +0300 dwrite: Remove unused type definitions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 01bf1ce0a09..717b1ea0351 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -400,7 +400,7 @@ struct ot_script WORD default_langsys; WORD langsys_count; struct ot_langsys_record langsys[1]; -} OT_Script; +}; struct ot_script_record { @@ -802,25 +802,6 @@ struct ot_gpos_mark_to_mark_format1 WORD mark2_array; }; -typedef struct { - WORD SubstFormat; - WORD Coverage; - WORD DeltaGlyphID; -} GSUB_SingleSubstFormat1; - -typedef struct { - WORD SubstFormat; - WORD Coverage; - WORD GlyphCount; - WORD Substitute[1]; -} GSUB_SingleSubstFormat2; - -typedef struct { - WORD SubstFormat; - WORD ExtensionLookupType; - DWORD ExtensionOffset; -} GSUB_ExtensionPosFormat1; - struct kern_header { WORD version;

1 0

Zebediah Figura : strmbase: Remove the unused "dropped" field from struct strmbase_qc.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 92aacce542402e8ac872b3b19dd0498929aea0d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92aacce542402e8ac872b3b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 7 14:49:06 2021 -0600 strmbase: Remove the unused "dropped" field from struct strmbase_qc. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 3 --- include/wine/strmbase.h | 1 - 2 files changed, 4 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index c9325e5c93d..ffe8d3cc957 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -62,7 +62,6 @@ static void QualityControlRender_Start(struct strmbase_qc *This, REFERENCE_TIME This->avg_render = This->last_in_time = This->last_left = This->avg_duration = This->avg_pt = -1; This->clockstart = tStart; This->avg_rate = -1.0; - This->dropped = 0; This->is_dropped = FALSE; } @@ -238,8 +237,6 @@ static void QualityControlRender_BeginRender(struct strmbase_qc *This, REFERENCE This->is_dropped = QualityControlRender_IsLate(This, This->current_jitter, start, stop); TRACE("dropped %d, start %s, stop %s, jitter %s.\n", This->is_dropped, debugstr_time(start), debugstr_time(stop), debugstr_time(This->current_jitter)); - if (This->is_dropped) - This->dropped++; if (!This->pin->filter->clock) return; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index d2877477321..3a5a0c0e25e 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -282,7 +282,6 @@ struct strmbase_qc REFERENCE_TIME last_in_time, last_left, avg_duration, avg_pt, avg_render, start, stop; REFERENCE_TIME current_jitter, current_rstart, current_rstop, clockstart; double avg_rate; - LONG64 dropped; BOOL is_dropped; };

1 0

Zebediah Figura : strmbase: Remove the unused "qos_handled" field from struct strmbase_qc.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 4d400a71fab08a99e102117ecaf48b82ae13d51f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d400a71fab08a99e102117e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 7 14:49:04 2021 -0600 strmbase: Remove the unused "qos_handled" field from struct strmbase_qc. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 5 +---- include/wine/strmbase.h | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index f3869c868dc..5af3fca4e5f 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -64,7 +64,6 @@ static void QualityControlRender_Start(struct strmbase_qc *This, REFERENCE_TIME This->avg_rate = -1.0; This->rendered = This->dropped = 0; This->is_dropped = FALSE; - This->qos_handled = TRUE; /* Lie that will be corrected on first adjustment */ } static BOOL QualityControlRender_IsLate(struct strmbase_qc *This, REFERENCE_TIME jitter, @@ -187,7 +186,6 @@ static void QualityControlRender_DoQOS(struct strmbase_qc *priv) if (priv->avg_rate >= 0.0) { - HRESULT hr; Quality q; /* If we have a valid rate, start sending QoS messages. */ @@ -211,8 +209,7 @@ static void QualityControlRender_DoQOS(struct strmbase_qc *priv) q.Proportion = 5000; q.Late = priv->current_jitter; q.TimeStamp = priv->current_rstart; - hr = IQualityControl_Notify(&priv->IQualityControl_iface, &priv->pin->filter->IBaseFilter_iface, q); - priv->qos_handled = hr == S_OK; + IQualityControl_Notify(&priv->IQualityControl_iface, &priv->pin->filter->IBaseFilter_iface, q); } /* Record when this buffer will leave us. */ diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 51dcb3a8c55..848f4bac35b 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -283,7 +283,7 @@ struct strmbase_qc REFERENCE_TIME current_jitter, current_rstart, current_rstop, clockstart; double avg_rate; LONG64 rendered, dropped; - BOOL qos_handled, is_dropped; + BOOL is_dropped; }; struct strmbase_renderer

1 0

Huw Davies : winemac: Add discardEventsPassingTest to WineEventQueue's interface.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 7a68ae5951160c631bfcfc0b6a3acf76188b4c04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a68ae5951160c631bfcfc0b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 8 10:42:02 2021 +0000 winemac: Add discardEventsPassingTest to WineEventQueue's interface. This is called from the status item implementation. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_event.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/cocoa_event.h b/dlls/winemac.drv/cocoa_event.h index 72ff8f9c6d4..1cc7e8ac4ba 100644 --- a/dlls/winemac.drv/cocoa_event.h +++ b/dlls/winemac.drv/cocoa_event.h @@ -53,6 +53,7 @@ enum { - (void) postEvent:(macdrv_event*)inEvent; - (void) discardEventsMatchingMask:(macdrv_event_mask)mask forWindow:(NSWindow*)window; + - (void) discardEventsPassingTest:(BOOL (^)(macdrv_event* event))block; - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout flags:(NSUInteger)flags; - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout;

1 0

Nikolay Sivov : dwrite: Check for vertical variants only when asked.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: f8e3cba7462eaa936a14add168ffe2fcb7d839ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8e3cba7462eaa936a14add1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 8 11:30:49 2021 +0300 dwrite: Check for vertical variants only when asked. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 13 +++++++------ dlls/dwrite/font.c | 4 +--- dlls/dwrite/opentype.c | 12 ++++++++++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 4628a2a3704..27f4906a00d 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -182,11 +182,12 @@ struct fontfacecached enum font_flags { - FONT_IS_SYMBOL = 1 << 0, - FONT_IS_MONOSPACED = 1 << 1, - FONT_IS_COLORED = 1 << 2, /* CPAL/COLR support */ - FONTFACE_HAS_KERNING_PAIRS = 1 << 3, - FONTFACE_HAS_VERTICAL_VARIANTS = 1 << 4 + FONT_IS_SYMBOL = 0x00000001, + FONT_IS_MONOSPACED = 0x00000002, + FONT_IS_COLORED = 0x00000004, /* CPAL/COLR support */ + FONTFACE_HAS_KERNING_PAIRS = 0x00000008, + FONTFACE_VERTICAL_VARIANTS = 0x00000010, + FONTFACE_NO_VERTICAL_VARIANTS = 0x00000020, }; struct dwrite_cmap; @@ -257,7 +258,7 @@ struct dwrite_fontface unsigned int ascent; unsigned int descent; } typo_metrics; - UINT32 flags; + unsigned int flags; struct dwrite_cmap cmap; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9386e9bec3f..5a96ccc71a0 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1217,7 +1217,7 @@ static BOOL WINAPI dwritefontface1_HasVerticalGlyphVariants(IDWriteFontFace5 *if TRACE("%p.\n", iface); - return !!(fontface->flags & FONTFACE_HAS_VERTICAL_VARIANTS); + return opentype_has_vertical_variants(fontface); } static BOOL WINAPI dwritefontface2_IsColorFont(IDWriteFontFace5 *iface) @@ -5004,8 +5004,6 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li if (freetype_has_kerning_pairs(&fontface->IDWriteFontFace5_iface)) fontface->flags |= FONTFACE_HAS_KERNING_PAIRS; - if (opentype_has_vertical_variants(fontface)) - fontface->flags |= FONTFACE_HAS_VERTICAL_VARIANTS; fontface->glyph_image_formats = opentype_get_glyph_image_formats(&fontface->IDWriteFontFace5_iface); /* Font properties are reused from font object when 'normal' face creation path is used: diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 39943c52c9a..45967a12f0a 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -6342,6 +6342,9 @@ BOOL opentype_has_vertical_variants(struct dwrite_fontface *fontface) struct lookups lookups = { 0 }; UINT16 format; + if (fontface->flags & (FONTFACE_VERTICAL_VARIANTS | FONTFACE_NO_VERTICAL_VARIANTS)) + return !!(fontface->flags & FONTFACE_VERTICAL_VARIANTS); + context.cache = fontface_get_shaping_cache(fontface); context.table = &context.cache->gsub; @@ -6384,7 +6387,12 @@ BOOL opentype_has_vertical_variants(struct dwrite_fontface *fontface) heap_free(lookups.lookups); - return !!count; + if (count) + fontface->flags |= FONTFACE_VERTICAL_VARIANTS; + else + fontface->flags |= FONTFACE_NO_VERTICAL_VARIANTS; + + return !!(fontface->flags & FONTFACE_VERTICAL_VARIANTS); } HRESULT opentype_get_vertical_glyph_variants(struct dwrite_fontface *fontface, unsigned int glyph_count, @@ -6398,7 +6406,7 @@ HRESULT opentype_get_vertical_glyph_variants(struct dwrite_fontface *fontface, u memcpy(glyphs, nominal_glyphs, glyph_count * sizeof(*glyphs)); - if (!(fontface->flags & FONTFACE_HAS_VERTICAL_VARIANTS)) + if (!opentype_has_vertical_variants(fontface)) return S_OK; context.cache = fontface_get_shaping_cache(fontface);

1 0

Nikolay Sivov : dwrite: Limit to exactly one font file per fontface.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 7b540f8bc8114c7cd51c03473307f2c3cf22975d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b540f8bc8114c7cd51c0347… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 8 11:30:47 2021 +0300 dwrite: Limit to exactly one font file per fontface. Multiple files only existed in initial API version, formats using multiple files were never supported, and newer API often operates on a single file instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 6 ++--- dlls/dwrite/font.c | 59 ++++++++++++++------------------------------ dlls/dwrite/main.c | 3 +-- 3 files changed, 22 insertions(+), 46 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index d28c6cef870..4628a2a3704 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -154,9 +154,8 @@ struct fontface_desc { IDWriteFactory7 *factory; DWRITE_FONT_FACE_TYPE face_type; - IDWriteFontFile * const *files; + IDWriteFontFile *file; IDWriteFontFileStream *stream; - UINT32 files_number; UINT32 index; DWRITE_FONT_SIMULATIONS simulations; struct dwrite_font_data *font_data; /* could be NULL when face is created directly with IDWriteFactory::CreateFontFace() */ @@ -243,8 +242,7 @@ struct dwrite_fontface LONG refcount; IDWriteFontFileStream *stream; - IDWriteFontFile **files; - UINT32 file_count; + IDWriteFontFile *file; UINT32 index; IDWriteFactory7 *factory; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8a5033ab64f..9386e9bec3f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -639,14 +639,10 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace5 *iface) IDWriteFontFace5_ReleaseFontTable(iface, fontface->cpal.context); if (fontface->colr.context) IDWriteFontFace5_ReleaseFontTable(iface, fontface->colr.context); - for (i = 0; i < fontface->file_count; i++) - { - if (fontface->files[i]) - IDWriteFontFile_Release(fontface->files[i]); - } + if (fontface->file) + IDWriteFontFile_Release(fontface->file); if (fontface->stream) IDWriteFontFileStream_Release(fontface->stream); - heap_free(fontface->files); if (fontface->names) IDWriteLocalizedStrings_Release(fontface->names); if (fontface->family_names) @@ -683,24 +679,20 @@ static HRESULT WINAPI dwritefontface_GetFiles(IDWriteFontFace5 *iface, UINT32 *n IDWriteFontFile **fontfiles) { struct dwrite_fontface *fontface = impl_from_IDWriteFontFace5(iface); - int i; TRACE("%p, %p, %p.\n", iface, number_of_files, fontfiles); - if (fontfiles == NULL) + if (!fontfiles) { - *number_of_files = fontface->file_count; + *number_of_files = 1; return S_OK; } - if (*number_of_files < fontface->file_count) + if (!*number_of_files) return E_INVALIDARG; - for (i = 0; i < fontface->file_count; i++) - { - IDWriteFontFile_AddRef(fontface->files[i]); - fontfiles[i] = fontface->files[i]; - } + IDWriteFontFile_AddRef(fontface->file); + *fontfiles = fontface->file; return S_OK; } @@ -1603,7 +1595,7 @@ static HRESULT WINAPI dwritefontface5_GetFontResource(IDWriteFontFace5 *iface, I TRACE("%p, %p.\n", iface, resource); - return IDWriteFactory7_CreateFontResource(fontface->factory, fontface->files[0], fontface->index, resource); + return IDWriteFactory7_CreateFontResource(fontface->factory, fontface->file, fontface->index, resource); } static BOOL WINAPI dwritefontface5_Equals(IDWriteFontFace5 *iface, IDWriteFontFace *other) @@ -1619,7 +1611,7 @@ static BOOL WINAPI dwritefontface5_Equals(IDWriteFontFace5 *iface, IDWriteFontFa return fontface->index == other_face->index && fontface->simulations == other_face->simulations && - is_same_fontfile(fontface->files[0], other_face->files[0]); + is_same_fontfile(fontface->file, other_face->file); } static const IDWriteFontFace5Vtbl dwritefontfacevtbl = @@ -1728,11 +1720,11 @@ static HRESULT WINAPI dwritefontface_reference_CreateFontFaceWithSimulations(IDW TRACE("%p, %#x, %p.\n", iface, simulations, ret); - hr = IDWriteFontFile_Analyze(fontface->files[0], &is_supported, &file_type, &face_type, &face_num); + hr = IDWriteFontFile_Analyze(fontface->file, &is_supported, &file_type, &face_type, &face_num); if (FAILED(hr)) return hr; - hr = IDWriteFactory7_CreateFontFace(fontface->factory, face_type, 1, fontface->files, fontface->index, + hr = IDWriteFactory7_CreateFontFace(fontface->factory, face_type, 1, &fontface->file, fontface->index, simulations, &face); if (SUCCEEDED(hr)) { @@ -1774,7 +1766,7 @@ static HRESULT WINAPI dwritefontface_reference_GetFontFile(IDWriteFontFaceRefere TRACE("%p, %p.\n", iface, file); - *file = fontface->files[0]; + *file = fontface->file; IDWriteFontFile_AddRef(*file); return S_OK; @@ -1879,8 +1871,7 @@ static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace5 desc.factory = font->family->collection->factory; desc.face_type = data->face_type; - desc.files = &data->file; - desc.files_number = 1; + desc.file = data->file; desc.index = data->face_index; desc.simulations = data->simulations; desc.font_data = data; @@ -3979,7 +3970,7 @@ static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_fo return E_OUTOFMEMORY; data->ref = 1; - data->file = desc->files[0]; + data->file = desc->file; data->face_index = desc->index; data->face_type = desc->face_type; IDWriteFontFile_AddRef(data->file); @@ -4388,9 +4379,8 @@ HRESULT create_font_collection(IDWriteFactory7 *factory, IDWriteFontFileEnumerat desc.factory = factory; desc.face_type = face_type; - desc.files = &file; + desc.file = file; desc.stream = stream; - desc.files_number = 1; desc.index = i; desc.simulations = DWRITE_FONT_SIMULATIONS_NONE; desc.font_data = NULL; @@ -4729,13 +4719,12 @@ static HRESULT eudc_collection_add_family(IDWriteFactory7 *factory, struct dwrit struct dwrite_font_data *font_data; struct fontface_desc desc; - /* alloc and init new font data structure */ + /* Allocate new font data structure. */ desc.factory = factory; desc.face_type = face_type; desc.index = i; - desc.files = &file; + desc.file = file; desc.stream = stream; - desc.files_number = 1; desc.simulations = DWRITE_FONT_SIMULATIONS_NONE; desc.font_data = NULL; @@ -4983,17 +4972,10 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li if (!fontface) return E_OUTOFMEMORY; - fontface->files = heap_alloc_zero(sizeof(*fontface->files) * desc->files_number); - if (!fontface->files) { - heap_free(fontface); - return E_OUTOFMEMORY; - } - fontface->IDWriteFontFace5_iface.lpVtbl = &dwritefontfacevtbl; fontface->IDWriteFontFaceReference_iface.lpVtbl = &dwritefontface_reference_vtbl; fontface->refcount = 1; fontface->type = desc->face_type; - fontface->file_count = desc->files_number; fontface->vdmx.exists = TRUE; fontface->gasp.exists = TRUE; fontface->cpal.exists = TRUE; @@ -5002,11 +4984,8 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li fontface->simulations = desc->simulations; fontface->factory = desc->factory; IDWriteFactory7_AddRef(fontface->factory); - - for (i = 0; i < fontface->file_count; i++) { - fontface->files[i] = desc->files[i]; - IDWriteFontFile_AddRef(fontface->files[i]); - } + fontface->file = desc->file; + IDWriteFontFile_AddRef(fontface->file); fontface->stream = desc->stream; IDWriteFontFileStream_AddRef(fontface->stream); diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 864a44936c1..d66a27d7f68 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1033,9 +1033,8 @@ static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory7 *iface, DWRIT desc.factory = iface; desc.face_type = req_facetype; - desc.files = font_files; + desc.file = *font_files; desc.stream = stream; - desc.files_number = files_number; desc.index = index; desc.simulations = simulations; desc.font_data = NULL;

1 0

Nikolay Sivov : dwrite: Remove duplicated trace call.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: df9e20fadcd0aaeb7741740eb71d25063e504ce7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df9e20fadcd0aaeb7741740e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 8 11:30:46 2021 +0300 dwrite: Remove duplicated trace call. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9232f29317f..8a5033ab64f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -7226,9 +7226,6 @@ static HRESULT WINAPI dwritefontset_GetPropertyValues(IDWriteFontSet3 *iface, UI { static int once; - if (!once++) - FIXME("%p: stub\n", iface); - if (!once++) FIXME("%p, %u, %d, %p, %p.\n", iface, index, id, exists, values);

1 0

Chao Long : wmic: Add missing aliases.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 7dba53a0f28f1a30c538744f4d76cdddacc6c8af URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dba53a0f28f1a30c538744f… Author: Chao Long <longchao(a)uniontech.com> Date: Mon Mar 8 09:25:42 2021 +0100 wmic: Add missing aliases. Signed-off-by: Chao Long <longchao(a)uniontech.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wmic/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 1372c0986e9..f0b6ea0f05d 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -44,7 +44,10 @@ alias_map[] = { L"LogicalDisk", L"Win32_LogicalDisk" }, { L"nic", L"Win32_NetworkAdapter" }, { L"os", L"Win32_OperatingSystem" }, - { L"process", L"Win32_Process" } + { L"process", L"Win32_Process" }, + { L"baseboard", L"Win32_BaseBoard" }, + { L"diskdrive", L"Win32_DiskDrive" }, + { L"memorychip", L"Win32_PhysicalMemory" } }; static const WCHAR *find_class( const WCHAR *alias )

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_constant_buffer().
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 8f1092a6ee7330284d2700b9ec0ffdbf44b848d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f1092a6ee7330284d2700b9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 7 16:19:22 2021 -0600 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_constant_buffer(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 8 ++++---- dlls/wined3d/device.c | 9 ++++----- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 5176c635cf5..43f1d04dd0f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1414,18 +1414,18 @@ static void wined3d_cs_exec_set_constant_buffer(struct wined3d_cs *cs, const voi device_invalidate_state(cs->c.device, STATE_CONSTANT_BUFFER(op->type)); } -void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_shader_type type, - UINT cb_idx, struct wined3d_buffer *buffer) +void wined3d_device_context_emit_set_constant_buffer(struct wined3d_device_context *context, + enum wined3d_shader_type type, UINT cb_idx, struct wined3d_buffer *buffer) { struct wined3d_cs_set_constant_buffer *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_CONSTANT_BUFFER; op->type = type; op->cb_idx = cb_idx; op->buffer = buffer; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 181f491546a..1edbd23e7e4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1926,6 +1926,7 @@ void CDECL wined3d_device_get_scissor_rects(const struct wined3d_device *device, void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3d_state *state) { + struct wined3d_device_context *context = &device->cs->c; const struct wined3d_light_info *light; unsigned int i, j; @@ -1959,11 +1960,9 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) { - wined3d_device_context_emit_set_shader(&device->cs->c, i, state->shader[i]); + wined3d_device_context_emit_set_shader(context, i, state->shader[i]); for (j = 0; j < MAX_CONSTANT_BUFFERS; ++j) - { - wined3d_cs_emit_set_constant_buffer(device->cs, i, j, state->cb[i][j]); - } + wined3d_device_context_emit_set_constant_buffer(context, i, j, state->cb[i][j]); for (j = 0; j < MAX_SAMPLER_OBJECTS; ++j) { wined3d_cs_emit_set_sampler(device->cs, i, j, state->sampler[i][j]); @@ -2143,7 +2142,7 @@ void CDECL wined3d_device_set_constant_buffer(struct wined3d_device *device, if (buffer) wined3d_buffer_incref(buffer); state->cb[type][idx] = buffer; - wined3d_cs_emit_set_constant_buffer(device->cs, type, idx, buffer); + wined3d_device_context_emit_set_constant_buffer(&device->cs->c, type, idx, buffer); if (prev) wined3d_buffer_decref(prev); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ee00530981c..6fc743e74db 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4747,8 +4747,6 @@ void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture, WORD flags, const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_shader_type type, - UINT cb_idx, struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_depth_stencil_state(struct wined3d_cs *cs, struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_depth_stencil_view(struct wined3d_cs *cs, @@ -4812,6 +4810,8 @@ static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d cs->c.ops->push_constants(&cs->c, p, start_idx, count, constants); } +void wined3d_device_context_emit_set_constant_buffer(struct wined3d_device_context *context, + enum wined3d_shader_type type, UINT cb_idx, struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, struct wined3d_shader *shader) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_get_immediate_context().
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 3920277c22e1daa99ba292c1d6bf541165486baf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3920277c22e1daa99ba292c1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 7 16:19:19 2021 -0600 wined3d: Introduce wined3d_device_get_immediate_context(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 06329293261..181f491546a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2054,6 +2054,13 @@ struct wined3d_state * CDECL wined3d_device_get_state(struct wined3d_device *dev return device->cs->c.state; } +struct wined3d_device_context * CDECL wined3d_device_get_immediate_context(struct wined3d_device *device) +{ + TRACE("device %p.\n", device); + + return &device->cs->c; +} + void CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device, struct wined3d_vertex_declaration *declaration) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index f1d477af703..f5fa1d3d7e5 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -84,6 +84,7 @@ @ cdecl wined3d_device_get_hs_resource_view(ptr long) @ cdecl wined3d_device_get_hs_sampler(ptr long) @ cdecl wined3d_device_get_hull_shader(ptr) +@ cdecl wined3d_device_get_immediate_context(ptr) @ cdecl wined3d_device_get_index_buffer(ptr ptr ptr) @ cdecl wined3d_device_get_max_frame_latency(ptr) @ cdecl wined3d_device_get_npatch_mode(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 030e3fdcb67..ba9e8642ea2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2414,6 +2414,7 @@ struct wined3d_shader_resource_view * __cdecl wined3d_device_get_hs_resource_vie unsigned int idx); struct wined3d_sampler * __cdecl wined3d_device_get_hs_sampler(const struct wined3d_device *device, unsigned int idx); struct wined3d_shader * __cdecl wined3d_device_get_hull_shader(const struct wined3d_device *device); +struct wined3d_device_context * __cdecl wined3d_device_get_immediate_context(struct wined3d_device *device); struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, enum wined3d_format_id *format, unsigned int *offset); unsigned int __cdecl wined3d_device_get_max_frame_latency(const struct wined3d_device *device);

1 0