2 Dec
2015
2 Dec
'15
9:04 p.m.
Author: akhaldi
Date: Wed Dec 2 21:04:16 2015
New Revision: 70237
URL: http://svn.reactos.org/svn/reactos?rev=70237&view=rev
Log:
[T2EMBED] Leverage Wine Staging 1.7.55 code and put our remaining stubs into a proper
source file. CORE-10536
Added:
trunk/reactos/dll/win32/t2embed/main.c
- copied, changed from r70236, trunk/reactos/dll/win32/t2embed/t2embed.c
trunk/reactos/dll/win32/t2embed/stubs.c (with props)
Removed:
trunk/reactos/dll/win32/t2embed/t2embed.c
Modified:
trunk/reactos/dll/win32/t2embed/CMakeLists.txt
trunk/reactos/dll/win32/t2embed/t2embed.spec
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/t2embed/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/t2embed/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/t2embed/CMakeLists.txt [iso-8859-1] Wed Dec 2 21:04:16 2015
@@ -1,14 +1,15 @@
+add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(t2embed.dll t2embed.spec)
list(APPEND SOURCE
- t2embed.c
- t2embed.rc
+ main.c
+ stubs.c
${CMAKE_CURRENT_BINARY_DIR}/t2embed_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/t2embed.def)
-add_library(t2embed SHARED ${SOURCE})
+add_library(t2embed SHARED ${SOURCE} t2embed.rc)
set_module_type(t2embed win32dll UNICODE)
target_link_libraries(t2embed wine)
add_importlibs(t2embed gdi32 user32 advapi32 version msvcrt kernel32 ntdll)
Copied: trunk/reactos/dll/win32/t2embed/main.c (from r70236,
trunk/reactos/dll/win32/t2embed/t2embed.c)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/main.c?p…
==============================================================================
--- trunk/reactos/dll/win32/t2embed/t2embed.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/t2embed/main.c [iso-8859-1] Wed Dec 2 21:04:16 2015
@@ -1,12 +1,23 @@
/*
- * PROJECT: Font Embedding Dll
- * FILE: dll\win32\t2embed\t2embed.c
- * PURPOSE: Main file
- * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org)
+ *
+ * Copyright 2009 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 WIN32_NO_STATUS
-
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
@@ -15,191 +26,13 @@
WINE_DEFAULT_DEBUG_CHANNEL(t2embed);
-LONG
-WINAPI
-TTCharToUnicode(HDC hDC,
- UCHAR* pucCharCodes,
- ULONG ulCharCodeSize,
- USHORT* pusShortCodes,
- ULONG ulShortCodeSize,
- ULONG ulFlags)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
- UNIMPLEMENTED;
- return E_NONE;
-}
-LONG
-WINAPI
-TTDeleteEmbeddedFont(HANDLE hFontReference,
- ULONG ulFlags,
- ULONG* pulStatus)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTEmbedFont(HDC hDC,
- ULONG ulFlags,
- ULONG ulCharSet,
- ULONG* pulPrivStatus,
- ULONG* pulStatus,
- WRITEEMBEDPROC lpfnWriteToStream,
- LPVOID lpvWriteStream,
- USHORT* pusCharCodeSet,
- USHORT usCharCodeCount,
- USHORT usLanguage,
- TTEMBEDINFO* pTTEmbedInfo)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTEmbedFontFromFileA(HDC hDC,
- LPCSTR szFontFileName,
- USHORT usTTCIndex,
- ULONG ulFlags,
- ULONG ulCharSet,
- ULONG* pulPrivStatus,
- ULONG* pulStatus,
- WRITEEMBEDPROC lpfnWriteToStream,
- LPVOID lpvWriteStream,
- USHORT* pusCharCodeSet,
- USHORT usCharCodeCount,
- USHORT usLanguage,
- TTEMBEDINFO* pTTEmbedInfo)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTEnableEmbeddingForFacename(LPSTR lpszFacename,
- BOOL bEnable)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTGetEmbeddedFontInfo(ULONG ulFlags,
- ULONG* pulPrivStatus,
- ULONG ulPrivs,
- ULONG* pulStatus,
- READEMBEDPROC lpfnReadFromStream,
- LPVOID lpvReadStream,
- TTLOADINFO* pTTLoadInfo)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTGetEmbeddingType(HDC hDC,
- ULONG* pulPrivStatus)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTIsEmbeddingEnabled(HDC hDC,
- BOOL* pbEnabled)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTIsEmbeddingEnabledForFacename(LPSTR lpszFacename,
- BOOL* pbEnabled)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTLoadEmbeddedFont(HANDLE *phFontReference,
- ULONG ulFlags,
- ULONG* pulPrivStatus,
- ULONG ulPrivs,
- ULONG* pulStatus,
- READEMBEDPROC lpfnReadFromStream,
- LPVOID lpvReadStream,
- LPWSTR szWinFamilyName,
- LPSTR szMacFamilyName,
- TTLOADINFO* pTTLoadInfo)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTRunValidationTests(HDC hDC,
- TTVALIDATIONTESTPARAMS* pTestParam)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTEmbedFontEx(HDC hDC,
- ULONG ulFlags,
- ULONG ulCharSet,
- ULONG* pulPrivStatus,
- ULONG* pulStatus,
- WRITEEMBEDPROC lpfnWriteToStream,
- LPVOID lpvWriteStream,
- ULONG* pulCharCodeSet,
- USHORT usCharCodeCount,
- USHORT usLanguage,
- TTEMBEDINFO* pTTEmbedInfo)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTRunValidationTestsEx(HDC hDC,
- TTVALIDATIONTESTPARAMSEX* pTestParam)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTGetNewFontName(HANDLE* phFontReference,
- LPWSTR szWinFamilyName,
- long cchMaxWinName,
- LPSTR szMacFamilyName,
- long cchMaxMacName)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-
-BOOL
-WINAPI
-DllMain(IN HINSTANCE hinstDLL,
- IN DWORD dwReason,
- IN LPVOID lpvReserved)
-{
- switch (dwReason)
+ switch (fdwReason)
{
+ case DLL_WINE_PREATTACH:
+ return FALSE; /* prefer native version */
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(hinstDLL);
break;
@@ -207,3 +40,50 @@
return TRUE;
}
+
+LONG WINAPI TTLoadEmbeddedFont(HANDLE *phFontReference, ULONG ulFlags,
+ ULONG *pulPrivStatus, ULONG ulPrivs,
+ ULONG *pulStatus, READEMBEDPROC lpfnReadFromStream,
+ LPVOID lpvReadStream, LPWSTR szWinFamilyName,
+ LPSTR szMacFamilyName, TTLOADINFO *pTTLoadInfo)
+{
+ FIXME("(%p 0x%08x %p 0x%08x %p %p %p %s %s %p) stub\n", phFontReference,
+ ulFlags, pulPrivStatus, ulPrivs, pulStatus, lpfnReadFromStream,
+ lpvReadStream, debugstr_w(szWinFamilyName), szMacFamilyName,
+ pTTLoadInfo);
+
+ return E_API_NOTIMPL;
+}
+
+LONG WINAPI TTEmbedFont(HDC hDC, ULONG ulFlags, ULONG ulCharSet, ULONG *pulPrivStatus,
+ ULONG *pulStatus, WRITEEMBEDPROC lpfnWriteToStream, LPVOID
lpvWriteStream,
+ USHORT *pusCharCodeSet, USHORT usCharCodeCount, USHORT
usLanguage,
+ TTEMBEDINFO *pTTEmbedInfo)
+{
+ FIXME("(%p 0x%08x 0x%08x %p %p %p %p %p %u %u %p) stub\n", hDC,
+ ulFlags, ulCharSet, pulPrivStatus, pulStatus, lpfnWriteToStream,
+ lpvWriteStream, pusCharCodeSet, usCharCodeCount, usLanguage,
+ pTTEmbedInfo);
+
+ return E_API_NOTIMPL;
+}
+
+LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status)
+{
+ FIXME("(%p %p) stub\n", hDC, status);
+ if (status) *status = EMBED_NOEMBEDDING;
+ return E_API_NOTIMPL;
+}
+
+LONG WINAPI TTIsEmbeddingEnabled(HDC hDC, BOOL *enabled)
+{
+ FIXME("(%p %p) stub\n", hDC, enabled);
+ if (enabled) *enabled = FALSE;
+ return E_API_NOTIMPL;
+}
+
+LONG WINAPI TTDeleteEmbeddedFont(HANDLE hFontReference, ULONG flags, ULONG *status)
+{
+ FIXME("(%p 0x%08x %p) stub\n", hFontReference, flags, status);
+ return E_API_NOTIMPL;
+}
Added: trunk/reactos/dll/win32/t2embed/stubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/stubs.c?…
==============================================================================
--- trunk/reactos/dll/win32/t2embed/stubs.c (added)
+++ trunk/reactos/dll/win32/t2embed/stubs.c [iso-8859-1] Wed Dec 2 21:04:16 2015
@@ -0,0 +1,124 @@
+/*
+ * PROJECT: Font Embedding Dll
+ * FILE: dll\win32\t2embed\stubs.c
+ * PURPOSE: Stubs file
+ * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org)
+ */
+
+#define WIN32_NO_STATUS
+#include <windef.h>
+#include <t2embapi.h>
+#include <debug.h>
+
+LONG
+WINAPI
+TTCharToUnicode(HDC hDC,
+ UCHAR* pucCharCodes,
+ ULONG ulCharCodeSize,
+ USHORT* pusShortCodes,
+ ULONG ulShortCodeSize,
+ ULONG ulFlags)
+{
+ UNIMPLEMENTED;
+ return E_NONE;
+}
+
+LONG
+WINAPI
+TTEmbedFontFromFileA(HDC hDC,
+ LPCSTR szFontFileName,
+ USHORT usTTCIndex,
+ ULONG ulFlags,
+ ULONG ulCharSet,
+ ULONG* pulPrivStatus,
+ ULONG* pulStatus,
+ WRITEEMBEDPROC lpfnWriteToStream,
+ LPVOID lpvWriteStream,
+ USHORT* pusCharCodeSet,
+ USHORT usCharCodeCount,
+ USHORT usLanguage,
+ TTEMBEDINFO* pTTEmbedInfo)
+{
+ UNIMPLEMENTED;
+ return E_NONE;
+}
+
+LONG
+WINAPI
+TTEnableEmbeddingForFacename(LPSTR lpszFacename,
+ BOOL bEnable)
+{
+ UNIMPLEMENTED;
+ return E_NONE;
+}
+
+LONG
+WINAPI
+TTGetEmbeddedFontInfo(ULONG ulFlags,
+ ULONG* pulPrivStatus,
+ ULONG ulPrivs,
+ ULONG* pulStatus,
+ READEMBEDPROC lpfnReadFromStream,
+ LPVOID lpvReadStream,
+ TTLOADINFO* pTTLoadInfo)
+{
+ UNIMPLEMENTED;
+ return E_NONE;
+}
+
+LONG
+WINAPI
+TTIsEmbeddingEnabledForFacename(LPSTR lpszFacename,
+ BOOL* pbEnabled)
+{
+ UNIMPLEMENTED;
+ return E_NONE;
+}
+
+LONG
+WINAPI
+TTRunValidationTests(HDC hDC,
+ TTVALIDATIONTESTPARAMS* pTestParam)
+{
+ UNIMPLEMENTED;
+ return E_NONE;
+}
+
+LONG
+WINAPI
+TTEmbedFontEx(HDC hDC,
+ ULONG ulFlags,
+ ULONG ulCharSet,
+ ULONG* pulPrivStatus,
+ ULONG* pulStatus,
+ WRITEEMBEDPROC lpfnWriteToStream,
+ LPVOID lpvWriteStream,
+ ULONG* pulCharCodeSet,
+ USHORT usCharCodeCount,
+ USHORT usLanguage,
+ TTEMBEDINFO* pTTEmbedInfo)
+{
+ UNIMPLEMENTED;
+ return E_NONE;
+}
+
+LONG
+WINAPI
+TTRunValidationTestsEx(HDC hDC,
+ TTVALIDATIONTESTPARAMSEX* pTestParam)
+{
+ UNIMPLEMENTED;
+ return E_NONE;
+}
+
+LONG
+WINAPI
+TTGetNewFontName(HANDLE* phFontReference,
+ LPWSTR szWinFamilyName,
+ long cchMaxWinName,
+ LPSTR szMacFamilyName,
+ long cchMaxMacName)
+{
+ UNIMPLEMENTED;
+ return E_NONE;
+}
Propchange: trunk/reactos/dll/win32/t2embed/stubs.c
------------------------------------------------------------------------------
svn:eol-style = native
Removed: trunk/reactos/dll/win32/t2embed/t2embed.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/t2embed.…
==============================================================================
--- trunk/reactos/dll/win32/t2embed/t2embed.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/t2embed/t2embed.c (removed)
@@ -1,209 +0,0 @@
-/*
- * PROJECT: Font Embedding Dll
- * FILE: dll\win32\t2embed\t2embed.c
- * PURPOSE: Main file
- * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org)
- */
-
-#define WIN32_NO_STATUS
-
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <t2embapi.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(t2embed);
-
-LONG
-WINAPI
-TTCharToUnicode(HDC hDC,
- UCHAR* pucCharCodes,
- ULONG ulCharCodeSize,
- USHORT* pusShortCodes,
- ULONG ulShortCodeSize,
- ULONG ulFlags)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTDeleteEmbeddedFont(HANDLE hFontReference,
- ULONG ulFlags,
- ULONG* pulStatus)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTEmbedFont(HDC hDC,
- ULONG ulFlags,
- ULONG ulCharSet,
- ULONG* pulPrivStatus,
- ULONG* pulStatus,
- WRITEEMBEDPROC lpfnWriteToStream,
- LPVOID lpvWriteStream,
- USHORT* pusCharCodeSet,
- USHORT usCharCodeCount,
- USHORT usLanguage,
- TTEMBEDINFO* pTTEmbedInfo)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTEmbedFontFromFileA(HDC hDC,
- LPCSTR szFontFileName,
- USHORT usTTCIndex,
- ULONG ulFlags,
- ULONG ulCharSet,
- ULONG* pulPrivStatus,
- ULONG* pulStatus,
- WRITEEMBEDPROC lpfnWriteToStream,
- LPVOID lpvWriteStream,
- USHORT* pusCharCodeSet,
- USHORT usCharCodeCount,
- USHORT usLanguage,
- TTEMBEDINFO* pTTEmbedInfo)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTEnableEmbeddingForFacename(LPSTR lpszFacename,
- BOOL bEnable)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTGetEmbeddedFontInfo(ULONG ulFlags,
- ULONG* pulPrivStatus,
- ULONG ulPrivs,
- ULONG* pulStatus,
- READEMBEDPROC lpfnReadFromStream,
- LPVOID lpvReadStream,
- TTLOADINFO* pTTLoadInfo)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTGetEmbeddingType(HDC hDC,
- ULONG* pulPrivStatus)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTIsEmbeddingEnabled(HDC hDC,
- BOOL* pbEnabled)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTIsEmbeddingEnabledForFacename(LPSTR lpszFacename,
- BOOL* pbEnabled)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTLoadEmbeddedFont(HANDLE *phFontReference,
- ULONG ulFlags,
- ULONG* pulPrivStatus,
- ULONG ulPrivs,
- ULONG* pulStatus,
- READEMBEDPROC lpfnReadFromStream,
- LPVOID lpvReadStream,
- LPWSTR szWinFamilyName,
- LPSTR szMacFamilyName,
- TTLOADINFO* pTTLoadInfo)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTRunValidationTests(HDC hDC,
- TTVALIDATIONTESTPARAMS* pTestParam)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTEmbedFontEx(HDC hDC,
- ULONG ulFlags,
- ULONG ulCharSet,
- ULONG* pulPrivStatus,
- ULONG* pulStatus,
- WRITEEMBEDPROC lpfnWriteToStream,
- LPVOID lpvWriteStream,
- ULONG* pulCharCodeSet,
- USHORT usCharCodeCount,
- USHORT usLanguage,
- TTEMBEDINFO* pTTEmbedInfo)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTRunValidationTestsEx(HDC hDC,
- TTVALIDATIONTESTPARAMSEX* pTestParam)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-LONG
-WINAPI
-TTGetNewFontName(HANDLE* phFontReference,
- LPWSTR szWinFamilyName,
- long cchMaxWinName,
- LPSTR szMacFamilyName,
- long cchMaxMacName)
-{
- UNIMPLEMENTED;
- return E_NONE;
-}
-
-
-BOOL
-WINAPI
-DllMain(IN HINSTANCE hinstDLL,
- IN DWORD dwReason,
- IN LPVOID lpvReserved)
-{
- switch (dwReason)
- {
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(hinstDLL);
- break;
- }
-
- return TRUE;
-}
Modified: trunk/reactos/dll/win32/t2embed/t2embed.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/t2embed.…
==============================================================================
--- trunk/reactos/dll/win32/t2embed/t2embed.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/t2embed/t2embed.spec [iso-8859-1] Wed Dec 2 21:04:16 2015
@@ -11,14 +11,14 @@
@ stdcall TTRunValidationTests(ptr ptr)
@ stub _TTCharToUnicode@24
@ stub _TTDeleteEmbeddedFont@12
-@ stub _TTEmbedFont@44
+@ stdcall _TTEmbedFont@44(long long long ptr ptr ptr ptr ptr long long ptr) TTEmbedFont
@ stub _TTEmbedFontFromFileA@52
@ stub _TTEnableEmbeddingForFacename@8
@ stub _TTGetEmbeddedFontInfo@28
-@ stub _TTGetEmbeddingType@8
-@ stub _TTIsEmbeddingEnabled@8
+@ stdcall _TTGetEmbeddingType@8(long ptr) TTGetEmbeddingType
+@ stdcall _TTIsEmbeddingEnabled@8(long ptr) TTIsEmbeddingEnabled
@ stub _TTIsEmbeddingEnabledForFacename@8
-@ stub _TTLoadEmbeddedFont@40
+@ stdcall _TTLoadEmbeddedFont@40(ptr long ptr long ptr ptr ptr wstr str ptr)
TTLoadEmbeddedFont
@ stub _TTRunValidationTests@8
@ stdcall TTEmbedFontEx(ptr long long ptr ptr ptr ptr ptr long long ptr)
@ stdcall TTRunValidationTestsEx(ptr ptr)
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Dec 2 21:04:16 2015
@@ -187,6 +187,7 @@
reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.7.55
reactos/dll/win32/sti # Synced to WineStaging-1.7.55
reactos/dll/win32/sxs # Synced to WineStaging-1.7.55
+reactos/dll/win32/t2embed # Synced to WineStaging-1.7.55
reactos/dll/win32/tapi32 # Synced to WineStaging-1.7.55
reactos/dll/win32/traffic # Synced to WineStaging-1.7.55
reactos/dll/win32/twain_32 # Synced to WineStaging-1.7.55