January 2020 - Wine-Commits

Nikolay Sivov : dwrite: Evaluate IsMonospacedFont() flag at font level.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: fec78e62eeb1cfa853119b652e854fcc33dbf074 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fec78e62eeb1cfa853119b65… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 23 12:24:13 2020 +0300 dwrite: Evaluate IsMonospacedFont() flag at font level. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 3 +-- dlls/dwrite/font.c | 21 ++++----------------- dlls/dwrite/freetype.c | 18 ------------------ dlls/dwrite/opentype.c | 19 ++++++++++++++++++- dlls/dwrite/tests/font.c | 2 -- 5 files changed, 23 insertions(+), 40 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 76cf40cd1f..0705d43b1f 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -186,7 +186,7 @@ struct fontfacecached enum font_flags { FONT_IS_SYMBOL = 1 << 0, - FONTFACE_IS_MONOSPACED = 1 << 1, + FONT_IS_MONOSPACED = 1 << 1, FONTFACE_HAS_KERNING_PAIRS = 1 << 2, FONTFACE_HAS_VERTICAL_VARIANTS = 1 << 3 }; @@ -391,7 +391,6 @@ extern void release_freetype(void) DECLSPEC_HIDDEN; extern HRESULT freetype_get_design_glyph_metrics(struct dwrite_fontface *fontface, UINT16 glyph, DWRITE_GLYPH_METRICS *metrics) DECLSPEC_HIDDEN; extern void freetype_notify_cacheremove(IDWriteFontFace5 *fontface) DECLSPEC_HIDDEN; -extern BOOL freetype_is_monospaced(IDWriteFontFace5 *fontface) DECLSPEC_HIDDEN; extern HRESULT freetype_get_glyphrun_outline(IDWriteFontFace5 *fontface, float emsize, UINT16 const *glyphs, float const *advances, DWRITE_GLYPH_OFFSET const *offsets, unsigned int count, BOOL is_rtl, IDWriteGeometrySink *sink) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index f2b8655003..c1c9ce20fa 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -955,7 +955,7 @@ static BOOL WINAPI dwritefontface1_IsMonospacedFont(IDWriteFontFace5 *iface) TRACE("%p.\n", iface); - return !!(fontface->flags & FONTFACE_IS_MONOSPACED); + return !!(fontface->flags & FONT_IS_MONOSPACED); } static int fontface_get_design_advance(struct dwrite_fontface *fontface, DWRITE_MEASURING_MODE measuring_mode, @@ -1765,19 +1765,10 @@ static HRESULT WINAPI dwritefont1_GetUnicodeRanges(IDWriteFont3 *iface, UINT32 m static BOOL WINAPI dwritefont1_IsMonospacedFont(IDWriteFont3 *iface) { struct dwrite_font *font = impl_from_IDWriteFont3(iface); - IDWriteFontFace5 *fontface; - HRESULT hr; - BOOL ret; TRACE("%p.\n", iface); - hr = get_fontface_from_font(font, &fontface); - if (FAILED(hr)) - return FALSE; - - ret = IDWriteFontFace5_IsMonospacedFont(fontface); - IDWriteFontFace5_Release(fontface); - return ret; + return !!(font->data->flags & FONT_IS_MONOSPACED); } static BOOL WINAPI dwritefont2_IsColorFont(IDWriteFont3 *iface) @@ -4690,8 +4681,6 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li fontface->charmap = freetype_get_charmap_index(&fontface->IDWriteFontFace5_iface); if (freetype_has_kerning_pairs(&fontface->IDWriteFontFace5_iface)) fontface->flags |= FONTFACE_HAS_KERNING_PAIRS; - if (freetype_is_monospaced(&fontface->IDWriteFontFace5_iface)) - fontface->flags |= FONTFACE_IS_MONOSPACED; if (opentype_has_vertical_variants(&fontface->IDWriteFontFace5_iface)) fontface->flags |= FONTFACE_HAS_VERTICAL_VARIANTS; fontface->glyph_image_formats = opentype_get_glyph_image_formats(&fontface->IDWriteFontFace5_iface); @@ -4709,8 +4698,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li fontface->panose = desc->font_data->panose; fontface->fontsig = desc->font_data->fontsig; fontface->lf = desc->font_data->lf; - if (desc->font_data->flags & FONT_IS_SYMBOL) - fontface->flags |= FONT_IS_SYMBOL; + fontface->flags |= desc->font_data->flags & (FONT_IS_SYMBOL | FONT_IS_MONOSPACED); } else { @@ -4730,8 +4718,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li fontface->panose = data->panose; fontface->fontsig = data->fontsig; fontface->lf = data->lf; - if (data->flags & FONT_IS_SYMBOL) - fontface->flags |= FONT_IS_SYMBOL; + fontface->flags |= data->flags & (FONT_IS_SYMBOL | FONT_IS_MONOSPACED); IDWriteLocalizedStrings_Release(names); release_font_data(data); diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 3c54da27f9..86c8315e6a 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -303,19 +303,6 @@ HRESULT freetype_get_design_glyph_metrics(struct dwrite_fontface *fontface, UINT return S_OK; } -BOOL freetype_is_monospaced(IDWriteFontFace5 *fontface) -{ - BOOL is_monospaced = FALSE; - FT_Face face; - - EnterCriticalSection(&freetype_cs); - if (pFTC_Manager_LookupFace(cache_manager, fontface, &face) == 0) - is_monospaced = !!FT_IS_FIXED_WIDTH(face); - LeaveCriticalSection(&freetype_cs); - - return is_monospaced; -} - struct decompose_context { IDWriteGeometrySink *sink; D2D1_POINT_2F offset; @@ -925,11 +912,6 @@ HRESULT freetype_get_design_glyph_metrics(struct dwrite_fontface *fontface, UINT return E_NOTIMPL; } -BOOL freetype_is_monospaced(IDWriteFontFace5 *fontface) -{ - return FALSE; -} - HRESULT freetype_get_glyphrun_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 const *glyphs, float const *advances, DWRITE_GLYPH_OFFSET const *offsets, unsigned int count, BOOL is_rtl, IDWriteGeometrySink *sink) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 02a71b3528..5f41a5764b 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1716,9 +1716,9 @@ void opentype_get_font_metrics(struct file_stream_desc *stream_desc, DWRITE_FONT void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct dwrite_font_props *props) { struct dwrite_fonttable os2, head; + BOOL is_symbol, is_monospaced; const TT_OS2_V2 *tt_os2; const TT_HEAD *tt_head; - BOOL is_symbol; opentype_get_font_table(stream_desc, MS_OS2_TAG, &os2); opentype_get_font_table(stream_desc, MS_HEAD_TAG, &head); @@ -1733,6 +1733,7 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d memset(&props->panose, 0, sizeof(props->panose)); memset(&props->fontsig, 0, sizeof(props->fontsig)); memset(&props->lf, 0, sizeof(props->lf)); + props->flags = 0; /* DWRITE_FONT_STRETCH enumeration values directly match font data values */ if (tt_os2) @@ -1823,6 +1824,22 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d if (is_symbol) props->flags |= FONT_IS_SYMBOL; + if (!(is_monospaced = props->panose.text.proportion == DWRITE_PANOSE_PROPORTION_MONOSPACED)) + { + struct dwrite_fonttable post; + + opentype_get_font_table(stream_desc, MS_POST_TAG, &post); + + if (post.data) + { + is_monospaced = !!table_read_dword(&post, FIELD_OFFSET(TT_POST, fixed_pitch)); + + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, post.context); + } + } + if (is_monospaced) + props->flags |= FONT_IS_MONOSPACED; + TRACE("stretch=%d, weight=%d, style %d\n", props->stretch, props->weight, props->style); if (os2.data) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 33603f6571..ac70a4c137 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4990,9 +4990,7 @@ static void test_IsMonospacedFont(void) IDWriteFont1_GetPanose(font1, &panose); - /* FIXME: failures disabled on Wine for now */ is_monospaced_expected = get_expected_is_monospaced(fontface1, &panose); - todo_wine_if(is_monospaced_expected != is_monospaced_face) ok(is_monospaced_expected == is_monospaced_face, "Unexpected is_monospaced flag %d for %s, font %d.\n", is_monospaced_face, wine_dbgstr_w(nameW), j);

1 0

Alistair Leslie-Hughes : include: Add enum DBPROPFLAGSENUM.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 664b5cb0affa7cf8c6ca20da45b5b505c5735bc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=664b5cb0affa7cf8c6ca20da… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 21 23:44:01 2020 +0000 include: Add enum DBPROPFLAGSENUM. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbs.idl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/dbs.idl b/include/dbs.idl index d04aa09ff1..65fd5b1d36 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -95,6 +95,24 @@ typedef struct tagDBPROPSET { typedef DWORD DBPROPFLAGS; +enum DBPROPFLAGSENUM +{ + DBPROPFLAGS_NOTSUPPORTED = 0x0000, + DBPROPFLAGS_COLUMN = 0x0001, + DBPROPFLAGS_DATASOURCE = 0x0002, + DBPROPFLAGS_DATASOURCECREATE = 0x0004, + DBPROPFLAGS_DATASOURCEINFO = 0x0008, + DBPROPFLAGS_DBINIT = 0x0010, + DBPROPFLAGS_INDEX = 0x0020, + DBPROPFLAGS_ROWSET = 0x0040, + DBPROPFLAGS_TABLE = 0x0080, + DBPROPFLAGS_COLUMNOK = 0x0100, + DBPROPFLAGS_READ = 0x0200, + DBPROPFLAGS_WRITE = 0x0400, + DBPROPFLAGS_REQUIRED = 0x0800, + DBPROPFLAGS_SESSION = 0x1000, +}; + typedef struct tagDBPROPINFO { LPOLESTR pwszDescription; DBPROPID dwPropertyID;

1 0

Biswapriyo Nath : include: Update thumbcache.idl file.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 8d1b119b2e3248170a910b0daef92f528aaa63e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d1b119b2e3248170a910b0d… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Jan 22 07:18:00 2019 +0530 include: Update thumbcache.idl file. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/thumbcache.idl | 137 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) diff --git a/include/thumbcache.idl b/include/thumbcache.idl index f79d879ab0..38cf23da17 100644 --- a/include/thumbcache.idl +++ b/include/thumbcache.idl @@ -18,6 +18,7 @@ import "oaidl.idl"; import "shtypes.idl"; +import "shobjidl.idl"; typedef [v1_enum] enum WTS_FLAGS { @@ -40,9 +41,145 @@ typedef [v1_enum] enum WTS_FLAGS WTS_SCALEUP = 0x00010000, } WTS_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(WTS_FLAGS)") + +typedef [v1_enum] enum WTS_CACHEFLAGS +{ + WTS_DEFAULT = 0x00000000, + WTS_LOWQUALITY = 0x00000001, + WTS_CACHED = 0x00000002, +} WTS_CACHEFLAGS; + +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(WTS_CACHEFLAGS)") + +typedef [v1_enum] enum WTS_CONTEXTFLAGS +{ + WTSCF_DEFAULT = 0x00000000, + WTSCF_APPSTYLE = 0x00000001, + WTSCF_SQUARE = 0x00000002, + WTSCF_WIDE = 0x00000004, + WTSCF_FAST = 0x00000008, +} WTS_CONTEXTFLAGS; + +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(WTS_CONTEXTFLAGS)") + typedef [v1_enum] enum WTS_ALPHATYPE { WTSAT_UNKNOWN = 0, WTSAT_RGB = 1, WTSAT_ARGB = 2 } WTS_ALPHATYPE; + +typedef struct WTS_THUMBNAILID +{ + BYTE rgbKey[16]; +} WTS_THUMBNAILID; + + +cpp_quote("#define WTS_E_FAILEDEXTRACTION MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0xb200)") +cpp_quote("#define WTS_E_EXTRACTIONTIMEDOUT MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0xb201)") +cpp_quote("#define WTS_E_SURROGATEUNAVAILABLE MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0xb202)") +cpp_quote("#define WTS_E_FASTEXTRACTIONNOTSUPPORTED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0xb203)") +cpp_quote("#define WTS_E_DATAFILEUNAVAILABLE MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0xb204)") +cpp_quote("#define WTS_E_EXTRACTIONPENDING MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0xb205)") +cpp_quote("#define WTS_E_EXTRACTIONBLOCKED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0xb206)") + +[ + uuid(091162a4-bc96-411f-aae8-c5122cd03363), + pointer_default(unique), +] +interface ISharedBitmap : IUnknown +{ + HRESULT GetSharedBitmap([out] HBITMAP *phbm); + HRESULT GetSize([out] SIZE *pSize); + HRESULT GetFormat([out] WTS_ALPHATYPE *pat); + HRESULT InitializeBitmap([in] HBITMAP hbm, [in] WTS_ALPHATYPE wtsAT); + HRESULT Detach([out] HBITMAP *phbm); +} + +[ + object, + uuid(f676c15d-596a-4ce2-8234-33996f445db1), +] +interface IThumbnailCache : IUnknown +{ + [local] + HRESULT GetThumbnail([in] IShellItem *pShellItem, + [in] UINT cxyRequestedThumbSize, + [in] WTS_FLAGS flags, + [out, unique] ISharedBitmap **ppvThumb, + [out, unique] WTS_CACHEFLAGS *pOutFlags, + [out, unique] WTS_THUMBNAILID *pThumbnailID); + + [call_as(GetThumbnail)] + HRESULT RemoteGetThumbnail([in] IShellItem *pShellItem, + [in] UINT cxyRequestedThumbSize, + [in] WTS_FLAGS flags, + [out] ISharedBitmap **ppvThumb, + [out] WTS_CACHEFLAGS *pOutFlags, + [out] WTS_THUMBNAILID *pThumbnailID); + + [local] + HRESULT GetThumbnailByID([in] WTS_THUMBNAILID thumbnailID, + [in] UINT cxyRequestedThumbSize, + [out, unique] ISharedBitmap **ppvThumb, + [out, unique] WTS_CACHEFLAGS *pOutFlags); + + [call_as(GetThumbnailByID)] + HRESULT RemoteGetThumbnailByID([in] WTS_THUMBNAILID thumbnailID, + [in] UINT cxyRequestedThumbSize, + [out] ISharedBitmap **ppvThumb, + [out] WTS_CACHEFLAGS *pOutFlags); +} + +[ + uuid(e357fccd-a995-4576-b01f-234630154e96), +] +interface IThumbnailProvider : IUnknown +{ + HRESULT GetThumbnail([in] UINT cx, + [out] HBITMAP *phbmp, + [out] WTS_ALPHATYPE *pdwAlpha); +} + +[ + uuid(f4376f00-bef5-4d45-80f3-1e023bbf1209), +] +interface IThumbnailSettings : IUnknown +{ + HRESULT SetContext([in] WTS_CONTEXTFLAGS dwContext); +} + +[ + uuid(0f03f8fe-2b26-46f0-965a-212aa8d66b76), + object, + pointer_default(unique) +] +interface IThumbnailCachePrimer : IUnknown +{ + HRESULT PageInThumbnail([in] IShellItem *psi, + [in] WTS_FLAGS wtsFlags, + [in] UINT cxyRequestedThumbSize); +} + +[ + uuid(4c857096-0514-4d4d-abd5-dfaaa3c326d2) +] +library ThumbCacheLib +{ + [ + uuid(50ef4544-ac9f-4a8e-b21b-8a26180db13f) + ] + coclass LocalThumbnailCache + { + interface IThumbnailCache; + } + + [ + uuid(4db26476-6787-4046-b836-e8412a9e8a27) + ] + coclass SharedBitmap + { + interface ISharedBitmap; + } +}

1 0

Nikolay Sivov : dwrite: Add a helper specifically for TryGetFontTable().
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 107599531a38f18811202324d8ec11ee7c7fb9b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=107599531a38f18811202324… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 23 12:24:11 2020 +0300 dwrite: Add a helper specifically for TryGetFontTable(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 3 +- dlls/dwrite/font.c | 2 +- dlls/dwrite/opentype.c | 95 +++++++++++++++++++++++++++----------------- 3 files changed, 61 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=107599531a38f1881120…

1 0

Paul Gofman : include: Add Vista+ PEB_LDR_DATA structure fields.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 34e64876b271f7c2b7ebc474030dbd4b8de322fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=34e64876b271f7c2b7ebc474… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jan 22 19:08:28 2020 +0300 include: Add Vista+ PEB_LDR_DATA structure fields. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48289 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winternl.h b/include/winternl.h index 0122684483..e5aed5acb1 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -213,6 +213,8 @@ typedef struct _PEB_LDR_DATA LIST_ENTRY InMemoryOrderModuleList; LIST_ENTRY InInitializationOrderModuleList; PVOID EntryInProgress; + BOOLEAN ShutdownInProgress; + HANDLE ShutdownThreadId; } PEB_LDR_DATA, *PPEB_LDR_DATA; typedef struct _GDI_TEB_BATCH

1 0

Zebediah Figura : quartz: Simplify FilterMapper_RegisterPinType().
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: e44948a2c274e484bcdaeacf1e72259e1df337b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e44948a2c274e484bcdaeacf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 22 16:30:50 2020 -0600 quartz: Simplify FilterMapper_RegisterPinType(). Avoid some unnecessary allocations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 96 ++++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 67 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index f7259a1650..32d3e1a822 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1214,81 +1214,43 @@ static HRESULT WINAPI FilterMapper_RegisterPin(IFilterMapper *iface, CLSID clsid } -static HRESULT WINAPI FilterMapper_RegisterPinType( - IFilterMapper * iface, - CLSID clsFilter, - LPCWSTR szName, - CLSID clsMajorType, - CLSID clsSubType) +static HRESULT WINAPI FilterMapper_RegisterPinType(IFilterMapper *iface, + CLSID clsid, const WCHAR *pin, CLSID majortype, CLSID subtype) { - HRESULT hr; - LONG lRet; - LPWSTR wszClsid = NULL; - LPWSTR wszClsidMajorType = NULL; - LPWSTR wszClsidSubType = NULL; - HKEY hKey = NULL; - WCHAR * wszTypesKey; - WCHAR wszKeyName[MAX_PATH]; - - TRACE("(%p)->(%s, %s, %s, %s)\n", iface, debugstr_guid(&clsFilter), debugstr_w(szName), - debugstr_guid(&clsMajorType), debugstr_guid(&clsSubType)); - - hr = StringFromCLSID(&clsFilter, &wszClsid); - - if (SUCCEEDED(hr)) - { - hr = StringFromCLSID(&clsMajorType, &wszClsidMajorType); - } + WCHAR *keypath, type_keypath[38 + 1 + 38 + 1]; + HKEY key, type_key; + size_t len; + LONG ret; - if (SUCCEEDED(hr)) - { - hr = StringFromCLSID(&clsSubType, &wszClsidSubType); - } + TRACE("iface %p, clsid %s, pin %s, majortype %s, subtype %s.\n", iface, + debugstr_guid(&clsid), debugstr_w(pin), debugstr_guid(&majortype), debugstr_guid(&subtype)); - if (SUCCEEDED(hr)) - { - wszTypesKey = CoTaskMemAlloc((lstrlenW(wszClsidSlash) + lstrlenW(wszClsid) + lstrlenW(wszPins) + - lstrlenW(szName) + lstrlenW(wszTypes) + 3 + 1) * 2); - if (!wszTypesKey) - hr = E_OUTOFMEMORY; - } - - if (SUCCEEDED(hr)) - { - lstrcpyW(wszTypesKey, wszClsidSlash); - lstrcatW(wszTypesKey, wszClsid); - lstrcatW(wszTypesKey, wszSlash); - lstrcatW(wszTypesKey, wszPins); - lstrcatW(wszTypesKey, wszSlash); - lstrcatW(wszTypesKey, szName); - lstrcatW(wszTypesKey, wszSlash); - lstrcatW(wszTypesKey, wszTypes); - - lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszTypesKey, 0, KEY_WRITE, &hKey); - hr = HRESULT_FROM_WIN32(lRet); - CoTaskMemFree(wszTypesKey); - } + len = 6 + 38 + 6 + wcslen(pin) + 6 + 1; + if (!(keypath = malloc(len * sizeof(WCHAR)))) + return E_OUTOFMEMORY; - if (SUCCEEDED(hr)) + wcscpy(keypath, L"CLSID\\"); + StringFromGUID2(&clsid, keypath + wcslen(keypath), len - wcslen(keypath)); + wcscat(keypath, L"\\Pins\\"); + wcscat(keypath, pin); + wcscat(keypath, L"\\Types"); + if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, keypath, 0, KEY_CREATE_SUB_KEY, &key))) { - HKEY hkeyDummy = NULL; - - lstrcpyW(wszKeyName, wszClsidMajorType); - lstrcatW(wszKeyName, wszSlash); - lstrcatW(wszKeyName, wszClsidSubType); - - lRet = RegCreateKeyExW(hKey, wszKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkeyDummy, NULL); - hr = HRESULT_FROM_WIN32(lRet); - RegCloseKey(hKey); - - if (hkeyDummy) RegCloseKey(hkeyDummy); + free(keypath); + return HRESULT_FROM_WIN32(ret); } + free(keypath); - CoTaskMemFree(wszClsid); - CoTaskMemFree(wszClsidMajorType); - CoTaskMemFree(wszClsidSubType); + StringFromGUID2(&majortype, type_keypath, ARRAY_SIZE(type_keypath)); + wcscat(type_keypath, L"\\"); + StringFromGUID2(&subtype, type_keypath + wcslen(type_keypath), ARRAY_SIZE(type_keypath) - wcslen(type_keypath)); + if (!(ret = RegCreateKeyExW(key, type_keypath, 0, NULL, 0, 0, NULL, &type_key, NULL))) + RegCloseKey(type_key); + else + ERR("Failed to create type key, error %u.\n", ret); - return hr; + RegCloseKey(key); + return HRESULT_FROM_WIN32(ret); } static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper * iface, CLSID Filter)

