January 2019 - Wine-devel - list.winehq.org

[PATCH] ntdll: correct space/mark parity
by Julien D'ascenzio 31 Jan '19

31 Jan '19

When CMSPAR is define, the space and mark parity is reversed: The flag PARODD isn't set correctly --- dlls/ntdll/serial.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 29e9fafbca..b3404d4534 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -280,8 +280,8 @@ static NTSTATUS get_line_control(int fd, SERIAL_LINE_CONTROL* slc) case PARENB: slc->Parity = EVENPARITY; break; case PARENB|PARODD: slc->Parity = ODDPARITY; break; #ifdef CMSPAR - case PARENB|CMSPAR: slc->Parity = MARKPARITY; break; - case PARENB|PARODD|CMSPAR: slc->Parity = SPACEPARITY; break; + case PARENB|PARODD|CMSPAR: slc->Parity = MARKPARITY; break; + case PARENB|CMSPAR: slc->Parity = SPACEPARITY; break; #endif } switch (port.c_cflag & CSIZE) @@ -676,8 +676,8 @@ static NTSTATUS set_line_control(int fd, const SERIAL_LINE_CONTROL* slc) case EVENPARITY: port.c_cflag |= PARENB; break; #ifdef CMSPAR /* Linux defines mark/space (stick) parity */ - case MARKPARITY: port.c_cflag |= PARENB | CMSPAR; break; - case SPACEPARITY: port.c_cflag |= PARENB | PARODD | CMSPAR; break; + case MARKPARITY: port.c_cflag |= PARENB | PARODD | CMSPAR; break; + case SPACEPARITY: port.c_cflag |= PARENB | CMSPAR; break; #else /* try the POSIX way */ case MARKPARITY: -- 2.11.0

1 0

[PATCH] d3dx11: Fix D3DX11CreateShaderResourceViewFromMemory spec entry.
by Andrey Gusev 31 Jan '19

31 Jan '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/d3dx11_43/d3dx11_43.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 76a3916e71..dde8821a30 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -17,7 +17,7 @@ @ stub D3DX11CreateAsyncTextureProcessor @ stub D3DX11CreateShaderResourceViewFromFileA @ stub D3DX11CreateShaderResourceViewFromFileW -@ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) +@ stdcall D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW @ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr) -- 2.20.1

2 1

[PATCH] crypt32: Fix compile error on older gnutls.
by Alistair Leslie-Hughes 31 Jan '19

31 Jan '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/crypt32/pfx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c index cde2f19..46bf356 100644 --- a/dlls/crypt32/pfx.c +++ b/dlls/crypt32/pfx.c @@ -45,6 +45,8 @@ int gnutls_pkcs12_simple_parse(gnutls_pkcs12_t p12, const char *password, gnutls_x509_crt_t **extra_certs, unsigned int *extra_certs_len, gnutls_x509_crl_t * crl, unsigned int flags); +int gnutls_x509_privkey_get_pk_algorithm2(gnutls_x509_privkey_t, unsigned int*); + static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gnutls_global_deinit); -- 1.9.1

2 1

[PATCH vkd3d 06/10] vkd3d: Implement d3d12_command_list_SetName().
by Zhiyi Zhang 31 Jan '19

31 Jan '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/command.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 47c8854..f05b40c 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1694,9 +1694,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetName(ID3D12GraphicsComman { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, list->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, list->device->wchar_size)); - return E_NOTIMPL; + return vkd3d_set_vk_object_name(list->device, (uint64_t)(uintptr_t)list->vk_command_buffer, + VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, name);; } static HRESULT STDMETHODCALLTYPE d3d12_command_list_GetDevice(ID3D12GraphicsCommandList *iface, -- 2.20.1

2 4

[PATCH] crypt32: Add support for CERT_COMPARE_KEY_IDENTIFIER to CertFindCertificateInStore.
by Dmitry Timoshkov 31 Jan '19

