December 2020 - Wine-commits

Rémi Bernon : gdi32: Only use the registry cache for application fonts.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 63de94839cad9bd7845d79c27aff599d97104f19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63de94839cad9bd7845d79c2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 27 15:38:05 2020 +0100 gdi32: Only use the registry cache for application fonts. And load system fonts outside of the global font mutex. We now only use the mutex to protect the registry fonts initialization. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 26 ++++++++++++++++---------- dlls/gdi32/freetype.c | 6 +++--- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 4cc072bd785..9fa0f45ec4b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -7758,7 +7758,7 @@ static void load_system_bitmap_fonts(void) { dlen = sizeof(data); if (!RegQueryValueExW( hkey, fonts[i], 0, &type, (BYTE *)data, &dlen ) && type == REG_SZ) - add_system_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); + add_system_font_resource( data, ADDFONT_ALLOW_BITMAP ); } RegCloseKey( hkey ); } @@ -7789,11 +7789,11 @@ static void load_file_system_fonts(void) /* Windows directory */ get_fonts_win_dir_path( L"*", path ); - load_directory_fonts( path, ADDFONT_ADD_TO_CACHE ); + load_directory_fonts( path, 0 ); /* Wine data directory */ get_fonts_data_dir_path( L"*", path ); - load_directory_fonts( path, ADDFONT_ADD_TO_CACHE | ADDFONT_EXTERNAL_FONT ); + load_directory_fonts( path, ADDFONT_EXTERNAL_FONT ); /* custom paths */ /* @@ Wine registry key: HKCU\Software\Wine\Fonts */ @@ -7805,7 +7805,7 @@ static void load_file_system_fonts(void) if (next && next - ptr < 2) continue; lstrcpynW( path, ptr, MAX_PATH - 2 ); lstrcatW( path, L"\\*" ); - load_directory_fonts( path, ADDFONT_ADD_TO_CACHE | ADDFONT_EXTERNAL_FONT ); + load_directory_fonts( path, ADDFONT_EXTERNAL_FONT ); } } } @@ -7926,9 +7926,9 @@ static void load_registry_fonts(void) dlen /= sizeof(WCHAR); if (data[0] && data[1] == ':') - add_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); + add_font_resource( data, ADDFONT_ALLOW_BITMAP ); else if (dlen >= 6 && !wcsicmp( data + dlen - 5, L".fon" )) - add_system_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); + add_system_font_resource( data, ADDFONT_ALLOW_BITMAP ); next: vlen = ARRAY_SIZE(value); dlen = sizeof(data); @@ -7954,6 +7954,10 @@ void font_init(void) update_codepage(); if (__wine_init_unix_lib( gdi32_module, DLL_PROCESS_ATTACH, &callback_funcs, &font_funcs )) return; + load_system_bitmap_fonts(); + load_file_system_fonts(); + font_funcs->load_fonts(); + if (!(mutex = CreateMutexW( NULL, FALSE, L"__WINE_FONT_MUTEX__" ))) return; WaitForSingleObject( mutex, INFINITE ); @@ -7962,16 +7966,18 @@ void font_init(void) if (disposition == REG_CREATED_NEW_KEY) { - load_system_bitmap_fonts(); - load_file_system_fonts(); - font_funcs->load_fonts(); load_registry_fonts(); update_external_font_keys(); } - else load_font_list_from_cache(); ReleaseMutex( mutex ); + if (disposition != REG_CREATED_NEW_KEY) + { + load_registry_fonts(); + load_font_list_from_cache(); + } + reorder_font_list(); load_gdi_font_subst(); load_gdi_font_replacements(); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e7684728c9c..1ee02795bed 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1303,7 +1303,7 @@ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) ReadFontDir(path, external_fonts); else { - DWORD addfont_flags = ADDFONT_ADD_TO_CACHE; + DWORD addfont_flags = 0; if(external_fonts) addfont_flags |= ADDFONT_EXTERNAL_FONT; AddFontToList(NULL, path, NULL, 0, addfont_flags); } @@ -1523,7 +1523,7 @@ static void load_fontconfig_fonts( void ) if (!(done_set = pFcStrSetCreate())) goto done; if (!(dir_list = pFcConfigGetFontDirs( config ))) goto done; - fontconfig_add_fonts_from_dir_list( config, dir_list, done_set, ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE ); + fontconfig_add_fonts_from_dir_list( config, dir_list, done_set, ADDFONT_EXTERNAL_FONT ); done: if (dir_list) pFcStrListDone( dir_list ); @@ -1543,7 +1543,7 @@ static void load_mac_font_callback(const void *value, void *context) if (path && CFStringGetFileSystemRepresentation(pathStr, path, len)) { TRACE("font file %s\n", path); - AddFontToList(NULL, path, NULL, 0, ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE); + AddFontToList(NULL, path, NULL, 0, ADDFONT_EXTERNAL_FONT); } RtlFreeHeap(GetProcessHeap(), 0, path); }