1 0

Zebediah Figura : quartz: Simplify FilterMapper_UnregisterFilter().
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 021354c5541aeb353c653c5594fc95b2465215b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=021354c5541aeb353c653c55… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 22 16:30:51 2020 -0600 quartz: Simplify FilterMapper_UnregisterFilter(). Avoid some unnecessary allocations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 71 ++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 49 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 32d3e1a822..dde4a6caa5 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -83,12 +83,8 @@ static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a', static const WCHAR wszMeritName[] = {'M','e','r','i','t',0}; /* FilterData property in media category Moniker (not CLSID_ActiveMovieCategories) */ static const WCHAR wszFilterDataName[] = {'F','i','l','t','e','r','D','a','t','a',0}; -/* For filters registered with IFilterMapper */ -static const WCHAR wszFilter[] = {'F','i','l','t','e','r',0}; /* For pins registered with IFilterMapper */ static const WCHAR wszPins[] = {'P','i','n','s',0}; -/* For types registered with IFilterMapper */ -static const WCHAR wszTypes[] = {'T','y','p','e','s',0}; /* registry format for REGFILTER2 */ @@ -1253,59 +1249,36 @@ static HRESULT WINAPI FilterMapper_RegisterPinType(IFilterMapper *iface, return HRESULT_FROM_WIN32(ret); } -static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper * iface, CLSID Filter) +static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper *iface, CLSID clsid) { - HRESULT hr; - LONG lRet; - LPWSTR wszClsid = NULL; - HKEY hKey; - WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; - - TRACE("(%p)->(%s)\n", iface, debugstr_guid(&Filter)); - - hr = StringFromCLSID(&Filter, &wszClsid); - - if (SUCCEEDED(hr)) - { - lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszFilter, 0, KEY_WRITE, &hKey); - hr = HRESULT_FROM_WIN32(lRet); - } + WCHAR guidstr[39], keypath[6 + 38 + 1]; + LONG ret; + HKEY key; - if (SUCCEEDED(hr)) - { - lRet = RegDeleteKeyW(hKey, wszClsid); - hr = HRESULT_FROM_WIN32(lRet); - RegCloseKey(hKey); - } + TRACE("iface %p, clsid %s.\n", iface, debugstr_guid(&clsid)); - if (SUCCEEDED(hr)) - { - lstrcpyW(wszKeyName, wszClsidSlash); - lstrcatW(wszKeyName, wszClsid); + StringFromGUID2(&clsid, guidstr, ARRAY_SIZE(guidstr)); - lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, KEY_WRITE, &hKey); - if (lRet == ERROR_FILE_NOT_FOUND) - goto done; - hr = HRESULT_FROM_WIN32(lRet); - } + if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Filter", 0, 0, &key))) + return HRESULT_FROM_WIN32(ret); + if ((ret = RegDeleteKeyW(key, guidstr))) + ERR("Failed to delete filter key, error %u.\n", ret); + RegCloseKey(key); - if (SUCCEEDED(hr)) + wcscpy(keypath, L"CLSID\\"); + wcscat(keypath, guidstr); + if (!(ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, keypath, 0, KEY_WRITE, &key))) { - lRet = RegDeleteValueW(hKey, wszMeritName); - if (lRet != ERROR_SUCCESS && lRet != ERROR_FILE_NOT_FOUND) - hr = HRESULT_FROM_WIN32(lRet); - - lRet = RegDeleteTreeW(hKey, wszPins); - if (lRet != ERROR_SUCCESS && lRet != ERROR_FILE_NOT_FOUND) - hr = HRESULT_FROM_WIN32(lRet); - - RegCloseKey(hKey); + if ((ret = RegDeleteValueW(key, L"Merit"))) + ERR("Failed to delete Merit value, error %u.\n", ret); + if ((ret = RegDeleteTreeW(key, L"Pins"))) + ERR("Failed to delete Pins key, error %u.\n", ret); + RegCloseKey(key); } + else + ERR("Failed to open CLSID key, error %u.\n", ret); -done: - CoTaskMemFree(wszClsid); - - return hr; + return S_OK; } static HRESULT WINAPI FilterMapper_UnregisterFilterInstance(IFilterMapper * iface, CLSID MRId)