31 Jan '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index ef7b138c4c..e1c7c54340 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1769,6 +1769,7 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, PCCERT_CONTEXT ret; CertFindFunc find = NULL; CertCompareFunc compare = NULL; + CERT_ID cert_id; TRACE("(%p, %08x, %08x, %08x, %p, %p)\n", hCertStore, dwCertEncodingType, dwFlags, dwType, pvPara, pPrevCertContext); @@ -1799,6 +1800,11 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, case CERT_COMPARE_SUBJECT_CERT: compare = compare_cert_by_subject_cert; break; + case CERT_COMPARE_KEY_IDENTIFIER: + cert_id.dwIdChoice = CERT_ID_KEY_IDENTIFIER; + cert_id.u.KeyId = *(const CRYPT_HASH_BLOB *)pvPara; + pvPara = &cert_id; + /* fall through */ case CERT_COMPARE_CERT_ID: compare = compare_cert_by_cert_id; break; -- 2.20.1

1 0

[PATCH 1/5] dwrite: Add a helper to get shaped glyph positions.
by Nikolay Sivov 31 Jan '19

31 Jan '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 134 ++++++++++++++++------------------- dlls/dwrite/dwrite_private.h | 36 ++++++++-- dlls/dwrite/font.c | 49 ++++++++++++- dlls/dwrite/shape.c | 48 ++++++++----- 4 files changed, 172 insertions(+), 95 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 7ee3675d2e..13d3d3216a 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1157,16 +1157,14 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, UINT16* clustermap, DWRITE_SHAPING_TEXT_PROPERTIES* text_props, UINT16* glyph_indices, DWRITE_SHAPING_GLYPH_PROPERTIES* glyph_props, UINT32* actual_glyph_count) { - const struct dwritescript_properties *scriptprops; DWRITE_NUMBER_SUBSTITUTION_METHOD method; struct scriptshaping_context context; - struct scriptshaping_cache *cache = NULL; + struct dwrite_fontface *font_obj; WCHAR digits[NATIVE_DIGITS_LEN]; BOOL update_cluster; WCHAR *string; UINT32 i, g; HRESULT hr = S_OK; - UINT16 script; TRACE("(%s:%u %p %d %d %s %s %p %p %p %u %u %p %p %p %p %p)\n", debugstr_wn(text, length), length, fontface, is_sideways, is_rtl, debugstr_sa_script(analysis->script), debugstr_w(locale), substitution, @@ -1175,8 +1173,6 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, analyzer_dump_user_features(features, feature_range_lengths, feature_ranges); - script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; - if (max_glyph_count < length) return E_NOT_SUFFICIENT_BUFFER; @@ -1253,33 +1249,19 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, } *actual_glyph_count = g; - hr = create_scriptshaping_cache(fontface, &cache); - if (FAILED(hr)) - goto done; + font_obj = unsafe_impl_from_IDWriteFontFace(fontface); - context.cache = cache; + context.cache = fontface_get_shaping_cache(font_obj); context.text = text; context.length = length; context.is_rtl = is_rtl; - context.max_glyph_count = max_glyph_count; context.language_tag = get_opentype_language(locale); - scriptprops = &dwritescripts_properties[script]; - if (scriptprops->ops && scriptprops->ops->contextual_shaping) { - hr = scriptprops->ops->contextual_shaping(&context, clustermap, glyph_indices, actual_glyph_count); - if (FAILED(hr)) - goto done; - } - /* FIXME: apply default features */ - if (scriptprops->ops && scriptprops->ops->set_text_glyphs_props) - hr = scriptprops->ops->set_text_glyphs_props(&context, clustermap, glyph_indices, *actual_glyph_count, text_props, glyph_props); - else - hr = default_shaping_ops.set_text_glyphs_props(&context, clustermap, glyph_indices, *actual_glyph_count, text_props, glyph_props); + hr = default_shaping_ops.set_text_glyphs_props(&context, clustermap, glyph_indices, *actual_glyph_count, text_props, glyph_props); done: - release_scriptshaping_cache(cache); heap_free(string); return hr; @@ -1288,14 +1270,14 @@ done: static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 *iface, WCHAR const* text, UINT16 const* clustermap, DWRITE_SHAPING_TEXT_PROPERTIES* props, UINT32 text_len, UINT16 const* glyphs, DWRITE_SHAPING_GLYPH_PROPERTIES const* glyph_props, - UINT32 glyph_count, IDWriteFontFace *fontface, FLOAT emSize, BOOL is_sideways, BOOL is_rtl, + UINT32 glyph_count, IDWriteFontFace *fontface, float emSize, BOOL is_sideways, BOOL is_rtl, DWRITE_SCRIPT_ANALYSIS const* analysis, WCHAR const* locale, DWRITE_TYPOGRAPHIC_FEATURES const** features, - UINT32 const* feature_range_lengths, UINT32 feature_ranges, FLOAT *advances, DWRITE_GLYPH_OFFSET *offsets) + UINT32 const* feature_range_lengths, UINT32 feature_ranges, float *advances, DWRITE_GLYPH_OFFSET *offsets) { - DWRITE_FONT_METRICS metrics; - IDWriteFontFace1 *fontface1; - HRESULT hr; - UINT32 i; + const struct dwritescript_properties *scriptprops; + struct dwrite_fontface *font_obj; + unsigned int i, script; + HRESULT hr = S_OK; TRACE("(%s %p %p %u %p %p %u %p %.2f %d %d %s %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), clustermap, props, text_len, glyphs, glyph_props, glyph_count, fontface, emSize, is_sideways, @@ -1307,46 +1289,51 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 if (glyph_count == 0) return S_OK; - hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); - if (FAILED(hr)) { - WARN("failed to get IDWriteFontFace1.\n"); - return hr; - } + font_obj = unsafe_impl_from_IDWriteFontFace(fontface); - IDWriteFontFace_GetMetrics(fontface, &metrics); - for (i = 0; i < glyph_count; i++) { + for (i = 0; i < glyph_count; ++i) + { if (glyph_props[i].isZeroWidthSpace) advances[i] = 0.0f; - else { - INT32 a; - - hr = IDWriteFontFace1_GetDesignGlyphAdvances(fontface1, 1, &glyphs[i], &a, is_sideways); - if (FAILED(hr)) - a = 0; - advances[i] = get_scaled_advance_width(a, emSize, &metrics); - } + else + advances[i] = fontface_get_scaled_design_advance(font_obj, DWRITE_MEASURING_MODE_NATURAL, emSize, 1.0f, + NULL, glyphs[i], is_sideways); offsets[i].advanceOffset = 0.0f; offsets[i].ascenderOffset = 0.0f; } - /* FIXME: actually apply features */ + script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; - IDWriteFontFace1_Release(fontface1); - return S_OK; + scriptprops = &dwritescripts_properties[script]; + if (scriptprops->ops && scriptprops->ops->gpos_features) + { + struct scriptshaping_context context; + + context.cache = fontface_get_shaping_cache(font_obj); + context.text = text; + context.length = text_len; + context.is_rtl = is_rtl; + context.language_tag = get_opentype_language(locale); + + hr = shape_get_positions(&context, scriptprops->scripttags, scriptprops->ops->gpos_features); + } + + return hr; } static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWriteTextAnalyzer2 *iface, WCHAR const* text, UINT16 const* clustermap, DWRITE_SHAPING_TEXT_PROPERTIES* props, UINT32 text_len, UINT16 const* glyphs, DWRITE_SHAPING_GLYPH_PROPERTIES const* glyph_props, - UINT32 glyph_count, IDWriteFontFace *fontface, FLOAT emSize, FLOAT ppdip, + UINT32 glyph_count, IDWriteFontFace *fontface, float emSize, float ppdip, DWRITE_MATRIX const* transform, BOOL use_gdi_natural, BOOL is_sideways, BOOL is_rtl, DWRITE_SCRIPT_ANALYSIS const* analysis, WCHAR const* locale, DWRITE_TYPOGRAPHIC_FEATURES const** features, - UINT32 const* feature_range_lengths, UINT32 feature_ranges, FLOAT *advances, DWRITE_GLYPH_OFFSET *offsets) + UINT32 const* feature_range_lengths, UINT32 feature_ranges, float *advances, DWRITE_GLYPH_OFFSET *offsets) { - DWRITE_FONT_METRICS metrics; - IDWriteFontFace1 *fontface1; - HRESULT hr; - UINT32 i; + const struct dwritescript_properties *scriptprops; + DWRITE_MEASURING_MODE measuring_mode; + struct dwrite_fontface *font_obj; + unsigned int i, script; + HRESULT hr = S_OK; TRACE("(%s %p %p %u %p %p %u %p %.2f %.2f %p %d %d %d %s %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), clustermap, props, text_len, glyphs, glyph_props, glyph_count, fontface, emSize, ppdip, @@ -1358,35 +1345,38 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite if (glyph_count == 0) return S_OK; - hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); - if (FAILED(hr)) { - WARN("failed to get IDWriteFontFace1.\n"); - return hr; - } + font_obj = unsafe_impl_from_IDWriteFontFace(fontface); - hr = IDWriteFontFace_GetGdiCompatibleMetrics(fontface, emSize, ppdip, transform, &metrics); - if (FAILED(hr)) { - IDWriteFontFace1_Release(fontface1); - WARN("failed to get compat metrics, 0x%08x\n", hr); - return hr; - } - for (i = 0; i < glyph_count; i++) { - INT32 a; + measuring_mode = use_gdi_natural ? DWRITE_MEASURING_MODE_GDI_NATURAL : DWRITE_MEASURING_MODE_GDI_CLASSIC; - hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, emSize, ppdip, - transform, use_gdi_natural, is_sideways, 1, &glyphs[i], &a); - if (FAILED(hr)) + for (i = 0; i < glyph_count; ++i) + { + if (glyph_props[i].isZeroWidthSpace) advances[i] = 0.0f; else - advances[i] = floorf(a * emSize * ppdip / metrics.designUnitsPerEm + 0.5f) / ppdip; + advances[i] = fontface_get_scaled_design_advance(font_obj, measuring_mode, emSize, ppdip, + transform, glyphs[i], is_sideways); offsets[i].advanceOffset = 0.0f; offsets[i].ascenderOffset = 0.0f; } - /* FIXME: actually apply features */ + script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; - IDWriteFontFace1_Release(fontface1); - return S_OK; + scriptprops = &dwritescripts_properties[script]; + if (scriptprops->ops && scriptprops->ops->gpos_features) + { + struct scriptshaping_context context; + + context.cache = fontface_get_shaping_cache(font_obj); + context.text = text; + context.length = text_len; + context.is_rtl = is_rtl; + context.language_tag = get_opentype_language(locale); + + hr = shape_get_positions(&context, scriptprops->scripttags, scriptprops->ops->gpos_features); + } + + return hr; } static inline FLOAT get_cluster_advance(const FLOAT *advances, UINT32 start, UINT32 end) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 3595503f1e..2299a23cf1 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -192,6 +192,12 @@ extern void factory_lock(IDWriteFactory5*) DECLSPEC_HIDDEN; extern void factory_unlock(IDWriteFactory5*) DECLSPEC_HIDDEN; extern HRESULT create_inmemory_fileloader(IDWriteFontFileLoader**) DECLSPEC_HIDDEN; +struct dwrite_fontface; + +extern float fontface_get_scaled_design_advance(struct dwrite_fontface *fontface, DWRITE_MEASURING_MODE measuring_mode, + float emsize, float ppdip, const DWRITE_MATRIX *transform, UINT16 glyph, BOOL is_sideways) DECLSPEC_HIDDEN; +extern struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface) DECLSPEC_HIDDEN; + /* Opentype font table functions */ struct dwrite_font_props { DWRITE_FONT_STYLE style; @@ -320,7 +326,12 @@ enum SCRIPT_JUSTIFY SCRIPT_JUSTIFY_ARABIC_SEEN_M }; -struct scriptshaping_cache; +struct scriptshaping_cache +{ + const struct shaping_font_ops *font; + void *context; + UINT16 upem; +}; struct scriptshaping_context { @@ -328,21 +339,38 @@ struct scriptshaping_context UINT32 language_tag; const WCHAR *text; - UINT32 length; + unsigned int length; BOOL is_rtl; +}; - UINT32 max_glyph_count; +struct shaping_font_ops +{ + void (*grab_font_table)(void *context, UINT32 table, const BYTE **data, UINT32 *size, void **data_context); + void (*release_font_table)(void *context, void *data_context); + UINT16 (*get_font_upem)(void *context); }; -extern HRESULT create_scriptshaping_cache(IDWriteFontFace*,struct scriptshaping_cache**) DECLSPEC_HIDDEN; +extern struct scriptshaping_cache *create_scriptshaping_cache(void *context, + const struct shaping_font_ops *font_ops) DECLSPEC_HIDDEN; extern void release_scriptshaping_cache(struct scriptshaping_cache*) DECLSPEC_HIDDEN; +extern struct scriptshaping_cache *fontface_get_shaping_cache(struct dwrite_fontface *fontface) DECLSPEC_HIDDEN; + +struct shaping_features +{ + const DWORD *tags; + unsigned int count; +}; struct scriptshaping_ops { HRESULT (*contextual_shaping)(struct scriptshaping_context *context, UINT16 *clustermap, UINT16 *glyph_indices, UINT32* actual_glyph_count); HRESULT (*set_text_glyphs_props)(struct scriptshaping_context *context, UINT16 *clustermap, UINT16 *glyph_indices, UINT32 glyphcount, DWRITE_SHAPING_TEXT_PROPERTIES *text_props, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props); + const struct shaping_features *gpos_features; }; extern const struct scriptshaping_ops default_shaping_ops DECLSPEC_HIDDEN; extern const struct scriptshaping_ops latn_shaping_ops DECLSPEC_HIDDEN; + +extern HRESULT shape_get_positions(struct scriptshaping_context *context, const DWORD *scripts, + const struct shaping_features *features) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d1e4fb9725..f50133d18c 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -240,6 +240,8 @@ struct dwrite_fontface { FONTSIGNATURE fontsig; UINT32 glyph_image_formats; + struct scriptshaping_cache *shaping_cache; + LOGFONTW lf; }; @@ -263,6 +265,47 @@ struct dwrite_fontfacereference { IDWriteFactory5 *factory; }; +static void dwrite_grab_font_table(void *context, UINT32 table, const BYTE **data, UINT32 *size, void **data_context) +{ + struct dwrite_fontface *fontface = context; + BOOL exists = FALSE; + + if (FAILED(IDWriteFontFace4_TryGetFontTable(&fontface->IDWriteFontFace4_iface, table, (const void **)data, + size, data_context, &exists)) || !exists) + { + *data = NULL; + *size = 0; + *data_context = NULL; + } +} + +static void dwrite_release_font_table(void *context, void *data_context) +{ + struct dwrite_fontface *fontface = context; + IDWriteFontFace4_ReleaseFontTable(&fontface->IDWriteFontFace4_iface, data_context); +} + +static UINT16 dwrite_get_font_upem(void *context) +{ + struct dwrite_fontface *fontface = context; + return fontface->metrics.designUnitsPerEm; +} + +static const struct shaping_font_ops dwrite_font_ops = +{ + dwrite_grab_font_table, + dwrite_release_font_table, + dwrite_get_font_upem, +}; + +struct scriptshaping_cache *fontface_get_shaping_cache(struct dwrite_fontface *fontface) +{ + if (fontface->shaping_cache) + return fontface->shaping_cache; + + return fontface->shaping_cache = create_scriptshaping_cache(fontface, &dwrite_font_ops); +} + static inline struct dwrite_fontface *impl_from_IDWriteFontFace4(IDWriteFontFace4 *iface) { return CONTAINING_RECORD(iface, struct dwrite_fontface, IDWriteFontFace4_iface); @@ -493,7 +536,7 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace4 *iface) factory_unlock(This->factory); heap_free(This->cached); } - + release_scriptshaping_cache(This->shaping_cache); if (This->cmap.context) IDWriteFontFace4_ReleaseFontTable(iface, This->cmap.context); if (This->vdmx.context) @@ -1775,7 +1818,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface) return CONTAINING_RECORD(iface, struct dwrite_font, IDWriteFont3_iface); } -static struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface) +struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface) { if (!iface) return NULL; @@ -5363,7 +5406,7 @@ static inline void transform_point(D2D_POINT_2F *point, const DWRITE_MATRIX *m) *point = ret; } -static float fontface_get_scaled_design_advance(struct dwrite_fontface *fontface, DWRITE_MEASURING_MODE measuring_mode, +float fontface_get_scaled_design_advance(struct dwrite_fontface *fontface, DWRITE_MEASURING_MODE measuring_mode, float emsize, float ppdip, const DWRITE_MATRIX *transform, UINT16 glyph, BOOL is_sideways) { unsigned int upem = fontface->metrics.designUnitsPerEm; diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index a6039323ea..69780450e9 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -23,32 +23,26 @@ #include "dwrite_private.h" -struct scriptshaping_cache +struct scriptshaping_cache *create_scriptshaping_cache(void *context, const struct shaping_font_ops *font_ops) { - IDWriteFontFace *fontface; -}; - -HRESULT create_scriptshaping_cache(IDWriteFontFace *fontface, struct scriptshaping_cache **cache) -{ - struct scriptshaping_cache *ret; + struct scriptshaping_cache *cache; - ret = heap_alloc(sizeof(*ret)); - if (!ret) - return E_OUTOFMEMORY; + cache = heap_alloc_zero(sizeof(*cache)); + if (!cache) + return NULL; - ret->fontface = fontface; - IDWriteFontFace_AddRef(fontface); + cache->font = font_ops; + cache->context = context; - *cache = ret; + cache->upem = cache->font->get_font_upem(cache->context); - return S_OK; + return cache; } void release_scriptshaping_cache(struct scriptshaping_cache *cache) { if (!cache) return; - IDWriteFontFace_Release(cache->fontface); heap_free(cache); } @@ -160,10 +154,24 @@ static HRESULT latn_set_text_glyphs_props(struct scriptshaping_context *context, return hr; } +static const DWORD std_gpos_tags[] = +{ + DWRITE_FONT_FEATURE_TAG_KERNING, + DWRITE_FONT_FEATURE_TAG_MARK_POSITIONING, + DWRITE_FONT_FEATURE_TAG_MARK_TO_MARK_POSITIONING, +}; + +static const struct shaping_features std_gpos_features = +{ + std_gpos_tags, + ARRAY_SIZE(std_gpos_tags), +}; + const struct scriptshaping_ops latn_shaping_ops = { NULL, - latn_set_text_glyphs_props + latn_set_text_glyphs_props, + &std_gpos_features, }; const struct scriptshaping_ops default_shaping_ops = @@ -171,3 +179,11 @@ const struct scriptshaping_ops default_shaping_ops = NULL, default_set_text_glyphs_props }; + +HRESULT shape_get_positions(struct scriptshaping_context *context, const DWORD *scripts, + const struct shaping_features *features) +{ + /* FIXME: stub */ + + return S_OK; +} -- 2.20.1

