November 2017 - Wine-devel - list.winehq.org

[Testbot] Run make_makefiles when a file is added or removed.
by Zebediah Figura 27 Nov '17

27 Nov '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- testbot/bin/build/Build.pl | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 051039f..474cb84 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -74,6 +74,7 @@ sub ApplyPatch($$$) { my ($PatchFile, $PatchType, $BaseName) = @_; + my $NeedMakeMakefiles = !1; my $NeedMakefile = 0; my $NeedMakeInclude = !1; my $NeedBuildDeps = !1; @@ -84,7 +85,7 @@ sub ApplyPatch($$$) { my $Line; while (defined($Line = <FH>) && - ($NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || + (! $NeedMakeMakefiles || $NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || ! $NeedImplib || ! $NeedAutoconf || ! $NeedConfigure)) { if ($Line =~ m=^diff.*(?:tests/Makefile\.in|Make\.vars\.in|Make\.rules\.in|Maketest\.rules\.in)$=) @@ -111,6 +112,10 @@ sub ApplyPatch($$$) { $NeedConfigure = 1; } + elsif ($Line =~ m=^new file= || $Line =~ m=^deleted file= || $Line =~ m=^rename=) + { + $NeedMakeMakefiles = 1; + } } close FH; } @@ -125,6 +130,20 @@ sub ApplyPatch($$$) return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); } + if ($NeedMakeMakefiles) + { + InfoMsg "Running make_makefiles\n"; + system("( cd $DataDir/wine && set -x && " . + " ./tools/make_makefiles " . + ") >> $LogDir/Build.log 2>&1"); + if ($? != 0) + { + LogMsg "make_makefiles failed\n"; + return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); + } + $NeedConfigure = 1; + } + if ($NeedAutoconf && ! $NeedConfigure) { InfoMsg "Running autoconf\n"; -- 2.7.4

2 3

[PATCH v4] msvcrt: Don't crash if _vsnwprintf gets NULL as format string and add test
by Fabian Maurer 27 Nov '17

27 Nov '17

v2 Fix crash on older test machines v3 Check for dll function instead of OS version Add test for errno Moved test to msvcrt90 to be able to use _set_invalid_parameter_handler v4 proper patch name Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msvcr90/tests/msvcr90.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/printf.h | 7 +++++++ 2 files changed, 50 insertions(+) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 0975d00331..851c9c0a23 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -133,6 +133,7 @@ static char* (__cdecl *p_setlocale)(int, const char*); static int (__cdecl *p__fpieee_flt)(ULONG, EXCEPTION_POINTERS*, int (__cdecl *handler)(_FPIEEE_RECORD*)); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); +static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, va_list valist); /* make sure we use the correct errno */ #undef errno @@ -401,6 +402,7 @@ static BOOL init(void) SET(p__fpieee_flt, "_fpieee_flt"); SET(p__memicmp, "_memicmp"); SET(p__memicmp_l, "_memicmp_l"); + SET(p__vsnwprintf, "_vsnwprintf"); if (sizeof(void *) == 8) { @@ -1864,6 +1866,46 @@ static void test__memicmp_l(void) ok(ret == -1, "got %d\n", ret); } +static int WINAPIV _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p__vsnwprintf(str, len, format, valist); + __ms_va_end(valist); + return ret; +} + +static BOOL is_vista_or_newer(void) +{ + return GetProcAddress(GetModuleHandleA("msvcrt.dll"), "_vsnwprintf_s") != NULL; +} + +void test__vsnwprintf(void) +{ + int ret; + WCHAR str[2] = {0}; + + /* Test with format string set to NULL, we should not crash on vista or newer. */ + if(is_vista_or_newer()) + { + _invalid_parameter_handler old_handler = p_set_invalid_parameter_handler(test_invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + errno = 0xdeadbeef; + str[0] = 'x'; + ret = _vsnwprintf_wrapper(str, 0, NULL); + ok(ret == -1, "got %d, expected -1\n", ret); + ok(str[0] == 'x', "Expected string to be unchanged.\n"); + CHECK_CALLED(invalid_parameter_handler, EINVAL); + + ok(p_set_invalid_parameter_handler(old_handler) == test_invalid_parameter_handler, + "Cannot reset invalid parameter handler\n"); + } + else + win_skip("_vsnwprintf would crash with a NULL argument.\n"); +} + START_TEST(msvcr90) { if(!init()) @@ -1897,6 +1939,7 @@ START_TEST(msvcr90) test__mbstok_s(); test__memicmp(); test__memicmp_l(); + test__vsnwprintf(); #ifdef __i386__ test__fpieee_flt(); #endif diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 4ba02bafdb..def5342252 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -376,6 +376,13 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API TRACE("Format is: %s\n", FUNC_NAME(debugstr)(fmt)); + if(!fmt) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + return -1; + } + if(!locale) locinfo = get_locinfo(); else -- 2.15.0