1 0

Daniel Lehman : ntdll: Handle 64-bit addresses in +seh traces on x64.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: bd02a82d9c41ef680709637acaee579852488142 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd02a82d9c41ef680709637a… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Nov 26 15:22:18 2020 -0800 ntdll: Handle 64-bit addresses in +seh traces on x64. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index a332f961908..a3dba815c1f 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -241,11 +241,11 @@ static void dump_scope_table( ULONG64 base, const SCOPE_TABLE *table ) TRACE( "scope table at %p\n", table ); for (i = 0; i < table->Count; i++) - TRACE( " %u: %lx-%lx handler %lx target %lx\n", i, - base + table->ScopeRecord[i].BeginAddress, - base + table->ScopeRecord[i].EndAddress, - base + table->ScopeRecord[i].HandlerAddress, - base + table->ScopeRecord[i].JumpTarget ); + TRACE( " %u: %p-%p handler %p target %p\n", i, + (char *)base + table->ScopeRecord[i].BeginAddress, + (char *)base + table->ScopeRecord[i].EndAddress, + (char *)base + table->ScopeRecord[i].HandlerAddress, + (char *)base + table->ScopeRecord[i].JumpTarget ); } @@ -384,8 +384,8 @@ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_C frame.Handler = nested_exception_handler; __wine_push_frame( &frame ); - TRACE( "calling handler %p (rec=%p, frame=0x%lx context=%p, dispatch=%p)\n", - dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); + TRACE( "calling handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", + dispatch->LanguageHandler, rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch ); TRACE( "handler at %p returned %u\n", dispatch->LanguageHandler, res ); @@ -445,7 +445,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex dispatch.EstablisherFrame < (ULONG64)NtCurrentTeb()->Tib.StackLimit || dispatch.EstablisherFrame > (ULONG64)NtCurrentTeb()->Tib.StackBase) { - ERR( "invalid frame %lx (%p-%p)\n", dispatch.EstablisherFrame, + ERR( "invalid frame %p (%p-%p)\n", (void *)dispatch.EstablisherFrame, NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); rec->ExceptionFlags |= EH_STACK_INVALID; break; @@ -480,8 +480,8 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex /* hack: call wine handlers registered in the tib list */ else while ((ULONG64)teb_frame < context.Rsp) { - TRACE( "found wine frame %p rsp %lx handler %p\n", - teb_frame, context.Rsp, teb_frame->Handler ); + TRACE( "found wine frame %p rsp %p handler %p\n", + teb_frame, (void *)context.Rsp, teb_frame->Handler ); dispatch.EstablisherFrame = (ULONG64)teb_frame; switch (call_teb_handler( rec, orig_context, &dispatch, teb_frame )) { @@ -521,9 +521,9 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) NTSTATUS status; DWORD c; - TRACE( "code=%x flags=%x addr=%p ip=%lx tid=%04x\n", + TRACE( "code=%x flags=%x addr=%p ip=%p tid=%04x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, - context->Rip, GetCurrentThreadId() ); + (void *)context->Rip, GetCurrentThreadId() ); for (c = 0; c < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); c++) TRACE( " info[%d]=%016lx\n", c, rec->ExceptionInformation[c] ); @@ -780,7 +780,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, unsigned int i, prolog_offset; BOOL mach_frame = FALSE; - TRACE( "type %x rip %lx rsp %lx\n", type, pc, context->Rsp ); + TRACE( "type %x rip %p rsp %p\n", type, (void *)pc, (void *)context->Rsp ); if (TRACE_ON(seh)) dump_unwind_info( base, function ); frame = *frame_ret = context->Rsp; @@ -944,8 +944,8 @@ static DWORD call_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dis frame.dispatch = dispatch; __wine_push_frame( &frame.frame ); - TRACE( "calling handler %p (rec=%p, frame=0x%lx context=%p, dispatch=%p)\n", - dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); + TRACE( "calling handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", + dispatch->LanguageHandler, rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); TRACE( "handler %p returned %x\n", dispatch->LanguageHandler, res ); @@ -1162,7 +1162,7 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) teb_frame = __wine_pop_frame( teb_frame ); } - TRACE( "returning to %lx stack %lx\n", context->Rip, context->Rsp ); + TRACE( "returning to %p stack %p\n", (void *)context->Rip, (void *)context->Rsp ); NtSetContextThread( GetCurrentThread(), context ); } @@ -1226,7 +1226,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec dispatch.EstablisherFrame < (ULONG64)NtCurrentTeb()->Tib.StackLimit || dispatch.EstablisherFrame > (ULONG64)NtCurrentTeb()->Tib.StackBase) { - ERR( "invalid frame %lx (%p-%p)\n", dispatch.EstablisherFrame, + ERR( "invalid frame %p (%p-%p)\n", (void *)dispatch.EstablisherFrame, NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); rec->ExceptionFlags |= EH_STACK_INVALID; break; @@ -1236,7 +1236,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec { if (end_frame && (dispatch.EstablisherFrame > (ULONG64)end_frame)) { - ERR( "invalid end frame %lx/%p\n", dispatch.EstablisherFrame, end_frame ); + ERR( "invalid end frame %p/%p\n", (void *)dispatch.EstablisherFrame, end_frame ); raise_status( STATUS_INVALID_UNWIND_TARGET, rec ); } if (dispatch.EstablisherFrame == (ULONG64)end_frame) rec->ExceptionFlags |= EH_TARGET_UNWIND; @@ -1381,7 +1381,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, return ExceptionContinueExecution; } } - TRACE( "unwinding to target %lx\n", dispatch->ImageBase + table->ScopeRecord[i].JumpTarget ); + TRACE( "unwinding to target %p\n", (char *)dispatch->ImageBase + table->ScopeRecord[i].JumpTarget ); RtlUnwindEx( frame, (char *)dispatch->ImageBase + table->ScopeRecord[i].JumpTarget, rec, 0, dispatch->ContextRecord, dispatch->HistoryTable ); } @@ -1471,7 +1471,7 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, dispatch.EstablisherFrame < (ULONG64)NtCurrentTeb()->Tib.StackLimit || dispatch.EstablisherFrame > (ULONG64)NtCurrentTeb()->Tib.StackBase) { - ERR( "invalid frame %lx (%p-%p)\n", dispatch.EstablisherFrame, + ERR( "invalid frame %p (%p-%p)\n", (void *)dispatch.EstablisherFrame, NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); break; }

1 0

Austin English : dcomp: Add stub dll.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 0f29186a23c2639eb14a805569b8b5e9a848428f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f29186a23c2639eb14a8055… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 30 02:27:56 2020 -0600 dcomp: Add stub dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50206 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/dcomp/Makefile.in | 8 ++++++++ dlls/dcomp/dcomp.spec | 27 +++++++++++++++++++++++++++ dlls/dcomp/main.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dcomp/version.rc | 26 ++++++++++++++++++++++++++ 6 files changed, 108 insertions(+) diff --git a/configure b/configure index 9ee3ffdc947..d025c38934c 100755 --- a/configure +++ b/configure @@ -1244,6 +1244,7 @@ enable_davclnt enable_dbgeng enable_dbghelp enable_dciman32 +enable_dcomp enable_ddraw enable_ddrawex enable_devenum @@ -20214,6 +20215,7 @@ wine_fn_config_makefile dlls/dbgeng/tests enable_tests wine_fn_config_makefile dlls/dbghelp enable_dbghelp wine_fn_config_makefile dlls/dbghelp/tests enable_tests wine_fn_config_makefile dlls/dciman32 enable_dciman32 +wine_fn_config_makefile dlls/dcomp enable_dcomp wine_fn_config_makefile dlls/ddeml.dll16 enable_win16 wine_fn_config_makefile dlls/ddraw enable_ddraw wine_fn_config_makefile dlls/ddraw/tests enable_tests diff --git a/configure.ac b/configure.ac index 92b555bb3b8..e823543f1cd 100644 --- a/configure.ac +++ b/configure.ac @@ -3145,6 +3145,7 @@ WINE_CONFIG_MAKEFILE(dlls/dbgeng/tests) WINE_CONFIG_MAKEFILE(dlls/dbghelp) WINE_CONFIG_MAKEFILE(dlls/dbghelp/tests) WINE_CONFIG_MAKEFILE(dlls/dciman32) +WINE_CONFIG_MAKEFILE(dlls/dcomp) WINE_CONFIG_MAKEFILE(dlls/ddeml.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/ddraw) WINE_CONFIG_MAKEFILE(dlls/ddraw/tests) diff --git a/dlls/dcomp/Makefile.in b/dlls/dcomp/Makefile.in new file mode 100644 index 00000000000..6d75a87980f --- /dev/null +++ b/dlls/dcomp/Makefile.in @@ -0,0 +1,8 @@ +MODULE = dcomp.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c + +RC_SRCS = version.rc diff --git a/dlls/dcomp/dcomp.spec b/dlls/dcomp/dcomp.spec new file mode 100644 index 00000000000..03801ebba6f --- /dev/null +++ b/dlls/dcomp/dcomp.spec @@ -0,0 +1,27 @@ +1017 stub @ +1019 stub @ +1028 stub @ +1031 stub @ +1033 stub @ +1038 stub @ +1039 stub @ +1040 stub @ +1041 stub @ +1042 stub @ + +@ stub CompileEffectDescription +@ stub CreateEffectDescription +@ stub DCompositionAttachMouseDragToHwnd +@ stub DCompositionAttachMouseWheelToHwnd +@ stub DCompositionCreateDevice2 +@ stub DCompositionCreateDevice3 +@ stub DCompositionCreateDevice +@ stub DCompositionCreateSurfaceHandle +@ stub DeserializeEffectDescription +@ stub DllCanUnloadNow +@ stub DllGetActivationFactory +@ stub DllGetClassObject +@ stub DwmEnableMMCSS +@ stub DwmFlush +@ stub DwmpEnableDDASupport +@ stub SerializeEffectDescription diff --git a/dlls/dcomp/main.c b/dlls/dcomp/main.c new file mode 100644 index 00000000000..b0b911a9bf5 --- /dev/null +++ b/dlls/dcomp/main.c @@ -0,0 +1,44 @@ +/* + * DirectComposition Library + * + * Copyright 2020 Austin English + * + * 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 "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dcomp); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + default: + break; + } + + return TRUE; +} diff --git a/dlls/dcomp/version.rc b/dlls/dcomp/version.rc new file mode 100644 index 00000000000..a76f2675829 --- /dev/null +++ b/dlls/dcomp/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dcomp" +#define WINE_FILENAME_STR "dcomp.dll" +#define WINE_FILEVERSION 10,0,14393,0 +#define WINE_FILEVERSION_STR "10.0.14393.0" +#define WINE_PRODUCTVERSION 10,0,14393,0 +#define WINE_PRODUCTVERSION_STR "10.0.14393.0" + +#include "wine/wine_common_ver.rc"

1 0

Rémi Bernon : include: Emit assembly function size when compiling without MinGW.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 4130bbf48fdc7d54ec01102de4cb03ccfb105ec0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4130bbf48fdc7d54ec01102d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 30 10:30:19 2020 +0100 include: Emit assembly function size when compiling without MinGW. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/asm.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index b4b6fb50eb8..b5e6c6efd3d 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -65,6 +65,14 @@ # define __ASM_FUNC_TYPE(name) ".type " name ",@function" #endif +#ifdef _WIN32 +# define __ASM_FUNC_SIZE(name) "" +#elif defined(__APPLE__) +# define __ASM_FUNC_SIZE(name) "" +#else +# define __ASM_FUNC_SIZE(name) "\n\t.size " name ",.-" name +#endif + #if !defined(__GNUC__) && !defined(__clang__) # define __ASM_BLOCK_BEGIN(name) void __asm_dummy_##name(void) { # define __ASM_BLOCK_END } @@ -76,7 +84,7 @@ #define __ASM_DEFINE_FUNC(name,code) \ __ASM_BLOCK_BEGIN(__LINE__) \ asm(".text\n\t.align 4\n\t.globl " name "\n\t" __ASM_FUNC_TYPE(name) __ASM_SEH("\n\t.seh_proc " name) "\n" name ":\n\t" \ - __ASM_CFI(".cfi_startproc\n\t") code __ASM_CFI("\n\t.cfi_endproc") __ASM_SEH("\n\t.seh_endproc") ); \ + __ASM_CFI(".cfi_startproc\n\t") code __ASM_CFI("\n\t.cfi_endproc") __ASM_SEH("\n\t.seh_endproc") __ASM_FUNC_SIZE(name)); \ __ASM_BLOCK_END #define __ASM_GLOBAL_FUNC(name,code) __ASM_DEFINE_FUNC(__ASM_NAME(#name),code)

1 0

Nikolay Sivov : dwrite/font: Use consistent traces for the font object.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 5f219eccd5706b971069fa2a6aa0bdd635c30f2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f219eccd5706b971069fa2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 15:14:59 2020 +0300 dwrite/font: Use consistent traces for the font object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 121 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 68 insertions(+), 53 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index aa51c744297..9889add8899 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -151,9 +151,10 @@ struct dwrite_fontlist struct dwrite_fontfamily *family; }; -struct dwrite_font { +struct dwrite_font +{ IDWriteFont3 IDWriteFont3_iface; - LONG ref; + LONG refcount; DWRITE_FONT_STYLE style; struct dwrite_font_data *data; @@ -1848,9 +1849,7 @@ static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace5 static HRESULT WINAPI dwritefont_QueryInterface(IDWriteFont3 *iface, REFIID riid, void **obj) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IDWriteFont3) || IsEqualIID(riid, &IID_IDWriteFont2) || @@ -1871,57 +1870,67 @@ static HRESULT WINAPI dwritefont_QueryInterface(IDWriteFont3 *iface, REFIID riid static ULONG WINAPI dwritefont_AddRef(IDWriteFont3 *iface) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); - return ref; + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + ULONG refcount = InterlockedIncrement(&font->refcount); + + TRACE("%p, refcount %d.\n", iface, refcount); + + return refcount; } static ULONG WINAPI dwritefont_Release(IDWriteFont3 *iface) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + ULONG refcount = InterlockedDecrement(&font->refcount); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("%p, refcount %d.\n", iface, refcount); - if (!ref) { - IDWriteFontFamily2_Release(&This->family->IDWriteFontFamily2_iface); - release_font_data(This->data); - heap_free(This); + if (!refcount) + { + IDWriteFontFamily2_Release(&font->family->IDWriteFontFamily2_iface); + release_font_data(font->data); + heap_free(font); } - return ref; + return refcount; } static HRESULT WINAPI dwritefont_GetFontFamily(IDWriteFont3 *iface, IDWriteFontFamily **family) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)->(%p)\n", This, family); + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p, %p.\n", iface, family); - *family = (IDWriteFontFamily*)This->family; + *family = (IDWriteFontFamily *)font->family; IDWriteFontFamily_AddRef(*family); return S_OK; } static DWRITE_FONT_WEIGHT WINAPI dwritefont_GetWeight(IDWriteFont3 *iface) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)\n", This); - return This->data->weight; + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p.\n", iface); + + return font->data->weight; } static DWRITE_FONT_STRETCH WINAPI dwritefont_GetStretch(IDWriteFont3 *iface) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)\n", This); - return This->data->stretch; + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p.\n", iface); + + return font->data->stretch; } static DWRITE_FONT_STYLE WINAPI dwritefont_GetStyle(IDWriteFont3 *iface) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)\n", This); - return This->style; + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p.\n", iface); + + return font->style; } static BOOL WINAPI dwritefont_IsSymbolFont(IDWriteFont3 *iface) @@ -1960,17 +1969,20 @@ static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont3 *iface, static DWRITE_FONT_SIMULATIONS WINAPI dwritefont_GetSimulations(IDWriteFont3 *iface) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)\n", This); - return This->data->simulations; + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p.\n", iface); + + return font->data->simulations; } static void WINAPI dwritefont_GetMetrics(IDWriteFont3 *iface, DWRITE_FONT_METRICS *metrics) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); + struct dwrite_font *font = impl_from_IDWriteFont3(iface); - TRACE("(%p)->(%p)\n", This, metrics); - memcpy(metrics, &This->data->metrics, sizeof(*metrics)); + TRACE("%p, %p.\n", iface, metrics); + + memcpy(metrics, &font->data->metrics, sizeof(*metrics)); } static BOOL dwritefont_has_character(struct dwrite_font *font, UINT32 ch) @@ -2003,16 +2015,20 @@ static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont3 *iface, IDWriteFont static void WINAPI dwritefont1_GetMetrics(IDWriteFont3 *iface, DWRITE_FONT_METRICS1 *metrics) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)->(%p)\n", This, metrics); - *metrics = This->data->metrics; + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p, %p.\n", iface, metrics); + + *metrics = font->data->metrics; } static void WINAPI dwritefont1_GetPanose(IDWriteFont3 *iface, DWRITE_PANOSE *panose) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)->(%p)\n", This, panose); - *panose = This->data->panose; + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p, %p.\n", iface, panose); + + *panose = font->data->panose; } static HRESULT WINAPI dwritefont1_GetUnicodeRanges(IDWriteFont3 *iface, UINT32 max_count, DWRITE_UNICODE_RANGE *ranges, @@ -2093,8 +2109,8 @@ static BOOL WINAPI dwritefont3_HasCharacter(IDWriteFont3 *iface, UINT32 ch) static DWRITE_LOCALITY WINAPI dwritefont3_GetLocality(IDWriteFont3 *iface) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - FIXME("(%p): stub\n", This); + FIXME("%p: stub.\n", iface); + return DWRITE_LOCALITY_LOCAL; } @@ -2179,23 +2195,22 @@ HRESULT get_fontsig_from_fontface(IDWriteFontFace *iface, FONTSIGNATURE *fontsig static HRESULT create_font(struct dwrite_fontfamily *family, UINT32 index, IDWriteFont3 **font) { - struct dwrite_font *This; + struct dwrite_font *object; *font = NULL; - This = heap_alloc(sizeof(*This)); - if (!This) + if (!(object = heap_alloc(sizeof(*object)))) return E_OUTOFMEMORY; - This->IDWriteFont3_iface.lpVtbl = &dwritefontvtbl; - This->ref = 1; - This->family = family; + object->IDWriteFont3_iface.lpVtbl = &dwritefontvtbl; + object->refcount = 1; + object->family = family; IDWriteFontFamily2_AddRef(&family->IDWriteFontFamily2_iface); - This->data = family->data->fonts[index]; - This->style = This->data->style; - addref_font_data(This->data); + object->data = family->data->fonts[index]; + object->style = object->data->style; + addref_font_data(object->data); - *font = &This->IDWriteFont3_iface; + *font = &object->IDWriteFont3_iface; return S_OK; }

1 0

Nikolay Sivov : dwrite/gdiinterop: Use consistent trace format for the bitmap render target.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 061372438e5c1d838643b467946da9f8641f0f3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=061372438e5c1d838643b467… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 15:15:00 2020 +0300 dwrite/gdiinterop: Use consistent trace format for the bitmap render target. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 116 +++++++++++++++++++++++++---------------------- 1 file changed, 63 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=061372438e5c1d838643…

1 0

Nikolay Sivov : dwrite/gdiinterop: Use consistent traces for the interop object.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 40d30cf4542a425e6d8e2ee4a7aa9c91ba75dc8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=40d30cf4542a425e6d8e2ee4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 15:15:01 2020 +0300 dwrite/gdiinterop: Use consistent traces for the interop object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 47924011fd3..81cfc3a586b 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -637,9 +637,7 @@ static HRESULT create_rendertarget(IDWriteFactory7 *factory, HDC hdc, UINT32 wid static HRESULT WINAPI gdiinterop_QueryInterface(IDWriteGdiInterop1 *iface, REFIID riid, void **obj) { - struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IDWriteGdiInterop1) || IsEqualIID(riid, &IID_IDWriteGdiInterop) || @@ -686,9 +684,7 @@ static ULONG WINAPI gdiinterop_Release(IDWriteGdiInterop1 *iface) static HRESULT WINAPI gdiinterop_CreateFontFromLOGFONT(IDWriteGdiInterop1 *iface, LOGFONTW const *logfont, IDWriteFont **font) { - struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - - TRACE("(%p)->(%p %p)\n", This, logfont, font); + TRACE("%p, %p, %p.\n", iface, logfont, font); return IDWriteGdiInterop1_CreateFontFromLOGFONT(iface, logfont, NULL, font); } @@ -696,12 +692,11 @@ static HRESULT WINAPI gdiinterop_CreateFontFromLOGFONT(IDWriteGdiInterop1 *iface static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop1 *iface, IDWriteFont *font, LOGFONTW *logfont, BOOL *is_systemfont) { - struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); IDWriteFontCollection *collection; IDWriteFontFamily *family; HRESULT hr; - TRACE("(%p)->(%p %p %p)\n", This, font, logfont, is_systemfont); + TRACE("%p, %p, %p, %p.\n", iface, font, logfont, is_systemfont); *is_systemfont = FALSE; @@ -732,9 +727,7 @@ static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop1 *iface, static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop1 *iface, IDWriteFontFace *fontface, LOGFONTW *logfont) { - struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - - TRACE("(%p)->(%p %p)\n", This, fontface, logfont); + TRACE("%p, %p, %p.\n", iface, fontface, logfont); memset(logfont, 0, sizeof(*logfont)); @@ -841,9 +834,11 @@ static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop1 *iface static HRESULT WINAPI gdiinterop_CreateBitmapRenderTarget(IDWriteGdiInterop1 *iface, HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **target) { - struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - TRACE("(%p)->(%p %u %u %p)\n", This, hdc, width, height, target); - return create_rendertarget(This->factory, hdc, width, height, target); + struct gdiinterop *interop = impl_from_IDWriteGdiInterop1(iface); + + TRACE("%p, %p, %u, %u, %p.\n", iface, hdc, width, height, target); + + return create_rendertarget(interop->factory, hdc, width, height, target); } static HRESULT WINAPI gdiinterop1_CreateFontFromLOGFONT(IDWriteGdiInterop1 *iface, @@ -897,9 +892,7 @@ done: static HRESULT WINAPI gdiinterop1_GetFontSignature_(IDWriteGdiInterop1 *iface, IDWriteFontFace *fontface, FONTSIGNATURE *fontsig) { - struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - - TRACE("(%p)->(%p %p)\n", This, fontface, fontsig); + TRACE("%p, %p, %p.\n", iface, fontface, fontsig); return get_fontsig_from_fontface(fontface, fontsig); } @@ -919,9 +912,7 @@ static HRESULT WINAPI gdiinterop1_GetFontSignature(IDWriteGdiInterop1 *iface, ID static HRESULT WINAPI gdiinterop1_GetMatchingFontsByLOGFONT(IDWriteGdiInterop1 *iface, LOGFONTW const *logfont, IDWriteFontSet *fontset, IDWriteFontSet **subset) { - struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - - FIXME("(%p)->(%p %p %p): stub\n", This, logfont, fontset, subset); + FIXME("%p, %p, %p, %p: stub.\n", iface, logfont, fontset, subset); return E_NOTIMPL; }

1 0

Nikolay Sivov : dwrite/font: Reimplement HasVerticalGlyphVariants() flag using general shaping logic.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: feefc6a908eaac6484bde7ebfbdbe7cff546554b URL: https://source.winehq.org/git/wine.git/?a=commit;h=feefc6a908eaac6484bde7eb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 15:15:02 2020 +0300 dwrite/font: Reimplement HasVerticalGlyphVariants() flag using general shaping logic. 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 | 2 +- dlls/dwrite/opentype.c | 175 +++++++++++++++++-------------------------- dlls/dwrite/tests/font.c | 9 ++- 4 files changed, 74 insertions(+), 114 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=feefc6a908eaac6484bd…

1 0

Nikolay Sivov : dwrite: Use font data access helpers when reading metrics tables.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: b3c27c4792a64e7b8665b4b53fb658afb2e21988 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3c27c4792a64e7b8665b4b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 15:15:03 2020 +0300 dwrite: Use font data access helpers when reading metrics tables. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 200 ++++++++++++++++++++++++------------------------- 1 file changed, 97 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b3c27c4792a64e7b8665…

1 0

Nikolay Sivov : mfplat: Remove duplicated attribute from tracing.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: c512748e2252c69d1ebabd509fad7d8cd03592a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c512748e2252c69d1ebabd50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 15:16:23 2020 +0300 mfplat: Remove duplicated attribute from tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 6394784593e..e4cd1c397ad 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1579,7 +1579,6 @@ const char *debugstr_attr(const GUID *guid) X(MF_SA_D3D_AWARE), X(MF_MT_MAX_KEYFRAME_SPACING), X(MFT_TRANSFORM_CLSID_Attribute), - X(MFT_TRANSFORM_CLSID_Attribute), X(MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING), X(MF_MT_AM_FORMAT_TYPE), X(MF_SESSION_APPROX_EVENT_OCCURRENCE_TIME),

1 0