December 2021 - Wine-Commits

Nikolay Sivov : dwrite: Use separate argument for cache key for get_bbox/get_bitmap calls.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

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

Francois Gouget : msdasql/tests: Fix the spelling of the command_text variable.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: 0ed15c56d174d35a5d8516ec89f40888395ce33b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ed15c56d174d35a5d8516ec… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 7 12:53:30 2021 +0100 msdasql/tests: Fix the spelling of the command_text variable. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/tests/provider.c | 56 +++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index b520b127d67..dfe3e3af886 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -187,7 +187,7 @@ static void test_command_interfaces(IUnknown *cmd) { HRESULT hr; ICommandProperties *commandProp; - ICommandText *comand_text; + ICommandText *command_text; IConvertType *convertype; ICommandPrepare *commandprepare; ICommandStream *commandstream; @@ -204,9 +204,9 @@ static void test_command_interfaces(IUnknown *cmd) ok(hr == S_OK, "got 0x%08x\n", hr); ICommandWithParameters_Release(cmdwithparams); - hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); ok(hr == S_OK, "got 0x%08x\n", hr); - ICommandText_Release(comand_text); + ICommandText_Release(command_text); hr = IUnknown_QueryInterface(cmd, &IID_IConvertType, (void**)&convertype); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -238,70 +238,70 @@ static void test_command_interfaces(IUnknown *cmd) static void test_command_text(IUnknown *cmd) { - ICommandText *comand_text; + ICommandText *command_text; HRESULT hr; OLECHAR *str; GUID dialect; - hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + hr = ICommandText_GetCommandText(command_text, &dialect, &str); ok(hr == DB_E_NOCOMMAND, "got 0x%08x\n", hr); if (0) { /* Crashes under windows */ - hr = ICommandText_SetCommandText(comand_text, NULL, L"select * from testing"); + hr = ICommandText_SetCommandText(command_text, NULL, L"select * from testing"); ok(hr == S_OK, "got 0x%08x\n", hr); } - hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, NULL); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + hr = ICommandText_GetCommandText(command_text, &dialect, &str); ok(hr == DB_E_NOCOMMAND, "got 0x%08x\n", hr); - hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"select * from testing"); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"select * from testing"); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ICommandText_GetCommandText(comand_text, NULL, &str); + hr = ICommandText_GetCommandText(command_text, NULL, &str); ok(hr == S_OK, "got 0x%08x\n", hr); ok (!lstrcmpW(L"select * from testing", str), "got %s\n", debugstr_w(str)); HeapFree(GetProcessHeap(), 0, str); /* dialect empty value */ - hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + hr = ICommandText_GetCommandText(command_text, &dialect, &str); ok(hr == DB_S_DIALECTIGNORED, "got 0x%08x\n", hr); ok(IsEqualGUID(&DBGUID_DEFAULT, &dialect), "got %s\n", debugstr_guid(&dialect)); ok (!lstrcmpW(L"select * from testing", str), "got %s\n", debugstr_w(str)); HeapFree(GetProcessHeap(), 0, str); dialect = DBGUID_DEFAULT; - hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + hr = ICommandText_GetCommandText(command_text, &dialect, &str); ok(hr == S_OK, "got 0x%08x\n", hr); ok(IsEqualGUID(&DBGUID_DEFAULT, &dialect), "got %s\n", debugstr_guid(&dialect)); ok (!lstrcmpW(L"select * from testing", str), "got %s\n", debugstr_w(str)); HeapFree(GetProcessHeap(), 0, str); - ICommandText_Release(comand_text); + ICommandText_Release(command_text); } static void test_command_dbsession(IUnknown *cmd, IUnknown *session) { - ICommandText *comand_text; + ICommandText *command_text; HRESULT hr; IUnknown *sess; - hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ICommandText_GetDBSession(comand_text, &IID_IUnknown, &sess); + hr = ICommandText_GetDBSession(command_text, &IID_IUnknown, &sess); ok(hr == S_OK, "got 0x%08x\n", hr); ok(session == sess, "different session pointers\n"); - ICommandText_Release(comand_text); + ICommandText_Release(command_text); } static void test_rowset_interfaces(IRowset *rowset, ICommandText *commandtext) @@ -353,33 +353,33 @@ static void test_rowset_interfaces(IRowset *rowset, ICommandText *commandtext) static void test_command_rowset(IUnknown *cmd) { - ICommandText *comand_text; + ICommandText *command_text; HRESULT hr; IUnknown *unk = NULL; IRowset *rowset; DBROWCOUNT affected; - hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"CREATE TABLE testing (col1 INT, col2 SHORT)"); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"CREATE TABLE testing (col1 INT, col2 SHORT)"); ok(hr == S_OK, "got 0x%08x\n", hr); affected = 9999; - hr = ICommandText_Execute(comand_text, NULL, &IID_IRowset, NULL, &affected, &unk); + hr = ICommandText_Execute(command_text, NULL, &IID_IRowset, NULL, &affected, &unk); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(unk == NULL, "Unexepcted value\n"); + todo_wine ok(unk == NULL, "Unexpected value\n"); todo_wine ok(affected == -1, "got %ld\n", affected); if (unk) IUnknown_Release(unk); - hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"select * from testing"); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"select * from testing"); ok(hr == S_OK, "got 0x%08x\n", hr); affected = 9999; - hr = ICommandText_Execute(comand_text, NULL, &IID_IRowset, NULL, &affected, &unk); + hr = ICommandText_Execute(command_text, NULL, &IID_IRowset, NULL, &affected, &unk); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(unk != NULL, "Unexepcted value\n"); + ok(unk != NULL, "Unexpected value\n"); if (hr == S_OK) { ok(affected == -1, "wrong affected value\n"); @@ -387,13 +387,13 @@ static void test_command_rowset(IUnknown *cmd) hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset); ok(hr == S_OK, "got 0x%08x\n", hr); - test_rowset_interfaces(rowset, comand_text); + test_rowset_interfaces(rowset, command_text); IRowset_Release(rowset); IUnknown_Release(unk); } - ICommandText_Release(comand_text); + ICommandText_Release(command_text); }

