December 2021 - Wine-commits

Jeremy Newman : WWN 408
by Jeremy Newman 03 Dec '21

03 Dec '21

Module: website Branch: master Commit: a513721d10894df4261dace3feae4baabbc462c3 URL: https://source.winehq.org/git/website.git/?a=commit;h=a513721d10894df4261da… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Dec 3 10:17:52 2021 -0600 WWN 408 --- news/en/2021120301.xml | 12 +++++++++++ wwn/en/wn20211203_408.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/news/en/2021120301.xml b/news/en/2021120301.xml new file mode 100644 index 00000000..3dc6ef00 --- /dev/null +++ b/news/en/2021120301.xml @@ -0,0 +1,12 @@ +<news> + <date>December 3, 2021</date> + <title>World Wine News Issue 408</title> + <body> + <a href="{$root}/wwn/408">WWN Issue 408</a> was released today. + <ul> + <li><a href="{$root}/wwn/408#Tryptophan and Turkey OR The Curious Case of Wine and PE">Tryptophan and Turkey OR The Curious Case of Wine and PE</a></li> + <li><a href="{$root}/wwn/408#Conversion to PE Files">Conversion to PE Files</a></li> + <li><a href="{$root}/wwn/408#Code Freeze">Code Freeze</a></li> + </ul> + </body> +</news> diff --git a/wwn/en/wn20211203_408.xml b/wwn/en/wn20211203_408.xml new file mode 100755 index 00000000..839b839a --- /dev/null +++ b/wwn/en/wn20211203_408.xml @@ -0,0 +1,55 @@ +<kc> + <title>Wine Traffic</title> + <author contact="mailto:wwn(a)winehq.org">Cressida Silver</author> + <issue num="408" date="12/03/2021"/> + <intro> + <p> + This is the 408th issue of the World Wine News publication. Its main goal is to inform you of what's going on around Wine. + Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. + Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code, + but it can optionally use native system DLLs if they are available. You can find more info at <a href="http://www.winehq.org">www.winehq.org</a> + </p> + </intro> + + + <section title="Tryptophan and Turkey OR The Curious Case of Wine and PE" subject="" archive="" posts=""> + <p> + I realize that the 408th issue of WWN is arriving a week late. I blame Thanksgiving and all that <a href="https://en.wikipedia.org/wiki/Tryptophan#Turkey_meat_and_drowsiness"> + Tryptophan in turkey</a> for missing my deadline last Friday. I don't care that Wikipedia says it is a myth. Why else would I be so tired after eating several plates of + turkey, stuffing, mashed potatoes, corn, and candied yams? + </p> + + <p> + No need to debate, I ate the turkey and I got tired. Seems like a simple case of cause and effect. + </p> + </section> + + <section title="Conversion to PE Files" subject="Wine Overview" archive="" posts=""> + <p> + On Windows, all system libraries are Portable Executable (PE) files. Before version 5.0, Wine provided its implementation of Windows libraries and <i>.so</i> (ELF or MachO) files in such a way that they behaved like PE files. Though effective in many scenarios, a need for a 32on64 solution and some lingering compatibility issues prompted changes to this format. + Beginning in Wine 5.0, most modules were built in PE instead of Executable and Linkable File (ELF) format. The PE binaries were copied into the Wine prefix, not the DLL files, making it look more like a Windows installation. Several core DLLs (e.g., NTDLL, KERNEL32, GDI32, and USER32) were converted to PE in Wine 6.0. + + More closely resembling a Windows installation improves the functionality of applications using Digital Right Management (DRM) schemes that require on-disk system module content to be identical to the in-memory content. However, PE files can't link directly to Unix libraries. For this reason some modules in Wine have both PE and <i>.so</i> libraries. This allows the PE library to call into its <i>.so</i> library, which can then perform the Unix call. This process is like an OS syscall or kernel call, and it's treated as such. + </p> + + <p> + Another class of applications that benefit from this are Windows debuggers, which don't expect non-PE modules. Conversion to PE means that debuggers now understand Wine built-in modules and the execution of native libraries is hidden from the debuggers using syscall interface. + </p> + + <p> + Let's get back to the 32on64 issue. It was a prominent reason for the PE conversion. The goal is for Wine to execute 32-bit code in 64-bit Unix, and not require 32-bit host libraries. In such cases, there will be only the 64-bit versions of Wine Unix libraries, but both 64-bit and 32-bit PE libraries. Whenever a 32-bit application calls a Unix function, it will use a mechanism built around syscall interface to switch between 64-bit and 32-bit mode. This architecture also makes it possible to support other multi-arch scenarios. Furthermore, this architecture will also solver an issue arising when macOS and Windows both attempt to use the %gs base register for threading support. There are hacks currently in place for this, but they are not reliable. A clean separation of Unix and PE code with a syscall interface will potentially make it possible to switch between Unix and Windows %gs base. + </p> + + </section> + + <section title="Code Freeze" subject="Wine Code Freeze" archive="" posts=""> + <p> + Save the date. The Wine code freeze is set to begin on December 10th, 2021. This means Wine 7.0 is just around the corner. Happy Holidays, indeed! + </p> + + <p> + P.S. With Wine 7.0, very few (but tricky!) modules will remain unconverted to PE. + </p> + + </section> +</kc>

1 0

