September 2020 - Wine-Devel

[PATCH v3 1/6] windowscodecs/tests: Add a simple JXR/WMP test case.
by Rémi Bernon Sept. 21, 2020

Sept. 21, 2020

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Use todo_wine win_skip instead of skip. dlls/windowscodecs/tests/Makefile.in | 3 +- dlls/windowscodecs/tests/wmpformat.c | 179 +++++++++++++++++++++++++++ 2 files changed, 181 insertions(+), 1 deletion(-) create mode 100644 dlls/windowscodecs/tests/wmpformat.c diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index 315e975a09c..3d1e9e8a84e 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -15,4 +15,5 @@ C_SRCS = \ pngformat.c \ propertybag.c \ stream.c \ - tiffformat.c + tiffformat.c \ + wmpformat.c diff --git a/dlls/windowscodecs/tests/wmpformat.c b/dlls/windowscodecs/tests/wmpformat.c new file mode 100644 index 00000000000..b2a8d0fc7d6 --- /dev/null +++ b/dlls/windowscodecs/tests/wmpformat.c @@ -0,0 +1,179 @@ +/* + * 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 COBJMACROS + +#include "objbase.h" +#include "wincodec.h" +#include "wine/test.h" + +/* generated with JxrEncApp -i image.bmp -o image.jxr -q 1 -c 22 */ +unsigned char wmp_imagedata[] = { + 0x49, 0x49, 0xbc, 0x01, 0x20, 0x00, 0x00, 0x00, 0x24, 0xc3, 0xdd, 0x6f, + 0x03, 0x4e, 0xfe, 0x4b, 0xb1, 0x85, 0x3d, 0x77, 0x76, 0x8d, 0xc9, 0x0f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x01, 0xbc, + 0x01, 0x00, 0x10, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x02, 0xbc, + 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xbc, + 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x81, 0xbc, + 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x82, 0xbc, + 0x0b, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x42, 0x83, 0xbc, + 0x0b, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x42, 0xc0, 0xbc, + 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x9e, 0x00, 0x00, 0x00, 0xc1, 0xbc, + 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0xaf, 0x00, 0x00, 0x00, 0xc2, 0xbc, + 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x4e, 0x01, 0x00, 0x00, 0xc3, 0xbc, + 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0xb3, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x57, 0x4d, 0x50, 0x48, 0x4f, 0x54, 0x4f, 0x00, 0x11, 0x45, + 0xc0, 0x71, 0x00, 0x00, 0x00, 0x04, 0x60, 0x00, 0xc0, 0x00, 0x00, 0x0c, + 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x09, 0x00, 0x26, 0xff, 0xff, 0x00, 0x00, 0x01, 0x01, 0x51, 0x40, 0xc2, + 0x51, 0x88, 0x00, 0x00, 0x01, 0x02, 0x02, 0x10, 0x08, 0x62, 0x18, 0x84, + 0x21, 0x00, 0xc4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, + 0x18, 0x00, 0x00, 0x80, 0x40, 0x30, 0x00, 0x00, 0x00, 0x01, 0x03, 0x19, + 0x0d, 0x34, 0xd2, 0x77, 0x06, 0x62, 0xe8, 0x89, 0x8b, 0xa2, 0x26, 0x2f, + 0x11, 0xba, 0xbc, 0x46, 0xea, 0xa3, 0x6e, 0xdd, 0x72, 0x23, 0x75, 0x86, + 0xcd, 0x48, 0x73, 0xae, 0x43, 0xb9, 0x67, 0x8d, 0xfd, 0x98, 0xb0, 0xd5, + 0x52, 0x1d, 0xcb, 0x0d, 0x81, 0x06, 0xb4, 0x7d, 0xb8, 0x92, 0x5f, 0xf3, + 0x75, 0xc0, 0x3b, 0xd5, 0x07, 0xcb, 0xd0, 0xec, 0xde, 0x54, 0x1f, 0x7a, + 0x9a, 0x21, 0x8e, 0xcd, 0xe5, 0x4c, 0xdc, 0xce, 0xb8, 0x3e, 0xfa, 0x1d, + 0x8d, 0xca, 0x32, 0x94, 0xd2, 0x93, 0x2c, 0x76, 0x37, 0x2a, 0x63, 0x77, + 0x72, 0xd4, 0xd7, 0x66, 0x5a, 0xdb, 0x66, 0xed, 0x60, 0x00, 0x57, 0x4d, + 0x50, 0x48, 0x4f, 0x54, 0x4f, 0x00, 0x11, 0x45, 0xc0, 0x01, 0x00, 0x00, + 0x00, 0x04, 0x00, 0x80, 0x20, 0x08, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x06, 0x00, 0x13, 0xff, 0xff, 0x00, 0x00, 0x01, 0x01, 0x91, 0xe2, 0x00, + 0x00, 0x01, 0x02, 0x00, 0x86, 0x00, 0x00, 0x20, 0x10, 0x0c, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x03, 0xad, 0xcf, 0xf4, 0x6b, 0x64, 0x45, 0xe1, 0x91, + 0x17, 0x8e, 0x9a, 0x51, 0x32, 0x1f, 0xe2, 0x02, 0xfa, 0x69, 0x44, 0x3b, + 0xfc, 0x7b, 0xab, 0x20, 0xfe, 0x9d, 0x35, 0xd4, 0xda, 0xb7, 0xcb, 0x77, + 0x5f, 0x4d, 0xe5, 0x0e, 0xee, 0x39, 0x97, 0x6f, 0xb9, 0x99, 0x6b, 0x6d, + 0xcc, 0xb9, 0x60}; + +static void test_decode(void) +{ + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *framedecode; + IWICImagingFactory *factory; + IWICPalette *palette; + HRESULT hr; + HGLOBAL hwmpdata; + char *wmpdata; + IStream *wmpstream; + GUID format; + UINT count = 0, width = 0, height = 0; + BYTE imagedata[5 * 4] = {1}; + UINT i, j; + + const BYTE expected_imagedata[5 * 4] = { + 0x6d, 0xb0, 0xfc, 0x00, 0x6d, 0xb0, 0xfc, 0x00, 0x6d, 0xb0, + 0xfc, 0x00, 0x6d, 0xb0, 0xfc, 0x00, 0x6d, 0xb0, 0xfc, 0x00, + }; + + const BYTE broken_imagedata[5 * 4] = { + 0x74, 0xa2, 0xd6, 0x28, 0x73, 0xa1, 0xd4, 0x29, 0x71, 0xa9, + 0xe7, 0x16, 0x71, 0xa9, 0xe7, 0x16, 0x70, 0xa7, 0xe5, 0x17 + }; + + hr = CoCreateInstance(&CLSID_WICWmpDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void **)&decoder); + if (FAILED(hr)) + { + todo_wine win_skip("WmpDecoder isn't available, skipping test\n"); + return; + } + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + + hwmpdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(wmp_imagedata)); + ok(hwmpdata != 0, "GlobalAlloc failed\n"); + + wmpdata = GlobalLock(hwmpdata); + memcpy(wmpdata, wmp_imagedata, sizeof(wmp_imagedata)); + GlobalUnlock(hwmpdata); + + hr = CreateStreamOnHGlobal(hwmpdata, FALSE, &wmpstream); + ok(SUCCEEDED(hr), "CreateStreamOnHGlobal failed, hr=%x\n", hr); + + hr = IWICBitmapDecoder_Initialize(decoder, wmpstream, WICDecodeMetadataCacheOnLoad); + ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &format); + ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&format, &GUID_ContainerFormatWmp), + "unexpected container format\n"); + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &count); + ok(SUCCEEDED(hr), "GetFrameCount failed, hr=%x\n", hr); + ok(count == 1, "unexpected count %u\n", count); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, NULL); + ok(hr == E_INVALIDARG, "GetFrame(NULL) returned hr=%x\n", hr); + + for (j = 2; j > 0; --j) + { + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); + ok(SUCCEEDED(hr), "GetFrame failed, hr=%x\n", hr); + + hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); + ok(SUCCEEDED(hr), "GetSize failed, hr=%x\n", hr); + ok(width == 1, "expected width=1, got %u\n", width); + ok(height == 5, "expected height=5, got %u\n", height); + + hr = IWICBitmapFrameDecode_GetPixelFormat(framedecode, &format); + ok(SUCCEEDED(hr), "GetPixelFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppBGRA), + "unexpected pixel format: %s\n", wine_dbgstr_guid(&format)); + + for (i = 2; i > 0; --i) + { + memset(imagedata, 0, sizeof(imagedata)); + hr = IWICBitmapFrameDecode_CopyPixels( + framedecode, NULL, 4, sizeof(imagedata), imagedata); + ok(SUCCEEDED(hr), "CopyPixels failed, hr=%x\n", hr); + ok(!memcmp(imagedata, expected_imagedata, sizeof(imagedata)) || + broken(!memcmp(imagedata, broken_imagedata, sizeof(imagedata)) /* w2008s64 */), + "unexpected image data\n"); + } + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(SUCCEEDED(hr), "CreatePalette failed, hr=%x\n", hr); + + hr = IWICBitmapDecoder_CopyPalette(decoder, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#x.\n", hr); + + hr = IWICBitmapFrameDecode_CopyPalette(framedecode, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#x.\n", hr); + + IWICPalette_Release(palette); + + IWICBitmapFrameDecode_Release(framedecode); + } + + IStream_Release(wmpstream); + GlobalFree(hwmpdata); + + IWICBitmapDecoder_Release(decoder); + IWICImagingFactory_Release(factory); +} + +START_TEST(wmpformat) +{ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + test_decode(); + + CoUninitialize(); +} -- 2.28.0

2 9

[PATCH v3 1/2] ntdll/tests: Restore EFlags without re-loading.
by Jefferson Carpenter Sept. 21, 2020

Sept. 21, 2020

1 2

[PATCH] winevulkan: Update to VK spec version 1.2.154.
by Liam Middlebrook Sept. 21, 2020

Sept. 21, 2020

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5261c35360..1f9bdc156c 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.149" +VK_XML_VERSION = "1.2.154" WINE_VK_VERSION = (1, 2) # Filenames to create. -- 2.28.0

1 0

Wine and mingw-w64 cooperation?
by Fabian Maurer Sept. 21, 2020

Sept. 21, 2020

Hello, I'm curious, is there any news on this front? Regards, Fabian Maurer

3 2

[PATCH] winapi_test: Remove wininet DECL_WINELIB_TYPE_AW(...) types
by Serge Gautherie Sept. 21, 2020

Sept. 21, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- tools/winapi/tests.dat | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 0e35110..8a3120d 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1613,50 +1613,37 @@ wininet.h %type -GOPHER_ABSTRACT_ATTRIBUTE_TYPE GOPHER_ABSTRACT_ATTRIBUTE_TYPEA GOPHER_ABSTRACT_ATTRIBUTE_TYPEW -GOPHER_ADMIN_ATTRIBUTE_TYPE GOPHER_ADMIN_ATTRIBUTE_TYPEA GOPHER_ADMIN_ATTRIBUTE_TYPEW -GOPHER_ASK_ATTRIBUTE_TYPE GOPHER_ASK_ATTRIBUTE_TYPEA GOPHER_ASK_ATTRIBUTE_TYPEW -GOPHER_ATTRIBUTE_ENUMERATOR GOPHER_ATTRIBUTE_ENUMERATORA GOPHER_ATTRIBUTE_ENUMERATORW -GOPHER_ATTRIBUTE_TYPE GOPHER_ATTRIBUTE_TYPEA GOPHER_ATTRIBUTE_TYPEW -GOPHER_FIND_DATA GOPHER_FIND_DATAA GOPHER_FIND_DATAW GOPHER_GEOGRAPHICAL_LOCATION_ATTRIBUTE_TYPE -GOPHER_LOCATION_ATTRIBUTE_TYPE GOPHER_LOCATION_ATTRIBUTE_TYPEA GOPHER_LOCATION_ATTRIBUTE_TYPEW GOPHER_MOD_DATE_ATTRIBUTE_TYPE -GOPHER_ORGANIZATION_ATTRIBUTE_TYPE GOPHER_ORGANIZATION_ATTRIBUTE_TYPEA GOPHER_ORGANIZATION_ATTRIBUTE_TYPEW -GOPHER_PROVIDER_ATTRIBUTE_TYPE GOPHER_PROVIDER_ATTRIBUTE_TYPEA GOPHER_PROVIDER_ATTRIBUTE_TYPEW GOPHER_SCORE_ATTRIBUTE_TYPE GOPHER_SCORE_RANGE_ATTRIBUTE_TYPE -GOPHER_SITE_ATTRIBUTE_TYPE GOPHER_SITE_ATTRIBUTE_TYPEA GOPHER_SITE_ATTRIBUTE_TYPEW GOPHER_TIMEZONE_ATTRIBUTE_TYPE GOPHER_TTL_ATTRIBUTE_TYPE -GOPHER_UNKNOWN_ATTRIBUTE_TYPE GOPHER_UNKNOWN_ATTRIBUTE_TYPEA GOPHER_UNKNOWN_ATTRIBUTE_TYPEW GOPHER_VERONICA_ATTRIBUTE_TYPE -GOPHER_VERSION_ATTRIBUTE_TYPE GOPHER_VERSION_ATTRIBUTE_TYPEA GOPHER_VERSION_ATTRIBUTE_TYPEW -GOPHER_VIEW_ATTRIBUTE_TYPE GOPHER_VIEW_ATTRIBUTE_TYPEA GOPHER_VIEW_ATTRIBUTE_TYPEW GROUPID -- 2.10.0.windows.1

2 1

[PATCH] conhost/tests: Fix the spelling of a comment message.
by Francois Gouget Sept. 21, 2020

Sept. 21, 2020

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- programs/conhost/tests/tty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 369199a127b..27912aa1889 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -923,7 +923,7 @@ static void test_tty_output(void) expect_output_sequence("\x1b[32m"); /* foreground black */ expect_output_sequence("\x1b[1;8H"); /* set cursor */ expect_output_sequence("0"); - expect_output_sequence("\x1b[41m"); /* backgorund red */ + expect_output_sequence("\x1b[41m"); /* background red */ expect_output_sequence("1"); expect_output_sequence("\x1b[30m"); /* foreground black */ expect_output_sequence("2"); -- 2.20.1

2 1

[PATCH] vbscript: Fix the spelling of the delimiter* variables.
by Francois Gouget Sept. 21, 2020

Sept. 21, 2020

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/vbscript/global.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 92288fcd88d..1231beee8e6 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2316,8 +2316,8 @@ static HRESULT Global_Join(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, V static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - BSTR str, string, delimeter = NULL; - int count, max, mode, len, start, end, ret, delimeterlen = 1; + BSTR str, string, delimiter = NULL; + int count, max, mode, len, start, end, ret, delimiterlen = 1; int i,*indices = NULL, indices_max = 8; SAFEARRAYBOUND bounds; SAFEARRAY *sa = NULL; @@ -2342,13 +2342,13 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, if(args_cnt > 1) { if(V_VT(args+1) != VT_BSTR) { - hres = to_string(args+1, &delimeter); + hres = to_string(args+1, &delimiter); if(FAILED(hres)) goto error; }else { - delimeter = V_BSTR(args+1); + delimiter = V_BSTR(args+1); } - delimeterlen = SysStringLen(delimeter); + delimiterlen = SysStringLen(delimiter); } if(args_cnt > 2) { @@ -2388,9 +2388,9 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, while(1) { ret = -1; - if (delimeterlen) { + if (delimiterlen) { ret = FindStringOrdinal(FIND_FROMSTART, string + start, len - start, - delimeter ? delimeter : L" ", delimeterlen, mode); + delimiter ? delimiter : L" ", delimiterlen, mode); } if (ret == -1) { @@ -2410,7 +2410,7 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, indices[count++] = end; if (ret == -1 || count == max) break; - start = start + ret + delimeterlen; + start = start + ret + delimiterlen; if (start > len) break; } @@ -2443,7 +2443,7 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, SafeArrayDestroy(sa); goto error; } - start = indices[i]+delimeterlen; + start = indices[i]+delimiterlen; } SafeArrayUnaccessData(sa); @@ -2459,7 +2459,7 @@ error: if(V_VT(args) != VT_BSTR) SysFreeString(string); if(V_VT(args+1) != VT_BSTR) - SysFreeString(delimeter); + SysFreeString(delimiter); return hres; } -- 2.20.1

2 1

[PATCH] ntdll: Fix the spelling of the arch_context_parameters variable.
by Francois Gouget Sept. 21, 2020

Sept. 21, 2020

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntdll/exception.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 17bbb26f9e8..a6b4b6a7baa 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -696,7 +696,7 @@ static const struct context_parameters ULONG flags_offset; const struct context_copy_range *copy_ranges; } -arch_context_paramaters[] = +arch_context_parameters[] = { {0x00100000, 0xd810005f, 0x4d0, 0x4d0, 0x20, 7, 0xf, 0x30, copy_ranges_amd64}, {0x00010000, 0xd801007f, 0x2cc, 0xcc, 0x18, 3, 0x3, 0, copy_ranges_x86}, @@ -706,10 +706,10 @@ static const struct context_parameters *context_get_parameters( ULONG context_fl { unsigned int i; - for (i = 0; i < ARRAY_SIZE(arch_context_paramaters); ++i) + for (i = 0; i < ARRAY_SIZE(arch_context_parameters); ++i) { - if (context_flags & arch_context_paramaters[i].arch_flag) - return context_flags & ~arch_context_paramaters[i].supported_flags ? NULL : &arch_context_paramaters[i]; + if (context_flags & arch_context_parameters[i].arch_flag) + return context_flags & ~arch_context_parameters[i].supported_flags ? NULL : &arch_context_parameters[i]; } return NULL; } -- 2.20.1

2 1

[PATCH] gdi32: Limit GetGlyphOutlineW(uChar) to a WORD.
by Arkadiusz Hiler Sept. 21, 2020

Sept. 21, 2020

Turns out GetGlyphOutlineW() is using only two bytes for the character, which is common for GDI font API. This limits us to chars in the range 0x0000 - 0xffff. Fixes eden* PLUS＋MOSAIC. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45400 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/gdi32/font.c | 2 + dlls/gdi32/tests/Makefile.in | 1 + dlls/gdi32/tests/font.c | 54 ++++++++++++++++ dlls/gdi32/tests/resource.rc | 3 + dlls/gdi32/tests/wine_glyphoutlines.sfd | 79 ++++++++++++++++++++++++ dlls/gdi32/tests/wine_glyphoutlines.ttf | Bin 0 -> 1748 bytes 6 files changed, 139 insertions(+) create mode 100644 dlls/gdi32/tests/wine_glyphoutlines.sfd create mode 100644 dlls/gdi32/tests/wine_glyphoutlines.ttf diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index e099bec5e81..0fa1722d621 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2905,6 +2905,8 @@ DWORD WINAPI GetGlyphOutlineW( HDC hdc, UINT uChar, UINT fuFormat, dc = get_dc_ptr(hdc); if(!dc) return GDI_ERROR; + uChar &= 0xFFFF; + dev = GET_DC_PHYSDEV( dc, pGetGlyphOutline ); ret = dev->funcs->pGetGlyphOutline( dev, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, lpmat2 ); release_dc_ptr( dc ); diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 8b722cfe5d2..acb2051c9f9 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -20,6 +20,7 @@ C_SRCS = \ FONT_SRCS = \ vertical.sfd \ + wine_glyphoutlines.sfd \ wine_longname.sfd \ wine_test.sfd \ wine_ttfnames.sfd \ diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index f5c8d4dac3b..f272a10f098 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6131,6 +6131,59 @@ static void check_vertical_metrics(const char *face) ReleaseDC(NULL, hdc); } +static void test_GetGlyphOutlineW_character_limited_to_a_word(void) +{ + char ttf_name[MAX_PATH]; + HFONT hfont, hfont_old; + LOGFONTA lf; + HDC hdc; + DWORD num, ret; + GLYPHMETRICS gm1, gm2; + + if (!write_ttf_file("wine_glyphoutlines.ttf", ttf_name)) + { + skip("Failed to create ttf file for testing\n"); + return; + } + + num = pAddFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(num == 1, "AddFontResourceExA should add 1 fonts from vertical.ttf\n"); + + hdc = CreateCompatibleDC(0); + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = 72; + lstrcpyA(lf.lfFaceName, "WineTestGlyphOutlines"); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); + hfont_old = SelectObject(hdc, hfont); + + /* the font has two glyph with different metrics - .notdef and 0x10000 */ + + ret = GetGlyphOutlineW(hdc, 'A', GGO_METRICS, &gm1, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed with %d, lest error %d\n", ret, GetLastError()); + + ret = GetGlyphOutlineW(hdc, 0x10000, GGO_METRICS, &gm2, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed with %d, lest error %d\n", ret, GetLastError()); + + /* we shouldn't be able to use 0x10000 and isntead get the .notdef */ + ok(gm1.gmBlackBoxX == gm2.gmBlackBoxX, "gmBlackBoxX differs, %d should equal %d\n", gm1.gmBlackBoxX, gm2.gmBlackBoxX); + ok(gm1.gmBlackBoxY == gm2.gmBlackBoxY, "gmBlackBoxY differs, %d should equal %d\n", gm1.gmBlackBoxY, gm2.gmBlackBoxY); + ok(gm1.gmptGlyphOrigin.x == gm2.gmptGlyphOrigin.x, "gmptGlyphOrigin.x differs, %d should equal %d\n", gm1.gmptGlyphOrigin.x, gm2.gmptGlyphOrigin.x); + ok(gm1.gmptGlyphOrigin.y == gm2.gmptGlyphOrigin.y, "gmptGlyphOrigin.y difference, %d should equal %d\n", gm1.gmptGlyphOrigin.y, gm2.gmptGlyphOrigin.y); + ok(gm1.gmCellIncX == gm2.gmCellIncX, "gmCellIncX differs, %d should equal %d\n", gm1.gmCellIncX, gm2.gmCellIncX); + ok(gm1.gmCellIncY == gm2.gmCellIncY, "gmCellIncY differs, %d should equal %d\n", gm1.gmCellIncY, gm2.gmCellIncY); + + SelectObject(hdc, hfont_old); + DeleteObject(hfont); + + DeleteDC(hdc); + + ret = pRemoveFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError()); + DeleteFileA(ttf_name); +} + static void test_vertical_font(void) { char ttf_name[MAX_PATH]; @@ -7396,6 +7449,7 @@ START_TEST(font) test_RealizationInfo(); test_GetTextFace(); test_GetGlyphOutline(); + test_GetGlyphOutlineW_character_limited_to_a_word(); test_GetTextMetrics2("Tahoma", -11); test_GetTextMetrics2("Tahoma", -55); test_GetTextMetrics2("Tahoma", -110); diff --git a/dlls/gdi32/tests/resource.rc b/dlls/gdi32/tests/resource.rc index b5a6107a987..c47f4bb87f9 100644 --- a/dlls/gdi32/tests/resource.rc +++ b/dlls/gdi32/tests/resource.rc @@ -37,3 +37,6 @@ wine_ttfnames.ttf RCDATA wine_ttfnames.ttf /* @makedep: wine_ttfnames_bold.ttf */ wine_ttfnames_bold.ttf RCDATA wine_ttfnames_bold.ttf + +/* @makedep: wine_glyphoutlines.ttf */ +wine_glyphoutlines.ttf RCDATA wine_glyphoutlines.ttf diff --git a/dlls/gdi32/tests/wine_glyphoutlines.sfd b/dlls/gdi32/tests/wine_glyphoutlines.sfd new file mode 100644 index 00000000000..20bd8427b84 --- /dev/null +++ b/dlls/gdi32/tests/wine_glyphoutlines.sfd @@ -0,0 +1,79 @@ +SplineFontDB: 3.2 +FontName: WineTestGlyphOutlines +FullName: WineTestGlyphOutlines +FamilyName: wine_glyphoutlines +Weight: Regular +Copyright: Copyright (c) 2020, Arkadiusz Hiler +UComments: "2020-9-21: Created with FontForge (http://fontforge.org)" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -100 +UnderlineWidth: 50 +Ascent: 800 +Descent: 200 +InvalidEm: 0 +LayerCount: 2 +Layer: 0 0 "Back" 1 +Layer: 1 0 "Fore" 0 +XUID: [1021 1016 2035354264 8878123] +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1600686238 +ModificationTime: 1600688343 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'PfEd' +DEI: 91125 +Encoding: UnicodeFull +Compacted: 1 +UnicodeInterp: none +NameList: AGL For New Fonts +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 0 +WinInfo: 0 25 20 +BeginChars: 1114112 2 + +StartChar: u10000 +Encoding: 65536 65536 0 +Width: 2000 +Flags: HW +LayerCount: 2 +Fore +SplineSet +847 687 m 25 + 205 129 l 1053 +70 753 m 25 + 934 75 l 1049 +1847 687 m 25 + 1205 129 l 1053 +1070 753 m 25 + 1934 75 l 1049 +EndSplineSet +EndChar + +StartChar: .notdef +Encoding: 0 0 1 +Width: 120 +Flags: HWO +LayerCount: 2 +Fore +SplineSet +66 714 m 29 + 64 92 l 1053 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/dlls/gdi32/tests/wine_glyphoutlines.ttf b/dlls/gdi32/tests/wine_glyphoutlines.ttf new file mode 100644 index 0000000000000000000000000000000000000000..2b72ddaf559bfcbbda82e2073767eb978792fa1f GIT binary patch literal 1748 zcmds1O>YxN7=C7U?R-IsfL1*~G?W}5Bw_7CL(a)0*@5+^F4M354QB8A0XY>SO|Yp>NL z2k5CpRh!aCRQv#XE#iR4f%c3zAta=>^uUo5C=wha^UUrTLQAFg+IKac=Y8h=nh(Da z0Jh>QSeVS^rcSPYck?!oUL(6}Y-BWt{b;9tgL>D*>4VwNC-cjII7|I}e%=kS+y0IE zeU7D~TMHWvMnd`;*ISGJ;>B|>J{bk9N$OK2&n<Md{`w>FpBw`v677GqD*EoE-d&oH z7TT`kYw9}xHb2O_7{JH$AEDkp?=FP+3>{oQL|s+fdGE!}#|OB66Oe0RP>bB>1HUu> zEY~y8d*kT-zSJ(a)I!I4+!u%3~@la;})WFDTz5RSL3$aU(ikea2?hs<%zv^>;m%Ss$c z!=~6VW7EfuDeWm(a)ZpfI}cDJ~O6eE2j?~(g9nZ;9N1g#}fJSQWXXo{M=I9kARgJP-1 zA<W42#vLx|y);EpTfmT3#Yxup5II8T(r1re4qep=;}en9-o2c8m*j0I&Nja|D({RE z|0Y?sXdV0FUtQ{E(H4mnbBT0Q;jHc6wSBv|Il})DZ-M(a)L;<FjTERM<t`jmE9N2PqQ zu}a?N9VIVK(a)E%fV0osJsCM{u2Y+Sx-owt67CwXh*kqkFxWFeW8)9S>}=G1|`7&lm8 zJ5~*rjCjXji*Ia?!8Se=R}4;Jo49Lmn*2-sGVC^{(C;U~0^RTpmgvM!23xp*UktX< zBTgHff)dvaPLscnV+asp5ml5?L<tcT-%_5PL?H_&9=*iFw73Kp1=`h7!xFi1Vjmt? za4ZNHtL0)TQv34zRo2Nmy=u66$t{%YwIwxP_B|SXN&5=z=a|W7&XD;6MvJH=D>WLG zE8ZNNQCJG<kxzx(DLNHt=(7OEIpr1WzDtm!dxh?LuF}Gbi|%LH3WqtSP1q@})Mz*M zChf#u(kAv<wxK=@ax}M&Tu_N}LAB_qY`>!pt7%p=<<+7wUEzeOkbE}NH`u55jsK7p z?~MkWVZBvWT#omrxF3g=>3!)>(ZH+L%0WdrPNv^+95VlYtN)bLbOZLUEZ^7PMRzFy sDP+2yVNPyTi(n^`@hjDR=pzoTS^ACfU-Y)e2x2_>qUY0i-qh1y19@)s4*&oF literal 0 HcmV?d00001 -- 2.28.0

2 1

[PATCH] ntdll/tests: Fix the spelling of a couple of ok_() messages.
by Francois Gouget Sept. 21, 2020

Sept. 21, 2020

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntdll/tests/exception.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index c26cfb4a111..66dbe8089c3 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -7437,12 +7437,12 @@ static void check_changes_in_range_(const char *file, unsigned int line, const B if (flag & flags && p[i] != 0xcc) { - ok_(file, line)(0, "Got unexected byte %#x at %#x, flags %#x.\n", p[i], i, flags); + ok_(file, line)(0, "Got unexpected byte %#x at %#x, flags %#x.\n", p[i], i, flags); return; } else if (!(flag & flags) && p[i] != 0xdd) { - ok_(file, line)(0, "Got unexected byte %#x at %#x, flags %#x.\n", p[i], i, flags); + ok_(file, line)(0, "Got unexpected byte %#x at %#x, flags %#x.\n", p[i], i, flags); return; } } -- 2.20.1

1 0