1 0

Mohamad Al-Jaf : include: Add namespaceapi.h file.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: e214b99ae631d38bfda6bc9bdf941de400607db8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e214b99ae631d38bfda6bc9b… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Dec 7 02:42:34 2021 -0500 include: Add namespaceapi.h file. Required by IE11. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/namespaceapi.h | 39 +++++++++++++++++++++++++++++++++++++++ include/winbase.h | 2 ++ include/winnt.h | 2 ++ 4 files changed, 44 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index de40421edcb..302e0bb2a73 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -526,6 +526,7 @@ SOURCES = \ mtxdm.h \ mulres.idl \ multimon.h \ + namespaceapi.h \ natupnp.idl \ nb30.h \ ncrypt.h \ diff --git a/include/namespaceapi.h b/include/namespaceapi.h new file mode 100644 index 00000000000..9446806f82e --- /dev/null +++ b/include/namespaceapi.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2021 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _NAMESPACEAPI_H_ +#define _NAMESPACEAPI_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#define PRIVATE_NAMESPACE_FLAG_DESTROY 0x00000001 + +WINBASEAPI BOOL WINAPI AddSIDToBoundaryDescriptor(HANDLE*,PSID); +WINBASEAPI BOOLEAN WINAPI ClosePrivateNamespace(HANDLE,ULONG); +WINBASEAPI HANDLE WINAPI CreateBoundaryDescriptorW(LPCWSTR,ULONG); +WINBASEAPI HANDLE WINAPI CreatePrivateNamespaceW(LPSECURITY_ATTRIBUTES,LPVOID,LPCWSTR); +WINBASEAPI void WINAPI DeleteBoundaryDescriptor(HANDLE); +WINBASEAPI HANDLE WINAPI OpenPrivateNamespaceW(LPVOID,LPCWSTR); + +#ifdef __cplusplus +} +#endif + +#endif /* _NAMESPACEAPI_H_ */ diff --git a/include/winbase.h b/include/winbase.h index 2f7287f12b6..0a0bfde9d10 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -241,6 +241,8 @@ typedef struct _SECURITY_ATTRIBUTES BOOL bInheritHandle; } SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES; +#include <namespaceapi.h> + #ifndef _FILETIME_ #define _FILETIME_ /* 64 bit number of 100 nanoseconds intervals since January 1, 1601 */ diff --git a/include/winnt.h b/include/winnt.h index 2ab74ab123c..c80efee077d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3748,6 +3748,8 @@ typedef struct _SID { } SID,*PISID; #endif /* !defined(SID_DEFINED) */ +#define CREATE_BOUNDARY_DESCRIPTOR_ADD_APPCONTAINER_SID 0x01 + #define SID_REVISION (1) /* Current revision */ #define SID_MAX_SUB_AUTHORITIES (15) /* current max subauths */ #define SID_RECOMMENDED_SUB_AUTHORITIES (1) /* recommended subauths */

1 0