2 2

[PATCH v2] msvcrt: Call cdecl functions with empty FPU stack in _CI* functions
by Piotr Caban 27 Nov '17

27 Nov '17

The FPU stack should be empty on cdecl function call. Failing to do so breaks GCC 6.4.0 -O2 optimized code. For bug #43940. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 263 ++++++++++++++++++++++------------------------------- 1 file changed, 108 insertions(+), 155 deletions(-)

1 0

[PATCH 1/5] d3d11: Disallow 0-sized buffer shader resource views.
by Matteo Bruni 27 Nov '17

27 Nov '17

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- While writing more tests for the mipmap generation stuff I stumbled upon a couple of missing checks in our implementation. I decided to add those checks rather than changing the tests... dlls/d3d11/tests/d3d11.c | 15 +++++++++++++++ dlls/d3d11/view.c | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2447cd771c..f636a85db2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18433,6 +18433,21 @@ static void test_buffer_srv(void) cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(cb_size), NULL); ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + buffer_desc.ByteWidth = 256; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + srv_desc.Format = DXGI_FORMAT_R8_UNORM; + srv_desc.ViewDimension = D3D11_SRV_DIMENSION_BUFFER; + U(srv_desc).Buffer.FirstElement = 0; + U(srv_desc).Buffer.NumElements = 0; + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &srv); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ID3D11Buffer_Release(buffer); + ps = NULL; srv = NULL; buffer = NULL; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index f747c4bfde..034a4940b0 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -616,6 +616,11 @@ static HRESULT normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11R WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } + if (!desc->u.Buffer.u2.NumElements) + { + WARN("Zero sized buffer view.\n"); + return E_INVALIDARG; + } return S_OK; } -- 2.13.6

1 5

[PATCH 1/2] dwrite: test font collection fallback logic
by Lucian Poston 27 Nov '17

27 Nov '17

https://bugs.winehq.org/show_bug.cgi?id=44052 Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> --- dlls/dwrite/tests/font.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 7a14180979..744ae18445 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2934,6 +2934,51 @@ todo_wine ok(ref == 0, "factory not released, %u\n", ref); } +static void test_CustomFontCollection_fallback(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + static const WCHAR enusW[] = {'e','n','-','u','s',0}; + IDWriteFontCollectionLoader *loader; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + IDWriteFactory *factory; + LONG font_coll_key = 1; + IDWriteFontCollection *font_collection; + DWRITE_TEXT_METRICS metrics; + HRESULT hr; + + factory = create_factory(); + loader = create_collection_loader(); + hr = IDWriteFactory_RegisterFontCollectionLoader(factory, loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateCustomFontCollection(factory, loader, + &font_coll_key, sizeof(font_coll_key), &font_collection); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, font_collection, + DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, + 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_GetMetrics(layout, &metrics); + todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_UnregisterFontCollectionLoader(factory, loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IDWriteFontCollectionLoader_Release(loader); + IDWriteFontCollection_Release(font_collection); + IDWriteTextFormat_Release(format); + IDWriteTextLayout_Release(layout); + IDWriteFactory_Release(factory); +} + static HRESULT WINAPI fontfileloader_QueryInterface(IDWriteFontFileLoader *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteFontFileLoader)) @@ -8467,6 +8512,7 @@ START_TEST(font) test_system_fontcollection(); test_ConvertFontFaceToLOGFONT(); test_CustomFontCollection(); + test_CustomFontCollection_fallback(); test_CreateCustomFontFileReference(); test_CreateFontFileReference(); test_shared_isolated(); -- 2.13.6

