From 63aef3e1fc8a9e549539a38cfb44e26436f7da2d Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sun, 6 Aug 2023 14:43:56 +0300 Subject: [PATCH] [T2EMBED] Improve spec file - Only export stdcall annotated functions on x86 - Turn annotated stubs / forwarders into normal exports - Note: MSVC removes decorated exports / forwarders, as soon as the undecorated version is exported, even when _declspec(dllexport) is used, no idea how to fix that. --- dll/win32/t2embed/t2embed.spec | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dll/win32/t2embed/t2embed.spec b/dll/win32/t2embed/t2embed.spec index 9b74715f081..6eae6be2f5d 100644 --- a/dll/win32/t2embed/t2embed.spec +++ b/dll/win32/t2embed/t2embed.spec @@ -9,17 +9,17 @@ @ stdcall TTIsEmbeddingEnabledForFacename(str ptr) @ stdcall TTLoadEmbeddedFont(ptr long ptr long ptr ptr ptr wstr str ptr) @ stdcall TTRunValidationTests(ptr ptr) -@ stub _TTCharToUnicode@24 -@ stub _TTDeleteEmbeddedFont@12 -@ stdcall _TTEmbedFont@44(long long long ptr ptr ptr ptr ptr long long ptr) TTEmbedFont -@ stub _TTEmbedFontFromFileA@52 -@ stub _TTEnableEmbeddingForFacename@8 -@ stub _TTGetEmbeddedFontInfo@28 -@ stdcall _TTGetEmbeddingType@8(long ptr) TTGetEmbeddingType -@ stdcall _TTIsEmbeddingEnabled@8(long ptr) TTIsEmbeddingEnabled -@ stdcall _TTIsEmbeddingEnabledForFacename@8(str ptr) TTIsEmbeddingEnabledForFacename -@ stdcall _TTLoadEmbeddedFont@40(ptr long ptr long ptr ptr ptr wstr str ptr) TTLoadEmbeddedFont -@ stub _TTRunValidationTests@8 +@ stdcall -i386 _TTCharToUnicode@24(ptr ptr long ptr long long) +@ stdcall -i386 _TTDeleteEmbeddedFont@12(long long ptr) +@ stdcall -i386 _TTEmbedFont@44(long long long ptr ptr ptr ptr ptr long long ptr) +@ stdcall -i386 _TTEmbedFontFromFileA@52(ptr str long long long ptr ptr ptr ptr ptr long long ptr) +@ stdcall -i386 _TTEnableEmbeddingForFacename@8(str long) +@ stdcall -i386 _TTGetEmbeddedFontInfo@28(long ptr long ptr ptr ptr ptr) +@ stdcall -i386 _TTGetEmbeddingType@8(long ptr) +@ stdcall -i386 _TTIsEmbeddingEnabled@8(long ptr) +@ stdcall -i386 _TTIsEmbeddingEnabledForFacename@8(str ptr) +@ stdcall -i386 _TTLoadEmbeddedFont@40(ptr long ptr long ptr ptr ptr wstr str ptr) +@ stdcall -i386 _TTRunValidationTests@8(ptr ptr) @ stdcall TTEmbedFontEx(ptr long long ptr ptr ptr ptr ptr long long ptr) @ stdcall TTRunValidationTestsEx(ptr ptr) @ stdcall TTGetNewFontName(ptr wstr long str long)