Akihiro Sagawa : win32u: Use the replacement name in otmpFamilyName and GetTextFace().
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: be174154031a946c92e03cd56647709694d705d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be174154031a946c92e03cd5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Dec 7 09:40:46 2021 +0000 win32u: Use the replacement name in otmpFamilyName and GetTextFace(). Houkago Cinderella verifies that otmpFamilyName matches the desired font name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52176 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/font.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index fca3ed0fc76..3fa90ebc0f8 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1799,17 +1799,17 @@ static struct gdi_font_face *find_best_matching_face( const struct gdi_font_fami static struct gdi_font_face *find_matching_face_by_name( const WCHAR *name, const WCHAR *subst, const LOGFONTW *lf, FONTSIGNATURE fs, - BOOL can_use_bitmap ) + BOOL can_use_bitmap, const WCHAR **orig_name ) { struct gdi_font_family *family; struct gdi_font_face *face; family = find_family_from_any_name( name ); - if (family && (face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) return face; + if (family && (face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) goto found; if (subst) { family = find_family_from_any_name( subst ); - if (family && (face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) return face; + if (family && (face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) goto found; } /* search by full face name */ @@ -1824,6 +1824,11 @@ static struct gdi_font_face *find_matching_face_by_name( const WCHAR *name, cons if ((face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) return face; } return NULL; + +found: + if (orig_name && family != face->family) + *orig_name = family->family_name; + return face; } static struct gdi_font_face *find_any_face( const LOGFONTW *lf, FONTSIGNATURE fs, @@ -1863,7 +1868,7 @@ static struct gdi_font_face *find_any_face( const LOGFONTW *lf, FONTSIGNATURE fs } static struct gdi_font_face *find_matching_face( const LOGFONTW *lf, CHARSETINFO *csi, BOOL can_use_bitmap, - BOOL *substituted ) + BOOL *substituted, const WCHAR **orig_name ) { BOOL want_vertical = (lf->lfFaceName[0] == '@'); struct gdi_font_face *face; @@ -1888,7 +1893,7 @@ static struct gdi_font_face *find_matching_face( const LOGFONTW *lf, CHARSETINFO *substituted = TRUE; } - if ((face = find_matching_face_by_name( lf->lfFaceName, subst, lf, csi->fs, can_use_bitmap ))) + if ((face = find_matching_face_by_name( lf->lfFaceName, subst, lf, csi->fs, can_use_bitmap, orig_name ))) return face; } *substituted = FALSE; /* substitution is no longer relevant */ @@ -2460,7 +2465,7 @@ static void add_child_font( struct gdi_font *font, const WCHAR *family_name ) struct gdi_font *child; struct gdi_font_face *face; - if (!(face = find_matching_face_by_name( family_name, NULL, &font->lf, fs, FALSE ))) return; + if (!(face = find_matching_face_by_name( family_name, NULL, &font->lf, fs, FALSE, NULL ))) return; if (!(child = create_gdi_font( face, family_name, &font->lf ))) return; child->matrix = font->matrix; @@ -4077,6 +4082,7 @@ static struct gdi_font *select_font( LOGFONTW *lf, FMAT2 dcmat, BOOL can_use_bit struct gdi_font_face *face; INT height; CHARSETINFO csi; + const WCHAR *orig_name = NULL; BOOL substituted = FALSE; static const WCHAR symbolW[] = {'S','y','m','b','o','l',0}; @@ -4093,14 +4099,14 @@ static struct gdi_font *select_font( LOGFONTW *lf, FMAT2 dcmat, BOOL can_use_bit TRACE( "returning cached gdiFont(%p)\n", font ); return font; } - if (!(face = find_matching_face( lf, &csi, can_use_bitmap, &substituted ))) + if (!(face = find_matching_face( lf, &csi, can_use_bitmap, &substituted, &orig_name ))) { FIXME( "can't find a single appropriate font - bailing\n" ); return NULL; } height = lf->lfHeight; - font = create_gdi_font( face, NULL, lf ); + font = create_gdi_font( face, orig_name, lf ); font->use_logfont_name = substituted; font->matrix = dcmat; font->can_use_bitmap = can_use_bitmap;

1 0

Zhiyi Zhang : comctl32/propsheet: Return a pattern brush when handling WM_CTLCOLORSTATIC for theming.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: e8390a6c39b22f8936a109eaa26721b2b0970eec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8390a6c39b22f8936a109ea… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 7 17:13:57 2021 +0800 comctl32/propsheet: Return a pattern brush when handling WM_CTLCOLORSTATIC for theming. Fix a regression from 2f1bbd8 that makes the static control for DPI sample text in winecfg not refreshing its background when moving the DPI slider. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 11 ++++++++++- dlls/comctl32/tests/propsheet.c | 11 +---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 4c9b42e6ed7..9309250f65a 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1309,10 +1309,19 @@ static LRESULT CALLBACK PROPSHEET_ThemedSubclassProc(HWND hwnd, UINT msg, WPARAM if (lr) return lr; + brush = get_propsheet_background_brush(hwnd); + if (!brush) + break; + hdc = (HDC)wp; SetBkColor(hdc, GetSysColor(COLOR_BTNFACE)); SetBkMode(hdc, TRANSPARENT); - return (LRESULT)GetStockObject(NULL_BRUSH); + + org.x = 0; + org.y = 0; + MapWindowPoints((HWND)lp, hwnd, &org, 1); + SetBrushOrgEx(hdc, -org.x, -org.y, NULL); + return (LRESULT)brush; } } diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 0b012df1cca..6cc29a8b6f1 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1293,7 +1293,6 @@ static void test_WM_CTLCOLORSTATIC(void) /* Test that brush origin is changed after WM_CTLCOLORSTATIC */ ret = GetBrushOrgEx(child_hdc, &org); ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); - todo_wine ok(org.x == -1 && org.y == -2, "Expected (-1,-2), got %s.\n", wine_dbgstr_point(&org)); /* Test that device context is set to transparent after WM_CTLCOLORSTATIC */ @@ -1302,7 +1301,6 @@ static void test_WM_CTLCOLORSTATIC(void) /* Test that the brush is a pattern brush created from the tab body bitmap in the theme */ ok(hbrush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); - todo_wine_if(is_theme_active) ok(hbrush != GetStockObject(NULL_BRUSH), "Expected a different brush.\n"); hbrush2 = SelectObject(child_hdc, GetSysColorBrush(COLOR_BTNFACE)); ok(hbrush2 != hbrush, "Expected a different brush.\n"); @@ -1311,13 +1309,11 @@ static void test_WM_CTLCOLORSTATIC(void) count = GetObjectA(hbrush, sizeof(log_brush), &log_brush); ok(count == sizeof(log_brush), "GetObjectA failed, error %u.\n", GetLastError()); ok(log_brush.lbColor == 0, "Expected brush color %#x, got %#x.\n", 0, log_brush.lbColor); - todo_wine ok(log_brush.lbStyle == BS_PATTERN, "Expected brush style %#x, got %#x.\n", BS_PATTERN, log_brush.lbStyle); memset(&bmp, 0, sizeof(bmp)); count = GetObjectA((HBITMAP)log_brush.lbHatch, sizeof(bmp), &bmp); - todo_wine ok(count == sizeof(bmp), "GetObjectA failed, error %u.\n", GetLastError()); ok(pGetWindowTheme(hdlg) == NULL, "Expected NULL theme handle.\n"); @@ -1340,9 +1336,7 @@ static void test_WM_CTLCOLORSTATIC(void) size.cy = 0; hr = pGetThemePartSize(theme, NULL, TABP_BODY, 0, NULL, TS_TRUE, &size); ok(hr == S_OK, "GetThemePartSize failed, hr %#x.\n", hr); - todo_wine ok(bmp.bmWidth == size.cx, "Expected width %d, got %d.\n", size.cx, bmp.bmWidth); - todo_wine ok(bmp.bmHeight == size.cy, "Expected height %d, got %d.\n", size.cy, bmp.bmHeight); pCloseThemeData(theme); @@ -1415,13 +1409,11 @@ static void test_WM_CTLCOLORSTATIC(void) SetLastError(0xdeadbeef); ret = GetObjectA(hbrush, sizeof(log_brush), &log_brush); error = GetLastError(); - todo_wine ok(!ret, "GetObjectA succeeded.\n"); todo_wine ok(error == ERROR_INVALID_PARAMETER, "Expected error %u, got %u.\n", ERROR_INVALID_PARAMETER, error); ret = DeleteObject(hbrush); - todo_wine ok(!ret, "DeleteObject succeeded.\n"); /* Should still report the same brush handle after the brush handle was freed */ @@ -1432,10 +1424,8 @@ static void test_WM_CTLCOLORSTATIC(void) hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); SendMessageW(sheethwnd, WM_THEMECHANGED, 0, 0); hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(is_theme_active) ok(hbrush2 != hbrush, "Expected a different brush.\n"); ret = GetObjectA(hbrush, sizeof(log_brush), &log_brush); - todo_wine ok(!ret, "GetObjectA succeeded.\n"); } else @@ -1443,6 +1433,7 @@ static void test_WM_CTLCOLORSTATIC(void) /* Test that brush origin is at (0,0) */ ret = GetBrushOrgEx(child_hdc, &org); ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); + todo_wine_if(is_theme_active) ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); todo_wine_if(is_theme_active)

