December 2021 - Wine-commits

Nikolay Sivov : dwrite: Add flag for cached advance presence.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: 74e951a73ed74557407cde5da69d5aa724eae120 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74e951a73ed74557407cde5d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 7 15:59:43 2021 +0300 dwrite: Add flag for cached advance presence. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index f6ac43e65ac..76abedde770 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -66,6 +66,7 @@ struct cache_entry struct cache_key key; float advance; unsigned int has_contours : 1; + unsigned int has_advance : 1; }; static struct cache_entry * fontface_get_cache_entry(struct dwrite_fontface *fontface, const struct cache_key *key) @@ -97,9 +98,6 @@ static float fontface_get_glyph_advance(struct dwrite_fontface *fontface, float { if (!(entry = calloc(1, sizeof(*entry)))) return 0.0f; - - entry->advance = font_funcs->get_glyph_advance(fontface->get_font_object(fontface), fontsize, glyph, mode, &value); - entry->has_contours = !!value; entry->key = key; size = fontface_get_cache_entry_size(entry); @@ -123,6 +121,13 @@ static float fontface_get_glyph_advance(struct dwrite_fontface *fontface, float fontface->cache.size += size; } + if (!entry->has_advance) + { + entry->advance = font_funcs->get_glyph_advance(fontface->get_font_object(fontface), fontsize, glyph, mode, &value); + entry->has_contours = !!value; + entry->has_advance = 1; + } + *has_contours = entry->has_contours; return entry->advance; }

1 0

Nikolay Sivov : dwrite: Use separate argument for cache key for get_bbox/get_bitmap calls.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: 4ae2058e0b557aa9462441220eac8897170230b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ae2058e0b557aa946244122… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 7 15:59:44 2021 +0300 dwrite: Use separate argument for cache key for get_bbox/get_bitmap calls. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 7 +++---- dlls/dwrite/font.c | 12 +++++------- dlls/dwrite/freetype.c | 20 ++++++++++---------- dlls/dwrite/layout.c | 3 +-- 4 files changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index e0373dc2891..ba634c99917 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -444,7 +444,6 @@ extern HRESULT bidi_computelevels(const WCHAR*,UINT32,UINT8,UINT8*,UINT8*) DECLS struct dwrite_glyphbitmap { - void *key; DWORD simulations; float emsize; BOOL nohint; @@ -735,8 +734,8 @@ struct font_backend_funcs UINT16 (CDECL *get_glyph_count)(font_object_handle object); INT32 (CDECL *get_glyph_advance)(font_object_handle object, float em_size, UINT16 glyph, DWRITE_MEASURING_MODE measuring_mode, 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_glyph_bbox)(void *key, struct dwrite_glyphbitmap *bitmap_desc); + BOOL (CDECL *get_glyph_bitmap)(void *key, struct dwrite_glyphbitmap *bitmap_desc); void (CDECL *get_design_glyph_metrics)(font_object_handle object, UINT16 upem, UINT16 ascent, unsigned int simulations, UINT16 glyph, DWRITE_GLYPH_METRICS *metrics); }; @@ -744,4 +743,4 @@ struct font_backend_funcs extern void init_font_backend(void) DECLSPEC_HIDDEN; extern void release_font_backend(void) DECLSPEC_HIDDEN; -extern void dwrite_fontface_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) DECLSPEC_HIDDEN; +extern void dwrite_fontface_get_glyph_bbox(IDWriteFontFace *fontface, struct dwrite_glyphbitmap *bitmap) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 76abedde770..205b2f8c0f1 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -47,9 +47,9 @@ static const FLOAT RECOMMENDED_NATURAL_PPEM = 20.0f; static const struct font_backend_funcs *font_funcs; -void dwrite_fontface_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) +void dwrite_fontface_get_glyph_bbox(IDWriteFontFace *fontface, struct dwrite_glyphbitmap *bitmap) { - font_funcs->get_glyph_bbox(bitmap); + font_funcs->get_glyph_bbox(fontface, bitmap); } struct cache_key @@ -5836,7 +5836,6 @@ static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *a WARN("failed to get IDWriteFontFace4, 0x%08x\n", hr); memset(&glyph_bitmap, 0, sizeof(glyph_bitmap)); - glyph_bitmap.key = fontface; glyph_bitmap.simulations = IDWriteFontFace4_GetSimulations(fontface); glyph_bitmap.emsize = analysis->run.fontEmSize; glyph_bitmap.nohint = is_natural_rendering_mode(analysis->rendering_mode); @@ -5848,7 +5847,7 @@ static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *a UINT32 bitmap_size; glyph_bitmap.glyph = analysis->run.glyphIndices[i]; - font_funcs->get_glyph_bbox(&glyph_bitmap); + font_funcs->get_glyph_bbox(fontface, &glyph_bitmap); bitmap_size = get_glyph_bitmap_pitch(analysis->rendering_mode, bbox->right - bbox->left) * (bbox->bottom - bbox->top); @@ -5927,7 +5926,6 @@ static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis) origin.x = origin.y = 0.0f; memset(&glyph_bitmap, 0, sizeof(glyph_bitmap)); - glyph_bitmap.key = fontface; glyph_bitmap.simulations = IDWriteFontFace4_GetSimulations(fontface); glyph_bitmap.emsize = analysis->run.fontEmSize; glyph_bitmap.nohint = is_natural_rendering_mode(analysis->rendering_mode); @@ -5948,7 +5946,7 @@ static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis) BOOL is_1bpp; glyph_bitmap.glyph = analysis->run.glyphIndices[i]; - font_funcs->get_glyph_bbox(&glyph_bitmap); + font_funcs->get_glyph_bbox(fontface, &glyph_bitmap); if (IsRectEmpty(bbox)) continue; @@ -5958,7 +5956,7 @@ static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis) glyph_bitmap.pitch = get_glyph_bitmap_pitch(analysis->rendering_mode, width); memset(src, 0, height * glyph_bitmap.pitch); - is_1bpp = font_funcs->get_glyph_bitmap(&glyph_bitmap); + is_1bpp = font_funcs->get_glyph_bitmap(fontface, &glyph_bitmap); OffsetRect(bbox, analysis->origins[i].x, analysis->origins[i].y); diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index a2304f264d5..dede7c46c9c 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -572,7 +572,7 @@ static BOOL is_face_scalable(void *key) return FALSE; } -static BOOL get_glyph_transform(struct dwrite_glyphbitmap *bitmap, FT_Matrix *ret) +static BOOL get_glyph_transform(void *key, struct dwrite_glyphbitmap *bitmap, FT_Matrix *ret) { FT_Matrix m; @@ -583,7 +583,7 @@ static BOOL get_glyph_transform(struct dwrite_glyphbitmap *bitmap, FT_Matrix *re /* Some fonts provide mostly bitmaps and very few outlines, for example for .notdef. Disable transform if that's the case. */ - if (!is_face_scalable(bitmap->key) || (!bitmap->m && bitmap->simulations == 0)) + if (!is_face_scalable(key) || (!bitmap->m && !bitmap->simulations)) return FALSE; if (bitmap->simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE) { @@ -602,7 +602,7 @@ static BOOL get_glyph_transform(struct dwrite_glyphbitmap *bitmap, FT_Matrix *re return TRUE; } -static void CDECL freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) +static void CDECL freetype_get_glyph_bbox(void *key, struct dwrite_glyphbitmap *bitmap) { FTC_ImageTypeRec imagetype; FT_BBox bbox = { 0 }; @@ -612,9 +612,9 @@ static void CDECL freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) RtlEnterCriticalSection(&freetype_cs); - needs_transform = get_glyph_transform(bitmap, &m); + needs_transform = get_glyph_transform(key, bitmap, &m); - imagetype.face_id = bitmap->key; + imagetype.face_id = key; imagetype.width = 0; imagetype.height = bitmap->emsize; imagetype.flags = needs_transform ? FT_LOAD_NO_BITMAP : FT_LOAD_DEFAULT; @@ -734,7 +734,7 @@ static BOOL freetype_get_aa_glyph_bitmap(struct dwrite_glyphbitmap *bitmap, FT_G return ret; } -static BOOL CDECL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap) +static BOOL CDECL freetype_get_glyph_bitmap(void *key, struct dwrite_glyphbitmap *bitmap) { FTC_ImageTypeRec imagetype; BOOL needs_transform; @@ -744,9 +744,9 @@ static BOOL CDECL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap) RtlEnterCriticalSection(&freetype_cs); - needs_transform = get_glyph_transform(bitmap, &m); + needs_transform = get_glyph_transform(key, bitmap, &m); - imagetype.face_id = bitmap->key; + imagetype.face_id = key; imagetype.width = 0; imagetype.height = bitmap->emsize; imagetype.flags = needs_transform ? FT_LOAD_NO_BITMAP : FT_LOAD_DEFAULT; @@ -865,12 +865,12 @@ static INT32 CDECL null_get_glyph_advance(font_object_handle object, float emsiz return 0; } -static void CDECL null_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) +static void CDECL null_get_glyph_bbox(void *key, struct dwrite_glyphbitmap *bitmap) { SetRectEmpty(&bitmap->bbox); } -static BOOL CDECL null_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap) +static BOOL CDECL null_get_glyph_bitmap(void *key, struct dwrite_glyphbitmap *bitmap) { return FALSE; } diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index b2e71e7f436..b7ab855d1f1 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3945,7 +3945,6 @@ static void layout_get_erun_bbox(struct dwrite_textlayout *layout, struct layout glyph_run.glyphOffsets = &regular->run.glyphOffsets[start_glyph]; memset(&glyph_bitmap, 0, sizeof(glyph_bitmap)); - glyph_bitmap.key = glyph_run.fontFace; glyph_bitmap.simulations = IDWriteFontFace_GetSimulations(glyph_run.fontFace); glyph_bitmap.emsize = glyph_run.fontEmSize; glyph_bitmap.nohint = layout->measuringmode == DWRITE_MEASURING_MODE_NATURAL; @@ -3967,7 +3966,7 @@ static void layout_get_erun_bbox(struct dwrite_textlayout *layout, struct layout D2D1_RECT_F glyph_bbox; glyph_bitmap.glyph = glyph_run.glyphIndices[i]; - dwrite_fontface_get_glyph_bbox(&glyph_bitmap); + dwrite_fontface_get_glyph_bbox(glyph_run.fontFace, &glyph_bitmap); glyph_bbox.left = bbox->left; glyph_bbox.top = bbox->top;

1 0

Nikolay Sivov : dwrite: Move glyph box cache to PE side.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: b3ad9000c04c5e57d65d955c1669402fb617c79d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3ad9000c04c5e57d65d955c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 7 15:59:45 2021 +0300 dwrite: Move glyph box cache to 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 | 96 ++++++++++++++++++++++++++------------------ dlls/dwrite/freetype.c | 58 +++++++++++++------------- 3 files changed, 88 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b3ad9000c04c5e57d65d…

1 0

Nikolay Sivov : dwrite: Move bitmap cache to PE side.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: b1dc908aa59f43e34b91c12fd13dd84f741db47a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1dc908aa59f43e34b91c12f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 7 15:59:46 2021 +0300 dwrite: Move bitmap cache to 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 | 103 +++++++++++++++++++++++++++++-------------- dlls/dwrite/freetype.c | 53 ++++++++-------------- 3 files changed, 90 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b1dc908aa59f43e34b91…

1 0

Nikolay Sivov : dwrite: Remove unixlib callbacks.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: 06742814ed08c65c6466f459bfd46d8fdfd0eb13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06742814ed08c65c6466f459… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 7 15:59:47 2021 +0300 dwrite: Remove unixlib callbacks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 8 ---- dlls/dwrite/font.c | 74 +---------------------------------- dlls/dwrite/freetype.c | 93 +------------------------------------------- 3 files changed, 3 insertions(+), 172 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 1ac50747ec6..f83372acc9e 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -717,18 +717,10 @@ extern HRESULT shape_check_typographic_feature(struct scriptshaping_context *con struct font_data_context; extern HMODULE dwrite_module DECLSPEC_HIDDEN; -struct font_callback_funcs -{ - int (CDECL *get_font_data)(void *key, const void **data_ptr, UINT64 *data_size, unsigned int *index, - struct font_data_context **context); - void (CDECL *release_font_data)(struct font_data_context *context); -}; - 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)(font_object_handle object, float emsize, unsigned int simulations, UINT16 glyph, struct dwrite_outline *outline); UINT16 (CDECL *get_glyph_count)(font_object_handle object); diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 05aea75d52d..cb4f856524c 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -837,7 +837,6 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace5 *iface) for (i = 0; i < ARRAY_SIZE(fontface->glyphs); i++) free(fontface->glyphs[i]); - font_funcs->notify_release(iface); font_funcs->release_font_object(fontface->font_object); if (fontface->stream) { @@ -8142,81 +8141,12 @@ HRESULT create_fontset_builder(IDWriteFactory7 *factory, IDWriteFontSetBuilder2 return S_OK; } -struct font_data_context -{ - IDWriteFontFileStream *stream; - void *context; -}; - -static int CDECL get_font_data_cb(void *key, const void **data_ptr, UINT64 *data_size, - unsigned int *index, struct font_data_context **ret_context) -{ - IDWriteFontFace *fontface = key; - struct font_data_context *context; - IDWriteFontFileStream *stream; - IDWriteFontFile *file; - unsigned int count; - void *data_context; - HRESULT hr; - - *ret_context = NULL; - - count = 1; - if (FAILED(IDWriteFontFace_GetFiles(fontface, &count, &file))) return 1; - - hr = get_filestream_from_file(file, &stream); - IDWriteFontFile_Release(file); - if (FAILED(hr)) return 1; - - hr = IDWriteFontFileStream_GetFileSize(stream, data_size); - if (FAILED(hr)) - { - IDWriteFontFileStream_Release(stream); - return 1; - } - - hr = IDWriteFontFileStream_ReadFileFragment(stream, data_ptr, 0, *data_size, &data_context); - if (FAILED(hr)) - { - IDWriteFontFileStream_Release(stream); - return 1; - } - - if (!(context = malloc(sizeof(*context)))) - { - IDWriteFontFileStream_Release(stream); - return 1; - } - - context->stream = stream; - context->context = data_context; - - *ret_context = context; - *index = IDWriteFontFace_GetIndex(fontface); - - return 0; -} - -static void CDECL release_font_data_cb(struct font_data_context *context) -{ - if (!context) return; - IDWriteFontFileStream_ReleaseFileFragment(context->stream, context->context); - IDWriteFontFileStream_Release(context->stream); - free(context); -} - -struct font_callback_funcs callback_funcs = -{ - get_font_data_cb, - release_font_data_cb, -}; - void init_font_backend(void) { - __wine_init_unix_lib(dwrite_module, DLL_PROCESS_ATTACH, &callback_funcs, &font_funcs); + __wine_init_unix_lib(dwrite_module, DLL_PROCESS_ATTACH, NULL, &font_funcs); } void release_font_backend(void) { - __wine_init_unix_lib(dwrite_module, DLL_PROCESS_DETACH, &callback_funcs, NULL); + __wine_init_unix_lib(dwrite_module, DLL_PROCESS_DETACH, NULL, NULL); } diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 3b9676a1af1..daaff6a3f8c 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -29,7 +29,7 @@ #ifdef HAVE_FT2BUILD_H #include <ft2build.h> -#include FT_CACHE_H +#include FT_GLYPH_H #include FT_FREETYPE_H #include FT_OUTLINE_H #include FT_TRUETYPE_TABLES_H @@ -47,19 +47,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); -static RTL_CRITICAL_SECTION freetype_cs; -static RTL_CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &freetype_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": freetype_cs") } -}; -static RTL_CRITICAL_SECTION freetype_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; - static void *ft_handle = NULL; static FT_Library library = 0; -static FTC_Manager cache_manager = 0; -static FTC_ImageCache image_cache = 0; typedef struct { FT_Int major; @@ -67,8 +56,6 @@ typedef struct FT_Int patch; } FT_Version_t; -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); @@ -98,53 +85,9 @@ 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); -MAKE_FUNCPTR(FTC_Manager_Done); -MAKE_FUNCPTR(FTC_Manager_LookupFace); -MAKE_FUNCPTR(FTC_Manager_LookupSize); -MAKE_FUNCPTR(FTC_Manager_RemoveFaceID); #undef MAKE_FUNCPTR static FT_Error (*pFT_Outline_EmboldenXY)(FT_Outline *, FT_Pos, FT_Pos); -static void face_finalizer(void *object) -{ - FT_Face face = object; - callback_funcs->release_font_data((struct font_data_context *)face->generic.data); -} - -static FT_Error face_requester(FTC_FaceID face_id, FT_Library library, FT_Pointer request_data, FT_Face *face) -{ - struct font_data_context *context; - const void *data_ptr; - FT_Error fterror; - UINT64 data_size; - UINT32 index; - - *face = NULL; - - if (!face_id) - { - WARN("NULL fontface requested.\n"); - return FT_Err_Ok; - } - - if (callback_funcs->get_font_data(face_id, &data_ptr, &data_size, &index, &context)) - return FT_Err_Ok; - - fterror = pFT_New_Memory_Face(library, data_ptr, data_size, index, face); - if (fterror == FT_Err_Ok) - { - (*face)->generic.data = context; - (*face)->generic.finalizer = face_finalizer; - } - else - callback_funcs->release_font_data(context); - - return fterror; -} - static FT_Size freetype_set_face_size(FT_Face face, FT_UInt emsize) { FT_Size size; @@ -207,13 +150,6 @@ static BOOL init_freetype(void) 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) - LOAD_FUNCPTR(FTC_Manager_Done) - LOAD_FUNCPTR(FTC_Manager_LookupFace) - LOAD_FUNCPTR(FTC_Manager_LookupSize) - LOAD_FUNCPTR(FTC_Manager_RemoveFaceID) #undef LOAD_FUNCPTR pFT_Outline_EmboldenXY = dlsym(ft_handle, "FT_Outline_EmboldenXY"); @@ -225,18 +161,6 @@ static BOOL init_freetype(void) } pFT_Library_Version(library, &FT_Version.major, &FT_Version.minor, &FT_Version.patch); - /* init cache manager */ - if (pFTC_Manager_New(library, 0, 0, 0, &face_requester, NULL, &cache_manager) != 0 || - pFTC_ImageCache_New(cache_manager, &image_cache) != 0) { - - ERR("Failed to init FreeType cache\n"); - pFTC_Manager_Done(cache_manager); - pFT_Done_FreeType(library); - dlclose(ft_handle); - ft_handle = NULL; - return FALSE; - } - TRACE("FreeType version is %d.%d.%d\n", FT_Version.major, FT_Version.minor, FT_Version.patch); return TRUE; @@ -264,13 +188,6 @@ 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); - pFTC_Manager_RemoveFaceID(cache_manager, key); - RtlLeaveCriticalSection(&freetype_cs); -} - 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) { @@ -793,7 +710,6 @@ 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, freetype_get_glyph_advance, @@ -804,7 +720,6 @@ const static struct font_backend_funcs freetype_funcs = static NTSTATUS init_freetype_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) { - callback_funcs = ptr_in; if (!init_freetype()) return STATUS_DLL_NOT_FOUND; *(const struct font_backend_funcs **)ptr_out = &freetype_funcs; return STATUS_SUCCESS; @@ -812,7 +727,6 @@ static NTSTATUS init_freetype_lib(HMODULE module, DWORD reason, const void *ptr_ static NTSTATUS release_freetype_lib(void) { - pFTC_Manager_Done(cache_manager); pFT_Done_FreeType(library); return STATUS_SUCCESS; } @@ -828,10 +742,6 @@ static void CDECL null_release_font_object(font_object_handle object) { } -static void CDECL null_notify_release(void *key) -{ -} - static int CDECL null_get_glyph_outline(font_object_handle object, float emSize, unsigned int simulations, UINT16 glyph, struct dwrite_outline *outline) { @@ -869,7 +779,6 @@ 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, null_get_glyph_advance,

1 0

Zhiyi Zhang : gdi32/tests: Test deleting the bitmap used for pattern brush creation.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: 1febcf692f820880b85cbc23c5e1b2370cc4e390 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1febcf692f820880b85cbc23… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 7 17:12:16 2021 +0800 gdi32/tests: Test deleting the bitmap used for pattern brush creation. Test that the bitmap for pattern brush creation can be deleted after CreatePatternBrush() and the created brush will still function normally. However, the bitmap object can not be retrieved from LOGBRUSH.lbHatch if the bitmap is deleted. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/brush.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index f04ee22ab6d..0841eb2f2e1 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -120,9 +120,14 @@ static void test_pattern_brush(void) { char buffer[sizeof(BITMAPINFOHEADER) + 2 * sizeof(RGBQUAD) + 32 * 32 / 8]; BITMAPINFO *info = (BITMAPINFO *)buffer; - HBRUSH brush; - HBITMAP bitmap; + HBITMAP bitmap, bitmap2, old_bitmap; + HBRUSH brush, brush2; + HDC hdc, hdc_screen; + COLORREF color; + BOOL result; LOGBRUSH br; + BITMAP bm; + RECT rect; INT ret; void *bits; DIBSECTION dib; @@ -269,6 +274,64 @@ static void test_pattern_brush(void) ok( !brush, "CreatePatternBrush succeeded\n" ); GlobalFree( mem ); + + /* Test deleting bitmap after brush creation */ + /* Create hdc and bitmaps */ + hdc_screen = GetDC( NULL ); + hdc = CreateCompatibleDC( hdc_screen ); + bitmap = CreateCompatibleBitmap( hdc_screen, 16, 16 ); + bitmap2 = CreateCompatibleBitmap( hdc_screen, 16, 16 ); + + /* Fill the first bitmap with 0xff5511 */ + old_bitmap = SelectObject( hdc, bitmap ); + SetRect( &rect, 0, 0, 16, 16 ); + brush = CreateSolidBrush( 0xff5511 ); + result = FillRect( hdc, &rect, brush ); + ok( result, "FillRect failed, error %d.\n", GetLastError() ); + DeleteObject( brush ); + color = GetPixel( hdc, 10, 10 ); + ok( color == 0xff5511, "Expected color %#x, got %#x.\n", 0xff5511, color ); + + /* Create a pattern brush with the first bitmap filled with 0xff5511 */ + brush = CreatePatternBrush( bitmap ); + ok( brush != NULL, "CreatePatternBrush failed, error %u.\n", GetLastError() ); + + /* Delete the first bitmap used for pattern brush creation */ + SelectObject( hdc, bitmap2 ); + DeleteObject( bitmap ); + + memset( &br, 0, sizeof(br) ); + ret = GetObjectW( brush, sizeof(br), &br ); + ok( ret == sizeof(br), "wrong size %u\n", ret ); + ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); + ok( br.lbStyle == BS_PATTERN, "wrong style %u\n", br.lbStyle ); + ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); + + /* The first bitmap is now invalid */ + memset( &bm, 0, sizeof (bm)); + ret = GetObjectW( bitmap, sizeof(bm), &bm ); + ok( !ret, "wrong size %u\n", ret ); + + /* Fill hdc with 0xabcdef */ + brush2 = CreateSolidBrush( 0xabcdef ); + result = FillRect( hdc, &rect, brush2 ); + ok( result, "FillRect failed, error %d.\n", GetLastError() ); + color = GetPixel( hdc, 10, 10 ); + ok( color == 0xabcdef, "Expected color %#x, got %#x.\n", 0xabcdef, color ); + DeleteObject( brush2 ); + + /* Fill hdc with the brush created with the deleted bitmap */ + /* FillRect() succeeds and hdc is filled with the deleted bitmap content */ + result = FillRect( hdc, &rect, brush ); + ok( result, "FillRect failed, error %d.\n", GetLastError() ); + color = GetPixel( hdc, 10, 10 ); + ok( color == 0xff5511, "Expected color %#x, got %#x.\n", 0xff5511, color ); + DeleteObject( brush ); + + SelectObject( hdc, old_bitmap ); + DeleteObject( bitmap2 ); + DeleteDC( hdc ); + ReleaseDC( NULL, hdc_screen ); } static void test_palette_brush(void)

