February 2019 - Wine-commits

Dmitry Timoshkov : windowscodecs: Add support for converting to 8bppIndexed format.
by Alexandre Julliard 04 Feb '19

04 Feb '19

Module: wine Branch: master Commit: d6c2734d72e3cd530c16807324b61e981191b022 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6c2734d72e3cd530c168073… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 1 16:47:18 2019 +0800 windowscodecs: Add support for converting to 8bppIndexed format. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/converter.c | 163 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 146 insertions(+), 17 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 6e7bb8e..d6b62a6 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -76,7 +76,7 @@ typedef struct FormatConverter { const struct pixelformatinfo *dst_format, *src_format; WICBitmapDitherType dither; double alpha_threshold; - WICBitmapPaletteType palette_type; + IWICPalette *palette; CRITICAL_SECTION lock; /* must be held when initialized */ } FormatConverter; @@ -1219,11 +1219,99 @@ static HRESULT copypixels_to_8bppGray(struct FormatConverter *This, const WICRec return hr; } +static UINT rgb_to_palette_index(BYTE bgr[3], WICColor *colors, UINT count) +{ + UINT best_diff, best_index, i; + + best_diff = ~0; + best_index = 0; + + for (i = 0; i < count; i++) + { + BYTE pal_r, pal_g, pal_b; + UINT diff_r, diff_g, diff_b, diff; + + pal_r = colors[i] >> 16; + pal_g = colors[i] >> 8; + pal_b = colors[i]; + + diff_r = bgr[2] - pal_r; + diff_g = bgr[1] - pal_g; + diff_b = bgr[0] - pal_b; + + diff = diff_r * diff_r + diff_g * diff_g + diff_b * diff_b; + if (diff == 0) return i; + + if (diff < best_diff) + { + best_diff = diff; + best_index = i; + } + } + + return best_index; +} + +static HRESULT copypixels_to_8bppIndexed(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + HRESULT hr; + BYTE *srcdata; + WICColor colors[256]; + UINT srcstride, srcdatasize, count; + + if (source_format == format_8bppIndexed) + { + if (prc) + return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + + return S_OK; + } + + if (!prc) + return copypixels_to_24bppBGR(This, NULL, cbStride, cbBufferSize, pbBuffer, source_format); + + if (!This->palette) return WINCODEC_ERR_WRONGSTATE; + + hr = IWICPalette_GetColors(This->palette, 256, colors, &count); + if (hr != S_OK) return hr; + if (!count) return WINCODEC_ERR_WRONGSTATE; + + srcstride = 3 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + hr = copypixels_to_24bppBGR(This, prc, srcstride, srcdatasize, srcdata, source_format); + if (SUCCEEDED(hr) && prc) + { + INT x, y; + BYTE *src = srcdata, *dst = pbBuffer; + + for (y = 0; y < prc->Height; y++) + { + BYTE *bgr = src; + + for (x = 0; x < prc->Width; x++) + { + dst[x] = rgb_to_palette_index(bgr, colors, count); + bgr += 3; + } + src += srcstride; + dst += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + return hr; +} + static const struct pixelformatinfo supported_formats[] = { {format_1bppIndexed, &GUID_WICPixelFormat1bppIndexed, NULL}, {format_2bppIndexed, &GUID_WICPixelFormat2bppIndexed, NULL}, {format_4bppIndexed, &GUID_WICPixelFormat4bppIndexed, NULL}, - {format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, NULL}, + {format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, copypixels_to_8bppIndexed}, {format_BlackWhite, &GUID_WICPixelFormatBlackWhite, NULL}, {format_2bppGray, &GUID_WICPixelFormat2bppGray, NULL}, {format_4bppGray, &GUID_WICPixelFormat4bppGray, NULL}, @@ -1300,6 +1388,7 @@ static ULONG WINAPI FormatConverter_Release(IWICFormatConverter *iface) This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); if (This->source) IWICBitmapSource_Release(This->source); + if (This->palette) IWICPalette_Release(This->palette); HeapFree(GetProcessHeap(), 0, This); } @@ -1348,10 +1437,16 @@ static HRESULT WINAPI FormatConverter_GetResolution(IWICFormatConverter *iface, } static HRESULT WINAPI FormatConverter_CopyPalette(IWICFormatConverter *iface, - IWICPalette *pIPalette) + IWICPalette *palette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + FormatConverter *This = impl_from_IWICFormatConverter(iface); + + TRACE("(%p,%p)\n", iface, palette); + + if (!palette) return E_INVALIDARG; + if (!This->palette) return WINCODEC_ERR_WRONGSTATE; + + return IWICPalette_InitializeFromPalette(palette, This->palette); } static HRESULT WINAPI FormatConverter_CopyPixels(IWICFormatConverter *iface, @@ -1384,19 +1479,52 @@ static HRESULT WINAPI FormatConverter_CopyPixels(IWICFormatConverter *iface, } static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, - IWICBitmapSource *pISource, REFWICPixelFormatGUID dstFormat, WICBitmapDitherType dither, - IWICPalette *pIPalette, double alphaThresholdPercent, WICBitmapPaletteType paletteTranslate) + IWICBitmapSource *source, REFWICPixelFormatGUID dstFormat, WICBitmapDitherType dither, + IWICPalette *palette, double alpha_threshold, WICBitmapPaletteType palette_type) { FormatConverter *This = impl_from_IWICFormatConverter(iface); const struct pixelformatinfo *srcinfo, *dstinfo; - static INT fixme=0; GUID srcFormat; - HRESULT res=S_OK; + HRESULT res; + + TRACE("(%p,%p,%s,%u,%p,%0.3f,%u)\n", iface, source, debugstr_guid(dstFormat), + dither, palette, alpha_threshold, palette_type); + + if (!palette) + { + res = PaletteImpl_Create(&palette); + if (res != S_OK) return res; + + switch (palette_type) + { + case WICBitmapPaletteTypeCustom: + IWICPalette_Release(palette); + palette = NULL; + res = S_OK; + break; + + case WICBitmapPaletteTypeMedianCut: + { + UINT bpp; + res = get_pixelformat_bpp(dstFormat, &bpp); + if (res == S_OK && bpp <= 8) + res = IWICPalette_InitializeFromBitmap(palette, source, 1 << bpp, FALSE); + break; + } - TRACE("(%p,%p,%s,%u,%p,%0.1f,%u)\n", iface, pISource, debugstr_guid(dstFormat), - dither, pIPalette, alphaThresholdPercent, paletteTranslate); + default: + res = IWICPalette_InitializePredefined(palette, palette_type, FALSE); + break; + } - if (pIPalette && !fixme++) FIXME("ignoring palette\n"); + if (res != S_OK) + { + IWICPalette_Release(palette); + return res; + } + } + else + IWICPalette_AddRef(palette); EnterCriticalSection(&This->lock); @@ -1406,7 +1534,7 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, goto end; } - res = IWICBitmapSource_GetPixelFormat(pISource, &srcFormat); + res = IWICBitmapSource_GetPixelFormat(source, &srcFormat); if (FAILED(res)) goto end; srcinfo = get_formatinfo(&srcFormat); @@ -1427,13 +1555,13 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, if (dstinfo->copy_function) { - IWICBitmapSource_AddRef(pISource); + IWICBitmapSource_AddRef(source); This->src_format = srcinfo; This->dst_format = dstinfo; This->dither = dither; - This->alpha_threshold = alphaThresholdPercent; - This->palette_type = paletteTranslate; - This->source = pISource; + This->alpha_threshold = alpha_threshold; + This->palette = palette; + This->source = source; } else { @@ -1512,6 +1640,7 @@ HRESULT FormatConverter_CreateInstance(REFIID iid, void** ppv) This->IWICFormatConverter_iface.lpVtbl = &FormatConverter_Vtbl; This->ref = 1; This->source = NULL; + This->palette = NULL; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FormatConverter.lock");

1 0

Dmitry Timoshkov : windowscodecs: Add a NULL check to 8bpp gray converter.
by Alexandre Julliard 04 Feb '19

04 Feb '19

Module: wine Branch: master Commit: 453aa459803fbdbf09fa1e4c66ec6d73271711f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=453aa459803fbdbf09fa1e4c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 1 16:47:22 2019 +0800 windowscodecs: Add a NULL check to 8bpp gray converter. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/converter.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index d6b62a6..5288a32 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -1186,6 +1186,9 @@ static HRESULT copypixels_to_8bppGray(struct FormatConverter *This, const WICRec return hr; } + if (!prc) + return copypixels_to_24bppBGR(This, NULL, cbStride, cbBufferSize, pbBuffer, source_format); + srcstride = 3 * prc->Width; srcdatasize = srcstride * prc->Height;

1 0

Matteo Bruni : d3dx11: Downgrade ERR() to WARN() in D3DX11CreateAsyncResourceLoader*().
by Alexandre Julliard 04 Feb '19

04 Feb '19

Module: wine Branch: master Commit: 9679766e2e3a4cea156e4df3618ae01da2d445af URL: https://source.winehq.org/git/wine.git/?a=commit;h=9679766e2e3a4cea156e4df3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 1 13:01:53 2019 +0100 d3dx11: Downgrade ERR() to WARN() in D3DX11CreateAsyncResourceLoader*(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_43/async.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c index ece13e9..f640b6c 100644 --- a/dlls/d3dx11_43/async.c +++ b/dlls/d3dx11_43/async.c @@ -348,7 +348,7 @@ HRESULT WINAPI D3DX11CreateAsyncResourceLoaderA(HMODULE module, const char *reso if (!(rsrc = FindResourceA(module, resource, (const char *)RT_RCDATA))) { - ERR("Failed to find resource.\n"); + WARN("Failed to find resource.\n"); HeapFree(GetProcessHeap(), 0, object); return D3DX11_ERR_INVALID_DATA; } @@ -380,7 +380,7 @@ HRESULT WINAPI D3DX11CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *res if (!(rsrc = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA))) { - ERR("Failed to find resource.\n"); + WARN("Failed to find resource.\n"); HeapFree(GetProcessHeap(), 0, object); return D3DX11_ERR_INVALID_DATA; }

1 0

Nikolay Sivov : winhttp/tests: Add a couple of return value tests ( Coverity).
by Alexandre Julliard 04 Feb '19

04 Feb '19

Module: wine Branch: master Commit: 2dc1c967d5928e11428d5fa75ffdaceac79654fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dc1c967d5928e11428d5fa7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 31 23:31:46 2019 +0300 winhttp/tests: Add a couple of return value tests (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 91a9d53..3a28acf 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3206,6 +3206,7 @@ static void test_multiple_reads(int port) char *buf = HeapAlloc( GetProcessHeap(), 0, len + 1 ); ret = WinHttpReadData( req, buf, len, &bytes_read ); + ok(ret, "WinHttpReadData failed: %u.\n", GetLastError()); ok( len == bytes_read, "only got %u of %u available\n", bytes_read, len ); HeapFree( GetProcessHeap(), 0, buf ); @@ -4699,6 +4700,7 @@ static void test_chunked_read(void) char *buf = HeapAlloc( GetProcessHeap(), 0, len + 1 ); ret = WinHttpReadData( req, buf, len, &bytes_read ); + ok(ret, "WinHttpReadData failed: %u.\n", GetLastError()); buf[bytes_read] = 0; trace( "WinHttpReadData -> %d %u\n", ret, bytes_read );

1 0

Andrey Gusev : d3dx11_42: Share source with d3dx11_43.
by Alexandre Julliard 04 Feb '19

04 Feb '19

Module: wine Branch: master Commit: 1d8a2ba4f747f6956c9be38860c34c4187ca05e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d8a2ba4f747f6956c9be388… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jan 31 15:07:15 2019 +0200 d3dx11_42: Share source with d3dx11_43. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/Makefile.in | 3 +- dlls/d3dx11_42/d3dx11_42.c | 55 ---------------------------------- dlls/d3dx11_42/d3dx11_42.spec | 20 ++++++------- dlls/d3dx11_43/Makefile.in | 3 +- dlls/d3dx11_43/{d3dx11_43.c => main.c} | 12 ++------ tools/make_specfiles | 4 --- 6 files changed, 16 insertions(+), 81 deletions(-) diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in index d20f660..4a8fd0b 100644 --- a/dlls/d3dx11_42/Makefile.in +++ b/dlls/d3dx11_42/Makefile.in @@ -1,10 +1,11 @@ +EXTRADEFS = -DD3DX11_SDK_VERSION=42 MODULE = d3dx11_42.dll IMPORTS = d3dcompiler PARENTSRC = ../d3dx11_43 C_SRCS = \ async.c \ - d3dx11_42.c \ + main.c \ texture.c RC_SRCS = version.rc diff --git a/dlls/d3dx11_42/d3dx11_42.c b/dlls/d3dx11_42/d3dx11_42.c deleted file mode 100644 index 823ebf4..0000000 --- a/dlls/d3dx11_42/d3dx11_42.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2013 Detlef Riekenberg - * - * 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 "config.h" -#include "wine/port.h" -#include <stdarg.h> - -#define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "objbase.h" -#include "d3dx11.h" - -BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hdll); - } - - return TRUE; -} - -/*********************************************************************** - * D3DX11CheckVersion - * - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DX11CheckVersion(UINT d3dsdkversion, UINT d3dxsdkversion) -{ - if ((d3dsdkversion == D3D11_SDK_VERSION) && (d3dxsdkversion == 42)) - return TRUE; - - return FALSE; -} diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index cb1f780..dde8821 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -6,30 +6,30 @@ @ stub D3DX11CompileFromResourceW @ stub D3DX11ComputeNormalMap @ stub D3DX11CreateAsyncCompilerProcessor -@ stdcall D3DX11CreateAsyncFileLoaderA(str ptr) d3dx11_43.D3DX11CreateAsyncFileLoaderA -@ stdcall D3DX11CreateAsyncFileLoaderW(wstr ptr) d3dx11_43.D3DX11CreateAsyncFileLoaderW -@ stdcall D3DX11CreateAsyncMemoryLoader(ptr long ptr) d3dx11_43.D3DX11CreateAsyncMemoryLoader -@ stdcall D3DX11CreateAsyncResourceLoaderA(long str ptr) d3dx11_43.D3DX11CreateAsyncResourceLoaderA -@ stdcall D3DX11CreateAsyncResourceLoaderW(long wstr ptr) d3dx11_43.D3DX11CreateAsyncResourceLoaderW +@ stdcall D3DX11CreateAsyncFileLoaderA(str ptr) +@ stdcall D3DX11CreateAsyncFileLoaderW(wstr ptr) +@ stdcall D3DX11CreateAsyncMemoryLoader(ptr long ptr) +@ stdcall D3DX11CreateAsyncResourceLoaderA(long str ptr) +@ stdcall D3DX11CreateAsyncResourceLoaderW(long wstr ptr) @ stub D3DX11CreateAsyncShaderPreprocessProcessor @ stub D3DX11CreateAsyncShaderResourceViewProcessor @ stub D3DX11CreateAsyncTextureInfoProcessor @ stub D3DX11CreateAsyncTextureProcessor @ stub D3DX11CreateShaderResourceViewFromFileA @ stub D3DX11CreateShaderResourceViewFromFileW -@ stdcall D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) d3dx11_43.D3DX11CreateShaderResourceViewFromMemory +@ stdcall D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW -@ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileA -@ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileW +@ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr) +@ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) @ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceW @ stub D3DX11CreateThreadPump -@ stdcall D3DX11FilterTexture(ptr ptr long long) d3dx11_43.D3DX11FilterTexture +@ stdcall D3DX11FilterTexture(ptr ptr long long) @ stub D3DX11GetImageInfoFromFileA @ stub D3DX11GetImageInfoFromFileW -@ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) d3dx11_43.D3DX11GetImageInfoFromMemory +@ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) @ stub D3DX11GetImageInfoFromResourceA @ stub D3DX11GetImageInfoFromResourceW @ stub D3DX11LoadTextureFromTexture diff --git a/dlls/d3dx11_43/Makefile.in b/dlls/d3dx11_43/Makefile.in index d5c5b45..c64d037 100644 --- a/dlls/d3dx11_43/Makefile.in +++ b/dlls/d3dx11_43/Makefile.in @@ -1,10 +1,11 @@ +EXTRADEFS = -DD3DX11_SDK_VERSION=43 MODULE = d3dx11_43.dll IMPORTLIB = d3dx11 IMPORTS = d3dcompiler C_SRCS = \ async.c \ - d3dx11_43.c \ + main.c \ texture.c RC_SRCS = version.rc diff --git a/dlls/d3dx11_43/d3dx11_43.c b/dlls/d3dx11_43/main.c similarity index 84% rename from dlls/d3dx11_43/d3dx11_43.c rename to dlls/d3dx11_43/main.c index 4bf4998..b1bf969 100644 --- a/dlls/d3dx11_43/d3dx11_43.c +++ b/dlls/d3dx11_43/main.c @@ -48,17 +48,9 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) return TRUE; } -/*********************************************************************** - * D3DX11CheckVersion - * - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DX11CheckVersion(UINT d3dsdkversion, UINT d3dxsdkversion) +BOOL WINAPI D3DX11CheckVersion(UINT d3d_sdk_ver, UINT d3dx_sdk_ver) { - if ((d3dsdkversion == D3D11_SDK_VERSION) && (d3dxsdkversion == 43)) - return TRUE; - - return FALSE; + return d3d_sdk_ver == D3D11_SDK_VERSION && d3dx_sdk_ver == D3DX11_SDK_VERSION; } HRESULT WINAPI D3DX11FilterTexture(ID3D11DeviceContext *context, ID3D11Resource *texture, UINT src_level, UINT filter) diff --git a/tools/make_specfiles b/tools/make_specfiles index edc317d..7666c3c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -92,10 +92,6 @@ my @dll_groups = "d3dx10_33", ], [ - "d3dx11_43", - "d3dx11_42", - ], - [ "xinput1_3", "xinput1_4", "xinput1_2",

1 0

Nikolay Sivov : dwrite: Implement single adjustment, GPOS lookup 1.
by Alexandre Julliard 04 Feb '19

04 Feb '19

Module: wine Branch: master Commit: 623f059b0756d70bc517d9aa5ca55df27415da01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=623f059b0756d70bc517d9aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 1 13:48:09 2019 +0300 dwrite: Implement single adjustment, GPOS lookup 1. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 4 + dlls/dwrite/dwrite_private.h | 2 + dlls/dwrite/opentype.c | 305 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 311 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=623f059b0756d70bc517…

1 0

Nikolay Sivov : dwrite: Implement pair adjustment, GPOS lookup 2.
by Alexandre Julliard 04 Feb '19

04 Feb '19

Module: wine Branch: master Commit: 9b2ff6d2f1f3e94ebba1dc190be11cfccf03b0bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b2ff6d2f1f3e94ebba1dc19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 1 13:48:10 2019 +0300 dwrite: Implement pair adjustment, GPOS lookup 2. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 201 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 8cc45e4..f3c2043 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -586,6 +586,41 @@ struct ot_gpos_singlepos_format2 WORD values[1]; }; +struct ot_gpos_pairvalue +{ + WORD second_glyph; + BYTE data[1]; +}; + +struct ot_gpos_pairset +{ + WORD pairvalue_count; + struct ot_gpos_pairvalue pairvalues[1]; +}; + +struct ot_gpos_pairpos_format1 +{ + WORD format; + WORD coverage; + WORD value_format1; + WORD value_format2; + WORD pairset_count; + WORD pairsets[1]; +}; + +struct ot_gpos_pairpos_format2 +{ + WORD format; + WORD coverage; + WORD value_format1; + WORD value_format2; + WORD class_def1; + WORD class_def2; + WORD class1_count; + WORD class2_count; + WORD values[1]; +}; + typedef struct { WORD SubstFormat; WORD Coverage; @@ -2929,6 +2964,21 @@ static BOOL glyph_iterator_match(const struct glyph_iterator *iter) return TRUE; } +static BOOL glyph_iterator_next(struct glyph_iterator *iter) +{ + while (iter->pos + iter->len < iter->context->glyph_count) + { + ++iter->pos; + if (glyph_iterator_match(iter)) + { + --iter->len; + return TRUE; + } + } + + return FALSE; +} + static BOOL opentype_layout_apply_gpos_single_adjustment(struct scriptshaping_context *context, struct glyph_iterator *iter, const struct lookup *lookup) { @@ -2985,9 +3035,160 @@ static BOOL opentype_layout_apply_gpos_single_adjustment(struct scriptshaping_co return FALSE; } +static int gpos_pair_adjustment_compare_format1(const void *g, const void *r) +{ + const struct ot_gpos_pairvalue *pairvalue = r; + UINT16 second_glyph = GET_BE_WORD(pairvalue->second_glyph); + return *(UINT16 *)g - second_glyph; +} + static BOOL opentype_layout_apply_gpos_pair_adjustment(struct scriptshaping_context *context, struct glyph_iterator *iter, const struct lookup *lookup) { + struct scriptshaping_cache *cache = context->cache; + unsigned int i, first_glyph, second_glyph; + struct glyph_iterator iter_pair; + WORD format, coverage; + + glyph_iterator_init(context, iter->flags, iter->pos, 1, &iter_pair); + if (!glyph_iterator_next(&iter_pair)) + return FALSE; + + if (context->is_rtl) + { + first_glyph = iter_pair.pos; + second_glyph = iter->pos; + } + else + { + first_glyph = iter->pos; + second_glyph = iter_pair.pos; + } + + for (i = 0; i < lookup->subtable_count; ++i) + { + unsigned int subtable_offset = opentype_layout_get_gpos_subtable(cache, lookup->offset, i); + WORD value_format1, value_format2, value_len1, value_len2; + unsigned int coverage_index; + + format = table_read_be_word(&cache->gpos.table, subtable_offset); + + coverage = table_read_be_word(&cache->gpos.table, subtable_offset + + FIELD_OFFSET(struct ot_gpos_pairpos_format1, coverage)); + if (!coverage) + continue; + + coverage_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + + coverage, context->u.pos.glyphs[first_glyph]); + if (coverage_index == GLYPH_NOT_COVERED) + continue; + + if (format == 1) + { + const struct ot_gpos_pairpos_format1 *format1; + WORD pairset_count = table_read_be_word(&cache->gpos.table, subtable_offset + + FIELD_OFFSET(struct ot_gpos_pairpos_format1, pairset_count)); + unsigned int pairvalue_len, pairset_offset; + const struct ot_gpos_pairset *pairset; + const WORD *pairvalue; + WORD pairvalue_count; + + if (!pairset_count || coverage_index >= pairset_count) + continue; + + format1 = table_read_ensure(&cache->gpos.table, subtable_offset, + FIELD_OFFSET(struct ot_gpos_pairpos_format1, pairsets[pairset_count])); + if (!format1) + continue; + + /* Ordered paired values. */ + pairvalue_count = table_read_be_word(&cache->gpos.table, subtable_offset + + GET_BE_WORD(format1->pairsets[coverage_index])); + if (!pairvalue_count) + continue; + + /* Structure length is variable, but does not change across the subtable. */ + value_format1 = GET_BE_WORD(format1->value_format1) & 0xff; + value_format2 = GET_BE_WORD(format1->value_format2) & 0xff; + + value_len1 = dwrite_popcount(value_format1); + value_len2 = dwrite_popcount(value_format2); + pairvalue_len = FIELD_OFFSET(struct ot_gpos_pairvalue, data) + value_len1 * sizeof(WORD) + + value_len2 * sizeof(WORD); + + pairset_offset = subtable_offset + GET_BE_WORD(format1->pairsets[coverage_index]); + pairset = table_read_ensure(&cache->gpos.table, subtable_offset + pairset_offset, + pairvalue_len * pairvalue_count); + if (!pairset) + continue; + + pairvalue = bsearch(&context->u.pos.glyphs[second_glyph], pairset->pairvalues, pairvalue_count, + pairvalue_len, gpos_pair_adjustment_compare_format1); + if (!pairvalue) + continue; + + pairvalue += 1; /* Skip SecondGlyph. */ + opentype_layout_apply_gpos_value(context, pairset_offset, value_format1, pairvalue, first_glyph); + opentype_layout_apply_gpos_value(context, pairset_offset, value_format2, pairvalue + value_len1, + second_glyph); + + iter->pos = iter_pair.pos; + if (value_len2) + iter->pos++; + + return TRUE; + } + else if (format == 2) + { + const struct ot_gpos_pairpos_format2 *format2; + WORD class1_count, class2_count; + unsigned int class1, class2; + + value_format1 = table_read_be_word(&cache->gpos.table, subtable_offset + + FIELD_OFFSET(struct ot_gpos_pairpos_format2, value_format1)) & 0xff; + value_format2 = table_read_be_word(&cache->gpos.table, subtable_offset + + FIELD_OFFSET(struct ot_gpos_pairpos_format2, value_format2)) & 0xff; + + class1_count = table_read_be_word(&cache->gpos.table, subtable_offset + + FIELD_OFFSET(struct ot_gpos_pairpos_format2, class1_count)); + class2_count = table_read_be_word(&cache->gpos.table, subtable_offset + + FIELD_OFFSET(struct ot_gpos_pairpos_format2, class2_count)); + + value_len1 = dwrite_popcount(value_format1); + value_len2 = dwrite_popcount(value_format2); + + format2 = table_read_ensure(&cache->gpos.table, subtable_offset, + FIELD_OFFSET(struct ot_gpos_pairpos_format2, + values[class1_count * class2_count * (value_len1 + value_len2)])); + if (!format2) + continue; + + class1 = opentype_layout_get_glyph_class(&cache->gpos.table, subtable_offset + GET_BE_WORD(format2->class_def1), + context->u.pos.glyphs[first_glyph]); + class2 = opentype_layout_get_glyph_class(&cache->gpos.table, subtable_offset + GET_BE_WORD(format2->class_def2), + context->u.pos.glyphs[second_glyph]); + + if (class1 < class1_count && class2 < class2_count) + { + const WCHAR *values = &format2->values[(class1 * class2_count + class2) * (value_len1 + value_len2)]; + opentype_layout_apply_gpos_value(context, subtable_offset, value_format1, values, first_glyph); + opentype_layout_apply_gpos_value(context, subtable_offset, value_format2, values + value_len1, + second_glyph); + + iter->pos = iter_pair.pos; + if (value_len2) + iter->pos++; + + return TRUE; + } + } + else + { + WARN("Unknown pair adjustment format %u.\n", format); + continue; + } + } + return FALSE; }

1 0

Nikolay Sivov : dwrite: Implement cursive attachment, GPOS lookup 3.
by Alexandre Julliard 04 Feb '19

04 Feb '19

Module: wine Branch: master Commit: d1642df049cb17ade2b5458974fd040090a0ba51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1642df049cb17ade2b54589… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 1 13:48:11 2019 +0300 dwrite: Implement cursive attachment, GPOS lookup 3. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 2 + dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/opentype.c | 185 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 188 insertions(+) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 1fc8f98..0d8305d 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1317,6 +1317,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 context.u.pos.glyph_props = glyph_props; context.glyph_count = glyph_count; context.emsize = emSize; + context.measuring_mode = DWRITE_MEASURING_MODE_NATURAL; context.advances = advances; context.offsets = offsets; context.language_tag = get_opentype_language(locale); @@ -1381,6 +1382,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite context.u.pos.glyph_props = glyph_props; context.glyph_count = glyph_count; context.emsize = emSize * ppdip; + context.measuring_mode = measuring_mode; context.advances = advances; context.offsets = offsets; context.language_tag = get_opentype_language(locale); diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 355a826..0451a7e 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -394,6 +394,7 @@ struct scriptshaping_context unsigned int glyph_count; float emsize; + DWRITE_MEASURING_MODE measuring_mode; float *advances; DWRITE_GLYPH_OFFSET *offsets; }; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index f3c2043..e9c755e 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -621,6 +621,38 @@ struct ot_gpos_pairpos_format2 WORD values[1]; }; +struct ot_gpos_anchor_format1 +{ + WORD format; + short x_coord; + short y_coord; +}; + +struct ot_gpos_anchor_format2 +{ + WORD format; + short x_coord; + short y_coord; + WORD anchor_point; +}; + +struct ot_gpos_anchor_format3 +{ + WORD format; + short x_coord; + short y_coord; + WORD x_dev_offset; + WORD y_dev_offset; +}; + +struct ot_gpos_cursive_format1 +{ + WORD format; + WORD coverage; + WORD count; + WORD anchors[1]; +}; + typedef struct { WORD SubstFormat; WORD Coverage; @@ -2979,6 +3011,24 @@ static BOOL glyph_iterator_next(struct glyph_iterator *iter) return FALSE; } +static BOOL glyph_iterator_prev(struct glyph_iterator *iter) +{ + if (!iter->pos) + return FALSE; + + while (iter->pos > iter->len - 1) + { + --iter->pos; + if (glyph_iterator_match(iter)) + { + --iter->len; + return TRUE; + } + } + + return FALSE; +} + static BOOL opentype_layout_apply_gpos_single_adjustment(struct scriptshaping_context *context, struct glyph_iterator *iter, const struct lookup *lookup) { @@ -3192,9 +3242,144 @@ static BOOL opentype_layout_apply_gpos_pair_adjustment(struct scriptshaping_cont return FALSE; } +static void opentype_layout_gpos_get_anchor(const struct scriptshaping_context *context, unsigned int anchor_offset, + unsigned int glyph_index, float *x, float *y) +{ + const struct scriptshaping_cache *cache = context->cache; + + WORD format = table_read_be_word(&cache->gpos.table, anchor_offset); + + *x = *y = 0.0f; + + if (format == 1) + { + const struct ot_gpos_anchor_format1 *format1 = table_read_ensure(&cache->gpos.table, anchor_offset, + sizeof(*format1)); + + if (format1) + { + *x = opentype_scale_gpos_be_value(format1->x_coord, context->emsize, cache->upem); + *y = opentype_scale_gpos_be_value(format1->y_coord, context->emsize, cache->upem); + } + } + else if (format == 2) + { + const struct ot_gpos_anchor_format2 *format2 = table_read_ensure(&cache->gpos.table, anchor_offset, + sizeof(*format2)); + + if (format2) + { + if (context->measuring_mode != DWRITE_MEASURING_MODE_NATURAL) + FIXME("Use outline anchor point for glyph %u.\n", context->u.pos.glyphs[glyph_index]); + + *x = opentype_scale_gpos_be_value(format2->x_coord, context->emsize, cache->upem); + *y = opentype_scale_gpos_be_value(format2->y_coord, context->emsize, cache->upem); + } + } + else if (format == 3) + { + const struct ot_gpos_anchor_format3 *format3 = table_read_ensure(&cache->gpos.table, anchor_offset, + sizeof(*format3)); + + if (format3) + { + *x = opentype_scale_gpos_be_value(format3->x_coord, context->emsize, cache->upem); + *y = opentype_scale_gpos_be_value(format3->y_coord, context->emsize, cache->upem); + + if (context->measuring_mode != DWRITE_MEASURING_MODE_NATURAL) + { + if (format3->x_dev_offset) + *x += opentype_layout_gpos_get_dev_value(context, anchor_offset + GET_BE_WORD(format3->x_dev_offset)); + if (format3->y_dev_offset) + *y += opentype_layout_gpos_get_dev_value(context, anchor_offset + GET_BE_WORD(format3->y_dev_offset)); + } + } + } + else + WARN("Unknown anchor format %u.\n", format); +} + static BOOL opentype_layout_apply_gpos_cursive_attachment(struct scriptshaping_context *context, struct glyph_iterator *iter, const struct lookup *lookup) { + struct scriptshaping_cache *cache = context->cache; + unsigned int i; + + for (i = 0; i < lookup->subtable_count; ++i) + { + unsigned int subtable_offset = opentype_layout_get_gpos_subtable(cache, lookup->offset, i); + WORD format; + + format = table_read_be_word(&cache->gpos.table, subtable_offset); + + if (format == 1) + { + WORD coverage_offset = table_read_be_word(&cache->gpos.table, subtable_offset + + FIELD_OFFSET(struct ot_gpos_cursive_format1, coverage)); + unsigned int glyph_index, entry_count, entry_anchor, exit_anchor; + float entry_x, entry_y, exit_x, exit_y, delta; + struct glyph_iterator prev_iter; + + if (!coverage_offset) + continue; + + entry_count = table_read_be_word(&cache->gpos.table, subtable_offset + + FIELD_OFFSET(struct ot_gpos_cursive_format1, count)); + + glyph_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + + coverage_offset, context->u.pos.glyphs[iter->pos]); + if (glyph_index == GLYPH_NOT_COVERED || glyph_index >= entry_count) + continue; + + entry_anchor = table_read_be_word(&cache->gpos.table, subtable_offset + + FIELD_OFFSET(struct ot_gpos_cursive_format1, anchors[glyph_index * 2])); + if (!entry_anchor) + continue; + + glyph_iterator_init(context, iter->flags, iter->pos, 1, &prev_iter); + if (!glyph_iterator_prev(&prev_iter)) + continue; + + glyph_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + + coverage_offset, context->u.pos.glyphs[prev_iter.pos]); + if (glyph_index == GLYPH_NOT_COVERED || glyph_index >= entry_count) + continue; + + exit_anchor = table_read_be_word(&cache->gpos.table, subtable_offset + + FIELD_OFFSET(struct ot_gpos_cursive_format1, anchors[glyph_index * 2 + 1])); + if (!exit_anchor) + continue; + + opentype_layout_gpos_get_anchor(context, subtable_offset + exit_anchor, prev_iter.pos, &exit_x, &exit_y); + opentype_layout_gpos_get_anchor(context, subtable_offset + entry_anchor, iter->pos, &entry_x, &entry_y); + + if (context->is_rtl) + { + delta = exit_x + context->offsets[prev_iter.pos].advanceOffset; + context->advances[prev_iter.pos] -= delta; + context->advances[iter->pos] = entry_x + context->offsets[iter->pos].advanceOffset; + context->offsets[prev_iter.pos].advanceOffset -= delta; + } + else + { + delta = entry_x + context->offsets[iter->pos].advanceOffset; + context->advances[prev_iter.pos] = exit_x + context->offsets[prev_iter.pos].advanceOffset; + context->advances[iter->pos] -= delta; + context->offsets[iter->pos].advanceOffset -= delta; + } + + if (lookup->flags & LOOKUP_FLAG_RTL) + context->offsets[prev_iter.pos].ascenderOffset = entry_y - exit_y; + else + context->offsets[iter->pos].ascenderOffset = exit_y - entry_y; + + break; + } + else + WARN("Unknown cursive attachment format %u.\n", format); + + } + return FALSE; }