Vijay Kiran Kamuju : ntdll: Add stub RtlLookupElementGenericTable function.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 78fbea16728f43771c7081427232f7008be5d7f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78fbea16728f43771c708142… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Nov 30 20:15:58 2021 -0700 ntdll: Add stub RtlLookupElementGenericTable function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49426 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 695a30cf25c..85bc32a1a15 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -853,7 +853,7 @@ # @ stub RtlLockMemoryStreamRegion # @ stub RtlLogStackBackTrace @ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) -@ stub RtlLookupElementGenericTable +@ stdcall RtlLookupElementGenericTable(ptr ptr) # @ stub RtlLookupElementGenericTableAvl @ stdcall -arch=arm,arm64,x86_64 RtlLookupFunctionEntry(long ptr ptr) @ stdcall RtlMakeSelfRelativeSD(ptr ptr ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 9b93c8fad28..11067f44941 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -473,6 +473,15 @@ void * WINAPI RtlGetElementGenericTable(RTL_GENERIC_TABLE *table, ULONG index) return NULL; } +/****************************************************************************** + * RtlLookupElementGenericTable [NTDLL.@] + */ +void * WINAPI RtlLookupElementGenericTable(RTL_GENERIC_TABLE *table, void *buffer) +{ + FIXME("(%p, %p) stub!\n", table, buffer); + return NULL; +} + /****************************************************************************** * RtlMoveMemory [NTDLL.@] * diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7bfbebc92a8..d445c5a5557 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1183,7 +1183,7 @@ @ stdcall RtlLocateLegacyContext(ptr ptr) @ stub RtlLockBootStatusData @ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) -@ stub RtlLookupElementGenericTable +@ stdcall RtlLookupElementGenericTable(ptr ptr) @ stub RtlLookupElementGenericTableAvl @ stub RtlLookupElementGenericTableFull @ stub RtlLookupElementGenericTableFullAvl diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 2940436d0ca..a6b2974ee6a 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -269,6 +269,7 @@ void * WINAPI RtlGetElementGenericTable(PRTL_GENERIC_TABLE,ULONG); void WINAPI RtlInitializeGenericTable(PRTL_GENERIC_TABLE,PRTL_GENERIC_COMPARE_ROUTINE,PRTL_GENERIC_ALLOCATE_ROUTINE,PRTL_GENERIC_FREE_ROUTINE,void *); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); +void * WINAPI RtlLookupElementGenericTable(PRTL_GENERIC_TABLE,void *); ULONG WINAPI RtlNumberGenericTableElements(PRTL_GENERIC_TABLE); #endif

1 0

