January 2020 - Wine-commits

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

23 Jan '20

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

Alistair Leslie-Hughes : include: Add directmanipulation.idl.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: 2b6b3498578eab5007a26e33755a537b5c0d9437 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b6b3498578eab5007a26e33… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 21 23:43:56 2020 +0000 include: Add directmanipulation.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/directmanipulation.idl | 416 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 417 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2b6b3498578eab5007a2…

1 0

Alistair Leslie-Hughes : include: Add _Inout_updates_bytes_opt_ define.
by Alexandre Julliard 23 Jan '20

23 Jan '20

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

Alistair Leslie-Hughes : include: Add remaining DBPROPSET_* GUID's.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: 12f5fa1fd7d87d518ada0a7c7d55fd3a0975bcbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=12f5fa1fd7d87d518ada0a7c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 21 23:44:00 2020 +0000 include: Add remaining DBPROPSET_* GUID's. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbs.idl | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/include/dbs.idl b/include/dbs.idl index 53cadedf65..d04aa09ff1 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -482,12 +482,26 @@ cpp_quote(" EXTERN_C const GUID name DECLSPEC_HIDDEN") cpp_quote("#endif") cpp_quote("DEFINE_DBGUID(DB_NULLGUID, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);") -cpp_quote("DEFINE_DBGUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_SESSION, 0xc8b522f5, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_ROWSET, 0xc8b522f6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_ROW, 0xc8b522f7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_STREAM, 0xc8b522f9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_COLUMN, 0xc8b522b9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DATASOURCE, 0xc8b522ba, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DATASOURCEINFO, 0xc8b522bb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_INDEX, 0xc8b522bd, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_ROWSET, 0xc8b522be, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_TABLE, 0xc8b522bf, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DATASOURCEALL, 0xc8b522c0, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DATASOURCEINFOALL, 0xc8b522c1, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_ROWSETALL, 0xc8b522c2, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_SESSION, 0xc8b522c6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_SESSIONALL, 0xc8b522c7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBPROPSET_PROPERTIESINERROR, 0xc8b522d4, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") + cpp_quote("#define DBPROMPT_PROMPT 0x01") cpp_quote("#define DBPROMPT_COMPLETE 0x02") cpp_quote("#define DBPROMPT_COMPLETEREQUIRED 0x03")

1 0

Alistair Leslie-Hughes : include: Add enum DBPROPFLAGSENUM.
by Alexandre Julliard 23 Jan '20

23 Jan '20

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 dxva2api.idl.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: 508764a8bd778178270c040adef474a1f9642652 URL: https://source.winehq.org/git/wine.git/?a=commit;h=508764a8bd778178270c040a… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Jan 22 07:18:00 2019 +0530 include: Update dxva2api.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxva2api.idl | 242 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 242 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=508764a8bd778178270c…

1 0

Biswapriyo Nath : include: Update thumbcache.idl file.
by Alexandre Julliard 23 Jan '20

23 Jan '20

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 23 Jan '20

23 Jan '20

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

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

23 Jan '20

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

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

23 Jan '20

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