1 0

Zebediah Figura : quartz: Simplify FilterMapper_UnregisterPin().
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: c947dab09dda58ef1ca76ff79279694f19f3631f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c947dab09dda58ef1ca76ff7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 22 16:30:52 2020 -0600 quartz: Simplify FilterMapper_UnregisterPin(). Avoid some unnecessary allocations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 60 ++++++++++++---------------------------------- 1 file changed, 15 insertions(+), 45 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index dde4a6caa5..84338e39c3 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -72,9 +72,6 @@ static inline FilterMapper3Impl *impl_from_IUnknown( IUnknown *iface ) return CONTAINING_RECORD(iface, FilterMapper3Impl, IUnknown_inner); } -static const WCHAR wszClsidSlash[] = {'C','L','S','I','D','\\',0}; -static const WCHAR wszSlash[] = {'\\',0}; - /* CLSID property in media category Moniker */ static const WCHAR wszClsidName[] = {'C','L','S','I','D',0}; /* FriendlyName property in media category Moniker */ @@ -83,8 +80,6 @@ static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a', static const WCHAR wszMeritName[] = {'M','e','r','i','t',0}; /* FilterData property in media category Moniker (not CLSID_ActiveMovieCategories) */ static const WCHAR wszFilterDataName[] = {'F','i','l','t','e','r','D','a','t','a',0}; -/* For pins registered with IFilterMapper */ -static const WCHAR wszPins[] = {'P','i','n','s',0}; /* registry format for REGFILTER2 */ @@ -1290,54 +1285,29 @@ static HRESULT WINAPI FilterMapper_UnregisterFilterInstance(IFilterMapper * ifac return E_NOTIMPL; } -static HRESULT WINAPI FilterMapper_UnregisterPin(IFilterMapper * iface, CLSID Filter, LPCWSTR Name) +static HRESULT WINAPI FilterMapper_UnregisterPin(IFilterMapper * iface, CLSID clsid, const WCHAR *name) { - HRESULT hr; - LONG lRet; - LPWSTR wszClsid = NULL; - HKEY hKey = NULL; - WCHAR * wszPinNameKey; - WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; + WCHAR keypath[6 + 38 + 5 + 1]; + LONG ret; + HKEY key; - TRACE("(%p)->(%s, %s)\n", iface, debugstr_guid(&Filter), debugstr_w(Name)); + TRACE("iface %p, clsid %s, name %s.\n", iface, debugstr_guid(&clsid), debugstr_w(name)); - if (!Name) + if (!name) return E_INVALIDARG; - hr = StringFromCLSID(&Filter, &wszClsid); - - if (SUCCEEDED(hr)) - { - lstrcpyW(wszKeyName, wszClsidSlash); - lstrcatW(wszKeyName, wszClsid); - - lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, KEY_WRITE, &hKey); - hr = HRESULT_FROM_WIN32(lRet); - } - - if (SUCCEEDED(hr)) - { - wszPinNameKey = CoTaskMemAlloc((lstrlenW(wszPins) + 1 + lstrlenW(Name) + 1) * 2); - if (!wszPinNameKey) - hr = E_OUTOFMEMORY; - } - - if (SUCCEEDED(hr)) - { - lstrcpyW(wszPinNameKey, wszPins); - lstrcatW(wszPinNameKey, wszSlash); - lstrcatW(wszPinNameKey, Name); + wcscpy(keypath, L"CLSID\\"); + StringFromGUID2(&clsid, keypath + wcslen(keypath), ARRAY_SIZE(keypath) - wcslen(keypath)); + wcscat(keypath, L"\\Pins"); + if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, keypath, 0, 0, &key))) + return HRESULT_FROM_WIN32(ret); - lRet = RegDeleteTreeW(hKey, wszPinNameKey); - hr = HRESULT_FROM_WIN32(lRet); - CoTaskMemFree(wszPinNameKey); - } + if ((ret = RegDeleteTreeW(key, name))) + ERR("Failed to delete subkey, error %u.\n", ret); - CoTaskMemFree(wszClsid); - if (hKey) - RegCloseKey(hKey); + RegCloseKey(key); - return hr; + return S_OK; } static const IFilterMapperVtbl fmvtbl =