Nikolay Sivov : dwrite: Create backend font objects for faces.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 7639820cfb96f1c3e653e6a1d6d0e30eb01850c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7639820cfb96f1c3e653e6a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 2 15:37:15 2021 +0300 dwrite: Create backend font objects for faces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 9 +++++++++ dlls/dwrite/font.c | 35 +++++++++++++++++++++++++++++++++-- dlls/dwrite/freetype.c | 37 +++++++++++++++++++++++++++++++++++-- 3 files changed, 77 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 7cca4c5c4f9..9735ffd2605 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -241,6 +241,10 @@ extern UINT16 opentype_cmap_get_glyph(const struct dwrite_cmap *cmap, unsigned i extern HRESULT opentype_cmap_get_unicode_ranges(const struct dwrite_cmap *cmap, unsigned int max_count, DWRITE_UNICODE_RANGE *ranges, unsigned int *count) DECLSPEC_HIDDEN; +struct dwrite_fontface; +typedef void * font_object_handle; +typedef font_object_handle (*p_dwrite_fontface_get_font_object)(struct dwrite_fontface *fontface); + struct dwrite_fontface { IDWriteFontFace5 IDWriteFontFace5_iface; @@ -253,6 +257,9 @@ struct dwrite_fontface IDWriteFactory7 *factory; struct fontfacecached *cached; + font_object_handle font_object; + void *data_context; + p_dwrite_fontface_get_font_object get_font_object; USHORT simulations; DWRITE_FONT_FACE_TYPE type; @@ -731,6 +738,8 @@ struct font_callback_funcs struct font_backend_funcs { + font_object_handle (CDECL *create_font_object)(const void *data_ptr, UINT64 data_size, unsigned int index); + void (CDECL *release_font_object)(font_object_handle object); void (CDECL *notify_release)(void *key); int (CDECL *get_glyph_outline)(void *key, float em_size, unsigned int simulations, UINT16 glyph, struct dwrite_outline *outline); diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index b7071314bb2..85868c6bfd8 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -636,8 +636,6 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace5 *iface) IDWriteFontFace5_ReleaseFontTable(iface, fontface->kern.context); if (fontface->file) IDWriteFontFile_Release(fontface->file); - if (fontface->stream) - IDWriteFontFileStream_Release(fontface->stream); if (fontface->names) IDWriteLocalizedStrings_Release(fontface->names); if (fontface->family_names) @@ -652,6 +650,12 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace5 *iface) heap_free(fontface->glyphs[i]); font_funcs->notify_release(iface); + font_funcs->release_font_object(fontface->font_object); + if (fontface->stream) + { + IDWriteFontFileStream_ReleaseFileFragment(fontface->stream, fontface->data_context); + IDWriteFontFileStream_Release(fontface->stream); + } dwrite_cmap_release(&fontface->cmap); IDWriteFactory7_Release(fontface->factory); @@ -5013,6 +5017,32 @@ HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_ke return S_OK; } +static font_object_handle dwrite_fontface_get_font_object(struct dwrite_fontface *fontface) +{ + font_object_handle font_object; + const void *data_ptr; + void *data_context; + UINT64 size; + + if (!fontface->font_object && SUCCEEDED(IDWriteFontFileStream_GetFileSize(fontface->stream, &size))) + { + if (SUCCEEDED(IDWriteFontFileStream_ReadFileFragment(fontface->stream, &data_ptr, 0, size, &data_context))) + { + if (!(font_object = font_funcs->create_font_object(data_ptr, size, fontface->index))) + { + WARN("Backend failed to create font object.\n"); + IDWriteFontFileStream_ReleaseFileFragment(fontface->stream, data_context); + return NULL; + } + + if (InterlockedCompareExchangePointer((void **)&fontface->font_object, font_object, NULL)) + font_funcs->release_font_object(font_object); + } + } + + return fontface->font_object; +} + HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_list, IDWriteFontFace5 **ret) { struct file_stream_desc stream_desc; @@ -5102,6 +5132,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li release_font_data(font_data); fontface->cached = factory_cache_fontface(fontface->factory, cached_list, &fontface->IDWriteFontFace5_iface); + fontface->get_font_object = dwrite_fontface_get_font_object; *ret = &fontface->IDWriteFontFace5_iface; diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 1ece99e08c9..5c32ec725f6 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -69,6 +69,7 @@ typedef struct static const struct font_callback_funcs *callback_funcs; #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL +MAKE_FUNCPTR(FT_Done_Face); MAKE_FUNCPTR(FT_Done_FreeType); MAKE_FUNCPTR(FT_Done_Glyph); MAKE_FUNCPTR(FT_Get_First_Char); @@ -143,12 +144,14 @@ static BOOL init_freetype(void) FT_Version_t FT_Version; ft_handle = dlopen(SONAME_LIBFREETYPE, RTLD_NOW); - if (!ft_handle) { + if (!ft_handle) + { WINE_MESSAGE("Wine cannot find the FreeType font library.\n"); - return FALSE; + return FALSE; } #define LOAD_FUNCPTR(f) if((p##f = dlsym(ft_handle, #f)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} + LOAD_FUNCPTR(FT_Done_Face) LOAD_FUNCPTR(FT_Done_FreeType) LOAD_FUNCPTR(FT_Done_Glyph) LOAD_FUNCPTR(FT_Get_First_Char) @@ -211,6 +214,23 @@ sym_not_found: return FALSE; } +static font_object_handle CDECL freetype_create_font_object(const void *data_ptr, UINT64 data_size, unsigned int index) +{ + FT_Face face = NULL; + FT_Error fterror; + + fterror = pFT_New_Memory_Face(library, data_ptr, data_size, index, &face); + if (fterror != FT_Err_Ok) + WARN("Failed to create a face object, error %d.\n", fterror); + + return face; +} + +static void CDECL freetype_release_font_object(font_object_handle object) +{ + pFT_Done_Face(object); +} + static void CDECL freetype_notify_release(void *key) { RtlEnterCriticalSection(&freetype_cs); @@ -777,6 +797,8 @@ static INT32 CDECL freetype_get_glyph_advance(void *key, float emSize, UINT16 in const static struct font_backend_funcs freetype_funcs = { + freetype_create_font_object, + freetype_release_font_object, freetype_notify_release, freetype_get_glyph_outline, freetype_get_glyph_count, @@ -803,6 +825,15 @@ static NTSTATUS release_freetype_lib(void) #else /* HAVE_FREETYPE */ +static font_object_handle CDECL null_create_font_object(const void *data_ptr, UINT64 data_size, unsigned int index) +{ + return NULL; +} + +static void CDECL null_release_font_object(font_object_handle object) +{ +} + static void CDECL null_notify_release(void *key) { } @@ -842,6 +873,8 @@ static void CDECL null_get_design_glyph_metrics(void *key, UINT16 upem, UINT16 a const static struct font_backend_funcs null_funcs = { + null_create_font_object, + null_release_font_object, null_notify_release, null_get_glyph_outline, null_get_glyph_count,

1 0

Nikolay Sivov : dwrite: Use per-instance font object for GetGlyphCount().
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 822a49d524bba50a46a3d3c51afa37f6dfadb4ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=822a49d524bba50a46a3d3c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 2 15:37:16 2021 +0300 dwrite: Use per-instance font object for GetGlyphCount(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 4 +++- dlls/dwrite/freetype.c | 15 ++++----------- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 9735ffd2605..75bc1be902a 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -743,7 +743,7 @@ struct font_backend_funcs void (CDECL *notify_release)(void *key); int (CDECL *get_glyph_outline)(void *key, float em_size, unsigned int simulations, UINT16 glyph, struct dwrite_outline *outline); - UINT16 (CDECL *get_glyph_count)(void *key); + UINT16 (CDECL *get_glyph_count)(font_object_handle object); INT32 (CDECL *get_glyph_advance)(void *key, float em_size, UINT16 index, DWRITE_MEASURING_MODE measuring_mode, BOOL *has_contours); void (CDECL *get_glyph_bbox)(struct dwrite_glyphbitmap *bitmap_desc); diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 85868c6bfd8..5f4f5587a62 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -734,9 +734,11 @@ static void WINAPI dwritefontface_GetMetrics(IDWriteFontFace5 *iface, DWRITE_FON static UINT16 WINAPI dwritefontface_GetGlyphCount(IDWriteFontFace5 *iface) { + struct dwrite_fontface *fontface = impl_from_IDWriteFontFace5(iface); + TRACE("%p.\n", iface); - return font_funcs->get_glyph_count(iface); + return font_funcs->get_glyph_count(fontface->get_font_object(fontface)); } static HRESULT WINAPI dwritefontface_GetDesignGlyphMetrics(IDWriteFontFace5 *iface, diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 5c32ec725f6..6b566649edc 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -527,17 +527,10 @@ static int CDECL freetype_get_glyph_outline(void *key, float emSize, unsigned in return ret; } -static UINT16 CDECL freetype_get_glyph_count(void *key) +static UINT16 CDECL freetype_get_glyph_count(font_object_handle object) { - UINT16 count = 0; - FT_Face face; - - RtlEnterCriticalSection(&freetype_cs); - if (pFTC_Manager_LookupFace(cache_manager, key, &face) == 0) - count = face->num_glyphs; - RtlLeaveCriticalSection(&freetype_cs); - - return count; + FT_Face face = object; + return face ? face->num_glyphs : 0; } static inline void ft_matrix_from_dwrite_matrix(const DWRITE_MATRIX *m, FT_Matrix *ft_matrix) @@ -844,7 +837,7 @@ static int CDECL null_get_glyph_outline(void *key, float emSize, unsigned int si return 1; } -static UINT16 CDECL null_get_glyph_count(void *key) +static UINT16 CDECL null_get_glyph_count(font_object_handle object) { return 0; }

1 0

Nikolay Sivov : dwrite: Do not use freetype cache for design glyph metrics.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 6356717c47ee7c1aa5bc385fc91fd8e21cb7b040 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6356717c47ee7c1aa5bc385f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 2 15:37:17 2021 +0300 dwrite: Do not use freetype cache for design glyph metrics. 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 | 23 +++++++----- dlls/dwrite/freetype.c | 89 ++++++++++++++++++++++++++++---------------- 3 files changed, 72 insertions(+), 43 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 75bc1be902a..3d445cddae2 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -260,6 +260,7 @@ struct dwrite_fontface font_object_handle font_object; void *data_context; p_dwrite_fontface_get_font_object get_font_object; + CRITICAL_SECTION cs; USHORT simulations; DWRITE_FONT_FACE_TYPE type; @@ -748,7 +749,7 @@ struct font_backend_funcs BOOL *has_contours); void (CDECL *get_glyph_bbox)(struct dwrite_glyphbitmap *bitmap_desc); BOOL (CDECL *get_glyph_bitmap)(struct dwrite_glyphbitmap *bitmap_desc); - void (CDECL *get_design_glyph_metrics)(void *key, UINT16 upem, UINT16 ascent, unsigned int simulations, + void (CDECL *get_design_glyph_metrics)(font_object_handle object, UINT16 upem, UINT16 ascent, unsigned int simulations, UINT16 glyph, DWRITE_GLYPH_METRICS *metrics); }; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5f4f5587a62..4b135b83d68 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -659,6 +659,7 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace5 *iface) dwrite_cmap_release(&fontface->cmap); IDWriteFactory7_Release(fontface->factory); + DeleteCriticalSection(&fontface->cs); heap_free(fontface); } @@ -745,8 +746,8 @@ static HRESULT WINAPI dwritefontface_GetDesignGlyphMetrics(IDWriteFontFace5 *ifa UINT16 const *glyphs, UINT32 glyph_count, DWRITE_GLYPH_METRICS *ret, BOOL is_sideways) { struct dwrite_fontface *fontface = impl_from_IDWriteFontFace5(iface); + HRESULT hr = S_OK; unsigned int i; - HRESULT hr; TRACE("%p, %p, %u, %p, %d.\n", iface, glyphs, glyph_count, ret, is_sideways); @@ -756,22 +757,23 @@ static HRESULT WINAPI dwritefontface_GetDesignGlyphMetrics(IDWriteFontFace5 *ifa if (is_sideways) FIXME("sideways metrics are not supported.\n"); - for (i = 0; i < glyph_count; i++) { + EnterCriticalSection(&fontface->cs); + for (i = 0; i < glyph_count; ++i) + { DWRITE_GLYPH_METRICS metrics; - hr = get_cached_glyph_metrics(fontface, glyphs[i], &metrics); - if (hr != S_OK) + if (get_cached_glyph_metrics(fontface, glyphs[i], &metrics) != S_OK) { - font_funcs->get_design_glyph_metrics(iface, fontface->metrics.designUnitsPerEm, - fontface->typo_metrics.ascent, fontface->simulations, glyphs[i], &metrics); - hr = set_cached_glyph_metrics(fontface, glyphs[i], &metrics); - if (FAILED(hr)) - return hr; + font_funcs->get_design_glyph_metrics(fontface->get_font_object(fontface), + fontface->metrics.designUnitsPerEm, fontface->typo_metrics.ascent, + fontface->simulations, glyphs[i], &metrics); + if (FAILED(hr = set_cached_glyph_metrics(fontface, glyphs[i], &metrics))) break; } ret[i] = metrics; } + LeaveCriticalSection(&fontface->cs); - return S_OK; + return hr; } static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace5 *iface, UINT32 const *codepoints, @@ -5076,6 +5078,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li IDWriteFontFile_AddRef(fontface->file); fontface->stream = desc->stream; IDWriteFontFileStream_AddRef(fontface->stream); + InitializeCriticalSection(&fontface->cs); stream_desc.stream = fontface->stream; stream_desc.face_type = desc->face_type; diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 6b566649edc..b19ae3616bc 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -33,6 +33,7 @@ #include FT_FREETYPE_H #include FT_OUTLINE_H #include FT_TRUETYPE_TABLES_H +#include FT_SIZES_H #endif /* HAVE_FT2BUILD_H */ #include "ntstatus.h" @@ -69,9 +70,11 @@ typedef struct static const struct font_callback_funcs *callback_funcs; #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL +MAKE_FUNCPTR(FT_Activate_Size); MAKE_FUNCPTR(FT_Done_Face); MAKE_FUNCPTR(FT_Done_FreeType); MAKE_FUNCPTR(FT_Done_Glyph); +MAKE_FUNCPTR(FT_Done_Size); MAKE_FUNCPTR(FT_Get_First_Char); MAKE_FUNCPTR(FT_Get_Kerning); MAKE_FUNCPTR(FT_Get_Sfnt_Table); @@ -84,6 +87,7 @@ MAKE_FUNCPTR(FT_Load_Glyph); MAKE_FUNCPTR(FT_Matrix_Multiply); MAKE_FUNCPTR(FT_MulDiv); MAKE_FUNCPTR(FT_New_Memory_Face); +MAKE_FUNCPTR(FT_New_Size); MAKE_FUNCPTR(FT_Outline_Copy); MAKE_FUNCPTR(FT_Outline_Decompose); MAKE_FUNCPTR(FT_Outline_Done); @@ -92,6 +96,7 @@ MAKE_FUNCPTR(FT_Outline_Get_Bitmap); MAKE_FUNCPTR(FT_Outline_New); MAKE_FUNCPTR(FT_Outline_Transform); MAKE_FUNCPTR(FT_Outline_Translate); +MAKE_FUNCPTR(FT_Set_Pixel_Sizes); MAKE_FUNCPTR(FTC_ImageCache_Lookup); MAKE_FUNCPTR(FTC_ImageCache_New); MAKE_FUNCPTR(FTC_Manager_New); @@ -139,6 +144,28 @@ static FT_Error face_requester(FTC_FaceID face_id, FT_Library library, FT_Pointe return fterror; } +static FT_Size freetype_set_face_size(FT_Face face, FT_UInt emsize) +{ + FT_Size size; + + if (pFT_New_Size(face, &size)) return NULL; + + pFT_Activate_Size(size); + + if (pFT_Set_Pixel_Sizes(face, emsize, emsize)) + { + pFT_Done_Size(size); + return NULL; + } + + return size; +} + +static BOOL freetype_glyph_has_contours(FT_Face face) +{ + return face->glyph->format == FT_GLYPH_FORMAT_OUTLINE && face->glyph->outline.n_contours; +} + static BOOL init_freetype(void) { FT_Version_t FT_Version; @@ -151,9 +178,11 @@ static BOOL init_freetype(void) } #define LOAD_FUNCPTR(f) if((p##f = dlsym(ft_handle, #f)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} + LOAD_FUNCPTR(FT_Activate_Size) LOAD_FUNCPTR(FT_Done_Face) LOAD_FUNCPTR(FT_Done_FreeType) LOAD_FUNCPTR(FT_Done_Glyph) + LOAD_FUNCPTR(FT_Done_Size) LOAD_FUNCPTR(FT_Get_First_Char) LOAD_FUNCPTR(FT_Get_Kerning) LOAD_FUNCPTR(FT_Get_Sfnt_Table) @@ -166,6 +195,7 @@ static BOOL init_freetype(void) LOAD_FUNCPTR(FT_Matrix_Multiply) LOAD_FUNCPTR(FT_MulDiv) LOAD_FUNCPTR(FT_New_Memory_Face) + LOAD_FUNCPTR(FT_New_Size) LOAD_FUNCPTR(FT_Outline_Copy) LOAD_FUNCPTR(FT_Outline_Decompose) LOAD_FUNCPTR(FT_Outline_Done) @@ -174,6 +204,7 @@ static BOOL init_freetype(void) LOAD_FUNCPTR(FT_Outline_New) LOAD_FUNCPTR(FT_Outline_Transform) LOAD_FUNCPTR(FT_Outline_Translate) + LOAD_FUNCPTR(FT_Set_Pixel_Sizes) LOAD_FUNCPTR(FTC_ImageCache_Lookup) LOAD_FUNCPTR(FTC_ImageCache_New) LOAD_FUNCPTR(FTC_Manager_New) @@ -238,43 +269,37 @@ static void CDECL freetype_notify_release(void *key) RtlLeaveCriticalSection(&freetype_cs); } -static void CDECL freetype_get_design_glyph_metrics(void *key, UINT16 upem, UINT16 ascent, +static void CDECL freetype_get_design_glyph_metrics(font_object_handle object, UINT16 upem, UINT16 ascent, unsigned int simulations, UINT16 glyph, DWRITE_GLYPH_METRICS *ret) { - FTC_ScalerRec scaler; + FT_Face face = object; FT_Size size; - scaler.face_id = key; - scaler.width = upem; - scaler.height = upem; - scaler.pixel = 1; - scaler.x_res = 0; - scaler.y_res = 0; + if (!(size = freetype_set_face_size(face, upem))) + return; - RtlEnterCriticalSection(&freetype_cs); - if (pFTC_Manager_LookupSize(cache_manager, &scaler, &size) == 0) { - if (pFT_Load_Glyph(size->face, glyph, FT_LOAD_NO_SCALE) == 0) { - FT_Glyph_Metrics *metrics = &size->face->glyph->metrics; - - ret->leftSideBearing = metrics->horiBearingX; - ret->advanceWidth = metrics->horiAdvance; - ret->rightSideBearing = metrics->horiAdvance - metrics->horiBearingX - metrics->width; - - ret->advanceHeight = metrics->vertAdvance; - ret->verticalOriginY = ascent; - ret->topSideBearing = ascent - metrics->horiBearingY; - ret->bottomSideBearing = metrics->vertAdvance - metrics->height - ret->topSideBearing; - - /* Adjust in case of bold simulation, glyphs without contours are ignored. */ - if (simulations & DWRITE_FONT_SIMULATIONS_BOLD && - size->face->glyph->format == FT_GLYPH_FORMAT_OUTLINE && size->face->glyph->outline.n_contours) - { - if (ret->advanceWidth) - ret->advanceWidth += (upem + 49) / 50; - } - } + if (!pFT_Load_Glyph(face, glyph, FT_LOAD_NO_SCALE)) + { + FT_Glyph_Metrics *metrics = &face->glyph->metrics; + + ret->leftSideBearing = metrics->horiBearingX; + ret->advanceWidth = metrics->horiAdvance; + ret->rightSideBearing = metrics->horiAdvance - metrics->horiBearingX - metrics->width; + + ret->advanceHeight = metrics->vertAdvance; + ret->verticalOriginY = ascent; + ret->topSideBearing = ascent - metrics->horiBearingY; + ret->bottomSideBearing = metrics->vertAdvance - metrics->height - ret->topSideBearing; + + /* Adjust in case of bold simulation, glyphs without contours are ignored. */ + if (simulations & DWRITE_FONT_SIMULATIONS_BOLD && freetype_glyph_has_contours(face)) + { + if (ret->advanceWidth) + ret->advanceWidth += (upem + 49) / 50; + } } - RtlLeaveCriticalSection(&freetype_cs); + + pFT_Done_Size(size); } struct decompose_context @@ -859,7 +884,7 @@ static BOOL CDECL null_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap) return FALSE; } -static void CDECL null_get_design_glyph_metrics(void *key, UINT16 upem, UINT16 ascent, unsigned int simulations, +static void CDECL null_get_design_glyph_metrics(font_object_handle object, UINT16 upem, UINT16 ascent, unsigned int simulations, UINT16 glyph, DWRITE_GLYPH_METRICS *metrics) { }

1 0

Nikolay Sivov : dwrite: Allocate outline buffers on PE side.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 1a8d6f55f245aca47d233607419012f5fcd55b71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a8d6f55f245aca47d233607… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 2 15:37:18 2021 +0300 dwrite: Allocate outline buffers on PE side. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 27 +++++++++++++++++++++---- dlls/dwrite/freetype.c | 48 ++++++++++++++++++++------------------------ 3 files changed, 46 insertions(+), 31 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 3d445cddae2..2b9651a906c 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -742,7 +742,7 @@ struct font_backend_funcs font_object_handle (CDECL *create_font_object)(const void *data_ptr, UINT64 data_size, unsigned int index); void (CDECL *release_font_object)(font_object_handle object); void (CDECL *notify_release)(void *key); - int (CDECL *get_glyph_outline)(void *key, float em_size, unsigned int simulations, UINT16 glyph, + int (CDECL *get_glyph_outline)(font_object_handle object, float emsize, unsigned int simulations, UINT16 glyph, struct dwrite_outline *outline); UINT16 (CDECL *get_glyph_count)(font_object_handle object); INT32 (CDECL *get_glyph_advance)(void *key, float em_size, UINT16 index, DWRITE_MEASURING_MODE measuring_mode, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4b135b83d68..20bb6b3159f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -835,12 +835,13 @@ static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace5 *iface, { struct dwrite_fontface *fontface = impl_from_IDWriteFontFace5(iface); D2D1_POINT_2F *origins, baseline_origin = { 0 }; - struct dwrite_outline outline = {{ 0 }}; + struct dwrite_outline outline, outline_size; D2D1_BEZIER_SEGMENT segment; D2D1_POINT_2F point; DWRITE_GLYPH_RUN run; unsigned int i, j, p; HRESULT hr; + int ret; TRACE("%p, %.8e, %p, %p, %p, %u, %d, %d, %p.\n", iface, emSize, glyphs, advances, offsets, count, is_sideways, is_rtl, sink); @@ -871,14 +872,32 @@ static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace5 *iface, ID2D1SimplifiedGeometrySink_SetFillMode(sink, D2D1_FILL_MODE_WINDING); + memset(&outline_size, 0, sizeof(outline_size)); + memset(&outline, 0, sizeof(outline)); + for (i = 0; i < count; ++i) { outline.tags.count = outline.points.count = 0; - if (font_funcs->get_glyph_outline(iface, emSize, fontface->simulations, glyphs[i], &outline)) + + EnterCriticalSection(&fontface->cs); + if (!(ret = font_funcs->get_glyph_outline(fontface->get_font_object(fontface), emSize, fontface->simulations, + glyphs[i], &outline_size))) { - WARN("Failed to get glyph outline for glyph %u.\n", glyphs[i]); - continue; + dwrite_array_reserve((void **)&outline.tags.values, &outline.tags.size, outline_size.tags.count, + sizeof(*outline.tags.values)); + dwrite_array_reserve((void **)&outline.points.values, &outline.points.size, outline_size.points.count, + sizeof(*outline.points.values)); + + if ((ret = font_funcs->get_glyph_outline(fontface->get_font_object(fontface), emSize, fontface->simulations, + glyphs[i], &outline))) + { + WARN("Failed to get glyph outline for glyph %u.\n", glyphs[i]); + } } + LeaveCriticalSection(&fontface->cs); + + if (ret) + continue; for (j = 0, p = 0; j < outline.tags.count; ++j) { diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index b19ae3616bc..503f8b04496 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -318,11 +318,8 @@ static inline void ft_vector_to_d2d_point(const FT_Vector *v, D2D1_POINT_2F *p) static int dwrite_outline_push_tag(struct dwrite_outline *outline, unsigned char tag) { - if (!dwrite_array_reserve((void **)&outline->tags.values, &outline->tags.size, outline->tags.count + 1, - sizeof(*outline->tags.values))) - { + if (outline->tags.size < outline->tags.count + 1) return 1; - } outline->tags.values[outline->tags.count++] = tag; @@ -331,11 +328,8 @@ static int dwrite_outline_push_tag(struct dwrite_outline *outline, unsigned char static int dwrite_outline_push_points(struct dwrite_outline *outline, const D2D1_POINT_2F *points, unsigned int count) { - if (!dwrite_array_reserve((void **)&outline->points.values, &outline->points.size, outline->points.count + count, - sizeof(*outline->points.values))) - { + if (outline->points.size < outline->points.count + count) return 1; - } memcpy(&outline->points.values[outline->points.count], points, sizeof(*points) * count); outline->points.count += count; @@ -512,30 +506,25 @@ static void embolden_glyph(FT_Glyph glyph, FLOAT emsize) embolden_glyph_outline(&outline_glyph->outline, emsize); } -static int CDECL freetype_get_glyph_outline(void *key, float emSize, unsigned int simulations, +static int CDECL freetype_get_glyph_outline(font_object_handle object, float emsize, unsigned int simulations, UINT16 glyph, struct dwrite_outline *outline) { - FTC_ScalerRec scaler; + FT_Face face = object; FT_Size size; - int ret; + int ret = 0; - scaler.face_id = key; - scaler.width = emSize; - scaler.height = emSize; - scaler.pixel = 1; - scaler.x_res = 0; - scaler.y_res = 0; + if (!(size = freetype_set_face_size(face, emsize))) + return 0; - RtlEnterCriticalSection(&freetype_cs); - if (!(ret = pFTC_Manager_LookupSize(cache_manager, &scaler, &size))) + if (!pFT_Load_Glyph(face, glyph, FT_LOAD_NO_BITMAP)) { - if (pFT_Load_Glyph(size->face, glyph, FT_LOAD_NO_BITMAP) == 0) - { - FT_Outline *ft_outline = &size->face->glyph->outline; - FT_Matrix m; + FT_Outline *ft_outline = &face->glyph->outline; + FT_Matrix m; + if (outline->points.values) + { if (simulations & DWRITE_FONT_SIMULATIONS_BOLD) - embolden_glyph_outline(ft_outline, emSize); + embolden_glyph_outline(ft_outline, emsize); m.xx = 1 << 16; m.xy = simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE ? (1 << 16) / 3 : 0; @@ -546,8 +535,15 @@ static int CDECL freetype_get_glyph_outline(void *key, float emSize, unsigned in ret = decompose_outline(ft_outline, outline); } + else + { + /* Intentionally overestimate numbers to keep it simple. */ + outline->points.count = ft_outline->n_points * 3; + outline->tags.count = ft_outline->n_points + ft_outline->n_contours * 2; + } } - RtlLeaveCriticalSection(&freetype_cs); + + pFT_Done_Size(size); return ret; } @@ -856,7 +852,7 @@ static void CDECL null_notify_release(void *key) { } -static int CDECL null_get_glyph_outline(void *key, float emSize, unsigned int simulations, +static int CDECL null_get_glyph_outline(font_object_handle object, float emSize, unsigned int simulations, UINT16 glyph, struct dwrite_outline *outline) { return 1;

1 0

Nikolay Sivov : dwrite: Use CRT allocation functions.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 909f7aa7c21f82114586e98a0a9e940b13bc386a URL: https://source.winehq.org/git/wine.git/?a=commit;h=909f7aa7c21f82114586e98a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 2 15:37:19 2021 +0300 dwrite: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 123 ++++++++-------- dlls/dwrite/bidi.c | 41 +++--- dlls/dwrite/dwrite_private.h | 24 +-- dlls/dwrite/font.c | 337 ++++++++++++++++++++++--------------------- dlls/dwrite/gdiinterop.c | 34 ++--- dlls/dwrite/layout.c | 251 ++++++++++++++++---------------- dlls/dwrite/main.c | 87 ++++++----- dlls/dwrite/opentype.c | 38 ++--- dlls/dwrite/shape.c | 11 +- 9 files changed, 461 insertions(+), 485 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=909f7aa7c21f82114586…

1 0

Jacek Caban : win32u: Move GetMonitorInfo implementation from user32.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 45dcaf02fcd9e929b406854b4b78371bc3886031 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45dcaf02fcd9e929b406854b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 2 01:13:39 2021 +0100 win32u: Move GetMonitorInfo implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 7 ------ dlls/user32/sysparams.c | 44 +-------------------------------- dlls/user32/user_private.h | 1 - dlls/win32u/driver.c | 7 ------ dlls/win32u/gdiobj.c | 1 + dlls/win32u/sysparams.c | 59 +++++++++++++++++++++++++++++++++++++++++++- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 5 ++++ include/ntuser.h | 7 ++++++ include/wine/gdi_driver.h | 3 +-- 11 files changed, 75 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=45dcaf02fcd9e929b406…

1 0

Jacek Caban : win32u: Move NtUserEnumDisplayMonitors implementation from user32.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 318673405c6296342ef49177de26440f69a4b0be URL: https://source.winehq.org/git/wine.git/?a=commit;h=318673405c6296342ef49177… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 2 01:13:55 2021 +0100 win32u: Move NtUserEnumDisplayMonitors implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 13 --- dlls/user32/sysparams.c | 187 ++++--------------------------------------- dlls/user32/user_main.c | 8 ++ dlls/user32/user_private.h | 6 +- dlls/win32u/driver.c | 9 +-- dlls/win32u/gdiobj.c | 1 + dlls/win32u/sysparams.c | 71 ++++++++++++++++ dlls/win32u/win32u.spec | 4 +- dlls/win32u/win32u_private.h | 8 ++ dlls/win32u/wrappers.c | 5 ++ include/ntuser.h | 17 ++++ include/wine/gdi_driver.h | 3 +- 12 files changed, 133 insertions(+), 199 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=318673405c6296342ef4…

1 0

Jacek Caban : win32u: Handle invisible winstations in lock_display_devices.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: c4b258eff75d54fdc0eb9b1843db5f77318f836c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4b258eff75d54fdc0eb9b18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 2 01:14:04 2021 +0100 win32u: Handle invisible winstations in lock_display_devices. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 139 ++++++++++++++++++++++++++++-------------------- 1 file changed, 80 insertions(+), 59 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index d0eda54cde7..195756acea1 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -224,6 +224,17 @@ static struct list monitors = LIST_INIT(monitors); static INT64 last_query_display_time; static pthread_mutex_t display_lock = PTHREAD_MUTEX_INITIALIZER; +static struct monitor virtual_monitor = +{ + .handle = NULLDRV_DEFAULT_HMONITOR, + .flags = MONITORINFOF_PRIMARY, + .rc_monitor.right = 1024, + .rc_monitor.bottom = 768, + .rc_work.right = 1024, + .rc_work.bottom = 768, + .dev.state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED, +}; + static HANDLE get_display_device_init_mutex( void ) { static const WCHAR display_device_initW[] = @@ -1045,6 +1056,32 @@ static void release_display_manager_ctx( struct device_manager_ctx *ctx ) if (ctx->gpu_count) cleanup_devices(); } +static void clear_display_devices(void) +{ + struct adapter *adapter; + struct monitor *monitor; + + if (list_head( &monitors ) == &virtual_monitor.entry) + { + list_init( &monitors ); + return; + } + + while (!list_empty( &monitors )) + { + monitor = LIST_ENTRY( list_head( &monitors ), struct monitor, entry ); + list_remove( &monitor->entry ); + free( monitor ); + } + + while (!list_empty( &adapters )) + { + adapter = LIST_ENTRY( list_head( &adapters ), struct adapter, entry ); + list_remove( &adapter->entry ); + free( adapter ); + } +} + static BOOL update_display_cache_from_registry(void) { DWORD adapter_id, monitor_id, monitor_count = 0, size; @@ -1069,19 +1106,7 @@ static BOOL update_display_cache_from_registry(void) mutex = get_display_device_init_mutex(); pthread_mutex_lock( &display_lock ); - while (!list_empty( &monitors )) - { - monitor = LIST_ENTRY( list_head( &monitors ), struct monitor, entry ); - list_remove( &monitor->entry ); - free( monitor ); - } - - while (!list_empty( &adapters )) - { - adapter = LIST_ENTRY( list_head( &adapters ), struct adapter, entry ); - list_remove( &adapter->entry ); - free( adapter ); - } + clear_display_devices(); for (adapter_id = 0;; adapter_id++) { @@ -1161,8 +1186,27 @@ static BOOL update_display_cache(void) static BOOL lock_display_devices(void) { - if (!update_display_cache()) return FALSE; + USEROBJECTFLAGS flags; + HWINSTA winstation; + pthread_mutex_lock( &display_lock ); + + /* Report physical monitor information only if window station has visible display surfaces */ + winstation = NtUserGetProcessWindowStation(); + if (NtUserGetObjectInformation( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL ) && + (flags.dwFlags & WSF_VISIBLE)) + { + pthread_mutex_unlock( &display_lock ); + if (!update_display_cache()) return FALSE; + pthread_mutex_lock( &display_lock ); + } + else + { + clear_display_devices(); + list_add_tail( &monitors, &virtual_monitor.entry ); + last_query_display_time = 0; + } + return TRUE; } @@ -1334,46 +1378,30 @@ BOOL WINAPI NtUserEnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc struct monitor_enum_info enum_buf[8], *enum_info = enum_buf; struct enum_display_monitor_params params; struct monitor *monitor; - ULONG count = 0, i; - USEROBJECTFLAGS flags; - HWINSTA winstation; + unsigned int count = 0, i; BOOL ret = TRUE; - /* Report physical monitor information only if window station has visible display surfaces */ - winstation = NtUserGetProcessWindowStation(); - if (NtUserGetObjectInformation( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL ) && - (flags.dwFlags & WSF_VISIBLE)) - { - if (!lock_display_devices()) return FALSE; - - count = list_count( &monitors ); - if (!count || (count > ARRAYSIZE(enum_buf) && - !(enum_info = malloc( count * sizeof(*enum_info) )))) - { - unlock_display_devices(); - return FALSE; - } - - count = 0; - LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) - { - if (!(monitor->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue; - enum_info[count].handle = monitor->handle; - enum_info[count].rect = monitor->rc_monitor; - count++; - } + if (!lock_display_devices()) return FALSE; + count = list_count( &monitors ); + if (!count || (count > ARRAYSIZE(enum_buf) && + !(enum_info = malloc( count * sizeof(*enum_info) )))) + { unlock_display_devices(); - if (!count) return FALSE; + return FALSE; } - else + + count = 0; + LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) { - if (!(enum_info = malloc( sizeof(*enum_info) ))) return FALSE; - enum_info->handle = NULLDRV_DEFAULT_HMONITOR; - SetRect( &enum_info->rect, 0, 0, 1024, 768 ); - count = 1; + if (!(monitor->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue; + enum_info[count].handle = monitor->handle; + enum_info[count].rect = monitor->rc_monitor; + count++; } + unlock_display_devices(); + params.proc = proc; params.hdc = hdc; params.lparam = lparam; @@ -1397,18 +1425,6 @@ static BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) if (info->cbSize != sizeof(MONITORINFOEXW) && info->cbSize != sizeof(MONITORINFO)) return FALSE; - /* Fallback to report one monitor */ - if (handle == NULLDRV_DEFAULT_HMONITOR) - { - RECT default_rect = {0, 0, 1024, 768}; - info->rcMonitor = default_rect; - info->rcWork = default_rect; - info->dwFlags = MONITORINFOF_PRIMARY; - if (info->cbSize >= sizeof(MONITORINFOEXW)) - asciiz_to_unicode( ((MONITORINFOEXW *)info)->szDevice, "WinDisc" ); - return TRUE; - } - if (!lock_display_devices()) return FALSE; LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) @@ -1421,7 +1437,12 @@ static BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) info->rcWork = monitor->rc_work; info->dwFlags = monitor->flags; if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitor->adapter->dev.device_name ); + { + if (monitor->adapter) + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitor->adapter->dev.device_name ); + else + asciiz_to_unicode( ((MONITORINFOEXW *)info)->szDevice, "WinDisc" ); + } unlock_display_devices(); return TRUE; }

1 0