Author: akhaldi Date: Thu Nov 17 23:09:21 2016 New Revision: 73293
URL: http://svn.reactos.org/svn/reactos?rev=73293&view=rev Log: [T2EMBED] Sync with Wine Staging 1.9.23. CORE-12409
Modified: trunk/reactos/dll/win32/t2embed/main.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/t2embed/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/main.c?re... ============================================================================== --- trunk/reactos/dll/win32/t2embed/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/t2embed/main.c [iso-8859-1] Thu Nov 17 23:09:21 2016 @@ -32,7 +32,6 @@
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - switch (fdwReason) { case DLL_WINE_PREATTACH: @@ -75,6 +74,7 @@ LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) { OUTLINETEXTMETRICW otm; + WORD fsType;
TRACE("(%p %p)\n", hDC, status);
@@ -88,15 +88,22 @@ if (!status) return E_PERMISSIONSINVALID;
+ otm.otmfsType = (fsType = otm.otmfsType) & 0xf; if (otm.otmfsType == LICENSE_INSTALLABLE) *status = EMBED_INSTALLABLE; + else if (otm.otmfsType & LICENSE_EDITABLE) + *status = EMBED_EDITABLE; + else if (otm.otmfsType & LICENSE_PREVIEWPRINT) + *status = EMBED_PREVIEWPRINT; else if (otm.otmfsType & LICENSE_NOEMBEDDING) *status = EMBED_NOEMBEDDING; - else if (otm.otmfsType & LICENSE_PREVIEWPRINT) - *status = EMBED_PREVIEWPRINT; - else if (otm.otmfsType & LICENSE_EDITABLE) - *status = EMBED_EDITABLE; + else + { + WARN("unrecognized flags, %#x\n", otm.otmfsType); + *status = EMBED_INSTALLABLE; + }
+ TRACE("fsType 0x%04x, status %u\n", fsType, *status); return E_NONE; }
@@ -118,7 +125,7 @@
*enabled = TRUE; if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, exclusionlistW, 0, GENERIC_READ, &hkey)) - return E_NONE; + goto out;
*enabled = TRUE; ret = ERROR_SUCCESS; @@ -142,6 +149,8 @@ } RegCloseKey(hkey);
+out: + TRACE("embedding %s for %s\n", *enabled ? "enabled" : "disabled", debugstr_a(facename)); return E_NONE; }
@@ -165,7 +174,7 @@ return E_NOFREEMEMORY;
GetOutlineTextMetricsA(hDC, len, otm); - ret = TTIsEmbeddingEnabledForFacename(otm->otmpFaceName, enabled); + ret = TTIsEmbeddingEnabledForFacename((LPCSTR)otm + (ULONG_PTR)otm->otmpFaceName, enabled); HeapFree(GetProcessHeap(), 0, otm); return ret; }
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Nov 17 23:09:21 2016 @@ -182,7 +182,7 @@ reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.9.11 reactos/dll/win32/sti # Synced to WineStaging-1.9.23 reactos/dll/win32/sxs # Synced to WineStaging-1.9.11 -reactos/dll/win32/t2embed # Synced to WineStaging-1.9.11 +reactos/dll/win32/t2embed # Synced to WineStaging-1.9.23 reactos/dll/win32/tapi32 # Synced to WineStaging-1.9.11 reactos/dll/win32/traffic # Synced to WineStaging-1.9.11 reactos/dll/win32/twain_32 # Synced to WineStaging-1.9.11