1 0

Nikolay Sivov : dwrite: Evaluate IsSymbolFont() flag at font level.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 0b0a2ce8fdba62199c979f6f03bb9d374da48e45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b0a2ce8fdba62199c979f6f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 23 12:24:12 2020 +0300 dwrite: Evaluate IsSymbolFont() flag at font level. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 16 ++++++++++--- dlls/dwrite/font.c | 42 +++++++++++++-------------------- dlls/dwrite/freetype.c | 23 +++++------------- dlls/dwrite/opentype.c | 55 +++++++++++++++++++++++++++++++++++++++----- dlls/dwrite/tests/font.c | 13 ++++------- 5 files changed, 88 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b0a2ce8fdba62199c97…

1 0

Alistair Leslie-Hughes : include: Add _Inout_updates_bytes_opt_ define.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 9b1e9fce9f212d3bc7e2cef8162b1d1fad5ce00e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b1e9fce9f212d3bc7e2cef8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 21 23:43:58 2020 +0000 include: Add _Inout_updates_bytes_opt_ define. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sal.h b/include/sal.h index 823361af17..81a828dd97 100644 --- a/include/sal.h +++ b/include/sal.h @@ -97,6 +97,7 @@ #define _Inout_updates_(count) #define _Inout_updates_bytes_(count) #define _Inout_updates_bytes_all_opt_(count) +#define _Inout_updates_bytes_opt_(count) #define _Inout_updates_opt_(count) #define _Inout_updates_z_(count) #define _Inout_updates_opt_z_(count)

1 0