1 0

Zhiyi Zhang : uxtheme: Do not hook DefDlgProc() for theming.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: 9c9274990ee12cc990706c780d738b5d6b68b11e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c9274990ee12cc990706c78… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 7 17:13:19 2021 +0800 uxtheme: Do not hook DefDlgProc() for theming. Currently there is no need to hook DefDlgProc(). Tests show that dialog theming shouldn't be implemented in DefDlgProc(). Also fix a double free bug because WM_DESTROY in UXTHEME_DefDlgProc() calls CloseThemeData() even when the theme handle is not opened when handling WM_CREATE in UXTHEME_DefDlgProc(). The bug can be demonstrated by running comctl32/tests/propsheet.c tests with Light theme. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/propsheet.c | 9 ++----- dlls/comctl32/tests/static.c | 5 +--- dlls/user32/defdlg.c | 34 ++++++------------------ dlls/user32/hook.c | 1 - dlls/user32/user_private.h | 1 - dlls/uxtheme/Makefile.in | 1 - dlls/uxtheme/dialog.c | 59 ----------------------------------------- dlls/uxtheme/system.c | 1 - dlls/uxtheme/uxthemedll.h | 1 - include/winuser.h | 1 - 10 files changed, 11 insertions(+), 102 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 199b280879e..0b012df1cca 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1320,9 +1320,7 @@ static void test_WM_CTLCOLORSTATIC(void) todo_wine ok(count == sizeof(bmp), "GetObjectA failed, error %u.\n", GetLastError()); - todo_wine_if(pGetWindowTheme(hdlg) != NULL) ok(pGetWindowTheme(hdlg) == NULL, "Expected NULL theme handle.\n"); - todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) ok(pGetWindowTheme(sheethwnd) == NULL, "Expected NULL theme handle.\n"); memset(&cls, 0, sizeof(cls)); @@ -1336,18 +1334,15 @@ static void test_WM_CTLCOLORSTATIC(void) hwnd = CreateWindowA("TestClass", "test", WS_POPUP | WS_VISIBLE, 0, 0, 4, 4, 0, 0, 0, NULL); ok(hwnd != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); theme = pOpenThemeData(hwnd, L"Tab"); - /* Light theme triggers a double free bug in uxtheme */ - todo_wine_if(!theme) ok(theme != NULL, "OpenThemeData failed.\n"); size.cx = 0; size.cy = 0; hr = pGetThemePartSize(theme, NULL, TABP_BODY, 0, NULL, TS_TRUE, &size); - todo_wine_if(!theme) ok(hr == S_OK, "GetThemePartSize failed, hr %#x.\n", hr); - todo_wine_if(theme) + todo_wine ok(bmp.bmWidth == size.cx, "Expected width %d, got %d.\n", size.cx, bmp.bmWidth); - todo_wine_if(theme) + todo_wine ok(bmp.bmHeight == size.cy, "Expected height %d, got %d.\n", size.cy, bmp.bmHeight); pCloseThemeData(theme); diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index b507cf1e02b..529396b3f0d 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -408,11 +408,11 @@ static void test_WM_CTLCOLORSTATIC(void) HWND parent, dialog, child; COLORREF color, old_color; HDC child_hdc, dialog_hdc; - BOOL ret, todo = FALSE; int mode, old_mode; HBRUSH brush; HRESULT hr; POINT org; + BOOL ret; struct { @@ -434,8 +434,6 @@ static void test_WM_CTLCOLORSTATIC(void) child = GetDlgItem(dialog, 100); ok(child != NULL, "Failed to get child static control, error %d.\n", GetLastError()); - todo = !!pGetWindowTheme(dialog); - dialog_hdc = GetDC(dialog); child_hdc = GetDC(child); PatBlt(dialog_hdc, 0, 0, 80, 80, BLACKNESS); @@ -447,7 +445,6 @@ static void test_WM_CTLCOLORSTATIC(void) 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); diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index 4f44a93cd49..81c7cb0f207 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -354,7 +354,10 @@ out: return dlgInfo; } -static LRESULT USER_DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +/*********************************************************************** + * DefDlgProcA (USER32.@) + */ +LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { DIALOGINFO *dlgInfo; DLGPROC dlgproc; @@ -408,7 +411,10 @@ static LRESULT USER_DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar return GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); } -static LRESULT USER_DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +/*********************************************************************** + * DefDlgProcW (USER32.@) + */ +LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { DIALOGINFO *dlgInfo; DLGPROC dlgproc; @@ -461,27 +467,3 @@ static LRESULT USER_DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar return GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); } - -LRESULT WINAPI USER_DefDlgProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) -{ - if (unicode) - return USER_DefDlgProcW( hwnd, msg, wParam, lParam ); - else - return USER_DefDlgProcA( hwnd, msg, wParam, lParam ); -} - -/*********************************************************************** - * DefDlgProcA (USER32.@) - */ -LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) -{ - return user_api->pDefDlgProc( hwnd, msg, wParam, lParam, FALSE ); -} - -/*********************************************************************** - * DefDlgProcW (USER32.@) - */ -LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) -{ - return user_api->pDefDlgProc( hwnd, msg, wParam, lParam, TRUE ); -} diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index f5b4c6ab8a1..159797020f2 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -83,7 +83,6 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); static struct user_api_hook original_user_api = { - USER_DefDlgProc, USER_ScrollBarDraw, USER_ScrollBarProc, }; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index c2152900a9b..96704ac68ae 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -302,7 +302,6 @@ extern BOOL get_icon_size( HICON handle, SIZE *size ) DECLSPEC_HIDDEN; #endif extern struct user_api_hook *user_api DECLSPEC_HIDDEN; -LRESULT WINAPI USER_DefDlgProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; LRESULT WINAPI USER_ScrollBarProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; void WINAPI USER_ScrollBarDraw(HWND, HDC, INT, enum SCROLL_HITTEST, const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in index 933650f4261..01751d3243a 100644 --- a/dlls/uxtheme/Makefile.in +++ b/dlls/uxtheme/Makefile.in @@ -5,7 +5,6 @@ DELAYIMPORTS = msimg32 C_SRCS = \ buffer.c \ - dialog.c \ draw.c \ main.c \ metric.c \ diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c deleted file mode 100644 index 776f54e1d31..00000000000 --- a/dlls/uxtheme/dialog.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Theming - Dialogs - * - * Copyright (c) 2005 by Frank Richter - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "uxtheme.h" -#include "uxthemedll.h" -#include "vssym32.h" -#include "wine/debug.h" - -LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode) -{ - HTHEME theme = GetWindowTheme ( hWnd ); - static const WCHAR themeClass[] = L"Window"; - LRESULT result; - - switch (msg) - { - case WM_CREATE: - result = user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - theme = OpenThemeData( hWnd, themeClass ); - return result; - - case WM_DESTROY: - CloseThemeData ( theme ); - SetWindowTheme( hWnd, NULL, NULL ); - OpenThemeData( hWnd, NULL ); - return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - - default: - /* Call old proc */ - return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - } - return 0; -} diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 37c484387ec..61a608e5962 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -1245,7 +1245,6 @@ BOOL WINAPI ThemeHooksInstall(void) { struct user_api_hook hooks; - hooks.pDefDlgProc = UXTHEME_DefDlgProc; hooks.pScrollBarDraw = UXTHEME_ScrollBarDraw; hooks.pScrollBarWndProc = UXTHEME_ScrollbarWndProc; return RegisterUserApiHook(&hooks, &user_api); diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h index 67130774392..c43ad703884 100644 --- a/dlls/uxtheme/uxthemedll.h +++ b/dlls/uxtheme/uxthemedll.h @@ -106,7 +106,6 @@ extern HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) DECLSPEC_HIDDEN; extern void UXTHEME_UninitSystem(void) DECLSPEC_HIDDEN; extern struct user_api_hook user_api DECLSPEC_HIDDEN; -LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode) DECLSPEC_HIDDEN; void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTEST hit_test, const struct SCROLL_TRACKING_INFO *tracking_info, BOOL draw_arrows, BOOL draw_interior, RECT *rect, INT arrowsize, diff --git a/include/winuser.h b/include/winuser.h index 898c9034e33..1d37bd44344 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4435,7 +4435,6 @@ struct SCROLL_TRACKING_INFO struct user_api_hook { - LRESULT (WINAPI *pDefDlgProc)(HWND, UINT, WPARAM, LPARAM, BOOL); void (WINAPI *pScrollBarDraw)(HWND, HDC, INT, enum SCROLL_HITTEST, const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, INT, BOOL);