1 0

Nikolay Sivov : dwrite: Implement mark-to-base attachment, GPOS lookup 4.
by Alexandre Julliard 04 Feb '19

04 Feb '19

Module: wine Branch: master Commit: e166ab8b183bff2b277991de3f4b74636119a664 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e166ab8b183bff2b277991de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 1 13:48:12 2019 +0300 dwrite: Implement mark-to-base attachment, GPOS lookup 4. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index e9c755e..92a5d40 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -653,6 +653,34 @@ struct ot_gpos_cursive_format1 WORD anchors[1]; }; +struct ot_gpos_mark_record +{ + WORD mark_class; + WORD mark_anchor; +}; + +struct ot_gpos_mark_array +{ + WORD count; + struct ot_gpos_mark_record records[1]; +}; + +struct ot_gpos_base_array +{ + WORD count; + WORD offsets[1]; +}; + +struct ot_gpos_mark_to_base_format1 +{ + WORD format; + WORD mark_coverage; + WORD base_coverage; + WORD mark_class_count; + WORD mark_array; + WORD base_array; +}; + typedef struct { WORD SubstFormat; WORD Coverage; @@ -3386,6 +3414,83 @@ static BOOL opentype_layout_apply_gpos_cursive_attachment(struct scriptshaping_c static BOOL opentype_layout_apply_gpos_mark_to_base_attachment(const struct scriptshaping_context *context, struct glyph_iterator *iter, const struct lookup *lookup) { + struct scriptshaping_cache *cache = context->cache; + unsigned int i; + WORD format; + + for (i = 0; i < lookup->subtable_count; ++i) + { + unsigned int subtable_offset = opentype_layout_get_gpos_subtable(cache, lookup->offset, i); + + format = table_read_be_word(&cache->gpos.table, subtable_offset); + + if (format == 1) + { + const struct ot_gpos_mark_to_base_format1 *format1 = table_read_ensure(&cache->gpos.table, subtable_offset, + sizeof(*format1)); + unsigned int mark_class_count, count, mark_array_offset, base_array_offset; + const struct ot_gpos_mark_array *mark_array; + const struct ot_gpos_base_array *base_array; + float mark_x, mark_y, base_x, base_y; + unsigned int base_index, mark_index; + struct glyph_iterator base_iter; + unsigned int base_anchor; + + if (!format1) + continue; + + mark_array_offset = subtable_offset + GET_BE_WORD(format1->mark_array); + if (!(count = table_read_be_word(&cache->gpos.table, mark_array_offset))) + continue; + + mark_array = table_read_ensure(&cache->gpos.table, mark_array_offset, + FIELD_OFFSET(struct ot_gpos_mark_array, records[count])); + if (!mark_array) + continue; + + base_array_offset = subtable_offset + GET_BE_WORD(format1->base_array); + if (!(count = table_read_be_word(&cache->gpos.table, base_array_offset))) + continue; + + base_array = table_read_ensure(&cache->gpos.table, base_array_offset, + FIELD_OFFSET(struct ot_gpos_base_array, offsets[count * GET_BE_WORD(format1->mark_class_count)])); + if (!base_array) + continue; + + mark_class_count = GET_BE_WORD(format1->mark_class_count); + + mark_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + + GET_BE_WORD(format1->mark_coverage), context->u.pos.glyphs[iter->pos]); + + if (mark_index == GLYPH_NOT_COVERED || mark_index >= GET_BE_WORD(mark_array->count)) + continue; + + /* Look back for first base glyph. */ + glyph_iterator_init(context, LOOKUP_FLAG_IGNORE_MARKS, iter->pos, 1, &base_iter); + if (!glyph_iterator_prev(&base_iter)) + continue; + + base_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + + GET_BE_WORD(format1->base_coverage), context->u.pos.glyphs[base_iter.pos]); + if (base_index == GLYPH_NOT_COVERED || base_index >= GET_BE_WORD(base_array->count)) + continue; + + base_anchor = GET_BE_WORD(base_array->offsets[base_index * mark_class_count + + GET_BE_WORD(mark_array->records[mark_index].mark_class)]); + + opentype_layout_gpos_get_anchor(context, mark_array_offset + + GET_BE_WORD(mark_array->records[mark_index].mark_anchor), iter->pos, &mark_x, &mark_y); + opentype_layout_gpos_get_anchor(context, base_array_offset + base_anchor, base_iter.pos, &base_x, &base_y); + + context->offsets[iter->pos].advanceOffset = (context->is_rtl ? -1.0f : 1.0f) * (base_x - mark_x); + context->offsets[iter->pos].ascenderOffset = base_y - mark_y; + + break; + } + else + WARN("Unknown mark-to-base format %u.\n", format); + } + return FALSE; }

1 0

Fabian Maurer : mscoree: Allow loading of registration free .NET COM objects.
by Alexandre Julliard 04 Feb '19

04 Feb '19

Module: wine Branch: master Commit: 6428c45667606461fee5e023bb1f26d4c431b237 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6428c45667606461fee5e023… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 31 21:44:47 2019 +0100 mscoree: Allow loading of registration free .NET COM objects. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 237 +++++++++++++++++++++++++++++++----------- dlls/mscoree/tests/comtest.c | 4 +- 2 files changed, 178 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6428c45667606461fee5…

1 0