1 4

[PATCH v2 2/2] mfreadwrite: Register MFReadWriteClassFactory interface
by Alistair Leslie-Hughes 31 Jan '19

31 Jan '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfreadwrite/Makefile.in | 2 ++ dlls/mfreadwrite/main.c | 13 +++++++++++++ dlls/mfreadwrite/mf_classes.idl | 25 +++++++++++++++++++++++++ dlls/mfreadwrite/mfreadwrite.spec | 2 ++ 4 files changed, 42 insertions(+) create mode 100644 dlls/mfreadwrite/mf_classes.idl diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in index 4b8ee82506..445beaa62d 100644 --- a/dlls/mfreadwrite/Makefile.in +++ b/dlls/mfreadwrite/Makefile.in @@ -3,3 +3,5 @@ IMPORTLIB = mfreadwrite C_SRCS = \ main.c + +IDL_SRCS = mf_classes.idl diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 2a5e29a48e..b001e68354 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -31,6 +31,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +static HINSTANCE mfinstance; + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { switch (reason) @@ -38,6 +40,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + mfinstance = instance; DisableThreadLibraryCalls(instance); break; } @@ -65,6 +68,16 @@ HRESULT WINAPI DllCanUnloadNow(void) return S_FALSE; } +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( mfinstance ); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( mfinstance ); +} + typedef struct _srcreader { IMFSourceReader IMFSourceReader_iface; diff --git a/dlls/mfreadwrite/mf_classes.idl b/dlls/mfreadwrite/mf_classes.idl new file mode 100644 index 0000000000..99dbd80018 --- /dev/null +++ b/dlls/mfreadwrite/mf_classes.idl @@ -0,0 +1,25 @@ +/* + * + * Copyright 2019 Alistair Leslie-Hughes + * + * 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 + */ +#pragma makedep register + +[ + threading(both), + uuid(48e2ed0f-98c2-4a37-bed5-166312ddd83f) +] +coclass MFReadWriteClassFactory { interface IMFReadWriteClassFactory; } diff --git a/dlls/mfreadwrite/mfreadwrite.spec b/dlls/mfreadwrite/mfreadwrite.spec index f46c5923e2..ad61646718 100644 --- a/dlls/mfreadwrite/mfreadwrite.spec +++ b/dlls/mfreadwrite/mfreadwrite.spec @@ -1,5 +1,7 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stub MFCreateSinkWriterFromMediaSink @ stub MFCreateSinkWriterFromURL @ stdcall MFCreateSourceReaderFromByteStream(ptr ptr ptr) -- 2.20.1