3 4

[PATCH] msvcrt: Call cdecl functions with empty FPU stack in _CI* functions
by Piotr Caban 27 Nov '17

27 Nov '17

The FPU stack should be empty on cdecl function call. Failing to do so breaks GCC 6.4.0 -O2 optimized code. New code is still calling cdecl functions with non empty FPU stack. Is it better to reimplement _CI* functions in assembler? For bug #43940. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 123 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 69 insertions(+), 54 deletions(-)

2 1

Bundle private ld-linux.so.2
by probono 27 Nov '17

27 Nov '17

Dear all, I am trying to bundle a 32-bit Windows executable with WINE in a standalone directory (like a macOS bundle) that should be able to run on any 64-bit Linux distribution without needing the user to install anything special on the host system. While this appears to work well for 64-bit Windows executable with 64-bit WINE, it appears that in order to run 32-bit Windows applications, 32-bit Windows must be used, which in turn requires 32-bit ld-linux.so.2 and glibc. But most 64-bit systems these days don't have the 32-bit compatibility libraries installed anymore. With other programs it is usually possible to manually load the 32-bit ELF file with a private, bundled version of ld-linux.so.2 like so: wget -c http://security.ubuntu.com/ubuntu/pool/main/g/glibc/libc6-i386_2.24-9ubuntu… dpkg -x ./libc6*.deb . HERE="$(dirname "$(readlink -f "${0}")")" WINEPREFIX="$HERE/wineprefix/" \ "$HERE/lib32/ld-linux.so.2" --library-path "$HERE/lib32" "$HERE/wine-stable/bin/wine" \ "$WINEPREFIX/drive_c/Program Files/App/App.exe" "$@" However, with WINE, this does not work. My guess is that WINE launches other WINE instances through other mechanisms in the background, which in turn don't get loaded using the specified "$HERE/lib32/ld-linux.so.2" and --library-path "$HERE/lib32" 1.) Can you confirm? 2.) Is there any way to tell WINE to use a private, bundled ld-linux.so.2 (and related glibc and other libraries) instead of looking for it in the host system? Reference: http://www.wildmediaserver.com/download.php (not developed by me) offers Linux versions which are basically Windows versions that bundle a minimal WINE subset but here the application is a 64-bit Windows executable whereas I am interested in 32-bit. Thanks, probono

2 1

[PATCH] user32/tests: Don't mark the SW_SHOWMINIMIZED overlapped test as todo.
by Zebediah Figura 27 Nov '17

27 Nov '17

This is window manager-dependent, but it succeeds on fvwm2 which the testbot machines use. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 64c7967..a816919 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5087,7 +5087,7 @@ static void test_messages(void) ShowWindow(hwnd, SW_MINIMIZE); flush_events(); - ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", TRUE); + ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", FALSE); flush_sequence(); if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE) -- 2.7.4

2 3

[PATCH] dwrite: Stub SetIncrementalTabStop with S_OK
by Lucian Poston 27 Nov '17

27 Nov '17

https://bugs.winehq.org/show_bug.cgi?id=44052 Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> --- dlls/dwrite/layout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index eda90ec784..104b039231 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -4263,7 +4263,7 @@ static HRESULT WINAPI dwritetextformat_layout_SetIncrementalTabStop(IDWriteTextF { struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); FIXME("(%p)->(%f): stub\n", This, tabstop); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI dwritetextformat_layout_SetTrimming(IDWriteTextFormat1 *iface, DWRITE_TRIMMING const *trimming, @@ -5272,7 +5272,7 @@ static HRESULT WINAPI dwritetextformat_SetIncrementalTabStop(IDWriteTextFormat2 { struct dwrite_textformat *This = impl_from_IDWriteTextFormat2(iface); FIXME("(%p)->(%f): stub\n", This, tabstop); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI dwritetextformat_SetTrimming(IDWriteTextFormat2 *iface, DWRITE_TRIMMING const *trimming, -- 2.13.6

2 1

[PATCH 3/3] mlang/tests: Add MapFont tests.
by Ziqing Hui 27 Nov '17

27 Nov '17

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/tests/Makefile.in | 2 +- dlls/mlang/tests/mlang.c | 99 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 99 insertions(+), 2 deletions(-)

3 3