1 0

Zhiyi Zhang : uxtheme/tests: Add DrawThemeParentBackground() tests.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: f685eda9085ae14761124983d1e1b3030e542128 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f685eda9085ae14761124983… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 7 17:12:27 2021 +0800 uxtheme/tests: Add DrawThemeParentBackground() tests. Test that DrawThemeParentBackground() always send WM_ERASEBKGND and WM_PRINTCLIENT on success, which can be used to indicate if DrawThemeParentBackground() is called. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 95 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 10857115061..b085e639784 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1438,6 +1438,100 @@ done: DestroyWindow(hwnd); } +static const struct message DrawThemeParentBackground_seq[] = +{ + {WM_ERASEBKGND, sent}, + {WM_PRINTCLIENT, sent | lparam, 0, PRF_CLIENT}, + {0} +}; + +static LRESULT WINAPI test_DrawThemeParentBackground_proc(HWND hwnd, UINT message, WPARAM wp, + LPARAM lp) +{ + static LONG defwndproc_counter; + struct message msg = {0}; + LRESULT lr; + POINT org; + BOOL ret; + + switch (message) + { + /* Test that DrawThemeParentBackground() doesn't change brush origins */ + case WM_ERASEBKGND: + case WM_PRINTCLIENT: + ret = GetBrushOrgEx((HDC)wp, &org); + ok(ret, "GetBrushOrgEx failed, error %d.\n", GetLastError()); + ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); + break; + + default: + break; + } + + msg.message = message; + msg.flags = sent | wparam | lparam; + if (defwndproc_counter) + msg.flags |= defwinproc; + msg.wParam = wp; + msg.lParam = lp; + add_message(sequences, PARENT_SEQ_INDEX, &msg); + + InterlockedIncrement(&defwndproc_counter); + lr = DefWindowProcA(hwnd, message, wp, lp); + InterlockedDecrement(&defwndproc_counter); + return lr; +} + +static void test_DrawThemeParentBackground(void) +{ + HWND child, parent; + WNDCLASSA cls; + HRESULT hr; + POINT org; + RECT rect; + BOOL ret; + HDC hdc; + + memset(&cls, 0, sizeof(cls)); + cls.hInstance = GetModuleHandleA(0); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpfnWndProc = test_DrawThemeParentBackground_proc; + cls.lpszClassName = "TestDrawThemeParentBackgroundClass"; + RegisterClassA(&cls); + + parent = CreateWindowA("TestDrawThemeParentBackgroundClass", "parent", WS_POPUP | WS_VISIBLE, 0, + 0, 100, 100, 0, 0, 0, 0); + ok(parent != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + child = CreateWindowA(WC_STATICA, "child", WS_CHILD | WS_VISIBLE, 1, 2, 50, 50, parent, 0, 0, + NULL); + ok(child != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + flush_events(); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + hdc = GetDC(child); + ret = GetBrushOrgEx(hdc, &org); + ok(ret, "GetBrushOrgEx failed, error %d.\n", GetLastError()); + ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); + + hr = DrawThemeParentBackground(child, hdc, NULL); + ok(SUCCEEDED(hr), "DrawThemeParentBackground failed, hr %#x.\n", hr); + ok_sequence(sequences, PARENT_SEQ_INDEX, DrawThemeParentBackground_seq, + "DrawThemeParentBackground parent", FALSE); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + GetClientRect(child, &rect); + hr = DrawThemeParentBackground(child, hdc, &rect); + ok(SUCCEEDED(hr), "DrawThemeParentBackground failed, hr %#x.\n", hr); + ok_sequence(sequences, PARENT_SEQ_INDEX, DrawThemeParentBackground_seq, + "DrawThemeParentBackground parent", FALSE); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ReleaseDC(child, hdc); + DestroyWindow(parent); + UnregisterClassA("TestDrawThemeParentBackgroundClass", GetModuleHandleA(0)); +} + START_TEST(system) { init_funcs(); @@ -1459,6 +1553,7 @@ START_TEST(system) test_buffered_paint(); test_GetThemeIntList(); test_GetThemeTransitionDuration(); + test_DrawThemeParentBackground(); /* Test EnableTheming() in the end because it may disable theming */ test_EnableTheming();

1 0

Zhiyi Zhang : comctl32/tests: Add more WM_CTLCOLORSTATIC tests for static controls in a dialog.
by Alexandre Julliard 07 Dec '21

07 Dec '21

Module: wine Branch: master Commit: fa1294faa64cdfca2d4f7bff5ece3ce513c6d62a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa1294faa64cdfca2d4f7bff… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 7 17:12:34 2021 +0800 comctl32/tests: Add more WM_CTLCOLORSTATIC tests for static controls in a dialog. Mostly to test that even when theme texture is enabled for a dialog, the default dialog procedure still returns the stock COLOR_BTNFACE brush in response to WM_CTLCOLORSTATIC. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/static.c | 61 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 99738f7b513..ce21e03df3c 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -40,6 +40,11 @@ static HWND hMainWnd; static int g_nReceivedColorStatic; +static HRESULT (WINAPI *pEnableThemeDialogTexture)(HWND, DWORD); +static HTHEME (WINAPI *pGetWindowTheme)(HWND); +static BOOL (WINAPI *pIsThemeActive)(void); +static BOOL (WINAPI *pIsThemeDialogTextureEnabled)(HWND); + /* try to make sure pending X events have been processed before continuing */ static void flush_events(void) { @@ -385,7 +390,7 @@ static INT_PTR CALLBACK test_WM_CTLCOLORSTATIC_proc(HWND hwnd, UINT msg, WPARAM switch (msg) { case WM_INITDIALOG: - child = CreateWindowA(WC_STATICA, "child", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, hwnd, + child = CreateWindowA(WC_STATICA, "child", WS_CHILD | WS_VISIBLE, 1, 2, 50, 50, hwnd, (HMENU)100, 0, NULL); ok(child != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); return FALSE; @@ -401,14 +406,14 @@ static INT_PTR CALLBACK test_WM_CTLCOLORSTATIC_proc(HWND hwnd, UINT msg, WPARAM static void test_WM_CTLCOLORSTATIC(void) { - HTHEME (WINAPI *pGetWindowTheme)(HTHEME) = NULL; HWND parent, dialog, child; COLORREF color, old_color; HDC child_hdc, dialog_hdc; + BOOL ret, todo = FALSE; int mode, old_mode; - BOOL todo = FALSE; - HMODULE uxtheme; HBRUSH brush; + HRESULT hr; + POINT org; struct { @@ -430,13 +435,7 @@ static void test_WM_CTLCOLORSTATIC(void) child = GetDlgItem(dialog, 100); ok(child != NULL, "Failed to get child static control, error %d.\n", GetLastError()); - uxtheme = LoadLibraryA("uxtheme.dll"); - if (uxtheme) - { - pGetWindowTheme = (void*)GetProcAddress(uxtheme, "GetWindowTheme"); - if (pGetWindowTheme) - todo = !!pGetWindowTheme(dialog); - } + todo = !!pGetWindowTheme(dialog); dialog_hdc = GetDC(dialog); child_hdc = GetDC(child); @@ -447,6 +446,11 @@ static void test_WM_CTLCOLORSTATIC(void) old_color = SetBkColor(child_hdc, 0xaa5511); ok(old_color != CLR_INVALID, "SetBkColor failed.\n"); + ret = pIsThemeDialogTextureEnabled(dialog); + ok(ret, "Expected theme dialog texture supported.\n"); + todo_wine_if(todo) + ok(pGetWindowTheme(dialog) == NULL, "Expected NULL theme handle.\n"); + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); todo_wine_if(todo) ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", @@ -460,11 +464,42 @@ static void test_WM_CTLCOLORSTATIC(void) color = GetPixel(dialog_hdc, 40, 40); ok(color == 0, "Expected pixel %#x, got %#x.\n", 0, color); + /* Test that EnableThemeDialogTexture() doesn't make WM_CTLCOLORSTATIC return a different brush */ + hr = pEnableThemeDialogTexture(dialog, ETDT_DISABLE); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + ret = pIsThemeDialogTextureEnabled(dialog); + ok(!ret, "Expected theme dialog texture disabled.\n"); + hr = pEnableThemeDialogTexture(dialog, ETDT_ENABLETAB); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + ret = pIsThemeDialogTextureEnabled(dialog); + ok(ret, "Expected theme dialog texture enabled.\n"); + + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + todo_wine_if(pIsThemeActive()) + ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", + GetSysColorBrush(COLOR_BTNFACE), brush); + + /* Test that WM_CTLCOLORSTATIC doesn't change brush origin */ + ret = GetBrushOrgEx(child_hdc, &org); + ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); + ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); + ReleaseDC(child, child_hdc); ReleaseDC(dialog, dialog_hdc); EndDialog(dialog, 0); DestroyWindow(parent); - FreeLibrary(uxtheme); +} + +static void init_functions(void) +{ + HMODULE uxtheme = LoadLibraryA("uxtheme.dll"); + +#define X(f) p##f = (void *)GetProcAddress(uxtheme, #f); + X(EnableThemeDialogTexture) + X(GetWindowTheme) + X(IsThemeActive) + X(IsThemeDialogTextureEnabled) +#undef X } START_TEST(static) @@ -477,6 +512,8 @@ START_TEST(static) if (!load_v6_module(&ctx_cookie, &hCtx)) return; + init_functions(); + wndclass.cbSize = sizeof(wndclass); wndclass.style = CS_HREDRAW | CS_VREDRAW; wndclass.lpfnWndProc = WndProc;

1 0

Alex Henrie : shell32: Provide 4-bit icons that are actually limited to 16 colors.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 4f5f15c206db718fa46a15c37d6f16af2bba8d54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f5f15c206db718fa46a15c3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 5 23:15:04 2021 -0700 shell32: Provide 4-bit icons that are actually limited to 16 colors. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/resources/audio.ico | Bin 48131 -> 39758 bytes dlls/shell32/resources/audio.svg | 311 ++++++++++++++------------------ dlls/shell32/resources/eject.ico | Bin 41496 -> 36707 bytes dlls/shell32/resources/eject.svg | 98 +++------- dlls/shell32/resources/favorites.ico | Bin 49876 -> 41503 bytes dlls/shell32/resources/favorites.svg | 124 ++++--------- dlls/shell32/resources/help.ico | Bin 71467 -> 62072 bytes dlls/shell32/resources/help.svg | 185 ++++--------------- dlls/shell32/resources/image.ico | Bin 48807 -> 39430 bytes dlls/shell32/resources/image.svg | 113 ++++-------- dlls/shell32/resources/internet.ico | Bin 76974 -> 67610 bytes dlls/shell32/resources/internet.svg | 179 ++++-------------- dlls/shell32/resources/log_off.ico | Bin 48648 -> 39438 bytes dlls/shell32/resources/log_off.svg | 142 ++++----------- dlls/shell32/resources/menu.ico | Bin 34002 -> 29172 bytes dlls/shell32/resources/menu.svg | 184 +++++++++---------- dlls/shell32/resources/move.ico | Bin 39515 -> 34726 bytes dlls/shell32/resources/move.svg | 107 ++++------- dlls/shell32/resources/network.ico | Bin 43624 -> 38828 bytes dlls/shell32/resources/network.svg | 93 ++++------ dlls/shell32/resources/optical_disc.ico | Bin 50691 -> 41297 bytes dlls/shell32/resources/optical_disc.svg | 167 ++++------------- dlls/shell32/resources/play.ico | Bin 37047 -> 32258 bytes dlls/shell32/resources/play.svg | 96 +++------- dlls/shell32/resources/rename.ico | Bin 30995 -> 26206 bytes dlls/shell32/resources/rename.svg | 220 +++++++++++++--------- dlls/shell32/resources/restricted.ico | Bin 54521 -> 45124 bytes dlls/shell32/resources/restricted.svg | 126 ++++--------- dlls/shell32/resources/search.ico | Bin 78154 -> 69627 bytes dlls/shell32/resources/search.svg | 180 ++++-------------- dlls/shell32/resources/security.ico | Bin 32810 -> 28021 bytes dlls/shell32/resources/security.svg | 91 +++------- dlls/shell32/resources/shut_down.ico | Bin 38405 -> 33627 bytes dlls/shell32/resources/shut_down.svg | 82 +++------ dlls/shell32/resources/sleep.ico | Bin 65140 -> 55754 bytes dlls/shell32/resources/sleep.svg | 146 ++++----------- dlls/shell32/resources/trash_full.ico | Bin 73668 -> 64254 bytes dlls/shell32/resources/trash_full.svg | 185 ++++--------------- dlls/shell32/resources/update.ico | Bin 47370 -> 38997 bytes dlls/shell32/resources/update.svg | 299 ++++++++++++++---------------- dlls/shell32/resources/users.ico | Bin 57595 -> 48207 bytes dlls/shell32/resources/users.svg | 155 ++++------------ dlls/shell32/resources/video.ico | Bin 64272 -> 54890 bytes dlls/shell32/resources/video.svg | 153 ++++------------ 44 files changed, 1123 insertions(+), 2313 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f5f15c206db718fa46a…

1 0

Paul Gofman : ntdll: Support THREAD_CREATE_FLAGS_HIDE_FROM_DEBUGGER thread creation flag.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: c338a6ff99101d3344477297354e64e63b00e438 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c338a6ff99101d3344477297… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Dec 3 20:28:34 2021 +0300 ntdll: Support THREAD_CREATE_FLAGS_HIDE_FROM_DEBUGGER thread creation flag. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/Makefile.in | 1 + dlls/ntdll/tests/thread.c | 126 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/process.c | 12 +++- dlls/ntdll/unix/thread.c | 6 +- include/wine/server_protocol.h | 4 +- server/protocol.def | 2 +- server/request.h | 2 +- server/thread.c | 3 +- server/trace.c | 2 +- 9 files changed, 150 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c338a6ff99101d334447…

1 0