1 0

Zhiyi Zhang : include: Add more EnableThemeDialogTexture() option flags.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: 15eef4c8f7fad3f8df5f1b5fb42999e53cbcd6b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15eef4c8f7fad3f8df5f1b5f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 7 17:12:43 2021 +0800 include: Add more EnableThemeDialogTexture() option flags. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/uxtheme.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/uxtheme.h b/include/uxtheme.h index 384c3655b41..b44e06de611 100644 --- a/include/uxtheme.h +++ b/include/uxtheme.h @@ -96,7 +96,10 @@ HRESULT WINAPI DrawThemeTextEx(HTHEME,HDC,int,int,LPCWSTR,int,DWORD,RECT*, #define ETDT_DISABLE 0x00000001 #define ETDT_ENABLE 0x00000002 #define ETDT_USETABTEXTURE 0x00000004 +#define ETDT_USEAEROWIZARDTABTEXTURE 0x00000008 #define ETDT_ENABLETAB (ETDT_ENABLE|ETDT_USETABTEXTURE) +#define ETDT_ENABLEAEROWIZARDTAB (ETDT_ENABLE|ETDT_USEAEROWIZARDTABTEXTURE) +#define ETDT_VALIDBITS (ETDT_DISABLE|ETDT_ENABLE|ETDT_USETABTEXTURE|ETDT_USEAEROWIZARDTABTEXTURE) HRESULT WINAPI EnableThemeDialogTexture(HWND,DWORD); HRESULT WINAPI EnableTheming(BOOL);

1 0

Mohamad Al-Jaf : kernelbase: Add CreateBoundaryDescriptorW stub.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: a866e9150ef902ce27bd19419eeb645960830990 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a866e9150ef902ce27bd1941… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Dec 6 22:17:59 2021 -0500 kernelbase: Add CreateBoundaryDescriptorW stub. Needed for IE11 iertutil.dll. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-namespace-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/security.c | 9 +++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-namespace-l1-1-0/api-ms-win-core-namespace-l1-1-0.spec b/dlls/api-ms-win-core-namespace-l1-1-0/api-ms-win-core-namespace-l1-1-0.spec index ebb41489dc7..df6ff599396 100644 --- a/dlls/api-ms-win-core-namespace-l1-1-0/api-ms-win-core-namespace-l1-1-0.spec +++ b/dlls/api-ms-win-core-namespace-l1-1-0/api-ms-win-core-namespace-l1-1-0.spec @@ -1,6 +1,6 @@ @ stub AddSIDToBoundaryDescriptor @ stub ClosePrivateNamespace -@ stub CreateBoundaryDescriptorW +@ stdcall CreateBoundaryDescriptorW(wstr long) kernel32.CreateBoundaryDescriptorW @ stub CreatePrivateNamespaceW @ stub DeleteBoundaryDescriptor @ stub OpenPrivateNamespaceW diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0e5f953aa50..6c487c86bd2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -267,7 +267,7 @@ @ stdcall CreateActCtxA(ptr) @ stdcall -import CreateActCtxW(ptr) # @ stub CreateBoundaryDescriptorA -# @ stub CreateBoundaryDescriptorW +@ stdcall -import CreateBoundaryDescriptorW(wstr long) @ stdcall -import CreateConsoleScreenBuffer(long long ptr long ptr) @ stdcall -import CreateDirectoryA(str ptr) @ stdcall CreateDirectoryExA(str str ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index da3d5e4035b..a118ab84ef8 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -174,7 +174,7 @@ # @ stub CouldMultiUserAppsBehaviorBePossibleForPackage @ stdcall CreateActCtxW(ptr) # @ stub CreateAppContainerToken -# @ stub CreateBoundaryDescriptorW +@ stdcall CreateBoundaryDescriptorW(wstr long) @ stdcall CreateConsoleScreenBuffer(long long ptr long ptr) @ stdcall CreateDirectoryA(str ptr) @ stdcall CreateDirectoryExW(wstr wstr ptr) diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 71e09bdefb5..d5f5280e979 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -922,6 +922,15 @@ BOOL WINAPI ConvertToAutoInheritPrivateObjectSecurity( PSECURITY_DESCRIPTOR pare return set_ntstatus( RtlConvertToAutoInheritSecurityObject( parent, current, descr, type, is_dir, mapping )); } +/****************************************************************************** + * CreateBoundaryDescriptorW (kernelbase.@) + */ +HANDLE WINAPI CreateBoundaryDescriptorW( LPCWSTR name, ULONG flags ) +{ + FIXME("%s %u - stub\n", debugstr_w(name), flags); + return NULL; +} + /****************************************************************************** * CreatePrivateObjectSecurity (kernelbase.@) */

1 0

Francois Gouget : kernel32: Store the ILANGUAGE values in uppercase.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

Module: wine Branch: master Commit: 652d94d34b9f8376ae94a4fe1015c79a6e41269e URL: https://source.winehq.org/git/wine.git/?a=commit;h=652d94d34b9f8376ae94a4fe… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 7 12:55:27 2021 +0100 kernel32: Store the ILANGUAGE values in uppercase. Some APIs (e.g. GetSystemPreferredUILanguages()) return them as a string so the case should match the one used by Windows in case developers used case sensitive string comparisons (e.g. as in advapi32:lsa) Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/are.nls | 4 ++-- dlls/kernel32/nls/arh.nls | 4 ++-- dlls/kernel32/nls/arj.nls | 4 ++-- dlls/kernel32/nls/art.nls | 4 ++-- dlls/kernel32/nls/ast.nls | 4 ++-- dlls/kernel32/nls/aze.nls | 4 ++-- dlls/kernel32/nls/azl.nls | 2 +- dlls/kernel32/nls/dea.nls | 4 ++-- dlls/kernel32/nls/ena.nls | 4 ++-- dlls/kernel32/nls/enb.nls | 2 +- dlls/kernel32/nls/ens.nls | 4 ++-- dlls/kernel32/nls/ent.nls | 4 ++-- dlls/kernel32/nls/eox.nls | 4 ++-- dlls/kernel32/nls/esa.nls | 4 ++-- dlls/kernel32/nls/esb.nls | 4 ++-- dlls/kernel32/nls/esc.nls | 4 ++-- dlls/kernel32/nls/esd.nls | 4 ++-- dlls/kernel32/nls/ese.nls | 4 ++-- dlls/kernel32/nls/esf.nls | 4 ++-- dlls/kernel32/nls/esg.nls | 4 ++-- dlls/kernel32/nls/esh.nls | 4 ++-- dlls/kernel32/nls/esi.nls | 4 ++-- dlls/kernel32/nls/esl.nls | 4 ++-- dlls/kernel32/nls/esm.nls | 4 ++-- dlls/kernel32/nls/esn.nls | 4 ++-- dlls/kernel32/nls/eso.nls | 4 ++-- dlls/kernel32/nls/esp.nls | 4 ++-- dlls/kernel32/nls/esr.nls | 4 ++-- dlls/kernel32/nls/ess.nls | 4 ++-- dlls/kernel32/nls/esu.nls | 4 ++-- dlls/kernel32/nls/esv.nls | 4 ++-- dlls/kernel32/nls/esy.nls | 4 ++-- dlls/kernel32/nls/esz.nls | 4 ++-- dlls/kernel32/nls/euq.nls | 4 ++-- dlls/kernel32/nls/fin.nls | 4 ++-- dlls/kernel32/nls/fra.nls | 4 ++-- dlls/kernel32/nls/frb.nls | 4 ++-- dlls/kernel32/nls/frc.nls | 4 ++-- dlls/kernel32/nls/frl.nls | 4 ++-- dlls/kernel32/nls/frm.nls | 4 ++-- dlls/kernel32/nls/frs.nls | 4 ++-- dlls/kernel32/nls/gae.nls | 4 ++-- dlls/kernel32/nls/glc.nls | 2 +- dlls/kernel32/nls/heb.nls | 4 ++-- dlls/kernel32/nls/hrv.nls | 4 ++-- dlls/kernel32/nls/hun.nls | 4 ++-- dlls/kernel32/nls/hye.nls | 4 ++-- dlls/kernel32/nls/isl.nls | 4 ++-- dlls/kernel32/nls/kan.nls | 4 ++-- dlls/kernel32/nls/kkz.nls | 4 ++-- dlls/kernel32/nls/mar.nls | 4 ++-- dlls/kernel32/nls/mki.nls | 4 ++-- dlls/kernel32/nls/msb.nls | 4 ++-- dlls/kernel32/nls/msl.nls | 4 ++-- dlls/kernel32/nls/nls.nls | 2 +- dlls/kernel32/nls/san.nls | 4 ++-- dlls/kernel32/nls/sky.nls | 4 ++-- dlls/kernel32/nls/sqi.nls | 4 ++-- dlls/kernel32/nls/srb.nls | 4 ++-- dlls/kernel32/nls/srl.nls | 4 ++-- dlls/kernel32/nls/srm.nls | 4 ++-- dlls/kernel32/nls/sve.nls | 4 ++-- dlls/kernel32/nls/svf.nls | 4 ++-- dlls/kernel32/nls/syr.nls | 4 ++-- dlls/kernel32/nls/tel.nls | 4 ++-- dlls/kernel32/nls/tha.nls | 4 ++-- dlls/kernel32/nls/trk.nls | 4 ++-- dlls/kernel32/nls/vit.nls | 4 ++-- dlls/kernel32/nls/zhh.nls | 4 ++-- 69 files changed, 134 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=652d94d34b9f8376ae94…

1 0

Nikolay Sivov : dwrite: Add flag for cached advance presence.
by Alexandre Julliard Dec. 7, 2021

Dec. 7, 2021

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