1 0

[PATCH v2 1/2] mfreadwrite: Add DllGetClassObject/DllCanUnloadNow functions
by Alistair Leslie-Hughes 31 Jan '19

31 Jan '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfreadwrite/main.c | 11 +++++++++++ dlls/mfreadwrite/mfreadwrite.spec | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index e09120d5a4..2a5e29a48e 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -54,6 +54,17 @@ HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAt return E_NOTIMPL; } +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + FIXME("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + typedef struct _srcreader { IMFSourceReader IMFSourceReader_iface; diff --git a/dlls/mfreadwrite/mfreadwrite.spec b/dlls/mfreadwrite/mfreadwrite.spec index 4272b7183c..f46c5923e2 100644 --- a/dlls/mfreadwrite/mfreadwrite.spec +++ b/dlls/mfreadwrite/mfreadwrite.spec @@ -1,5 +1,5 @@ -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub MFCreateSinkWriterFromMediaSink @ stub MFCreateSinkWriterFromURL @ stdcall MFCreateSourceReaderFromByteStream(ptr ptr ptr) -- 2.20.1

1 0

[PATCH vkd3d 10/10] tests: Add SetName() tests.
by Zhiyi Zhang 31 Jan '19

31 Jan '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- tests/d3d12.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2121473..6f34dd6 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2740,7 +2740,7 @@ static void test_create_fence(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -static void test_private_data(void) +static void test_ID3D12Object(void) { D3D12_DESCRIPTOR_HEAP_DESC descriptor_heap_desc; D3D12_QUERY_HEAP_DESC query_heap_desc; @@ -2763,6 +2763,8 @@ static void test_private_data(void) static const GUID test_guid2 = {0x2e5afac2, 0x87b5, 0x4c10, {0x9b, 0x4b, 0x89, 0xd7, 0xd1, 0x12, 0xe7, 0x2b}}; static const DWORD data[] = {1, 2, 3, 4}; + static const WCHAR deadbeefW[] = {'d', 'e', 'a', 'd', 'b', 'e', 'e', 'f', 0}; + static const WCHAR emptyW[] = {0}; static const GUID *tests[] = { &IID_ID3D12CommandAllocator, @@ -2994,6 +2996,15 @@ static void test_private_data(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } + hr = ID3D12Object_SetName(object, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12Object_SetName(object, emptyW); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12Object_SetName(object, deadbeefW); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12Object_Release(object); refcount = IUnknown_Release(test_object); @@ -24038,7 +24049,7 @@ START_TEST(d3d12) run_test(test_create_compute_pipeline_state); run_test(test_create_graphics_pipeline_state); run_test(test_create_fence); - run_test(test_private_data); + run_test(test_ID3D12Object); run_test(test_multithread_private_data); run_test(test_reset_command_allocator); run_test(test_cpu_signal_fence); -- 2.20.1

1 0

[PATCH vkd3d 09/10] vkd3d: Implement d3d12_command_queue_SetName().
by Zhiyi Zhang 31 Jan '19

31 Jan '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/command.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 848b5cd..274e769 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4551,10 +4551,21 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_SetPrivateDataInterface(ID3 static HRESULT STDMETHODCALLTYPE d3d12_command_queue_SetName(ID3D12CommandQueue *iface, const WCHAR *name) { struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); + VkQueue vk_queue; + HRESULT hr; - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, command_queue->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, command_queue->device->wchar_size)); - return E_NOTIMPL; + if (!(vk_queue = vkd3d_queue_acquire(command_queue->vkd3d_queue))) + { + ERR("Failed to acquire queue %p.\n", command_queue->vkd3d_queue); + return E_FAIL; + } + + hr = vkd3d_set_vk_object_name(command_queue->device, (uint64_t)(uintptr_t)vk_queue, + VK_DEBUG_REPORT_OBJECT_TYPE_QUEUE_EXT, name); + vkd3d_queue_release(command_queue->vkd3d_queue); + return hr; } static HRESULT STDMETHODCALLTYPE d3d12_command_queue_GetDevice(ID3D12CommandQueue *iface, -- 2.20.1

1 0